From 7dddcd1be3bd3762713246391f94b9dfe3a0d430 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Wed, 12 Sep 2012 19:38:16 -0400 Subject: [PATCH] updates to UE 8 minor changes nothing big --- SteamPowerVersion.txt | 2 +- src/common/basicpipes/pipes/TileEntityCondenser.java | 2 +- src/common/basicpipes/pipes/TileEntityPump.java | 4 ++-- src/common/steampower/TileEntityMachine.java | 2 +- src/common/steampower/TileEntityNuller.java | 7 +++++-- src/common/steampower/mcmod.info | 2 +- src/minecraft/steampower/GUIGenerator.java | 6 ++++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/SteamPowerVersion.txt b/SteamPowerVersion.txt index fa6609c4..57500fa4 100644 --- a/SteamPowerVersion.txt +++ b/SteamPowerVersion.txt @@ -1 +1 @@ -1.3.2r4 \ No newline at end of file +r5 \ No newline at end of file diff --git a/src/common/basicpipes/pipes/TileEntityCondenser.java b/src/common/basicpipes/pipes/TileEntityCondenser.java index 25ebd4a0..18a27cbb 100644 --- a/src/common/basicpipes/pipes/TileEntityCondenser.java +++ b/src/common/basicpipes/pipes/TileEntityCondenser.java @@ -67,7 +67,7 @@ public class TileEntityCondenser extends TileEntity implements ILiquidProducer, } @Override - public float electricityRequest() { + public float ampRequest() { // TODO Auto-generated method stub return 0; } diff --git a/src/common/basicpipes/pipes/TileEntityPump.java b/src/common/basicpipes/pipes/TileEntityPump.java index 5031f0e8..d225623f 100644 --- a/src/common/basicpipes/pipes/TileEntityPump.java +++ b/src/common/basicpipes/pipes/TileEntityPump.java @@ -37,7 +37,7 @@ public class TileEntityPump extends TileEntityElectricUnit implements ILiquidPro if(!worldObj.isRemote) { count++; - if (electricityRequest() > 0 && canConnect(side)) + if (ampRequest() > 0 && canConnect(side)) { float rejectedElectricity = (float) Math.max((this.eStored + watts) - this.eMax, 0.0); this.eStored = (float) Math.max(this.eStored + watts - rejectedElectricity, 0.0); @@ -55,7 +55,7 @@ public class TileEntityPump extends TileEntityElectricUnit implements ILiquidPro } @Override - public float electricityRequest() { + public float ampRequest() { return Math.max(eMax - eStored,0); } @Override diff --git a/src/common/steampower/TileEntityMachine.java b/src/common/steampower/TileEntityMachine.java index 206bc85b..bb934439 100644 --- a/src/common/steampower/TileEntityMachine.java +++ b/src/common/steampower/TileEntityMachine.java @@ -77,7 +77,7 @@ public class TileEntityMachine extends TileEntityElectricUnit implements IInven } @Override - public float electricityRequest() { + public float ampRequest() { // TODO Auto-generated method stub return 0; } diff --git a/src/common/steampower/TileEntityNuller.java b/src/common/steampower/TileEntityNuller.java index fb48d77f..bd915d44 100644 --- a/src/common/steampower/TileEntityNuller.java +++ b/src/common/steampower/TileEntityNuller.java @@ -4,8 +4,8 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.extend.IElectricUnit; public class TileEntityNuller extends TileEntityMachine implements IElectricUnit { - - public float electricityRequest() + @Override + public float ampRequest() { return 100; } @@ -14,14 +14,17 @@ public class TileEntityNuller extends TileEntityMachine implements IElectricUnit { return true; } + @Override public float getVoltage() { return 1000; } + @Override public int getTickInterval() { return 10; } + @Override public boolean canConnect(ForgeDirection side) { return true; diff --git a/src/common/steampower/mcmod.info b/src/common/steampower/mcmod.info index 8a1863b5..7a4a675c 100644 --- a/src/common/steampower/mcmod.info +++ b/src/common/steampower/mcmod.info @@ -3,7 +3,7 @@ "modid": "SteamPower", "name": "Steam Power", "description": "Basic coal fired power plant generator pack for UE", - "version": "r4", + "version": "r5", "mcversion": "1.3.2", "url": "http://www.minecraftforge.net/forum/index.php/topic,222.0.html", "updateUrl": "", diff --git a/src/minecraft/steampower/GUIGenerator.java b/src/minecraft/steampower/GUIGenerator.java index 310dfd89..612922ff 100644 --- a/src/minecraft/steampower/GUIGenerator.java +++ b/src/minecraft/steampower/GUIGenerator.java @@ -8,7 +8,8 @@ import org.lwjgl.opengl.GL11; import steampower.turbine.ContainerGenerator; import steampower.turbine.TileEntitySteamPiston; -import universalelectricity.electricity.ElectricUnit; +import universalelectricity.electricity.ElectricInfo; +import universalelectricity.electricity.ElectricInfo.ElectricUnit; public class GUIGenerator extends GuiContainer { @@ -56,7 +57,8 @@ import universalelectricity.electricity.ElectricUnit; } else { - displayText = ElectricUnit.getWattDisplay((int)(tileEntity.generateRate*20)); + //displayText = ElectricUnit.getWattDisplay((int)(tileEntity.generateRate*20)); + displayText = ElectricInfo.getDisplay(ElectricInfo.getWatts(tileEntity.generateRate*20, tileEntity.getVoltage()), ElectricUnit.WATT); } displayText2 = "water" + "-" + tileEntity.waterStored; displayText3 = "steam" + "-" + tileEntity.steamStored;