update class transform. fix blocking defineclass from overwriting data

Author: wagyourtail

build.gradle.kts

@@ -3,21 +3,19 @@ import java.net.URI
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "9.1.0"
+    id("xyz.wagyourtail.commons-gradle") version "1.0.5-SNAPSHOT"
 }
 
 version = if (project.hasProperty("version_snapshot")) project.properties["version"] as String + "-SNAPSHOT" else project.properties["version"] as String
 group = project.properties["maven_group"] as String
 
+commons.autoToolchain(8, 17)
+
 base {
     archivesName.set(project.properties["archives_base_name"] as String)
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 repositories {
     mavenCentral()
     maven("https://maven.quiltmc.org/repository/release")
@@ -26,20 +24,24 @@ repositories {
 dependencies {
 
     // class transform
-    implementation("net.lenni0451.classtransform:core:1.12.1")
+    implementation("net.lenni0451.classtransform:core:1.14.1")
 
     // qup
     implementation("org.quiltmc.qup:json:0.2.0") {
         isTransitive = false
     }
-}
 
-tasks.compileJava {
-    options.encoding = "UTF-8"
+    testImplementation("org.ow2.asm:asm:9.2")
+    testImplementation("org.ow2.asm:asm-commons:9.2")
+    testImplementation("org.ow2.asm:asm-tree:9.2")
 
-    if (JavaVersion.current().isJava9Compatible) {
-        options.release.set(8)
-    }
+    testImplementation("net.lenni0451:Reflect:1.5.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+}
+
+tasks.test {
+    useJUnitPlatform()
 }
 
 tasks.jar {

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1G
-version=0.1.4
+version=0.1.5
 maven_group=xyz.wagyourtail.unimined
 archives_base_name=jarmod-agent

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1 +1,9 @@
+pluginManagement {
+    repositories {
+        maven("https://maven.wagyourtail.xyz/snapshots")
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = "jarmod-agent"

src/main/java/xyz/wagyourtail/unimined/jarmodagent/JarModder.java

@@ -258,8 +258,9 @@ public byte[] patch(String className, Supplier<URL> base, Map<String, URL> prior
             debug("Found class with runtime patches: \"" + className + "\"");
             return patch(className, base.get());
         }
-        return readAllBytes(base.get().openStream());
 
+        // no transform necessary
+        return null;
     }
 
     private String bytesToHex(byte[] hash) {

src/main/java/xyz/wagyourtail/unimined/jarmodagent/Test.java

@@ -0,0 +1,13 @@
+package xyz.wagyourtail.unimined.jarmodagent;
+
+public class Test {
+
+    public class Inner {
+
+    }
+
+    public static void main(String[] args) {
+        Test t = null;
+        t.new Inner() {};
+    }
+}

src/test/java/xyz/wagyourtail/unimined/test/JMATest.java

@@ -0,0 +1,51 @@
+package xyz.wagyourtail.unimined.test;
+
+import net.lenni0451.reflect.Agents;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.ClassNode;
+import xyz.wagyourtail.unimined.jarmodagent.JarModAgent;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class JMATest {
+
+    @BeforeAll
+    public static void loadAgent() throws IOException {
+        Agents.loadInternal(JarModAgent.class);
+    }
+
+    @Test
+    public void test() throws IllegalAccessException {
+
+        // transformed
+        ClassNode transformed = new ClassNode();
+        transformed.visit(52, 1, "xyz/wagyourtail/unimined/test/TestClass", null, "java/lang/Object", null);
+
+        MethodVisitor md = transformed.visitMethod(Opcodes.ACC_STATIC | Opcodes.ACC_PUBLIC, "test", "()Ljava/lang/String;", null, null);
+        md.visitCode();
+        md.visitLdcInsn("transformed");
+        md.visitInsn(Opcodes.ARETURN);
+        md.visitMaxs(0, 0);
+        md.visitEnd();
+
+        transformed.visitEnd();
+
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+        transformed.accept(cw);
+
+        byte[] classBytes = cw.toByteArray();
+
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        lookup.defineClass(classBytes);
+
+        assertEquals("transformed", TestClass.test());
+    }
+
+}

src/test/java/xyz/wagyourtail/unimined/test/TestClass.java

@@ -0,0 +1,9 @@
+package xyz.wagyourtail.unimined.test;
+
+public class TestClass {
+
+    public static String test() {
+        return "untransformed";
+    }
+
+}