- Removing some logging.

$ Fixed Bed Height > 128 not working as intended.
$ Fixed IC2 ASM for wrench harvesting.
$ Fixed TC4 ASM.
$ Fixed Invalid Giant Chicken Texture handling.

7 files changed, 43 insertions, 56 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java
index 3d562bf76e..601a51392f 100644
--- a/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java
+++ b/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java
@@ -17,7 +17,7 @@ public class TypeCounter<V> implements Set<V> {
 	private final Class mClass;
 
 	public TypeCounter(Class o) {
-		Logger.INFO("Created new TypeCounter for "+o.getName());
+		Logger.WARNING("Created new TypeCounter for "+o.getName());
 		mClass = o;
 	}
 
@@ -56,17 +56,17 @@ public class TypeCounter<V> implements Set<V> {
 		InternalTypeCounterObject<V> aValue = mInternalMap.get(aKey);
 		if (aValue == null) {
 			aValue = new InternalTypeCounterObject<V>((V) arg0);
-			Logger.INFO("Adding new key to map: "+aKey);
+			Logger.WARNING("Adding new key to map: "+aKey);
 		}
 		aValue.add();
 		int a = aValue.count();
 		if (a > mHighestValue) {
 			mHighestValue = a;
 			mHighestValueKey = aKey;
-			Logger.INFO("New Highest Count - "+aKey+":"+a);
+			Logger.WARNING("New Highest Count - "+aKey+":"+a);
 		}		
 		mInternalMap.put(aKey, aValue);
-		Logger.INFO(aKey+":"+a);
+		Logger.WARNING(aKey+":"+a);
 		return true;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java b/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
index bc00db7ed1..cc1249280b 100644
--- a/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
@@ -4,40 +4,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.RenderChicken;
-import net.minecraft.entity.passive.EntityChicken;
-import net.minecraft.util.ResourceLocation;
-
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 @SideOnly(Side.CLIENT)
 public class RenderGiantChicken extends RenderChicken {
-	
-	/**
-	 * Fancy reflective handling of nabbing the original chicken texture object, should save reload the texture to memory. :)
-	 */
-    private static final ResourceLocation chickenTexturesEx;    
-    static {
-        ResourceLocation mChicken;
-		try {
-			mChicken = (ResourceLocation) ReflectionUtils.getField(RenderGiantChicken.class, "chickenTextures").get(null);
-		}
-		catch (IllegalArgumentException | IllegalAccessException e) {
-			mChicken = new ResourceLocation("textures/entity/chicken.png");
-		}
-        chickenTexturesEx = mChicken;
-    }
 
     public RenderGiantChicken(ModelBase p_i1252_1_, float p_i1252_2_)
     {
         super(p_i1252_1_, p_i1252_2_);
     }
-
-    /**
-     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
-     */
-    @Override
-    protected ResourceLocation getEntityTexture(EntityChicken p_110775_1_)
-    {
-        return chickenTexturesEx;
-    }
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 030099cff1..f9a4d8f548 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -463,14 +463,14 @@ public class MathUtils {
 			return 0;
 		}
 		int divisor = aDataSet.length;
-		Logger.INFO("Calculating Average Short. Divisor: "+divisor);
+		Logger.WARNING("Calculating Average Short. Divisor: "+divisor);
 		short total = 0;		
 		for (short i : aDataSet) {
-			Logger.INFO("Adding "+i);
+			Logger.WARNING("Adding "+i);
 			total += i;
 		}
 		short result = safeShort((total/divisor));
-		Logger.INFO("Average: "+result);
+		Logger.WARNING("Average: "+result);
 		return result;		
 	}
 	public static int getIntAverage(int[] aDataSet) {
diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index e0fef80b52..4a0c8d3d6c 100644
--- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -7,6 +7,7 @@ import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
 import gtPlusPlus.preloader.DevHelper;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,9 +18,11 @@ public class VanillaBedHeightFix implements IBugFix {
 	private final Method mSleepInBedAt;
 
 	public VanillaBedHeightFix() {
-		if (DevHelper.isValidHelperObject()) {
-			Method m = DevHelper.getForgeMethod(EntityPlayer.class, "sleepInBedAt", int.class, int.class,
-					int.class);
+		if (DevHelper.isValidHelperObject()) {			
+			Method m = ReflectionUtils.getMethod(EntityPlayer.class, "sleepInBedAt", int.class, int.class,	int.class);
+			if (m == null) {
+				m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class,	int.class);
+			}			
 			if (m != null) {
 				mSleepInBedAt = m;
 				Utils.registerEvent(this);
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
index 1e67619337..7c3d376de8 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
@@ -22,6 +22,9 @@ public class ClassTransformer_IC2_GetHarvestTool {
 	private final ClassWriter writer;
 	private final String className;
 
+	private final String aName_getItemDropped;
+	private final String aName_damageDropped;
+
 	public static String getHarvestTool(int aMeta) {
 		return "wrench";
 	}
@@ -37,7 +40,10 @@ public class ClassTransformer_IC2_GetHarvestTool {
 	public ClassTransformer_IC2_GetHarvestTool(byte[] basicClass, boolean obfuscated, String aClassName) {
 		className = aClassName;
 		ClassReader aTempReader = null;
-		ClassWriter aTempWriter = null;
+		ClassWriter aTempWriter = null;		
+		
+		aName_getItemDropped = obfuscated ? "func_149650_a" : "getItemDropped";
+		aName_damageDropped = obfuscated ? "func_149692_a" : "damageDropped";		
 
 		FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO,
 				"Attempting to patch in mode " + className + ".");
@@ -51,6 +57,7 @@ public class ClassTransformer_IC2_GetHarvestTool {
 		} else {
 			isValid = false;
 		}
+		
 		FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Valid patch? " + isValid + ".");
 		reader = aTempReader;
 		writer = aTempWriter;
@@ -58,15 +65,15 @@ public class ClassTransformer_IC2_GetHarvestTool {
 		if (reader != null && writer != null) {
 			FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Attempting Method Injection.");
 			injectMethod("getHarvestTool");
-
 			if (aClassName.equals("ic2.core.block.machine.BlockMachine2")
-					|| aClassName.equals("ic2.core.block.machine.BlockMachine3")) {
-				injectMethod("getItemDropped");
-				injectMethod("damageDropped");
+					|| aClassName.equals("ic2.core.block.machine.BlockMachine3") 
+					|| aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
+				injectMethod(aName_getItemDropped);
+				injectMethod(aName_damageDropped);
 			}
 			else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
 					|| aClassName.equals("ic2.core.block.machine.BlockMachine")) {
-				injectMethod("damageDropped");
+				injectMethod(aName_damageDropped);
 			}
 		}
 
@@ -111,8 +118,8 @@ public class ClassTransformer_IC2_GetHarvestTool {
 			mv.visitEnd();
 			didInject = true;
 		}
-		else if (aMethodName.equals("getItemDropped")) {
-			mv = cw.visitMethod(ACC_PUBLIC, "getItemDropped", "(ILjava/util/Random;I)Lnet/minecraft/item/Item;", null, null);
+		else if (aMethodName.equals(aName_getItemDropped)) {
+			mv = cw.visitMethod(ACC_PUBLIC, aName_getItemDropped, "(ILjava/util/Random;I)Lnet/minecraft/item/Item;", null, null);
 			mv.visitCode();
 			Label l0 = new Label();
 			mv.visitLabel(l0);
@@ -121,7 +128,7 @@ public class ClassTransformer_IC2_GetHarvestTool {
 			mv.visitVarInsn(ILOAD, 1);
 			mv.visitVarInsn(ALOAD, 2);
 			mv.visitVarInsn(ILOAD, 3);
-			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool", "getItemDropped", "(Lnet/minecraft/block/Block;ILjava/util/Random;I)Lnet/minecraft/item/Item;", false);
+			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool", aName_getItemDropped, "(Lnet/minecraft/block/Block;ILjava/util/Random;I)Lnet/minecraft/item/Item;", false);
 			mv.visitInsn(ARETURN);
 			Label l1 = new Label();
 			mv.visitLabel(l1);
@@ -133,14 +140,14 @@ public class ClassTransformer_IC2_GetHarvestTool {
 			mv.visitEnd();
 			didInject = true;
 		}
-		else if (aMethodName.equals("damageDropped")) {
-			mv = cw.visitMethod(ACC_PUBLIC, "damageDropped", "(I)I", null, null);
+		else if (aMethodName.equals(aName_damageDropped)) {
+			mv = cw.visitMethod(ACC_PUBLIC, aName_damageDropped, "(I)I", null, null);
 			mv.visitCode();
 			Label l0 = new Label();
 			mv.visitLabel(l0);
 			mv.visitLineNumber(48, l0);
 			mv.visitVarInsn(ILOAD, 1);
-			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool", "damageDropped", "(I)I", false);
+			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool", aName_damageDropped, "(I)I", false);
 			mv.visitInsn(IRETURN);
 			Label l1 = new Label();
 			mv.visitLabel(l1);
@@ -167,10 +174,11 @@ public class ClassTransformer_IC2_GetHarvestTool {
 		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 			MethodVisitor methodVisitor;
 			if (aClassName.equals("ic2.core.block.machine.BlockMachine2")
-					|| aClassName.equals("ic2.core.block.machine.BlockMachine3")) {
-				if (name.equals("getItemDropped")) {
+					|| aClassName.equals("ic2.core.block.machine.BlockMachine3")
+					|| aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
+				if (name.equals(aName_getItemDropped)) {
 					methodVisitor = null;
-				} else if (name.equals("damageDropped")) {
+				} else if (name.equals(aName_damageDropped)) {
 					methodVisitor = null;
 				} else if (name.equals("getHarvestTool")) {
 					methodVisitor = null;
@@ -180,7 +188,7 @@ public class ClassTransformer_IC2_GetHarvestTool {
 			}
 			else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
 					|| aClassName.equals("ic2.core.block.machine.BlockMachine")) {
-				if (name.equals("damageDropped")) {
+				if (name.equals(aName_damageDropped)) {
 					methodVisitor = null;
 				} else if (name.equals("getHarvestTool")) {
 					methodVisitor = null;
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
index 993559115c..5c8547e3d6 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
@@ -29,7 +29,7 @@ public class ClassTransformer_TC_ItemWispEssence {
 		ClassWriter aTempWriter = null;
 		boolean obfuscated = obfuscated2;
 		FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Are we patching obfuscated methods? "+obfuscated);
-		String aGetColour = obfuscated ? DevHelper.getSRG("getColorFromItemStack") : DevHelper.getForge("getColorFromItemStack");
+		String aGetColour = obfuscated ? DevHelper.getSRG("getColorFromItemStack") : "getColorFromItemStack";
 		aTempReader = new ClassReader(basicClass);
 		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);	
 		aTempReader.accept(new AddAdapter(aTempWriter, new String[] {"getAspects", aGetColour}), 0);
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 38fd1e0508..d3b59c753d 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -188,13 +188,17 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 				"ic2.core.block.reactor.block.BlockReactorFluidPort",
 				"ic2.core.block.reactor.block.BlockReactorRedstonePort", 
 				"ic2.core.block.reactor.block.BlockReactorVessel",
+				"ic2.core.block.personal.BlockPersonal.class",
+				"ic2.core.block.wiring.BlockChargepad.class",
+				"ic2.core.block.wiring.BlockElectric.class",
+				"ic2.core.block.wiring.BlockLuminator.class",				
 		};
 
 		//Fix IC2 Shit	
 		for (String y : aIC2ClassNames) {
 			if (transformedName.equals(y)) {
 				FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Transforming %s", transformedName);
-				return new ClassTransformer_IC2_GetHarvestTool(basicClass, probablyShouldBeFalse, transformedName).getWriter().toByteArray();			
+				return new ClassTransformer_IC2_GetHarvestTool(basicClass, obfuscated, transformedName).getWriter().toByteArray();			
 			}
 		}