$ Fixed many tiny bugs, found by static code analysis.

$ Fixed Canning handling further.
$ Adjusted the Charcoal Pit fix.

3 files changed, 43 insertions, 37 deletions

diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
index 8299ea3cb5..9c79db265d 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
@@ -17,6 +17,7 @@ import org.objectweb.asm.MethodVisitor;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import gregtech.api.enums.OrePrefixes;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -30,13 +31,19 @@ public class ClassTransformer_GT_CharcoalPit {
 	private final ClassWriter writer;
 
 	public static boolean isWoodLog(Block log) {
-		String tTool = log.getHarvestTool(0);
-		boolean isLog1 = OrePrefixes.log.contains(new ItemStack(log, 1)) && tTool != null && tTool.equals("axe")	&& log.getMaterial() == Material.wood;
+		//Logger.INFO("checking for log");
+		boolean isLog1 = OrePrefixes.log.contains(new ItemStack(log, 1));
+		if (isLog1) {
+			//Logger.INFO("Found 1");
+			return true;
+		}
 		ArrayList<ItemStack> oredict = OreDictionary.getOres("logWood");
 		if (oredict.contains(ItemUtils.getSimpleStack(log))) {
+			//Logger.INFO("found 2");
 			return true;
-		}		
-		return isLog1;
+		}	
+		//Logger.INFO("Did not find. "+(log != null ? ""+log.getLocalizedName() : "Null or invalid block?"));	
+		return false;
 	}
 	
 	public ClassTransformer_GT_CharcoalPit(byte[] basicClass, boolean obfuscated) {
@@ -79,7 +86,7 @@ public class ClassTransformer_GT_CharcoalPit {
 			aBlockClassName = "aji";
 		}		
 		if (aMethodName.equals("isWoodLog")) {
-			mv = cw.visitMethod(ACC_PUBLIC, "woodLog", "(L"+aBlockClassName+";)Z", null, null);
+			mv = cw.visitMethod(ACC_PUBLIC, "isWoodLog", "(L"+aBlockClassName+";)Z", null, null);
 			mv.visitCode();
 			Label l0 = new Label();
 			mv.visitLabel(l0);
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 06759429b9..8f65709478 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
@@ -1,6 +1,36 @@
 package gtPlusPlus.preloader.asm.transformers;
 
-import static org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.AALOAD;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACONST_NULL;
+import static org.objectweb.asm.Opcodes.ALOAD;
+import static org.objectweb.asm.Opcodes.ARETURN;
+import static org.objectweb.asm.Opcodes.ARRAYLENGTH;
+import static org.objectweb.asm.Opcodes.ASM5;
+import static org.objectweb.asm.Opcodes.ASTORE;
+import static org.objectweb.asm.Opcodes.DUP;
+import static org.objectweb.asm.Opcodes.F_APPEND;
+import static org.objectweb.asm.Opcodes.F_CHOP;
+import static org.objectweb.asm.Opcodes.F_SAME;
+import static org.objectweb.asm.Opcodes.F_SAME1;
+import static org.objectweb.asm.Opcodes.GETSTATIC;
+import static org.objectweb.asm.Opcodes.GOTO;
+import static org.objectweb.asm.Opcodes.I2L;
+import static org.objectweb.asm.Opcodes.ICONST_0;
+import static org.objectweb.asm.Opcodes.IFEQ;
+import static org.objectweb.asm.Opcodes.IFLE;
+import static org.objectweb.asm.Opcodes.IFNONNULL;
+import static org.objectweb.asm.Opcodes.IFNULL;
+import static org.objectweb.asm.Opcodes.ILOAD;
+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static org.objectweb.asm.Opcodes.IRETURN;
+import static org.objectweb.asm.Opcodes.ISTORE;
+import static org.objectweb.asm.Opcodes.L2I;
+import static org.objectweb.asm.Opcodes.LDIV;
+import static org.objectweb.asm.Opcodes.LREM;
+import static org.objectweb.asm.Opcodes.NEW;
 
 import org.apache.logging.log4j.Level;
 import org.objectweb.asm.AnnotationVisitor;
@@ -11,12 +41,7 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.preloader.DevHelper;
-import net.minecraft.item.ItemStack;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
 
 public class ClassTransformer_TC_ItemWispEssence {	
 
@@ -246,30 +271,6 @@ public class ClassTransformer_TC_ItemWispEssence {
 		}
 
 	}
-	static Aspect[] displayAspects;
-
-	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack stack, int par2) {
-		if (stack == null) {
-			return 0;
-		}		
-		if (this.getAspects(stack) != null) {
-			return this.getAspects(stack).getAspects()[0].getColor();
-		} else {
-			int idx = (int) (System.currentTimeMillis() / 500L % (long) displayAspects.length);
-			return displayAspects[idx].getColor();
-		}
-	}
-
-	public AspectList getAspects(ItemStack itemstack) {
-		if (itemstack.hasTagCompound()) {
-			AspectList aspects = new AspectList();
-			aspects.readFromNBT(itemstack.getTagCompound());
-			return aspects.size() > 0 ? aspects : null;
-		} else {
-			return null;
-		}
-	}
 
 
 
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
index 390289d162..507e2cf974 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
@@ -329,8 +329,6 @@ public class Preloader_ClassTransformer2 {
 				Logger.REFLECTION("mItemStorageNBT: "+(mItemStorageNBT != null));
 
 				//mItemStorageNBT
-
-				ItemStack rStack = new ItemStack(GregTech_API.sBlockMachines, 1, tID);
 				NBTTagCompound tNBT = new NBTTagCompound();
 
 				if (tRecipeStuff != null && !tRecipeStuff.hasNoTags()) tNBT.setTag("GT.CraftingComponents", tRecipeStuff);