Minor eco-util refactor

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;