Skip to content

Commit

Permalink
Merge pull request #204 from VolmitSoftware/Development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@NextdoorPsycho
NextdoorPsycho authored Sep 24, 2022
2 parents e2e4113 + 9632707 commit 584b03b
Show file tree
Hide file tree
Showing 25 changed files with 158 additions and 442 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}


version '1.3.3-1.19.2' // Needs to be version specific
version '1.3.4-1.19.2' // Needs to be version specific
def nmsVersion = "1.19.2" //[NMS]
def apiVersion = '1.19'
def specialSourceVersion = '1.11.0' //[NMS]
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/com/volmit/adapt/api/skill/SimpleSkill.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import art.arcane.amulet.io.FileWatcher;
import com.google.gson.Gson;
import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.adaptation.Adaptation;
import com.volmit.adapt.api.advancement.AdaptAdvancement;
import com.volmit.adapt.api.recipe.AdaptRecipe;
Expand All @@ -33,7 +34,9 @@
import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -144,6 +147,30 @@ public void registerRecipe(AdaptRecipe r) {
recipes.add(r);
}

public boolean canUseSkill(Player p) {
if (!this.isEnabled()) {
return false;
}
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return false;
}
if (!AdaptConfig.get().isXpInCreative()
&& (p.getGameMode().equals(GameMode.CREATIVE)
|| p.getGameMode().equals(GameMode.SPECTATOR)
|| p.isDead()
|| p.isInvulnerable()
|| p.isDead()
|| p.isInvulnerable())) {
return false;
}
return true;
}

public boolean canUseSkill() {
return this.isEnabled();
}


