From 8c75f707c04807912477ec5859d10898c886b50f Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Thu, 23 May 2013 23:03:06 -0400 Subject: [PATCH] v5.5.6 Beta #9 (FINAL for @CannibalVox) *Minor javadoc additions. *Fixed Chargepad pick block crash. *Minor touchups --- src/minecraft/mekanism/client/RenderChargepad.java | 8 ++++---- src/minecraft/mekanism/common/BlockMachine.java | 7 +++++-- src/minecraft/mekanism/common/ItemBlockMachine.java | 7 +++++-- src/minecraft/mekanism/common/TileEntityChargepad.java | 4 ++-- .../mekanism/generators/common/TileEntityWindTurbine.java | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/minecraft/mekanism/client/RenderChargepad.java b/src/minecraft/mekanism/client/RenderChargepad.java index 25b98ae59..4591be6c8 100644 --- a/src/minecraft/mekanism/client/RenderChargepad.java +++ b/src/minecraft/mekanism/client/RenderChargepad.java @@ -24,10 +24,10 @@ public class RenderChargepad extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/minecraft/mekanism/common/BlockMachine.java b/src/minecraft/mekanism/common/BlockMachine.java index 35cf0c2f2..8aab98aa3 100644 --- a/src/minecraft/mekanism/common/BlockMachine.java +++ b/src/minecraft/mekanism/common/BlockMachine.java @@ -699,8 +699,11 @@ public class BlockMachine extends BlockContainer energizedItem.setEnergy(itemStack, ((TileEntityElectricBlock)tileEntity).electricityStored); } - ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem(); - inventory.setInventory(((ISustainedInventory)tileEntity).getInventory(), itemStack); + if(tileEntity instanceof TileEntityContainerBlock && ((TileEntityContainerBlock)tileEntity).inventory.length > 0) + { + ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem(); + inventory.setInventory(((ISustainedInventory)tileEntity).getInventory(), itemStack); + } if(((ISustainedTank)itemStack.getItem()).hasTank(itemStack)) { diff --git a/src/minecraft/mekanism/common/ItemBlockMachine.java b/src/minecraft/mekanism/common/ItemBlockMachine.java index 03759c378..a85baafd4 100644 --- a/src/minecraft/mekanism/common/ItemBlockMachine.java +++ b/src/minecraft/mekanism/common/ItemBlockMachine.java @@ -165,7 +165,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem list.add(EnumColor.PURPLE + "Speed: " + EnumColor.GREY + "x" + (getSpeedMultiplier(itemstack)+1)); } - list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + if(itemstack.getItemDamage() != 14) + { + list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + } } } @@ -457,7 +460,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem { if(data[0] instanceof ItemStack) { - if(((ItemStack)data[0]).getItemDamage() != 11 && ((ItemStack)data[0]).getItemDamage() != 12 && ((ItemStack)data[0]).getItemDamage() != 13) + if(((ItemStack)data[0]).getItemDamage() != 11 && ((ItemStack)data[0]).getItemDamage() != 12 && ((ItemStack)data[0]).getItemDamage() != 13 && ((ItemStack)data[0]).getItemDamage() != 14) { return true; } diff --git a/src/minecraft/mekanism/common/TileEntityChargepad.java b/src/minecraft/mekanism/common/TileEntityChargepad.java index df0d482cc..65f781499 100644 --- a/src/minecraft/mekanism/common/TileEntityChargepad.java +++ b/src/minecraft/mekanism/common/TileEntityChargepad.java @@ -236,7 +236,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct @Override public boolean canReceiveEnergy(ForgeDirection side) { - return side == ForgeDirection.DOWN || side == ForgeDirection.getOrientation(facing); + return side == ForgeDirection.DOWN || side == ForgeDirection.getOrientation(facing).getOpposite(); } @Override @@ -272,7 +272,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct @Override public boolean acceptsEnergyFrom(TileEntity emitter, Direction direction) { - return direction.toForgeDirection() == ForgeDirection.DOWN || direction.toForgeDirection() == ForgeDirection.getOrientation(facing); + return direction.toForgeDirection() == ForgeDirection.DOWN || direction.toForgeDirection() == ForgeDirection.getOrientation(facing).getOpposite(); } @Override diff --git a/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java b/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java index 9e688b7f0..d511d93ad 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java +++ b/src/minecraft/mekanism/generators/common/TileEntityWindTurbine.java @@ -10,10 +10,10 @@ import dan200.computer.api.IComputerAccess; public class TileEntityWindTurbine extends TileEntityGenerator implements IBoundingBlock { - public boolean canSpin; - + /** The angle the blades of this Wind Turbine are currently at. */ public int angle; + /** How much energy this generator produces per-tick. */ public int GENERATION_RATE = 30; public TileEntityWindTurbine()