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

updates to UE 8

Browse source 
minor changes nothing big
This commit is contained in:
Rseifert 2012-09-12 19:38:16 -04:00
parent ce3d3afcfe
commit 7dddcd1be3
7 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SteamPowerVersion.txt
View file

@ -1 +1 @@
1.3.2r4 r5

2
src/common/basicpipes/pipes/TileEntityCondenser.java
View file

@ -67,7 +67,7 @@ public class TileEntityCondenser extends TileEntity implements ILiquidProducer,
} }
@Override @Override
public float electricityRequest() { public float ampRequest() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }

4
src/common/basicpipes/pipes/TileEntityPump.java
View file

@ -37,7 +37,7 @@ public class TileEntityPump extends TileEntityElectricUnit implements ILiquidPro
if(!worldObj.isRemote) if(!worldObj.isRemote)
{ {
count++; count++;
if (electricityRequest() > 0 && canConnect(side)) if (ampRequest() > 0 && canConnect(side))
{ {
float rejectedElectricity = (float) Math.max((this.eStored + watts) - this.eMax, 0.0); float rejectedElectricity = (float) Math.max((this.eStored + watts) - this.eMax, 0.0);
this.eStored = (float) Math.max(this.eStored + watts - rejectedElectricity, 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 @Override
public float electricityRequest() { public float ampRequest() {
return Math.max(eMax - eStored,0); return Math.max(eMax - eStored,0);
} }
@Override @Override

2
src/common/steampower/TileEntityMachine.java
View file

@ -77,7 +77,7 @@ public class TileEntityMachine extends TileEntityElectricUnit implements IInven
} }
@Override @Override
public float electricityRequest() { public float ampRequest() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }

7
src/common/steampower/TileEntityNuller.java
View file

@ -4,8 +4,8 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.extend.IElectricUnit; import universalelectricity.extend.IElectricUnit;
public class TileEntityNuller extends TileEntityMachine implements IElectricUnit { public class TileEntityNuller extends TileEntityMachine implements IElectricUnit {
@Override
public float electricityRequest() public float ampRequest()
{ {
return 100; return 100;
} }
@ -14,14 +14,17 @@ public class TileEntityNuller extends TileEntityMachine implements IElectricUnit
{ {
return true; return true;
} }
@Override
public float getVoltage() public float getVoltage()
{ {
return 1000; return 1000;
} }
@Override
public int getTickInterval() public int getTickInterval()
{ {
return 10; return 10;
} }
@Override
public boolean canConnect(ForgeDirection side) public boolean canConnect(ForgeDirection side)
{ {
return true; return true;

2
src/common/steampower/mcmod.info
View file

@ -3,7 +3,7 @@
"modid": "SteamPower", "modid": "SteamPower",
"name": "Steam Power", "name": "Steam Power",
"description": "Basic coal fired power plant generator pack for UE", "description": "Basic coal fired power plant generator pack for UE",
"version": "r4", "version": "r5",
"mcversion": "1.3.2", "mcversion": "1.3.2",
"url": "http://www.minecraftforge.net/forum/index.php/topic,222.0.html", "url": "http://www.minecraftforge.net/forum/index.php/topic,222.0.html",
"updateUrl": "", "updateUrl": "",

6
src/minecraft/steampower/GUIGenerator.java
View file

@ -8,7 +8,8 @@ import org.lwjgl.opengl.GL11;
import steampower.turbine.ContainerGenerator; import steampower.turbine.ContainerGenerator;
import steampower.turbine.TileEntitySteamPiston; import steampower.turbine.TileEntitySteamPiston;
import universalelectricity.electricity.ElectricUnit; import universalelectricity.electricity.ElectricInfo;
import universalelectricity.electricity.ElectricInfo.ElectricUnit;
public class GUIGenerator extends GuiContainer public class GUIGenerator extends GuiContainer
{ {
@ -56,7 +57,8 @@ import universalelectricity.electricity.ElectricUnit;
} }
else 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; displayText2 = "water" + "-" + tileEntity.waterStored;
displayText3 = "steam" + "-" + tileEntity.steamStored; displayText3 = "steam" + "-" + tileEntity.steamStored;