Workarounds for 1.16.4 and for mojmaps

Author: Niko-sk2x

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'java'
 
-version = "2.2"
+version = "2.3"
 group = "ofdev" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "aa_do_not_rename_OptiFineDevTweaker"
 

src/main/java/ofdev/modlauncher/OFDevTransformationService.java

@@ -132,8 +132,13 @@ private static Path findObfMcJar(IEnvironment env) {
 
                     Class<?> newClass = makeNewOptiFineTransformer(oldTransformer.getClass().getClassLoader());
                     Constructor<?> constr = newClass.getConstructor(ZipFile.class);
-                    Object newTransformer = constr.newInstance(ofZipFile);
-
+                    Object newTransformer;
+                    try {
+                        newTransformer = constr.newInstance(ofZipFile);
+                    } catch (InvocationTargetException e) {
+                        constr = newClass.getConstructor(ZipFile.class, IEnvironment.class);
+                        newTransformer = constr.newInstance(ofZipFile, envIn);
+                    }
                     transformerField.set(null, newTransformer);
 
                     LOGGER.info("Finding OptiFine AccessFixer");
@@ -236,6 +241,28 @@ public Test(ZipFile ofZipFile) {
 
         cw.visitSource("OFDevTransformationService.java", null);
 
+        {
+            mv = cw.visitMethod(ACC_PUBLIC, "<init>", "(Ljava/util/zip/ZipFile;Lcpw/mods/modlauncher/api/IEnvironment;)V", null, null);
+            mv.visitCode();
+            Label l0 = new Label();
+            mv.visitLabel(l0);
+            mv.visitLineNumber(10, l0);
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitVarInsn(ALOAD, 1);
+            mv.visitVarInsn(ALOAD, 2);
+            mv.visitMethodInsn(INVOKESPECIAL, "optifine/OptiFineTransformer", "<init>", "(Ljava/util/zip/ZipFile;Lcpw/mods/modlauncher/api/IEnvironment;)V", false);
+            Label l1 = new Label();
+            mv.visitLabel(l1);
+            mv.visitLineNumber(11, l1);
+            mv.visitInsn(RETURN);
+            Label l2 = new Label();
+            mv.visitLabel(l2);
+            mv.visitLocalVariable("this", "L" + name + ";", null, l0, l2, 0);
+            mv.visitLocalVariable("ofZipFile", "Ljava/util/zip/ZipFile;", null, l0, l2, 1);
+            mv.visitLocalVariable("env", "Lcpw/mods/modlauncher/api/IEnvironment;", null, l0, l2, 2);
+            mv.visitMaxs(3, 3);
+            mv.visitEnd();
+        }
         {
             mv = cw.visitMethod(ACC_PUBLIC, "<init>", "(Ljava/util/zip/ZipFile;)V", null, null);
             mv.visitCode();

src/main/java/ofdev/modlauncher/OfDevRemapper.java

@@ -14,6 +14,12 @@ public class OfDevRemapper extends Remapper {
     }
 
     @Override public String mapMethodName(final String owner, final String name, final String descriptor) {
+        if (owner.equals("net/minecraft/client/world/ClientWorld") && name.equals("onEntityRemoved")) {
+            return "onEntityRemoved_OF";
+        }
+        if (owner.equals("net/minecraft/client/renderer/model/BakedQuad") && name.equals("getSprite")) {
+            return "getSprite_OF";
+        }
         return srg2mcp.apply(INameMappingService.Domain.METHOD, name);
     }