From 353f522caec1cfaafc3a143c225c27a924e7771c Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Tue, 12 Feb 2013 12:27:11 +0800 Subject: [PATCH] Fixed imprinter dupe --- ...ControllerOff.png => crane_controller_off.png} | Bin ...ontrollerValid.png => crane_controller_on.png} | Bin .../textures/{craneRail.png => crane_rail.png} | Bin .../assemblyline/textures/quarry_frame_map.png | Bin 338 -> 0 bytes .../client/render/RenderCraneController.java | 7 +++++-- .../client/render/RenderCraneRail.java | 2 +- .../machine/imprinter/ContainerImprinter.java | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) rename resources/assemblyline/textures/{quarryControllerOff.png => crane_controller_off.png} (100%) rename resources/assemblyline/textures/{quarryControllerValid.png => crane_controller_on.png} (100%) rename resources/assemblyline/textures/{craneRail.png => crane_rail.png} (100%) delete mode 100644 resources/assemblyline/textures/quarry_frame_map.png diff --git a/resources/assemblyline/textures/quarryControllerOff.png b/resources/assemblyline/textures/crane_controller_off.png similarity index 100% rename from resources/assemblyline/textures/quarryControllerOff.png rename to resources/assemblyline/textures/crane_controller_off.png diff --git a/resources/assemblyline/textures/quarryControllerValid.png b/resources/assemblyline/textures/crane_controller_on.png similarity index 100% rename from resources/assemblyline/textures/quarryControllerValid.png rename to resources/assemblyline/textures/crane_controller_on.png diff --git a/resources/assemblyline/textures/craneRail.png b/resources/assemblyline/textures/crane_rail.png similarity index 100% rename from resources/assemblyline/textures/craneRail.png rename to resources/assemblyline/textures/crane_rail.png diff --git a/resources/assemblyline/textures/quarry_frame_map.png b/resources/assemblyline/textures/quarry_frame_map.png deleted file mode 100644 index 13368a2d4b731b01ff2f87ee60cf0899e0325424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*8spE{-7?&TqpV`3@`a7}p-3w_X3sxw-mp z*6X}H(wfGhqO!mu>!m8!F^NY^Qu!_wmD!6_w=cW*V2-kb*gwvWxQR!sgxH$jS^mAa z`9{}Pj{{x1uL&EAUYLAVG&^@a!}8n@En6Jt6d18ddQU9!wv1vgcIhfhIh{#)M+=$f%~=?#vD3ABlIxs!ws~A9%8SiebKWyYz2|v0nbF9B?F56Q g0&_|Ok4Gs(C-Wkp00i_>zopr09yKhCjbBd diff --git a/src/minecraft/assemblyline/client/render/RenderCraneController.java b/src/minecraft/assemblyline/client/render/RenderCraneController.java index 9741105cc..37d9e7c80 100644 --- a/src/minecraft/assemblyline/client/render/RenderCraneController.java +++ b/src/minecraft/assemblyline/client/render/RenderCraneController.java @@ -14,8 +14,8 @@ import assemblyline.common.machine.crane.TileEntityCraneController; public class RenderCraneController extends RenderImprintable { - public static final String TEXTURE = "quarryControllerOff.png"; - public static final String TEXTURE_VALID = "quarryControllerValid.png"; + public static final String TEXTURE = "crane_controller_off.png"; + public static final String TEXTURE_VALID = "crane_controller_on.png"; public static final ModelCraneController MODEL = new ModelCraneController(); @Override @@ -26,8 +26,11 @@ public class RenderCraneController extends RenderImprintable this.bindTextureByName(AssemblyLine.TEXTURE_PATH + (((TileEntityCraneController) tileEntity).isCraneValid() ? TEXTURE_VALID : TEXTURE)); ForgeDirection rot = ForgeDirection.getOrientation(tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)); float angle = 0f; + switch (rot) { + default: + break; case NORTH: { angle = 90f; diff --git a/src/minecraft/assemblyline/client/render/RenderCraneRail.java b/src/minecraft/assemblyline/client/render/RenderCraneRail.java index 682aa2efb..1bd79ca53 100644 --- a/src/minecraft/assemblyline/client/render/RenderCraneRail.java +++ b/src/minecraft/assemblyline/client/render/RenderCraneRail.java @@ -15,7 +15,7 @@ import assemblyline.common.machine.crane.TileEntityCraneRail; public class RenderCraneRail extends RenderImprintable { - public static final String TEXTURE = "craneRail.png"; + public static final String TEXTURE = "crane_rail.png"; public static final ModelCraneRail MODEL = new ModelCraneRail(); @Override diff --git a/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java index d1922abe4..9e5de0f7b 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java @@ -97,7 +97,7 @@ public class ContainerImprinter extends Container implements ISlotWatcher this.tileEntity.setInventorySlotContents(this.tileEntity.INVENTORY_START - 1, null); } - if (slot > this.tileEntity.getSizeInventory()) + if (slot > this.tileEntity.getSizeInventory() - 1) { if (this.getSlot(this.tileEntity.IMPRINTER_MATRIX_START).isItemValid(slotStack)) {