diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/AutoCraft.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/AutoCraft.kt similarity index 81% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/AutoCraft.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/AutoCraft.kt index 202e671e..8168a246 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/AutoCraft.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/AutoCraft.kt @@ -1,5 +1,5 @@ -package com.willfp.eco.proxy.v1_16_R3 -import com.willfp.eco.proxy.AutoCraftProxy +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 +import com.willfp.eco.internal.spigot.proxy.AutoCraftProxy import net.minecraft.server.v1_16_R3.MinecraftKey import net.minecraft.server.v1_16_R3.PacketPlayOutAutoRecipe diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/BlockBreak.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/BlockBreak.kt similarity index 80% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/BlockBreak.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/BlockBreak.kt index df44468c..32825338 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/BlockBreak.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/BlockBreak.kt @@ -1,5 +1,5 @@ -package com.willfp.eco.proxy.v1_16_R3 -import com.willfp.eco.proxy.BlockBreakProxy +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 +import com.willfp.eco.internal.spigot.proxy.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/kotlin/com/willfp/eco/proxy/v1_16_R3/ChatComponent.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/ChatComponent.kt similarity index 96% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/ChatComponent.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/ChatComponent.kt index 710a1776..04625e0d 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/ChatComponent.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/ChatComponent.kt @@ -1,7 +1,7 @@ -package com.willfp.eco.proxy.v1_16_R3 +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 import com.willfp.eco.core.display.Display -import com.willfp.eco.proxy.ChatComponentProxy +import com.willfp.eco.internal.spigot.proxy.ChatComponentProxy import net.kyori.adventure.nbt.api.BinaryTagHolder import net.kyori.adventure.text.BuildableComponent import net.kyori.adventure.text.Component diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/FastItemStackFactory.kt similarity index 56% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/FastItemStackFactory.kt index 89d683bc..453ca91d 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/FastItemStackFactory.kt @@ -1,7 +1,7 @@ -package com.willfp.eco.proxy.v1_16_R3 +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 import com.willfp.eco.core.fast.FastItemStack -import com.willfp.eco.proxy.FastItemStackFactoryProxy -import com.willfp.eco.proxy.v1_16_R3.fast.NMSFastItemStack +import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy +import com.willfp.eco.internal.spigot.proxy.v1_16_R3.fast.NMSFastItemStack import org.bukkit.inventory.ItemStack class FastItemStackFactory : FastItemStackFactoryProxy { diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/Skull.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/Skull.kt similarity index 92% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/Skull.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/Skull.kt index ae358341..093e16f0 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/Skull.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/Skull.kt @@ -1,8 +1,8 @@ -package com.willfp.eco.proxy.v1_16_R3 +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 import com.mojang.authlib.GameProfile import com.mojang.authlib.properties.Property -import com.willfp.eco.proxy.SkullProxy +import com.willfp.eco.internal.spigot.proxy.SkullProxy import org.bukkit.inventory.meta.SkullMeta import java.lang.reflect.Field import java.lang.reflect.Method diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/TPS.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/TPS.kt similarity index 67% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/TPS.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/TPS.kt index 27864c39..2229fd82 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/TPS.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/TPS.kt @@ -1,6 +1,6 @@ -package com.willfp.eco.proxy.v1_16_R3 +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 -import com.willfp.eco.proxy.TPSProxy +import com.willfp.eco.internal.spigot.proxy.TPSProxy import org.bukkit.Bukkit import org.bukkit.craftbukkit.v1_16_R3.CraftServer diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt similarity index 93% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt index 11ac2be5..4afaa65c 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt @@ -1,6 +1,6 @@ -package com.willfp.eco.proxy.v1_16_R3 +package com.willfp.eco.internal.spigot.proxy.v1_16_R3 import com.willfp.eco.core.display.Display -import com.willfp.eco.proxy.VillagerTradeProxy +import com.willfp.eco.internal.spigot.proxy.VillagerTradeProxy import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe import org.bukkit.entity.Player import org.bukkit.inventory.MerchantRecipe diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/FastItemStackUtils.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/fast/FastItemStackUtils.kt similarity index 89% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/FastItemStackUtils.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/fast/FastItemStackUtils.kt index c0328ffc..76058373 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/FastItemStackUtils.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/fast/FastItemStackUtils.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy.v1_16_R3.fast +package com.willfp.eco.internal.spigot.proxy.v1_16_R3.fast import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack import org.bukkit.inventory.ItemStack diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/fast/NMSFastItemStack.kt similarity index 98% rename from eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.kt rename to eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/fast/NMSFastItemStack.kt index 5fdc887b..8b1a4b55 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/fast/NMSFastItemStack.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy.v1_16_R3.fast +package com.willfp.eco.internal.spigot.proxy.v1_16_R3.fast import com.willfp.eco.internal.fast.EcoFastItemStack import com.willfp.eco.util.StringUtils diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/AutoCraft.kt similarity index 82% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/AutoCraft.kt index 8721639f..60c86da6 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/AutoCraft.kt @@ -1,6 +1,6 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 -import com.willfp.eco.proxy.AutoCraftProxy +import com.willfp.eco.internal.spigot.proxy.AutoCraftProxy import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket import net.minecraft.resources.ResourceLocation diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/BlockBreak.kt similarity index 66% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/BlockBreak.kt index 7b7d38e4..ab03241e 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/BlockBreak.kt @@ -1,6 +1,6 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 -import com.willfp.eco.proxy.BlockBreakProxy +import com.willfp.eco.internal.spigot.proxy.BlockBreakProxy import org.bukkit.block.Block import org.bukkit.entity.Player diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/ChatComponent.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ChatComponent.kt similarity index 96% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/ChatComponent.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ChatComponent.kt index 2fecdfa7..374eba7a 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/ChatComponent.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ChatComponent.kt @@ -1,7 +1,7 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 import com.willfp.eco.core.display.Display -import com.willfp.eco.proxy.ChatComponentProxy +import com.willfp.eco.internal.spigot.proxy.ChatComponentProxy import net.kyori.adventure.nbt.api.BinaryTagHolder import net.kyori.adventure.text.BuildableComponent import net.kyori.adventure.text.Component diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/FastItemStackFactory.kt similarity index 56% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/FastItemStackFactory.kt index f149a868..c9ee4d14 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/FastItemStackFactory.kt @@ -1,8 +1,8 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 import com.willfp.eco.core.fast.FastItemStack -import com.willfp.eco.proxy.FastItemStackFactoryProxy -import com.willfp.eco.proxy.v1_17_R1.fast.NMSFastItemStack +import com.willfp.eco.internal.spigot.proxy.v1_17_R1.fast.NMSFastItemStack +import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy import org.bukkit.inventory.ItemStack class FastItemStackFactory : FastItemStackFactoryProxy { diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/Skull.kt similarity index 92% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/Skull.kt index aa4389fe..74fd644a 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/Skull.kt @@ -1,8 +1,8 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 import com.mojang.authlib.GameProfile import com.mojang.authlib.properties.Property -import com.willfp.eco.proxy.SkullProxy +import com.willfp.eco.internal.spigot.proxy.SkullProxy import org.bukkit.inventory.meta.SkullMeta import java.lang.reflect.Field import java.lang.reflect.Method diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/TPS.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/TPS.kt similarity index 67% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/TPS.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/TPS.kt index bb78aacb..1440887b 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/TPS.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/TPS.kt @@ -1,6 +1,6 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 -import com.willfp.eco.proxy.TPSProxy +import com.willfp.eco.internal.spigot.proxy.TPSProxy import org.bukkit.Bukkit import org.bukkit.craftbukkit.v1_17_R1.CraftServer diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/VillagerTrade.kt similarity index 91% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/VillagerTrade.kt index 6bcd72b2..9440f540 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/VillagerTrade.kt @@ -1,7 +1,7 @@ -package com.willfp.eco.proxy.v1_17_R1 +package com.willfp.eco.internal.spigot.proxy.v1_17_R1 import com.willfp.eco.core.display.Display -import com.willfp.eco.proxy.VillagerTradeProxy +import com.willfp.eco.internal.spigot.proxy.VillagerTradeProxy import net.minecraft.world.item.trading.MerchantOffer import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMerchantRecipe import org.bukkit.entity.Player diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/FastItemStackUtils.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/FastItemStackUtils.kt similarity index 89% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/FastItemStackUtils.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/FastItemStackUtils.kt index f431bd47..85774ff9 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/FastItemStackUtils.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/FastItemStackUtils.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy.v1_17_R1.fast +package com.willfp.eco.internal.spigot.proxy.v1_17_R1.fast import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack import org.bukkit.inventory.ItemStack diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt similarity index 98% rename from eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.kt rename to eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt index 4e4c82dc..df15b11e 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy.v1_17_R1.fast +package com.willfp.eco.internal.spigot.proxy.v1_17_R1.fast import com.willfp.eco.internal.fast.EcoFastItemStack import com.willfp.eco.util.StringUtils diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/spigot/recipes/ShapedRecipeListener.java similarity index 99% rename from eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java rename to eco-core/core-plugin/src/main/java/com/willfp/eco/internal/spigot/recipes/ShapedRecipeListener.java index d0348bbf..83f4464c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/ShapedRecipeListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/spigot/recipes/ShapedRecipeListener.java @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.recipes; +package com.willfp.eco.internal.spigot.recipes; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.PluginDependent; diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt similarity index 89% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt index e3ba3365..1501b1a4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoHandler.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot +package com.willfp.eco.internal.spigot import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.Handler @@ -20,18 +20,18 @@ import com.willfp.eco.internal.logging.EcoLogger import com.willfp.eco.internal.proxy.EcoProxyFactory import com.willfp.eco.internal.requirement.EcoRequirementFactory import com.willfp.eco.internal.scheduling.EcoScheduler -import com.willfp.eco.proxy.FastItemStackFactoryProxy -import com.willfp.eco.spigot.data.EcoKeyRegistry -import com.willfp.eco.spigot.data.EcoPlayerProfileHandler -import com.willfp.eco.spigot.data.storage.MySQLDataHandler -import com.willfp.eco.spigot.data.storage.YamlDataHandler -import com.willfp.eco.spigot.integrations.bstats.MetricHandler +import com.willfp.eco.internal.spigot.data.EcoKeyRegistry +import com.willfp.eco.internal.spigot.data.EcoPlayerProfileHandler +import com.willfp.eco.internal.spigot.data.storage.MySQLDataHandler +import com.willfp.eco.internal.spigot.data.storage.YamlDataHandler +import com.willfp.eco.internal.spigot.integrations.bstats.MetricHandler +import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy import net.kyori.adventure.platform.bukkit.BukkitAudiences import org.bukkit.inventory.ItemStack import java.util.logging.Logger @Suppress("UNUSED") -class EcoHandler : EcoSpigotPlugin(), Handler { +class EcoHandler : com.willfp.eco.internal.spigot.EcoSpigotPlugin(), Handler { private val cleaner = EcoCleaner() private val requirementFactory = EcoRequirementFactory() private var adventure: BukkitAudiences? = null diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt similarity index 69% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt index 68646643..49fed4cc 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot +package com.willfp.eco.internal.spigot import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.Eco @@ -20,59 +20,59 @@ import com.willfp.eco.core.items.args.EnchantmentArgParser import com.willfp.eco.core.items.args.TextureArgParser import com.willfp.eco.internal.display.EcoDisplayHandler import com.willfp.eco.internal.drops.DropManager -import com.willfp.eco.proxy.BlockBreakProxy -import com.willfp.eco.proxy.FastItemStackFactoryProxy -import com.willfp.eco.proxy.SkullProxy -import com.willfp.eco.proxy.TPSProxy -import com.willfp.eco.spigot.arrows.ArrowDataListener -import com.willfp.eco.spigot.data.DataListener -import com.willfp.eco.spigot.data.PlayerBlockListener -import com.willfp.eco.spigot.data.storage.ProfileSaver -import com.willfp.eco.spigot.display.PacketAutoRecipe -import com.willfp.eco.spigot.display.PacketChat -import com.willfp.eco.spigot.display.PacketOpenWindowMerchant -import com.willfp.eco.spigot.display.PacketSetCreativeSlot -import com.willfp.eco.spigot.display.PacketSetSlot -import com.willfp.eco.spigot.display.PacketWindowItems -import com.willfp.eco.spigot.display.frame.clearFrames -import com.willfp.eco.spigot.drops.CollatedRunnable -import com.willfp.eco.spigot.eventlisteners.EntityDeathByEntityListeners -import com.willfp.eco.spigot.eventlisteners.NaturalExpGainListeners -import com.willfp.eco.spigot.eventlisteners.PlayerJumpListeners -import com.willfp.eco.spigot.eventlisteners.armor.ArmorChangeEventListeners -import com.willfp.eco.spigot.eventlisteners.armor.ArmorListener -import com.willfp.eco.spigot.gui.GUIListener -import com.willfp.eco.spigot.integrations.afk.AFKIntegrationCMI -import com.willfp.eco.spigot.integrations.afk.AFKIntegrationEssentials -import com.willfp.eco.spigot.integrations.anticheat.AnticheatAAC -import com.willfp.eco.spigot.integrations.anticheat.AnticheatAlice -import com.willfp.eco.spigot.integrations.anticheat.AnticheatMatrix -import com.willfp.eco.spigot.integrations.anticheat.AnticheatNCP -import com.willfp.eco.spigot.integrations.anticheat.AnticheatSpartan -import com.willfp.eco.spigot.integrations.anticheat.AnticheatVulcan -import com.willfp.eco.spigot.integrations.antigrief.AntigriefBentoBox -import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV10 -import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV11 -import com.willfp.eco.spigot.integrations.antigrief.AntigriefCrashClaim -import com.willfp.eco.spigot.integrations.antigrief.AntigriefDeluxeCombat -import com.willfp.eco.spigot.integrations.antigrief.AntigriefFactionsUUID -import com.willfp.eco.spigot.integrations.antigrief.AntigriefGriefPrevention -import com.willfp.eco.spigot.integrations.antigrief.AntigriefIridiumSkyblock -import com.willfp.eco.spigot.integrations.antigrief.AntigriefKingdoms -import com.willfp.eco.spigot.integrations.antigrief.AntigriefLands -import com.willfp.eco.spigot.integrations.antigrief.AntigriefSuperiorSkyblock2 -import com.willfp.eco.spigot.integrations.antigrief.AntigriefTowny -import com.willfp.eco.spigot.integrations.antigrief.AntigriefWorldGuard -import com.willfp.eco.spigot.integrations.customitems.CustomItemsHeadDatabase -import com.willfp.eco.spigot.integrations.customitems.CustomItemsItemsAdder -import com.willfp.eco.spigot.integrations.customitems.CustomItemsOraxen -import com.willfp.eco.spigot.integrations.economy.EconomyVault -import com.willfp.eco.spigot.integrations.hologram.HologramCMI -import com.willfp.eco.spigot.integrations.hologram.HologramHolographicDisplays -import com.willfp.eco.spigot.integrations.mcmmo.McmmoIntegrationImpl -import com.willfp.eco.spigot.integrations.multiverseinventories.MultiverseInventoriesIntegration -import com.willfp.eco.spigot.integrations.shop.ShopShopGuiPlus -import com.willfp.eco.spigot.recipes.ShapedRecipeListener +import com.willfp.eco.internal.spigot.arrows.ArrowDataListener +import com.willfp.eco.internal.spigot.data.DataListener +import com.willfp.eco.internal.spigot.data.PlayerBlockListener +import com.willfp.eco.internal.spigot.data.storage.ProfileSaver +import com.willfp.eco.internal.spigot.display.PacketAutoRecipe +import com.willfp.eco.internal.spigot.display.PacketChat +import com.willfp.eco.internal.spigot.display.PacketOpenWindowMerchant +import com.willfp.eco.internal.spigot.display.PacketSetCreativeSlot +import com.willfp.eco.internal.spigot.display.PacketSetSlot +import com.willfp.eco.internal.spigot.display.PacketWindowItems +import com.willfp.eco.internal.spigot.display.frame.clearFrames +import com.willfp.eco.internal.spigot.drops.CollatedRunnable +import com.willfp.eco.internal.spigot.eventlisteners.EntityDeathByEntityListeners +import com.willfp.eco.internal.spigot.eventlisteners.NaturalExpGainListeners +import com.willfp.eco.internal.spigot.eventlisteners.PlayerJumpListeners +import com.willfp.eco.internal.spigot.eventlisteners.armor.ArmorChangeEventListeners +import com.willfp.eco.internal.spigot.eventlisteners.armor.ArmorListener +import com.willfp.eco.internal.spigot.gui.GUIListener +import com.willfp.eco.internal.spigot.integrations.afk.AFKIntegrationCMI +import com.willfp.eco.internal.spigot.integrations.afk.AFKIntegrationEssentials +import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatAAC +import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatAlice +import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatMatrix +import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatNCP +import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatSpartan +import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatVulcan +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefBentoBox +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV10 +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV11 +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCrashClaim +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefDeluxeCombat +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFactionsUUID +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefGriefPrevention +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefIridiumSkyblock +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefKingdoms +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefLands +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefSuperiorSkyblock2 +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefTowny +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefWorldGuard +import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsHeadDatabase +import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsItemsAdder +import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsOraxen +import com.willfp.eco.internal.spigot.integrations.economy.EconomyVault +import com.willfp.eco.internal.spigot.integrations.hologram.HologramCMI +import com.willfp.eco.internal.spigot.integrations.hologram.HologramHolographicDisplays +import com.willfp.eco.internal.spigot.integrations.mcmmo.McmmoIntegrationImpl +import com.willfp.eco.internal.spigot.integrations.multiverseinventories.MultiverseInventoriesIntegration +import com.willfp.eco.internal.spigot.integrations.shop.ShopShopGuiPlus +import com.willfp.eco.internal.spigot.proxy.BlockBreakProxy +import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy +import com.willfp.eco.internal.spigot.proxy.SkullProxy +import com.willfp.eco.internal.spigot.proxy.TPSProxy +import com.willfp.eco.internal.spigot.recipes.ShapedRecipeListener import com.willfp.eco.util.BlockUtils import com.willfp.eco.util.ServerUtils import com.willfp.eco.util.SkullUtils @@ -86,7 +86,7 @@ import org.bukkit.inventory.ItemStack abstract class EcoSpigotPlugin : EcoPlugin( 773, 10043, - "com.willfp.eco.proxy", + "com.willfp.eco.internal.spigot.proxy", "&a" ) { init { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/arrows/ArrowDataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt similarity index 95% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/arrows/ArrowDataListener.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt index 60dc0525..55871b2e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/arrows/ArrowDataListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.arrows +package com.willfp.eco.internal.spigot.arrows import com.willfp.eco.core.EcoPlugin import org.bukkit.Material diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/DataListener.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/DataListener.kt index 2f17ff0f..8cadeabd 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/DataListener.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.data +package com.willfp.eco.internal.spigot.data import com.willfp.eco.core.Eco import com.willfp.eco.util.PlayerUtils diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoKeyRegistry.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoKeyRegistry.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoKeyRegistry.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoKeyRegistry.kt index 1869eb93..5bfb1b45 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoKeyRegistry.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoKeyRegistry.kt @@ -1,10 +1,10 @@ -package com.willfp.eco.spigot.data +package com.willfp.eco.internal.spigot.data import com.willfp.eco.core.Eco import com.willfp.eco.core.data.keys.KeyRegistry import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType -import com.willfp.eco.spigot.EcoSpigotPlugin +import com.willfp.eco.internal.spigot.EcoSpigotPlugin import org.bukkit.NamespacedKey class EcoKeyRegistry( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoPlayerProfileHandler.kt similarity index 92% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoPlayerProfileHandler.kt index 01923823..baa7fbd7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoPlayerProfileHandler.kt @@ -1,10 +1,10 @@ -package com.willfp.eco.spigot.data +package com.willfp.eco.internal.spigot.data import com.willfp.eco.core.data.PlayerProfile import com.willfp.eco.core.data.PlayerProfileHandler import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.internal.data.EcoPlayerProfile -import com.willfp.eco.spigot.data.storage.DataHandler +import com.willfp.eco.internal.spigot.data.storage.DataHandler import java.util.UUID class EcoPlayerProfileHandler( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/PlayerBlockListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/PlayerBlockListener.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt index 8ec070af..5befe494 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/PlayerBlockListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.data +package com.willfp.eco.internal.spigot.data import com.willfp.eco.core.EcoPlugin import org.bukkit.block.Block diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/DataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt similarity index 90% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/DataHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt index 5a686862..309c1a52 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/DataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.data.storage +package com.willfp.eco.internal.spigot.data.storage import com.willfp.eco.core.data.keys.PersistentDataKey import org.bukkit.NamespacedKey diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt similarity index 98% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt index 1ba08ea6..d0c89648 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt @@ -1,11 +1,11 @@ -package com.willfp.eco.spigot.data.storage +package com.willfp.eco.internal.spigot.data.storage import com.google.common.util.concurrent.ThreadFactoryBuilder import com.willfp.eco.core.Eco import com.willfp.eco.core.data.PlayerProfile import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType -import com.willfp.eco.spigot.EcoSpigotPlugin +import com.willfp.eco.internal.spigot.EcoSpigotPlugin import org.apache.logging.log4j.Level import org.bukkit.NamespacedKey import org.jetbrains.exposed.dao.id.UUIDTable diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/ProfileSaver.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt similarity index 89% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/ProfileSaver.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt index 9702d839..faf4d297 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/ProfileSaver.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.data.storage +package com.willfp.eco.internal.spigot.data.storage import com.willfp.eco.core.Eco import com.willfp.eco.core.EcoPlugin diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/YamlDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt similarity index 91% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/YamlDataHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt index 90b4f24f..2bee22dd 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/YamlDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt @@ -1,9 +1,9 @@ -package com.willfp.eco.spigot.data.storage +package com.willfp.eco.internal.spigot.data.storage import com.willfp.eco.core.config.yaml.YamlBaseConfig import com.willfp.eco.core.data.PlayerProfile import com.willfp.eco.core.data.keys.PersistentDataKey -import com.willfp.eco.spigot.EcoSpigotPlugin +import com.willfp.eco.internal.spigot.EcoSpigotPlugin import org.bukkit.NamespacedKey import java.util.UUID diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketAutoRecipe.kt similarity index 92% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketAutoRecipe.kt index a96b2a92..0c25da32 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketAutoRecipe.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display +package com.willfp.eco.internal.spigot.display import com.comphenix.protocol.PacketType import com.comphenix.protocol.ProtocolLibrary @@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer import com.comphenix.protocol.events.PacketEvent import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.proxy.AutoCraftProxy +import com.willfp.eco.internal.spigot.proxy.AutoCraftProxy import org.bukkit.entity.Player import java.lang.reflect.InvocationTargetException diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketChat.kt similarity index 91% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketChat.kt index aabd0330..6df2f562 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketChat.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display +package com.willfp.eco.internal.spigot.display import com.comphenix.protocol.PacketType import com.comphenix.protocol.events.ListenerPriority @@ -7,7 +7,7 @@ import com.comphenix.protocol.events.PacketEvent import com.comphenix.protocol.wrappers.WrappedChatComponent import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.proxy.ChatComponentProxy +import com.willfp.eco.internal.spigot.proxy.ChatComponentProxy import org.bukkit.entity.Player class PacketChat(plugin: EcoPlugin) : diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketOpenWindowMerchant.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketOpenWindowMerchant.kt index e23fee9b..1971c40c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketOpenWindowMerchant.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display +package com.willfp.eco.internal.spigot.display import com.comphenix.protocol.PacketType import com.comphenix.protocol.events.ListenerPriority @@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer import com.comphenix.protocol.events.PacketEvent import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.proxy.VillagerTradeProxy +import com.willfp.eco.internal.spigot.proxy.VillagerTradeProxy import com.willfp.eco.util.NamespacedKeyUtils import org.bukkit.entity.Player import org.bukkit.inventory.ItemFlag diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketSetCreativeSlot.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketSetCreativeSlot.kt similarity index 81% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketSetCreativeSlot.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketSetCreativeSlot.kt index 4b3f5b20..ec406ff6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketSetCreativeSlot.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketSetCreativeSlot.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display +package com.willfp.eco.internal.spigot.display import com.comphenix.protocol.PacketType import com.comphenix.protocol.events.PacketContainer @@ -6,8 +6,8 @@ import com.comphenix.protocol.events.PacketEvent import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.display.Display -import com.willfp.eco.spigot.display.frame.DisplayFrame -import com.willfp.eco.spigot.display.frame.lastDisplayFrame +import com.willfp.eco.internal.spigot.display.frame.DisplayFrame +import com.willfp.eco.internal.spigot.display.frame.lastDisplayFrame import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketSetSlot.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketSetSlot.kt similarity index 81% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketSetSlot.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketSetSlot.kt index 953a452b..5a600d00 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketSetSlot.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketSetSlot.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display +package com.willfp.eco.internal.spigot.display import com.comphenix.protocol.PacketType import com.comphenix.protocol.events.PacketContainer @@ -6,8 +6,8 @@ import com.comphenix.protocol.events.PacketEvent import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.display.Display -import com.willfp.eco.spigot.display.frame.DisplayFrame -import com.willfp.eco.spigot.display.frame.lastDisplayFrame +import com.willfp.eco.internal.spigot.display.frame.DisplayFrame +import com.willfp.eco.internal.spigot.display.frame.lastDisplayFrame import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketWindowItems.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketWindowItems.kt similarity index 95% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketWindowItems.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketWindowItems.kt index 43bb7a81..c66afb1e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketWindowItems.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketWindowItems.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display +package com.willfp.eco.internal.spigot.display import com.comphenix.protocol.PacketType import com.comphenix.protocol.ProtocolLibrary @@ -9,9 +9,9 @@ import com.willfp.eco.core.AbstractPacketAdapter import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.display.Display import com.willfp.eco.core.fast.FastItemStack -import com.willfp.eco.spigot.display.frame.DisplayFrame -import com.willfp.eco.spigot.display.frame.HashedItem -import com.willfp.eco.spigot.display.frame.lastDisplayFrame +import com.willfp.eco.internal.spigot.display.frame.DisplayFrame +import com.willfp.eco.internal.spigot.display.frame.HashedItem +import com.willfp.eco.internal.spigot.display.frame.lastDisplayFrame import com.willfp.eco.util.ServerUtils import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/frame/DisplayFrame.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/frame/DisplayFrame.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/frame/DisplayFrame.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/frame/DisplayFrame.kt index e6f82790..2df4dff9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/frame/DisplayFrame.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/frame/DisplayFrame.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.display.frame +package com.willfp.eco.internal.spigot.display.frame import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/drops/CollatedRunnable.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/drops/CollatedRunnable.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/drops/CollatedRunnable.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/drops/CollatedRunnable.kt index c25909b2..e052b7e7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/drops/CollatedRunnable.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/drops/CollatedRunnable.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.drops +package com.willfp.eco.internal.spigot.drops import com.willfp.eco.core.EcoPlugin import com.willfp.eco.internal.drops.impl.EcoDropQueue diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityBuilder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/EntityDeathByEntityBuilder.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityBuilder.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/EntityDeathByEntityBuilder.kt index 7a6902e2..efeead08 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityBuilder.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/EntityDeathByEntityBuilder.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners +package com.willfp.eco.internal.spigot.eventlisteners import com.willfp.eco.core.events.EntityDeathByEntityEvent import org.apache.commons.lang.Validate diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/EntityDeathByEntityListeners.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/EntityDeathByEntityListeners.kt index 23d4bedf..5d674a38 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/EntityDeathByEntityListeners.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners +package com.willfp.eco.internal.spigot.eventlisteners import com.willfp.eco.core.EcoPlugin import org.bukkit.entity.LivingEntity diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/NaturalExpGainBuilder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/NaturalExpGainBuilder.kt similarity index 92% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/NaturalExpGainBuilder.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/NaturalExpGainBuilder.kt index 3cc12637..3617571c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/NaturalExpGainBuilder.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/NaturalExpGainBuilder.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners +package com.willfp.eco.internal.spigot.eventlisteners import com.willfp.eco.core.events.NaturalExpGainEvent import org.apache.commons.lang.Validate diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/NaturalExpGainListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/NaturalExpGainListeners.kt similarity index 96% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/NaturalExpGainListeners.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/NaturalExpGainListeners.kt index eb431de9..93cb976a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/NaturalExpGainListeners.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/NaturalExpGainListeners.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners +package com.willfp.eco.internal.spigot.eventlisteners import org.bukkit.event.EventHandler import org.bukkit.event.Listener diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/PlayerJumpListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/PlayerJumpListeners.kt similarity index 96% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/PlayerJumpListeners.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/PlayerJumpListeners.kt index a8e667cc..3ef30a6c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/PlayerJumpListeners.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/PlayerJumpListeners.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners +package com.willfp.eco.internal.spigot.eventlisteners import com.willfp.eco.core.events.PlayerJumpEvent import com.willfp.eco.core.integrations.mcmmo.McmmoManager diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorChangeEventListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorChangeEventListeners.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorChangeEventListeners.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorChangeEventListeners.kt index 8f555910..0b6624db 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorChangeEventListeners.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorChangeEventListeners.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners.armor +package com.willfp.eco.internal.spigot.eventlisteners.armor import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.events.ArmorChangeEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorListener.kt similarity index 99% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorListener.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorListener.kt index 0621c79b..c555e9a9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorListener.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners.armor +package com.willfp.eco.internal.spigot.eventlisteners.armor import com.willfp.eco.core.events.ArmorEquipEvent import org.bukkit.Bukkit diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorType.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorType.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorType.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorType.kt index 4bf9855a..f261015b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/eventlisteners/armor/ArmorType.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/eventlisteners/armor/ArmorType.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.eventlisteners.armor +package com.willfp.eco.internal.spigot.eventlisteners.armor import org.bukkit.inventory.ItemStack enum class ArmorType(val slot: Int) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/gui/GUIListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt similarity index 98% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/gui/GUIListener.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt index bd68d174..41fb57ef 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/gui/GUIListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.gui +package com.willfp.eco.internal.spigot.gui import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.drops.DropQueue diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/afk/AFKIntegrationCMI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt similarity index 86% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/afk/AFKIntegrationCMI.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt index b6e8cf18..4ac9d374 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/afk/AFKIntegrationCMI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.afk +package com.willfp.eco.internal.spigot.integrations.afk import com.Zrips.CMI.CMI import com.willfp.eco.core.integrations.afk.AFKWrapper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/afk/AFKIntegrationEssentials.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt similarity index 89% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/afk/AFKIntegrationEssentials.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt index c2c13e2c..ffb7f205 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/afk/AFKIntegrationEssentials.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.afk +package com.willfp.eco.internal.spigot.integrations.afk import com.earth2me.essentials.Essentials import com.willfp.eco.core.integrations.afk.AFKWrapper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt similarity index 91% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt index 5f0d4692..12e3787e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.anticheat +package com.willfp.eco.internal.spigot.integrations.anticheat import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper import me.konsolas.aac.api.AACAPI diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAlice.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAlice.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt index 40130cba..0a52a35d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAlice.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.anticheat +package com.willfp.eco.internal.spigot.integrations.anticheat import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper import me.nik.alice.api.events.AliceViolationEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt index 79152d44..7b0c1445 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.anticheat +package com.willfp.eco.internal.spigot.integrations.anticheat import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper import me.rerere.matrix.api.events.PlayerViolationEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt index 870870b7..797e56c2 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.anticheat +package com.willfp.eco.internal.spigot.integrations.anticheat import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper import fr.neatmonster.nocheatplus.checks.CheckType diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt index 2c1b2f2f..22ac4904 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.anticheat +package com.willfp.eco.internal.spigot.integrations.anticheat import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper import me.vagdedes.spartan.api.PlayerViolationEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt index 26356aa3..3bc84d0a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.anticheat +package com.willfp.eco.internal.spigot.integrations.anticheat import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper import me.frep.vulcan.api.event.VulcanFlagEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefBentoBox.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefBentoBox.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt index 4c8a8ab8..c682382a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefBentoBox.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper import org.bukkit.Location diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt index e699a2ca..a00e1789 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.SirBlobman.combatlogx.api.ICombatLogX import com.SirBlobman.combatlogx.api.expansion.Expansion diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt index c4b1f16b..32960a4a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.github.sirblobman.combatlogx.api.ICombatLogX import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCrashClaim.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCrashClaim.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt index c2c5a1f1..d06db3d9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCrashClaim.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper import net.crashcraft.crashclaim.CrashClaim diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt index 031438d7..26f0cd1c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper import nl.marido.deluxecombat.api.DeluxeCombatAPI diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt index 0bd3203d..d64037eb 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.massivecraft.factions.Board import com.massivecraft.factions.FLocation diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt index 26f9fccd..de6eb790 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper import me.ryanhamshire.GriefPrevention.Claim diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt index 0f910e6c..36d67007 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.iridium.iridiumskyblock.PermissionType import com.iridium.iridiumskyblock.api.IridiumSkyblockAPI diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt index 410b3e02..8c71c150 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper import org.bukkit.Location diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt index e1cad9f2..0feede36 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt index 9e87018d..5e26a042 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.bgsoftware.superiorskyblock.api.SuperiorSkyblockAPI import com.bgsoftware.superiorskyblock.api.enums.HitActionResult diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt similarity index 97% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt index a0742fcb..0dd4396c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.palmergames.bukkit.towny.TownyAPI import com.palmergames.bukkit.towny.TownyUniverse diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt similarity index 98% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt index 72b9756b..c307a630 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.antigrief +package com.willfp.eco.internal.spigot.integrations.antigrief import com.sk89q.worldedit.bukkit.BukkitAdapter import com.sk89q.worldguard.LocalPlayer diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/bstats/MetricHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/MetricHandler.kt similarity index 91% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/bstats/MetricHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/MetricHandler.kt index 9d44d2df..372b80c5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/bstats/MetricHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/MetricHandler.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.bstats +package com.willfp.eco.internal.spigot.integrations.bstats import com.willfp.eco.core.EcoPlugin import org.bstats.bukkit.Metrics diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsHeadDatabase.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt similarity index 96% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsHeadDatabase.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt index 1fc68cfe..442fd8f8 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsHeadDatabase.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.customitems +package com.willfp.eco.internal.spigot.integrations.customitems import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsItemsAdder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt similarity index 95% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsItemsAdder.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt index dbf21688..5f46e81a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsItemsAdder.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.customitems +package com.willfp.eco.internal.spigot.integrations.customitems import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper import com.willfp.eco.core.items.CustomItem diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt index 6752ba2e..567dc8ce 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.customitems +package com.willfp.eco.internal.spigot.integrations.customitems import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper import com.willfp.eco.core.items.CustomItem diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/economy/EconomyVault.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/economy/EconomyVault.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt index 03775d27..f1bbef47 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/economy/EconomyVault.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.economy +package com.willfp.eco.internal.spigot.integrations.economy import com.willfp.eco.core.integrations.economy.EconomyWrapper import net.milkbowl.vault.economy.Economy diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramCMI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramCMI.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt index 1559bae9..5f02c00e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramCMI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.hologram +package com.willfp.eco.internal.spigot.integrations.hologram import com.Zrips.CMI.CMI import com.Zrips.CMI.Modules.Holograms.CMIHologram diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramGHolo.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt similarity index 93% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramGHolo.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt index 165cb773..2248dbc5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramGHolo.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.hologram +package com.willfp.eco.internal.spigot.integrations.hologram import com.willfp.eco.core.integrations.hologram.Hologram import com.willfp.eco.core.integrations.hologram.HologramWrapper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramHolographicDisplays.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramHolographicDisplays.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt index 18e6ee2e..f8bdb070 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/hologram/HologramHolographicDisplays.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.hologram +package com.willfp.eco.internal.spigot.integrations.hologram import com.gmail.filoghost.holographicdisplays.api.HologramsAPI import com.willfp.eco.core.EcoPlugin diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt similarity index 94% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt index ea2a09a4..af406e2a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.mcmmo +package com.willfp.eco.internal.spigot.integrations.mcmmo import com.gmail.nossr50.datatypes.meta.BonusDropMeta import com.gmail.nossr50.events.fake.FakeEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/multiverseinventories/MultiverseInventoriesIntegration.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/multiverseinventories/MultiverseInventoriesIntegration.kt similarity index 90% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/multiverseinventories/MultiverseInventoriesIntegration.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/multiverseinventories/MultiverseInventoriesIntegration.kt index d6c4e0ee..49968cdf 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/multiverseinventories/MultiverseInventoriesIntegration.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/multiverseinventories/MultiverseInventoriesIntegration.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.multiverseinventories +package com.willfp.eco.internal.spigot.integrations.multiverseinventories import com.onarandombox.multiverseinventories.event.WorldChangeShareHandlingEvent import com.willfp.eco.core.EcoPlugin diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/shop/ShopShopGuiPlus.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt similarity index 95% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/shop/ShopShopGuiPlus.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt index 0da98d8f..a126f775 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/shop/ShopShopGuiPlus.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.spigot.integrations.shop +package com.willfp.eco.internal.spigot.integrations.shop import com.willfp.eco.core.integrations.shop.ShopWrapper import com.willfp.eco.core.items.Items diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index e1652306..7b19f5d5 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: eco version: ${projectVersion} -main: com.willfp.eco.spigot.EcoHandler +main: com.willfp.eco.internal.spigot.EcoHandler api-version: 1.16 authors: [ Auxilor ] website: willfp.com diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/AutoCraftProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt similarity index 73% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/AutoCraftProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt index 5abbf997..6eff274d 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/AutoCraftProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.proxy.AbstractProxy diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/BlockBreakProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt similarity index 83% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/BlockBreakProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt index 98c66a2d..173e28f2 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/BlockBreakProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.block.Block diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/ChatComponentProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt similarity index 82% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/ChatComponentProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt index 96d29429..c8997a6c 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/ChatComponentProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.entity.Player diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/FastItemStackFactoryProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt similarity index 84% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/FastItemStackFactoryProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt index bcc463a4..7e8a4f23 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/FastItemStackFactoryProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.fast.FastItemStack import com.willfp.eco.core.proxy.AbstractProxy diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/SkullProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt similarity index 85% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/SkullProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt index c02d5241..6bc8760a 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/SkullProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.inventory.meta.SkullMeta diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/TPSProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt similarity index 71% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/TPSProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt index 9fd63394..09edf58c 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/TPSProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.proxy.AbstractProxy diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/VillagerTradeProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt similarity index 85% rename from eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/VillagerTradeProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt index 6414b92e..49615076 100644 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/VillagerTradeProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt @@ -1,4 +1,4 @@ -package com.willfp.eco.proxy +package com.willfp.eco.internal.spigot.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.entity.Player