Fixed ASM frame calculations; fixing forEach removal

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.9.1+build.205
 
 # Mod Properties
-	mod_version = 0.0.2
+	mod_version = 0.0.3
 	maven_group = net.gudenau.minecraft
 	archives_base_name = gud_fps
 

src/main/java/net/gudenau/minecraft/fps/GudFPS.java

@@ -47,6 +47,7 @@ public void onInitialize(){
             }catch(IOException | URISyntaxException ignored){
                 System.err.println("Failed to force load classes");
             }
+            System.exit(0);
         }
     }
 
@@ -135,7 +136,7 @@ private static Config loadConfig(){
     }
 
     public static final class Config{
-        public final Option<Boolean> removeForEach = new BooleanOption("removeForEach", false);
+        public final Option<Boolean> removeForEach = new BooleanOption("removeForEach", true);
         public final Option<Boolean> removeBlockPos = new BooleanOption("removeBlockPos", true);
         public final Option<Boolean> precomputeConstants = new BooleanOption("precomputeConstants", true);
         public final Option<Boolean> optimizeMath = new BooleanOption("optimizeMath", true);

src/main/java/net/gudenau/minecraft/fps/mixin/Plugin.java

@@ -56,6 +56,7 @@ public class Plugin implements IMixinConfigPlugin{
         }
 
         ClassLoader classLoader = Plugin.class.getClassLoader();
+        Transformers.setClassLoader(classLoader);
 
         try{
             // Get all of the non-public classes

src/main/java/net/gudenau/minecraft/fps/transformer/ForEachRemover.java

@@ -1,6 +1,7 @@
 package net.gudenau.minecraft.fps.transformer;
 
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;

src/main/java/net/gudenau/minecraft/fps/transformer/Transformers.java

@@ -30,6 +30,7 @@ public class Transformers{
     private static final boolean verifyClasses = GudFPS.CONFIG.verify.get();
     private static final Stats transformerStats = Stats.getStats("Transformer");
     private static final Stats dumperStats = Stats.getStats("Dump");
+    private static ClassLoader classLoader;
 
     static {
         GudFPS.Config config = GudFPS.CONFIG;
@@ -100,7 +101,12 @@ private static byte[] doTransform(String name, String transformedName, byte[] ba
             transformerStats.incrementStat(transformer.getClass().getSimpleName());
         }
 
-        ClassWriter classWriter = new ClassWriter(flags.getFlags());
+        ClassWriter classWriter = new ClassWriter(flags.getFlags()){
+            @Override
+            protected ClassLoader getClassLoader(){
+                return classLoader;
+            }
+        };
         classNode.accept(classWriter);
         byte[] newClass = classWriter.toByteArray();
         if(dumpClasses){
@@ -160,4 +166,8 @@ private static void dumpClass(ClassNode node, byte[] bytecode){
             }
         });
     }
+
+    public static void setClassLoader(ClassLoader classLoader){
+        Transformers.classLoader = classLoader;
+    }
 }