public void registerAdvancement(AdaptAdvancement a) {
cachedAdvancements.add(a);
}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/volmit/adapt/content/adaptation/pickaxe/PickaxeChisel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import lombok.NoArgsConstructor;
import org.bukkit.*;
import org.bukkit.block.data.BlockData;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
Expand Down Expand Up @@ -75,6 +76,9 @@ private int getDamagePerBlock(double levelPercent) {
public void on(PlayerInteractEvent e) {
Player p = e.getPlayer();
if (e.getClickedBlock() != null && e.getAction().equals(Action.RIGHT_CLICK_BLOCK) && isPickaxe(p.getInventory().getItemInMainHand()) && hasAdaptation(p)) {
if (p.getInventory().getItemInMainHand().getEnchantments().containsKey(Enchantment.SILK_TOUCH) || p.getInventory().getItemInMainHand().getEnchantments().containsKey(Enchantment.MENDING)) {
return;
}
if (p.getCooldown(p.getInventory().getItemInMainHand().getType()) > 0) {
return;
}
Expand Down
21 changes: 3 additions & 18 deletions src/main/java/com/volmit/adapt/content/skill/SkillAgility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.advancement.AdaptAdvancement;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.api.world.AdaptStatTracker;
Expand All @@ -32,7 +31,6 @@
import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand Down Expand Up @@ -83,19 +81,13 @@ public SkillAgility() {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(PlayerMoveEvent e) {
if (!this.isEnabled()) {
if (canUseSkill(e.getPlayer())) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
if (e.getFrom().getWorld() != null && e.getTo() != null && e.getFrom().getWorld().equals(e.getTo().getWorld())) {
double d = e.getFrom().distance(e.getTo());
getPlayer(p).getData().addStat("move", d);
Expand All @@ -113,19 +105,12 @@ public void on(PlayerMoveEvent e) {

@Override
public void onTick() {

for (Player i : Bukkit.getOnlinePlayers()) {
checkStatTrackers(getPlayer(i));
if (AdaptConfig.get().blacklistedWorlds.contains(i.getWorld().getName())) {
if (canUseSkill(i.getPlayer())) {
return;
}
checkStatTrackers(getPlayer(i));
if (i.isSprinting() && !i.isFlying() && !i.isSwimming() && !i.isSneaking()) {
if (!AdaptConfig.get().isXpInCreative() && (i.getGameMode().equals(GameMode.CREATIVE) || i.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
if (!this.isEnabled()) {
return;
}
xpSilent(i, getConfig().sprintXpPassive);
}
}
Expand Down
26 changes: 6 additions & 20 deletions src/main/java/com/volmit/adapt/content/skill/SkillArchitect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.advancement.AdaptAdvancement;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.api.world.AdaptStatTracker;
Expand All @@ -32,7 +31,6 @@
import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -59,17 +57,11 @@ public SkillArchitect() {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(BlockPlaceEvent e) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
if (canUseSkill(e.getPlayer())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
if (e.isCancelled()) {
return;
}
double v = getValue(e.getBlock()) * getConfig().xpValueMultiplier;
Expand All @@ -81,17 +73,11 @@ public void on(BlockPlaceEvent e) {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(BlockBreakEvent e) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
if (canUseSkill(e.getPlayer())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
if (e.isCancelled()) {
return;
}
getPlayer(p).getData().addStat("blocks.broken", 1);
Expand All @@ -100,10 +86,10 @@ public void on(BlockBreakEvent e) {
@Override
public void onTick() {
for (Player i : Bukkit.getOnlinePlayers()) {
checkStatTrackers(getPlayer(i));
if (AdaptConfig.get().blacklistedWorlds.contains(i.getWorld().getName())) {
if (canUseSkill(i)) {
return;
}
checkStatTrackers(getPlayer(i));
}
}

Expand Down
27 changes: 6 additions & 21 deletions src/main/java/com/volmit/adapt/content/skill/SkillAxes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.api.world.AdaptPlayer;
import com.volmit.adapt.content.adaptation.axe.AxeChop;
Expand All @@ -29,7 +28,6 @@
import com.volmit.adapt.util.C;
import com.volmit.adapt.util.J;
import lombok.NoArgsConstructor;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -55,22 +53,16 @@ public SkillAxes() {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(EntityDamageByEntityEvent e) {
if (!this.isEnabled()) {
return;
}
if (!e.isCancelled()) {
if (e.getDamager() instanceof Player p) {
if (e.isCancelled()) {
if (canUseSkill(p)) {
return;
}
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
if (e.isCancelled()) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))
|| e.getEntity().isDead()
|| e.getEntity().isInvulnerable()
|| p.isDead()
|| p.isInvulnerable()) {

if (e.getEntity().isDead() || e.getEntity().isInvulnerable()) {
return;
}
AdaptPlayer a = getPlayer((Player) e.getDamager());
Expand All @@ -87,18 +79,11 @@ public void on(EntityDamageByEntityEvent e) {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(BlockBreakEvent e) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
if (canUseSkill(p)) {
return;
}

if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
if (e.isCancelled()) {
return;
}
if (isAxe(p.getInventory().getItemInMainHand())) {
Expand Down
20 changes: 3 additions & 17 deletions src/main/java/com/volmit/adapt/content/skill/SkillBlocking.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.content.adaptation.blocking.BlockingMultiArmor;
import com.volmit.adapt.util.C;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
Expand All @@ -52,17 +50,11 @@ public SkillBlocking() {

@EventHandler
public void on(EntityDamageByEntityEvent e) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
if (e.getEntity() instanceof Player p) {
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
if (canUseSkill(p)) {
return;
}
if (cooldowns.containsKey(p)) {
Expand All @@ -85,17 +77,11 @@ public void on(EntityDamageByEntityEvent e) {
@Override
public void onTick() {
for (Player i : Bukkit.getOnlinePlayers()) {
checkStatTrackers(getPlayer(i));
if (AdaptConfig.get().blacklistedWorlds.contains(i.getWorld().getName())) {
if (canUseSkill(i)) {
return;
}
checkStatTrackers(getPlayer(i));
if (i.getPlayer() != null && (i.getPlayer().getInventory().getItemInOffHand().getType().equals(Material.SHIELD) || i.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.SHIELD))) {
if (!AdaptConfig.get().isXpInCreative() && (i.getGameMode().equals(GameMode.CREATIVE) || i.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
if (!this.isEnabled()) {
return;
}
xpSilent(i, getConfig().passiveXpForUsingShield);
}
}
Expand Down
Loading

0 comments on commit 584b03b

Please sign in to comment.