$ Fixed a compile error after refactoring a config variable to a new location.

2 files changed, 8 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index 9c1fdd29f5..7d05a221b9 100644
--- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
+++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -25,15 +25,15 @@ import net.minecraft.world.World;
 
 public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, IElectricItemManager, IFuelHandler{
 
-	public static int rfPerEU = 4;
+	public static double rfPerEU = 3.4;
 	private final String unlocalizedName = "rfEUBattery";
 	private final ItemStack thisStack;
 	private final static int maxValueEU = 100000000;
-	private final static int maxValueRF = maxValueEU * rfPerEU;
+	private final static int maxValueRF = (int) (maxValueEU * rfPerEU);
 	protected double chargeEU = 0;
 
 	public RF2EU_Battery(){
-		super(maxValueRF, maxValueRF, maxValueRF);
+		super(maxValueRF);
 		GameRegistry.registerFuelHandler(this);
 		//this.setMaxDamage(Integer.MAX_VALUE);
 		//this.setDamage(UtilsItems.getSimpleStack(this), 0);
diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index b7593246dc..4a9584466a 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -22,7 +22,7 @@ import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
 import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
 import gtPlusPlus.core.handler.render.FirepitRender;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE.configSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
 import gtPlusPlus.core.util.Utils;
@@ -30,7 +30,6 @@ import gtPlusPlus.core.util.particles.EntityParticleFXMysterious;
 import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.renderer.entity.RenderIronGolem;
 import net.minecraft.client.renderer.entity.RenderSnowball;
 import net.minecraft.entity.Entity;
 
@@ -45,7 +44,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
 
 	@SubscribeEvent
 	public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
-		if (CORE.mEnableCape){
+		if (configSwitches.enableCustomCapes){
 			mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
 		}
 	}
@@ -56,7 +55,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
 	@Override
 	public void preInit(final FMLPreInitializationEvent e) {
 		super.preInit(e);
-		if (CORE.mEnableCape){
+		if (configSwitches.enableCustomCapes){
 			onPreLoad();			
 		}
 		//Do this weird things for textures.
@@ -154,7 +153,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
 
 
 	public void onPreLoad() {
-		if (CORE.mEnableCape){
+		if (configSwitches.enableCustomCapes){
 			String arr$[] = {
 					"draknyte1", "fobius"
 			};
@@ -169,7 +168,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
 
 	public void run() {
 		try {
-			if (CORE.mEnableCape){
+			if (configSwitches.enableCustomCapes){
 				Utils.LOG_INFO("GT++ Mod: Downloading Cape List.");
 				@SuppressWarnings("resource")
 				Scanner tScanner = new Scanner(new URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream());