diff --git a/pom.xml b/pom.xml index 7c70e2a..4fbafb6 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ com.ja-netfilter ja-netfilter - 2.0.1 + 2025.3.0 provided diff --git a/src/main/java/com/novitechie/ClassLoaderTransformer.java b/src/main/java/com/novitechie/ClassLoaderTransformer.java index 8646f20..008290f 100644 --- a/src/main/java/com/novitechie/ClassLoaderTransformer.java +++ b/src/main/java/com/novitechie/ClassLoaderTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick @@ -23,7 +23,7 @@ public class ClassLoaderTransformer implements MyTransformer { ClassNode node = new ClassNode(ASM5); reader.accept(node, 0); for (MethodNode m : node.methods) { - if ("loadClass".equals(m.name)) { + if ("loadClass".equals(m.name) && m.desc.equals("(Ljava/lang/String;)Ljava/lang/Class;")) { InsnList list = new InsnList(); LabelNode L0 = new LabelNode(); list.add(new MethodInsnNode(INVOKESTATIC, "com/novitechie/rules/StackTraceRule", "check", "()Z", false)); diff --git a/src/main/java/com/novitechie/ClassTransformer.java b/src/main/java/com/novitechie/ClassTransformer.java index 731ee8a..1f4309a 100644 --- a/src/main/java/com/novitechie/ClassTransformer.java +++ b/src/main/java/com/novitechie/ClassTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick diff --git a/src/main/java/com/novitechie/CollectionsTransformer.java b/src/main/java/com/novitechie/CollectionsTransformer.java index 5280079..1057867 100644 --- a/src/main/java/com/novitechie/CollectionsTransformer.java +++ b/src/main/java/com/novitechie/CollectionsTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick @@ -23,7 +23,7 @@ public class CollectionsTransformer implements MyTransformer { ClassNode node = new ClassNode(ASM5); reader.accept(node, 0); for (MethodNode m : node.methods) { - if ("shuffle".equals(m.name)) { + if ("shuffle".equals(m.name) && m.desc.equals("(Ljava/util/List;)V")) { InsnList list = new InsnList(); LabelNode L0 = new LabelNode(); list.add(new MethodInsnNode(INVOKESTATIC, "com/novitechie/rules/StackTraceRule", "check", "()Z", false)); diff --git a/src/main/java/com/novitechie/LicensingFacadeTransformer.java b/src/main/java/com/novitechie/LicensingFacadeTransformer.java index b846929..a0a36ce 100644 --- a/src/main/java/com/novitechie/LicensingFacadeTransformer.java +++ b/src/main/java/com/novitechie/LicensingFacadeTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; public class LicensingFacadeTransformer implements MyTransformer { @Override diff --git a/src/main/java/com/novitechie/MethodTransformer.java b/src/main/java/com/novitechie/MethodTransformer.java index 94ad6e9..8239750 100644 --- a/src/main/java/com/novitechie/MethodTransformer.java +++ b/src/main/java/com/novitechie/MethodTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick diff --git a/src/main/java/com/novitechie/PluginClassLoaderTransformer.java b/src/main/java/com/novitechie/PluginClassLoaderTransformer.java index 4998ee5..30ee738 100644 --- a/src/main/java/com/novitechie/PluginClassLoaderTransformer.java +++ b/src/main/java/com/novitechie/PluginClassLoaderTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; public class PluginClassLoaderTransformer implements MyTransformer { @Override diff --git a/src/main/java/com/novitechie/PluginManagerCoreTransformer.java b/src/main/java/com/novitechie/PluginManagerCoreTransformer.java index e6bdb93..9809c32 100644 --- a/src/main/java/com/novitechie/PluginManagerCoreTransformer.java +++ b/src/main/java/com/novitechie/PluginManagerCoreTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick diff --git a/src/main/java/com/novitechie/RuntimeMXBeanTransformer.java b/src/main/java/com/novitechie/RuntimeMXBeanTransformer.java index 69dc722..efbe2a5 100644 --- a/src/main/java/com/novitechie/RuntimeMXBeanTransformer.java +++ b/src/main/java/com/novitechie/RuntimeMXBeanTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick diff --git a/src/main/java/com/novitechie/SafeClassWriter.java b/src/main/java/com/novitechie/SafeClassWriter.java index 4e6e89d..374972e 100644 --- a/src/main/java/com/novitechie/SafeClassWriter.java +++ b/src/main/java/com/novitechie/SafeClassWriter.java @@ -29,9 +29,9 @@ package com.novitechie; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/novitechie/SystemTransformer.java b/src/main/java/com/novitechie/SystemTransformer.java index 594e0d5..66e3bf7 100644 --- a/src/main/java/com/novitechie/SystemTransformer.java +++ b/src/main/java/com/novitechie/SystemTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * @author YeloChick diff --git a/src/main/java/com/novitechie/VMOptionsTransformer.java b/src/main/java/com/novitechie/VMOptionsTransformer.java index f31cb6c..6f1daae 100644 --- a/src/main/java/com/novitechie/VMOptionsTransformer.java +++ b/src/main/java/com/novitechie/VMOptionsTransformer.java @@ -1,11 +1,11 @@ package com.novitechie; import com.janetfilter.core.plugin.MyTransformer; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; public class VMOptionsTransformer implements MyTransformer { @Override