diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-08-04 01:55:51 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-08-04 01:55:51 +1000 |
| commit | d3e198b78b311987b7b69a9102c75867c3253782 (patch) | |
| tree | 9fb68235b10287570bdfd07a0292db1df9bf914c /src/Java/miscutil/core | |
| parent | feb1963f65a43ee3d8ff17e5601991f51143cd9e (diff) | |
| download | GT5-Unofficial-d3e198b78b311987b7b69a9102c75867c3253782.tar.gz GT5-Unofficial-d3e198b78b311987b7b69a9102c75867c3253782.tar.bz2 GT5-Unofficial-d3e198b78b311987b7b69a9102c75867c3253782.zip | |
+ Added a config option for RF:EU Multiplier for Universal batteries.
Diffstat (limited to 'src/Java/miscutil/core')
| -rw-r--r-- | src/Java/miscutil/core/item/general/RF2EU_Battery.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Java/miscutil/core/item/general/RF2EU_Battery.java b/src/Java/miscutil/core/item/general/RF2EU_Battery.java index 9cb017e1a7..1e3c0ae8c9 100644 --- a/src/Java/miscutil/core/item/general/RF2EU_Battery.java +++ b/src/Java/miscutil/core/item/general/RF2EU_Battery.java @@ -27,11 +27,12 @@ import cpw.mods.fml.relauncher.SideOnly; public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, IElectricItemManager, IFuelHandler{ + public static int rfPerEU = 4; private final String unlocalizedName = "rfEUBattery"; private final ItemStack thisStack; private final static int maxValueEU = 100000000; - private final static int maxValueRF = maxValueEU * 4; - private double chargeEU = 0; + private final static int maxValueRF = maxValueEU * rfPerEU; + protected double chargeEU = 0; public RF2EU_Battery(){ super(maxValueRF, maxValueRF, maxValueRF); @@ -194,7 +195,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, energy += energyReceived; stack.stackTagCompound.setInteger("Energy", energy); ElectricItem.manager.discharge(stack, ElectricItem.manager.getCharge(stack), 3, true, true, false); - ElectricItem.manager.charge(stack, energy/4, 3, true, false); + ElectricItem.manager.charge(stack, energy/rfPerEU, 3, true, false); } return ElectricItem.manager.charge(stack, amount, tier, ignoreTransferLimit, simulate); @@ -213,7 +214,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, energy -= energyExtracted; stack.stackTagCompound.setInteger("Energy", energy); ElectricItem.manager.discharge(stack, ElectricItem.manager.getCharge(stack), 3, true, true, false); - ElectricItem.manager.charge(stack, energy/4, 3, true, false); + ElectricItem.manager.charge(stack, energy/rfPerEU, 3, true, false); } return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate); @@ -257,7 +258,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, energy += energyReceived; container.stackTagCompound.setInteger("Energy", energy); ElectricItem.manager.discharge(container, ElectricItem.manager.getCharge(container), 3, true, true, false); - ElectricItem.manager.charge(container, energy/4, 3, true, false); + ElectricItem.manager.charge(container, energy/rfPerEU, 3, true, false); } return energyReceived; @@ -276,7 +277,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, energy -= energyExtracted; container.stackTagCompound.setInteger("Energy", energy); ElectricItem.manager.discharge(container, ElectricItem.manager.getCharge(container), 3, true, true, false); - ElectricItem.manager.charge(container, energy/4, 3, true, false); + ElectricItem.manager.charge(container, energy/rfPerEU, 3, true, false); } return energyExtracted; } @@ -289,7 +290,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, } int energy = container.stackTagCompound.getInteger("Energy"); ElectricItem.manager.discharge(container, ElectricItem.manager.getCharge(container), 3, true, true, false); - ElectricItem.manager.charge(container, energy/4, 3, true, false); + ElectricItem.manager.charge(container, energy/rfPerEU, 3, true, false); return energy; } |