Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reverted accidental change and updated the build script.

Browse source
This commit is contained in:
Kyprus 2012-06-23 10:37:15 -04:00
parent 783d0f8c1c
commit d32f719cb6
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.xml
View file

@ -67,9 +67,7 @@
<!-- Copy BC source --> <!-- Copy BC source -->
<copy todir="${clientsrc.dir}"> <copy todir="${clientsrc.dir}">
<fileset dir="${src.dir}/buildcraft_client"> <fileset dir="${src.dir}/buildcraft_client"/>
<exclude name="**/mod_BuildCraftDevel.*"/>
</fileset>
</copy> </copy>
<copy todir="${clientsrc.dir}"> <copy todir="${clientsrc.dir}">
<fileset dir="${src.dir}/common"> <fileset dir="${src.dir}/common">
@ -81,9 +79,7 @@
</copy> </copy>
<copy todir="${serversrc.dir}"> <copy todir="${serversrc.dir}">
<fileset dir="${src.dir}/buildcraft_server"> <fileset dir="${src.dir}/buildcraft_server/>
<exclude name="**/mod_BuildCraftDevel.*"/>
</fileset>
</copy> </copy>
<copy todir="${serversrc.dir}"> <copy todir="${serversrc.dir}">
<fileset dir="${src.dir}/common"> <fileset dir="${src.dir}/common">

22
common/net/minecraft/src/buildcraft/energy/EngineIron.java
View file

@ -35,7 +35,7 @@ public class EngineIron extends Engine {
int heat = 0; int heat = 0;
public int penatlyCooling = 0; public int penaltyCooling = 0;
boolean lastPowered = false; boolean lastPowered = false;
@ -79,7 +79,7 @@ public class EngineIron extends Engine {
@Override @Override
public boolean isBurning() { public boolean isBurning() {
return liquidQty > 0 && penatlyCooling == 0 && tile.isRedstonePowered; return liquidQty > 0 && penaltyCooling == 0 && tile.isRedstonePowered;
} }
@Override @Override
@ -91,7 +91,7 @@ public class EngineIron extends Engine {
return; return;
} }
if (penatlyCooling <= 0 && tile.isRedstonePowered) { if (penaltyCooling <= 0 && tile.isRedstonePowered) {
lastPowered = true; lastPowered = true;
@ -107,10 +107,10 @@ public class EngineIron extends Engine {
addEnergy(currentFuel.powerPerCycle); addEnergy(currentFuel.powerPerCycle);
heat += currentFuel.powerPerCycle; heat += currentFuel.powerPerCycle;
} }
} else if (penatlyCooling <= 0) { } else if (penaltyCooling <= 0) {
if (lastPowered) { if (lastPowered) {
lastPowered = false; lastPowered = false;
penatlyCooling = 1 * 20; penaltyCooling = 30 * 20;
// 30 sec of penalty on top of the cooling // 30 sec of penalty on top of the cooling
} }
} }
@ -146,13 +146,13 @@ public class EngineIron extends Engine {
} }
} }
if (heat > 0 && (penatlyCooling > 0 || !tile.isRedstonePowered)) { if (heat > 0 && (penaltyCooling > 0 || !tile.isRedstonePowered)) {
heat -= 10; heat -= 10;
} }
if (heat <= 0 && penatlyCooling > 0) { if (heat <= 0 && penaltyCooling > 0) {
penatlyCooling--; penaltyCooling--;
} }
} }
@ -244,7 +244,7 @@ public class EngineIron extends Engine {
coolantId = nbttagcompound.getInteger("coolantId"); coolantId = nbttagcompound.getInteger("coolantId");
coolantQty = nbttagcompound.getInteger("coolantQty"); coolantQty = nbttagcompound.getInteger("coolantQty");
heat = nbttagcompound.getInteger("heat"); heat = nbttagcompound.getInteger("heat");
penatlyCooling = nbttagcompound.getInteger("penaltyCooling"); penaltyCooling = nbttagcompound.getInteger("penaltyCooling");
} }
@Override @Override
@ -255,7 +255,7 @@ public class EngineIron extends Engine {
nbttagcompound.setInteger("coolantId", coolantId); nbttagcompound.setInteger("coolantId", coolantId);
nbttagcompound.setInteger("coolantQty", coolantQty); nbttagcompound.setInteger("coolantQty", coolantQty);
nbttagcompound.setInteger("heat", heat); nbttagcompound.setInteger("heat", heat);
nbttagcompound.setInteger("penaltyCooling", penatlyCooling); nbttagcompound.setInteger("penaltyCooling", penaltyCooling);
} }
public int getScaledCoolant(int i) { public int getScaledCoolant(int i) {
@ -313,7 +313,7 @@ public class EngineIron extends Engine {
@Override @Override
public boolean isActive() { public boolean isActive() {
return penatlyCooling <= 0; return penaltyCooling <= 0;
} }
@Override @Override