tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed imprinter dupe

Browse source
This commit is contained in:
Henry Mao 2013-02-12 12:27:11 +08:00
parent 366d784a06
commit 353f522cae
7 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
resources/assemblyline/textures/quarryControllerOff.png → resources/assemblyline/textures/crane_controller_off.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 7 KiB

0
resources/assemblyline/textures/quarryControllerValid.png → resources/assemblyline/textures/crane_controller_on.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

0
resources/assemblyline/textures/craneRail.png → resources/assemblyline/textures/crane_rail.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 718 B

After

Width:  |  Height:  |  Size: 718 B

BIN
resources/assemblyline/textures/quarry_frame_map.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 338 B

7
src/minecraft/assemblyline/client/render/RenderCraneController.java
View file

@ -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;

2
src/minecraft/assemblyline/client/render/RenderCraneRail.java
View file

@ -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

2
src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java
View file

@ -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))
{