From 4b115b83345da3f46ba5dabde1ca60e79e0a34e6 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 31 Dec 2020 17:37:45 +0000 Subject: [PATCH] Reworked proxy package --- .../proxy/v1_15_R1/BlockBreak.java | 4 ++-- .../proxy/v1_15_R1/ChatComponent.java | 4 ++-- .../proxy/v1_15_R1/Cooldown.java | 4 ++-- .../proxy/v1_15_R1/FastGetEnchants.java | 4 ++-- .../proxy/v1_15_R1/OpenInventory.java | 4 ++-- .../proxy/v1_15_R1/RepairCost.java | 4 ++-- .../proxy/v1_15_R1/TridentStack.java | 4 ++-- .../proxy/v1_15_R1/VillagerTrade.java | 4 ++-- .../proxy/v1_16_R1/BlockBreak.java | 4 ++-- .../proxy/v1_16_R1/ChatComponent.java | 4 ++-- .../proxy/v1_16_R1/Cooldown.java | 4 ++-- .../proxy/v1_16_R1/FastGetEnchants.java | 4 ++-- .../proxy/v1_16_R1/OpenInventory.java | 4 ++-- .../proxy/v1_16_R1/RepairCost.java | 4 ++-- .../proxy/v1_16_R1/TridentStack.java | 4 ++-- .../proxy/v1_16_R1/VillagerTrade.java | 4 ++-- .../proxy/v1_16_R2/BlockBreak.java | 4 ++-- .../proxy/v1_16_R2/ChatComponent.java | 4 ++-- .../proxy/v1_16_R2/Cooldown.java | 4 ++-- .../proxy/v1_16_R2/FastGetEnchants.java | 4 ++-- .../proxy/v1_16_R2/OpenInventory.java | 4 ++-- .../proxy/v1_16_R2/RepairCost.java | 4 ++-- .../proxy/v1_16_R2/TridentStack.java | 4 ++-- .../proxy/v1_16_R2/VillagerTrade.java | 4 ++-- .../proxy/v1_16_R3/BlockBreak.java | 4 ++-- .../proxy/v1_16_R3/ChatComponent.java | 4 ++-- .../proxy/v1_16_R3/Cooldown.java | 4 ++-- .../proxy/v1_16_R3/FastGetEnchants.java | 4 ++-- .../proxy/v1_16_R3/OpenInventory.java | 4 ++-- .../proxy/v1_16_R3/RepairCost.java | 4 ++-- .../proxy/v1_16_R3/TridentStack.java | 4 ++-- .../proxy/v1_16_R3/VillagerTrade.java | 4 ++-- .../willfp/ecoenchants/EcoEnchantsPlugin.java | 4 ++-- .../command/commands/CommandEcodebug.java | 2 +- .../display/packets/PacketChat.java | 2 +- .../packets/PacketOpenWindowMerchant.java | 2 +- .../ecoenchants/normal/Abrasion.java | 2 +- .../ecoenchants/normal/BlastMining.java | 2 +- .../ecoenchants/normal/Bleed.java | 2 +- .../ecoenchants/normal/Cleave.java | 2 +- .../ecoenchants/normal/Disable.java | 2 +- .../ecoenchants/normal/Drill.java | 2 +- .../ecoenchants/normal/Dullness.java | 2 +- .../ecoenchants/normal/Famine.java | 2 +- .../enchantments/ecoenchants/normal/Fury.java | 2 +- .../ecoenchants/normal/IllusionAspect.java | 2 +- .../ecoenchants/normal/Lumberjack.java | 2 +- .../ecoenchants/normal/Shockwave.java | 2 +- .../ecoenchants/normal/Spearfishing.java | 2 +- .../ecoenchants/normal/Splash.java | 2 +- .../ecoenchants/normal/StrayAspect.java | 2 +- .../ecoenchants/normal/Supercritical.java | 2 +- .../ecoenchants/normal/Telekinesis.java | 2 +- .../enchantments/ecoenchants/normal/Thor.java | 2 +- .../ecoenchants/normal/Toxic.java | 2 +- .../ecoenchants/normal/VampireAspect.java | 2 +- .../enchantments/ecoenchants/normal/Vein.java | 2 +- .../ecoenchants/special/Bolt.java | 2 +- .../ecoenchants/special/Carve.java | 2 +- .../ecoenchants/special/Confusion.java | 2 +- .../ecoenchants/special/Razor.java | 2 +- .../ecoenchants/special/Volatile.java | 2 +- .../ecoenchants/spell/Dynamite.java | 2 +- .../enchantments/itemtypes/Artifact.java | 2 +- .../support/merging/anvil/AnvilListeners.java | 6 +++--- .../enchantments/util/EnchantChecks.java | 2 +- .../enchantments/util/WatcherTriggers.java | 2 +- .../proxy/proxies/BlockBreakProxy.java | 4 ++-- .../proxy/proxies/ChatComponentProxy.java | 4 ++-- .../proxy/proxies/CooldownProxy.java | 4 ++-- .../proxy/proxies/FastGetEnchantsProxy.java | 4 ++-- .../proxy/proxies/OpenInventoryProxy.java | 4 ++-- .../proxy/proxies/RepairCostProxy.java | 4 ++-- .../proxy/proxies/TridentStackProxy.java | 4 ++-- .../proxy/proxies/VillagerTradeProxy.java | 4 ++-- eco-extensions/mmo/build.gradle | 2 +- eco-extensions/precision/build.gradle | 2 +- .../ecoenchants/precision/Precision.java | 2 +- eco-extensions/summoning/build.gradle | 2 +- .../summoning/SummoningEnchantment.java | 2 +- .../java/com/willfp/eco/util/ProxyUtils.java | 10 ++++++---- .../eco/util/plugin/AbstractEcoPlugin.java | 19 ++++++++++++++----- .../willfp/eco/util}/proxy/AbstractProxy.java | 2 +- .../eco/util}/proxy/ProxyConstants.java | 2 +- .../willfp/eco/util}/proxy/ProxyFactory.java | 13 +++++++++---- .../proxy/UnsupportedVersionException.java | 2 +- 86 files changed, 155 insertions(+), 139 deletions(-) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/BlockBreak.java (83%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/ChatComponent.java (66%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/Cooldown.java (80%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/FastGetEnchants.java (94%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/OpenInventory.java (76%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/RepairCost.java (87%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/TridentStack.java (84%) rename eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_15_R1/VillagerTrade.java (95%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/BlockBreak.java (83%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/ChatComponent.java (97%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/Cooldown.java (71%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/FastGetEnchants.java (94%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/OpenInventory.java (76%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/RepairCost.java (87%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/TridentStack.java (84%) rename eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R1/VillagerTrade.java (95%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/BlockBreak.java (83%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/ChatComponent.java (97%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/Cooldown.java (71%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/FastGetEnchants.java (94%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/OpenInventory.java (76%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/RepairCost.java (87%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/TridentStack.java (84%) rename eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R2/VillagerTrade.java (95%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/BlockBreak.java (83%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/ChatComponent.java (97%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/Cooldown.java (71%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/FastGetEnchants.java (94%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/OpenInventory.java (76%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/RepairCost.java (87%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/TridentStack.java (84%) rename eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/v1_16_R3/VillagerTrade.java (95%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/BlockBreakProxy.java (82%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/ChatComponentProxy.java (79%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/CooldownProxy.java (80%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/FastGetEnchantsProxy.java (89%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/OpenInventoryProxy.java (79%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/RepairCostProxy.java (87%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/TridentStackProxy.java (80%) rename eco-core/core-proxy/src/main/java/com/willfp/{eco/core => ecoenchants}/proxy/proxies/VillagerTradeProxy.java (76%) rename {eco-core/core-proxy => eco-util}/src/main/java/com/willfp/eco/util/ProxyUtils.java (58%) rename {eco-core/core-proxy/src/main/java/com/willfp/eco/core => eco-util/src/main/java/com/willfp/eco/util}/proxy/AbstractProxy.java (51%) rename {eco-core/core-proxy/src/main/java/com/willfp/eco/core => eco-util/src/main/java/com/willfp/eco/util}/proxy/ProxyConstants.java (89%) rename {eco-core/core-proxy/src/main/java/com/willfp/eco/core => eco-util/src/main/java/com/willfp/eco/util}/proxy/ProxyFactory.java (74%) rename {eco-core/core-proxy/src/main/java/com/willfp/eco/core => eco-util/src/main/java/com/willfp/eco/util}/proxy/UnsupportedVersionException.java (90%) diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/BlockBreak.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java similarity index 83% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/BlockBreak.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java index d71cc31c..3ce925d5 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/BlockBreak.java +++ b/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; diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/ChatComponent.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/ChatComponent.java similarity index 66% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/ChatComponent.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/ChatComponent.java index aebb21bb..5a0c32be 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/ChatComponent.java +++ b/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 { diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/Cooldown.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java similarity index 80% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/Cooldown.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java index 21a78f05..6a1094bd 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/Cooldown.java +++ b/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; diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/FastGetEnchants.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/FastGetEnchants.java similarity index 94% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/FastGetEnchants.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/FastGetEnchants.java index 6617be61..42b48d42 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/FastGetEnchants.java +++ b/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; diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/OpenInventory.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/OpenInventory.java similarity index 76% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/OpenInventory.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/OpenInventory.java index 235dec86..6b2a0dfb 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/OpenInventory.java +++ b/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; diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/RepairCost.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/RepairCost.java similarity index 87% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/RepairCost.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/RepairCost.java index d9ba1b6f..8996a2e9 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/RepairCost.java +++ b/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; diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/TridentStack.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java similarity index 84% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/TridentStack.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java index 04337810..cec867fb 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/TridentStack.java +++ b/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; diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/VillagerTrade.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/VillagerTrade.java similarity index 95% rename from eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/VillagerTrade.java rename to eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/VillagerTrade.java index a7efa008..20c2666c 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/core/proxy/v1_15_R1/VillagerTrade.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/BlockBreak.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java similarity index 83% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/BlockBreak.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java index eca6c1a8..bf2cf56f 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/BlockBreak.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/ChatComponent.java similarity index 97% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/ChatComponent.java index 1fa4ec36..82a5ed49 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/ChatComponent.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/Cooldown.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java similarity index 71% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/Cooldown.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java index 2f929ec0..ca7a2d90 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/Cooldown.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/FastGetEnchants.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/FastGetEnchants.java similarity index 94% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/FastGetEnchants.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/FastGetEnchants.java index 6f93cf12..f1ac15ed 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/FastGetEnchants.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/OpenInventory.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/OpenInventory.java similarity index 76% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/OpenInventory.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/OpenInventory.java index 073e5e5c..7ed7bc16 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/OpenInventory.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/RepairCost.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/RepairCost.java similarity index 87% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/RepairCost.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/RepairCost.java index 79907500..ffa9c164 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/RepairCost.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/TridentStack.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java similarity index 84% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/TridentStack.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java index 8080d45a..87716e66 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/TridentStack.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/VillagerTrade.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/VillagerTrade.java similarity index 95% rename from eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/VillagerTrade.java rename to eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/VillagerTrade.java index 44a0d20c..faa70436 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/core/proxy/v1_16_R1/VillagerTrade.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/BlockBreak.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java similarity index 83% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/BlockBreak.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java index 1ebbe183..0e59bd25 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/BlockBreak.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/ChatComponent.java similarity index 97% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/ChatComponent.java index 30a49357..1e754cb9 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/ChatComponent.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/Cooldown.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java similarity index 71% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/Cooldown.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java index 00cc79a6..1c3e0a54 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/Cooldown.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/FastGetEnchants.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/FastGetEnchants.java similarity index 94% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/FastGetEnchants.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/FastGetEnchants.java index cbdfaf56..a82894b4 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/FastGetEnchants.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/OpenInventory.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/OpenInventory.java similarity index 76% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/OpenInventory.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/OpenInventory.java index 971f04a7..ff876898 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/OpenInventory.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/RepairCost.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/RepairCost.java similarity index 87% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/RepairCost.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/RepairCost.java index 583e43dd..fd0cc8c5 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/RepairCost.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/TridentStack.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java similarity index 84% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/TridentStack.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java index e1e55bf3..cc3d6115 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/TridentStack.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/VillagerTrade.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/VillagerTrade.java similarity index 95% rename from eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/VillagerTrade.java rename to eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/VillagerTrade.java index f32cc6f2..57b05390 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/core/proxy/v1_16_R2/VillagerTrade.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/BlockBreak.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java similarity index 83% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/BlockBreak.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java index 7444eb1d..1c047e9b 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/BlockBreak.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/ChatComponent.java similarity index 97% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/ChatComponent.java index 2b949ff0..86d013df 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/ChatComponent.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/Cooldown.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java similarity index 71% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/Cooldown.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java index 5b5da9cb..de068c89 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/Cooldown.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/FastGetEnchants.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java similarity index 94% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/FastGetEnchants.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java index d5cb8b64..af748a63 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/FastGetEnchants.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/OpenInventory.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/OpenInventory.java similarity index 76% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/OpenInventory.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/OpenInventory.java index 66524337..c6549c6b 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/OpenInventory.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/RepairCost.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java similarity index 87% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/RepairCost.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/RepairCost.java index 10bed11e..fc4e6868 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/RepairCost.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/TridentStack.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java similarity index 84% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/TridentStack.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java index 5af20aa2..ee82a606 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/TridentStack.java +++ b/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; diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/VillagerTrade.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/VillagerTrade.java similarity index 95% rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/VillagerTrade.java rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/VillagerTrade.java index f760684a..7c7d7c5d 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/core/proxy/v1_16_R3/VillagerTrade.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index c06f2a55..95afc5a7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/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"); } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java index 5a1198f0..3f966f12 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java index 177508eb..94698e78 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java index d0fbaaf5..b070a2aa 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java index 1ab49558..fdef9340 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java index 22324fec..9a3bb6ba 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java index f0910bbd..12de6a3f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java index 0065a4f6..5896557a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java index 87a464ae..34ac616e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java index 3120a21e..7ceabec1 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java index a0ef4547..08bf698c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java index e6437144..847f39fd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java index 7cf755ad..857103f6 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java index 6b1cf045..a2940eee 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java index 586771a0..952e5987 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java index 2d1ced92..64fd3b4f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java index cd959dca..c8c31220 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java index f61011d3..a05b4e24 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java index 83209b2c..00cd8c4b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java index e51520fc..bcd788e7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java index b45bcf96..922fda1c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java index d2e4de9b..781c4aed 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java index eec0a907..aa27bbb4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java index 211b5ea6..47207dce 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java index 1f75f0a4..dabb4712 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java index 61447b60..fe144bc8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java index b2e9378f..fcd05f8a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java index 7c8aba84..63cd7656 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java index 7a51ad5b..e003d2b8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java index e6fb0c50..83ff1cf8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java index 1e321b9d..3a5ab372 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java index 83a73a9f..fe9753c2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java index 0fb66382..9bbb6d2d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java +++ b/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.core.proxy.proxies.OpenInventoryProxy; -import com.willfp.eco.core.proxy.proxies.RepairCostProxy; +import com.willfp.eco.util.proxy.ProxyConstants; +import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy; +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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java index 98e5a52d..693d133c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java +++ b/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; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java index 82f1794a..82c99d89 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/BlockBreakProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java similarity index 82% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/BlockBreakProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java index 1da906bc..263aa31f 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/BlockBreakProxy.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/ChatComponentProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/ChatComponentProxy.java similarity index 79% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/ChatComponentProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/ChatComponentProxy.java index 02b09baf..52e4fef4 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/ChatComponentProxy.java +++ b/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 { diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/CooldownProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java similarity index 80% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/CooldownProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java index 6bbf1088..618891b1 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/CooldownProxy.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/FastGetEnchantsProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/FastGetEnchantsProxy.java similarity index 89% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/FastGetEnchantsProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/FastGetEnchantsProxy.java index 54c69d2d..fc14a33d 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/FastGetEnchantsProxy.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/OpenInventoryProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/OpenInventoryProxy.java similarity index 79% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/OpenInventoryProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/OpenInventoryProxy.java index 59b04fce..5b40791f 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/OpenInventoryProxy.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/RepairCostProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java similarity index 87% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/RepairCostProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/RepairCostProxy.java index fd99611d..cf6d5c03 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/RepairCostProxy.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/TridentStackProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java similarity index 80% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/TridentStackProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java index 6b2ba5c2..53bd166a 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/TridentStackProxy.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/VillagerTradeProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/VillagerTradeProxy.java similarity index 76% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/VillagerTradeProxy.java rename to eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/VillagerTradeProxy.java index f7126d4e..a4743b13 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/proxies/VillagerTradeProxy.java +++ b/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 { diff --git a/eco-extensions/mmo/build.gradle b/eco-extensions/mmo/build.gradle index 231a3f62..48d6692c 100644 --- a/eco-extensions/mmo/build.gradle +++ b/eco-extensions/mmo/build.gradle @@ -1,5 +1,5 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'MMO Extension' repositories { diff --git a/eco-extensions/precision/build.gradle b/eco-extensions/precision/build.gradle index 59eb9fa4..c4533054 100644 --- a/eco-extensions/precision/build.gradle +++ b/eco-extensions/precision/build.gradle @@ -1,5 +1,5 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Precision Extension' jar { diff --git a/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java index 2fe1cea1..861868a3 100644 --- a/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java +++ b/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; diff --git a/eco-extensions/summoning/build.gradle b/eco-extensions/summoning/build.gradle index 82235d6b..8c698dab 100644 --- a/eco-extensions/summoning/build.gradle +++ b/eco-extensions/summoning/build.gradle @@ -1,5 +1,5 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Summoning Extension' jar { diff --git a/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index f7e78081..46b576ec 100644 --- a/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java b/eco-util/src/main/java/com/willfp/eco/util/ProxyUtils.java similarity index 58% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java rename to eco-util/src/main/java/com/willfp/eco/util/ProxyUtils.java index 7e515969..5f554aa5 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java +++ b/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.core.proxy.ProxyFactory; +import com.willfp.eco.util.plugin.AbstractEcoPlugin; +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 The type of the proxy. + * @param The type of the proxy. * @return The proxy implementation. */ public @NotNull T getProxy(@NotNull final Class proxyClass) { - return new ProxyFactory<>(proxyClass).getProxy(); + return new ProxyFactory<>(AbstractEcoPlugin.getInstance(), proxyClass).getProxy(); } } diff --git a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java index 33eed7ed..9e58a6e5 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java +++ b/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. */ @@ -148,16 +154,19 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { /** * Create a new plugin. * - * @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 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); diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java b/eco-util/src/main/java/com/willfp/eco/util/proxy/AbstractProxy.java similarity index 51% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java rename to eco-util/src/main/java/com/willfp/eco/util/proxy/AbstractProxy.java index dddcddc2..7747599c 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java +++ b/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 { diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java b/eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyConstants.java similarity index 89% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java rename to eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyConstants.java index a3493d08..81370c88 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java +++ b/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; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java b/eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyFactory.java similarity index 74% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java rename to eco-util/src/main/java/com/willfp/eco/util/proxy/ProxyFactory.java index d3d4b24c..5e10b237 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java +++ b/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 { +public class ProxyFactory extends PluginDependent { /** * Cached proxy implementations in order to not perform expensive reflective class-finding. */ @@ -19,9 +21,12 @@ public class ProxyFactory { /** * 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 proxyClass) { + public ProxyFactory(@NotNull final AbstractEcoPlugin plugin, + @NotNull final Class proxyClass) { + super(plugin); this.proxyClass = proxyClass; } @@ -37,7 +42,7 @@ public class ProxyFactory { 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)) { diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/UnsupportedVersionException.java b/eco-util/src/main/java/com/willfp/eco/util/proxy/UnsupportedVersionException.java similarity index 90% rename from eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/UnsupportedVersionException.java rename to eco-util/src/main/java/com/willfp/eco/util/proxy/UnsupportedVersionException.java index 501fd590..a84f054a 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/UnsupportedVersionException.java +++ b/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;