$ Fixed Wire Cutter handling for 5.09.32+.

$ Corrected Rainforest Oak sapling recipes and also fixed the Charcoal Pit Igniter. Further fixes #454.

4 files changed, 149 insertions, 5 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
new file mode 100644
index 0000000000..8299ea3cb5
--- /dev/null
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
@@ -0,0 +1,135 @@
+package gtPlusPlus.preloader.asm.transformers;
+
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ALOAD;
+import static org.objectweb.asm.Opcodes.ASM5;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.IRETURN;
+
+import java.util.ArrayList;
+
+import org.apache.logging.log4j.Level;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gregtech.api.enums.OrePrefixes;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class ClassTransformer_GT_CharcoalPit {
+
+	private final boolean isValid;
+	private final ClassReader reader;
+	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;
+		ArrayList<ItemStack> oredict = OreDictionary.getOres("logWood");
+		if (oredict.contains(ItemUtils.getSimpleStack(log))) {
+			return true;
+		}		
+		return isLog1;
+	}
+	
+	public ClassTransformer_GT_CharcoalPit(byte[] basicClass, boolean obfuscated) {
+		ClassReader aTempReader = null;
+		ClassWriter aTempWriter = null;
+		aTempReader = new ClassReader(basicClass);
+		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
+		aTempReader.accept(new AddFieldAdapter(aTempWriter), 0);
+		injectMethod("isWoodLog", obfuscated, aTempWriter);
+		if (aTempReader != null && aTempWriter != null) {
+			isValid = true;
+		} else {
+			isValid = false;
+		}
+		FMLRelaunchLog.log("[GT++ ASM] GT Charcoal Pit Fix", Level.INFO,
+				"Valid? " + isValid + ".");
+		reader = aTempReader;
+		writer = aTempWriter;
+	}
+
+	public boolean isValidTransformer() {
+		return isValid;
+	}
+
+	public ClassReader getReader() {
+		return reader;
+	}
+
+	public ClassWriter getWriter() {
+		return writer;
+	}
+
+	public boolean injectMethod(String aMethodName, boolean obfuscated, ClassWriter cw) {
+		MethodVisitor mv;
+		boolean didInject = false;
+		FMLRelaunchLog.log("[GT++ ASM] GT Charcoal Pit Fix", Level.INFO, "Injecting " + aMethodName + ".");
+		
+		String aBlockClassName = "net/minecraft/block/Block";		
+		if (obfuscated) {
+			aBlockClassName = "aji";
+		}		
+		if (aMethodName.equals("isWoodLog")) {
+			mv = cw.visitMethod(ACC_PUBLIC, "woodLog", "(L"+aBlockClassName+";)Z", null, null);
+			mv.visitCode();
+			Label l0 = new Label();
+			mv.visitLabel(l0);
+			mv.visitLineNumber(49, l0);
+			mv.visitVarInsn(ALOAD, 1);
+			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit", "isWoodLog", "(L"+aBlockClassName+";)Z", false);
+			mv.visitInsn(IRETURN);
+			Label l1 = new Label();
+			mv.visitLabel(l1);
+			mv.visitLocalVariable("this", "Lgregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit;", null, l0, l1, 0);
+			mv.visitLocalVariable("log", "L"+aBlockClassName+";", null, l0, l1, 1);
+			mv.visitMaxs(1, 2);
+			mv.visitEnd();
+			didInject = true;
+		}
+		FMLRelaunchLog.log("[GT++ ASM] GT Charcoal Pit Fix", Level.INFO, "Method injection complete.");
+		return didInject;
+	}
+
+	public class AddFieldAdapter extends ClassVisitor {
+
+		public AddFieldAdapter(ClassVisitor cv) {
+			super(ASM5, cv);
+			this.cv = cv;
+		}
+
+		private final String[] aMethodsToStrip = new String[] { "isWoodLog" };
+
+		@Override
+		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+			MethodVisitor methodVisitor;
+			boolean found = false;
+
+			for (String s : aMethodsToStrip) {
+				if (name.equals(s)) {
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+			} else {
+				methodVisitor = null;
+			}
+			if (found) {
+				FMLRelaunchLog.log("[GT++ ASM] GT Charcoal Pit Fix", Level.INFO, "Found method " + name + ", removing.");
+			}
+			return methodVisitor;
+		}
+
+	}
+
+}
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 0e06b360b1..c269e9463e 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -167,6 +167,12 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 			return new ClassTransformer_GT_BaseMetaTileEntity(basicClass).getWriter().toByteArray();
 		}
 		
+		//Fix log handling on the charcoal pit
+		if (transformedName.equals("gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit")) {	
+			FMLRelaunchLog.log("[GT++ ASM] GT Charcoal Pit Fix", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_GT_CharcoalPit(basicClass, obfuscated).getWriter().toByteArray();
+		}
+		
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
index 92e626cea0..ea9b61bb2e 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
@@ -48,7 +48,7 @@ public class BOP_Block_Registrator {
 	public static final void recipes() {		
 		//Rainforest Oak
 		addLogRecipes(ItemUtils.getSimpleStack(log_Rainforest));
-		addSaplingRecipes(ItemUtils.getSimpleStack(log_Rainforest));
+		addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Rainforest));
 
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 2c9ddff4f1..236ae65edb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -49,12 +49,15 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 		GT_HashSet<GT_ItemStack> aWireCutterList = new GT_HashSet<GT_ItemStack>();
 		//Does not exist prior to 5.09.32, use an empty field if we can't find the existing one.
 		if (ReflectionUtils.doesFieldExist(GregTech_API.class, "sWireCutterList")) {
-			Field sWireCutterList = ReflectionUtils.getField(GregTech_API.class, "");
+			Field sWireCutterList = ReflectionUtils.getField(GregTech_API.class, "sWireCutterList");
 			try {
-				Object val = sWireCutterList.get(null);
-				if (val != null && val instanceof GT_HashSet) {
-					aWireCutterList = (GT_HashSet<GT_ItemStack>) val;
+				if (sWireCutterList != null) {
+					Object val = sWireCutterList.get(null);
+					if (val != null && val instanceof GT_HashSet) {
+						aWireCutterList = (GT_HashSet<GT_ItemStack>) val;
+					}
 				}
+				
 			}
 			catch (IllegalArgumentException | IllegalAccessException e) {
 				// Not found, so it's GT 5.09.31 or earlier.