From c73861ab6cbbbf5fe316add5850e50f42f2e586e Mon Sep 17 00:00:00 2001 From: cp Date: Wed, 19 Mar 2014 12:59:33 +0800 Subject: [PATCH] Completed merge of Issue #545 fix from 1.6.4 --- .../enderio/conduit/BlockConduitBundle.java | 3 ++ .../GuiExternalConnectionSelector.java | 7 ++-- .../conduit/gui/PacketOpenConduitUI.java | 42 +++++++++++++++++++ .../enderio/machine/MachineRecipes.java | 2 +- 4 files changed, 50 insertions(+), 4 deletions(-) rename src/main/java/crazypants/enderio/conduit/{ => gui}/GuiExternalConnectionSelector.java (92%) create mode 100644 src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 423f2091..8aedab1e 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -34,6 +34,8 @@ import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.gui.ExternalConnectionContainer; import crazypants.enderio.conduit.gui.GuiExternalConnection; +import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector; +import crazypants.enderio.conduit.gui.PacketOpenConduitUI; import crazypants.enderio.conduit.liquid.PacketFluidLevel; import crazypants.enderio.conduit.packet.PacketConnectionMode; import crazypants.enderio.conduit.packet.PacketExtractMode; @@ -59,6 +61,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { EnderIO.packetPipeline.registerPacket(PacketConnectionMode.class); EnderIO.packetPipeline.registerPacket(PacketItemConduitFilter.class); EnderIO.packetPipeline.registerPacket(PacketRedstoneConduitSignalColor.class); + EnderIO.packetPipeline.registerPacket(PacketOpenConduitUI.class); BlockConduitBundle result = new BlockConduitBundle(); result.init(); diff --git a/src/main/java/crazypants/enderio/conduit/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java similarity index 92% rename from src/main/java/crazypants/enderio/conduit/GuiExternalConnectionSelector.java rename to src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index e995b680..33222585 100644 --- a/src/main/java/crazypants/enderio/conduit/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -1,4 +1,4 @@ -package crazypants.enderio.conduit; +package crazypants.enderio.conduit.gui; import java.awt.Color; import java.awt.Point; @@ -13,6 +13,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; import crazypants.render.ColorUtil; import crazypants.util.BlockCoord; @@ -34,8 +36,7 @@ public class GuiExternalConnectionSelector extends GuiScreen { ForgeDirection dir = ForgeDirection.values()[b.id]; EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; BlockCoord loc = cb.getBlockCoord(); - //TODO:1.7 - //PacketDispatcher.sendPacketToServer(MJReaderPacketHandler.createOpenConduitGuiPacket(cb, dir)); + EnderIO.packetPipeline.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir)); player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, loc.x, loc.y, loc.z); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java new file mode 100644 index 00000000..a23c65b9 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java @@ -0,0 +1,42 @@ +package crazypants.enderio.conduit.gui; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.network.AbstractPacketTileEntity; + +public class PacketOpenConduitUI extends AbstractPacketTileEntity { + + private ForgeDirection dir; + + public PacketOpenConduitUI() { + } + + public PacketOpenConduitUI(TileEntity tile, ForgeDirection dir) { + super(tile); + this.dir = dir; + } + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + super.encode(ctx, buf); + buf.writeShort(dir.ordinal()); + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + super.decode(ctx, buf); + dir = ForgeDirection.values()[buf.readShort()]; + } + + @Override + protected void handleServerSide(EntityPlayer player, World worldObj, TileEntity tile) { + player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index f8a7d605..9ed3bbf8 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -42,7 +42,7 @@ public class MachineRecipes { } else { glassSides = "glass"; } - GameRegistry.addShapedRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz); + GameRegistry.addRecipe(new ShapedOreRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz)); //mill ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0);