From 2942f57528c8edc049e2cfbae9233a46c2dfcc02 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 3 Oct 2020 14:25:40 +0100 Subject: [PATCH] Refactoring --- .../ecoenchants/command/commands/CommandEcodebug.java | 1 + .../vanillasupport/merging}/anvil/AnvilListeners.java | 2 +- .../vanillasupport/merging}/anvil/AnvilMerge.java | 2 +- .../merging}/grindstone/GrindstoneListeners.java | 2 +- .../merging}/grindstone/GrindstoneMerge.java | 2 +- .../obtaining/EnchantingListeners.java | 2 +- .../{ => vanillasupport}/obtaining/LootPopulator.java | 2 +- .../obtaining/VillagerListeners.java | 2 +- .../java/com/willfp/ecoenchants/loader/Loader.java | 10 +++++----- 9 files changed, 13 insertions(+), 12 deletions(-) rename Plugin/src/main/java/com/willfp/ecoenchants/{ => enchantments/vanillasupport/merging}/anvil/AnvilListeners.java (95%) rename Plugin/src/main/java/com/willfp/ecoenchants/{ => enchantments/vanillasupport/merging}/anvil/AnvilMerge.java (99%) rename Plugin/src/main/java/com/willfp/ecoenchants/{ => enchantments/vanillasupport/merging}/grindstone/GrindstoneListeners.java (96%) rename Plugin/src/main/java/com/willfp/ecoenchants/{ => enchantments/vanillasupport/merging}/grindstone/GrindstoneMerge.java (96%) rename Plugin/src/main/java/com/willfp/ecoenchants/enchantments/{ => vanillasupport}/obtaining/EnchantingListeners.java (99%) rename Plugin/src/main/java/com/willfp/ecoenchants/enchantments/{ => vanillasupport}/obtaining/LootPopulator.java (98%) rename Plugin/src/main/java/com/willfp/ecoenchants/enchantments/{ => vanillasupport}/obtaining/VillagerListeners.java (99%) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java index 09bc13c1..a9c35290 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java @@ -13,6 +13,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +@SuppressWarnings("unchecked") public final class CommandEcodebug extends AbstractCommand { public CommandEcodebug() { super("ecodebug", "ecoenchants.ecodebug", true); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/anvil/AnvilListeners.java similarity index 95% rename from Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilListeners.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/anvil/AnvilListeners.java index f065b996..8806d7b6 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilListeners.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/anvil/AnvilListeners.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.anvil; +package com.willfp.ecoenchants.enchantments.vanillasupport.merging.anvil; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.util.Pair; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/anvil/AnvilMerge.java similarity index 99% rename from Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/anvil/AnvilMerge.java index 9da3fc1d..773bb310 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/anvil/AnvilMerge.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.anvil; +package com.willfp.ecoenchants.enchantments.vanillasupport.merging.anvil; import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/grindstone/GrindstoneListeners.java similarity index 96% rename from Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/grindstone/GrindstoneListeners.java index a0309ba8..2518a8c8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/grindstone/GrindstoneListeners.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.grindstone; +package com.willfp.ecoenchants.enchantments.vanillasupport.merging.grindstone; import com.willfp.ecoenchants.EcoEnchantsPlugin; import org.bukkit.Bukkit; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneMerge.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/grindstone/GrindstoneMerge.java similarity index 96% rename from Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneMerge.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/grindstone/GrindstoneMerge.java index 13382f63..ddb2fb3f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneMerge.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/merging/grindstone/GrindstoneMerge.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.grindstone; +package com.willfp.ecoenchants.enchantments.vanillasupport.merging.grindstone; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/EnchantingListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/EnchantingListeners.java similarity index 99% rename from Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/EnchantingListeners.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/EnchantingListeners.java index b6c0fad9..c16d7289 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/EnchantingListeners.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/EnchantingListeners.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.enchantments.obtaining; +package com.willfp.ecoenchants.enchantments.vanillasupport.obtaining; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.config.ConfigManager; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/LootPopulator.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/LootPopulator.java similarity index 98% rename from Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/LootPopulator.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/LootPopulator.java index 695c5fce..f7b4778f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/LootPopulator.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/LootPopulator.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.enchantments.obtaining; +package com.willfp.ecoenchants.enchantments.vanillasupport.obtaining; import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/VillagerListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/VillagerListeners.java similarity index 99% rename from Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/VillagerListeners.java rename to Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/VillagerListeners.java index 833bee46..1297066f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/obtaining/VillagerListeners.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/vanillasupport/obtaining/VillagerListeners.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.enchantments.obtaining; +package com.willfp.ecoenchants.enchantments.vanillasupport.obtaining; import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java index ad8f8921..9351dc76 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.loader; import com.comphenix.protocol.ProtocolLibrary; import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.anvil.AnvilListeners; +import com.willfp.ecoenchants.enchantments.vanillasupport.merging.anvil.AnvilListeners; import com.willfp.ecoenchants.command.commands.CommandEcodebug; import com.willfp.ecoenchants.command.commands.CommandEcoreload; import com.willfp.ecoenchants.command.commands.CommandEnchantinfo; @@ -16,16 +16,16 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; -import com.willfp.ecoenchants.enchantments.obtaining.EnchantingListeners; -import com.willfp.ecoenchants.enchantments.obtaining.LootPopulator; -import com.willfp.ecoenchants.enchantments.obtaining.VillagerListeners; +import com.willfp.ecoenchants.enchantments.vanillasupport.obtaining.EnchantingListeners; +import com.willfp.ecoenchants.enchantments.vanillasupport.obtaining.LootPopulator; +import com.willfp.ecoenchants.enchantments.vanillasupport.obtaining.VillagerListeners; import com.willfp.ecoenchants.enchantments.util.WatcherTriggers; import com.willfp.ecoenchants.events.armorequip.ArmorListener; import com.willfp.ecoenchants.events.armorequip.DispenserArmorListener; import com.willfp.ecoenchants.events.entitydeathbyentity.EntityDeathByEntityListeners; import com.willfp.ecoenchants.events.naturalexpgainevent.NaturalExpGainListeners; import com.willfp.ecoenchants.extensions.ExtensionManager; -import com.willfp.ecoenchants.grindstone.GrindstoneListeners; +import com.willfp.ecoenchants.enchantments.vanillasupport.merging.grindstone.GrindstoneListeners; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatAAC; import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatMatrix;