Update Mixin version and make ctor redirectors compatible with new ver

Mumfrey
1 parent 62eaf16e
Showing 4 changed files with 22 additions and 19 deletions
build.gradle
src/client/java/com/mumfrey/liteloader/client/gui/startup/LoadingBar.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinSession.java
src/client/java/com/mumfrey/liteloader/client/transformers/MinecraftTransformer.java
@@ -72,7 +72,7 @@ repositories {
 }
 dependencies {
-    compile('org.spongepowered:mixin:0.6.1-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.6.4-SNAPSHOT') {
         exclude module: 'asm-commons'
         exclude module: 'asm-tree'
         exclude module: 'launchwrapper'
@@ -42,13 +42,14 @@ public class LoadingBar extends LoadingProgress
 {
     private static LoadingBar instance;
+    private static final int MAX_MINECRAFT_PROGRESS = 90;
+    private static final int LITELOADER_PROGRESS_SCALE = 2;
+
     private static final String LOADING_MESSAGE_1 = "Starting Game...";
     private static final String LOADING_MESSAGE_2 = "Initialising...";
     private int minecraftProgress = 0;
-    private int totalMinecraftProgress = 606;
-
-    private int liteLoaderProgressScale = 3;
+    private int totalMinecraftProgress = LoadingBar.MAX_MINECRAFT_PROGRESS;
     private int liteLoaderProgress = 0;
     private int totalLiteLoaderProgress = 0;
@@ -129,7 +130,7 @@ public class LoadingBar extends LoadingProgress
     @Override
     protected void _incLiteLoaderProgress()
     {
-        this.liteLoaderProgress += this.liteLoaderProgressScale;
+        this.liteLoaderProgress += LoadingBar.LITELOADER_PROGRESS_SCALE;
         this.render();
     }
@@ -144,14 +145,14 @@ public class LoadingBar extends LoadingProgress
     protected void _incLiteLoaderProgress(String message)
     {
         this.message = message;
-        this.liteLoaderProgress += this.liteLoaderProgressScale ;
+        this.liteLoaderProgress += LoadingBar.LITELOADER_PROGRESS_SCALE ;
         this.render();
     }
     @Override
     protected void _incTotalLiteLoaderProgress(int by)
     {
-        this.totalLiteLoaderProgress += (by * this.liteLoaderProgressScale);
+        this.totalLiteLoaderProgress += (by * LoadingBar.LITELOADER_PROGRESS_SCALE);
         this.render();
     }
@@ -198,7 +199,7 @@ public class LoadingBar extends LoadingProgress
     {
         if (this.totalMinecraftProgress == -1)
         {
-            this.totalMinecraftProgress = 606 - this.minecraftProgress;
+            this.totalMinecraftProgress = LoadingBar.MAX_MINECRAFT_PROGRESS - this.minecraftProgress;
             this.minecraftProgress = 0;
         }
@@ -23,8 +23,9 @@ public abstract class MixinSession
     @Inject(method = "getProfile()Lcom/mojang/authlib/GameProfile;", cancellable = true, at = @At(
         value = "NEW",
-        args = "class=com/mojang/authlib/GameProfile",
-        ordinal = 1
+        target = "com/mojang/authlib/GameProfile",
+        ordinal = 1,
+        remap = false
     ))
     private void generateGameProfile(CallbackInfoReturnable<GameProfile> ci)
     {
@@ -48,12 +48,18 @@ public class MinecraftTransformer extends ClassTransformer
     {
         InsnList insns = new InsnList(); 
+        boolean loadingBarEnabled = LiteLoaderTweaker.loadingBarEnabled();
         boolean found = false;
         Iterator<AbstractInsnNode> iter = method.instructions.iterator();
         while (iter.hasNext())
         {
             AbstractInsnNode insn = iter.next();
+            if (loadingBarEnabled && insn instanceof MethodInsnNode)
+            {
+                insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "incrementProgress", "()V", false));
+            }
+            
             insns.add(insn);
             if (insn instanceof TypeInsnNode && insn.getOpcode() == Opcodes.NEW && insns.getLast() != null)
@@ -69,18 +75,13 @@ public class MinecraftTransformer extends ClassTransformer
                 }
             }
-            if (LiteLoaderTweaker.loadingBarEnabled())
+            if (loadingBarEnabled && insn instanceof LdcInsnNode)
             {
-                if (insn instanceof LdcInsnNode)
+                LdcInsnNode ldcInsn = (LdcInsnNode)insn;
+                if ("textures/blocks".equals(ldcInsn.cst))
                 {
-                    LdcInsnNode ldcInsn = (LdcInsnNode)insn;
-                    if ("textures/blocks".equals(ldcInsn.cst))
-                    {
-                        insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "initTextures", "()V", false));
-                    }
+                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "initTextures", "()V", false));
                 }
-
-                insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "incrementProgress", "()V", false));
             }
         }