+ Added Hexadecuple Fluid Pipes.

+ Backported GT NBT Persistency fix via ASM.
+ Added support for 6 Slot Assembler recipes & Assembly Line recipes.

2 files changed, 204 insertions, 60 deletions

diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java
new file mode 100644
index 0000000000..e65d9d11eb
--- /dev/null
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java
@@ -0,0 +1,182 @@
+package gtPlusPlus.preloader.asm.transformers;
+
+import static org.objectweb.asm.Opcodes.*;
+
+import java.io.IOException;
+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 gtPlusPlus.preloader.DevHelper;
+
+public class ClassTransformer_GT_BlockMachines_NBT {	
+
+	//The qualified name of the class we plan to transform.
+	private static final String className = "micdoodle8.mods.galacticraft.core.util.FluidUtil"; 
+	//gregtech/common/blocks/GT_Block_Machines
+
+	private final boolean isValid;
+	private final ClassReader reader;
+	private final ClassWriter writer;	
+	
+	String aEntityPlayer;
+	String aEntityPlayerMP;
+	String aWorld;
+	
+	private static boolean doesMethodAlreadyExist = false;
+
+	public ClassTransformer_GT_BlockMachines_NBT(byte[] basicClass, boolean obfuscated) {
+		ClassReader aTempReader = null;
+		ClassWriter aTempWriter = null;
+		try {
+			aTempReader = new ClassReader(className);
+			aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
+			new ClassReader(basicClass).accept(new localClassVisitor(aTempWriter), 0);
+		} catch (IOException e) {}		
+		if (aTempReader != null && aTempWriter != null) {
+			isValid = true;
+		}
+		else {
+			isValid = false;
+		}
+		reader = aTempReader;
+		writer = aTempWriter;
+
+		if (reader != null && writer != null && !doesMethodAlreadyExist) {			
+			aEntityPlayer = obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayer") : "net/minecraft/entity/player/EntityPlayer";
+			aEntityPlayerMP = obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayerMP") : "net/minecraft/entity/player/EntityPlayerMP";
+			aWorld = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World";
+						
+			injectMethod("removedByPlayer");
+			injectMethod("harvestBlock");
+		}
+
+	}
+
+	public boolean isValidTransformer() {
+		return isValid;
+	}
+
+	public ClassReader getReader() {
+		return reader;
+	}
+
+	public ClassWriter getWriter() {
+		return writer;
+	}
+
+	public void injectMethod(String aMethodName) {		
+		MethodVisitor mv;	
+		FMLRelaunchLog.log("[GT++ ASM] Gregtech NBT Persistency Patch", Level.INFO, "Injecting "+aMethodName+" into "+className+".");	
+		if (aMethodName.equals("removedByPlayer")) {
+			
+			mv = getWriter().visitMethod(ACC_PUBLIC, "removedByPlayer", "(L"+aWorld+";L"+aEntityPlayer+";IIIZ)Z", null, null);
+			mv.visitCode();
+			Label l0 = new Label();
+			mv.visitLabel(l0);
+			mv.visitLineNumber(535, l0);
+			mv.visitVarInsn(ILOAD, 6);
+			Label l1 = new Label();
+			mv.visitJumpInsn(IFEQ, l1);
+			Label l2 = new Label();
+			mv.visitLabel(l2);
+			mv.visitLineNumber(536, l2);
+			mv.visitInsn(ICONST_1);
+			mv.visitInsn(IRETURN);
+			mv.visitLabel(l1);
+			mv.visitLineNumber(538, l1);
+			mv.visitFrame(F_SAME, 0, null, 0, null);
+			mv.visitVarInsn(ALOAD, 0);
+			mv.visitVarInsn(ALOAD, 1);
+			mv.visitVarInsn(ALOAD, 2);
+			mv.visitVarInsn(ILOAD, 3);
+			mv.visitVarInsn(ILOAD, 4);
+			mv.visitVarInsn(ILOAD, 5);
+			mv.visitInsn(ICONST_0);
+			mv.visitMethodInsn(INVOKESPECIAL, "gregtech/api/items/GT_Generic_Block", "removedByPlayer", "(L"+aWorld+";L"+aEntityPlayer+";IIIZ)Z", false);
+			mv.visitInsn(IRETURN);
+			Label l3 = new Label();
+			mv.visitLabel(l3);
+			mv.visitLocalVariable("this", "Lgregtech/common/blocks/GT_Block_Machines;", null, l0, l3, 0);
+			mv.visitLocalVariable("aWorld", "L"+aWorld+";", null, l0, l3, 1);
+			mv.visitLocalVariable("aPlayer", "L"+aEntityPlayer+";", null, l0, l3, 2);
+			mv.visitLocalVariable("aX", "I", null, l0, l3, 3);
+			mv.visitLocalVariable("aY", "I", null, l0, l3, 4);
+			mv.visitLocalVariable("aZ", "I", null, l0, l3, 5);
+			mv.visitLocalVariable("aWillHarvest", "Z", null, l0, l3, 6);
+			mv.visitMaxs(7, 7);
+			mv.visitEnd();
+
+
+		}
+		else if (aMethodName.equals("harvestBlock")) {
+
+			mv = getWriter().visitMethod(ACC_PUBLIC, "harvestBlock", "(L"+aWorld+";L"+aEntityPlayer+";IIII)V", null, null);
+			mv.visitCode();
+			Label l0 = new Label();
+			mv.visitLabel(l0);
+			mv.visitLineNumber(544, l0);
+			mv.visitVarInsn(ALOAD, 0);
+			mv.visitVarInsn(ALOAD, 1);
+			mv.visitVarInsn(ALOAD, 2);
+			mv.visitVarInsn(ILOAD, 3);
+			mv.visitVarInsn(ILOAD, 4);
+			mv.visitVarInsn(ILOAD, 5);
+			mv.visitVarInsn(ILOAD, 6);
+			mv.visitMethodInsn(INVOKESPECIAL, "gregtech/api/items/GT_Generic_Block", "harvestBlock", "(L"+aWorld+";L"+aEntityPlayer+";IIII)V", false);
+			Label l1 = new Label();
+			mv.visitLabel(l1);
+			mv.visitLineNumber(545, l1);
+			mv.visitVarInsn(ALOAD, 1);
+			mv.visitVarInsn(ILOAD, 3);
+			mv.visitVarInsn(ILOAD, 4);
+			mv.visitVarInsn(ILOAD, 5);
+			mv.visitMethodInsn(INVOKEVIRTUAL, ""+aWorld+"", "setBlockToAir", "(III)Z", false);
+			mv.visitInsn(POP);
+			Label l2 = new Label();
+			mv.visitLabel(l2);
+			mv.visitLineNumber(546, l2);
+			mv.visitInsn(RETURN);
+			Label l3 = new Label();
+			mv.visitLabel(l3);
+			mv.visitLocalVariable("this", "Lgregtech/common/blocks/GT_Block_Machines;", null, l0, l3, 0);
+			mv.visitLocalVariable("aWorld", "L"+aWorld+";", null, l0, l3, 1);
+			mv.visitLocalVariable("aPlayer", "L"+aEntityPlayer+";", null, l0, l3, 2);
+			mv.visitLocalVariable("aX", "I", null, l0, l3, 3);
+			mv.visitLocalVariable("aY", "I", null, l0, l3, 4);
+			mv.visitLocalVariable("aZ", "I", null, l0, l3, 5);
+			mv.visitLocalVariable("aMeta", "I", null, l0, l3, 6);
+			mv.visitMaxs(7, 7);
+			mv.visitEnd();
+
+		}	
+		FMLRelaunchLog.log("[GT++ ASM] Gregtech NBT Persistency Patch", Level.INFO, "Method injection complete.");		
+
+	}
+
+	public static final class localClassVisitor extends ClassVisitor {
+
+		public localClassVisitor(ClassVisitor cv) {
+			super(ASM5, cv);
+		}
+
+		@Override
+		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {			
+			if (name.equals("removedByPlayer")) {
+				FMLRelaunchLog.log("[GT++ ASM] Gregtech NBT Persistency Patch", Level.INFO, "Found method "+name+", skipping patch.");
+				doesMethodAlreadyExist = true;
+			}	
+			if (name.equals("harvestBlock")) {
+				FMLRelaunchLog.log("[GT++ ASM] Gregtech NBT Persistency Patch", Level.INFO, "Found method "+name+", skipping patch.");
+				doesMethodAlreadyExist = true;
+			}			
+			MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+			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 700fa09047..3738140b0d 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -11,7 +11,6 @@ import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.Launch;
 import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
-import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer2.GT_MetaTile_Visitor;
 
 public class Preloader_Transformer_Handler implements IClassTransformer {
 
@@ -54,69 +53,32 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 		}
 
 		// Fix Tinkers Fluids
-			if (transformedName.equals("tconstruct.smeltery.blocks.TConstructFluid")) {
-				FMLRelaunchLog.log("[GT++ ASM] Bright Fluids", Level.INFO, "Transforming %s", transformedName);
-				return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass).getWriter().toByteArray();
-			}
+		if (transformedName.equals("tconstruct.smeltery.blocks.TConstructFluid")) {
+			FMLRelaunchLog.log("[GT++ ASM] Bright Fluids", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass).getWriter().toByteArray();
+		}
 
 		//Fix GC stuff
-			if (transformedName.equals("micdoodle8.mods.galacticraft.core.util.FluidUtil")) {	
-				FMLRelaunchLog.log("[GT++ ASM] Galacticraft FluidUtils Patch", Level.INFO, "Transforming %s", transformedName);
-				return new ClassTransformer_GC_FluidUtil(basicClass, obfuscated).getWriter().toByteArray();
-			}
-			if (transformedName.equals("micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader")) {
-				FMLRelaunchLog.log("[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Transforming %s", transformedName);
-				return new ClassTransformer_GC_FuelLoader(basicClass, obfuscated).getWriter().toByteArray();
-			}
-			if (transformedName.equals("micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket")) {
-				FMLRelaunchLog.log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Transforming %s", transformedName);
-				return new ClassTransformer_GC_EntityAutoRocket(basicClass, obfuscated).getWriter().toByteArray();
-			}
-		
-	
-		if (mEnabled) {
-			if (transformedName.equals("gregtech.api.metatileentity.BaseMetaTileEntity")) {
-				FMLRelaunchLog.log("[GT++ ASM] NBTFixer", Level.INFO, "Transforming %s", transformedName);
-				ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-				ClassReader x = new ClassReader(basicClass);
-				x.accept(new GT_MetaTile_Visitor(classWriter, false), ClassReader.EXPAND_FRAMES);
-				return classWriter.toByteArray();
-			}
-			if (transformedName.equals("gregtech.common.blocks.GT_Block_Machines")) {
-				FMLRelaunchLog.log("[GT++ ASM] NBTFixer", Level.INFO, "Transforming %s", transformedName);
-				ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-				ClassReader x = new ClassReader(basicClass);
-				x.accept(new GT_MetaTile_Visitor(classWriter, true), ClassReader.EXPAND_FRAMES);
-				return classWriter.toByteArray();
-			}
-			
-			//Improve OB Sprinklers
-			/*if (transformedName.equals("openblocks.common.tileentity.TileEntitySprinkler")) {
-				FMLRelaunchLog.log("[GT++ ASM] OpenBlocks Sprinkler Patch", Level.INFO, "Transforming %s", transformedName);
-				try {
-					ClassLoader aCustom = new gtPlusPlus.preloader.CustomClassLoader();
-					Class aCustomClass = aCustom.loadClass(gtPlusPlus.xmod.ob.TileEntitySprinkler_ASM.class.getName());
-					if (aCustomClass == null) {
-						aCustomClass = aCustom.loadClass(gtPlusPlus.xmod.ob.TileEntitySprinkler_ASM.class.getCanonicalName());
-					}
-					if (aCustomClass == null) {
-						aCustomClass = aCustom.loadClass(gtPlusPlus.xmod.ob.TileEntitySprinkler_ASM.class.getSimpleName());
-					}
-					if (aCustomClass == null) {
-						byte[] mCustomClassData = GetBytecode.getClassFile(aCustomClass);
-						if (mCustomClassData != null) {
-							FMLRelaunchLog.log("[GT++ ASM] OpenBlocks Sprinkler Patch", Level.INFO, "Custom Class Loaded in place.");
-							return mCustomClassData;
-						}
-					}
+		if (transformedName.equals("micdoodle8.mods.galacticraft.core.util.FluidUtil")) {	
+			FMLRelaunchLog.log("[GT++ ASM] Galacticraft FluidUtils Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_GC_FluidUtil(basicClass, obfuscated).getWriter().toByteArray();
+		}
+		if (transformedName.equals("micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader")) {
+			FMLRelaunchLog.log("[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_GC_FuelLoader(basicClass, obfuscated).getWriter().toByteArray();
+		}
+		if (transformedName.equals("micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket")) {
+			FMLRelaunchLog.log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_GC_EntityAutoRocket(basicClass, obfuscated).getWriter().toByteArray();
+		}
 
-				} catch (ClassNotFoundException | UnmodifiableClassException e) {
-					e.printStackTrace();
-				}
-				return new ClassTransformer_OB_Sprinkler(obfuscated, basicClass).getWriter().toByteArray();
-			}*/
+		//Fix GT NBT Persistency issue
+		if (transformedName.equals("gregtech.common.blocks.GT_Block_Machines")) {	
+			FMLRelaunchLog.log("[GT++ ASM] Gregtech NBT Persistency Patch", Level.INFO, "Transforming %s", transformedName);
+			return new ClassTransformer_GT_BlockMachines_NBT(basicClass, obfuscated).getWriter().toByteArray();
 		}
+
 		return basicClass;
 	}
-	
+
 }