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 13368a2d..00000000 Binary files a/resources/assemblyline/textures/quarry_frame_map.png and /dev/null differ diff --git a/src/minecraft/assemblyline/client/render/RenderCraneController.java b/src/minecraft/assemblyline/client/render/RenderCraneController.java index 9741105c..37d9e7c8 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 682aa2ef..1bd79ca5 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 d1922abe..9e5de0f7 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)) {