From 0d978d5de4e188a57c14f7f68f36d2161b5d7178 Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sat, 5 Jan 2013 23:07:35 +0800 Subject: [PATCH] Fixed Encoder Gui Render Issues --- buildnumber.txt | 2 +- info.txt | 1 + .../assemblyline/textures/gui_encoder.png | Bin 3712 -> 3711 bytes .../assemblyline/client/gui/GuiEncoder.java | 20 +++++------ .../client/render/RenderCrate.java | 1 - .../client/render/RenderImprintable.java | 8 ++--- .../common/block/TileEntityCrate.java | 1 - .../common/machine/TileEntityManipulator.java | 4 +-- .../common/machine/TileEntityRejector.java | 4 +-- .../machine/detector/TileEntityDetector.java | 4 +-- .../machine/encoder/ContainerEncoder.java | 16 ++++----- .../machine/encoder/TileEntityEncoder.java | 34 ++++++++++-------- .../machine/imprinter/BlockImprintable.java | 4 +-- ...intable.java => TileEntityFilterable.java} | 2 +- 14 files changed, 52 insertions(+), 49 deletions(-) rename src/minecraft/assemblyline/common/machine/imprinter/{TileEntityImprintable.java => TileEntityFilterable.java} (96%) diff --git a/buildnumber.txt b/buildnumber.txt index 41b5364b..0acebe3a 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -41 +42 diff --git a/info.txt b/info.txt index d1382869..351fd177 100644 --- a/info.txt +++ b/info.txt @@ -37,3 +37,4 @@ Minecraft 1.4.5 @ AssemblyLine_v0.2.1.39.jar AssemblyLine_v0.2.1.39_api.zip * AssemblyLine_v0.2.1.40.jar AssemblyLine_v0.2.1.40_api.zip @ AssemblyLine_v0.2.2.41.jar AssemblyLine_v0.2.2.41_api.zip +@ AssemblyLine_v0.2.2.42.jar AssemblyLine_v0.2.2.42_api.zip diff --git a/resources/assemblyline/textures/gui_encoder.png b/resources/assemblyline/textures/gui_encoder.png index 61cd12bf269eaeb8690960720bd187b7009a0062..a71a962a1f45921b5ae786db50fe25863b639229 100644 GIT binary patch delta 530 zcmZpW{V%iO09XAgPZ!6Kid%2)1a>WU5OKH|?i@DtmRqjNirO6lvF&=RpCwO7Gn&AE z+DGL4&)i?8A&*>hD>Uo2G;n9ERb5`t^QCy%x_Z4&OMN|A_&%LJdj6`;X(3J3_*>2I z82)h`*tO2DHCXz%p_0@+=Gj3=Rwoj0|AL z*p)sdNa^_-1HlGut)(S@>(*Y?bF*QZoX8`$xs6+pQTG6=?Y+MR5^eA71H3vb=bbf7 z|2}8VX6>)ij5q8WsP0~5}eG)BjW-9ICl z@A(v^MO&{aDgBGwlb}4oGJVG9U4j`h$2&S^EYpn2KAHMwp>@Ms<`;>NdoA}C=dgU@ z0~w^jazLy02d@OIpNYk$1L#l=f= zYigv7-kmRe3byn8mmf^^xh(SWxvH6L9RCJOp><#G-u>5n^qg}^!vm0+>T(Ze*D*6N c{Qu9)AZc`YT}!sB6$21>y85}Sb4q9e0LX0PRsaA1 delta 537 zcmew_(;&Oy09XBLPZ!6Kid%2)1oq7~5OKKpTx)gL_J_R+mGU|)*BDP1*=w0(X+340 z%yz_b|KfcU=M=E^{0jP$!6<$q%G>Xu#LMSCvHxS9c+Z~1A@gK<_x#n7(^P}J_HALm z%lJpMp)__b*K)JIWEU5o%TN3sG*~l;+jB4|Ff=eQFfo7`lk<7F<*t7$VEN5^_=4@? zDMFU%?VSuUftpKS-@hL9S6#=3X>tLN+~%p=f{c?Jc=+@=7(UeYm)pyQ%_*v7xWeXZ%UO0(m0?iODwEnQm0GTD(&#)XlAg<;3+?Y|kkGy}8W z{!@K6nFW%UO filters = ItemImprinter.getFilters(filter); for (int i = 0; i < filters.size(); i++) { - if (((TileEntityImprintable) tileEntity).isInverted()) + if (((TileEntityFilterable) tileEntity).isInverted()) { RenderHelper.renderFloatingText(filters.get(i).getTooltip(player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips).get(0).toString(), (float) x + 0.5f, ((float) y + (i * 0.25f)) - 1f, (float) z + 0.5f, 0xFF8888); } diff --git a/src/minecraft/assemblyline/common/block/TileEntityCrate.java b/src/minecraft/assemblyline/common/block/TileEntityCrate.java index f9a1034b..780a6c11 100644 --- a/src/minecraft/assemblyline/common/block/TileEntityCrate.java +++ b/src/minecraft/assemblyline/common/block/TileEntityCrate.java @@ -13,7 +13,6 @@ import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.network.PacketManager; import universalelectricity.prefab.tile.TileEntityAdvanced; import assemblyline.common.AssemblyLine; -import assemblyline.common.machine.imprinter.ItemImprinter; import com.google.common.io.ByteArrayDataInput; diff --git a/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java b/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java index f02cd25c..1bcb85ed 100644 --- a/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java +++ b/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java @@ -15,12 +15,12 @@ import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.implement.IRedstoneReceptor; import universalelectricity.prefab.network.PacketManager; import assemblyline.api.IManipulator; -import assemblyline.common.machine.imprinter.TileEntityImprintable; +import assemblyline.common.machine.imprinter.TileEntityFilterable; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.relauncher.Side; -public class TileEntityManipulator extends TileEntityImprintable implements IRedstoneReceptor, IManipulator +public class TileEntityManipulator extends TileEntityFilterable implements IRedstoneReceptor, IManipulator { public boolean selfPulse = false; diff --git a/src/minecraft/assemblyline/common/machine/TileEntityRejector.java b/src/minecraft/assemblyline/common/machine/TileEntityRejector.java index c3d27f45..3665b4e5 100644 --- a/src/minecraft/assemblyline/common/machine/TileEntityRejector.java +++ b/src/minecraft/assemblyline/common/machine/TileEntityRejector.java @@ -11,14 +11,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.network.PacketManager; -import assemblyline.common.machine.imprinter.TileEntityImprintable; +import assemblyline.common.machine.imprinter.TileEntityFilterable; /** * * @author Darkguardsman * */ -public class TileEntityRejector extends TileEntityImprintable +public class TileEntityRejector extends TileEntityFilterable { /** * should the piston fire, or be extended diff --git a/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java b/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java index 5b9e8e3c..3d21bff7 100644 --- a/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java +++ b/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java @@ -10,9 +10,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.network.PacketManager; import assemblyline.common.AssemblyLine; -import assemblyline.common.machine.imprinter.TileEntityImprintable; +import assemblyline.common.machine.imprinter.TileEntityFilterable; -public class TileEntityDetector extends TileEntityImprintable +public class TileEntityDetector extends TileEntityFilterable { private boolean powering = false; diff --git a/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java index 0b195cdf..b8ddb638 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java @@ -5,22 +5,22 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; public class ContainerEncoder extends Container { + public static final int Y_OFFSET = 9; + private ItemStack[] containingItems = new ItemStack[1]; private InventoryPlayer inventoryPlayer; - private TileEntityEncoder encoder; + private TileEntityEncoder tileEntity; public ContainerEncoder(InventoryPlayer inventoryPlayer, TileEntityEncoder encoder) { this.inventoryPlayer = inventoryPlayer; - this.encoder = encoder; + this.tileEntity = encoder; // Disk - this.addSlotToContainer(new Slot(encoder, 0, 80, 17)); + this.addSlotToContainer(new Slot(encoder, 0, 80, 24 + Y_OFFSET)); int var3; @@ -28,20 +28,20 @@ public class ContainerEncoder extends Container { for (int var4 = 0; var4 < 9; ++var4) { - this.addSlotToContainer(new Slot(inventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 155 + var3 * 18)); + this.addSlotToContainer(new Slot(inventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 155 + var3 * 18 + Y_OFFSET)); } } for (var3 = 0; var3 < 9; ++var3) { - this.addSlotToContainer(new Slot(inventoryPlayer, var3, 8 + var3 * 18, 213)); + this.addSlotToContainer(new Slot(inventoryPlayer, var3, 8 + var3 * 18, 213 + Y_OFFSET)); } } @Override public boolean canInteractWith(EntityPlayer player) { - return encoder.isUseableByPlayer(player); + return this.tileEntity.isUseableByPlayer(player); } /** diff --git a/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java index eebd932b..66a7138a 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java @@ -153,6 +153,7 @@ public class TileEntityEncoder extends TileEntityAdvanced implements IPacketRece { this.disk = ItemStack.loadItemStackFromNBT(diskNBT); } + } @Override @@ -160,25 +161,28 @@ public class TileEntityEncoder extends TileEntityAdvanced implements IPacketRece { try { - /** - * Only the server receives this from the client's button click action. - */ - String newCommand = dataStream.readUTF(); - - if (Command.getCommand(newCommand) != null && this.disk != null) + if (!this.worldObj.isRemote) { - ArrayList tempCmds = ItemDisk.getCommands(this.disk); + /** + * New command action + */ + String newCommand = dataStream.readUTF(); - if (dataStream.readBoolean()) + if (Command.getCommand(newCommand) != null && this.disk != null) { - tempCmds.add(newCommand); - } - else - { - tempCmds.remove(newCommand); - } + ArrayList tempCmds = ItemDisk.getCommands(this.disk); - ItemDisk.setCommands(this.disk, tempCmds); + if (dataStream.readBoolean()) + { + tempCmds.add(newCommand); + } + else + { + tempCmds.remove(newCommand); + } + + ItemDisk.setCommands(this.disk, tempCmds); + } } } catch (Exception e) diff --git a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprintable.java b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprintable.java index a9a36830..b239173a 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprintable.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprintable.java @@ -77,9 +77,9 @@ public abstract class BlockImprintable extends BlockMachine if (tileEntity != null) { - if (tileEntity instanceof TileEntityImprintable) + if (tileEntity instanceof TileEntityFilterable) { - ((TileEntityImprintable) tileEntity).toggleInversion(); + ((TileEntityFilterable) tileEntity).toggleInversion(); world.markBlockForRenderUpdate(x, y, z); } } diff --git a/src/minecraft/assemblyline/common/machine/imprinter/TileEntityImprintable.java b/src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java similarity index 96% rename from src/minecraft/assemblyline/common/machine/imprinter/TileEntityImprintable.java rename to src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java index cc7166dc..3609643d 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/TileEntityImprintable.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java @@ -24,7 +24,7 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -public abstract class TileEntityImprintable extends TileEntityAssemblyNetwork implements IRotatable, IFilterable, IPacketReceiver +public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork implements IRotatable, IFilterable, IPacketReceiver { private ItemStack filterItem; private boolean inverted;