Remove MinecraftTransformer and replace with mixin injections

Mumfrey
1 parent 82c837c7
Showing 4 changed files with 21 additions and 96 deletions
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
src/client/java/com/mumfrey/liteloader/client/transformers/MinecraftTransformer.java
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
@@ -42,7 +42,6 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
     private static final String[] requiredDownstreamTransformers = {
             LiteLoaderCoreAPI.PKG_LITELOADER_COMMON + ".transformers.LiteLoaderPacketTransformer",
-            LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.MinecraftTransformer",
             LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.json.ModEventInjectionTransformer"
     };
@@ -19,7 +19,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
 import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.ducks.IFramebuffer;
+import com.mumfrey.liteloader.client.gui.startup.LoadingBar;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
+import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -45,6 +47,25 @@ public abstract class MixinMinecraft implements IMinecraft
     private LiteLoaderEventBrokerClient broker;
+    @Inject(method = "init()V", at = @At(value = "NEW", target = "net/minecraft/client/renderer/EntityRenderer"))
+    private void init(CallbackInfo ci)
+    {
+        LiteLoaderTweaker.init();
+        LiteLoaderTweaker.postInit();
+    }
+    
+    @Inject(method = "init()V", at = @At(value = "NEW", target = "net/minecraft/client/renderer/texture/TextureMap"))
+    private void initTextures(CallbackInfo ci)
+    {
+        LoadingBar.initTextures();
+    }
+    
+    @Inject(method = "init()V", at = @At("INVOKE"))
+    private void progress(CallbackInfo ci)
+    {
+        LoadingBar.incrementProgress();
+    }
+    
     @Inject(method = "init()V", at = @At("RETURN"))
     private void onStartupComplete(CallbackInfo ci)
     {
-/*
- * This file is part of LiteLoader.
- * Copyright (C) 2012-16 Adam Mummery-Smith
- * All Rights Reserved.
- */
-package com.mumfrey.liteloader.client.transformers;
-
-import java.util.Iterator;
-
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.LdcInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.TypeInsnNode;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
-import com.mumfrey.liteloader.transformers.ClassTransformer;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
-public class MinecraftTransformer extends ClassTransformer
-{
-    private static final String TWEAKCLASS = LiteLoaderTweaker.class.getName().replace('.', '/');
-    
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass)
-    {
-        if ((Obf.Minecraft.name.equals(transformedName) || Obf.Minecraft.obf.equals(transformedName)))
-        {
-            ClassNode classNode = this.readClass(basicClass, true);
-            for (MethodNode method : classNode.methods)
-            {
-                if (Obf.startGame.obf.equals(method.name) || Obf.startGame.srg.equals(method.name) || Obf.startGame.name.equals(method.name))
-                {
-                    this.transformStartGame(method);
-                }
-            }
-            return this.writeClass(classNode);
-        }
-        return basicClass;
-    }
-
-
-    private void transformStartGame(MethodNode method)
-    {
-        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)
-            {
-                TypeInsnNode typeNode = (TypeInsnNode)insn;
-                if (!found && (Obf.EntityRenderer.obf.equals(typeNode.desc) || Obf.EntityRenderer.ref.equals(typeNode.desc)))
-                {
-                    LiteLoaderLogger.info("MinecraftTransformer found INIT injection point, this is good.");
-                    found = true;
-
-                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftTransformer.TWEAKCLASS, Obf.init.name, "()V", false));
-                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftTransformer.TWEAKCLASS, Obf.postInit.name, "()V", false));
-                }
-            }
-
-            if (loadingBarEnabled && insn instanceof LdcInsnNode)
-            {
-                LdcInsnNode ldcInsn = (LdcInsnNode)insn;
-                if ("textures/blocks".equals(ldcInsn.cst))
-                {
-                    insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "initTextures", "()V", false));
-                }
-            }
-        }
-
-        method.instructions = insns;
-
-        if (!found) LiteLoaderLogger.severe("MinecraftTransformer failed to find INIT injection point, the game will probably crash pretty soon.");
-    }
-}
@@ -26,14 +26,11 @@ public class Obf
     public static final Obf    BakedProfilingHandlerList = new Obf("com.mumfrey.liteloader.core.event.ProfilingHandlerList$BakedList"  );
     public static final Obf                 PacketEvents = new Obf("com.mumfrey.liteloader.core.PacketEvents"                          );
     public static final Obf           PacketEventsClient = new Obf("com.mumfrey.liteloader.client.PacketEventsClient"                  );
-    public static final Obf                   LoadingBar = new Obf("com.mumfrey.liteloader.client.gui.startup.LoadingBar"              );
     public static final Obf                  GameProfile = new Obf("com.mojang.authlib.GameProfile"                                    );
     public static final Obf                MinecraftMain = new Obf("net.minecraft.client.main.Main"                                    );
     public static final Obf              MinecraftServer = new Obf("net.minecraft.server.MinecraftServer"                              );
     public static final Obf                         GL11 = new Obf("org.lwjgl.opengl.GL11"                                             );
     public static final Obf             RealmsMainScreen = new Obf("com.mojang.realmsclient.RealmsMainScreen"                          );
-    public static final Obf                         init = new Obf("init"                                                              );
-    public static final Obf                     postInit = new Obf("postInit"                                                          );
     public static final Obf                  constructor = new Obf("<init>"                                                            );
     // CHECKSTYLE:OFF