diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java index 53b256f8..08f7a579 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java +++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java @@ -5,7 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.willfp.eco.core.display.Display; -import proxy.ChatComponentProxy; +import com.willfp.eco.proxy.ChatComponentProxy; import net.minecraft.server.v1_16_R3.ChatBaseComponent; import net.minecraft.server.v1_16_R3.ChatHoverable; import net.minecraft.server.v1_16_R3.ChatMessage; 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/proxy/v1_16_R3/AutoCraft.kt index 9ccd1bf3..373235e8 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/proxy/v1_16_R3/AutoCraft.kt @@ -1,5 +1,5 @@ package com.willfp.eco.proxy.v1_16_R3 -import proxy.AutoCraftProxy +import com.willfp.eco.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/proxy/v1_16_R3/BlockBreak.kt index 7281aaee..df44468c 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/proxy/v1_16_R3/BlockBreak.kt @@ -1,5 +1,5 @@ package com.willfp.eco.proxy.v1_16_R3 -import proxy.BlockBreakProxy +import com.willfp.eco.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/FastItemStackFactory.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.kt index 0ca9f335..89d683bc 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/proxy/v1_16_R3/FastItemStackFactory.kt @@ -1,6 +1,6 @@ package com.willfp.eco.proxy.v1_16_R3 import com.willfp.eco.core.fast.FastItemStack -import proxy.FastItemStackFactoryProxy +import com.willfp.eco.proxy.FastItemStackFactoryProxy import com.willfp.eco.proxy.v1_16_R3.fast.NMSFastItemStack 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/Skull.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/Skull.kt index 390f8a1a..6f9a1823 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/proxy/v1_16_R3/Skull.kt @@ -2,7 +2,7 @@ package com.willfp.eco.proxy.v1_16_R3 import com.mojang.authlib.GameProfile import com.mojang.authlib.properties.Property import org.bukkit.inventory.meta.SkullMeta -import proxy.SkullProxy +import com.willfp.eco.proxy.SkullProxy import java.lang.reflect.Method import java.util.* 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/proxy/v1_16_R3/VillagerTrade.kt index 69e60788..eeefd816 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/proxy/v1_16_R3/VillagerTrade.kt @@ -3,7 +3,7 @@ import com.willfp.eco.core.display.Display import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe import org.bukkit.entity.Player import org.bukkit.inventory.MerchantRecipe -import proxy.VillagerTradeProxy +import com.willfp.eco.proxy.VillagerTradeProxy import java.lang.reflect.Field class VillagerTrade : VillagerTradeProxy { diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java index 86e57fd4..5a72e0fe 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java +++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java @@ -16,7 +16,7 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; -import proxy.ChatComponentProxy; +import com.willfp.eco.proxy.ChatComponentProxy; public final class ChatComponent implements ChatComponentProxy { @Override 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/proxy/v1_17_R1/AutoCraft.kt index 7d518532..d48ebc29 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/proxy/v1_17_R1/AutoCraft.kt @@ -2,7 +2,7 @@ package com.willfp.eco.proxy.v1_17_R1 import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket import net.minecraft.resources.ResourceLocation -import proxy.AutoCraftProxy +import com.willfp.eco.proxy.AutoCraftProxy class AutoCraft : AutoCraftProxy { @Throws(NoSuchFieldException::class, IllegalAccessException::class) 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/proxy/v1_17_R1/BlockBreak.kt index e8863c50..430d8d5d 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/proxy/v1_17_R1/BlockBreak.kt @@ -2,7 +2,7 @@ package com.willfp.eco.proxy.v1_17_R1 import org.bukkit.block.Block import org.bukkit.entity.Player -import proxy.BlockBreakProxy +import com.willfp.eco.proxy.BlockBreakProxy class BlockBreak : BlockBreakProxy { override fun breakBlock( 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/proxy/v1_17_R1/FastItemStackFactory.kt index f4c6c265..9128cc77 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/proxy/v1_17_R1/FastItemStackFactory.kt @@ -3,7 +3,7 @@ package com.willfp.eco.proxy.v1_17_R1 import com.willfp.eco.core.fast.FastItemStack import com.willfp.eco.proxy.v1_17_R1.fast.NMSFastItemStack import org.bukkit.inventory.ItemStack -import proxy.FastItemStackFactoryProxy +import com.willfp.eco.proxy.FastItemStackFactoryProxy class FastItemStackFactory : FastItemStackFactoryProxy { override fun create(itemStack: ItemStack): FastItemStack { 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/proxy/v1_17_R1/Skull.kt index 47c2585c..a4edcfd6 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/proxy/v1_17_R1/Skull.kt @@ -2,8 +2,8 @@ package com.willfp.eco.proxy.v1_17_R1 import com.mojang.authlib.GameProfile import com.mojang.authlib.properties.Property +import com.willfp.eco.proxy.SkullProxy import org.bukkit.inventory.meta.SkullMeta -import proxy.SkullProxy import java.lang.reflect.Method import java.util.* 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/proxy/v1_17_R1/VillagerTrade.kt index 971c1243..9228b558 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/proxy/v1_17_R1/VillagerTrade.kt @@ -5,7 +5,7 @@ import net.minecraft.world.item.trading.MerchantOffer import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMerchantRecipe import org.bukkit.entity.Player import org.bukkit.inventory.MerchantRecipe -import proxy.VillagerTradeProxy +import com.willfp.eco.proxy.VillagerTradeProxy import java.lang.reflect.Field class VillagerTrade : VillagerTradeProxy { 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/spigot/EcoHandler.kt index b5b32bea..b45192b0 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/spigot/EcoHandler.kt @@ -33,7 +33,7 @@ import com.willfp.eco.internal.proxy.EcoProxyFactory import com.willfp.eco.internal.scheduling.EcoScheduler import com.willfp.eco.spigot.integrations.bstats.MetricHandler import org.bukkit.inventory.ItemStack -import proxy.FastItemStackFactoryProxy +import com.willfp.eco.proxy.FastItemStackFactoryProxy import java.util.logging.Logger @Suppress("UNUSED") 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/spigot/EcoSpigotPlugin.kt index 6b0a72ba..b57e1a6e 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/spigot/EcoSpigotPlugin.kt @@ -9,9 +9,9 @@ import com.willfp.eco.core.integrations.antigrief.AntigriefManager import com.willfp.eco.core.integrations.customitems.CustomItemsManager import com.willfp.eco.core.integrations.mcmmo.McmmoManager import com.willfp.eco.internal.drops.DropManager -import proxy.BlockBreakProxy -import proxy.FastItemStackFactoryProxy -import proxy.SkullProxy +import com.willfp.eco.proxy.BlockBreakProxy +import com.willfp.eco.proxy.FastItemStackFactoryProxy +import com.willfp.eco.proxy.SkullProxy import com.willfp.eco.spigot.arrows.ArrowDataListener import com.willfp.eco.spigot.display.* import com.willfp.eco.spigot.drops.CollatedRunnable 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/spigot/display/PacketAutoRecipe.kt index f77a2ab8..456e5e49 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/spigot/display/PacketAutoRecipe.kt @@ -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 proxy.AutoCraftProxy +import com.willfp.eco.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/spigot/display/PacketChat.kt index c7fc66c7..59d6728d 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/spigot/display/PacketChat.kt @@ -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 proxy.ChatComponentProxy +import com.willfp.eco.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/spigot/display/PacketOpenWindowMerchant.kt index 0d186e31..5e20eba9 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/spigot/display/PacketOpenWindowMerchant.kt @@ -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 proxy.VillagerTradeProxy +import com.willfp.eco.proxy.VillagerTradeProxy import com.willfp.eco.util.NamespacedKeyUtils import org.bukkit.entity.Player import org.bukkit.inventory.ItemFlag diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/AutoCraftProxy.kt similarity index 87% rename from eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/AutoCraftProxy.kt index 8f4122b5..1ce241ac 100644 --- a/eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/AutoCraftProxy.kt @@ -1,4 +1,4 @@ -package proxy +package com.willfp.eco.proxy import com.willfp.eco.core.proxy.AbstractProxy diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/BlockBreakProxy.kt similarity index 88% rename from eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/BlockBreakProxy.kt index 3611f6bb..98c66a2d 100644 --- a/eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/BlockBreakProxy.kt @@ -1,4 +1,4 @@ -package proxy +package com.willfp.eco.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.block.Block diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/ChatComponentProxy.kt similarity index 87% rename from eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/ChatComponentProxy.kt index 9197c7e8..6af7b461 100644 --- a/eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/ChatComponentProxy.kt @@ -1,4 +1,4 @@ -package proxy +package com.willfp.eco.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.entity.Player diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/FastItemStackFactoryProxy.kt similarity index 89% rename from eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/FastItemStackFactoryProxy.kt index 4e085a2f..bcc463a4 100644 --- a/eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/FastItemStackFactoryProxy.kt @@ -1,4 +1,4 @@ -package proxy +package com.willfp.eco.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/proxy/SkullProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/SkullProxy.kt similarity index 87% rename from eco-core/core-proxy/src/main/kotlin/proxy/SkullProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/SkullProxy.kt index 6ad27243..1190f081 100644 --- a/eco-core/core-proxy/src/main/kotlin/proxy/SkullProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/SkullProxy.kt @@ -1,4 +1,4 @@ -package proxy +package com.willfp.eco.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.inventory.meta.SkullMeta diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/VillagerTradeProxy.kt similarity index 90% rename from eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt rename to eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/VillagerTradeProxy.kt index 3369e0e7..6414b92e 100644 --- a/eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt +++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/proxy/VillagerTradeProxy.kt @@ -1,4 +1,4 @@ -package proxy +package com.willfp.eco.proxy import com.willfp.eco.core.proxy.AbstractProxy import org.bukkit.entity.Player