Move everything from rewriter except for reflection rules to asm-utils

PaperMC · Feb 12, 2024 · d32c598 · d32c598
1 parent eca8506
commit d32c598
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 21 deletions.
diff --git a/...ermc/reflectionrewriter/DefaultRules.java → ...ctionrewriter/BuiltInReflectionRules.java b/...ermc/reflectionrewriter/DefaultRules.java → ...ctionrewriter/BuiltInReflectionRules.java
@@ -1,17 +1,20 @@
 package io.papermc.reflectionrewriter;
 
+import io.papermc.asmutils.InvokeStaticRewrite;
+import io.papermc.asmutils.MethodMatcher;
+import io.papermc.asmutils.RewriteRule;
 import java.util.List;
 import java.util.Set;
 
-public final class DefaultRules {
+public final class BuiltInReflectionRules {
     private final String proxy;
     private final RewriteRule classRule;
     private final RewriteRule methodHandlesLookupRule;
     private final RewriteRule lambdaMetafactoryRule;
     private final RewriteRule constantBootstrapsRule;
     private final RewriteRule methodTypeRule;
 
-    public DefaultRules(final String proxyClassName) {
+    public BuiltInReflectionRules(final String proxyClassName) {
         this.proxy = proxyClassName;
         this.classRule = this.createClassRule();
         this.methodHandlesLookupRule = this.createMethodHandlesLookupRule();

diff --git a/...ection-rewriter/rewriter/src/main/java/io/papermc/reflectionrewriter/DefineClassRule.java b/...ection-rewriter/rewriter/src/main/java/io/papermc/reflectionrewriter/DefineClassRule.java
@@ -1,5 +1,10 @@
 package io.papermc.reflectionrewriter;
 
+import io.papermc.asmutils.ClassInfo;
+import io.papermc.asmutils.ClassInfoProvider;
+import io.papermc.asmutils.ClassProcessingContext;
+import io.papermc.asmutils.InvokeStaticRewrite;
+import io.papermc.asmutils.RewriteRule;
 import java.util.Set;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/reflection-rewriter/rewriter/src/main/java/io/papermc/reflectionrewriter/EnumRule.java b/reflection-rewriter/rewriter/src/main/java/io/papermc/reflectionrewriter/EnumRule.java
@@ -1,5 +1,9 @@
 package io.papermc.reflectionrewriter;
 
+import io.papermc.asmutils.ClassInfo;
+import io.papermc.asmutils.ClassInfoProvider;
+import io.papermc.asmutils.InvokeStaticRewrite;
+import io.papermc.asmutils.RewriteRule;
 import java.util.function.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.objectweb.asm.MethodVisitor;

diff --git a/.../reflectionrewriter/BasicRewriteRule.java → ...io/papermc/asmutils/BasicRewriteRule.java b/.../reflectionrewriter/BasicRewriteRule.java → ...io/papermc/asmutils/BasicRewriteRule.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;

diff --git a/...papermc/reflectionrewriter/ClassInfo.java → ...n/java/io/papermc/asmutils/ClassInfo.java b/...papermc/reflectionrewriter/ClassInfo.java → ...n/java/io/papermc/asmutils/ClassInfo.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/...rmc/reflectionrewriter/ClassInfoImpl.java → ...va/io/papermc/asmutils/ClassInfoImpl.java b/...rmc/reflectionrewriter/ClassInfoImpl.java → ...va/io/papermc/asmutils/ClassInfoImpl.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/...reflectionrewriter/ClassInfoProvider.java → ...o/papermc/asmutils/ClassInfoProvider.java b/...reflectionrewriter/ClassInfoProvider.java → ...o/papermc/asmutils/ClassInfoProvider.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;

diff --git a/...ctionrewriter/ClassProcessingContext.java → ...ermc/asmutils/ClassProcessingContext.java b/...ctionrewriter/ClassProcessingContext.java → ...ermc/asmutils/ClassProcessingContext.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/...flectionrewriter/InvokeStaticRewrite.java → ...papermc/asmutils/InvokeStaticRewrite.java b/...flectionrewriter/InvokeStaticRewrite.java → ...papermc/asmutils/InvokeStaticRewrite.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -9,7 +9,7 @@
 
 @DefaultQualifier(NonNull.class)
 @FunctionalInterface
-interface InvokeStaticRewrite extends MethodVisitorFactory {
+public interface InvokeStaticRewrite extends MethodVisitorFactory {
     @Nullable Rewrite rewrite(ClassProcessingContext context, int opcode, String owner, String name, String descriptor, boolean isInterface);
 
     @Override

diff --git a/...rmc/reflectionrewriter/MethodMatcher.java → ...va/io/papermc/asmutils/MethodMatcher.java b/...rmc/reflectionrewriter/MethodMatcher.java → ...va/io/papermc/asmutils/MethodMatcher.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...lectionrewriter/MethodVisitorFactory.java → ...apermc/asmutils/MethodVisitorFactory.java b/...lectionrewriter/MethodVisitorFactory.java → ...apermc/asmutils/MethodVisitorFactory.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;

diff --git a/...permc/reflectionrewriter/RewriteRule.java → ...java/io/papermc/asmutils/RewriteRule.java b/...permc/reflectionrewriter/RewriteRule.java → ...java/io/papermc/asmutils/RewriteRule.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...ermc/reflectionrewriter/RewriteRules.java → ...ava/io/papermc/asmutils/RewriteRules.java b/...ermc/reflectionrewriter/RewriteRules.java → ...ava/io/papermc/asmutils/RewriteRules.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,10 +50,6 @@ public Builder rules(final List<RewriteRule> rules) {
             return this;
         }
 
-        public Builder defaultRules(final String proxyClassName) {
-            return this.rules(new DefaultRules(proxyClassName).rules());
-        }
-
         public RewriteRules build() {
             return new RewriteRules(this.rules);
         }

diff --git a/...eflectionrewriter/ReflectionRewriter.java → ...mc/asmutils/RewriteRulesClassVisitor.java b/...eflectionrewriter/ReflectionRewriter.java → ...mc/asmutils/RewriteRulesClassVisitor.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -8,13 +8,13 @@
 import org.objectweb.asm.MethodVisitor;
 
 @DefaultQualifier(NonNull.class)
-public final class ReflectionRewriter extends ClassVisitor implements ClassProcessingContext {
+public final class RewriteRulesClassVisitor extends ClassVisitor implements ClassProcessingContext {
     private final RewriteRules rules;
     private final ClassInfoProvider classInfoProvider;
     private @MonotonicNonNull String name;
     private @Nullable String superName;
 
-    public ReflectionRewriter(
+    public RewriteRulesClassVisitor(
         final int api,
         final ClassVisitor parent,
         final RewriteRules rules,

diff --git a/...rmc/reflectionrewriter/ShouldProcess.java → ...va/io/papermc/asmutils/ShouldProcess.java b/...rmc/reflectionrewriter/ShouldProcess.java → ...va/io/papermc/asmutils/ShouldProcess.java
@@ -1,4 +1,4 @@
-package io.papermc.reflectionrewriter;
+package io.papermc.asmutils;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;