Reworked proxy package

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import net.minecraft.server.v1_15_R1.BlockPosition;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
 import org.jetbrains.annotations.NotNull;
 
 public final class ChatComponent implements ChatComponentProxy {

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import net.minecraft.server.v1_15_R1.EntityHuman;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
+import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
 import net.minecraft.server.v1_15_R1.NBTBase;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
 import net.minecraft.server.v1_15_R1.NBTTagList;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
+import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
+import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import net.minecraft.server.v1_15_R1.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_15_R1;
+package com.willfp.ecoenchants.proxy.v1_15_R1;
 
-import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
+import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftMerchantRecipe;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import net.minecraft.server.v1_16_R1.BlockPosition;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;

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

@@ -1,10 +1,10 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import net.minecraft.server.v1_16_R1.ChatBaseComponent;
 import net.minecraft.server.v1_16_R1.ChatHoverable;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
+import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
 import net.minecraft.server.v1_16_R1.NBTBase;
 import net.minecraft.server.v1_16_R1.NBTTagCompound;
 import net.minecraft.server.v1_16_R1.NBTTagList;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
+import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
 import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
+import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import net.minecraft.server.v1_16_R1.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R1;
+package com.willfp.ecoenchants.proxy.v1_16_R1;
 
-import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
+import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftMerchantRecipe;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import net.minecraft.server.v1_16_R2.BlockPosition;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;

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

@@ -1,10 +1,10 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import net.minecraft.server.v1_16_R2.ChatBaseComponent;
 import net.minecraft.server.v1_16_R2.ChatHoverable;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
+import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
 import net.minecraft.server.v1_16_R2.NBTBase;
 import net.minecraft.server.v1_16_R2.NBTTagCompound;
 import net.minecraft.server.v1_16_R2.NBTTagList;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
+import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
 import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
+import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import net.minecraft.server.v1_16_R2.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R2;
+package com.willfp.ecoenchants.proxy.v1_16_R2;
 
-import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
+import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftMerchantRecipe;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import net.minecraft.server.v1_16_R3.BlockPosition;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;

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

@@ -1,10 +1,10 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import net.minecraft.server.v1_16_R3.ChatBaseComponent;
 import net.minecraft.server.v1_16_R3.ChatHoverable;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
+import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
 import net.minecraft.server.v1_16_R3.NBTBase;
 import net.minecraft.server.v1_16_R3.NBTTagCompound;
 import net.minecraft.server.v1_16_R3.NBTTagList;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
+import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
+import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import net.minecraft.server.v1_16_R3.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.v1_16_R3;
+package com.willfp.ecoenchants.proxy.v1_16_R3;
 
-import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
+import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants;
 
-import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
+import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.command.AbstractCommand;
 import com.willfp.eco.util.drops.telekinesis.TelekinesisUtils;
@@ -52,7 +52,7 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin {
      * Internal constructor called by bukkit on plugin load.
      */
     public EcoEnchantsPlugin() {
-        super("EcoEnchants", 79573, 7666);
+        super("EcoEnchants", 79573, 7666, "com.willfp.ecoenchants.proxy");
     }
 
     /**

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java

@@ -2,7 +2,7 @@ package com.willfp.ecoenchants.command.commands;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.ListenerPriority;
-import com.willfp.eco.core.proxy.ProxyConstants;
+import com.willfp.eco.util.proxy.ProxyConstants;
 import com.willfp.eco.util.command.AbstractCommand;
 import com.willfp.eco.util.drops.internal.DropManager;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java

@@ -4,7 +4,7 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import com.willfp.eco.core.proxy.proxies.ChatComponentProxy;
+import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java

@@ -2,7 +2,7 @@ package com.willfp.ecoenchants.display.packets;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
-import com.willfp.eco.core.proxy.proxies.VillagerTradeProxy;
+import com.willfp.ecoenchants.proxy.proxies.VillagerTradeProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.eco.util.protocollib.AbstractPacketAdapter;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.DurabilityUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.VectorUtils;
 import com.willfp.eco.util.integrations.anticheat.AnticheatManager;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.VectorUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import com.willfp.eco.util.BlockUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.integrations.anticheat.AnticheatManager;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.drops.DropQueue;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.config.Configs;
 import com.willfp.eco.util.drops.DropQueue;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.LightningUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import com.willfp.eco.util.BlockUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.integrations.anticheat.AnticheatManager;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.special;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.LightningUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.special;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.special;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.special;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.special;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.spell;
 
-import com.willfp.eco.core.proxy.proxies.BlockBreakProxy;
+import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.itemtypes;
 
 import com.google.common.util.concurrent.AtomicDouble;
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.optional.Prerequisite;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.support.merging.anvil;
 
-import com.willfp.eco.core.proxy.ProxyConstants;
+import com.willfp.eco.util.proxy.ProxyConstants;
-import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy;
+import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
-import com.willfp.eco.core.proxy.proxies.RepairCostProxy;
+import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.config.Configs;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.util;
 
 
-import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy;
+import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
 import com.willfp.eco.util.DurabilityUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.util;
 
 import com.google.common.collect.Sets;
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.events.armorequip.ArmorEquipEvent;
 import com.willfp.eco.util.internal.PluginDependent;

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

@@ -1,7 +1,7 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,7 +1,7 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.jetbrains.annotations.NotNull;
 
 public interface ChatComponentProxy extends AbstractProxy {

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

@@ -1,7 +1,7 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,7 +1,7 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.entity.Trident;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,6 +1,6 @@
-package com.willfp.eco.core.proxy.proxies;
+package com.willfp.ecoenchants.proxy.proxies;
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.AbstractProxy;
 import org.bukkit.inventory.MerchantRecipe;
 
 public interface VillagerTradeProxy extends AbstractProxy {

eco-extensions/mmo/build.gradle

@@ -1,5 +1,5 @@
 group 'com.willfp'
-version '3.0.0'
+version '3.0.1'
 description = 'MMO Extension'
 
 repositories {

eco-extensions/precision/build.gradle

@@ -1,5 +1,5 @@
 group 'com.willfp'
-version '3.0.0'
+version '3.0.1'
 description = 'Precision Extension'
 
 jar {

eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.precision;
 
 
-import com.willfp.eco.core.proxy.proxies.TridentStackProxy;
+import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;

eco-extensions/summoning/build.gradle

@@ -1,5 +1,5 @@
 group 'com.willfp'
-version '3.0.0'
+version '3.0.1'
 description = 'Summoning Extension'
 
 jar {

eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.summoning;
 
-import com.willfp.eco.core.proxy.proxies.CooldownProxy;
+import com.willfp.ecoenchants.proxy.proxies.CooldownProxy;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.eco.util.optional.Prerequisite;

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

@@ -1,7 +1,8 @@
 package com.willfp.eco.util;
 
-import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.util.plugin.AbstractEcoPlugin;
-import com.willfp.eco.core.proxy.ProxyFactory;
+import com.willfp.eco.util.proxy.AbstractProxy;
+import com.willfp.eco.util.proxy.ProxyFactory;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
@@ -9,11 +10,12 @@ import org.jetbrains.annotations.NotNull;
 public class ProxyUtils {
     /**
      * Get the implementation of a specified proxy.
+     *
      * @param proxyClass The proxy interface.
      * @param <T>        The type of the proxy.
      * @return The proxy implementation.
      */
     public @NotNull <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
-        return new ProxyFactory<>(proxyClass).getProxy();
+        return new ProxyFactory<>(AbstractEcoPlugin.getInstance(), proxyClass).getProxy();
     }
 }

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

