Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

30 files changed, 11467 insertions, 9152 deletions

diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java
index 8791d401c8..ee463d6cca 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java
@@ -2,120 +2,121 @@ package gtPlusPlus.preloader.asm.transformers;
 
 import static org.objectweb.asm.Opcodes.*;
 
+import gtPlusPlus.preloader.Preloader_Logger;
 import org.apache.logging.log4j.Level;
 import org.objectweb.asm.*;
 
-import gtPlusPlus.preloader.Preloader_Logger;
-
 public class ClassTransformer_CC_GuiContainerManager {
 
-	private final boolean isValid;
-	private final ClassReader reader;
-	private final ClassWriter writer;
-
-	public ClassTransformer_CC_GuiContainerManager(byte[] basicClass) {
-		
-		ClassReader aTempReader = null;
-		ClassWriter aTempWriter = null;
-
-		aTempReader = new ClassReader(basicClass);
-		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-		localClassVisitor aTempMethodRemover = new localClassVisitor(aTempWriter);
-		aTempReader.accept(aTempMethodRemover, 0);
-
-		if (aTempReader != null && aTempWriter != null) {
-			isValid = true;
-		} else {
-			isValid = false;
-		}
-		
-		Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Valid patch? " + isValid + ".");
-		reader = aTempReader;
-		writer = aTempWriter;
-
-		if (reader != null && writer != null) {
-			Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Attempting Method Injection.");
-			injectMethod("mouseUp");
-		}
-
-	}
-
-	public boolean isValidTransformer() {
-		return isValid;
-	}
-
-	public ClassReader getReader() {
-		return reader;
-	}
-
-	public ClassWriter getWriter() {
-		return writer;
-	}
-
-	public boolean injectMethod(String aMethodName) {
-		MethodVisitor mv;
-		boolean didInject = false;
-		String aClassName = "codechicken/nei/guihook/GuiContainerManager";
-		ClassWriter cw = getWriter();	
-		if (aMethodName.equals("mouseUp")) {
-			Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Injecting " + aMethodName + ", static replacement call to "+aClassName+".");
-			mv = cw.visitMethod(ACC_PUBLIC, "mouseUp", "(III)V", null, null);
-			mv.visitCode();
-			Label l0 = new Label();
-			mv.visitLabel(l0);
-			mv.visitLineNumber(12, l0);
-			mv.visitVarInsn(ILOAD, 1);
-			mv.visitVarInsn(ILOAD, 2);
-			mv.visitVarInsn(ILOAD, 3);
-			mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/helpers/MethodHelper_CC", "mouseUp", "(III)V", false);
-			Label l1 = new Label();
-			mv.visitLabel(l1);
-			mv.visitLineNumber(13, l1);
-			mv.visitInsn(RETURN);
-			Label l2 = new Label();
-			mv.visitLabel(l2);
-			mv.visitLocalVariable("this", "L+aClassName+;", null, l0, l2, 0);
-			mv.visitLocalVariable("mousex", "I", null, l0, l2, 1);
-			mv.visitLocalVariable("mousey", "I", null, l0, l2, 2);
-			mv.visitLocalVariable("button", "I", null, l0, l2, 3);
-			mv.visitMaxs(3, 4);
-			mv.visitEnd();
-			didInject = true;
-		}		
-		
-		Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Method injection complete.");
-		return didInject;
-	}
-
-	public final class localClassVisitor extends ClassVisitor {
-
-		boolean obfuscated = false;
-		
-		public localClassVisitor(ClassVisitor cv) {
-			super(ASM5, cv);
-		}
-
-		public boolean getObfuscatedRemoval() {
-			return obfuscated;
-		}
-
-		@Override
-		public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-			MethodVisitor methodVisitor;
-			
-			if (name.equals("mouseUp")) {	
-				methodVisitor = null;
-			}
-			else {
-				methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-			}
-
-			if (methodVisitor == null) {
-				Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Found method " + name + ", removing.");
-				Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Descriptor: "+desc);
-			}
-			return methodVisitor;
-		}
-	}
-
+    private final boolean isValid;
+    private final ClassReader reader;
+    private final ClassWriter writer;
+
+    public ClassTransformer_CC_GuiContainerManager(byte[] basicClass) {
+
+        ClassReader aTempReader = null;
+        ClassWriter aTempWriter = null;
+
+        aTempReader = new ClassReader(basicClass);
+        aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
+        localClassVisitor aTempMethodRemover = new localClassVisitor(aTempWriter);
+        aTempReader.accept(aTempMethodRemover, 0);
+
+        if (aTempReader != null && aTempWriter != null) {
+            isValid = true;
+        } else {
+            isValid = false;
+        }
+
+        Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Valid patch? " + isValid + ".");
+        reader = aTempReader;
+        writer = aTempWriter;
+
+        if (reader != null && writer != null) {
+            Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Attempting Method Injection.");
+            injectMethod("mouseUp");
+        }
+    }
+
+    public boolean isValidTransformer() {
+        return isValid;
+    }
+
+    public ClassReader getReader() {
+        return reader;
+    }
+
+    public ClassWriter getWriter() {
+        return writer;
+    }
+
+    public boolean injectMethod(String aMethodName) {
+        MethodVisitor mv;
+        boolean didInject = false;
+        String aClassName = "codechicken/nei/guihook/GuiContainerManager";
+        ClassWriter cw = getWriter();
+        if (aMethodName.equals("mouseUp")) {
+            Preloader_Logger.LOG(
+                    "CodeChicken GuiContainerManager Patch",
+                    Level.INFO,
+                    "Injecting " + aMethodName + ", static replacement call to " + aClassName + ".");
+            mv = cw.visitMethod(ACC_PUBLIC, "mouseUp", "(III)V", null, null);
+            mv.visitCode();
+            Label l0 = new Label();
+            mv.visitLabel(l0);
+            mv.visitLineNumber(12, l0);
+            mv.visitVarInsn(ILOAD, 1);
+            mv.visitVarInsn(ILOAD, 2);
+            mv.visitVarInsn(ILOAD, 3);
+            mv.visitMethodInsn(
+                    INVOKESTATIC, "gtPlusPlus/preloader/asm/helpers/MethodHelper_CC", "mouseUp", "(III)V", false);
+            Label l1 = new Label();
+            mv.visitLabel(l1);
+            mv.visitLineNumber(13, l1);
+            mv.visitInsn(RETURN);
+            Label l2 = new Label();
+            mv.visitLabel(l2);
+            mv.visitLocalVariable("this", "L+aClassName+;", null, l0, l2, 0);
+            mv.visitLocalVariable("mousex", "I", null, l0, l2, 1);
+            mv.visitLocalVariable("mousey", "I", null, l0, l2, 2);
+            mv.visitLocalVariable("button", "I", null, l0, l2, 3);
+            mv.visitMaxs(3, 4);
+            mv.visitEnd();
+            didInject = true;
+        }
+
+        Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Method injection complete.");
+        return didInject;
+    }
+
+    public final class localClassVisitor extends ClassVisitor {
+
+        boolean obfuscated = false;
+
+        public localClassVisitor(ClassVisitor cv) {
+            super(ASM5, cv);
+        }
+
+        public boolean getObfuscatedRemoval() {
+            return obfuscated;
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+            MethodVisitor methodVisitor;
+
+            if (name.equals("mouseUp")) {
+                methodVisitor = null;
+            } else {
+                methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+            }
+
+            if (methodVisitor == null) {
+                Preloader_Logger.LOG(
+                        "CodeChicken GuiContainerManager Patch", Level.INFO, "Found method " + name + ", removing.");
+                Preloader_Logger.LOG("CodeChicken GuiContainerManager Patch", Level.INFO, "Descriptor: " + desc);
+            }
+            return methodVisitor;
+        }
+    }
 }
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
index 6f08dc4ff5..eea82c33e5 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
@@ -7,179 +7,186 @@ import static org.objectweb.asm.Opcodes.ASM5;
 import static org.objectweb.asm.Opcodes.INVOKESTATIC;
 import static org.objectweb.asm.Opcodes.RETURN;
 
