Converted MJ to RF in circuits and Tin Engine

This commit is contained in:
mezz committed 2014-09-22 02:21:59 -07:00
1 parent 3468169bf9
commit a80bcef949
5 files changed
+12 -12

No files matched your search

@@ -12,10 +12,10 @@ package forestry.energy.circuits;
public class CircuitElectricBoost extends CircuitElectricChange {
public CircuitElectricBoost(String uid, int limit, int eu, int mj) {
public CircuitElectricBoost(String uid, int limit, int eu, int rf) {
super(uid, false);
this.setLimit(limit);
this.configureChange(eu, mj);
this.configureChange(eu, rf);
}
}
@@ -18,15 +18,15 @@ import forestry.energy.gadgets.EngineTin;
public abstract class CircuitElectricChange extends Circuit {
int euChange = 7;
int mjChange = 2;
int rfChange = 20;
public CircuitElectricChange(String uid, boolean requiresDiscovery) {
super(uid, requiresDiscovery);
}
protected void configureChange(int euChange, int mjChange) {
protected void configureChange(int euChange, int rfChange) {
this.euChange = euChange;
this.mjChange = mjChange;
this.rfChange = rfChange;
}
@Override
@@ -40,7 +40,7 @@ public abstract class CircuitElectricChange extends Circuit {
return;
EngineTin engine = (EngineTin) tile;
engine.changeEnergyConfig(euChange, mjChange, 2 * euChange);
engine.changeEnergyConfig(euChange, rfChange, 2 * euChange);
}
@Override
@@ -54,7 +54,7 @@ public abstract class CircuitElectricChange extends Circuit {
return;
EngineTin engine = (EngineTin) tile;
engine.changeEnergyConfig(-euChange, -mjChange, -(2 * euChange));
engine.changeEnergyConfig(-euChange, -rfChange, -(2 * euChange));
}
@Override
@@ -14,7 +14,7 @@ public class CircuitElectricChoke extends CircuitElectricChange {
public CircuitElectricChoke(String uid) {
super(uid, false);
this.configureChange(-2, -1);
this.configureChange(-2, -10);
this.setLimit(1);
}
}
@@ -256,9 +256,9 @@ public class EngineTin extends Engine implements ISocketable, IInventory {
}
// / ENERGY CONFIG CHANGE
public void changeEnergyConfig(int euChange, int mjChange, int storageChange) {
public void changeEnergyConfig(int euChange, int rfChange, int storageChange) {
euConfig.euForCycle += euChange;
euConfig.rfPerCycle += mjChange;
euConfig.rfPerCycle += rfChange;
euConfig.euStorage += storageChange;
if (ic2EnergySink != null) ic2EnergySink.setCapacity(euConfig.euStorage);
@@ -153,8 +153,8 @@ public class PluginEnergy extends ForestryPlugin {
Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1");
Circuit.energyFireDampener1 = new CircuitFireDampener("dampener.1");
Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("electric.efficiency.1");
Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 2);
Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 2, 15, 4);
Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 20);
Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 2, 15, 40);
}
@Override