diff --git a/src/main/java/codechicken/nei/NEICPH.java b/src/main/java/codechicken/nei/NEICPH.java index a9b3d57f..4f2428be 100644 --- a/src/main/java/codechicken/nei/NEICPH.java +++ b/src/main/java/codechicken/nei/NEICPH.java @@ -1,5 +1,7 @@ package codechicken.nei; +import static codechicken.nei.PacketIDs.*; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.item.ItemStack; @@ -20,37 +22,37 @@ public class NEICPH implements IClientPacketHandler { @Override public void handlePacket(PacketCustom packet, Minecraft mc, INetHandlerPlayClient netHandler) { switch (packet.getType()) { - case 1: + case S2C.SEND_SERVER_SIDE_CHECK: handleSMPCheck(packet.readUByte(), packet.readString(), mc.theWorld); break; - case 10: + case S2C.SEND_LOGIN_STATE: handleLoginState(packet); break; - case 11: + case S2C.SEND_ACTION_DISABLED: handleActionDisabled(packet); break; - case 12: + case S2C.SEND_ACTION_ENABLED: handleActionEnabled(packet); break; - case 13: + case S2C.SEND_MAGNETIC_ITEM: ClientHandler.instance().addSMPMagneticItem(packet.readInt(), mc.theWorld); break; - case 14: + case S2C.SEND_GAME_MODE: handleGamemode(mc, packet.readUByte()); break; - case 21: + case S2C.OPEN_ENCHANTMENT_GUI: ClientUtils.openSMPGui( packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0)); break; - case 23: + case S2C.SET_CREATIVE_PLUS_MODE: if (packet.readBoolean()) ClientUtils.openSMPGui( packet.readUByte(), new GuiExtendedCreativeInv( new ContainerCreativeInv(mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT)))); else mc.displayGuiScreen(new GuiInventory(mc.thePlayer)); break; - case 24: + case S2C.OPEN_POTION_GUI: ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory)); break; } @@ -117,7 +119,7 @@ public class NEICPH implements IClientPacketHandler { } public static void sendGiveItem(ItemStack spawnstack, boolean infinite, boolean doSpawn) { - PacketCustom packet = new PacketCustom(channel, 1); + PacketCustom packet = new PacketCustom(channel, C2S.GIVE_ITEM); packet.writeItemStack(spawnstack, true); packet.writeBoolean(infinite); packet.writeBoolean(doSpawn); @@ -125,7 +127,7 @@ public class NEICPH implements IClientPacketHandler { } public static void sendDeleteAllItems() { - PacketCustom packet = new PacketCustom(channel, 4); + PacketCustom packet = new PacketCustom(channel, C2S.DELETE_ALL_ITEMS); packet.sendToServer(); } @@ -139,18 +141,18 @@ public class NEICPH implements IClientPacketHandler { sendSetSlot(slot, item, false); } - PacketCustom packet = new PacketCustom(channel, 11); + PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER_CONTENTS); packet.sendToServer(); } public static void sendRequestContainer() { - PacketCustom packet = new PacketCustom(channel, 16); + PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER); packet.writeInt(Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size()); packet.sendToServer(); } public static void sendSetSlot(int slot, ItemStack stack, boolean container) { - PacketCustom packet = new PacketCustom(channel, 5); + PacketCustom packet = new PacketCustom(channel, C2S.SET_SLOT); packet.writeBoolean(container); packet.writeShort(slot); packet.writeItemStack(stack); @@ -158,38 +160,38 @@ public class NEICPH implements IClientPacketHandler { } private static void sendRequestLoginInfo() { - PacketCustom packet = new PacketCustom(channel, 10); + PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_LOGIN_INFO); packet.sendToServer(); } public static void sendToggleMagnetMode() { - PacketCustom packet = new PacketCustom(channel, 6); + PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_MAGNET); packet.sendToServer(); } public static void sendSetTime(int hour) { - PacketCustom packet = new PacketCustom(channel, 7); + PacketCustom packet = new PacketCustom(channel, C2S.SET_TIME); packet.writeByte(hour); packet.sendToServer(); } public static void sendHeal() { - PacketCustom packet = new PacketCustom(channel, 8); + PacketCustom packet = new PacketCustom(channel, C2S.HEAL); packet.sendToServer(); } public static void sendToggleRain() { - PacketCustom packet = new PacketCustom(channel, 9); + PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_RAIN); packet.sendToServer(); } public static void sendOpenEnchantmentWindow() { - PacketCustom packet = new PacketCustom(channel, 21); + PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_ENCHANTMENT_GUI); packet.sendToServer(); } public static void sendModifyEnchantment(int enchID, int level, boolean add) { - PacketCustom packet = new PacketCustom(channel, 22); + PacketCustom packet = new PacketCustom(channel, C2S.MODIFY_ENCHANTMENT); packet.writeByte(enchID); packet.writeByte(level); packet.writeBoolean(add); @@ -197,30 +199,30 @@ public class NEICPH implements IClientPacketHandler { } public static void sendSetPropertyDisabled(String name, boolean enable) { - PacketCustom packet = new PacketCustom(channel, 12); + PacketCustom packet = new PacketCustom(channel, C2S.CHANGE_PROPERTY); packet.writeString(name); packet.writeBoolean(enable); packet.sendToServer(); } public static void sendGamemode(int mode) { - new PacketCustom(channel, 13).writeByte(mode).sendToServer(); + new PacketCustom(channel, C2S.SET_GAME_MODE).writeByte(mode).sendToServer(); } public static void sendCreativeInv(boolean open) { - PacketCustom packet = new PacketCustom(channel, 23); + PacketCustom packet = new PacketCustom(channel, C2S.SET_CREATIVE_PLUS_MODE); packet.writeBoolean(open); packet.sendToServer(); } public static void sendCreativeScroll(int steps) { - PacketCustom packet = new PacketCustom(channel, 14); + PacketCustom packet = new PacketCustom(channel, C2S.CYCLE_CREATIVE_INV); packet.writeInt(steps); packet.sendToServer(); } public static void sendMobSpawnerID(int x, int y, int z, String mobtype) { - PacketCustom packet = new PacketCustom(channel, 15); + PacketCustom packet = new PacketCustom(channel, C2S.SEND_MOB_SPAWNER_ID); packet.writeCoord(x, y, z); packet.writeString(mobtype); packet.sendToServer(); @@ -231,13 +233,13 @@ public class NEICPH implements IClientPacketHandler { InventoryUtils.readItemStacksFromTag( potionStore, NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10)); - PacketCustom packet = new PacketCustom(channel, 24); + PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_POTION_GUI); for (ItemStack stack : potionStore) packet.writeItemStack(stack); packet.sendToServer(); } public static void sendDummySlotSet(int slotNumber, ItemStack stack) { - PacketCustom packet = new PacketCustom(channel, 25); + PacketCustom packet = new PacketCustom(channel, C2S.SET_DUMMY_SLOT); packet.writeShort(slotNumber); packet.writeItemStack(stack, true); packet.sendToServer(); diff --git a/src/main/java/codechicken/nei/NEISPH.java b/src/main/java/codechicken/nei/NEISPH.java index 7bcca83e..2e265754 100644 --- a/src/main/java/codechicken/nei/NEISPH.java +++ b/src/main/java/codechicken/nei/NEISPH.java @@ -1,5 +1,7 @@ package codechicken.nei; +import static codechicken.nei.PacketIDs.*; + import java.util.LinkedList; import java.util.Set; @@ -28,61 +30,61 @@ public class NEISPH implements IServerPacketHandler { if (!NEIServerConfig.authenticatePacket(sender, packet)) return; switch (packet.getType()) { - case 1: + case C2S.GIVE_ITEM: handleGiveItem(sender, packet); break; - case 4: + case C2S.DELETE_ALL_ITEMS: NEIServerUtils.deleteAllItems(sender); break; - case 5: + case C2S.SET_SLOT: setInventorySlot(sender, packet); break; - case 6: + case C2S.TOGGLE_MAGNET: NEIServerUtils.toggleMagnetMode(sender); break; - case 7: + case C2S.SET_TIME: NEIServerUtils.setHourForward(sender.worldObj, packet.readUByte(), true); break; - case 8: + case C2S.HEAL: NEIServerUtils.healPlayer(sender); break; - case 9: + case C2S.TOGGLE_RAIN: NEIServerUtils.toggleRaining(sender.worldObj, true); break; - case 10: + case C2S.REQUEST_LOGIN_INFO: sendLoginState(sender); break; - case 11: + case C2S.REQUEST_CONTAINER_CONTENTS: sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory()); break; - case 12: + case C2S.CHANGE_PROPERTY: handlePropertyChange(sender, packet); break; - case 13: + case C2S.SET_GAME_MODE: NEIServerUtils.setGamemode(sender, packet.readUByte()); break; - case 14: + case C2S.CYCLE_CREATIVE_INV: NEIServerUtils.cycleCreativeInv(sender, packet.readInt()); break; - case 15: + case C2S.SEND_MOB_SPAWNER_ID: handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString()); break; - case 16: + case C2S.REQUEST_CONTAINER: handleRequestContainer(sender, packet.readInt()); break; - case 21: + case C2S.REQUEST_ENCHANTMENT_GUI: openEnchantmentGui(sender); break; - case 22: + case C2S.MODIFY_ENCHANTMENT: modifyEnchantment(sender, packet.readUByte(), packet.readUByte(), packet.readBoolean()); break; - case 23: + case C2S.SET_CREATIVE_PLUS_MODE: processCreativeInv(sender, packet.readBoolean()); break; - case 24: + case C2S.REQUEST_POTION_GUI: openPotionGui(sender, packet); break; - case 25: + case C2S.SET_DUMMY_SLOT: handleDummySlotSet(sender, packet); break; } @@ -126,14 +128,14 @@ public class NEISPH implements IServerPacketHandler { NEIServerConfig.forPlayer(sender.getCommandSenderName()), Side.SERVER)), (player, windowId) -> { - PacketCustom packet = new PacketCustom(channel, 23); + PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE); packet.writeBoolean(true); packet.writeByte(windowId); packet.sendToPlayer(player); }); } else { sender.closeContainer(); - PacketCustom packet = new PacketCustom(channel, 23); + PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE); packet.writeBoolean(false); packet.sendToPlayer(sender); } @@ -169,7 +171,7 @@ public class NEISPH implements IServerPacketHandler { player, new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0), (player1, windowId) -> { - PacketCustom packet = new PacketCustom(channel, 21); + PacketCustom packet = new PacketCustom(channel, S2C.OPEN_ENCHANTMENT_GUI); packet.writeByte(windowId); packet.sendToPlayer(player1); }); @@ -179,18 +181,19 @@ public class NEISPH implements IServerPacketHandler { InventoryBasic b = new InventoryBasic("potionStore", true, 9); for (int i = 0; i < b.getSizeInventory(); i++) b.setInventorySlotContents(i, packet.readItemStack()); ServerUtils.openSMPContainer(player, new ContainerPotionCreator(player.inventory, b), (player1, windowId) -> { - PacketCustom packet1 = new PacketCustom(channel, 24); + PacketCustom packet1 = new PacketCustom(channel, S2C.OPEN_POTION_GUI); packet1.writeByte(windowId); packet1.sendToPlayer(player1); }); } public static void sendActionDisabled(int dim, String name, boolean disable) { - new PacketCustom(channel, 11).writeString(name).writeBoolean(disable).sendToDimension(dim); + new PacketCustom(channel, S2C.SEND_ACTION_DISABLED).writeString(name).writeBoolean(disable) + .sendToDimension(dim); } public static void sendActionEnabled(EntityPlayerMP player, String name, boolean enable) { - new PacketCustom(channel, 12).writeString(name).writeBoolean(enable).sendToPlayer(player); + new PacketCustom(channel, S2C.SEND_ACTION_ENABLED).writeString(name).writeBoolean(enable).sendToPlayer(player); } private void sendLoginState(EntityPlayerMP player) { @@ -209,7 +212,7 @@ public class NEISPH implements IServerPacketHandler { if (!NEIServerConfig.isPlayerInList(player.getCommandSenderName(), entry.value, true)) bannedItems.add(entry.key); - PacketCustom packet = new PacketCustom(channel, 10); + PacketCustom packet = new PacketCustom(channel, S2C.SEND_LOGIN_STATE); packet.writeByte(actions.size()); for (String s : actions) packet.writeString(s); @@ -228,7 +231,7 @@ public class NEISPH implements IServerPacketHandler { public static void sendHasServerSideTo(EntityPlayerMP player) { NEIServerConfig.logger.debug("Sending serverside check to: " + player.getCommandSenderName()); - PacketCustom packet = new PacketCustom(channel, 1); + PacketCustom packet = new PacketCustom(channel, S2C.SEND_SERVER_SIDE_CHECK); packet.writeByte(NEIActions.protocol); packet.writeString(CommonUtils.getWorldName(player.worldObj)); @@ -236,7 +239,7 @@ public class NEISPH implements IServerPacketHandler { } public static void sendAddMagneticItemTo(EntityPlayerMP player, EntityItem item) { - PacketCustom packet = new PacketCustom(channel, 13); + PacketCustom packet = new PacketCustom(channel, S2C.SEND_MAGNETIC_ITEM); packet.writeInt(item.getEntityId()); packet.sendToPlayer(player); diff --git a/src/main/java/codechicken/nei/NEIServerUtils.java b/src/main/java/codechicken/nei/NEIServerUtils.java index 5dde12f7..92c86e80 100644 --- a/src/main/java/codechicken/nei/NEIServerUtils.java +++ b/src/main/java/codechicken/nei/NEIServerUtils.java @@ -42,6 +42,7 @@ import codechicken.core.ServerUtils; import codechicken.lib.inventory.InventoryRange; import codechicken.lib.inventory.InventoryUtils; import codechicken.lib.packet.PacketCustom; +import codechicken.nei.PacketIDs.S2C; import codechicken.nei.util.NBTHelper; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; @@ -295,7 +296,7 @@ public class NEIServerUtils { player.theItemInWorldManager.setGameType(getGameType(mode)); // tell the client to change it - new PacketCustom(NEISPH.channel, 14).writeByte(mode).sendToPlayer(player); + new PacketCustom(NEISPH.channel, S2C.SEND_GAME_MODE).writeByte(mode).sendToPlayer(player); player.addChatMessage(new ChatComponentTranslation("nei.chat.gamemode." + mode)); } diff --git a/src/main/java/codechicken/nei/PacketIDs.java b/src/main/java/codechicken/nei/PacketIDs.java new file mode 100644 index 00000000..9ff2f291 --- /dev/null +++ b/src/main/java/codechicken/nei/PacketIDs.java @@ -0,0 +1,40 @@ +package codechicken.nei; + +public final class PacketIDs { + + public static final class C2S { + + public static final int GIVE_ITEM = 1; + public static final int DELETE_ALL_ITEMS = 4; + public static final int SET_SLOT = 5; + public static final int TOGGLE_MAGNET = 6; + public static final int SET_TIME = 7; + public static final int HEAL = 8; + public static final int TOGGLE_RAIN = 9; + public static final int REQUEST_LOGIN_INFO = 10; + public static final int REQUEST_CONTAINER_CONTENTS = 11; + public static final int CHANGE_PROPERTY = 12; + public static final int SET_GAME_MODE = 13; + public static final int CYCLE_CREATIVE_INV = 14; + public static final int SEND_MOB_SPAWNER_ID = 15; + public static final int REQUEST_CONTAINER = 16; + public static final int REQUEST_ENCHANTMENT_GUI = 21; + public static final int MODIFY_ENCHANTMENT = 22; + public static final int SET_CREATIVE_PLUS_MODE = 23; + public static final int REQUEST_POTION_GUI = 24; + public static final int SET_DUMMY_SLOT = 25; + } + + public static final class S2C { + + public static final int SEND_SERVER_SIDE_CHECK = 1; + public static final int SEND_LOGIN_STATE = 10; + public static final int SEND_ACTION_DISABLED = 11; + public static final int SEND_ACTION_ENABLED = 12; + public static final int SEND_MAGNETIC_ITEM = 13; + public static final int SEND_GAME_MODE = 14; + public static final int OPEN_ENCHANTMENT_GUI = 21; + public static final int SET_CREATIVE_PLUS_MODE = 23; + public static final int OPEN_POTION_GUI = 24; + } +}