From a063e136120c56e4a8c9b5f8819837fe119dab17 Mon Sep 17 00:00:00 2001 From: Gig Date: Mon, 29 Jun 2015 18:42:20 +0100 Subject: [PATCH] It works!!! Charge bench now working needs a texture and recipe --- src/main/java/techreborn/tiles/TileChargeBench.java | 13 ++++++------- .../resources/assets/techreborn/lang/en_US.lang | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index 98cb3a6aa..f44076c47 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -36,11 +36,13 @@ public class TileChargeBench extends TileMachineBase implements IWrenchable, IEn public void updateEntity(){ super.updateEntity(); energy.updateEntity(); - if(inventory.getStackInSlot(0) != null) + + for (int i = 0; i < 6; i++) + if(inventory.getStackInSlot(i) != null) { - if(inventory.getStackInSlot(0).getItem() instanceof IElectricItem) + if(inventory.getStackInSlot(i).getItem() instanceof IElectricItem) { - ItemStack stack = inventory.getStackInSlot(0); + ItemStack stack = inventory.getStackInSlot(i); double MaxCharge = ((IElectricItem) stack.getItem()).getMaxCharge(stack); double CurrentCharge = ElectricItem.manager.getCharge(stack); if(CurrentCharge != MaxCharge) @@ -52,6 +54,7 @@ public class TileChargeBench extends TileMachineBase implements IWrenchable, IEn } } + @Override public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side){ return false; @@ -195,8 +198,4 @@ public class TileChargeBench extends TileMachineBase implements IWrenchable, IEn // { // return slotIndex == 2; // } -// -// public int getEnergyScaled(int scale) { -// return (int)energy.getEnergyStored() * scale / energy.getCapacity(); -// } } diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index edb1d21f3..37b40ea7a 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -54,6 +54,7 @@ tile.techreborn.machineFrame.brass.name=Brass Machine Hull tile.techreborn.machineFrame.steel.name=Steel Machine Hull tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull tile.techreborn.industrialsawmill.name=Saw Mill +tile.techreborn.chargebench.name=Charge Bench #Ores tile.techreborn.ore.Galena.name=Galena Ore