@@ -11,8 +11,8 @@ import com.willfp.eco.util.bukkit.scheduling.EcoScheduler;
 import com.willfp.eco.util.bukkit.scheduling.RunnableFactory;
 import com.willfp.eco.util.bukkit.scheduling.Scheduler;
 import com.willfp.eco.util.command.AbstractCommand;
-import com.willfp.eco.util.config.updating.ConfigHandler;
 import com.willfp.eco.util.config.Configs;
+import com.willfp.eco.util.config.updating.ConfigHandler;
 import com.willfp.eco.util.drops.internal.DropManager;
 import com.willfp.eco.util.drops.internal.FastCollatedDropQueue;
 import com.willfp.eco.util.events.armorequip.ArmorListener;
@@ -79,6 +79,12 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
     @Getter
     private final int bStatsId;
 
+    /**
+     * The package where proxy implementations are.
+     */
+    @Getter
+    private final String proxyPackage;
+
     /**
      * Set of external plugin integrations.
      */
@@ -151,13 +157,16 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
      * @param pluginName   The name of the plugin.
      * @param resourceId   The spigot resource ID for the plugin.
      * @param bStatsId     The bStats resource ID for the plugin.
+     * @param proxyPackage The package where proxy implementations are stored.
      */
     protected AbstractEcoPlugin(@NotNull final String pluginName,
                                 final int resourceId,
-                                final int bStatsId) {
+                                final int bStatsId,
+                                @NotNull final String proxyPackage) {
         this.pluginName = pluginName;
         this.resourceId = resourceId;
         this.bStatsId = bStatsId;
+        this.proxyPackage = proxyPackage;
 
         this.log = new EcoLogger(this);
         this.scheduler = new EcoScheduler(this);

eco-util/src/main/java/com/willfp/eco/util/proxy/AbstractProxy.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.core.proxy;
+package com.willfp.eco.util.proxy;
 
 public interface AbstractProxy {
 

eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyConstants.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.core.proxy;
+package com.willfp.eco.util.proxy;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;

eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyFactory.java

@@ -1,11 +1,13 @@
-package com.willfp.eco.core.proxy;
+package com.willfp.eco.util.proxy;
 
+import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-public class ProxyFactory<T extends AbstractProxy> {
+public class ProxyFactory<T extends AbstractProxy> extends PluginDependent {
     /**
      * Cached proxy implementations in order to not perform expensive reflective class-finding.
      */
@@ -19,9 +21,12 @@ public class ProxyFactory<T extends AbstractProxy> {
     /**
      * Create a new Proxy Factory for a specific type.
      *
+     * @param plugin     The plugin to create proxies for.
      * @param proxyClass The class of the proxy interface.
      */
-    public ProxyFactory(@NotNull final Class<T> proxyClass) {
+    public ProxyFactory(@NotNull final AbstractEcoPlugin plugin,
+                        @NotNull final Class<T> proxyClass) {
+        super(plugin);
         this.proxyClass = proxyClass;
     }
 
@@ -37,7 +42,7 @@ public class ProxyFactory<T extends AbstractProxy> {
                 return cachedProxy;
             }
 
-            String className = "com.willfp.eco.core.proxy." + ProxyConstants.NMS_VERSION + "." + proxyClass.getSimpleName().replace("Proxy", "");
+            String className = this.getPlugin().getProxyPackage() + "." + ProxyConstants.NMS_VERSION + "." + proxyClass.getSimpleName().replace("Proxy", "");
             final Class<?> class2 = Class.forName(className);
             Object instance = class2.getConstructor().newInstance();
             if (proxyClass.isAssignableFrom(class2) && proxyClass.isInstance(instance)) {

eco-util/src/main/java/com/willfp/eco/util/proxy/UnsupportedVersionException.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.core.proxy;
+package com.willfp.eco.util.proxy;
 
 import org.jetbrains.annotations.NotNull;