Simplified and standardized code as request in PR:342

Author: Fly1337

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/RequirementListener.java

@@ -19,6 +19,7 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.player.PlayerHarvestBlockEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
@@ -113,6 +114,13 @@ public void onPlace(BlockPlaceEvent event) {
         checkBlockRequirements(event.getPlayer(), event.getBlock().getType(), event);
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onHarvest(PlayerHarvestBlockEvent event) {
+        if (event.isCancelled()) return;
+        checkBlockRequirements(event.getPlayer(), event.getHarvestedBlock().getType(), event);
+    }
+
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onAttack(EntityDamageByEntityEvent event) {
         if (event.isCancelled()) return;
@@ -168,7 +176,15 @@ private void checkItemRequirements(Player player, ItemStack item, Cancellable ev
     }
 
     private void checkBlockRequirements(Player player, Material material, Cancellable event) {
-        BlockRequirement blockRequirement = manager.getBlocks().stream().filter(b -> b.getMaterial() == material).findFirst().orElse(null);
+        BlockRequirement blockRequirement = null;
+
+        for (BlockRequirement block : manager.getBlocks()) {
+            if (block.getMaterial() == material) {
+                blockRequirement = block;
+                break;
+            }
+        }
+
         if (blockRequirement != null) {
             if (event instanceof BlockBreakEvent) {
                 if (!blockRequirement.checksBreaking()) return;
@@ -180,7 +196,7 @@ private void checkBlockRequirements(Player player, Material material, Cancellabl
                 if (!node.check(player)) {
                     event.setCancelled(true);
                     String message = node.getDenyMessage();
-                    if(!message.isEmpty()) player.sendMessage(message);
+                    if (!message.isEmpty()) player.sendMessage(message);
                 }
             }
         }

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/RequirementManager.java

@@ -89,8 +89,9 @@ public void loadBlocks() {
                 Material material = Material.valueOf(blockNode.node("material").getString().toUpperCase(Locale.ROOT));
                 boolean allowPlace = blockNode.node("allow_place").getBoolean();
                 boolean allowBreak = blockNode.node("allow_break").getBoolean();
+                boolean allowHarvest = blockNode.node("allow_harvest").getBoolean();
                 List<? extends ConfigurationNode> requirementNodes = blockNode.node("requirements").childrenList();
-                LinkedList<RequirementNode> nodes = new LinkedList<>();
+                List<RequirementNode> nodes = new ArrayList<>();
 
                 for (ConfigurationNode requirementNode : requirementNodes) {
                     String type = requirementNode.node("type").getString();
@@ -120,7 +121,7 @@ public void loadBlocks() {
                     }
                 }
 
-                BlockRequirement blockRequirement = new BlockRequirement(material, allowPlace, allowBreak, nodes);
+                BlockRequirement blockRequirement = new BlockRequirement(material, allowPlace, allowBreak, allowHarvest, nodes);
                 blockRequirements.add(blockRequirement);
             }
             if (!blockRequirements.isEmpty()) {

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/blocks/BlockRequirement.java

@@ -2,19 +2,21 @@
 
 import org.bukkit.Material;
 
-import java.util.LinkedList;
+import java.util.List;
 
 public class BlockRequirement {
 
     private final Material material;
     private final boolean checksPlace;
     private final boolean checksBreak;
-    private final LinkedList<RequirementNode> nodes;
+    private final boolean checksHarvest;
+    private final List<RequirementNode> nodes;
 
-    public BlockRequirement(Material material, boolean checksPlace, boolean checksBreak, LinkedList<RequirementNode> nodes) {
+    public BlockRequirement(Material material, boolean checksPlace, boolean checksBreak, boolean checksHarvest, List<RequirementNode> nodes) {
         this.material = material;
         this.checksPlace = checksPlace;
         this.checksBreak = checksBreak;
+        this.checksHarvest = checksHarvest;
         this.nodes = nodes;
     }
 
@@ -30,7 +32,11 @@ public boolean checksBreaking() {
         return checksBreak;
     }
 
-    public LinkedList<RequirementNode> getNodes() {
+    public boolean checksHarvesting() {
+        return checksHarvest;
+    }
+
+    public List<RequirementNode> getNodes() {
         return nodes;
     }
 }

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/blocks/ExcludedWorldNode.java

@@ -6,12 +6,10 @@
 public class ExcludedWorldNode extends RequirementNode {
 
     private final String[] worlds;
-    private final String message;
 
     public ExcludedWorldNode(AuraSkills plugin, String[] worlds, String message) {
-        super(plugin);
+        super(plugin, message);
         this.worlds = worlds;
-        this.message = message;
     }
 
     @Override
@@ -23,9 +21,4 @@ public boolean check(Player player) {
         }
         return true;
     }
-
-    @Override
-    public String getDenyMessage() {
-        return message;
-    }
 }

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/blocks/PermissionNode.java

@@ -6,19 +6,14 @@
 public class PermissionNode extends RequirementNode {
 
     private final String permission;
-    private final String message;
 
     public PermissionNode(AuraSkills plugin, String permission, String message) {
-        super(plugin);
+        super(plugin, message);
         this.permission = permission;
-        this.message = message;
     }
 
+    @Override
     public boolean check(Player player) {
         return player.hasPermission(permission);
     }
-
-    public String getDenyMessage() {
-        return message;
-    }
 }

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/blocks/RequirementNode.java

@@ -6,11 +6,16 @@
 public abstract class RequirementNode {
 
     protected AuraSkills plugin;
+    protected String denyMessage;
 
-    public RequirementNode(AuraSkills plugin) {
+    public RequirementNode(AuraSkills plugin, String denyMessage) {
         this.plugin = plugin;
+        this.denyMessage = denyMessage;
     }
 
-    public abstract String getDenyMessage();
     public abstract boolean check(Player player);
+
+    public String getDenyMessage() {
+        return denyMessage;
+    }
 }

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/blocks/SkillNode.java

@@ -8,20 +8,15 @@ public class SkillNode extends RequirementNode {
 
     private final Skill skill;
     private final int level;
-    private final String message;
 
     public SkillNode(AuraSkills plugin, Skill skill, int level, String message) {
-        super(plugin);
+        super(plugin, message);
         this.skill = skill;
         this.level = level;
-        this.message = message;
     }
 
+    @Override
     public boolean check(Player player) {
         return plugin.getUser(player).getSkillLevel(skill) >= level;
     }
-
-    public String getDenyMessage() {
-        return message;
-    }
 }

bukkit/src/main/java/dev/aurelium/auraskills/bukkit/requirement/blocks/StatNode.java

@@ -8,20 +8,15 @@ public class StatNode extends RequirementNode {
 
     private final Stat stat;
     private final int value;
-    private final String message;
 
     public StatNode(AuraSkills plugin, Stat stat, int value, String message) {
-        super(plugin);
+        super(plugin, message);
         this.stat = stat;
         this.value = value;
-        this.message = message;
     }
 
+    @Override
     public boolean check(Player player) {
         return plugin.getUser(player).getStatLevel(stat) >= value;
     }
-
-    public String getDenyMessage() {
-        return message;
-    }
 }