-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 cofh.core.util.oredict.OreDictionaryArbiter;
+import cofh.lib.util.ItemWrapper;
 import com.google.common.base.Strings;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-
-import cofh.core.util.oredict.OreDictionaryArbiter;
-import cofh.lib.util.ItemWrapper;
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import gnu.trove.map.TMap;
 import gnu.trove.map.hash.THashMap;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.DevHelper;
+import java.util.ArrayList;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
+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;
 
 public class ClassTransformer_COFH_OreDictionaryArbiter {
 
-	//The qualified name of the class we plan to transform.
-		private static final String className = "cofh.core.util.oredict.OreDictionaryArbiter"; 
-		//cofh/core/util/oredict/OreDictionaryArbiter
-		
-		private final boolean isValid;
-		private final ClassReader reader;
-		private final ClassWriter writer;
-
-		public ClassTransformer_COFH_OreDictionaryArbiter(byte[] basicClass) {			
-			ClassReader aTempReader = null;
-			ClassWriter aTempWriter = null;			
-			aTempReader = new ClassReader(basicClass);
-			aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-			aTempReader.accept(new localClassVisitor(aTempWriter), 0);	
-			
-			if (aTempReader != null && aTempWriter != null) {
-				isValid = true;
-			}
-			else {
-				isValid = false;
-			}
-			reader = aTempReader;
-			writer = aTempWriter;
-			
-			if (reader != null && writer != null) {
-				injectMethod("registerOreDictionaryEntry");
-			}
-			
-		}
-
-		public boolean isValidTransformer() {
-			return isValid;
-		}
-
-		public ClassReader getReader() {
-			return reader;
-		}
-
-		public ClassWriter getWriter() {
-			return writer;
-		}
-
-		public void injectMethod(String aMethodName) {	
-			
-			boolean isObfuscated;
-			try {
-				isObfuscated = Class.forName("net.minecraft.item.ItemStack") != null ? false : true;
-			} catch (ClassNotFoundException e) {
-				isObfuscated = true;
-			}
-			String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack";
-			MethodVisitor mv;		
-			if (aMethodName.equals("registerOreDictionaryEntry")) {
-				FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter Patch", Level.INFO, "Injecting "+aMethodName+" into "+className+". ItemStack: "+aItemStack);
-				mv = getWriter().visitMethod(ACC_PUBLIC + ACC_STATIC, "registerOreDictionaryEntry", "(L"+aItemStack+";Ljava/lang/String;)V", null, null);
-				mv.visitCode();
-				Label l0 = new Label();
-				mv.visitLabel(l0);
-				mv.visitLineNumber(61, l0);
-				mv.visitVarInsn(ALOAD, 0);
-				mv.visitVarInsn(ALOAD, 1);
-				mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter$FixCOFH", "registerOreDictionaryEntry", "(L"+aItemStack+";Ljava/lang/String;)V", false);
-				Label l1 = new Label();
-				mv.visitLabel(l1);
-				mv.visitLineNumber(62, l1);
-				mv.visitInsn(RETURN);
-				Label l2 = new Label();
-				mv.visitLabel(l2);
-				mv.visitLocalVariable("arg", "L"+aItemStack+";", null, l0, l2, 0);
-				mv.visitLocalVariable("arg0", "Ljava/lang/String;", null, l0, l2, 1);
-				mv.visitMaxs(2, 2);
-				mv.visitEnd();			
-			}
-			FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter 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("registerOreDictionaryEntry")) {
-					FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter Patch", Level.INFO, "Removing method "+name);
-					return null;
-				}		
-				MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-				return methodVisitor;
-			}
-		}
-
-	
-	
-	
-	@SuppressWarnings("unchecked")
-	public static class FixCOFH{		
-		
-		private static BiMap<String, Integer> oreIDs;
-		private static TMap<Integer, ArrayList<ItemStack>> oreStacks;
-		private static TMap<ItemWrapper, ArrayList<Integer>> stackIDs;
-		private static TMap<ItemWrapper, ArrayList<String>> stackNames;
-		
-		static {
-			try {
-			oreIDs = (BiMap<String, Integer>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs").get(null);
-			oreStacks = (TMap<Integer, ArrayList<ItemStack>>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreStacks").get(null);
-			stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>) ReflectionUtils.getField(OreDictionaryArbiter.class, "stackIDs").get(null);
-			stackNames = (TMap<ItemWrapper, ArrayList<String>>) ReflectionUtils.getField(OreDictionaryArbiter.class, "stackNames").get(null);
-			}
-			catch (Throwable t) {
-				oreIDs = HashBiMap.create();
-				oreStacks = new THashMap<Integer, ArrayList<ItemStack>>();
-				stackIDs = new THashMap<ItemWrapper, ArrayList<Integer>>();
-				stackNames = new THashMap<ItemWrapper, ArrayList<String>>();
-			}
-		}
-		
-		public static void registerOreDictionaryEntry(ItemStack arg, String arg0) {	
-			try {
-			if (arg == null) {
-				return;
-			}			
-			if (arg.getItem() != null && !Strings.isNullOrEmpty(arg0)) {
-				int arg1 = OreDictionary.getOreID(arg0);
-				oreIDs.put(arg0, Integer.valueOf(arg1));
-				if (!oreStacks.containsKey(Integer.valueOf(arg1))) {
-					oreStacks.put(Integer.valueOf(arg1), new ArrayList<ItemStack>());
-				}
-				((ArrayList<ItemStack>) oreStacks.get(Integer.valueOf(arg1))).add(arg);
-				ItemWrapper arg2 = ItemWrapper.fromItemStack(arg);
-				if (!stackIDs.containsKey(arg2)) {
-					stackIDs.put(arg2, new ArrayList<Integer>());
-					stackNames.put(arg2, new ArrayList<String>());
-				}
-				((ArrayList<Integer>) stackIDs.get(arg2)).add(Integer.valueOf(arg1));
-				((ArrayList<String>) stackNames.get(arg2)).add(arg0);
-			}
-			}
-			catch (Throwable t) {
-				return;
-			}
-		}
-	}
-	
-
-	
-	
+    // The qualified name of the class we plan to transform.
+    private static final String className = "cofh.core.util.oredict.OreDictionaryArbiter";
+    // cofh/core/util/oredict/OreDictionaryArbiter
+
+    private final boolean isValid;
+    private final ClassReader reader;
+    private final ClassWriter writer;
+
+    public ClassTransformer_COFH_OreDictionaryArbiter(byte[] basicClass) {
+        ClassReader aTempReader = null;
+        ClassWriter aTempWriter = null;
+        aTempReader = new ClassReader(basicClass);
+        aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
+        aTempReader.accept(new localClassVisitor(aTempWriter), 0);
+
+        if (aTempReader != null && aTempWriter != null) {
+            isValid = true;
+        } else {
+            isValid = false;
+        }
+        reader = aTempReader;
+        writer = aTempWriter;
+
+        if (reader != null && writer != null) {
+            injectMethod("registerOreDictionaryEntry");
+        }
+    }
+
+    public boolean isValidTransformer() {
+        return isValid;
+    }
+
+    public ClassReader getReader() {
+        return reader;
+    }
+
+    public ClassWriter getWriter() {
+        return writer;
+    }
+
+    public void injectMethod(String aMethodName) {
+
+        boolean isObfuscated;
+        try {
+            isObfuscated = Class.forName("net.minecraft.item.ItemStack") != null ? false : true;
+        } catch (ClassNotFoundException e) {
+            isObfuscated = true;
+        }
+        String aItemStack =
+                isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack";
+        MethodVisitor mv;
+        if (aMethodName.equals("registerOreDictionaryEntry")) {
+            FMLRelaunchLog.log(
+                    "[GT++ ASM] COFH OreDictionaryArbiter Patch",
+                    Level.INFO,
+                    "Injecting " + aMethodName + " into " + className + ". ItemStack: " + aItemStack);
+            mv = getWriter()
+                    .visitMethod(
+                            ACC_PUBLIC + ACC_STATIC,
+                            "registerOreDictionaryEntry",
+                            "(L" + aItemStack + ";Ljava/lang/String;)V",
+                            null,
+                            null);
+            mv.visitCode();
+            Label l0 = new Label();
+            mv.visitLabel(l0);
+            mv.visitLineNumber(61, l0);
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitVarInsn(ALOAD, 1);
+            mv.visitMethodInsn(
+                    INVOKESTATIC,
+                    "gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter$FixCOFH",
+                    "registerOreDictionaryEntry",
+                    "(L" + aItemStack + ";Ljava/lang/String;)V",
+                    false);
+            Label l1 = new Label();
+            mv.visitLabel(l1);
+            mv.visitLineNumber(62, l1);
+            mv.visitInsn(RETURN);
+            Label l2 = new Label();
+            mv.visitLabel(l2);
+            mv.visitLocalVariable("arg", "L" + aItemStack + ";", null, l0, l2, 0);
+            mv.visitLocalVariable("arg0", "Ljava/lang/String;", null, l0, l2, 1);
+            mv.visitMaxs(2, 2);
+            mv.visitEnd();
+        }
+        FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter 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("registerOreDictionaryEntry")) {
+                FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter Patch", Level.INFO, "Removing method " + name);
+                return null;
+            }
+            MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+            return methodVisitor;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static class FixCOFH {
+
+        private static BiMap<String, Integer> oreIDs;
+        private static TMap<Integer, ArrayList<ItemStack>> oreStacks;
+        private static TMap<ItemWrapper, ArrayList<Integer>> stackIDs;
+        private static TMap<ItemWrapper, ArrayList<String>> stackNames;
+
+        static {
+            try {
+                oreIDs = (BiMap<String, Integer>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs")
+                        .get(null);
+                oreStacks = (TMap<Integer, ArrayList<ItemStack>>)
+                        ReflectionUtils.getField(OreDictionaryArbiter.class, "oreStacks")
+                                .get(null);
+                stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>)
+                        ReflectionUtils.getField(OreDictionaryArbiter.class, "stackIDs")
+                                .get(null);
+                stackNames = (TMap<ItemWrapper, ArrayList<String>>)
+                        ReflectionUtils.getField(OreDictionaryArbiter.class, "stackNames")
+                                .get(null);
+            } catch (Throwable t) {
+                oreIDs = HashBiMap.create();
+                oreStacks = new THashMap<Integer, ArrayList<ItemStack>>();
+                stackIDs = new THashMap<ItemWrapper, ArrayList<Integer>>();
+                stackNames = new THashMap<ItemWrapper, ArrayList<String>>();
+            }
+        }
+
+        public static void registerOreDictionaryEntry(ItemStack arg, String arg0) {
+            try {
+                if (arg == null) {
+                    return;
+                }
+                if (arg.getItem() != null && !Strings.isNullOrEmpty(arg0)) {
+                    int arg1 = OreDictionary.getOreID(arg0);
+                    oreIDs.put(arg0, Integer.valueOf(arg1));
+                    if (!oreStacks.containsKey(Integer.valueOf(arg1))) {
+                        oreStacks.put(Integer.valueOf(arg1), new ArrayList<ItemStack>());
+                    }
+                    ((ArrayList<ItemStack>) oreStacks.get(Integer.valueOf(arg1))).add(arg);
+                    ItemWrapper arg2 = ItemWrapper.fromItemStack(arg);
+                    if (!stackIDs.containsKey(arg2)) {
+                        stackIDs.put(arg2, new ArrayList<Integer>());
+                        stackNames.put(arg2, new ArrayList<String>());
+                    }
+                    ((ArrayList<Integer>) stackIDs.get(arg2)).add(Integer.valueOf(arg1));
+                    ((ArrayList<String>) stackNames.get(arg2)).add(arg0);
+                }
+            } catch (Throwable t) {
+                return;
+            }
+        }
+    }
 }
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java
index 19648ae60c..cfb4663734 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java
@@ -2,7 +2,8 @@ package gtPlusPlus.preloader.asm.transformers;
 
 import static org.objectweb.asm.Opcodes.*;
 
