Merge remote-tracking branch 'danyadev/optimize-transforming'

Author: FalsePattern

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.falsepattern.fpgradle-mc") version ("2.1.0")
+    id("com.falsepattern.fpgradle-mc") version ("4.0.2")
 }
 
 group = "com.falsepattern"
@@ -64,7 +64,7 @@ repositories {
 
 dependencies {
     // region Our deps
-    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.9.0")
+    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.12.0")
     compileOnly("it.unimi.dsi:fastutil:8.5.16")
     implementationSplit("com.falsepattern:chunkapi-mc1.7.10:0.8.0")
     // endregion

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -43,7 +43,7 @@
      name = Tags.MODNAME,
      acceptedMinecraftVersions = "[1.7.10]",
      dependencies = "required-after:chunkapi@[0.8.0,);" +
-                    "required-after:falsepatternlib@[1.9.0,);" +
+                    "required-after:falsepatternlib@[1.12.0,);" +
                     "after:antiidconflict")
 public class EndlessIDs {
     public static final byte[] ZERO_LENGTH_BIOME_ARRAY_PLACEHOLDER = new byte[0];

gradlew

@@ -25,6 +25,7 @@
 import com.falsepattern.endlessids.Tags;
 import com.falsepattern.endlessids.asm.EndlessIDsCore;
 import com.falsepattern.endlessids.asm.EndlessIDsTransformer;
+import com.falsepattern.lib.turboasm.BytePatternMatcher;
 import com.falsepattern.lib.turboasm.ClassNodeHandle;
 import com.falsepattern.lib.turboasm.TurboClassTransformer;
 import lombok.Data;
@@ -181,6 +182,9 @@ public class ChunkProviderSuperPatcher implements TurboClassTransformer {
     private static State<AbstractInsnNode> STATE17 = null;
     private static State<AbstractInsnNode> STATE_FINAL = null;
 
+    private static final BytePatternMatcher chunkClassMatcher;
+    private static final BytePatternMatcher getBiomeArrayMethodMatcher;
+
     static {
         if (EndlessIDsCore.deobfuscated) {
             CLASS_BiomeGenBase = new String[]{"net/minecraft/world/biome/BiomeGenBase"};
@@ -197,6 +201,9 @@ public class ChunkProviderSuperPatcher implements TurboClassTransformer {
             FIELD_biomeID = new String[]{"ay", "field_76756_M"};
             METHOD_getBiomeArray = new String[]{"m", "func_76605_m"};
         }
+
+        chunkClassMatcher = new BytePatternMatcher(CLASS_Chunk, BytePatternMatcher.Mode.Equals);
+        getBiomeArrayMethodMatcher = new BytePatternMatcher(METHOD_getBiomeArray, BytePatternMatcher.Mode.Equals);
     }
 
     static {
@@ -347,35 +354,6 @@ public class ChunkProviderSuperPatcher implements TurboClassTransformer {
         });
     }
 
-    private static boolean scanForBrokenCall(MethodNode method) {
-        val instructions = method.instructions;
-        val insnCount = instructions.size();
-        for (int i = 0; i < insnCount; i++) {
-            val insn = instructions.get(i);
-            if (insn.getOpcode() != Opcodes.INVOKEVIRTUAL) {
-                continue;
-            }
-            val invoke = (MethodInsnNode) insn;
-
-            if (anyMatch(invoke.owner, CLASS_Chunk) && anyMatch(invoke.name, METHOD_getBiomeArray) &&
-                invoke.desc.equals("()[B")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean anyMatch(List<String> str, String[] candidates) {
-        for (val s : str) {
-            for (val candidate : candidates) {
-                if (s.equals(candidate)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     private static boolean anyMatch(String str, String[] candidates) {
         for (val candidate : candidates) {
             if (str.equals(candidate)) {
@@ -456,17 +434,16 @@ public String name() {
 
     @Override
     public boolean shouldTransformClass(@NotNull String className, @NotNull ClassNodeHandle classNode) {
-        if ("net.minecraft.world.chunk.storage.AnvilChunkLoader".equals(className))
+        if ("net.minecraft.world.chunk.storage.AnvilChunkLoader".equals(className)) {
             return false;
-        val cn = classNode.getNode();
-        if (cn == null)
+        }
+
+        val metadata = classNode.getOriginalMetadata();
+        if (metadata == null) {
             return false;
-        for (MethodNode method : cn.methods) {
-            if (scanForBrokenCall(method)) {
-                return true;
-            }
         }
-        return false;
+
+        return metadata.matchesBytes(chunkClassMatcher) && metadata.matchesBytes(getBiomeArrayMethodMatcher);
     }
 
     @Override
@@ -664,4 +641,4 @@ public void updateLocalsState(FrameNode frame) {
             }
         }
     }
-}
+}