diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index afc2e7140..d2e2aabe9 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -30,13 +30,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; -import forestry.api.fuels.EngineBronzeFuel; -import forestry.api.fuels.EngineCopperFuel; -import forestry.api.fuels.FermenterFuel; import forestry.api.fuels.FuelManager; -import forestry.api.fuels.GeneratorFuel; -import forestry.api.fuels.MoistenerFuel; -import forestry.api.fuels.RainSubstrate; import forestry.core.ForestryCore; import forestry.core.config.Constants; import forestry.core.config.ForestryItem; diff --git a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java index 18574653b..e35bdfa26 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java +++ b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java @@ -11,18 +11,20 @@ package forestry.apiculture.gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.apiculture.items.ItemImprinter.ImprinterInventory; +import forestry.apiculture.network.PacketImprintSelectionRequest; +import forestry.apiculture.network.PacketImprintSelectionResponse; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.IGuiSelectable; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import forestry.core.network.ForestryPacket; -import forestry.core.network.PacketGuiSelect; -import forestry.core.network.PacketId; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; public class ContainerImprinter extends ContainerItemInventory implements IGuiSelectable { @@ -68,38 +70,39 @@ public class ContainerImprinter extends ContainerItemInventory implements IGuiSelectable { @@ -54,12 +56,12 @@ public class ContainerSolderingIron extends ContainerItemInventory implements IGuiSelectable { @@ -54,7 +55,7 @@ public class ContainerEscritoire extends ContainerTile implement } @Override - public void handleSelectionChange(EntityPlayer player, PacketGuiSelect packet) { + public void handleSelectionRequest(EntityPlayerMP player, PacketGuiSelectRequest packet) { if (!tile.getGame().isEnded()) { int index = packet.getPrimaryIndex(); if (index == -1) { @@ -65,8 +66,4 @@ public class ContainerEscritoire extends ContainerTile implement } } } - - @Override - public void setSelection(PacketGuiSelect packet) { - } } diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index 708bfb26a..77500371a 100644 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -17,7 +17,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import forestry.core.gui.slots.SlotForestry; -import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketClient; import forestry.core.proxy.Proxies; import forestry.core.utils.SlotUtil; @@ -65,7 +65,7 @@ public abstract class ContainerForestry extends Container { protected abstract boolean canAccess(EntityPlayer player); - protected final void sendPacketToCrafters(ForestryPacket packet) { + protected final void sendPacketToCrafters(IForestryPacketClient packet) { for (Object crafter : crafters) { if (crafter instanceof EntityPlayer) { Proxies.net.sendToPlayer(packet, (EntityPlayer) crafter); diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java b/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java index 0af36ef78..c28b3a094 100644 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanksHelper.java @@ -20,8 +20,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import forestry.api.core.IToolPipette; -import forestry.core.network.PacketId; -import forestry.core.network.PacketSlotClick; +import forestry.core.network.PacketPipetteClick; import forestry.core.proxy.Proxies; import forestry.core.tiles.ILiquidTankTile; @@ -40,7 +39,7 @@ public class ContainerLiquidTanksHelper return; } - Proxies.net.sendToServer(new PacketSlotClick(PacketId.PIPETTE_CLICK, tile, slot)); + Proxies.net.sendToServer(new PacketPipetteClick(tile, slot)); } @Override diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index fdaeaa298..f843c449c 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -11,10 +11,11 @@ package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.gui.slots.SlotFiltered; -import forestry.core.network.PacketGuiSelect; +import forestry.core.network.PacketGuiSelectRequest; import forestry.core.tiles.TileNaturalistChest; public class ContainerNaturalistInventory extends ContainerTile implements IGuiSelectable { @@ -32,14 +33,10 @@ public class ContainerNaturalistInventory extends ContainerTile impleme @Override public void handleChipsetClick(int slot) { - PacketSlotClick packet = new PacketSlotClick(PacketId.CHIPSET_CLICK, tile, slot); - Proxies.net.sendToServer(packet); + Proxies.net.sendToServer(new PacketChipsetClick(tile, slot)); } @Override @@ -77,8 +76,7 @@ public class ContainerSocketedHelper impleme @Override public void handleSolderingIronClick(int slot) { - PacketSlotClick packet = new PacketSlotClick(PacketId.SOLDERING_IRON_CLICK, tile, slot); - Proxies.net.sendToServer(packet); + Proxies.net.sendToServer(new PacketSolderingIronClick(tile, slot)); } @Override diff --git a/src/main/java/forestry/core/gui/GuiEscritoire.java b/src/main/java/forestry/core/gui/GuiEscritoire.java index 254b1d662..e98bad6b2 100755 --- a/src/main/java/forestry/core/gui/GuiEscritoire.java +++ b/src/main/java/forestry/core/gui/GuiEscritoire.java @@ -26,8 +26,7 @@ import org.lwjgl.opengl.GL11; import forestry.core.config.Constants; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; -import forestry.core.network.PacketGuiSelect; -import forestry.core.network.PacketId; +import forestry.core.network.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; @@ -123,8 +122,7 @@ public class GuiEscritoire extends GuiForestry= PacketIdClient.VALUES.length) { + return; + } + PacketIdServer packetId = PacketIdServer.VALUES[packetIdOrdinal]; + IForestryPacketServer packetHandler = packetId.getPacketHandler(); + packetHandler.readData(data); + packetHandler.onPacketData(data, player); + } catch (Exception ex) { + ex.printStackTrace(); + } } @SubscribeEvent public void onPacket(ClientCustomPacketEvent event) { - onPacketData(event.packet, Proxies.common.getPlayer()); - } - - /** Returns true if the packet has been handled */ - private static boolean onPacketData(FMLProxyPacket fmlPacket, EntityPlayer player) { - InputStream is = new ByteBufInputStream(fmlPacket.payload()); - DataInputStreamForestry data = new DataInputStreamForestry(is); + DataInputStreamForestry data = getStream(event.packet); + EntityPlayer player = Proxies.common.getPlayer(); try { - int packetIdOrdinal = data.readByte(); - if (packetIdOrdinal >= PacketId.VALUES.length) { - return false; - } - PacketId packetId = PacketId.VALUES[packetIdOrdinal]; - - switch (packetId) { - - case TILE_FORESTRY_UPDATE: { - PacketTileStream.onPacketData(data); - return true; - } - case TILE_FORESTRY_ERROR_UPDATE: { - PacketErrorUpdate.onPacketData(data); - return true; - } - case TILE_FORESTRY_GUI_OPENED: { - PacketGuiUpdate.onPacketData(data); - return true; - } - case TILE_FORESTRY_ACTIVE: { - PacketActiveUpdate.onPacketData(data); - return true; - } - case SOCKET_UPDATE: { - PacketSocketUpdate packetS = new PacketSocketUpdate(data); - onSocketUpdate(packetS); - return true; - } - case FX_SIGNAL: { - PacketFXSignal packet = new PacketFXSignal(data); - packet.executeFX(); - return true; - } - - case PIPETTE_CLICK: { - PacketSlotClick packet = new PacketSlotClick(data); - onPipetteClick(packet, (EntityPlayerMP) player); - return true; - } - case SOLDERING_IRON_CLICK: { - PacketSlotClick packet = new PacketSlotClick(data); - onSolderingIronClick(packet, (EntityPlayerMP) player); - return true; - } - case CHIPSET_CLICK: { - PacketSlotClick packet = new PacketSlotClick(data); - onChipsetClick(packet, (EntityPlayerMP) player); - return true; - } - case ACCESS_SWITCH: { - PacketCoordinates packet = new PacketCoordinates(data); - onAccessSwitch(packet, player); - return true; - } - case GUI_SELECTION_SET: { - PacketGuiSelect packet = new PacketGuiSelect(data); - onGuiSelection(packet); - return true; - } - case GUI_SELECTION_CHANGE: { - PacketGuiSelect packet = new PacketGuiSelect(data); - onGuiChange(player, packet); - return true; - } - case GUI_LAYOUT_SELECT: { - PacketString packet = new PacketString(data); - onGuiLayoutSelect(packet); - return true; - } - case GENOME_TRACKER_UPDATE: { - PacketNBT packet = new PacketNBT(data); - onGenomeTrackerUpdate(packet); - return true; - } - case GUI_PROGRESS_BAR: { - PacketProgressBarUpdate.onPacketData(data); - return true; - } - case GUI_ITEMSTACK: { - PacketItemStackDisplay.onPacketData(data); - return true; - } - case GUI_ENERGY: { - PacketGuiEnergy.onPacketData(data); - return true; - } - default: { - for (IPacketHandler handler : PluginManager.packetHandlers) { - if (handler.onPacketData(packetId, data, player)) { - return true; - } - } - } + byte packetIdOrdinal = data.readByte(); + if (packetIdOrdinal >= PacketIdClient.VALUES.length) { + return; } + PacketIdClient packetId = PacketIdClient.VALUES[packetIdOrdinal]; + IForestryPacketClient packetHandler = packetId.getPacketHandler(); + packetHandler.readData(data); + packetHandler.onPacketData(data, player); } catch (Exception ex) { ex.printStackTrace(); } + } - return false; + private static DataInputStreamForestry getStream(FMLProxyPacket fmlPacket) { + InputStream is = new ByteBufInputStream(fmlPacket.payload()); + return new DataInputStreamForestry(is); } public void sendPacket(FMLProxyPacket packet, EntityPlayerMP player) { channel.sendTo(packet, player); } - private static void onGenomeTrackerUpdate(PacketNBT packet) { - assert FMLCommonHandler.instance().getEffectiveSide().isClient(); - - EntityPlayer player = Proxies.common.getPlayer(); - IBreedingTracker tracker = null; - String type = packet.getTagCompound().getString(BreedingTracker.TYPE_KEY); - - ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(type); - if (root != null) { - tracker = root.getBreedingTracker(Proxies.common.getRenderWorld(), player.getGameProfile()); - } - if (tracker != null) { - tracker.decodeFromNBT(packet.getTagCompound()); - MinecraftForge.EVENT_BUS.post(new ForestryEvent.SyncedBreedingTracker(tracker, player)); - } - } - - private static void onGuiChange(EntityPlayer player, PacketGuiSelect packet) { - assert FMLCommonHandler.instance().getEffectiveSide().isServer(); - - if (!(player.openContainer instanceof IGuiSelectable)) { - return; - } - - ((IGuiSelectable) player.openContainer).handleSelectionChange(player, packet); - } - - private static void onGuiSelection(PacketGuiSelect packet) { - assert FMLCommonHandler.instance().getEffectiveSide().isClient(); - - EntityPlayer player = Proxies.common.getPlayer(); - - Container container = player.openContainer; - if (!(container instanceof IGuiSelectable)) { - return; - } - - ((IGuiSelectable) container).setSelection(packet); - } - - private static void onGuiLayoutSelect(PacketString packet) { - assert FMLCommonHandler.instance().getEffectiveSide().isClient(); - - EntityPlayer player = Proxies.common.getPlayer(); - - Container container = player.openContainer; - if (!(container instanceof ContainerSolderingIron)) { - return; - } - - ((ContainerSolderingIron) container).setLayout(packet.getString()); - } - - private static void onSocketUpdate(PacketSocketUpdate packet) { - assert FMLCommonHandler.instance().getEffectiveSide().isClient(); - - TileEntity tile = packet.getTarget(Proxies.common.getRenderWorld()); - if (!(tile instanceof ISocketable)) { - return; - } - - ISocketable socketable = (ISocketable) tile; - for (int i = 0; i < packet.itemStacks.length; i++) { - socketable.setSocket(i, packet.itemStacks[i]); - } - } - - private static void onChipsetClick(PacketSlotClick packet, EntityPlayerMP player) { - assert FMLCommonHandler.instance().getEffectiveSide().isServer(); - - if (!(player.openContainer instanceof IContainerSocketed)) { - return; - } - ItemStack itemstack = player.inventory.getItemStack(); - if (!(itemstack.getItem() instanceof ItemCircuitBoard)) { - return; - } - - ((IContainerSocketed) player.openContainer).handleChipsetClickServer(packet.getSlot(), player, itemstack); - } - - private static void onSolderingIronClick(PacketSlotClick packet, EntityPlayerMP player) { - assert FMLCommonHandler.instance().getEffectiveSide().isServer(); - - if (!(player.openContainer instanceof IContainerSocketed)) { - return; - } - ItemStack itemstack = player.inventory.getItemStack(); - - ((IContainerSocketed) player.openContainer).handleSolderingIronClickServer(packet.getSlot(), player, itemstack); - } - - private static void onAccessSwitch(PacketCoordinates packet, EntityPlayer playerEntity) { - assert FMLCommonHandler.instance().getEffectiveSide().isServer(); - - TileEntity tile = packet.getTarget(playerEntity.worldObj); - - if (tile instanceof TileAlveary) { - TileAlveary tileAlveary = (TileAlveary) tile; - IAlvearyController alvearyController = tileAlveary.getAlvearyController(); - alvearyController.getAccessHandler().switchAccessRule(playerEntity); - } else if (tile instanceof TileFarm) { - TileFarm tileFarm = (TileFarm) tile; - IFarmController farmController = tileFarm.getFarmController(); - farmController.getAccessHandler().switchAccessRule(playerEntity); - } else if (tile instanceof IRestrictedAccessTile) { - IRestrictedAccessTile restrictedAccessTile = (IRestrictedAccessTile) tile; - - restrictedAccessTile.getAccessHandler().switchAccessRule(playerEntity); - } - } - - private static void onPipetteClick(PacketSlotClick packet, EntityPlayerMP player) { - assert FMLCommonHandler.instance().getEffectiveSide().isServer(); - - if ((player.openContainer instanceof IContainerLiquidTanks)) { - ((IContainerLiquidTanks) player.openContainer).handlePipetteClick(packet.getSlot(), player); - } - } } diff --git a/src/main/java/forestry/core/network/PacketId.java b/src/main/java/forestry/core/network/PacketId.java deleted file mode 100644 index f7e9657f3..000000000 --- a/src/main/java/forestry/core/network/PacketId.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.network; - -public enum PacketId { - INVALID, - - TILE_FORESTRY_UPDATE, - TILE_FORESTRY_ERROR_UPDATE, - TILE_FORESTRY_GUI_OPENED, - TILE_FORESTRY_ACTIVE, - FX_SIGNAL, - - WORKTABLE_MEMORY_UPDATE, - WORKTABLE_NEI_SELECT, - - HABITAT_BIOME_POINTER, - CANDLE, - BEE_LOGIC_ACTIVE, - - GUI_SELECTION_CHANGE, - IMPRINT_SELECTION_GET, - GUI_SELECTION_SET, - GUI_LAYOUT_SELECT, - GUI_PROGRESS_BAR, - GUI_ITEMSTACK, - GUI_ENERGY, - - PIPETTE_CLICK, - - ACCESS_SWITCH, - - GENOME_TRACKER_UPDATE, - GAME_TOKEN_SET, - - CHIPSET_CLICK, - SOLDERING_IRON_CLICK, - SOCKET_UPDATE, - - LETTER_REQUEST_INFO, - LETTER_TEXT, - TRADING_ADDRESS_SET, - LETTER_INFO, - POBOX_INFO, - POBOX_INFO_REQUEST, - - RIPENING_UPDATE, - - // Propolis pipe - PROP_SEND_FILTER_SET, - PROP_REQUEST_FILTER_SET, - PROP_SEND_FILTER_CHANGE_GENOME, - PROP_SEND_FILTER_CHANGE_TYPE; - - public static final PacketId[] VALUES = values(); -} diff --git a/src/main/java/forestry/core/network/PacketIdClient.java b/src/main/java/forestry/core/network/PacketIdClient.java new file mode 100644 index 000000000..328741eda --- /dev/null +++ b/src/main/java/forestry/core/network/PacketIdClient.java @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.network; + +import javax.annotation.Nonnull; + +public enum PacketIdClient implements IPacketId { + INVALID, + + // Core Gui + ERROR_UPDATE(new PacketErrorUpdate()), + GUI_UPDATE(new PacketGuiUpdate()), + GUI_LAYOUT_SELECT(new PacketGuiLayoutSelect()), + GUI_PROGRESS_BAR(new PacketProgressBarUpdate()), + GUI_ENERGY(new PacketGuiEnergy()), + SOCKET_UPDATE(new PacketSocketUpdate()), + + // Core Tile Entities + TILE_FORESTRY_UPDATE(new PacketTileStream()), + ITEMSTACK_DISPLAY(new PacketItemStackDisplay()), + FX_SIGNAL(new PacketFXSignal()), + + // Core Genome + GENOME_TRACKER_UPDATE(new PacketGenomeTrackerUpdate()), + + // Factory + WORKTABLE_MEMORY_UPDATE, + + // Apiculture + TILE_FORESTRY_ACTIVE, + BEE_LOGIC_ACTIVE, + HABITAT_BIOME_POINTER, + CANDLE_UPDATE, + IMPRINT_SELECTION_RESPONSE, + + // Arboriculture + RIPENING_UPDATE, + + // Mail + TRADING_ADDRESS_RESPONSE, + LETTER_INFO_RESPONSE, + POBOX_INFO_RESPONSE; + + public static final PacketIdClient[] VALUES = values(); + + @Nonnull + private IForestryPacketClient packetHandler; + + PacketIdClient() { + this.packetHandler = PacketDummy.instance; + } + + PacketIdClient(@Nonnull IForestryPacketClient packetHandler) { + this.packetHandler = packetHandler; + } + + public void setPacketHandler(@Nonnull IForestryPacketClient packetHandler) { + this.packetHandler = packetHandler; + } + + @Nonnull + public IForestryPacketClient getPacketHandler() { + return packetHandler; + } +} diff --git a/src/main/java/forestry/core/network/PacketIdServer.java b/src/main/java/forestry/core/network/PacketIdServer.java new file mode 100644 index 000000000..7c4c43c17 --- /dev/null +++ b/src/main/java/forestry/core/network/PacketIdServer.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.network; + +import javax.annotation.Nonnull; + +public enum PacketIdServer implements IPacketId { + INVALID, + + // Core Gui + GUI_SELECTION_REQUEST(new PacketGuiSelectRequest()), + PIPETTE_CLICK(new PacketPipetteClick()), + ACCESS_SWITCH(new PacketAccessSwitch()), + CHIPSET_CLICK(new PacketChipsetClick()), + SOLDERING_IRON_CLICK(new PacketSolderingIronClick()), + + // Apiculture + IMPRINT_SELECTION_REQUEST, + + // Factory + WORKTABLE_NEI_SELECT, + + // Mail + LETTER_INFO_REQUEST, + TRADING_ADDRESS_REQUEST, + POBOX_INFO_REQUEST, + LETTER_TEXT_SET; + + public static final PacketIdServer[] VALUES = values(); + + @Nonnull + private IForestryPacketServer packetHandler; + + PacketIdServer() { + this.packetHandler = PacketDummy.instance; + } + + PacketIdServer(@Nonnull IForestryPacketServer packetHandler) { + this.packetHandler = packetHandler; + } + + public void setPacketHandler(@Nonnull IForestryPacketServer packetHandler) { + this.packetHandler = packetHandler; + } + + @Nonnull + public IForestryPacketServer getPacketHandler() { + return packetHandler; + } +} diff --git a/src/main/java/forestry/core/network/PacketItemStackDisplay.java b/src/main/java/forestry/core/network/PacketItemStackDisplay.java index 03f6da713..47828820a 100644 --- a/src/main/java/forestry/core/network/PacketItemStackDisplay.java +++ b/src/main/java/forestry/core/network/PacketItemStackDisplay.java @@ -12,6 +12,7 @@ package forestry.core.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -19,20 +20,15 @@ import forestry.core.proxy.Proxies; import forestry.core.tiles.IItemStackDisplay; import forestry.core.tiles.TileForestry; -public class PacketItemStackDisplay extends PacketCoordinates { +public class PacketItemStackDisplay extends PacketCoordinates implements IForestryPacketClient { private ItemStack itemStack; - public static void onPacketData(DataInputStreamForestry data) throws IOException { - new PacketItemStackDisplay(data); - } - - private PacketItemStackDisplay(DataInputStreamForestry data) throws IOException { - super(data); + public PacketItemStackDisplay() { } public PacketItemStackDisplay(T tile, ItemStack itemStack) { - super(PacketId.GUI_ITEMSTACK, tile); + super(PacketIdClient.ITEMSTACK_DISPLAY, tile); this.itemStack = itemStack; } @@ -43,10 +39,13 @@ public class PacketItemStackDisplay extends PacketCoordinates { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { super.readData(data); itemStack = data.readItemStack(); + } + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { TileEntity tile = getTarget(Proxies.common.getRenderWorld()); if (tile instanceof IItemStackDisplay) { ((IItemStackDisplay) tile).handleItemStackForDisplay(itemStack); diff --git a/src/main/java/forestry/core/network/PacketNBT.java b/src/main/java/forestry/core/network/PacketNBT.java index c1a5a8409..48dc1cec7 100755 --- a/src/main/java/forestry/core/network/PacketNBT.java +++ b/src/main/java/forestry/core/network/PacketNBT.java @@ -14,15 +14,14 @@ import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; -public class PacketNBT extends ForestryPacket { +public abstract class PacketNBT extends ForestryPacket { private NBTTagCompound nbttagcompound; - public PacketNBT(DataInputStreamForestry data) throws IOException { - super(data); + protected PacketNBT() { } - public PacketNBT(PacketId id, NBTTagCompound nbttagcompound) { + protected PacketNBT(IPacketId id, NBTTagCompound nbttagcompound) { super(id); this.nbttagcompound = nbttagcompound; } @@ -33,11 +32,11 @@ public class PacketNBT extends ForestryPacket { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { this.nbttagcompound = data.readNBTTagCompound(); } - public NBTTagCompound getTagCompound() { + protected NBTTagCompound getTagCompound() { return this.nbttagcompound; } } diff --git a/src/main/java/forestry/core/network/PacketPipetteClick.java b/src/main/java/forestry/core/network/PacketPipetteClick.java new file mode 100644 index 000000000..508e738b8 --- /dev/null +++ b/src/main/java/forestry/core/network/PacketPipetteClick.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.network; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + +import forestry.core.gui.IContainerLiquidTanks; + +public class PacketPipetteClick extends PacketSlotClick implements IForestryPacketServer { + + public PacketPipetteClick() { + } + + public PacketPipetteClick(TileEntity tile, int slot) { + super(PacketIdServer.PIPETTE_CLICK, tile, slot); + } + + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + if ((player.openContainer instanceof IContainerLiquidTanks)) { + ((IContainerLiquidTanks) player.openContainer).handlePipetteClick(getSlot(), player); + } + } +} diff --git a/src/main/java/forestry/core/network/PacketProgressBarUpdate.java b/src/main/java/forestry/core/network/PacketProgressBarUpdate.java index cfe7c7492..36a48f70a 100644 --- a/src/main/java/forestry/core/network/PacketProgressBarUpdate.java +++ b/src/main/java/forestry/core/network/PacketProgressBarUpdate.java @@ -12,28 +12,21 @@ package forestry.core.network; import java.io.IOException; -import net.minecraft.client.entity.EntityClientPlayerMP; - -import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.entity.player.EntityPlayer; /** * @author CovertJaguar */ -public class PacketProgressBarUpdate extends ForestryPacket { +public class PacketProgressBarUpdate extends ForestryPacket implements IForestryPacketClient { private int windowId, dataId, value; - public static void onPacketData(DataInputStreamForestry data) throws IOException { - new PacketProgressBarUpdate(data); - } - - private PacketProgressBarUpdate(DataInputStreamForestry data) throws IOException { - super(data); + public PacketProgressBarUpdate() { } public PacketProgressBarUpdate(int windowId, int dataId, int value) { - super(PacketId.GUI_PROGRESS_BAR); + super(PacketIdClient.GUI_PROGRESS_BAR); this.windowId = windowId; this.dataId = dataId; this.value = value; @@ -47,13 +40,14 @@ public class PacketProgressBarUpdate extends ForestryPacket { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { windowId = data.readByte(); dataId = data.readByte(); value = data.readInt(); + } - EntityClientPlayerMP player = FMLClientHandler.instance().getClient().thePlayer; - + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { if (player.openContainer != null && player.openContainer.windowId == windowId) { player.openContainer.updateProgressBar(dataId, value); } diff --git a/src/main/java/forestry/core/network/PacketSlotClick.java b/src/main/java/forestry/core/network/PacketSlotClick.java index cd962ea30..cb6d8a987 100644 --- a/src/main/java/forestry/core/network/PacketSlotClick.java +++ b/src/main/java/forestry/core/network/PacketSlotClick.java @@ -14,20 +14,19 @@ import java.io.IOException; import net.minecraft.tileentity.TileEntity; -public class PacketSlotClick extends PacketCoordinates { +public abstract class PacketSlotClick extends PacketCoordinates { private int slot; - public PacketSlotClick(DataInputStreamForestry data) throws IOException { - super(data); + protected PacketSlotClick() { } - public PacketSlotClick(PacketId id, TileEntity tile, int slot) { + protected PacketSlotClick(IPacketId id, TileEntity tile, int slot) { super(id, tile); this.slot = slot; } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { super.readData(data); this.slot = data.readVarInt(); } diff --git a/src/main/java/forestry/core/network/PacketSocketUpdate.java b/src/main/java/forestry/core/network/PacketSocketUpdate.java index 183c73475..563cff086 100755 --- a/src/main/java/forestry/core/network/PacketSocketUpdate.java +++ b/src/main/java/forestry/core/network/PacketSocketUpdate.java @@ -12,21 +12,22 @@ package forestry.core.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import forestry.core.circuits.ISocketable; +import forestry.core.proxy.Proxies; -public class PacketSocketUpdate extends PacketCoordinates { +public class PacketSocketUpdate extends PacketCoordinates implements IForestryPacketClient { - public ItemStack[] itemStacks; + private ItemStack[] itemStacks; - public PacketSocketUpdate(DataInputStreamForestry data) throws IOException { - super(data); + public PacketSocketUpdate() { } public PacketSocketUpdate(T tile) { - super(PacketId.SOCKET_UPDATE, tile); + super(PacketIdClient.SOCKET_UPDATE, tile); itemStacks = new ItemStack[tile.getSocketCount()]; for (int i = 0; i < tile.getSocketCount(); i++) { @@ -37,14 +38,25 @@ public class PacketSocketUpdate extends PacketCoordinates { @Override protected void writeData(DataOutputStreamForestry data) throws IOException { super.writeData(data); - data.writeItemStacks(itemStacks); } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { super.readData(data); - itemStacks = data.readItemStacks(); } + + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { + TileEntity tile = getTarget(Proxies.common.getRenderWorld()); + if (!(tile instanceof ISocketable)) { + return; + } + + ISocketable socketable = (ISocketable) tile; + for (int i = 0; i < itemStacks.length; i++) { + socketable.setSocket(i, itemStacks[i]); + } + } } diff --git a/src/main/java/forestry/core/network/PacketSolderingIronClick.java b/src/main/java/forestry/core/network/PacketSolderingIronClick.java new file mode 100644 index 000000000..bc5505030 --- /dev/null +++ b/src/main/java/forestry/core/network/PacketSolderingIronClick.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.network; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import forestry.core.gui.IContainerSocketed; + +public class PacketSolderingIronClick extends PacketSlotClick implements IForestryPacketServer { + + public PacketSolderingIronClick() { + } + + public PacketSolderingIronClick(TileEntity tile, int slot) { + super(PacketIdServer.SOLDERING_IRON_CLICK, tile, slot); + } + + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + if (!(player.openContainer instanceof IContainerSocketed)) { + return; + } + ItemStack itemstack = player.inventory.getItemStack(); + + ((IContainerSocketed) player.openContainer).handleSolderingIronClickServer(getSlot(), player, itemstack); + } +} diff --git a/src/main/java/forestry/core/network/PacketString.java b/src/main/java/forestry/core/network/PacketString.java index dd602658a..9abe915fe 100644 --- a/src/main/java/forestry/core/network/PacketString.java +++ b/src/main/java/forestry/core/network/PacketString.java @@ -12,15 +12,14 @@ package forestry.core.network; import java.io.IOException; -public class PacketString extends ForestryPacket { +public abstract class PacketString extends ForestryPacket { private String string; - public PacketString(DataInputStreamForestry data) throws IOException { - super(data); + protected PacketString() { } - public PacketString(PacketId id, String string) { + protected PacketString(IPacketId id, String string) { super(id); this.string = string; } @@ -32,7 +31,7 @@ public class PacketString extends ForestryPacket { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { super.readData(data); string = data.readUTF(); } diff --git a/src/main/java/forestry/core/network/PacketTileStream.java b/src/main/java/forestry/core/network/PacketTileStream.java index 9e8b19f11..9c20b5112 100644 --- a/src/main/java/forestry/core/network/PacketTileStream.java +++ b/src/main/java/forestry/core/network/PacketTileStream.java @@ -12,24 +12,20 @@ package forestry.core.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import forestry.core.proxy.Proxies; -public class PacketTileStream extends PacketCoordinates { +public class PacketTileStream extends PacketCoordinates implements IForestryPacketClient { private IStreamable streamable; - public static void onPacketData(DataInputStreamForestry data) throws IOException { - new PacketTileStream(data); - } - - private PacketTileStream(DataInputStreamForestry data) throws IOException { - super(data); + public PacketTileStream() { } public PacketTileStream(T streamable) { - super(PacketId.TILE_FORESTRY_UPDATE, streamable); + super(PacketIdClient.TILE_FORESTRY_UPDATE, streamable); this.streamable = streamable; } @@ -40,9 +36,7 @@ public class PacketTileStream extends PacketCoordinates { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { - super.readData(data); - + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { TileEntity tile = getTarget(Proxies.common.getRenderWorld()); if (tile instanceof IStreamable) { ((IStreamable) tile).readData(data); diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 8bf90c565..71029ca9d 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -49,15 +48,12 @@ import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.VersionParser; import cpw.mods.fml.common.versioning.VersionRange; -import forestry.Forestry; import forestry.core.TickHandlerCoreServer; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.multiblock.MultiblockServerTickHandler; -import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketFXSignal; -import forestry.core.network.PacketId; import forestry.core.render.SpriteSheet; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; @@ -162,10 +158,7 @@ public class ProxyCommon { player.dropPlayerItemWithRandomChoice(stack, true); } - public void setHabitatLocatorCoordinates(Entity player, ChunkCoordinates coordinates) { - if (coordinates != null) { - Forestry.packetHandler.sendPacket(new PacketCoordinates(PacketId.HABITAT_BIOME_POINTER, coordinates).getPacket(), (EntityPlayerMP) player); - } + public void setHabitatLocatorTexture(Entity player, ChunkCoordinates coordinates) { } public void removePotionEffect(EntityPlayer player, Potion effect) { diff --git a/src/main/java/forestry/core/proxy/ProxyCommonClient.java b/src/main/java/forestry/core/proxy/ProxyCommonClient.java index 05eff34f7..2e7474ba1 100644 --- a/src/main/java/forestry/core/proxy/ProxyCommonClient.java +++ b/src/main/java/forestry/core/proxy/ProxyCommonClient.java @@ -69,7 +69,7 @@ public class ProxyCommonClient extends ProxyCommon { } @Override - public void setHabitatLocatorCoordinates(Entity player, ChunkCoordinates coordinates) { + public void setHabitatLocatorTexture(Entity player, ChunkCoordinates coordinates) { TextureHabitatLocator.getInstance().setTargetCoordinates(coordinates); } diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index 2f71076ec..483e0434a 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -19,12 +19,13 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import forestry.Forestry; -import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketClient; +import forestry.core.network.IForestryPacketServer; import forestry.core.network.ILocatedPacket; public class ProxyNetwork { - public

void sendNetworkPacket(P packet, World world) { + public

void sendNetworkPacket(P packet, World world) { if (packet == null || !(world instanceof WorldServer)) { return; } @@ -40,13 +41,13 @@ public class ProxyNetwork { EntityPlayerMP player = (EntityPlayerMP) playerObj; if (playerManager.isPlayerWatchingChunk(player, chunkX, chunkZ)) { - Forestry.packetHandler.sendPacket(packet.getPacket(), player); + sendToPlayer(packet, player); } } } } - public void sendToPlayer(ForestryPacket packet, EntityPlayer entityplayer) { + public void sendToPlayer(IForestryPacketClient packet, EntityPlayer entityplayer) { if (!(entityplayer instanceof EntityPlayerMP) || (entityplayer instanceof FakePlayer)) { return; } @@ -55,7 +56,7 @@ public class ProxyNetwork { Forestry.packetHandler.sendPacket(packet.getPacket(), player); } - public void sendToServer(ForestryPacket packet) { + public void sendToServer(IForestryPacketServer packet) { } public void inventoryChangeNotify(EntityPlayer player) { diff --git a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java index d57c36515..34846f2dc 100644 --- a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java +++ b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java @@ -12,12 +12,12 @@ package forestry.core.proxy; import net.minecraft.client.network.NetHandlerPlayClient; -import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketServer; public class ProxyNetworkClient extends ProxyNetwork { @Override - public void sendToServer(ForestryPacket packet) { + public void sendToServer(IForestryPacketServer packet) { NetHandlerPlayClient netHandler = Proxies.common.getClientInstance().getNetHandler(); if (netHandler != null) { netHandler.addToSendQueue(packet.getPacket()); diff --git a/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java b/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java index f752e3781..758ff6a78 100644 --- a/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java +++ b/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java @@ -17,8 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import forestry.core.network.PacketId; -import forestry.core.network.PacketNBT; import forestry.core.proxy.Proxies; import codechicken.nei.LayoutManager; @@ -71,7 +69,7 @@ public class CustomOverlayHandler implements IOverlayHandler { NBTTagCompound data = new NBTTagCompound(); data.setTag("stacks", stacksnbt); - Proxies.net.sendToServer(new PacketNBT(PacketId.WORKTABLE_NEI_SELECT, data)); + Proxies.net.sendToServer(new PacketWorktableNEISelect(data)); } else { IStackPositioner positioner = new OffsetPositioner(xOffs, yOffs); LayoutManager.overlayRenderer = new DefaultOverlayRenderer(ingr, positioner); diff --git a/src/main/java/forestry/factory/network/PacketHandlerFactory.java b/src/main/java/forestry/core/recipes/nei/PacketWorktableNEISelect.java similarity index 56% rename from src/main/java/forestry/factory/network/PacketHandlerFactory.java rename to src/main/java/forestry/core/recipes/nei/PacketWorktableNEISelect.java index d33f8031e..fab7e794d 100644 --- a/src/main/java/forestry/factory/network/PacketHandlerFactory.java +++ b/src/main/java/forestry/core/recipes/nei/PacketWorktableNEISelect.java @@ -8,40 +8,32 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.factory.network; +package forestry.core.recipes.nei; import java.io.IOException; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; import forestry.core.gui.slots.SlotCraftMatrix; import forestry.core.network.DataInputStreamForestry; -import forestry.core.network.IPacketHandler; -import forestry.core.network.PacketId; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketIdServer; import forestry.core.network.PacketNBT; -import forestry.core.recipes.nei.SetRecipeCommandHandler; import forestry.factory.gui.ContainerWorktable; -public class PacketHandlerFactory implements IPacketHandler { - +public class PacketWorktableNEISelect extends PacketNBT implements IForestryPacketServer { private static final SetRecipeCommandHandler worktableNEISelectHandler = new SetRecipeCommandHandler(ContainerWorktable.class, SlotCraftMatrix.class); + public PacketWorktableNEISelect() { + } + + public PacketWorktableNEISelect(NBTTagCompound nbttagcompound) { + super(PacketIdServer.WORKTABLE_NEI_SELECT, nbttagcompound); + } + @Override - public boolean onPacketData(PacketId packetID, DataInputStreamForestry data, EntityPlayer player) throws IOException { - - switch (packetID) { - case WORKTABLE_MEMORY_UPDATE: { - PacketWorktableMemoryUpdate.onPacketData(data); - return true; - } - case WORKTABLE_NEI_SELECT: { - PacketNBT packet = new PacketNBT(data); - worktableNEISelectHandler.handle(packet.getTagCompound(), (EntityPlayerMP) player); - return true; - } - } - - return false; + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + worktableNEISelectHandler.handle(getTagCompound(), player); } } diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 56b8f839a..7abe6dfa5 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -11,6 +11,7 @@ package forestry.factory.gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.Slot; @@ -21,8 +22,7 @@ import forestry.core.gui.IContainerCrafting; import forestry.core.gui.IGuiSelectable; import forestry.core.gui.slots.SlotCraftMatrix; import forestry.core.gui.slots.SlotCrafter; -import forestry.core.network.PacketGuiSelect; -import forestry.core.network.PacketId; +import forestry.core.network.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.factory.network.PacketWorktableMemoryUpdate; @@ -105,12 +105,11 @@ public class ContainerWorktable extends ContainerTile implements } public static void sendRecipeClick(int mouseButton, int recipeIndex) { - PacketGuiSelect packet = new PacketGuiSelect(PacketId.GUI_SELECTION_CHANGE, mouseButton, recipeIndex); - Proxies.net.sendToServer(packet); + Proxies.net.sendToServer(new PacketGuiSelectRequest(mouseButton, recipeIndex)); } @Override - public void handleSelectionChange(EntityPlayer player, PacketGuiSelect packet) { + public void handleSelectionRequest(EntityPlayerMP player, PacketGuiSelectRequest packet) { if (packet.getPrimaryIndex() > 0) { tile.getMemory().toggleLock(player.worldObj, packet.getSecondaryIndex()); } else { @@ -119,8 +118,4 @@ public class ContainerWorktable extends ContainerTile implements updateRecipe(); } } - - @Override - public void setSelection(PacketGuiSelect packet) { - } } diff --git a/src/main/java/forestry/factory/network/PacketWorktableMemoryUpdate.java b/src/main/java/forestry/factory/network/PacketWorktableMemoryUpdate.java index c7f77b73a..ef550d3ba 100644 --- a/src/main/java/forestry/factory/network/PacketWorktableMemoryUpdate.java +++ b/src/main/java/forestry/factory/network/PacketWorktableMemoryUpdate.java @@ -12,30 +12,27 @@ package forestry.factory.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IForestryPacketClient; import forestry.core.network.PacketCoordinates; -import forestry.core.network.PacketId; +import forestry.core.network.PacketIdClient; import forestry.core.proxy.Proxies; import forestry.factory.recipes.RecipeMemory; import forestry.factory.tiles.TileWorktable; -public class PacketWorktableMemoryUpdate extends PacketCoordinates { +public class PacketWorktableMemoryUpdate extends PacketCoordinates implements IForestryPacketClient { private RecipeMemory recipeMemory; - public static void onPacketData(DataInputStreamForestry data) throws IOException { - new PacketWorktableMemoryUpdate(data); - } - - private PacketWorktableMemoryUpdate(DataInputStreamForestry data) throws IOException { - super(data); + public PacketWorktableMemoryUpdate() { } public PacketWorktableMemoryUpdate(TileWorktable worktable) { - super(PacketId.WORKTABLE_MEMORY_UPDATE, worktable); + super(PacketIdClient.WORKTABLE_MEMORY_UPDATE, worktable); this.recipeMemory = worktable.getMemory(); } @@ -46,9 +43,7 @@ public class PacketWorktableMemoryUpdate extends PacketCoordinates { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { - super.readData(data); - + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { TileEntity tile = getTarget(Proxies.common.getRenderWorld()); if (tile instanceof TileWorktable) { ((TileWorktable) tile).getMemory().readData(data); diff --git a/src/main/java/forestry/mail/PacketHandlerMail.java b/src/main/java/forestry/mail/PacketHandlerMail.java deleted file mode 100755 index dcff0c114..000000000 --- a/src/main/java/forestry/mail/PacketHandlerMail.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.mail; - -import java.io.IOException; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.tileentity.TileEntity; - -import forestry.core.network.DataInputStreamForestry; -import forestry.core.network.IPacketHandler; -import forestry.core.network.PacketId; -import forestry.core.network.PacketString; -import forestry.core.proxy.Proxies; -import forestry.mail.gui.ContainerCatalogue; -import forestry.mail.gui.ContainerLetter; -import forestry.mail.gui.GuiMailboxInfo; -import forestry.mail.network.PacketLetterInfo; -import forestry.mail.network.PacketPOBoxInfo; -import forestry.mail.network.PacketRequestLetterInfo; -import forestry.mail.network.PacketTraderAddress; -import forestry.mail.tiles.TileTrader; - -public class PacketHandlerMail implements IPacketHandler { - - @Override - public boolean onPacketData(PacketId packetID, DataInputStreamForestry data, EntityPlayer player) throws IOException { - - switch (packetID) { - case LETTER_INFO: { - PacketLetterInfo packet = new PacketLetterInfo(data); - onLetterInfo(packet); - return true; - } - case POBOX_INFO: { - PacketPOBoxInfo packet = new PacketPOBoxInfo(data); - onPOBoxInfo(packet); - return true; - } - case LETTER_REQUEST_INFO: { - PacketRequestLetterInfo packet = new PacketRequestLetterInfo(data); - onLetterRequestInfo(player, packet); - return true; - } - case LETTER_TEXT: { - PacketString packet = new PacketString(data); - onLetterText(player, packet); - return true; - } - case TRADING_ADDRESS_SET: { - PacketTraderAddress packet = new PacketTraderAddress(data); - handleTradeAddressSet(player, packet); - return true; - } - case POBOX_INFO_REQUEST: { - onPOBoxInfoRequest(player); - return true; - } - } - - return false; - } - - private static void onLetterInfo(PacketLetterInfo packet) { - - Container container = Proxies.common.getClientInstance().thePlayer.openContainer; - if (container instanceof ContainerLetter) { - ((ContainerLetter) container).handleLetterInfoUpdate(packet); - } else if (container instanceof ContainerCatalogue) { - ((ContainerCatalogue) container).handleTradeInfoUpdate(packet); - } - - } - - private static void onPOBoxInfo(PacketPOBoxInfo packet) { - GuiMailboxInfo.instance.setPOBoxInfo(packet.poboxInfo); - } - - private static void handleTradeAddressSet(EntityPlayer player, PacketTraderAddress packet) { - TileEntity tile = packet.getTarget(player.worldObj); - if (!(tile instanceof TileTrader)) { - return; - } - - String addressName = packet.getAddressName(); - - ((TileTrader) tile).handleSetAddress(addressName); - } - - private static void onLetterText(EntityPlayer player, PacketString packet) { - if (!(player.openContainer instanceof ContainerLetter)) { - return; - } - - ((ContainerLetter) player.openContainer).handleSetText(packet); - } - - private static void onLetterRequestInfo(EntityPlayer player, PacketRequestLetterInfo packet) { - if (!(player.openContainer instanceof ContainerLetter)) { - return; - } - - ((ContainerLetter) player.openContainer).handleRequestLetterInfo(player, packet); - } - - private static void onPOBoxInfoRequest(EntityPlayer player) { - MailAddress address = new MailAddress(player.getGameProfile()); - POBox pobox = PostRegistry.getOrCreatePOBox(player.worldObj, address); - if (pobox == null) { - return; - } - - Proxies.net.sendToPlayer(new PacketPOBoxInfo(pobox.getPOBoxInfo()), player); - } - -} diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 66bdb19ce..f17350ea9 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -33,7 +33,7 @@ import forestry.api.mail.PostManager; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; import forestry.mail.items.ItemLetter; -import forestry.mail.network.PacketPOBoxInfo; +import forestry.mail.network.PacketPOBoxInfoResponse; public class PostRegistry implements IPostRegistry { @@ -75,7 +75,7 @@ public class PostRegistry implements IPostRegistry { EntityPlayer player = Proxies.common.getPlayer(world, address.getPlayerProfile()); if (player != null) { - Proxies.net.sendToPlayer(new PacketPOBoxInfo(pobox.getPOBoxInfo()), player); + Proxies.net.sendToPlayer(new PacketPOBoxInfoResponse(pobox.getPOBoxInfo()), player); } } diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index 8d1b8d9b2..6c21412d2 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -11,6 +11,7 @@ package forestry.mail; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -28,7 +29,7 @@ import forestry.api.mail.PostManager; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; -import forestry.mail.network.PacketPOBoxInfo; +import forestry.mail.network.PacketPOBoxInfoResponse; public class PostalCarrier implements IPostalCarrier { @@ -85,8 +86,8 @@ public class PostalCarrier implements IPostalCarrier { return EnumDeliveryState.MAILBOX_FULL; } else { EntityPlayer player = Proxies.common.getPlayer(world, recipient.getPlayerProfile()); - if (player != null) { - Proxies.net.sendToPlayer(new PacketPOBoxInfo(pobox.getPOBoxInfo()), player); + if (player instanceof EntityPlayerMP) { + Proxies.net.sendToPlayer(new PacketPOBoxInfoResponse(pobox.getPOBoxInfo()), (EntityPlayerMP) player); } } diff --git a/src/main/java/forestry/mail/TickHandlerMailClient.java b/src/main/java/forestry/mail/TickHandlerMailClient.java index ea6c6c0b8..7027120a8 100755 --- a/src/main/java/forestry/mail/TickHandlerMailClient.java +++ b/src/main/java/forestry/mail/TickHandlerMailClient.java @@ -15,10 +15,9 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; -import forestry.core.network.ForestryPacket; -import forestry.core.network.PacketId; import forestry.core.proxy.Proxies; import forestry.mail.gui.GuiMailboxInfo; +import forestry.mail.network.PacketPOBoxInfoRequest; public class TickHandlerMailClient { public TickHandlerMailClient() { @@ -34,7 +33,7 @@ public class TickHandlerMailClient { if (GuiMailboxInfo.instance.hasPOBoxInfo()) { GuiMailboxInfo.instance.render(0, 0); } else { - Proxies.net.sendToServer(new ForestryPacket(PacketId.POBOX_INFO_REQUEST)); + Proxies.net.sendToServer(new PacketPOBoxInfoRequest()); } } } diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index a544d2c36..1fa8a453a 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Set; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -29,13 +30,12 @@ import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; import forestry.core.gui.IGuiSelectable; -import forestry.core.network.PacketGuiSelect; -import forestry.core.network.PacketId; +import forestry.core.network.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; import forestry.mail.EnumStationState; -import forestry.mail.network.PacketLetterInfo; +import forestry.mail.network.PacketLetterInfoResponse; -public class ContainerCatalogue extends Container implements IGuiSelectable { +public class ContainerCatalogue extends Container implements IGuiSelectable, ILetterInfoReceiver { private final EntityPlayer player; private final List stations = new ArrayList<>(); @@ -131,8 +131,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable { public void cycleFilter() { if (player.worldObj.isRemote) { - PacketGuiSelect packet = new PacketGuiSelect(PacketId.GUI_SELECTION_CHANGE, 2, 0); - Proxies.net.sendToServer(packet); + Proxies.net.sendToServer(new PacketGuiSelectRequest(2, 0)); return; } @@ -143,8 +142,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable { private static void sendSelection(boolean advance) { int value = advance ? 0 : 1; - PacketGuiSelect packet = new PacketGuiSelect(PacketId.GUI_SELECTION_CHANGE, value, 0); - Proxies.net.sendToServer(packet); + Proxies.net.sendToServer(new PacketGuiSelectRequest(value, 0)); } /* Managing Trade info */ @@ -163,7 +161,8 @@ public class ContainerCatalogue extends Container implements IGuiSelectable { needsSynch = true; } - public void handleTradeInfoUpdate(PacketLetterInfo packet) { + @Override + public void handleLetterInfoUpdate(PacketLetterInfoResponse packet) { setTradeInfo(packet.tradeInfo); } @@ -187,7 +186,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable { crafter.sendProgressBarUpdate(this, 2, currentFilter); } - Proxies.net.sendToPlayer(new PacketLetterInfo(EnumAddressee.TRADER, currentTrade, null), player); + Proxies.net.sendToPlayer(new PacketLetterInfoResponse(EnumAddressee.TRADER, currentTrade, null), player); needsSynch = false; } } @@ -213,7 +212,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable { } @Override - public void handleSelectionChange(EntityPlayer player, PacketGuiSelect packet) { + public void handleSelectionRequest(EntityPlayerMP player, PacketGuiSelectRequest packet) { switch (packet.getPrimaryIndex()) { case 0: @@ -229,8 +228,4 @@ public class ContainerCatalogue extends Container implements IGuiSelectable { needsSynch = true; } - - @Override - public void setSelection(PacketGuiSelect packet) { - } } diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index 1dccb3f0a..0848c10f6 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -28,15 +28,14 @@ import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotFiltered; -import forestry.core.network.PacketId; import forestry.core.network.PacketString; import forestry.core.proxy.Proxies; import forestry.mail.Letter; import forestry.mail.items.ItemLetter.LetterInventory; -import forestry.mail.network.PacketLetterInfo; -import forestry.mail.network.PacketRequestLetterInfo; +import forestry.mail.network.PacketLetterInfoResponse; +import forestry.mail.network.PacketLetterTextSet; -public class ContainerLetter extends ContainerItemInventory { +public class ContainerLetter extends ContainerItemInventory implements ILetterInfoReceiver { private EnumAddressee carrierType = EnumAddressee.PLAYER; private TradeStationInfo tradeInfo = null; @@ -121,10 +120,7 @@ public class ContainerLetter extends ContainerItemInventory { setCarrierType(postal.getType()); } - public void handleRequestLetterInfo(EntityPlayer player, PacketRequestLetterInfo packet) { - String recipientName = packet.getRecipientName(); - EnumAddressee type = packet.getAddressType(); - + public void handleRequestLetterInfo(EntityPlayer player, String recipientName, EnumAddressee type) { IMailAddress recipient = getRecipient(recipientName, type); getLetter().setRecipient(recipient); @@ -135,7 +131,7 @@ public class ContainerLetter extends ContainerItemInventory { } // Update info on client - Proxies.net.sendToPlayer(new PacketLetterInfo(type, tradeInfo, recipient), player); + Proxies.net.sendToPlayer(new PacketLetterInfoResponse(type, tradeInfo, recipient), player); } private static IMailAddress getRecipient(String recipientName, EnumAddressee type) { @@ -170,9 +166,7 @@ public class ContainerLetter extends ContainerItemInventory { public void setText(String text) { getLetter().setText(text); - PacketString packet = new PacketString(PacketId.LETTER_TEXT, text); - Proxies.net.sendToServer(packet); - + Proxies.net.sendToServer(new PacketLetterTextSet(text)); } public void handleSetText(PacketString packet) { @@ -201,7 +195,8 @@ public class ContainerLetter extends ContainerItemInventory { setTradeInfo(station.getTradeInfo()); } - public void handleLetterInfoUpdate(PacketLetterInfo packet) { + @Override + public void handleLetterInfoUpdate(PacketLetterInfoResponse packet) { carrierType = packet.type; if (packet.type == EnumAddressee.PLAYER) { getLetter().setRecipient(packet.address); diff --git a/src/main/java/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java index 310d5abb4..d5675ce19 100755 --- a/src/main/java/forestry/mail/gui/ContainerMailbox.java +++ b/src/main/java/forestry/mail/gui/ContainerMailbox.java @@ -21,7 +21,7 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.SlotUtil; import forestry.mail.POBox; import forestry.mail.POBoxInfo; -import forestry.mail.network.PacketPOBoxInfo; +import forestry.mail.network.PacketPOBoxInfoResponse; import forestry.mail.tiles.TileMailbox; public class ContainerMailbox extends ContainerTile { @@ -55,7 +55,7 @@ public class ContainerMailbox extends ContainerTile { if (SlotUtil.isSlotInRange(slotIndex, SLOT_LETTERS, SLOT_LETTERS_COUNT)) { if (!player.worldObj.isRemote && mailInventory != null) { POBoxInfo info = mailInventory.getPOBoxInfo(); - Proxies.net.sendToPlayer(new PacketPOBoxInfo(info), player); + Proxies.net.sendToPlayer(new PacketPOBoxInfoResponse(info), player); } } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index ee4b806a5..9741a628a 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -33,7 +33,7 @@ import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; import forestry.mail.items.ItemLetter.LetterInventory; -import forestry.mail.network.PacketRequestLetterInfo; +import forestry.mail.network.PacketLetterInfoRequest; public class GuiLetter extends GuiForestry { @@ -239,7 +239,7 @@ public class GuiLetter extends GuiForestry { return; } - PacketRequestLetterInfo packet = new PacketRequestLetterInfo(recipientName, type); + PacketLetterInfoRequest packet = new PacketLetterInfoRequest(recipientName, type); Proxies.net.sendToServer(packet); } diff --git a/src/main/java/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java index 62123c24c..116c1f448 100755 --- a/src/main/java/forestry/mail/gui/GuiTradeName.java +++ b/src/main/java/forestry/mail/gui/GuiTradeName.java @@ -20,7 +20,7 @@ import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.mail.network.PacketTraderAddress; +import forestry.mail.network.PacketTraderAddressRequest; import forestry.mail.tiles.TileTrader; public class GuiTradeName extends GuiForestry { @@ -84,7 +84,7 @@ public class GuiTradeName extends GuiForestry { private void setAddress() { String address = addressNameField.getText(); if (StringUtils.isNotBlank(address)) { - PacketTraderAddress packet = new PacketTraderAddress(inventory, address); + PacketTraderAddressRequest packet = new PacketTraderAddressRequest(inventory, address); Proxies.net.sendToServer(packet); } } diff --git a/src/main/java/forestry/mail/gui/ILetterInfoReceiver.java b/src/main/java/forestry/mail/gui/ILetterInfoReceiver.java new file mode 100644 index 000000000..7eb0b928e --- /dev/null +++ b/src/main/java/forestry/mail/gui/ILetterInfoReceiver.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail.gui; + +import forestry.mail.network.PacketLetterInfoResponse; + +public interface ILetterInfoReceiver { + void handleLetterInfoUpdate(PacketLetterInfoResponse packet); +} diff --git a/src/main/java/forestry/mail/network/PacketRequestLetterInfo.java b/src/main/java/forestry/mail/network/PacketLetterInfoRequest.java similarity index 53% rename from src/main/java/forestry/mail/network/PacketRequestLetterInfo.java rename to src/main/java/forestry/mail/network/PacketLetterInfoRequest.java index 398e62531..1d3f8b474 100644 --- a/src/main/java/forestry/mail/network/PacketRequestLetterInfo.java +++ b/src/main/java/forestry/mail/network/PacketLetterInfoRequest.java @@ -12,46 +12,50 @@ package forestry.mail.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayerMP; + import forestry.api.mail.EnumAddressee; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.ForestryPacket; -import forestry.core.network.PacketId; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketIdServer; +import forestry.mail.gui.ContainerLetter; -public class PacketRequestLetterInfo extends ForestryPacket { +public class PacketLetterInfoRequest extends ForestryPacket implements IForestryPacketServer { private String recipientName; - private short addressType; + private EnumAddressee addressType; - public PacketRequestLetterInfo(DataInputStreamForestry data) throws IOException { - super(data); + public PacketLetterInfoRequest() { } - public PacketRequestLetterInfo(String recipientName, EnumAddressee addressType) { - super(PacketId.LETTER_REQUEST_INFO); + public PacketLetterInfoRequest(String recipientName, EnumAddressee addressType) { + super(PacketIdServer.LETTER_INFO_REQUEST); this.recipientName = recipientName; - this.addressType = (short) addressType.ordinal(); + this.addressType = addressType; } @Override protected void writeData(DataOutputStreamForestry data) throws IOException { super.writeData(data); data.writeUTF(recipientName); - data.writeShort(addressType); + data.writeByte(addressType.ordinal()); } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { super.readData(data); recipientName = data.readUTF(); - addressType = data.readShort(); + addressType = EnumAddressee.values()[data.readByte()]; } - public String getRecipientName() { - return recipientName; - } + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + if (!(player.openContainer instanceof ContainerLetter)) { + return; + } - public EnumAddressee getAddressType() { - return EnumAddressee.values()[addressType]; + ((ContainerLetter) player.openContainer).handleRequestLetterInfo(player, recipientName, addressType); } } diff --git a/src/main/java/forestry/mail/network/PacketLetterInfo.java b/src/main/java/forestry/mail/network/PacketLetterInfoResponse.java similarity index 81% rename from src/main/java/forestry/mail/network/PacketLetterInfo.java rename to src/main/java/forestry/mail/network/PacketLetterInfoResponse.java index e76abdd74..9d5df0004 100644 --- a/src/main/java/forestry/mail/network/PacketLetterInfo.java +++ b/src/main/java/forestry/mail/network/PacketLetterInfoResponse.java @@ -13,6 +13,8 @@ package forestry.mail.network; import java.io.IOException; import java.util.UUID; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import com.mojang.authlib.GameProfile; @@ -24,21 +26,22 @@ import forestry.api.mail.TradeStationInfo; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.ForestryPacket; -import forestry.core.network.PacketId; +import forestry.core.network.IForestryPacketClient; +import forestry.core.network.PacketIdClient; import forestry.mail.EnumStationState; +import forestry.mail.gui.ILetterInfoReceiver; -public class PacketLetterInfo extends ForestryPacket { +public class PacketLetterInfoResponse extends ForestryPacket implements IForestryPacketClient { public EnumAddressee type; public TradeStationInfo tradeInfo; public IMailAddress address; - public PacketLetterInfo(DataInputStreamForestry data) throws IOException { - super(data); + public PacketLetterInfoResponse() { } - public PacketLetterInfo(EnumAddressee type, TradeStationInfo info, IMailAddress address) { - super(PacketId.LETTER_INFO); + public PacketLetterInfoResponse(EnumAddressee type, TradeStationInfo info, IMailAddress address) { + super(PacketIdClient.LETTER_INFO_RESPONSE); this.type = type; if (type == EnumAddressee.TRADER) { this.tradeInfo = info; @@ -126,4 +129,11 @@ public class PacketLetterInfo extends ForestryPacket { } } + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { + Container container = player.openContainer; + if (container instanceof ILetterInfoReceiver) { + ((ILetterInfoReceiver) container).handleLetterInfoUpdate(this); + } + } } diff --git a/src/main/java/forestry/mail/network/PacketLetterTextSet.java b/src/main/java/forestry/mail/network/PacketLetterTextSet.java new file mode 100644 index 000000000..00e3ead17 --- /dev/null +++ b/src/main/java/forestry/mail/network/PacketLetterTextSet.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail.network; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; + +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketIdServer; +import forestry.core.network.PacketString; +import forestry.mail.gui.ContainerLetter; + +public class PacketLetterTextSet extends PacketString implements IForestryPacketServer { + + public PacketLetterTextSet() { + } + + public PacketLetterTextSet(String string) { + super(PacketIdServer.LETTER_TEXT_SET, string); + } + + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + if (!(player.openContainer instanceof ContainerLetter)) { + return; + } + + ((ContainerLetter) player.openContainer).handleSetText(this); + } +} diff --git a/src/main/java/forestry/mail/network/PacketPOBoxInfoRequest.java b/src/main/java/forestry/mail/network/PacketPOBoxInfoRequest.java new file mode 100644 index 000000000..6fb0a52b2 --- /dev/null +++ b/src/main/java/forestry/mail/network/PacketPOBoxInfoRequest.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail.network; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; + +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketServer; +import forestry.core.network.PacketIdServer; +import forestry.core.proxy.Proxies; +import forestry.mail.MailAddress; +import forestry.mail.POBox; +import forestry.mail.PostRegistry; + +public class PacketPOBoxInfoRequest extends ForestryPacket implements IForestryPacketServer { + + public PacketPOBoxInfoRequest() { + super(PacketIdServer.POBOX_INFO_REQUEST); + } + + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + MailAddress address = new MailAddress(player.getGameProfile()); + POBox pobox = PostRegistry.getOrCreatePOBox(player.worldObj, address); + if (pobox != null) { + Proxies.net.sendToPlayer(new PacketPOBoxInfoResponse(pobox.getPOBoxInfo()), player); + } + } +} diff --git a/src/main/java/forestry/mail/network/PacketPOBoxInfo.java b/src/main/java/forestry/mail/network/PacketPOBoxInfoResponse.java old mode 100755 new mode 100644 similarity index 66% rename from src/main/java/forestry/mail/network/PacketPOBoxInfo.java rename to src/main/java/forestry/mail/network/PacketPOBoxInfoResponse.java index 6354890de..72478667e --- a/src/main/java/forestry/mail/network/PacketPOBoxInfo.java +++ b/src/main/java/forestry/mail/network/PacketPOBoxInfoResponse.java @@ -12,22 +12,25 @@ package forestry.mail.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; + import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.ForestryPacket; -import forestry.core.network.PacketId; +import forestry.core.network.IForestryPacketClient; +import forestry.core.network.PacketIdClient; import forestry.mail.POBoxInfo; +import forestry.mail.gui.GuiMailboxInfo; -public class PacketPOBoxInfo extends ForestryPacket { +public class PacketPOBoxInfoResponse extends ForestryPacket implements IForestryPacketClient { public POBoxInfo poboxInfo; - public PacketPOBoxInfo(DataInputStreamForestry data) throws IOException { - super(data); + public PacketPOBoxInfoResponse() { } - public PacketPOBoxInfo(POBoxInfo info) { - super(PacketId.POBOX_INFO); + public PacketPOBoxInfoResponse(POBoxInfo info) { + super(PacketIdClient.POBOX_INFO_RESPONSE); this.poboxInfo = info; } @@ -44,8 +47,7 @@ public class PacketPOBoxInfo extends ForestryPacket { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { - + public void readData(DataInputStreamForestry data) throws IOException { short isNotNull = data.readShort(); if (isNotNull < 0) { return; @@ -54,4 +56,9 @@ public class PacketPOBoxInfo extends ForestryPacket { this.poboxInfo = new POBoxInfo(data.readInt(), data.readInt()); } + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { + GuiMailboxInfo.instance.setPOBoxInfo(poboxInfo); + } + } diff --git a/src/main/java/forestry/mail/network/PacketTraderAddress.java b/src/main/java/forestry/mail/network/PacketTraderAddressRequest.java similarity index 57% rename from src/main/java/forestry/mail/network/PacketTraderAddress.java rename to src/main/java/forestry/mail/network/PacketTraderAddressRequest.java index 4a8258430..87545133c 100644 --- a/src/main/java/forestry/mail/network/PacketTraderAddress.java +++ b/src/main/java/forestry/mail/network/PacketTraderAddressRequest.java @@ -12,23 +12,25 @@ package forestry.mail.network; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IForestryPacketServer; import forestry.core.network.PacketCoordinates; -import forestry.core.network.PacketId; +import forestry.core.network.PacketIdServer; import forestry.mail.tiles.TileTrader; -public class PacketTraderAddress extends PacketCoordinates { +public class PacketTraderAddressRequest extends PacketCoordinates implements IForestryPacketServer { private String addressName; - public PacketTraderAddress(DataInputStreamForestry data) throws IOException { - super(data); + public PacketTraderAddressRequest() { } - public PacketTraderAddress(TileTrader tile, String addressName) { - super(PacketId.TRADING_ADDRESS_SET, tile); - + public PacketTraderAddressRequest(TileTrader tile, String addressName) { + super(PacketIdServer.TRADING_ADDRESS_REQUEST, tile); this.addressName = addressName; } @@ -39,13 +41,16 @@ public class PacketTraderAddress extends PacketCoordinates { } @Override - protected void readData(DataInputStreamForestry data) throws IOException { + public void readData(DataInputStreamForestry data) throws IOException { super.readData(data); - addressName = data.readUTF(); } - public String getAddressName() { - return addressName; + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { + TileEntity tile = getTarget(player.worldObj); + if ((tile instanceof TileTrader)) { + ((TileTrader) tile).handleSetAddressRequest(addressName); + } } } diff --git a/src/main/java/forestry/mail/network/PacketTraderAddressResponse.java b/src/main/java/forestry/mail/network/PacketTraderAddressResponse.java new file mode 100644 index 000000000..beace32c3 --- /dev/null +++ b/src/main/java/forestry/mail/network/PacketTraderAddressResponse.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail.network; + +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; + +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IForestryPacketClient; +import forestry.core.network.PacketCoordinates; +import forestry.core.network.PacketIdClient; +import forestry.mail.tiles.TileTrader; + +public class PacketTraderAddressResponse extends PacketCoordinates implements IForestryPacketClient { + + private String addressName; + + public PacketTraderAddressResponse() { + } + + public PacketTraderAddressResponse(TileTrader tile, String addressName) { + super(PacketIdClient.TRADING_ADDRESS_RESPONSE, tile); + this.addressName = addressName; + } + + @Override + protected void writeData(DataOutputStreamForestry data) throws IOException { + super.writeData(data); + data.writeUTF(addressName); + } + + @Override + public void readData(DataInputStreamForestry data) throws IOException { + super.readData(data); + addressName = data.readUTF(); + } + + @Override + public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { + TileEntity tile = getTarget(player.worldObj); + if ((tile instanceof TileTrader)) { + ((TileTrader) tile).handleSetAddressResponse(addressName); + } + } + +} diff --git a/src/main/java/forestry/mail/tiles/TileTrader.java b/src/main/java/forestry/mail/tiles/TileTrader.java index cd09ee3df..a20f64b9b 100644 --- a/src/main/java/forestry/mail/tiles/TileTrader.java +++ b/src/main/java/forestry/mail/tiles/TileTrader.java @@ -40,7 +40,7 @@ import forestry.core.tiles.TileBase; import forestry.core.utils.ItemStackUtil; import forestry.mail.MailAddress; import forestry.mail.TradeStation; -import forestry.mail.network.PacketTraderAddress; +import forestry.mail.network.PacketTraderAddressResponse; import forestry.mail.triggers.MailTriggers; import buildcraft.api.statements.ITriggerExternal; @@ -255,22 +255,25 @@ public class TileTrader extends TileBase { return address; } - public void handleSetAddress(String addressName) { + public void handleSetAddressRequest(String addressName) { IMailAddress address = PostManager.postRegistry.getMailAddress(addressName); setAddress(address); - if (!worldObj.isRemote) { - IMailAddress newAddress = getAddress(); - if (newAddress != null) { - String newAddressName = newAddress.getName(); - if (newAddressName != null && newAddressName.equals(addressName)) { - PacketTraderAddress packetResponse = new PacketTraderAddress(this, addressName); - Proxies.net.sendNetworkPacket(packetResponse, worldObj); - } + IMailAddress newAddress = getAddress(); + if (newAddress != null) { + String newAddressName = newAddress.getName(); + if (newAddressName != null && newAddressName.equals(addressName)) { + PacketTraderAddressResponse packetResponse = new PacketTraderAddressResponse(this, addressName); + Proxies.net.sendNetworkPacket(packetResponse, worldObj); } } } + public void handleSetAddressResponse(String addressName) { + IMailAddress address = PostManager.postRegistry.getMailAddress(addressName); + setAddress(address); + } + private void setAddress(IMailAddress address) { if (address == null) { throw new NullPointerException("address must not be null"); diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index d4d8a9e5b..bd8d7ae07 100755 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -24,7 +24,6 @@ import cpw.mods.fml.common.network.IGuiHandler; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; -import forestry.core.network.IPacketHandler; import forestry.core.utils.Log; public abstract class ForestryPlugin { @@ -94,8 +93,8 @@ public abstract class ForestryPlugin { public void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ) { } - public IPacketHandler getPacketHandler() { - return null; + public void registerPacketHandlers() { + } public IPickupHandler getPickupHandler() { diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index a07a27f19..5486e352a 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -54,7 +54,6 @@ import forestry.Forestry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; -import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.apiculture.hives.HiveManager; import forestry.api.core.Tabs; @@ -117,7 +116,12 @@ import forestry.apiculture.multiblock.TileAlvearyPlain; import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.apiculture.multiblock.TileAlvearyStabiliser; import forestry.apiculture.multiblock.TileAlvearySwarmer; -import forestry.apiculture.network.PacketHandlerApiculture; +import forestry.apiculture.network.PacketActiveUpdate; +import forestry.apiculture.network.PacketBeekeepingLogicActive; +import forestry.apiculture.network.PacketCandleUpdate; +import forestry.apiculture.network.PacketHabitatBiomePointer; +import forestry.apiculture.network.PacketImprintSelectionRequest; +import forestry.apiculture.network.PacketImprintSelectionResponse; import forestry.apiculture.proxy.ProxyApiculture; import forestry.apiculture.tiles.TileApiaristChest; import forestry.apiculture.tiles.TileApiary; @@ -145,7 +149,8 @@ import forestry.core.items.ItemForestry; import forestry.core.items.ItemOverlay; import forestry.core.items.ItemOverlay.OverlayInfo; import forestry.core.items.ItemScoop; -import forestry.core.network.IPacketHandler; +import forestry.core.network.PacketIdClient; +import forestry.core.network.PacketIdServer; import forestry.core.proxy.Proxies; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.tiles.MachineDefinition; @@ -495,8 +500,14 @@ public class PluginApiculture extends ForestryPlugin { } @Override - public IPacketHandler getPacketHandler() { - return new PacketHandlerApiculture(); + public void registerPacketHandlers() { + PacketIdServer.IMPRINT_SELECTION_REQUEST.setPacketHandler(new PacketImprintSelectionRequest()); + + PacketIdClient.IMPRINT_SELECTION_RESPONSE.setPacketHandler(new PacketImprintSelectionResponse()); + PacketIdClient.TILE_FORESTRY_ACTIVE.setPacketHandler(new PacketActiveUpdate()); + PacketIdClient.BEE_LOGIC_ACTIVE.setPacketHandler(new PacketBeekeepingLogicActive()); + PacketIdClient.HABITAT_BIOME_POINTER.setPacketHandler(new PacketHabitatBiomePointer()); + PacketIdClient.CANDLE_UPDATE.setPacketHandler(new PacketCandleUpdate()); } @Override diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 2583cda1b..1ace527ff 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -73,7 +73,7 @@ import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemGrafter; import forestry.arboriculture.items.ItemTreealyzer; -import forestry.arboriculture.network.PacketHandlerArboriculture; +import forestry.arboriculture.network.PacketRipeningUpdate; import forestry.arboriculture.proxy.ProxyArboriculture; import forestry.arboriculture.tiles.TileArboristChest; import forestry.arboriculture.tiles.TileFruitPod; @@ -90,7 +90,7 @@ import forestry.core.fluids.Fluids; import forestry.core.genetics.alleles.Allele; import forestry.core.items.ItemBlockForestry; import forestry.core.items.ItemFruit.EnumFruit; -import forestry.core.network.IPacketHandler; +import forestry.core.network.PacketIdClient; import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; @@ -407,8 +407,8 @@ public class PluginArboriculture extends ForestryPlugin { } @Override - public IPacketHandler getPacketHandler() { - return new PacketHandlerArboriculture(); + public void registerPacketHandlers() { + PacketIdClient.RIPENING_UPDATE.setPacketHandler(new PacketRipeningUpdate()); } @Override diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index e3c663f48..3b87b5e59 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -36,17 +36,19 @@ import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; import forestry.core.items.ItemBlockForestry; import forestry.core.items.ItemBlockNBT; -import forestry.core.network.IPacketHandler; +import forestry.core.network.PacketIdClient; +import forestry.core.network.PacketIdServer; import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.recipes.craftguide.CraftGuideIntegration; +import forestry.core.recipes.nei.PacketWorktableNEISelect; import forestry.core.tiles.MachineDefinition; import forestry.core.utils.Log; import forestry.factory.DummyManagers; import forestry.factory.GuiHandlerFactory; import forestry.factory.circuits.CircuitSpeedUpgrade; -import forestry.factory.network.PacketHandlerFactory; +import forestry.factory.network.PacketWorktableMemoryUpdate; import forestry.factory.tiles.TileBottler; import forestry.factory.tiles.TileCarpenter; import forestry.factory.tiles.TileCentrifuge; @@ -92,8 +94,10 @@ public class PluginFactory extends ForestryPlugin { } @Override - public IPacketHandler getPacketHandler() { - return new PacketHandlerFactory(); + public void registerPacketHandlers() { + PacketIdServer.WORKTABLE_NEI_SELECT.setPacketHandler(new PacketWorktableNEISelect()); + + PacketIdClient.WORKTABLE_MEMORY_UPDATE.setPacketHandler(new PacketWorktableMemoryUpdate()); } @Override diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index 15c02c807..52d2857c4 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -31,12 +31,12 @@ import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.items.ItemBlockForestry; -import forestry.core.network.IPacketHandler; +import forestry.core.network.PacketIdClient; +import forestry.core.network.PacketIdServer; import forestry.core.proxy.Proxies; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.tiles.MachineDefinition; import forestry.mail.GuiHandlerMail; -import forestry.mail.PacketHandlerMail; import forestry.mail.PostRegistry; import forestry.mail.PostalCarrier; import forestry.mail.SaveEventHandlerMail; @@ -46,6 +46,13 @@ import forestry.mail.items.ItemCatalogue; import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemStamps; import forestry.mail.items.ItemStamps.StampInfo; +import forestry.mail.network.PacketLetterInfoRequest; +import forestry.mail.network.PacketLetterInfoResponse; +import forestry.mail.network.PacketLetterTextSet; +import forestry.mail.network.PacketPOBoxInfoRequest; +import forestry.mail.network.PacketPOBoxInfoResponse; +import forestry.mail.network.PacketTraderAddressRequest; +import forestry.mail.network.PacketTraderAddressResponse; import forestry.mail.tiles.TileMailbox; import forestry.mail.tiles.TilePhilatelist; import forestry.mail.tiles.TileTrader; @@ -124,8 +131,15 @@ public class PluginMail extends ForestryPlugin { } @Override - public IPacketHandler getPacketHandler() { - return new PacketHandlerMail(); + public void registerPacketHandlers() { + PacketIdServer.LETTER_INFO_REQUEST.setPacketHandler(new PacketLetterInfoRequest()); + PacketIdServer.TRADING_ADDRESS_REQUEST.setPacketHandler(new PacketTraderAddressRequest()); + PacketIdServer.POBOX_INFO_REQUEST.setPacketHandler(new PacketPOBoxInfoRequest()); + PacketIdServer.LETTER_TEXT_SET.setPacketHandler(new PacketLetterTextSet()); + + PacketIdClient.LETTER_INFO_RESPONSE.setPacketHandler(new PacketLetterInfoResponse()); + PacketIdClient.TRADING_ADDRESS_RESPONSE.setPacketHandler(new PacketTraderAddressResponse()); + PacketIdClient.POBOX_INFO_RESPONSE.setPacketHandler(new PacketPOBoxInfoResponse()); } @Override diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 9dee1abc3..c653ccae7 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -42,7 +42,6 @@ import forestry.api.core.ForestryAPI; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; -import forestry.core.network.IPacketHandler; import forestry.core.utils.Log; public class PluginManager { @@ -51,7 +50,6 @@ public class PluginManager { private static final String CATEGORY_MODULES = "modules"; public static final ArrayList guiHandlers = Lists.newArrayList(); - public static final ArrayList packetHandlers = Lists.newArrayList(); public static final ArrayList pickupHandlers = Lists.newArrayList(); public static final ArrayList saveEventHandlers = Lists.newArrayList(); public static final ArrayList resupplyHandlers = Lists.newArrayList(); @@ -151,10 +149,7 @@ public class PluginManager { guiHandlers.add(guiHandler); } - IPacketHandler packetHandler = plugin.getPacketHandler(); - if (packetHandler != null) { - packetHandlers.add(packetHandler); - } + plugin.registerPacketHandlers(); IPickupHandler pickupHandler = plugin.getPickupHandler(); if (pickupHandler != null) { diff --git a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java index e025ecd76..44c5358e7 100755 --- a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java @@ -11,11 +11,12 @@ package forestry.storage.gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.IGuiSelectable; import forestry.core.gui.slots.SlotFiltered; -import forestry.core.network.PacketGuiSelect; +import forestry.core.network.PacketGuiSelectRequest; import forestry.storage.GuiHandlerStorage.PagedBackpackInventory; public class ContainerNaturalistBackpack extends ContainerItemInventory implements IGuiSelectable { @@ -32,11 +33,7 @@ public class ContainerNaturalistBackpack extends ContainerItemInventory