+ Added a config option for RF:EU Multiplier for Universal batteries.

2 files changed, 12 insertions, 7 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index 6719ebf470..7fc555399c 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -17,6 +17,7 @@ import java.io.File;
 import miscutil.core.commands.CommandMath;
 import miscutil.core.common.CommonProxy;
 import miscutil.core.handler.events.LoginEventHandler;
+import miscutil.core.item.general.RF2EU_Battery;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.HANDLER_GT;
@@ -62,6 +63,9 @@ implements ActionListener
 		disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
 		enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead.");
 		
+		//Options
+		RF2EU_Battery.rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000, "How much RF is a single unit of EU worth? (Most mods use 4:1 ratio)");
+		
 		
 		config.save(); 
 	}
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;
 	}