diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java b/proxy/src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java index 5104998..9ab1bfa 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C00PacketKeepAlive implements Packet +public class C00PacketKeepAlive implements Packet { private int key; @@ -22,7 +22,7 @@ public class C00PacketKeepAlive implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processKeepAlive(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java b/proxy/src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java index 59a06c0..ed685d7 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C01PacketChatMessage implements Packet +public class C01PacketChatMessage implements Packet { private String message; @@ -43,7 +43,7 @@ public class C01PacketChatMessage implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processChatMessage(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java b/proxy/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java index 15ec404..096893a 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C02PacketUseEntity implements Packet +public class C02PacketUseEntity implements Packet { private int entityId; private C02PacketUseEntity.Action action; @@ -49,7 +49,7 @@ public class C02PacketUseEntity implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processUseEntity(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java b/proxy/src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java index 34abcf0..5eea948 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C03PacketPlayer implements Packet +public class C03PacketPlayer implements Packet { protected double x; protected double y; @@ -20,7 +20,7 @@ public class C03PacketPlayer implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processPlayer(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java b/proxy/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java index 4fef1a1..34c20ee 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class C07PacketPlayerDigging implements Packet +public class C07PacketPlayerDigging implements Packet { private BlockPos position; private byte facing; @@ -36,7 +36,7 @@ public class C07PacketPlayerDigging implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processPlayerDigging(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java b/proxy/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java index 0a7ace4..02eb2b8 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java @@ -2,13 +2,13 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; import proxy.util.ItemStack; -public class C08PacketPlayerBlockPlacement implements Packet +public class C08PacketPlayerBlockPlacement implements Packet { private BlockPos position; private int placedBlockDirection; @@ -46,7 +46,7 @@ public class C08PacketPlayerBlockPlacement implements Packet +public class C09PacketHeldItemChange implements Packet { private int slotId; @@ -29,7 +29,7 @@ public class C09PacketHeldItemChange implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processHeldItemChange(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java b/proxy/src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java index 154c29a..3a97056 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C0APacketAnimation implements Packet +public class C0APacketAnimation implements Packet { /** * Reads the raw packet data from the data stream. @@ -25,7 +25,7 @@ public class C0APacketAnimation implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleAnimation(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java b/proxy/src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java index 4dde06e..b9f3ac8 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C0BPacketEntityAction implements Packet +public class C0BPacketEntityAction implements Packet { private int entityID; private C0BPacketEntityAction.Action action; @@ -35,7 +35,7 @@ public class C0BPacketEntityAction implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processEntityAction(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C0CPacketInput.java b/proxy/src/main/java/net/minecraft/network/play/client/C0CPacketInput.java index d323ebd..550f455 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C0CPacketInput.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C0CPacketInput.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C0CPacketInput implements Packet +public class C0CPacketInput implements Packet { private float strafeSpeed; private float forwardSpeed; @@ -50,7 +50,7 @@ public class C0CPacketInput implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processInput(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java b/proxy/src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java index 72569d8..5d682bd 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java @@ -2,18 +2,18 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C0DPacketCloseWindow implements Packet +public class C0DPacketCloseWindow implements Packet { private int windowId; /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processCloseWindow(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java b/proxy/src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java index d35f477..8751cb7 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ItemStack; -public class C0EPacketClickWindow implements Packet +public class C0EPacketClickWindow implements Packet { private int windowId; private int slotId; @@ -19,7 +19,7 @@ public class C0EPacketClickWindow implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processClickWindow(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java b/proxy/src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java index 52d45da..95e85c4 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C0FPacketConfirmTransaction implements Packet +public class C0FPacketConfirmTransaction implements Packet { private int windowId; private short uid; @@ -15,7 +15,7 @@ public class C0FPacketConfirmTransaction implements Packet +public class C10PacketCreativeInventoryAction implements Packet { private int slotId; private ItemStack stack; @@ -15,7 +15,7 @@ public class C10PacketCreativeInventoryAction implements Packet +public class C11PacketEnchantItem implements Packet { private int windowId; private int button; @@ -14,7 +14,7 @@ public class C11PacketEnchantItem implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processEnchantItem(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java b/proxy/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java index 5803222..855af2f 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java @@ -2,13 +2,13 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; import proxy.util.ChatComponent; -public class C12PacketUpdateSign implements Packet +public class C12PacketUpdateSign implements Packet { private BlockPos pos; private ChatComponent[] lines; @@ -47,7 +47,7 @@ public class C12PacketUpdateSign implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processUpdateSign(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java b/proxy/src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java index b6f31ae..4030707 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C13PacketPlayerAbilities implements Packet +public class C13PacketPlayerAbilities implements Packet { private boolean invulnerable; private boolean flying; @@ -64,7 +64,7 @@ public class C13PacketPlayerAbilities implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processPlayerAbilities(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java b/proxy/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java index c95a196..102f955 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class C14PacketTabComplete implements Packet +public class C14PacketTabComplete implements Packet { private String message; private BlockPos targetBlock; @@ -59,7 +59,7 @@ public class C14PacketTabComplete implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processTabComplete(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java b/proxy/src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java index e197eb1..2f327f4 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C15PacketClientSettings implements Packet +public class C15PacketClientSettings implements Packet { private String lang; private int view; @@ -41,7 +41,7 @@ public class C15PacketClientSettings implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processClientSettings(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java b/proxy/src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java index e050804..e1d86cc 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C16PacketClientStatus implements Packet +public class C16PacketClientStatus implements Packet { private C16PacketClientStatus.EnumState status; @@ -29,7 +29,7 @@ public class C16PacketClientStatus implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processClientStatus(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java b/proxy/src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java index 9520b6b..d51ed21 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java @@ -5,11 +5,11 @@ import io.netty.buffer.Unpooled; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C17PacketCustomPayload implements Packet +public class C17PacketCustomPayload implements Packet { private String channel; private PacketBuffer data; @@ -44,7 +44,7 @@ public class C17PacketCustomPayload implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.processVanilla250Packet(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java b/proxy/src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java index f681712..544e7d7 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java @@ -3,11 +3,11 @@ package net.minecraft.network.play.client; import java.io.IOException; import java.util.UUID; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C18PacketSpectate implements Packet +public class C18PacketSpectate implements Packet { private UUID id; @@ -30,7 +30,7 @@ public class C18PacketSpectate implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayServer handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpectate(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java b/proxy/src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java index 5651490..7a693cf 100755 --- a/proxy/src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java +++ b/proxy/src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.client; import java.io.IOException; -import proxy.network.INetHandlerPlayServer; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class C19PacketResourcePackStatus implements Packet +public class C19PacketResourcePackStatus implements Packet { private String hash; private C19PacketResourcePackStatus.Action status; @@ -32,7 +32,7 @@ public class C19PacketResourcePackStatus implements Packet +public class S00PacketKeepAlive implements Packet { private int id; @@ -22,7 +22,7 @@ public class S00PacketKeepAlive implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleKeepAlive(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java b/proxy/src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java index 177bf80..065e042 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S01PacketJoinGame implements Packet +public class S01PacketJoinGame implements Packet { private int entityId; private boolean hardcoreMode; @@ -74,7 +74,7 @@ public class S01PacketJoinGame implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleJoinGame(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S02PacketChat.java b/proxy/src/main/java/net/minecraft/network/play/server/S02PacketChat.java index 9201716..28528b6 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S02PacketChat.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S02PacketChat.java @@ -2,13 +2,13 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ChatComponent; import proxy.util.ChatComponentText; -public class S02PacketChat implements Packet +public class S02PacketChat implements Packet { private ChatComponent chatComponent; private byte type; @@ -44,7 +44,7 @@ public class S02PacketChat implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleChat(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java b/proxy/src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java index 59f51ce..ff9a8c9 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S03PacketTimeUpdate implements Packet +public class S03PacketTimeUpdate implements Packet { private long totalWorldTime; private long worldTime; @@ -52,7 +52,7 @@ public class S03PacketTimeUpdate implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleTimeUpdate(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java b/proxy/src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java index 18d7b11..dbba47e 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ItemStack; -public class S04PacketEntityEquipment implements Packet +public class S04PacketEntityEquipment implements Packet { private int entityID; private int equipmentSlot; @@ -36,7 +36,7 @@ public class S04PacketEntityEquipment implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityEquipment(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java b/proxy/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java index 94bac60..8e536c4 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S05PacketSpawnPosition implements Packet +public class S05PacketSpawnPosition implements Packet { private BlockPos spawnBlockPos; @@ -30,7 +30,7 @@ public class S05PacketSpawnPosition implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpawnPosition(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java b/proxy/src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java index 54ea08f..144081f 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S06PacketUpdateHealth implements Packet +public class S06PacketUpdateHealth implements Packet { private float health; private int foodLevel; @@ -35,7 +35,7 @@ public class S06PacketUpdateHealth implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleUpdateHealth(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java b/proxy/src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java index 00ff950..845a512 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S07PacketRespawn implements Packet +public class S07PacketRespawn implements Packet { private int dimensionID; private byte difficulty; @@ -28,7 +28,7 @@ public class S07PacketRespawn implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleRespawn(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java b/proxy/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java index 2769d4c..26edce3 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java @@ -5,11 +5,11 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S08PacketPlayerPosLook implements Packet +public class S08PacketPlayerPosLook implements Packet { private double x; private double y; @@ -61,7 +61,7 @@ public class S08PacketPlayerPosLook implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handlePlayerPosLook(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java b/proxy/src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java index 6c4fd34..2933f2e 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S09PacketHeldItemChange implements Packet +public class S09PacketHeldItemChange implements Packet { private int heldItemHotbarIndex; @@ -29,7 +29,7 @@ public class S09PacketHeldItemChange implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleHeldItemChange(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java b/proxy/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java index 2e5ab49..32fe796 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S0APacketUseBed implements Packet +public class S0APacketUseBed implements Packet { private int playerID; private BlockPos bedPos; @@ -33,7 +33,7 @@ public class S0APacketUseBed implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleUseBed(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java b/proxy/src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java index 28ae37a..e013e6f 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S0BPacketAnimation implements Packet +public class S0BPacketAnimation implements Packet { private int entityId; private int type; @@ -32,7 +32,7 @@ public class S0BPacketAnimation implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleAnimation(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java b/proxy/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java index a74a93e..599d5c0 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java @@ -4,13 +4,13 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.DataWatcher; import proxy.util.MathHelper; -public class S0CPacketSpawnPlayer implements Packet +public class S0CPacketSpawnPlayer implements Packet { private int entityId; private UUID playerId; @@ -73,7 +73,7 @@ public class S0CPacketSpawnPlayer implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpawnPlayer(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java b/proxy/src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java index df2bbf7..a1232fa 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S0DPacketCollectItem implements Packet +public class S0DPacketCollectItem implements Packet { private int collectedItemEntityId; private int entityId; @@ -32,7 +32,7 @@ public class S0DPacketCollectItem implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleCollectItem(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java b/proxy/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java index e151555..7571e18 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S0EPacketSpawnObject implements Packet +public class S0EPacketSpawnObject implements Packet { private int entityId; private int x; @@ -67,7 +67,7 @@ public class S0EPacketSpawnObject implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpawnObject(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java b/proxy/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java index 4503615..a3bc742 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java @@ -3,12 +3,12 @@ package net.minecraft.network.play.server; import java.io.IOException; import java.util.List; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.DataWatcher; -public class S0FPacketSpawnMob implements Packet +public class S0FPacketSpawnMob implements Packet { private int entityId; private int type; @@ -64,7 +64,7 @@ public class S0FPacketSpawnMob implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpawnMob(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java b/proxy/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java index 0514760..72982a5 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S10PacketSpawnPainting implements Packet +public class S10PacketSpawnPainting implements Packet { private int entityID; private BlockPos position; @@ -39,7 +39,7 @@ public class S10PacketSpawnPainting implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpawnPainting(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java b/proxy/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java index c399568..8ad703e 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S11PacketSpawnExperienceOrb implements Packet +public class S11PacketSpawnExperienceOrb implements Packet { private int entityID; private int posX; @@ -41,7 +41,7 @@ public class S11PacketSpawnExperienceOrb implements Packet +public class S12PacketEntityVelocity implements Packet { private int entityID; private int motionX; @@ -38,7 +38,7 @@ public class S12PacketEntityVelocity implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityVelocity(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java b/proxy/src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java index d115b9f..d92c929 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S13PacketDestroyEntities implements Packet +public class S13PacketDestroyEntities implements Packet { private int[] entityIDs; @@ -39,7 +39,7 @@ public class S13PacketDestroyEntities implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleDestroyEntities(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S14PacketEntity.java b/proxy/src/main/java/net/minecraft/network/play/server/S14PacketEntity.java index 09203b8..d56e89e 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S14PacketEntity.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S14PacketEntity.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S14PacketEntity implements Packet +public class S14PacketEntity implements Packet { protected int entityId; protected byte posX; @@ -36,7 +36,7 @@ public class S14PacketEntity implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityMovement(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java b/proxy/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java index 301f06e..e37a820 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S18PacketEntityTeleport implements Packet +public class S18PacketEntityTeleport implements Packet { private int entityId; private int posX; @@ -47,7 +47,7 @@ public class S18PacketEntityTeleport implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityTeleport(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java b/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java index 77bdd70..79ddec6 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S19PacketEntityHeadLook implements Packet +public class S19PacketEntityHeadLook implements Packet { private int entityId; private byte yaw; @@ -32,7 +32,7 @@ public class S19PacketEntityHeadLook implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityHeadLook(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java b/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java index 19028e6..7615256 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S19PacketEntityStatus implements Packet +public class S19PacketEntityStatus implements Packet { private int entityId; private byte logicOpcode; @@ -32,7 +32,7 @@ public class S19PacketEntityStatus implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityStatus(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java b/proxy/src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java index c549c82..8b0d6bf 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S1BPacketEntityAttach implements Packet +public class S1BPacketEntityAttach implements Packet { private int leash; private int entityId; @@ -35,7 +35,7 @@ public class S1BPacketEntityAttach implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityAttach(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java b/proxy/src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java index 5672fcb..32918df 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java @@ -3,12 +3,12 @@ package net.minecraft.network.play.server; import java.io.IOException; import java.util.List; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.DataWatcher; -public class S1CPacketEntityMetadata implements Packet +public class S1CPacketEntityMetadata implements Packet { private int entityId; private List field_149378_b; @@ -34,7 +34,7 @@ public class S1CPacketEntityMetadata implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityMetadata(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java b/proxy/src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java index 9a9b61d..6724a68 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S1DPacketEntityEffect implements Packet +public class S1DPacketEntityEffect implements Packet { private int entityId; private byte effectId; @@ -41,7 +41,7 @@ public class S1DPacketEntityEffect implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityEffect(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java b/proxy/src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java index 7667af2..232084e 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S1EPacketRemoveEntityEffect implements Packet +public class S1EPacketRemoveEntityEffect implements Packet { private int entityId; private int effectId; @@ -32,7 +32,7 @@ public class S1EPacketRemoveEntityEffect implements Packet +public class S1FPacketSetExperience implements Packet { private float field_149401_a; private int totalExperience; @@ -35,7 +35,7 @@ public class S1FPacketSetExperience implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSetExperience(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java b/proxy/src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java index e8a43be..ab3eed0 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java @@ -7,11 +7,11 @@ import java.util.UUID; import com.google.common.collect.Lists; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S20PacketEntityProperties implements Packet +public class S20PacketEntityProperties implements Packet { private int entityId; private final List field_149444_b = Lists.newArrayList(); @@ -67,7 +67,7 @@ public class S20PacketEntityProperties implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityProperties(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java b/proxy/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java index fc1586f..fe41858 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S21PacketChunkData implements Packet +public class S21PacketChunkData implements Packet { private int chunkX; private int chunkZ; @@ -41,7 +41,7 @@ public class S21PacketChunkData implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleChunkData(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java b/proxy/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java index 0f649c4..052663b 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S22PacketMultiBlockChange implements Packet +public class S22PacketMultiBlockChange implements Packet { private int chunkPosCoordX; private int chunkPosCoordZ; @@ -46,7 +46,7 @@ public class S22PacketMultiBlockChange implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleMultiBlockChange(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java b/proxy/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java index eb6d5a3..b4cba95 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S23PacketBlockChange implements Packet +public class S23PacketBlockChange implements Packet { private BlockPos blockPosition; private int blockState; @@ -33,7 +33,7 @@ public class S23PacketBlockChange implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleBlockChange(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java b/proxy/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java index 11083a6..9d3eed8 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S24PacketBlockAction implements Packet +public class S24PacketBlockAction implements Packet { private BlockPos blockPosition; private int instrument; @@ -39,7 +39,7 @@ public class S24PacketBlockAction implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleBlockAction(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java b/proxy/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java index 1b80bef..1871f59 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S25PacketBlockBreakAnim implements Packet +public class S25PacketBlockBreakAnim implements Packet { private int breakerId; private BlockPos position; @@ -36,7 +36,7 @@ public class S25PacketBlockBreakAnim implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleBlockBreakAnim(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java b/proxy/src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java index eeffa66..c07b723 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java @@ -3,11 +3,11 @@ package net.minecraft.network.play.server; import java.io.IOException; import java.util.Arrays; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S26PacketMapChunkBulk implements Packet +public class S26PacketMapChunkBulk implements Packet { private int[] xPositions; private int[] zPositions; @@ -79,7 +79,7 @@ public class S26PacketMapChunkBulk implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleMapChunkBulk(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java b/proxy/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java index 08bdc59..d819cca 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java @@ -5,12 +5,12 @@ import java.util.List; import com.google.common.collect.Lists; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S27PacketExplosion implements Packet +public class S27PacketExplosion implements Packet { private double posX; private double posY; @@ -81,7 +81,7 @@ public class S27PacketExplosion implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleExplosion(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java b/proxy/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java index c7791c5..4a36d8f 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S28PacketEffect implements Packet +public class S28PacketEffect implements Packet { private int soundType; private BlockPos soundPos; @@ -39,7 +39,7 @@ public class S28PacketEffect implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEffect(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java b/proxy/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java index 021aee4..4c5e9f7 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S29PacketSoundEffect implements Packet +public class S29PacketSoundEffect implements Packet { private String soundName; private int posX; @@ -44,7 +44,7 @@ public class S29PacketSoundEffect implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSoundEffect(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S2APacketParticles.java b/proxy/src/main/java/net/minecraft/network/play/server/S2APacketParticles.java index acc4864..3e15e07 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S2APacketParticles.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S2APacketParticles.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S2APacketParticles implements Packet +public class S2APacketParticles implements Packet { private int particleType; private float xCoord; @@ -70,7 +70,7 @@ public class S2APacketParticles implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleParticles(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java b/proxy/src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java index 3d9516e..dbc02bc 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S2BPacketChangeGameState implements Packet +public class S2BPacketChangeGameState implements Packet { private int state; private float field_149141_c; @@ -42,7 +42,7 @@ public class S2BPacketChangeGameState implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleChangeGameState(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java b/proxy/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java index 5f279ee..4080094 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S2CPacketSpawnGlobalEntity implements Packet +public class S2CPacketSpawnGlobalEntity implements Packet { private int entityId; private int x; @@ -41,7 +41,7 @@ public class S2CPacketSpawnGlobalEntity implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSpawnGlobalEntity(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java b/proxy/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java index 4be8a99..48f3e7d 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ChatComponent; -public class S2DPacketOpenWindow implements Packet +public class S2DPacketOpenWindow implements Packet { private int windowId; private String inventoryType; @@ -18,7 +18,7 @@ public class S2DPacketOpenWindow implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleOpenWindow(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java b/proxy/src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java index bb5537e..e13c135 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java @@ -2,18 +2,18 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S2EPacketCloseWindow implements Packet +public class S2EPacketCloseWindow implements Packet { private int windowId; /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleCloseWindow(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java b/proxy/src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java index f632f4b..125e432 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ItemStack; -public class S2FPacketSetSlot implements Packet +public class S2FPacketSetSlot implements Packet { private int windowId; private int slot; @@ -16,7 +16,7 @@ public class S2FPacketSetSlot implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSetSlot(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java b/proxy/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java index 14e5725..86f7615 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ItemStack; -public class S30PacketWindowItems implements Packet +public class S30PacketWindowItems implements Packet { private int windowId; private ItemStack[] itemStacks; @@ -44,7 +44,7 @@ public class S30PacketWindowItems implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleWindowItems(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java b/proxy/src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java index 5ff5538..9b1dd5b 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S31PacketWindowProperty implements Packet +public class S31PacketWindowProperty implements Packet { private int windowId; private int varIndex; @@ -15,7 +15,7 @@ public class S31PacketWindowProperty implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleWindowProperty(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java b/proxy/src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java index 09539ee..95a32d8 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S32PacketConfirmTransaction implements Packet +public class S32PacketConfirmTransaction implements Packet { private int windowId; private short actionNumber; @@ -15,7 +15,7 @@ public class S32PacketConfirmTransaction implements Packet +public class S33PacketUpdateSign implements Packet { private BlockPos blockPos; private ChatComponent[] lines; @@ -53,7 +53,7 @@ public class S33PacketUpdateSign implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleUpdateSign(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java b/proxy/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java index 42b023a..8bcfbc7 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S34PacketMaps implements Packet +public class S34PacketMaps implements Packet { private static class Vec4b { @@ -109,7 +109,7 @@ public class S34PacketMaps implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleMaps(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java b/proxy/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java index 9158727..d36bc06 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java @@ -3,12 +3,12 @@ package net.minecraft.network.play.server; import java.io.IOException; import proxy.nbt.NBTTagCompound; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S35PacketUpdateTileEntity implements Packet +public class S35PacketUpdateTileEntity implements Packet { private BlockPos blockPos; private int metadata; @@ -37,7 +37,7 @@ public class S35PacketUpdateTileEntity implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleUpdateTileEntity(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java b/proxy/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java index 79b4dca..bc540d4 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.BlockPos; -public class S36PacketSignEditorOpen implements Packet +public class S36PacketSignEditorOpen implements Packet { private BlockPos signPosition; @@ -22,7 +22,7 @@ public class S36PacketSignEditorOpen implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleSignEditorOpen(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java b/proxy/src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java index 87be016..79ca66a 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java @@ -6,18 +6,18 @@ import java.util.Map.Entry; import com.google.common.collect.Maps; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S37PacketStatistics implements Packet +public class S37PacketStatistics implements Packet { private Map field_148976_a; /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleStatistics(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java b/proxy/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java index 25be085..0ef8b7a 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java @@ -6,14 +6,14 @@ import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ChatComponent; import proxy.util.GameProfile; import proxy.util.Property; -public class S38PacketPlayerListItem implements Packet +public class S38PacketPlayerListItem implements Packet { private S38PacketPlayerListItem.Action action; private final List players = Lists.newArrayList(); @@ -186,7 +186,7 @@ public class S38PacketPlayerListItem implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handlePlayerListItem(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java b/proxy/src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java index 528cd04..17dcad2 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S39PacketPlayerAbilities implements Packet +public class S39PacketPlayerAbilities implements Packet { private boolean invulnerable; private boolean flying; @@ -78,7 +78,7 @@ public class S39PacketPlayerAbilities implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handlePlayerAbilities(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java b/proxy/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java index 41f85c6..5261469 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S3APacketTabComplete implements Packet +public class S3APacketTabComplete implements Packet { private String[] matches; @@ -48,7 +48,7 @@ public class S3APacketTabComplete implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleTabComplete(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java b/proxy/src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java index d903acf..2839a16 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S3BPacketScoreboardObjective implements Packet +public class S3BPacketScoreboardObjective implements Packet { private String objectiveName; private String objectiveValue; @@ -46,7 +46,7 @@ public class S3BPacketScoreboardObjective implements Packet +public class S3CPacketUpdateScore implements Packet { private String name = ""; private String objective = ""; @@ -46,7 +46,7 @@ public class S3CPacketUpdateScore implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleUpdateScore(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java b/proxy/src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java index 2874aa1..b09c27d 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S3DPacketDisplayScoreboard implements Packet +public class S3DPacketDisplayScoreboard implements Packet { private int position; private String scoreName; @@ -32,7 +32,7 @@ public class S3DPacketDisplayScoreboard implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleDisplayScoreboard(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java b/proxy/src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java index 64ed943..c3c8955 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java @@ -5,11 +5,11 @@ import java.util.Collection; import com.google.common.collect.Lists; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S3EPacketTeams implements Packet +public class S3EPacketTeams implements Packet { private String name = ""; private String displayName = ""; @@ -89,7 +89,7 @@ public class S3EPacketTeams implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleTeams(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java b/proxy/src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java index 7aea740..5b10368 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java @@ -3,11 +3,11 @@ package net.minecraft.network.play.server; import io.netty.buffer.ByteBuf; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S3FPacketCustomPayload implements Packet +public class S3FPacketCustomPayload implements Packet { private String channel; private PacketBuffer data; @@ -57,7 +57,7 @@ public class S3FPacketCustomPayload implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleCustomPayload(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java b/proxy/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java index 0ccabbd..022c6b4 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ChatComponent; -public class S40PacketDisconnect implements Packet +public class S40PacketDisconnect implements Packet { private ChatComponent reason; @@ -39,7 +39,7 @@ public class S40PacketDisconnect implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleDisconnect(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java b/proxy/src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java index abff2b4..ccf8731 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java @@ -2,18 +2,18 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S41PacketServerDifficulty implements Packet +public class S41PacketServerDifficulty implements Packet { private byte difficulty; /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleServerDifficulty(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java b/proxy/src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java index 24fc261..31dfff2 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S42PacketCombatEvent implements Packet +public class S42PacketCombatEvent implements Packet { public S42PacketCombatEvent.Event eventType; public int field_179774_b; @@ -57,7 +57,7 @@ public class S42PacketCombatEvent implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleCombatEvent(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S43PacketCamera.java b/proxy/src/main/java/net/minecraft/network/play/server/S43PacketCamera.java index 43294c9..1b596bc 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S43PacketCamera.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S43PacketCamera.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S43PacketCamera implements Packet +public class S43PacketCamera implements Packet { private int entityId; @@ -29,7 +29,7 @@ public class S43PacketCamera implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleCamera(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java b/proxy/src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java index b433ddc..823765b 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S44PacketWorldBorder implements Packet +public class S44PacketWorldBorder implements Packet { private S44PacketWorldBorder.Action action; private int size; @@ -109,7 +109,7 @@ public class S44PacketWorldBorder implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleWorldBorder(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java b/proxy/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java index 2656183..acaffc9 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java @@ -2,12 +2,12 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.ChatComponent; -public class S45PacketTitle implements Packet +public class S45PacketTitle implements Packet { private S45PacketTitle.Type type; private ChatComponent message; @@ -81,7 +81,7 @@ public class S45PacketTitle implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleTitle(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java b/proxy/src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java index adc4352..0d6e14b 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java @@ -2,11 +2,11 @@ package net.minecraft.network.play.server; import java.io.IOException; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S46PacketSetCompressionLevel implements Packet +public class S46PacketSetCompressionLevel implements Packet { private int threshold; @@ -29,7 +29,7 @@ public class S46PacketSetCompressionLevel implements Packet +public class S47PacketPlayerListHeaderFooter implements Packet { private ChatComponent header; private ChatComponent footer; @@ -43,7 +43,7 @@ public class S47PacketPlayerListHeaderFooter implements Packet +public class S48PacketResourcePackSend implements Packet { private String url; private String hash; @@ -32,7 +32,7 @@ public class S48PacketResourcePackSend implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleResourcePack(this); } diff --git a/proxy/src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java b/proxy/src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java index 555a6ac..8c3b1d6 100755 --- a/proxy/src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java +++ b/proxy/src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java @@ -3,11 +3,11 @@ package net.minecraft.network.play.server; import java.io.IOException; import proxy.nbt.NBTTagCompound; -import proxy.network.INetHandlerPlayClient; +import proxy.network.NetHandlerPlayServer; import proxy.network.Packet; import proxy.network.PacketBuffer; -public class S49PacketUpdateEntityNBT implements Packet +public class S49PacketUpdateEntityNBT implements Packet { private int entityId; private NBTTagCompound tagCompound; @@ -33,7 +33,7 @@ public class S49PacketUpdateEntityNBT implements Packet /** * Passes this Packet on to the NetHandler for processing. */ - public void processPacket(INetHandlerPlayClient handler) + public void processPacket(NetHandlerPlayServer handler) { handler.handleEntityNBT(this); } diff --git a/proxy/src/main/java/proxy/network/INetHandler.java b/proxy/src/main/java/proxy/network/INetHandler.java index 5d82aeb..31b6c8c 100755 --- a/proxy/src/main/java/proxy/network/INetHandler.java +++ b/proxy/src/main/java/proxy/network/INetHandler.java @@ -4,4 +4,6 @@ import proxy.util.ChatComponent; public interface INetHandler { void onDisconnect(NetworkManager connection, ChatComponent reason); + default void update(NetworkManager connection) { + } } diff --git a/proxy/src/main/java/proxy/network/INetHandlerPlayClient.java b/proxy/src/main/java/proxy/network/INetHandlerPlayClient.java deleted file mode 100755 index 40e3ff7..0000000 --- a/proxy/src/main/java/proxy/network/INetHandlerPlayClient.java +++ /dev/null @@ -1,384 +0,0 @@ -package proxy.network; - -import net.minecraft.network.play.server.S00PacketKeepAlive; -import net.minecraft.network.play.server.S01PacketJoinGame; -import net.minecraft.network.play.server.S02PacketChat; -import net.minecraft.network.play.server.S03PacketTimeUpdate; -import net.minecraft.network.play.server.S04PacketEntityEquipment; -import net.minecraft.network.play.server.S05PacketSpawnPosition; -import net.minecraft.network.play.server.S06PacketUpdateHealth; -import net.minecraft.network.play.server.S07PacketRespawn; -import net.minecraft.network.play.server.S08PacketPlayerPosLook; -import net.minecraft.network.play.server.S09PacketHeldItemChange; -import net.minecraft.network.play.server.S0APacketUseBed; -import net.minecraft.network.play.server.S0BPacketAnimation; -import net.minecraft.network.play.server.S0CPacketSpawnPlayer; -import net.minecraft.network.play.server.S0DPacketCollectItem; -import net.minecraft.network.play.server.S0EPacketSpawnObject; -import net.minecraft.network.play.server.S0FPacketSpawnMob; -import net.minecraft.network.play.server.S10PacketSpawnPainting; -import net.minecraft.network.play.server.S11PacketSpawnExperienceOrb; -import net.minecraft.network.play.server.S12PacketEntityVelocity; -import net.minecraft.network.play.server.S13PacketDestroyEntities; -import net.minecraft.network.play.server.S14PacketEntity; -import net.minecraft.network.play.server.S18PacketEntityTeleport; -import net.minecraft.network.play.server.S19PacketEntityHeadLook; -import net.minecraft.network.play.server.S19PacketEntityStatus; -import net.minecraft.network.play.server.S1BPacketEntityAttach; -import net.minecraft.network.play.server.S1CPacketEntityMetadata; -import net.minecraft.network.play.server.S1DPacketEntityEffect; -import net.minecraft.network.play.server.S1EPacketRemoveEntityEffect; -import net.minecraft.network.play.server.S1FPacketSetExperience; -import net.minecraft.network.play.server.S20PacketEntityProperties; -import net.minecraft.network.play.server.S21PacketChunkData; -import net.minecraft.network.play.server.S22PacketMultiBlockChange; -import net.minecraft.network.play.server.S23PacketBlockChange; -import net.minecraft.network.play.server.S24PacketBlockAction; -import net.minecraft.network.play.server.S25PacketBlockBreakAnim; -import net.minecraft.network.play.server.S26PacketMapChunkBulk; -import net.minecraft.network.play.server.S27PacketExplosion; -import net.minecraft.network.play.server.S28PacketEffect; -import net.minecraft.network.play.server.S29PacketSoundEffect; -import net.minecraft.network.play.server.S2APacketParticles; -import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity; -import net.minecraft.network.play.server.S2DPacketOpenWindow; -import net.minecraft.network.play.server.S2EPacketCloseWindow; -import net.minecraft.network.play.server.S2FPacketSetSlot; -import net.minecraft.network.play.server.S30PacketWindowItems; -import net.minecraft.network.play.server.S31PacketWindowProperty; -import net.minecraft.network.play.server.S32PacketConfirmTransaction; -import net.minecraft.network.play.server.S33PacketUpdateSign; -import net.minecraft.network.play.server.S34PacketMaps; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.network.play.server.S36PacketSignEditorOpen; -import net.minecraft.network.play.server.S37PacketStatistics; -import net.minecraft.network.play.server.S38PacketPlayerListItem; -import net.minecraft.network.play.server.S39PacketPlayerAbilities; -import net.minecraft.network.play.server.S3APacketTabComplete; -import net.minecraft.network.play.server.S3BPacketScoreboardObjective; -import net.minecraft.network.play.server.S3CPacketUpdateScore; -import net.minecraft.network.play.server.S3DPacketDisplayScoreboard; -import net.minecraft.network.play.server.S3EPacketTeams; -import net.minecraft.network.play.server.S3FPacketCustomPayload; -import net.minecraft.network.play.server.S40PacketDisconnect; -import net.minecraft.network.play.server.S41PacketServerDifficulty; -import net.minecraft.network.play.server.S42PacketCombatEvent; -import net.minecraft.network.play.server.S43PacketCamera; -import net.minecraft.network.play.server.S44PacketWorldBorder; -import net.minecraft.network.play.server.S45PacketTitle; -import net.minecraft.network.play.server.S46PacketSetCompressionLevel; -import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter; -import net.minecraft.network.play.server.S48PacketResourcePackSend; -import net.minecraft.network.play.server.S49PacketUpdateEntityNBT; - -public interface INetHandlerPlayClient extends INetHandler -{ - /** - * Spawns an instance of the objecttype indicated by the packet and sets its position and momentum - */ - void handleSpawnObject(S0EPacketSpawnObject packetIn); - - /** - * Spawns an experience orb and sets its value (amount of XP) - */ - void handleSpawnExperienceOrb(S11PacketSpawnExperienceOrb packetIn); - - /** - * Handles globally visible entities. Used in vanilla for lightning bolts - */ - void handleSpawnGlobalEntity(S2CPacketSpawnGlobalEntity packetIn); - - /** - * Spawns the mob entity at the specified location, with the specified rotation, momentum and type. Updates the - * entities Datawatchers with the entity metadata specified in the packet - */ - void handleSpawnMob(S0FPacketSpawnMob packetIn); - - /** - * May create a scoreboard objective, remove an objective from the scoreboard or update an objectives' displayname - */ - void handleScoreboardObjective(S3BPacketScoreboardObjective packetIn); - - /** - * Handles the spawning of a painting object - */ - void handleSpawnPainting(S10PacketSpawnPainting packetIn); - - /** - * Handles the creation of a nearby player entity, sets the position and held item - */ - void handleSpawnPlayer(S0CPacketSpawnPlayer packetIn); - - /** - * Renders a specified animation: Waking up a player, a living entity swinging its currently held item, being hurt - * or receiving a critical hit by normal or magical means - */ - void handleAnimation(S0BPacketAnimation packetIn); - - /** - * Updates the players statistics or achievements - */ - void handleStatistics(S37PacketStatistics packetIn); - - /** - * Updates all registered IWorldAccess instances with destroyBlockInWorldPartially - */ - void handleBlockBreakAnim(S25PacketBlockBreakAnim packetIn); - - /** - * Creates a sign in the specified location if it didn't exist and opens the GUI to edit its text - */ - void handleSignEditorOpen(S36PacketSignEditorOpen packetIn); - - /** - * Updates the NBTTagCompound metadata of instances of the following entitytypes: Mob spawners, command blocks, - * beacons, skulls, flowerpot - */ - void handleUpdateTileEntity(S35PacketUpdateTileEntity packetIn); - - /** - * Triggers Block.onBlockEventReceived, which is implemented in BlockPistonBase for extension/retraction, BlockNote - * for setting the instrument (including audiovisual feedback) and in BlockContainer to set the number of players - * accessing a (Ender)Chest - */ - void handleBlockAction(S24PacketBlockAction packetIn); - - /** - * Updates the block and metadata and generates a blockupdate (and notify the clients) - */ - void handleBlockChange(S23PacketBlockChange packetIn); - - /** - * Prints a chatmessage in the chat GUI - */ - void handleChat(S02PacketChat packetIn); - - /** - * Displays the available command-completion options the server knows of - */ - void handleTabComplete(S3APacketTabComplete packetIn); - - /** - * Received from the servers PlayerManager if between 1 and 64 blocks in a chunk are changed. If only one block - * requires an update, the server sends S23PacketBlockChange and if 64 or more blocks are changed, the server sends - * S21PacketChunkData - */ - void handleMultiBlockChange(S22PacketMultiBlockChange packetIn); - - /** - * Updates the worlds MapStorage with the specified MapData for the specified map-identifier and invokes a - * MapItemRenderer for it - */ - void handleMaps(S34PacketMaps packetIn); - - /** - * Verifies that the server and client are synchronized with respect to the inventory/container opened by the player - * and confirms if it is the case. - */ - void handleConfirmTransaction(S32PacketConfirmTransaction packetIn); - - /** - * Resets the ItemStack held in hand and closes the window that is opened - */ - void handleCloseWindow(S2EPacketCloseWindow packetIn); - - /** - * Handles the placement of a specified ItemStack in a specified container/inventory slot - */ - void handleWindowItems(S30PacketWindowItems packetIn); - - /** - * Displays a GUI by ID. In order starting from id 0: Chest, Workbench, Furnace, Dispenser, Enchanting table, - * Brewing stand, Villager merchant, Beacon, Anvil, Hopper, Dropper, Horse - */ - void handleOpenWindow(S2DPacketOpenWindow packetIn); - - /** - * Sets the progressbar of the opened window to the specified value - */ - void handleWindowProperty(S31PacketWindowProperty packetIn); - - /** - * Handles pickin up an ItemStack or dropping one in your inventory or an open (non-creative) container - */ - void handleSetSlot(S2FPacketSetSlot packetIn); - - /** - * Handles packets that have room for a channel specification. Vanilla implemented channels are "MC|TrList" to - * acquire a MerchantRecipeList trades for a villager merchant, "MC|Brand" which sets the server brand? on the - * player instance and finally "MC|RPack" which the server uses to communicate the identifier of the default server - * resourcepack for the client to load. - */ - void handleCustomPayload(S3FPacketCustomPayload packetIn); - - /** - * Closes the network channel - */ - void handleDisconnect(S40PacketDisconnect packetIn); - - /** - * Retrieves the player identified by the packet, puts him to sleep if possible (and flags whether all players are - * asleep) - */ - void handleUseBed(S0APacketUseBed packetIn); - - /** - * Invokes the entities' handleUpdateHealth method which is implemented in LivingBase (hurt/death), - * MinecartMobSpawner (spawn delay), FireworkRocket & MinecartTNT (explosion), IronGolem (throwing,...), Witch - * (spawn particles), Zombie (villager transformation), Animal (breeding mode particles), Horse (breeding/smoke - * particles), Sheep (...), Tameable (...), Villager (particles for breeding mode, angry and happy), Wolf (...) - */ - void handleEntityStatus(S19PacketEntityStatus packetIn); - - void handleEntityAttach(S1BPacketEntityAttach packetIn); - - /** - * Initiates a new explosion (sound, particles, drop spawn) for the affected blocks indicated by the packet. - */ - void handleExplosion(S27PacketExplosion packetIn); - - void handleChangeGameState(S2BPacketChangeGameState packetIn); - - void handleKeepAlive(S00PacketKeepAlive packetIn); - - /** - * Updates the specified chunk with the supplied data, marks it for re-rendering and lighting recalculation - */ - void handleChunkData(S21PacketChunkData packetIn); - - void handleMapChunkBulk(S26PacketMapChunkBulk packetIn); - - void handleEffect(S28PacketEffect packetIn); - - /** - * Registers some server properties (gametype,hardcore-mode,terraintype,difficulty,player limit), creates a new - * WorldClient and sets the player initial dimension - */ - void handleJoinGame(S01PacketJoinGame packetIn); - - /** - * Updates the specified entity's position by the specified relative moment and absolute rotation. Note that - * subclassing of the packet allows for the specification of a subset of this data (e.g. only rel. position, abs. - * rotation or both). - */ - void handleEntityMovement(S14PacketEntity packetIn); - - /** - * Handles changes in player positioning and rotation such as when travelling to a new dimension, (re)spawning, - * mounting horses etc. Seems to immediately reply to the server with the clients post-processing perspective on the - * player positioning - */ - void handlePlayerPosLook(S08PacketPlayerPosLook packetIn); - - /** - * Spawns a specified number of particles at the specified location with a randomized displacement according to - * specified bounds - */ - void handleParticles(S2APacketParticles packetIn); - - void handlePlayerAbilities(S39PacketPlayerAbilities packetIn); - - void handlePlayerListItem(S38PacketPlayerListItem packetIn); - - /** - * Locally eliminates the entities. Invoked by the server when the items are in fact destroyed, or the player is no - * longer registered as required to monitor them. The latter happens when distance between the player and item - * increases beyond a certain treshold (typically the viewing distance) - */ - void handleDestroyEntities(S13PacketDestroyEntities packetIn); - - void handleRemoveEntityEffect(S1EPacketRemoveEntityEffect packetIn); - - void handleRespawn(S07PacketRespawn packetIn); - - /** - * Updates the direction in which the specified entity is looking, normally this head rotation is independent of the - * rotation of the entity itself - */ - void handleEntityHeadLook(S19PacketEntityHeadLook packetIn); - - /** - * Updates which hotbar slot of the player is currently selected - */ - void handleHeldItemChange(S09PacketHeldItemChange packetIn); - - /** - * Removes or sets the ScoreObjective to be displayed at a particular scoreboard position (list, sidebar, below - * name) - */ - void handleDisplayScoreboard(S3DPacketDisplayScoreboard packetIn); - - /** - * Invoked when the server registers new proximate objects in your watchlist or when objects in your watchlist have - * changed -> Registers any changes locally - */ - void handleEntityMetadata(S1CPacketEntityMetadata packetIn); - - /** - * Sets the velocity of the specified entity to the specified value - */ - void handleEntityVelocity(S12PacketEntityVelocity packetIn); - - void handleEntityEquipment(S04PacketEntityEquipment packetIn); - - void handleSetExperience(S1FPacketSetExperience packetIn); - - void handleUpdateHealth(S06PacketUpdateHealth packetIn); - - /** - * Updates a team managed by the scoreboard: Create/Remove the team registration, Register/Remove the player-team- - * memberships, Set team displayname/prefix/suffix and/or whether friendly fire is enabled - */ - void handleTeams(S3EPacketTeams packetIn); - - /** - * Either updates the score with a specified value or removes the score for an objective - */ - void handleUpdateScore(S3CPacketUpdateScore packetIn); - - void handleSpawnPosition(S05PacketSpawnPosition packetIn); - - void handleTimeUpdate(S03PacketTimeUpdate packetIn); - - /** - * Updates a specified sign with the specified text lines - */ - void handleUpdateSign(S33PacketUpdateSign packetIn); - - void handleSoundEffect(S29PacketSoundEffect packetIn); - - void handleCollectItem(S0DPacketCollectItem packetIn); - - /** - * Updates an entity's position and rotation as specified by the packet - */ - void handleEntityTeleport(S18PacketEntityTeleport packetIn); - - /** - * Updates en entity's attributes and their respective modifiers, which are used for speed bonusses (player - * sprinting, animals fleeing, baby speed), weapon/tool attackDamage, hostiles followRange randomization, zombie - * maxHealth and knockback resistance as well as reinforcement spawning chance. - */ - void handleEntityProperties(S20PacketEntityProperties packetIn); - - void handleEntityEffect(S1DPacketEntityEffect packetIn); - - void handleCombatEvent(S42PacketCombatEvent packetIn); - - void handleServerDifficulty(S41PacketServerDifficulty packetIn); - - void handleCamera(S43PacketCamera packetIn); - - void handleWorldBorder(S44PacketWorldBorder packetIn); - - void handleTitle(S45PacketTitle packetIn); - - void handleSetCompressionLevel(S46PacketSetCompressionLevel packetIn); - - void handlePlayerListHeaderFooter(S47PacketPlayerListHeaderFooter packetIn); - - void handleResourcePack(S48PacketResourcePackSend packetIn); - - void handleEntityNBT(S49PacketUpdateEntityNBT packetIn); -} diff --git a/proxy/src/main/java/proxy/network/INetHandlerPlayServer.java b/proxy/src/main/java/proxy/network/INetHandlerPlayServer.java deleted file mode 100755 index 7a4a0d7..0000000 --- a/proxy/src/main/java/proxy/network/INetHandlerPlayServer.java +++ /dev/null @@ -1,143 +0,0 @@ -package proxy.network; - -import net.minecraft.network.play.client.C00PacketKeepAlive; -import net.minecraft.network.play.client.C01PacketChatMessage; -import net.minecraft.network.play.client.C02PacketUseEntity; -import net.minecraft.network.play.client.C03PacketPlayer; -import net.minecraft.network.play.client.C07PacketPlayerDigging; -import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement; -import net.minecraft.network.play.client.C09PacketHeldItemChange; -import net.minecraft.network.play.client.C0APacketAnimation; -import net.minecraft.network.play.client.C0BPacketEntityAction; -import net.minecraft.network.play.client.C0CPacketInput; -import net.minecraft.network.play.client.C0DPacketCloseWindow; -import net.minecraft.network.play.client.C0EPacketClickWindow; -import net.minecraft.network.play.client.C0FPacketConfirmTransaction; -import net.minecraft.network.play.client.C10PacketCreativeInventoryAction; -import net.minecraft.network.play.client.C11PacketEnchantItem; -import net.minecraft.network.play.client.C12PacketUpdateSign; -import net.minecraft.network.play.client.C13PacketPlayerAbilities; -import net.minecraft.network.play.client.C14PacketTabComplete; -import net.minecraft.network.play.client.C15PacketClientSettings; -import net.minecraft.network.play.client.C16PacketClientStatus; -import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.network.play.client.C18PacketSpectate; -import net.minecraft.network.play.client.C19PacketResourcePackStatus; - -public interface INetHandlerPlayServer extends INetHandler -{ - void handleAnimation(C0APacketAnimation packetIn); - - /** - * Process chat messages (broadcast back to clients) and commands (executes) - */ - void processChatMessage(C01PacketChatMessage packetIn); - - /** - * Retrieves possible tab completions for the requested command string and sends them to the client - */ - void processTabComplete(C14PacketTabComplete packetIn); - - /** - * Processes the client status updates: respawn attempt from player, opening statistics or achievements, or - * acquiring 'open inventory' achievement - */ - void processClientStatus(C16PacketClientStatus packetIn); - - /** - * Updates serverside copy of client settings: language, render distance, chat visibility, chat colours, difficulty, - * and whether to show the cape - */ - void processClientSettings(C15PacketClientSettings packetIn); - - /** - * Received in response to the server requesting to confirm that the client-side open container matches the servers' - * after a mismatched container-slot manipulation. It will unlock the player's ability to manipulate the container - * contents - */ - void processConfirmTransaction(C0FPacketConfirmTransaction packetIn); - - /** - * Enchants the item identified by the packet given some convoluted conditions (matching window, which - * should/shouldn't be in use?) - */ - void processEnchantItem(C11PacketEnchantItem packetIn); - - /** - * Executes a container/inventory slot manipulation as indicated by the packet. Sends the serverside result if they - * didn't match the indicated result and prevents further manipulation by the player until he confirms that it has - * the same open container/inventory - */ - void processClickWindow(C0EPacketClickWindow packetIn); - - /** - * Processes the client closing windows (container) - */ - void processCloseWindow(C0DPacketCloseWindow packetIn); - - /** - * Synchronizes serverside and clientside book contents and signing - */ - void processVanilla250Packet(C17PacketCustomPayload packetIn); - - /** - * Processes interactions ((un)leashing, opening command block GUI) and attacks on an entity with players currently - * equipped item - */ - void processUseEntity(C02PacketUseEntity packetIn); - - /** - * Updates a players' ping statistics - */ - void processKeepAlive(C00PacketKeepAlive packetIn); - - /** - * Processes clients perspective on player positioning and/or orientation - */ - void processPlayer(C03PacketPlayer packetIn); - - /** - * Processes a player starting/stopping flying - */ - void processPlayerAbilities(C13PacketPlayerAbilities packetIn); - - /** - * Processes the player initiating/stopping digging on a particular spot, as well as a player dropping items?. (0: - * initiated, 1: reinitiated, 2? , 3-4 drop item (respectively without or with player control), 5: stopped; x,y,z, - * side clicked on;) - */ - void processPlayerDigging(C07PacketPlayerDigging packetIn); - - /** - * Processes a range of action-types: sneaking, sprinting, waking from sleep, opening the inventory or setting jump - * height of the horse the player is riding - */ - void processEntityAction(C0BPacketEntityAction packetIn); - - /** - * Processes player movement input. Includes walking, strafing, jumping, sneaking; excludes riding and toggling - * flying/sprinting - */ - void processInput(C0CPacketInput packetIn); - - /** - * Updates which quickbar slot is selected - */ - void processHeldItemChange(C09PacketHeldItemChange packetIn); - - /** - * Update the server with an ItemStack in a slot. - */ - void processCreativeInventoryAction(C10PacketCreativeInventoryAction packetIn); - - void processUpdateSign(C12PacketUpdateSign packetIn); - - /** - * Processes block placement and block activation (anvil, furnace, etc.) - */ - void processPlayerBlockPlacement(C08PacketPlayerBlockPlacement packetIn); - - void handleSpectate(C18PacketSpectate packetIn); - - void handleResourcePackStatus(C19PacketResourcePackStatus packetIn); -} diff --git a/proxy/src/main/java/proxy/network/NetHandlerLoginServer.java b/proxy/src/main/java/proxy/network/NetHandlerLoginServer.java index 55a0c8e..40a1616 100755 --- a/proxy/src/main/java/proxy/network/NetHandlerLoginServer.java +++ b/proxy/src/main/java/proxy/network/NetHandlerLoginServer.java @@ -10,10 +10,9 @@ import net.minecraft.network.login.server.S03PacketEnableCompression; import proxy.Proxy; import proxy.util.ChatComponent; import proxy.util.ChatComponentText; -import proxy.util.ITickable; import proxy.util.Log; -public class NetHandlerLoginServer implements INetHandler, ITickable { +public class NetHandlerLoginServer implements INetHandler { private static enum LoginState { INIT, WAITING, DONE; } diff --git a/proxy/src/main/java/proxy/network/NetHandlerPlayServer.java b/proxy/src/main/java/proxy/network/NetHandlerPlayServer.java index 839cfa8..0e891b8 100755 --- a/proxy/src/main/java/proxy/network/NetHandlerPlayServer.java +++ b/proxy/src/main/java/proxy/network/NetHandlerPlayServer.java @@ -112,11 +112,10 @@ import proxy.util.ChatColor; import proxy.util.ChatComponent; import proxy.util.ChatComponentText; import proxy.util.User; -import proxy.util.ITickable; import proxy.util.ItemStack; import proxy.util.Log; -public class NetHandlerPlayServer implements INetHandlerPlayServer, INetHandlerPlayClient, ITickable { +public class NetHandlerPlayServer implements INetHandler { public class ProxyLoginHandler implements INetHandler { public void handleEncryptionRequest(S01PacketEncryptionRequest packetIn) { NetHandlerPlayServer.this.server.closeChannel(new ChatComponentText("Online mode auth request received")); diff --git a/proxy/src/main/java/proxy/network/NetworkManager.java b/proxy/src/main/java/proxy/network/NetworkManager.java index 332f820..ba94413 100755 --- a/proxy/src/main/java/proxy/network/NetworkManager.java +++ b/proxy/src/main/java/proxy/network/NetworkManager.java @@ -31,7 +31,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import proxy.util.ChatComponent; import proxy.util.ChatComponentText; -import proxy.util.ITickable; import proxy.util.LazyLoadBase; import proxy.util.Log; @@ -56,16 +55,9 @@ public class NetworkManager extends SimpleChannelInboundHandler private final Queue outboundPacketsQueue = new ConcurrentLinkedQueue(); private final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock(); - /** The active channel */ private Channel channel; - - /** The address of the remote party */ private SocketAddress socketAddress; - - /** The INetHandler instance responsible for processing received packets */ private INetHandler packetListener; - - /** A String indicating why the network has shutdown. */ private ChatComponent terminationReason; private boolean disconnected; @@ -277,12 +269,8 @@ public class NetworkManager extends SimpleChannelInboundHandler public void processReceivedPackets() { this.flushOutboundQueue(); - - if (this.packetListener instanceof ITickable) - { - ((ITickable)this.packetListener).update(this); - } - + if(this.packetListener != null) + this.packetListener.update(this); this.channel.flush(); } diff --git a/proxy/src/main/java/proxy/util/ITickable.java b/proxy/src/main/java/proxy/util/ITickable.java deleted file mode 100755 index fb0b38f..0000000 --- a/proxy/src/main/java/proxy/util/ITickable.java +++ /dev/null @@ -1,8 +0,0 @@ -package proxy.util; - -import proxy.network.NetworkManager; - -public interface ITickable -{ - void update(NetworkManager connection); -}