-import java.io.IOException;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.DevHelper;
 import org.apache.logging.log4j.Level;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -10,675 +11,1035 @@ 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_Forge_ChunkLoading {	
-
-	//The qualified name of the class we plan to transform.
-	private static final String className = "net.minecraftforge.common.ForgeChunkManager"; 
-	//net/minecraftforge/common/ForgeChunkManager
-	
-	private final boolean isValid;
-	private final ClassReader reader;
-	private final ClassWriter writer;	
-
-	String aChunkCoordIntPair;
-	String aItemStack;
-	String aWorld;
-	String aEntity;
+public class ClassTransformer_Forge_ChunkLoading {
 
-	private static boolean doesMethodAlreadyExist = false;
+    // The qualified name of the class we plan to transform.
+    private static final String className = "net.minecraftforge.common.ForgeChunkManager";
+    // net/minecraftforge/common/ForgeChunkManager
 
-	public ClassTransformer_Forge_ChunkLoading(byte[] basicClass, boolean obfuscated) {
-		
-		ClassReader aTempReader = null;
-		ClassWriter aTempWriter = null;
-		
-		aTempReader = new ClassReader(basicClass);
-		aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-		aTempReader.accept(new localClassVisitor(aTempWriter), 0);	
-		
-		if (aTempReader != null && aTempWriter != null) {
-			isValid = true;
-		}
-		else {
-			isValid = false;
-		}
-		reader = aTempReader;
-		writer = aTempWriter;
+    private final boolean isValid;
+    private final ClassReader reader;
+    private final ClassWriter writer;