From 45c9db8507bf67f633807c3142a5508a16464f00 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 29 Dec 2020 22:33:03 +0000 Subject: [PATCH] Minor eco-util refactor --- .../main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java | 2 +- .../com/willfp/ecoenchants/config/EnchantmentYamlConfig.java | 2 +- .../com/willfp/ecoenchants/display/packets/PacketChat.java | 2 +- .../ecoenchants/display/packets/PacketOpenWindowMerchant.java | 2 +- .../ecoenchants/display/packets/PacketSetCreativeSlot.java | 2 +- .../com/willfp/ecoenchants/display/packets/PacketSetSlot.java | 2 +- .../willfp/ecoenchants/display/packets/PacketWindowItems.java | 2 +- .../enchantments/support/merging/anvil/AnvilListeners.java | 2 +- .../support/merging/grindstone/GrindstoneListeners.java | 2 +- .../enchantments/support/obtaining/EnchantingListeners.java | 2 +- .../willfp/ecoenchants/enchantments/util/WatcherTriggers.java | 2 +- .../java/com/willfp/eco/util/arrows/ArrowDataListener.java | 2 +- .../com/willfp/eco/util/bukkit/events/EcoEventManager.java | 2 +- .../com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java | 2 +- .../java/com/willfp/eco/util/bukkit/logging/EcoLogger.java | 2 +- .../com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java | 2 +- .../com/willfp/eco/util/bukkit/scheduling/EcoScheduler.java | 2 +- .../com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java | 2 +- .../main/java/com/willfp/eco/util/command/AbstractCommand.java | 2 +- .../src/main/java/com/willfp/eco/util/config/BaseConfig.java | 2 +- .../main/java/com/willfp/eco/util/config/ConfigHandler.java | 2 +- .../willfp/eco/util/drops/internal/FastCollatedDropQueue.java | 2 +- .../entitydeathbyentity/EntityDeathByEntityListeners.java | 2 +- .../willfp/eco/util/extensions/loader/EcoExtensionLoader.java | 2 +- .../util/integrations/antigrief/plugins/AntigriefLands.java | 2 +- .../eco/util/{injection => internal}/PluginDependent.java | 2 +- .../eco/util/{factory => internal}/PluginDependentFactory.java | 3 +-- .../java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java | 2 +- .../util/{packets => protocollib}/AbstractPacketAdapter.java | 2 +- 29 files changed, 29 insertions(+), 30 deletions(-) rename eco-util/src/main/java/com/willfp/eco/util/{injection => internal}/PluginDependent.java (93%) rename eco-util/src/main/java/com/willfp/eco/util/{factory => internal}/PluginDependentFactory.java (79%) rename eco-util/src/main/java/com/willfp/eco/util/{packets => protocollib}/AbstractPacketAdapter.java (98%) 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 1f1e9063..8dbf4222 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 @@ -6,7 +6,7 @@ import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.drops.telekinesis.TelekinesisTests; import com.willfp.eco.util.integrations.IntegrationLoader; import com.willfp.eco.util.interfaces.EcoRunnable; -import com.willfp.eco.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.command.commands.CommandEcodebug; import com.willfp.ecoenchants.command.commands.CommandEcoreload; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java index eaecba80..5ef2bb34 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.config; import com.willfp.eco.util.config.ValueGetter; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import lombok.AccessLevel; 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 dbb7c10a..177508eb 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 @@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedChatComponent; import com.willfp.eco.core.proxy.proxies.ChatComponentProxy; import com.willfp.eco.util.ProxyUtils; -import com.willfp.eco.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.NotNull; 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 15bf0e0d..dbe64371 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 @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.display.packets; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.core.proxy.ProxyConstants; -import com.willfp.eco.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java index def20c4a..2a16e7eb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.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.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; import org.jetbrains.annotations.NotNull; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java index 8e1a2548..7e74a39f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.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.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; import org.bukkit.inventory.ItemFlag; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java index b2fcd160..c6d78e94 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.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.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; import org.bukkit.inventory.ItemFlag; 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 9d80fadf..0fb66382 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 @@ -6,7 +6,7 @@ import com.willfp.eco.core.proxy.proxies.RepairCostProxy; import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.config.Configs; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.tuplets.Pair; import org.bukkit.Material; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java index 4787b981..74167f63 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.enchantments.support.merging.grindstone; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java index 05a8c630..442e9b42 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.support.obtaining; import com.google.common.collect.ImmutableSet; import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.config.Configs; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; 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/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java index c5c1b7ad..82f1794a 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 @@ -4,7 +4,7 @@ import com.google.common.collect.Sets; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchants; diff --git a/eco-util/src/main/java/com/willfp/eco/util/arrows/ArrowDataListener.java b/eco-util/src/main/java/com/willfp/eco/util/arrows/ArrowDataListener.java index 975208eb..214612ef 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/arrows/ArrowDataListener.java +++ b/eco-util/src/main/java/com/willfp/eco/util/arrows/ArrowDataListener.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.arrows; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/events/EcoEventManager.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/events/EcoEventManager.java index d83c60c8..cc5e57f0 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/bukkit/events/EcoEventManager.java +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/events/EcoEventManager.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.events; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java index 25af074f..bae46550 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.keys; -import com.willfp.eco.util.factory.PluginDependentFactory; +import com.willfp.eco.util.internal.PluginDependentFactory; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.NamespacedKey; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/logging/EcoLogger.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/logging/EcoLogger.java index 2b680d64..558965f7 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/bukkit/logging/EcoLogger.java +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/logging/EcoLogger.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.bukkit.logging; import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java index adb55f86..8bd90970 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.meta; -import com.willfp.eco.util.factory.PluginDependentFactory; +import com.willfp.eco.util.internal.PluginDependentFactory; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.metadata.FixedMetadataValue; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoScheduler.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoScheduler.java index 6f0bbd19..75110203 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoScheduler.java +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoScheduler.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.scheduling; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java index 1004dbda..aca99b55 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.scheduling; -import com.willfp.eco.util.factory.PluginDependentFactory; +import com.willfp.eco.util.internal.PluginDependentFactory; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java b/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java index c0adfdef..3147554c 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java +++ b/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.command; import com.willfp.eco.util.config.Configs; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.interfaces.Registerable; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.Bukkit; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java b/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java index b81a188c..c81de487 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.config; import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import lombok.AccessLevel; import lombok.Getter; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java b/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java index 2544c2bb..184d34b6 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java @@ -3,7 +3,7 @@ package com.willfp.eco.util.config; import com.willfp.eco.util.config.annotations.ConfigUpdater; import com.willfp.eco.util.config.annotations.InvalidUpdatableClassException; import com.willfp.eco.util.config.annotations.InvalidUpdateMethodException; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/FastCollatedDropQueue.java b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/FastCollatedDropQueue.java index 625676fc..3e5030ac 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/FastCollatedDropQueue.java +++ b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/FastCollatedDropQueue.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.drops.internal; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import lombok.Getter; import lombok.Setter; diff --git a/eco-util/src/main/java/com/willfp/eco/util/events/entitydeathbyentity/EntityDeathByEntityListeners.java b/eco-util/src/main/java/com/willfp/eco/util/events/entitydeathbyentity/EntityDeathByEntityListeners.java index 7832e27d..39f20467 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/events/entitydeathbyentity/EntityDeathByEntityListeners.java +++ b/eco-util/src/main/java/com/willfp/eco/util/events/entitydeathbyentity/EntityDeathByEntityListeners.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.events.entitydeathbyentity; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; diff --git a/eco-util/src/main/java/com/willfp/eco/util/extensions/loader/EcoExtensionLoader.java b/eco-util/src/main/java/com/willfp/eco/util/extensions/loader/EcoExtensionLoader.java index c5e78266..623d69af 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/extensions/loader/EcoExtensionLoader.java +++ b/eco-util/src/main/java/com/willfp/eco/util/extensions/loader/EcoExtensionLoader.java @@ -3,7 +3,7 @@ package com.willfp.eco.util.extensions.loader; import com.willfp.eco.util.extensions.Extension; import com.willfp.eco.util.extensions.MalformedExtensionException; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/integrations/antigrief/plugins/AntigriefLands.java b/eco-util/src/main/java/com/willfp/eco/util/integrations/antigrief/plugins/AntigriefLands.java index 2159fb39..dc3e7942 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/integrations/antigrief/plugins/AntigriefLands.java +++ b/eco-util/src/main/java/com/willfp/eco/util/integrations/antigrief/plugins/AntigriefLands.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.integrations.antigrief.plugins; -import com.willfp.eco.util.injection.PluginDependent; +import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.integrations.antigrief.AntigriefWrapper; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import me.angeschossen.lands.api.integration.LandsIntegration; diff --git a/eco-util/src/main/java/com/willfp/eco/util/injection/PluginDependent.java b/eco-util/src/main/java/com/willfp/eco/util/internal/PluginDependent.java similarity index 93% rename from eco-util/src/main/java/com/willfp/eco/util/injection/PluginDependent.java rename to eco-util/src/main/java/com/willfp/eco/util/internal/PluginDependent.java index eae2528f..b17bdab3 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/injection/PluginDependent.java +++ b/eco-util/src/main/java/com/willfp/eco/util/internal/PluginDependent.java @@ -1,4 +1,4 @@ -package com.willfp.eco.util.injection; +package com.willfp.eco.util.internal; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import lombok.AccessLevel; diff --git a/eco-util/src/main/java/com/willfp/eco/util/factory/PluginDependentFactory.java b/eco-util/src/main/java/com/willfp/eco/util/internal/PluginDependentFactory.java similarity index 79% rename from eco-util/src/main/java/com/willfp/eco/util/factory/PluginDependentFactory.java rename to eco-util/src/main/java/com/willfp/eco/util/internal/PluginDependentFactory.java index 830791f9..68d2c57f 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/factory/PluginDependentFactory.java +++ b/eco-util/src/main/java/com/willfp/eco/util/internal/PluginDependentFactory.java @@ -1,6 +1,5 @@ -package com.willfp.eco.util.factory; +package com.willfp.eco.util.internal; -import com.willfp.eco.util.injection.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; 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 a4bf2918..012f254a 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 @@ -40,7 +40,7 @@ import com.willfp.eco.util.integrations.antigrief.plugins.AntigriefWorldGuard; import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; import com.willfp.eco.util.integrations.placeholder.plugins.PlaceholderIntegrationPAPI; import com.willfp.eco.util.optional.Prerequisite; -import com.willfp.eco.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.updater.UpdateChecker; import lombok.Getter; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; diff --git a/eco-util/src/main/java/com/willfp/eco/util/packets/AbstractPacketAdapter.java b/eco-util/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java similarity index 98% rename from eco-util/src/main/java/com/willfp/eco/util/packets/AbstractPacketAdapter.java rename to eco-util/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java index d4d91a6b..4f76a53a 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/packets/AbstractPacketAdapter.java +++ b/eco-util/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java @@ -1,4 +1,4 @@ -package com.willfp.eco.util.packets; +package com.willfp.eco.util.protocollib; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary;