diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/RecipePacket.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/RecipePacket.kt deleted file mode 100644 index ad1d35de..00000000 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/RecipePacket.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.willfp.eco.internal.spigot.proxy.v1_17_R1 - -import com.willfp.eco.internal.spigot.proxy.RecipePacketProxy -import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket - -class RecipePacket : RecipePacketProxy { - override fun splitPacket(packet: Any): List { - packet as ClientboundUpdateRecipesPacket - - val packets = mutableListOf() - - for (list in packet.recipes.chunked(64)) { - packets.add(ClientboundUpdateRecipesPacket(list)) - } - - return packets - } -} diff --git a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/RecipePacket.kt b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/RecipePacket.kt deleted file mode 100644 index 214e0f1a..00000000 --- a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/RecipePacket.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.willfp.eco.internal.spigot.proxy.v1_18_R1 - -import com.willfp.eco.internal.spigot.proxy.RecipePacketProxy -import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket - -class RecipePacket : RecipePacketProxy { - override fun splitPacket(packet: Any): List { - packet as ClientboundUpdateRecipesPacket - - val packets = mutableListOf() - - for (list in packet.recipes.chunked(64)) { - packets.add(ClientboundUpdateRecipesPacket(list)) - } - - return packets - } -} diff --git a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/RecipePacket.kt b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/RecipePacket.kt deleted file mode 100644 index 5ac39f23..00000000 --- a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/RecipePacket.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.willfp.eco.internal.spigot.proxy.v1_18_R2 - -import com.willfp.eco.internal.spigot.proxy.RecipePacketProxy -import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket - -class RecipePacket : RecipePacketProxy { - override fun splitPacket(packet: Any): List { - packet as ClientboundUpdateRecipesPacket - - val packets = mutableListOf() - - for (list in packet.recipes.chunked(64)) { - packets.add(ClientboundUpdateRecipesPacket(list)) - } - - return packets - } -} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt index 7c501d18..071f22cc 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt @@ -115,7 +115,6 @@ 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.CraftingRecipeListener -import com.willfp.eco.internal.spigot.recipes.RecipePacketFixer import com.willfp.eco.internal.spigot.recipes.StackedRecipeListener import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInComplex import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInVanilla @@ -345,8 +344,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() { PacketSetSlot(this), PacketWindowItems(this), PacketHeldWindowItems(this), - PacketOpenWindowMerchant(this), - RecipePacketFixer(this) + PacketOpenWindowMerchant(this) ) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/RecipePacketFixer.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/RecipePacketFixer.kt deleted file mode 100644 index 2cf01704..00000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/RecipePacketFixer.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.willfp.eco.internal.spigot.recipes - -import com.comphenix.protocol.PacketType -import com.comphenix.protocol.ProtocolLibrary -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.internal.spigot.proxy.RecipePacketProxy -import org.bukkit.entity.Player - -class RecipePacketFixer( - plugin: EcoPlugin -) : AbstractPacketAdapter( - plugin, - PacketType.Play.Server.RECIPE_UPDATE, - false -) { - override fun onSend(packet: PacketContainer, player: Player, event: PacketEvent) { - val nmsPackets = this.getPlugin().getProxy(RecipePacketProxy::class.java).splitPacket(packet.handle) - - if (nmsPackets.size <= 1) { - return - } - - event.isCancelled = true - for (nmsPacket in nmsPackets) { - val protocolLibPacket = PacketContainer.fromPacket(nmsPacket) - ProtocolLibrary.getProtocolManager().sendServerPacket(player, protocolLibPacket, false) - } - } -} diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/RecipePacketProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/RecipePacketProxy.kt deleted file mode 100644 index c0b37500..00000000 --- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/RecipePacketProxy.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.willfp.eco.internal.spigot.proxy - -interface RecipePacketProxy { - fun splitPacket(packet: Any): List -} \ No newline at end of file