diff --git a/build.gradle b/build.gradle index 8933de5e0..6768ac2c8 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.7.10-10.13.3.1403-1.7.10" + version = "1.7.10-10.13.4.1448-1.7.10" replace "@MODVERSION@", project.version } diff --git a/src/main/java/techreborn/powerSystem/RFProviderTile.java b/src/main/java/techreborn/powerSystem/RFProviderTile.java index ae7fb5741..5a3b14737 100644 --- a/src/main/java/techreborn/powerSystem/RFProviderTile.java +++ b/src/main/java/techreborn/powerSystem/RFProviderTile.java @@ -19,7 +19,10 @@ public abstract class RFProviderTile extends TileMachineBase implements IEnergyR @Override public void updateEntity() { super.updateEntity(); - //sendPower(); + if(worldObj.isRemote){ + return; + } + sendPower(); } public void sendPower() {//TODO fix this @@ -31,9 +34,8 @@ public abstract class RFProviderTile extends TileMachineBase implements IEnergyR TileEntity tile = worldObj.getTileEntity(xCoord + direction.offsetX, yCoord + direction.offsetY, zCoord + direction.offsetZ); if (isPoweredTile(tile, direction)) { - System.out.println(canProvideEnergy(direction)); - if(canProvideEnergy(direction)){ - if (tile instanceof IEnergyHandler) { + if(canProvideEnergy(direction)){ + if (tile instanceof IEnergyHandler) { IEnergyHandler handler = (IEnergyHandler) tile; int neededRF = handler.receiveEnergy( direction.getOpposite(), diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index d97a1db1b..32c0c8f03 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -87,12 +87,12 @@ public class TileLesu extends TilePowerAcceptor {//TODO wrench @Override public boolean canAcceptEnergy(ForgeDirection direction) { - return direction.ordinal() != blockMetadata; + return Functions.getIntDirFromDirection(direction) != worldObj.getBlockMetadata(xCoord, yCoord, zCoord); } @Override public boolean canProvideEnergy(ForgeDirection direction) { - return Functions.getIntDirFromDirection(direction) == blockMetadata; + return Functions.getIntDirFromDirection(direction) == worldObj.getBlockMetadata(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 5c311bcdf..9df38933a 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -787,8 +787,8 @@ config.techreborn.thermalGeneratorMaxCharge=Maximum charge for Thermal Generator config.techreborn.thermalGeneratorMaxCharge.tooltip= config.techreborn.aveargeEuOutTickTim=Eu out time config.techreborn.aveargeEuOutTickTime.tooltip=How often in ticks to update the eu out -config.techreborn.euPerRF=Eu per RF -config.techreborn.euPerRF.tooltip=How many eu are in each RF +config.techreborn.euPerRF=EU Conversion +config.techreborn.euPerRF.tooltip=The amount of RF that equal 1 EU. 4 by default, so 4RF == 1EU and .25EU == 1RF config.techreborn.farmeu=Farm EU per Tick config.techreborn.farmeu.tooltip=Amount of eu used per tick by the farm