Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	gradle.properties

build.gradle

@@ -25,7 +25,7 @@ allprojects {
         // NMS (for jitpack compilation)
         maven { url 'https://repo.codemc.org/repository/nms/' }
 
-        // bStats
+        // bStats, mcMMO
         maven { url 'https://repo.codemc.org/repository/maven-public' }
 
         // Spigot API
@@ -69,6 +69,7 @@ allprojects {
         exclude group: "org.kitteh", module: "paste-gg-api"
         exclude group: "org.spongepowered", module: "configurate-hocon"
         exclude group: "com.darkblade12", module: "particleeffect"
+        exclude group: "com.github.cryptomorin", module: "XSeries"
     }
 
     shadowJar {

config/checkstyle/checkstyle.xml

@@ -115,7 +115,6 @@
         <!-- Checks for imports                              -->
         <!-- See https://checkstyle.org/config_imports.html -->
         <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
         <module name="RedundantImport"/>
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>

eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/PacketPlayOutRecipeUpdateFix.java

@@ -1,46 +0,0 @@
-package com.willfp.eco.proxy.v1_15_R1;
-
-import com.willfp.eco.proxy.proxies.PacketPlayOutRecipeUpdateFixProxy;
-import net.minecraft.server.v1_15_R1.IRecipe;
-import net.minecraft.server.v1_15_R1.PacketPlayOutRecipeUpdate;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@SuppressWarnings("unchecked")
-public final class PacketPlayOutRecipeUpdateFix implements PacketPlayOutRecipeUpdateFixProxy {
-    @Override
-    public List<Object> splitPackets(@NotNull final Object object,
-                                     @NotNull final Player player) {
-        if (!(object instanceof PacketPlayOutRecipeUpdate)) {
-            throw new IllegalArgumentException("Parameter not packet!");
-        }
-
-        PacketPlayOutRecipeUpdate oldPacket = (PacketPlayOutRecipeUpdate) object;
-        List<IRecipe<?>> recipes = new ArrayList<>();
-        try {
-            Field f = oldPacket.getClass().getDeclaredField("a");
-            f.setAccessible(true);
-            recipes.addAll((Collection<? extends IRecipe<?>>) f.get(oldPacket));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        List<Object> splitPackets = new ArrayList<>();
-        List<IRecipe<?>> splitRecipes = new ArrayList<>();
-        for (int i = 0; i < recipes.size(); i++) {
-            splitRecipes.add(recipes.get(i));
-            if (i % 100 == 0) {
-                PacketPlayOutRecipeUpdate newPacket = new PacketPlayOutRecipeUpdate(splitRecipes);
-                splitPackets.add(newPacket);
-                splitRecipes.clear();
-            }
-        }
-
-        return splitPackets;
-    }
-}

eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/VillagerTrade.java

@@ -9,16 +9,11 @@ import org.bukkit.inventory.MerchantRecipe;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 public final class VillagerTrade implements VillagerTradeProxy {
     @Override
     public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
         try {
-            // Enables removing final modifier
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
-            modifiersField.setAccessible(true);
-
             // Bukkit MerchantRecipe result
             Field fResult = MerchantRecipe.class.getDeclaredField("result");
             fResult.setAccessible(true);
@@ -31,11 +26,9 @@ public final class VillagerTrade implements VillagerTradeProxy {
             Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
             fHandle.setAccessible(true);
             net.minecraft.server.v1_15_R1.MerchantRecipe handle = (net.minecraft.server.v1_15_R1.MerchantRecipe) fHandle.get(merchantRecipe); // NMS Recipe
-            modifiersField.setInt(fHandle, fHandle.getModifiers() & ~Modifier.FINAL); // Remove final
 
             Field fSelling = net.minecraft.server.v1_15_R1.MerchantRecipe.class.getDeclaredField("sellingItem");
             fSelling.setAccessible(true);
-            modifiersField.setInt(fSelling, fSelling.getModifiers() & ~Modifier.FINAL);
 
             ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
             Display.displayAndFinalize(selling);

eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/PacketPlayOutRecipeUpdateFix.java

@@ -1,46 +0,0 @@
-package com.willfp.eco.proxy.v1_16_R1;
-
-import com.willfp.eco.proxy.proxies.PacketPlayOutRecipeUpdateFixProxy;
-import net.minecraft.server.v1_16_R1.IRecipe;
-import net.minecraft.server.v1_16_R1.PacketPlayOutRecipeUpdate;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@SuppressWarnings("unchecked")
-public final class PacketPlayOutRecipeUpdateFix implements PacketPlayOutRecipeUpdateFixProxy {
-    @Override
-    public List<Object> splitPackets(@NotNull final Object object,
-                                     @NotNull final Player player) {
-        if (!(object instanceof PacketPlayOutRecipeUpdate)) {
-            throw new IllegalArgumentException("Parameter not packet!");
-        }
-
-        PacketPlayOutRecipeUpdate oldPacket = (PacketPlayOutRecipeUpdate) object;
-        List<IRecipe<?>> recipes = new ArrayList<>();
-        try {
-            Field f = oldPacket.getClass().getDeclaredField("a");
-            f.setAccessible(true);
-            recipes.addAll((Collection<? extends IRecipe<?>>) f.get(oldPacket));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        List<Object> splitPackets = new ArrayList<>();
-        List<IRecipe<?>> splitRecipes = new ArrayList<>();
-        for (int i = 0; i < recipes.size(); i++) {
-            splitRecipes.add(recipes.get(i));
-            if (i % 100 == 0) {
-                PacketPlayOutRecipeUpdate newPacket = new PacketPlayOutRecipeUpdate(splitRecipes);
-                splitPackets.add(newPacket);
-                splitRecipes.clear();
-            }
-        }
-
-        return splitPackets;
-    }
-}

eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java

@@ -9,16 +9,11 @@ import org.bukkit.inventory.MerchantRecipe;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 public final class VillagerTrade implements VillagerTradeProxy {
     @Override
     public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
         try {
-            // Enables removing final modifier
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
-            modifiersField.setAccessible(true);
-
             // Bukkit MerchantRecipe result
             Field fResult = MerchantRecipe.class.getDeclaredField("result");
             fResult.setAccessible(true);
@@ -30,11 +25,9 @@ public final class VillagerTrade implements VillagerTradeProxy {
             Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
             fHandle.setAccessible(true);
             net.minecraft.server.v1_16_R1.MerchantRecipe handle = (net.minecraft.server.v1_16_R1.MerchantRecipe) fHandle.get(merchantRecipe); // NMS Recipe
-            modifiersField.setInt(fHandle, fHandle.getModifiers() & ~Modifier.FINAL); // Remove final
 
             Field fSelling = net.minecraft.server.v1_16_R1.MerchantRecipe.class.getDeclaredField("sellingItem");
             fSelling.setAccessible(true);
-            modifiersField.setInt(fSelling, fSelling.getModifiers() & ~Modifier.FINAL);
 
             ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
             Display.displayAndFinalize(selling);

eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/PacketPlayOutRecipeUpdateFix.java

@@ -1,46 +0,0 @@
-package com.willfp.eco.proxy.v1_16_R2;
-
-import com.willfp.eco.proxy.proxies.PacketPlayOutRecipeUpdateFixProxy;
-import net.minecraft.server.v1_16_R2.IRecipe;
-import net.minecraft.server.v1_16_R2.PacketPlayOutRecipeUpdate;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@SuppressWarnings("unchecked")
-public final class PacketPlayOutRecipeUpdateFix implements PacketPlayOutRecipeUpdateFixProxy {
-    @Override
-    public List<Object> splitPackets(@NotNull final Object object,
-                                     @NotNull final Player player) {
-        if (!(object instanceof PacketPlayOutRecipeUpdate)) {
-            throw new IllegalArgumentException("Parameter not packet!");
-        }
-
-        PacketPlayOutRecipeUpdate oldPacket = (PacketPlayOutRecipeUpdate) object;
-        List<IRecipe<?>> recipes = new ArrayList<>();
-        try {
-            Field f = oldPacket.getClass().getDeclaredField("a");
-            f.setAccessible(true);
-            recipes.addAll((Collection<? extends IRecipe<?>>) f.get(oldPacket));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        List<Object> splitPackets = new ArrayList<>();
-        List<IRecipe<?>> splitRecipes = new ArrayList<>();
-        for (int i = 0; i < recipes.size(); i++) {
-            splitRecipes.add(recipes.get(i));
-            if (i % 100 == 0) {
-                PacketPlayOutRecipeUpdate newPacket = new PacketPlayOutRecipeUpdate(splitRecipes);
-                splitPackets.add(newPacket);
-                splitRecipes.clear();
-            }
-        }
-
-        return splitPackets;
-    }
-}

eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java

@@ -9,16 +9,11 @@ import org.bukkit.inventory.MerchantRecipe;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 public final class VillagerTrade implements VillagerTradeProxy {
     @Override
     public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
         try {
-            // Enables removing final modifier
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
-            modifiersField.setAccessible(true);
-
             // Bukkit MerchantRecipe result
             Field fResult = MerchantRecipe.class.getDeclaredField("result");
             fResult.setAccessible(true);
@@ -30,11 +25,9 @@ public final class VillagerTrade implements VillagerTradeProxy {
             Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
             fHandle.setAccessible(true);
             net.minecraft.server.v1_16_R2.MerchantRecipe handle = (net.minecraft.server.v1_16_R2.MerchantRecipe) fHandle.get(merchantRecipe); // NMS Recipe
-            modifiersField.setInt(fHandle, fHandle.getModifiers() & ~Modifier.FINAL); // Remove final
 
             Field fSelling = net.minecraft.server.v1_16_R2.MerchantRecipe.class.getDeclaredField("sellingItem");
             fSelling.setAccessible(true);
-            modifiersField.setInt(fSelling, fSelling.getModifiers() & ~Modifier.FINAL);
 
             ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
             Display.displayAndFinalize(selling);

eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/PacketPlayOutRecipeUpdateFix.java

@@ -1,46 +0,0 @@
-package com.willfp.eco.proxy.v1_16_R3;
-
-import com.willfp.eco.proxy.proxies.PacketPlayOutRecipeUpdateFixProxy;
-import net.minecraft.server.v1_16_R3.IRecipe;
-import net.minecraft.server.v1_16_R3.PacketPlayOutRecipeUpdate;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@SuppressWarnings("unchecked")
-public final class PacketPlayOutRecipeUpdateFix implements PacketPlayOutRecipeUpdateFixProxy {
-    @Override
-    public List<Object> splitPackets(@NotNull final Object object,
-                                     @NotNull final Player player) {
-        if (!(object instanceof PacketPlayOutRecipeUpdate)) {
-            throw new IllegalArgumentException("Parameter not packet!");
-        }
-
-        PacketPlayOutRecipeUpdate oldPacket = (PacketPlayOutRecipeUpdate) object;
-        List<IRecipe<?>> recipes = new ArrayList<>();
-        try {
-            Field f = oldPacket.getClass().getDeclaredField("a");
-            f.setAccessible(true);
-            recipes.addAll((Collection<? extends IRecipe<?>>) f.get(oldPacket));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-
-        List<Object> splitPackets = new ArrayList<>();
-        List<IRecipe<?>> splitRecipes = new ArrayList<>();
-        for (int i = 0; i < recipes.size(); i++) {
-            splitRecipes.add(recipes.get(i));
-            if (i % 100 == 0) {
-                PacketPlayOutRecipeUpdate newPacket = new PacketPlayOutRecipeUpdate(splitRecipes);
-                splitPackets.add(newPacket);
-                splitRecipes.clear();
-            }
-        }
-
-        return splitPackets;
-    }
-}

eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java

@@ -9,16 +9,11 @@ import org.bukkit.inventory.MerchantRecipe;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 
 public final class VillagerTrade implements VillagerTradeProxy {
     @Override
     public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
         try {
-            // Enables removing final modifier
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
-            modifiersField.setAccessible(true);
-
             // Bukkit MerchantRecipe result
             Field fResult = MerchantRecipe.class.getDeclaredField("result");
             fResult.setAccessible(true);
@@ -29,12 +24,10 @@ public final class VillagerTrade implements VillagerTradeProxy {
             // Get NMS MerchantRecipe from CraftMerchantRecipe
             Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
             fHandle.setAccessible(true);
-            net.minecraft.server.v1_16_R3.MerchantRecipe handle = (net.minecraft.server.v1_16_R3.MerchantRecipe) fHandle.get(merchantRecipe); // NMS Recipe
-            modifiersField.setInt(fHandle, fHandle.getModifiers() & ~Modifier.FINAL); // Remove final
+            net.minecraft.server.v1_16_R3.MerchantRecipe handle = (net.minecraft.server.v1_16_R3.MerchantRecipe) fHandle.get(merchantRecipe); // NMS RecipeR
 
             Field fSelling = net.minecraft.server.v1_16_R3.MerchantRecipe.class.getDeclaredField("sellingItem");
             fSelling.setAccessible(true);
-            modifiersField.setInt(fSelling, fSelling.getModifiers() & ~Modifier.FINAL);
 
             ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
             Display.displayAndFinalize(selling);

eco-core/core-plugin/build.gradle

@@ -9,11 +9,12 @@ dependencies {
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT'
     compileOnly 'com.github.TechFortress:GriefPrevention:16.14.0'
     compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
-    compileOnly 'com.github.cryptomorin:kingdoms:1.10.3.1'
+    compileOnly 'com.github.cryptomorin:kingdoms:1.10.14'
     compileOnly 'com.github.TownyAdvanced:Towny:0.96.2.0'
     compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
     compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
     compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
+    compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.157'
     compileOnly fileTree(dir: '../../lib', include: ['*.jar'])
 }
 

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java

@@ -1,22 +1,23 @@
 package com.willfp.eco.spigot;
 
-import com.comphenix.protocol.ProtocolLibrary;
 import com.willfp.eco.spigot.display.packets.PacketAutoRecipe;
 import com.willfp.eco.spigot.display.packets.PacketChat;
 import com.willfp.eco.spigot.display.packets.PacketOpenWindowMerchant;
 import com.willfp.eco.spigot.display.packets.PacketSetCreativeSlot;
 import com.willfp.eco.spigot.display.packets.PacketSetSlot;
 import com.willfp.eco.spigot.display.packets.PacketWindowItems;
-import com.willfp.eco.spigot.integrations.anticheat.plugins.AnticheatAAC;
-import com.willfp.eco.spigot.integrations.anticheat.plugins.AnticheatMatrix;
-import com.willfp.eco.spigot.integrations.anticheat.plugins.AnticheatNCP;
-import com.willfp.eco.spigot.integrations.antigrief.plugins.AntigriefFactionsUUID;
-import com.willfp.eco.spigot.integrations.antigrief.plugins.AntigriefGriefPrevention;
-import com.willfp.eco.spigot.integrations.antigrief.plugins.AntigriefKingdoms;
-import com.willfp.eco.spigot.integrations.antigrief.plugins.AntigriefLands;
-import com.willfp.eco.spigot.integrations.antigrief.plugins.AntigriefTowny;
-import com.willfp.eco.spigot.integrations.antigrief.plugins.AntigriefWorldGuard;
+import com.willfp.eco.spigot.integrations.anticheat.AnticheatAAC;
+import com.willfp.eco.spigot.integrations.anticheat.AnticheatMatrix;
+import com.willfp.eco.spigot.integrations.anticheat.AnticheatNCP;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefFactionsUUID;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefGriefPrevention;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefKingdoms;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefLands;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefTowny;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefWorldGuard;
+import com.willfp.eco.spigot.integrations.mcmmo.McmmoIntegrationImpl;
 import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.util.display.Display;
 import com.willfp.eco.util.drops.internal.FastCollatedDropQueue;
 import com.willfp.eco.util.events.armorequip.ArmorListener;
 import com.willfp.eco.util.events.armorequip.DispenserArmorListener;
@@ -25,9 +26,9 @@ import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainListeners;
 import com.willfp.eco.util.integrations.IntegrationLoader;
 import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.mcmmo.McmmoManager;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
-import com.willfp.eco.util.recipe.RecipeListener;
 import lombok.Getter;
 import org.bukkit.event.Listener;
 
@@ -48,6 +49,7 @@ public class EcoPlugin extends AbstractEcoPlugin {
     public EcoPlugin() {
         super("eco", 87955, 10043, "com.willfp.eco.proxy", "&a");
         instance = this;
+        Display.setFinalizeKey(this.getNamespacedKeyFactory().create("finalized"));
     }
 
     @Override
@@ -57,8 +59,6 @@ public class EcoPlugin extends AbstractEcoPlugin {
         this.getEventManager().registerListener(new ArmorListener());
         this.getEventManager().registerListener(new DispenserArmorListener());
         this.getEventManager().registerListener(new EntityDeathByEntityListeners(this));
-        this.getEventManager().registerListener(new RecipeListener(this));
-        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketPlayOutRecipeUpdateFix(this));
     }
 
     @Override
@@ -95,7 +95,10 @@ public class EcoPlugin extends AbstractEcoPlugin {
                 // Anticheat
                 new IntegrationLoader("AAC5", () -> AnticheatManager.register(this, new AnticheatAAC())),
                 new IntegrationLoader("Matrix", () -> AnticheatManager.register(this, new AnticheatMatrix())),
-                new IntegrationLoader("NoCheatPlus", () -> AnticheatManager.register(this, new AnticheatNCP()))
+                new IntegrationLoader("NoCheatPlus", () -> AnticheatManager.register(this, new AnticheatNCP())),
+
+                // Misc
+                new IntegrationLoader("mcMMO", () -> McmmoManager.register(new McmmoIntegrationImpl()))
         );
     }
 

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/PacketPlayOutRecipeUpdateFix.java

@@ -1,44 +0,0 @@
-package com.willfp.eco.spigot;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.willfp.eco.proxy.proxies.PacketPlayOutRecipeUpdateFixProxy;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-public class PacketPlayOutRecipeUpdateFix extends PacketAdapter {
-    /**
-     * Create new fixer for PacketPlayOutRecipeUpdate.
-     *
-     * @param plugin Plugin.
-     */
-    public PacketPlayOutRecipeUpdateFix(@NotNull final AbstractEcoPlugin plugin) {
-        super(plugin, PacketType.Play.Server.RECIPE_UPDATE);
-    }
-
-    @Override
-    public void onPacketSending(@NotNull final PacketEvent event) {
-        PacketContainer packet = event.getPacket();
-        Player player = event.getPlayer();
-
-        List<Object> packets = InternalProxyUtils.getProxy(PacketPlayOutRecipeUpdateFixProxy.class).splitPackets(packet.getHandle(), player);
-        if (packets.size() > 1) {
-            event.setCancelled(true);
-            for (Object o : packets) {
-                PacketContainer container = PacketContainer.fromPacket(o);
-                try {
-                    ProtocolLibrary.getProtocolManager().sendServerPacket(player, container);
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.anticheat.plugins;
+package com.willfp.eco.spigot.integrations.anticheat;
 
 import com.willfp.eco.util.integrations.anticheat.AnticheatWrapper;
 import me.konsolas.aac.api.AACAPI;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.anticheat.plugins;
+package com.willfp.eco.spigot.integrations.anticheat;
 
 import com.willfp.eco.util.integrations.anticheat.AnticheatWrapper;
 import me.rerere.matrix.api.events.PlayerViolationEvent;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.anticheat.plugins;
+package com.willfp.eco.spigot.integrations.anticheat;
 
 import com.willfp.eco.util.integrations.anticheat.AnticheatWrapper;
 import fr.neatmonster.nocheatplus.checks.CheckType;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.anticheat.plugins;
+package com.willfp.eco.spigot.integrations.anticheat;
 
 import com.willfp.eco.util.integrations.anticheat.AnticheatWrapper;
 import me.vagdedes.spartan.api.PlayerViolationEvent;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.antigrief.plugins;
+package com.willfp.eco.spigot.integrations.antigrief;
 
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.FLocation;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.antigrief.plugins;
+package com.willfp.eco.spigot.integrations.antigrief;
 
 import com.willfp.eco.util.integrations.antigrief.AntigriefWrapper;
 import me.ryanhamshire.GriefPrevention.Claim;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms.java

@@ -1,26 +1,43 @@
-package com.willfp.eco.spigot.integrations.antigrief.plugins;
+package com.willfp.eco.spigot.integrations.antigrief;
 
 import com.willfp.eco.util.integrations.antigrief.AntigriefWrapper;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.inventory.EquipmentSlot;
 import org.jetbrains.annotations.NotNull;
 import org.kingdoms.constants.kingdom.Kingdom;
+import org.kingdoms.constants.kingdom.model.KingdomRelation;
 import org.kingdoms.constants.land.Land;
+import org.kingdoms.constants.player.DefaultKingdomPermission;
+import org.kingdoms.constants.player.KingdomPlayer;
 import org.kingdoms.managers.PvPManager;
-import org.kingdoms.managers.land.LandManager;
 
 public class AntigriefKingdoms implements AntigriefWrapper {
     @Override
     public boolean canBreakBlock(@NotNull final Player player,
                                  @NotNull final Block block) {
-        BlockBreakEvent event = new BlockBreakEvent(block, player);
-        LandManager.onBreak(event);
-        return !event.isCancelled();
+        KingdomPlayer kp = KingdomPlayer.getKingdomPlayer(player);
+        if (kp.isAdmin()) {
+            return true;
+        }
+
+        Kingdom kingdom = kp.getKingdom();
+        if (kingdom == null) {
+            return false;
+        }
+
+        Land land = Land.getLand(block);
+
+        if (land == null) {
+            return true;
+        }
+
+        DefaultKingdomPermission permission = land.isNexusLand() ? DefaultKingdomPermission.NEXUS_BUILD : DefaultKingdomPermission.BUILD;
+        if (!kp.hasPermission(permission)) {
+            return false;
+        }
+        return kingdom.hasAttribute(land.getKingdom(), KingdomRelation.Attribute.BUILD);
     }
 
     @Override
@@ -41,10 +58,7 @@ public class AntigriefKingdoms implements AntigriefWrapper {
     @Override
     public boolean canPlaceBlock(@NotNull final Player player,
                                  @NotNull final Block block) {
-        Block placedOn = block.getRelative(0, -1, 0);
-        BlockPlaceEvent event = new BlockPlaceEvent(block, block.getState(), placedOn, player.getInventory().getItemInMainHand(), player, true, EquipmentSlot.HAND);
-        LandManager.onPlace(event);
-        return !event.isCancelled();
+        return canBreakBlock(player, block);
     }
 
     @Override

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.antigrief.plugins;
+package com.willfp.eco.spigot.integrations.antigrief;
 
 import com.willfp.eco.util.integrations.antigrief.AntigriefWrapper;
 import com.willfp.eco.util.internal.PluginDependent;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.antigrief.plugins;
+package com.willfp.eco.spigot.integrations.antigrief;
 
 import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownyPermission;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.spigot.integrations.antigrief.plugins;
+package com.willfp.eco.spigot.integrations.antigrief;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.LocalPlayer;

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl.java

@@ -0,0 +1,26 @@
+package com.willfp.eco.spigot.integrations.mcmmo;
+
+import com.gmail.nossr50.datatypes.meta.BonusDropMeta;
+import com.gmail.nossr50.events.fake.FakeEvent;
+import com.gmail.nossr50.mcMMO;
+import com.willfp.eco.util.integrations.mcmmo.McmmoWrapper;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+public class McmmoIntegrationImpl implements McmmoWrapper {
+    @Override
+    public int getBonusDropCount(@NotNull final Block block) {
+        if (block.getMetadata(mcMMO.BONUS_DROPS_METAKEY).size() > 0) {
+            BonusDropMeta bonusDropMeta = (BonusDropMeta) block.getMetadata(mcMMO.BONUS_DROPS_METAKEY).get(0);
+            return bonusDropMeta.asInt();
+        }
+
+        return 0;
+    }
+
+    @Override
+    public boolean isFake(@NotNull final Event event) {
+        return event instanceof FakeEvent;
+    }
+}

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -7,7 +7,7 @@ website: willfp.com
 loadbefore:
   - EcoEnchants
   - Talismans
-  - ItemStats
+  - StatTrackers
   - EcoArmor
   - Illusioner
 depend:
@@ -23,4 +23,5 @@ softdepend:
   - AAC
   - Matrix
   - Spartan
-  - PlaceholderAPI
+  - PlaceholderAPI
+  - mcMMO

eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/proxies/PacketPlayOutRecipeUpdateFixProxy.java

@@ -1,20 +0,0 @@
-package com.willfp.eco.proxy.proxies;
-
-
-import com.willfp.eco.util.proxy.AbstractProxy;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public interface PacketPlayOutRecipeUpdateFixProxy extends AbstractProxy {
-    /**
-     * Split recipe update packet into smaller packets.
-     *
-     * @param object The packet.
-     * @param player The player.
-     * @return The packets, split up.
-     */
-    List<Object> splitPackets(@NotNull Object object,
-                              @NotNull Player player);
-}

eco-util/src/main/java/com/willfp/eco/util/DurabilityUtils.java

@@ -2,6 +2,7 @@ package com.willfp.eco.util;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.SoundCategory;
 import org.bukkit.entity.Player;
@@ -37,25 +38,32 @@ public class DurabilityUtils {
             return;
         }
 
+        if (!(item.getItemMeta() instanceof Damageable)) {
+            return;
+        }
+
+        // Special edge case
+        if (item.getType() == Material.CARVED_PUMPKIN || item.getType() == Material.PLAYER_HEAD) {
+            return;
+        }
+
         PlayerItemDamageEvent event3 = new PlayerItemDamageEvent(player, item, damage);
         Bukkit.getPluginManager().callEvent(event3);
 
         if (!event3.isCancelled()) {
             int damage2 = event3.getDamage();
-            if (item.getItemMeta() instanceof Damageable) {
-                Damageable meta = (Damageable) item.getItemMeta();
-                meta.setDamage(meta.getDamage() + damage2);
+            Damageable meta = (Damageable) item.getItemMeta();
+            meta.setDamage(meta.getDamage() + damage2);
 
-                if (meta.getDamage() >= item.getType().getMaxDurability()) {
-                    meta.setDamage(item.getType().getMaxDurability());
-                    item.setItemMeta((ItemMeta) meta);
-                    PlayerItemBreakEvent event = new PlayerItemBreakEvent(player, item);
-                    Bukkit.getPluginManager().callEvent(event);
-                    player.getInventory().clear(slot);
-                    player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, SoundCategory.BLOCKS, 1, 1);
-                } else {
-                    item.setItemMeta((ItemMeta) meta);
-                }
+            if (meta.getDamage() >= item.getType().getMaxDurability()) {
+                meta.setDamage(item.getType().getMaxDurability());
+                item.setItemMeta((ItemMeta) meta);
+                PlayerItemBreakEvent event = new PlayerItemBreakEvent(player, item);
+                Bukkit.getPluginManager().callEvent(event);
+                player.getInventory().clear(slot);
+                player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, SoundCategory.BLOCKS, 1, 1);
+            } else {
+                item.setItemMeta((ItemMeta) meta);
             }
         }
     }
@@ -78,20 +86,22 @@ public class DurabilityUtils {
             return;
         }
 
+        if (!(item.getItemMeta() instanceof Damageable)) {
+            return;
+        }
+
         PlayerItemDamageEvent event3 = new PlayerItemDamageEvent(player, item, damage);
         Bukkit.getPluginManager().callEvent(event3);
 
         if (!event3.isCancelled()) {
             int damage2 = event3.getDamage();
-            if (item.getItemMeta() instanceof Damageable) {
-                Damageable meta = (Damageable) item.getItemMeta();
-                meta.setDamage(meta.getDamage() + damage2);
+            Damageable meta = (Damageable) item.getItemMeta();
+            meta.setDamage(meta.getDamage() + damage2);
 
-                if (meta.getDamage() >= item.getType().getMaxDurability()) {
-                    meta.setDamage(item.getType().getMaxDurability() - 1);
-                }
-                item.setItemMeta((ItemMeta) meta);
+            if (meta.getDamage() >= item.getType().getMaxDurability()) {
+                meta.setDamage(item.getType().getMaxDurability() - 1);
             }
+            item.setItemMeta((ItemMeta) meta);
         }
     }
 

eco-util/src/main/java/com/willfp/eco/util/bukkit/events/EcoEventManager.java

@@ -11,8 +11,6 @@ import org.jetbrains.annotations.NotNull;
 public class EcoEventManager extends PluginDependent implements EventManager {
     /**
      * Manager class for event management.
-     * <p>
-     * Prevents calls to {@link AbstractEcoPlugin#getInstance()}.
      *
      * @param plugin The {@link AbstractEcoPlugin} that this manages the events of.
      */

eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java

@@ -1,76 +1,51 @@
 package com.willfp.eco.util.config;
 
-import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.internal.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
-import lombok.AccessLevel;
-import lombok.Getter;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
-
-public abstract class BaseConfig extends PluginDependent implements ValueGetter {
-    /**
-     * The linked {@link YamlConfiguration} where values are physically stored.
-     */
-    @Getter(AccessLevel.PUBLIC)
-    private final YamlConfiguration config;
-
-    /**
-     * The physical config file, as stored on disk.
-     */
-    @Getter(AccessLevel.PROTECTED)
-    private final File configFile;
-
-    /**
-     * The full name of the config file (eg config.yml).
-     */
-    private final String name;
 
+public abstract class BaseConfig extends StaticBaseConfig {
     /**
      * Whether keys not in the base config should be removed on update.
      */
     private final boolean removeUnused;
 
+    /**
+     * List of blacklisted update keys.
+     */
+    private final List<String> updateBlacklist;
+
     /**
      * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
      * <p>
      * Automatically updates.
      *
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
+     * @param configName      The name of the config
+     * @param removeUnused    Whether keys not present in the default config should be removed on update.
+     * @param plugin          The plugin.
+     * @param updateBlacklist Substring of keys to not add/remove keys for.
      */
     protected BaseConfig(@NotNull final String configName,
                          final boolean removeUnused,
-                         @NotNull final AbstractEcoPlugin plugin) {
-        super(plugin);
-        this.name = configName + ".yml";
+                         @NotNull final AbstractEcoPlugin plugin,
+                         @Nullable final String... updateBlacklist) {
+        super(configName, plugin);
         this.removeUnused = removeUnused;
-
-        if (!new File(this.getPlugin().getDataFolder(), this.name).exists()) {
-            createFile();
-        }
-
-        this.configFile = new File(this.getPlugin().getDataFolder(), this.name);
-        this.config = YamlConfiguration.loadConfiguration(configFile);
+        this.updateBlacklist = Arrays.asList(updateBlacklist);
 
         update();
     }
 
-    private void createFile() {
-        this.getPlugin().saveResource(name, false);
-    }
-
     /**
      * Update the config.
      * <p>
@@ -78,11 +53,11 @@ public abstract class BaseConfig extends PluginDependent implements ValueGetter
      */
     public void update() {
         try {
-            config.load(configFile);
+            config.load(this.getConfigFile());
 
-            InputStream newIn = this.getPlugin().getResource(name);
+            InputStream newIn = this.getPlugin().getResource(this.getName());
             if (newIn == null) {
-                this.getPlugin().getLog().error(name + " is null?");
+                this.getPlugin().getLog().error(this.getName() + " is null?");
                 return;
             }
             BufferedReader reader = new BufferedReader(new InputStreamReader(newIn, StandardCharsets.UTF_8));
@@ -95,127 +70,25 @@ public abstract class BaseConfig extends PluginDependent implements ValueGetter
 
             newConfig.getKeys(true).forEach((s -> {
                 if (!config.getKeys(true).contains(s)) {
-                    config.set(s, newConfig.get(s));
+                    if (updateBlacklist.stream().noneMatch(s::contains)) {
+                        config.set(s, newConfig.get(s));
+                    }
                 }
             }));
 
             if (this.removeUnused) {
                 config.getKeys(true).forEach((s -> {
                     if (!newConfig.getKeys(true).contains(s)) {
-                        config.set(s, null);
+                        if (updateBlacklist.stream().noneMatch(s::contains)) {
+                            config.set(s, null);
+                        }
                     }
                 }));
             }
 
-            config.save(configFile);
+            config.save(this.getConfigFile());
         } catch (IOException | InvalidConfigurationException e) {
             e.printStackTrace();
         }
     }
-
-    /**
-     * Get an integer from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or 0 if not found.
-     */
-    @Override
-    public int getInt(@NotNull final String path) {
-        return config.getInt(path, 0);
-    }
-
-    /**
-     * Get an integer from config with a specified default (not found) value.
-     *
-     * @param path The key to fetch the value from.
-     * @param def  The value to default to if not found.
-     * @return The found value, or the default.
-     */
-    @Override
-    public int getInt(@NotNull final String path,
-                      final int def) {
-        return config.getInt(path, def);
-    }
-
-    /**
-     * Get a list of integers from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @Override
-    @NotNull
-    public List<Integer> getInts(@NotNull final String path) {
-        return config.getIntegerList(path);
-    }
-
-    /**
-     * Get a boolean from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or false if not found.
-     */
-    @Override
-    public boolean getBool(@NotNull final String path) {
-        return config.getBoolean(path, false);
-    }
-
-    /**
-     * Get a list of booleans from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @Override
-    @NotNull
-    public List<Boolean> getBools(@NotNull final String path) {
-        return config.getBooleanList(path);
-    }
-
-    /**
-     * Get a string from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or an empty string if not found.
-     */
-    @Override
-    @NotNull
-    public String getString(@NotNull final String path) {
-        return StringUtils.translate(Objects.requireNonNull(config.getString(path, "")));
-    }
-
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @Override
-    @NotNull
-    public List<String> getStrings(@NotNull final String path) {
-        return config.getStringList(path);
-    }
-
-    /**
-     * Get a decimal from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or 0 if not found.
-     */
-    @Override
-    public double getDouble(@NotNull final String path) {
-        return config.getDouble(path, 0);
-    }
-
-    /**
-     * Get a list of decimals from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @Override
-    @NotNull
-    public List<Double> getDoubles(@NotNull final String path) {
-        return config.getDoubleList(path);
-    }
 }

eco-util/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java

@@ -5,19 +5,21 @@ import com.willfp.eco.util.internal.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import lombok.AccessLevel;
 import lombok.Getter;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.util.List;
 import java.util.Objects;
 
-public abstract class StaticBaseConfig extends PluginDependent implements ValueGetter {
+public abstract class StaticBaseConfig extends PluginDependent {
     /**
      * The linked {@link YamlConfiguration} where values are physically stored.
      */
     @Getter(AccessLevel.PUBLIC)
-    private final YamlConfiguration config;
+    protected final YamlConfiguration config;
 
     /**
      * The physical config file, as stored on disk.
@@ -28,6 +30,7 @@ public abstract class StaticBaseConfig extends PluginDependent implements ValueG
     /**
      * The full name of the config file (eg config.yml).
      */
+    @Getter(AccessLevel.PROTECTED)
     private final String name;
 
     /**
@@ -35,8 +38,8 @@ public abstract class StaticBaseConfig extends PluginDependent implements ValueG
      * <p>
      * Does not automatically update.
      *
-     * @param configName   The name of the config
-     * @param plugin       The plugin.
+     * @param configName The name of the config
+     * @param plugin     The plugin.
      */
     protected StaticBaseConfig(@NotNull final String configName,
                                @NotNull final AbstractEcoPlugin plugin) {
@@ -55,17 +58,68 @@ public abstract class StaticBaseConfig extends PluginDependent implements ValueG
         this.getPlugin().saveResource(name, false);
     }
 
+    /**
+     * Get if the config contains a key.
+     *
+     * @param path The key to check.
+     * @return If contained.
+     */
+    public boolean has(@NotNull final String path) {
+        return config.contains(path);
+    }
+
+    /**
+     * Get configuration section from config.
+     *
+     * @param path The key to check.
+     * @return The configuration section. Throws NPE if not found.
+     */
+    @NotNull
+    public ConfigurationSection getSection(@NotNull final String path) {
+        ConfigurationSection section = getSectionOrNull(path);
+        if (section == null) {
+            throw new NullPointerException("Section cannot be null!");
+        } else {
+            return section;
+        }
+    }
+
+    /**
+     * Get configuration section from config.
+     *
+     * @param path The key to check.
+     * @return The configuration section, or null if not found.
+     */
+    @Nullable
+    public ConfigurationSection getSectionOrNull(@NotNull final String path) {
+        return config.getConfigurationSection(path);
+    }
+
     /**
      * Get an integer from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or 0 if not found.
      */
-    @Override
     public int getInt(@NotNull final String path) {
         return config.getInt(path, 0);
     }
 
+    /**
+     * Get an integer from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public Integer getIntOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getInt(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get an integer from config with a specified default (not found) value.
      *
@@ -73,7 +127,6 @@ public abstract class StaticBaseConfig extends PluginDependent implements ValueG
      * @param def  The value to default to if not found.
      * @return The found value, or the default.
      */
-    @Override
     public int getInt(@NotNull final String path,
                       final int def) {
         return config.getInt(path, def);
@@ -85,79 +138,177 @@ public abstract class StaticBaseConfig extends PluginDependent implements ValueG
      * @param path The key to fetch the value from.
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
-    @Override
     @NotNull
     public List<Integer> getInts(@NotNull final String path) {
         return config.getIntegerList(path);
     }
 
+    /**
+     * Get a list of integers from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public List<Integer> getIntsOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getInts(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get a boolean from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or false if not found.
      */
-    @Override
     public boolean getBool(@NotNull final String path) {
         return config.getBoolean(path, false);
     }
 
+    /**
+     * Get a boolean from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public Boolean getBoolOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getBool(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get a list of booleans from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
-    @Override
     @NotNull
     public List<Boolean> getBools(@NotNull final String path) {
         return config.getBooleanList(path);
     }
 
+    /**
+     * Get a list of booleans from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public List<Boolean> getBoolsOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getBools(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get a string from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or an empty string if not found.
      */
-    @Override
     @NotNull
     public String getString(@NotNull final String path) {
         return StringUtils.translate(Objects.requireNonNull(config.getString(path, "")));
     }
 
+    /**
+     * Get a string from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public String getStringOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getString(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get a list of strings from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
-    @Override
     @NotNull
     public List<String> getStrings(@NotNull final String path) {
         return config.getStringList(path);
     }
 
+    /**
+     * Get a list of strings from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public List<String> getStringsOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getStrings(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get a decimal from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or 0 if not found.
      */
-    @Override
     public double getDouble(@NotNull final String path) {
         return config.getDouble(path, 0);
     }
 
+    /**
+     * Get a decimal from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public Double getDoubleOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getDouble(path);
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Get a list of decimals from config.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
-    @Override
     @NotNull
     public List<Double> getDoubles(@NotNull final String path) {
         return config.getDoubleList(path);
     }
+
+    /**
+     * Get a list of decimals from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    public List<Double> getDoublesOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getDoubles(path);
+        } else {
+            return null;
+        }
+    }
 }

eco-util/src/main/java/com/willfp/eco/util/config/ValueGetter.java

@@ -1,87 +0,0 @@
-package com.willfp.eco.util.config;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-@SuppressWarnings("unused")
-public interface ValueGetter {
-    /**
-     * Get an integer from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or 0 if not found.
-     */
-    int getInt(@NotNull String path);
-
-    /**
-     * Get an integer from config with a specified default (not found) value.
-     *
-     * @param path The key to fetch the value from.
-     * @param def  The value to default to if not found.
-     * @return The found value, or the default.
-     */
-    int getInt(@NotNull String path,
-               int def);
-
-    /**
-     * Get a list of integers from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @NotNull
-    List<Integer> getInts(@NotNull String path);
-
-    /**
-     * Get a boolean from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or false if not found.
-     */
-    boolean getBool(@NotNull String path);
-
-    /**
-     * Get a list of booleans from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @NotNull
-    List<Boolean> getBools(@NotNull String path);
-
-    /**
-     * Get a string from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or an empty string if not found.
-     */
-    @NotNull
-    String getString(@NotNull String path);
-
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @NotNull
-    List<String> getStrings(@NotNull String path);
-
-    /**
-     * Get a decimal from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or 0 if not found.
-     */
-    double getDouble(@NotNull String path);
-
-    /**
-     * Get a list of decimals from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @NotNull
-    List<Double> getDoubles(@NotNull String path);
-}

eco-util/src/main/java/com/willfp/eco/util/display/Display.java

@@ -1,7 +1,13 @@
 package com.willfp.eco.util.display;
 
 import lombok.experimental.UtilityClass;
+import org.apache.commons.lang.Validate;
+import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -24,15 +30,9 @@ public class Display {
     private static final List<Function<ItemStack, ItemStack>> REVERT_FUNCTIONS = new ArrayList<>();
 
     /**
-     * Registered finalize functions.
+     * NamespacedKey for finalizing.
      */
-    public static final List<Function<ItemStack, ItemStack>> FINALIZE_FUNCTIONS = new ArrayList<>();
-
-
-    /**
-     * Registered finalize test functions.
-     */
-    public static final List<Predicate<ItemStack>> FINALIZE_TEST_FUNCTIONS = new ArrayList<>();
+    private static NamespacedKey finalizeKey;
 
     /**
      * Register display module.
@@ -66,30 +66,20 @@ public class Display {
         REVERT_FUNCTIONS.add(function);
     }
 
-    /**
-     * Register finalize function.
-     *
-     * @param function The function.
-     */
-    public void registerFinalizeModule(@NotNull final Function<ItemStack, ItemStack> function) {
-        FINALIZE_FUNCTIONS.add(function);
-    }
-
-    /**
-     * Register finalize test function.
-     *
-     * @param function The function.
-     */
-    public void registerFinalizeTestModule(@NotNull final Predicate<ItemStack> function) {
-        FINALIZE_TEST_FUNCTIONS.add(function);
-    }
-
     /**
      * Display on ItemStacks.
      *
      * @param itemStack The item.
+     * @return The itemstack.
      */
     public ItemStack display(@NotNull final ItemStack itemStack) {
+        if (isFinalized(itemStack)) {
+            unfinalize(itemStack);
+            return itemStack;
+        }
+
+        revert(itemStack);
+
         for (Map<String, Function<ItemStack, ItemStack>> displayFunctions : DISPLAY_FUNCTIONS) {
             if (displayFunctions == null) {
                 continue;
@@ -107,6 +97,7 @@ public class Display {
      * Display on ItemStacks and then finalize.
      *
      * @param itemStack The item.
+     * @return The itemstack.
      */
     public ItemStack displayAndFinalize(@NotNull final ItemStack itemStack) {
         return finalize(display(itemStack));
@@ -116,11 +107,18 @@ public class Display {
      * Revert on ItemStacks.
      *
      * @param itemStack The item.
+     * @return The itemstack.
      */
     public ItemStack revert(@NotNull final ItemStack itemStack) {
+        if (isFinalized(itemStack)) {
+            unfinalize(itemStack);
+            return itemStack;
+        }
+
         for (Function<ItemStack, ItemStack> displayFunction : REVERT_FUNCTIONS) {
             displayFunction.apply(itemStack);
         }
+
         return itemStack;
     }
 
@@ -128,27 +126,88 @@ public class Display {
      * Finalize an ItemStacks.
      *
      * @param itemStack The item.
+     * @return The itemstack.
      */
     public ItemStack finalize(@NotNull final ItemStack itemStack) {
-        for (Function<ItemStack, ItemStack> function : FINALIZE_FUNCTIONS) {
-            function.apply(itemStack);
+        Validate.notNull(finalizeKey, "Key cannot be null!");
+        if (itemStack.getType().getMaxStackSize() > 1) {
+            return itemStack;
         }
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return itemStack;
+        }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.set(finalizeKey, PersistentDataType.INTEGER, 1);
+        itemStack.setItemMeta(meta);
         return itemStack;
     }
 
     /**
-     * Finalize an ItemStacks.
+     * Unfinalize an ItemStacks.
      *
      * @param itemStack The item.
+     * @return The itemstack.
+     */
+    public ItemStack unfinalize(@NotNull final ItemStack itemStack) {
+        Validate.notNull(finalizeKey, "Key cannot be null!");
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return itemStack;
+        }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.remove(finalizeKey);
+        itemStack.setItemMeta(meta);
+        return itemStack;
+    }
+
+    /**
+     * If an item is finalized.
+     *
+     * @param itemStack The item.
+     * @return If finalized.
      */
     public boolean isFinalized(@NotNull final ItemStack itemStack) {
-        for (Predicate<ItemStack> function : FINALIZE_TEST_FUNCTIONS) {
-            if (function.test(itemStack)) {
-                return true;
-            }
+        Validate.notNull(finalizeKey, "Key cannot be null!");
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return false;
         }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        return container.has(finalizeKey, PersistentDataType.INTEGER);
+    }
 
-        return false;
+
+    /**
+     * Register finalize function.
+     *
+     * @param function The function.
+     * @deprecated Not needed.
+     */
+    @Deprecated
+    public void registerFinalizeModule(@NotNull final Function<ItemStack, ItemStack> function) {
+        // This function is not needed.
+    }
+
+    /**
+     * Register finalize test function.
+     *
+     * @param function The function.
+     * @deprecated Not needed.
+     */
+    @Deprecated
+    public void registerFinalizeTestModule(@NotNull final Predicate<ItemStack> function) {
+        // This isn't needed.
+    }
+
+    /**
+     * Set key to be used for finalization.
+     *
+     * @param finalizeKey The key.
+     */
+    @ApiStatus.Internal
+    public static void setFinalizeKey(@NotNull final NamespacedKey finalizeKey) {
+        Display.finalizeKey = finalizeKey;
     }
 
     static {

eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java

@@ -2,14 +2,24 @@ package com.willfp.eco.util.drops.internal;
 
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
 
 @UtilityClass
 public final class DropManager {
     /**
      * The currently used type, or implementation, of {@link AbstractDropQueue}.
      * <p>
-     * Standard by default, used if drops.collate key is not present in config.
+     * Default is {@link DropQueueType#COLLATED}, however this can be changed.
      */
     @Getter
     private DropQueueType type = DropQueueType.COLLATED;
+
+    /**
+     * Sets the type of Drop Queue to be used.
+     *
+     * @param type The type.
+     */
+    public static void setType(@NotNull final DropQueueType type) {
+        DropManager.type = type;
+    }
 }

eco-util/src/main/java/com/willfp/eco/util/drops/internal/InternalDropQueue.java

@@ -5,6 +5,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ExperienceOrb;
@@ -133,6 +134,11 @@ public class InternalDropQueue implements AbstractDropQueue {
         assert world != null;
         loc = loc.add(0.5, 0.5, 0.5);
 
+        items.removeIf(itemStack -> itemStack.getType() == Material.AIR);
+        if (items.isEmpty()) {
+            return;
+        }
+
         if (hasTelekinesis) {
             HashMap<Integer, ItemStack> leftover = player.getInventory().addItem(items.toArray(new ItemStack[0]));
             for (ItemStack drop : leftover.values()) {

eco-util/src/main/java/com/willfp/eco/util/integrations/mcmmo/McmmoManager.java

@@ -0,0 +1,52 @@
+package com.willfp.eco.util.integrations.mcmmo;
+
+import lombok.experimental.UtilityClass;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@UtilityClass
+public class McmmoManager {
+    /**
+     * A set of all registered integrations.
+     */
+    private final Set<McmmoWrapper> regsistered = new HashSet<>();
+
+    /**
+     * Register a new integration.
+     *
+     * @param integration The integration to register.
+     */
+    public void register(@NotNull final McmmoWrapper integration) {
+        regsistered.add(integration);
+    }
+
+    /**
+     * Get bonus drop count from block.
+     *
+     * @param block The block.
+     * @return The bonus drop count.
+     */
+    public int getBonusDropCount(@NotNull final Block block) {
+        for (McmmoWrapper mcmmoWrapper : regsistered) {
+            return mcmmoWrapper.getBonusDropCount(block);
+        }
+        return 0;
+    }
+
+    /**
+     * Get if event is fake.
+     *
+     * @param event The event to check.
+     * @return If the event is fake.
+     */
+    public boolean isFake(@NotNull final Event event) {
+        for (McmmoWrapper mcmmoWrapper : regsistered) {
+            return mcmmoWrapper.isFake(event);
+        }
+        return false;
+    }
+}

eco-util/src/main/java/com/willfp/eco/util/integrations/mcmmo/McmmoWrapper.java

@@ -0,0 +1,23 @@
+package com.willfp.eco.util.integrations.mcmmo;
+
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+public interface McmmoWrapper {
+    /**
+     * Get bonus drop count of block.
+     *
+     * @param block The block.
+     * @return The drop multiplier.
+     */
+    int getBonusDropCount(@NotNull Block block);
+
+    /**
+     * Get if event is fake.
+     *
+     * @param event The event.
+     * @return If is fake.
+     */
+    boolean isFake(@NotNull Event event);
+}

eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java

@@ -250,14 +250,11 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
 
         Prerequisite.update();
 
-
-        if (ClassUtils.exists("com.comphenix.protocol.events.PacketAdapter")) {
-            this.getPacketAdapters().forEach(abstractPacketAdapter -> {
-                if (!abstractPacketAdapter.isPostLoad()) {
-                    abstractPacketAdapter.register();
-                }
-            });
-        }
+        this.getPacketAdapters().forEach(abstractPacketAdapter -> {
+            if (!abstractPacketAdapter.isPostLoad()) {
+                abstractPacketAdapter.register();
+            }
+        });
 
         updatableClasses.addAll(this.getUpdatableClasses());
 

eco-util/src/main/java/com/willfp/eco/util/recipe/RecipeManager.java

@@ -52,8 +52,8 @@ public class RecipeManager extends PluginDependent {
             displayedRecipe.setIngredient(character, new RecipeChoice.ExactChoice(recipe.getDisplayedAtIndex(i)));
         }
 
-        Bukkit.getServer().addRecipe(displayedRecipe);
         Bukkit.getServer().addRecipe(shapedRecipe);
+        Bukkit.getServer().addRecipe(displayedRecipe);
     }
 
     /**

gradle.properties

@@ -1,2 +1,2 @@
-version = 3.2.0
+version = 3.5.0
 plugin-name = eco