Fix reflection diff and order wrt commodore diff

main.py

@@ -25,7 +25,7 @@ for file in files:
         description = match.group(2)
 
         # Calculate the new number
-        new_number = current_number + 4
+        new_number = current_number + 1
 
         # Construct the new file name
         new_file_name = f'{str(new_number).zfill(4)}-{description}'

patches/server/0021-Hook-into-CB-plugin-rewrites.patch

@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4e3e948f2 100644
+index 0ecd298fead1a75bfc9ef535b550f5178fc3d3c8..072153a601eb257bd36bba24f356d4eb085e3636 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -7,6 +7,7 @@ import java.io.InputStream;
@@ -19,7 +19,7 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
  import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
-@@ -15,6 +16,7 @@ import java.util.jar.JarEntry;
+@@ -16,6 +17,7 @@ import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  import java.util.jar.JarOutputStream;
  import java.util.zip.ZipEntry;
@@ -27,17 +27,7 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
  import joptsimple.OptionParser;
  import joptsimple.OptionSet;
  import joptsimple.OptionSpec;
-@@ -23,7 +25,9 @@ import org.bukkit.plugin.AuthorNagException;
- import org.objectweb.asm.ClassReader;
- import org.objectweb.asm.ClassVisitor;
- import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.FieldVisitor;
- import org.objectweb.asm.Handle;
-+import org.objectweb.asm.Label;
- import org.objectweb.asm.MethodVisitor;
- import org.objectweb.asm.Opcodes;
- import org.objectweb.asm.Type;
-@@ -51,6 +55,40 @@ public class Commodore {
+@@ -62,6 +64,40 @@ public class Commodore {
              "org/spigotmc/event/entity/EntityDismountEvent", "org/bukkit/event/entity/EntityDismountEvent"
      );
  
@@ -75,31 +65,13 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
 +    }
 +    // Paper end - Plugin rewrites
 +
-     public static void main(String[] args) {
-         OptionParser parser = new OptionParser();
-         OptionSpec<File> inputFlag = parser.acceptsAll(Arrays.asList("i", "input")).withRequiredArg().ofType(File.class).required();
-@@ -118,12 +156,67 @@ public class Commodore {
-         ClassWriter cw = new ClassWriter(cr, 0);
+     private static final Map<String, RerouteMethodData> FIELD_RENAME_METHOD_REROUTE = RerouteBuilder.buildFromClass(FieldRename.class);
  
-         cr.accept(new ClassRemapper(new ClassVisitor(Opcodes.ASM9, cw) {
-+
-+            // Paper start - Rewrite plugins
-+            @Override
-+            public FieldVisitor visitField(int access, String name, String desc, String signature, Object value)
-+            {
-+                desc = getOriginalOrRewrite(desc);
-+                if ( signature != null ) {
-+                    signature = getOriginalOrRewrite(signature);
-+                }
-+
-+                return super.visitField( access, name, desc, signature, value) ;
-+            }
-+            // Paper end
-+
+     public static void main(String[] args) {
+@@ -190,9 +226,49 @@ public class Commodore {
              @Override
              public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
                  return new MethodVisitor(this.api, super.visitMethod(access, name, desc, signature, exceptions)) {
- 
 +                    // Paper start - Plugin rewrites
 +                    @Override
 +                    public void visitTypeInsn(int opcode, String type) {
@@ -133,8 +105,8 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
 +
 +                        super.visitLocalVariable(name, descriptor, signature, start, end, index);
 +                    }
-+                    // Paper end
-+
++                    // Paper end - Plugin rewrites
+ 
                      @Override
                      public void visitFieldInsn(int opcode, String owner, String name, String desc) {
 +                        // Paper start - Rewrite plugins
@@ -143,21 +115,24 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
 +                            desc = getOriginalOrRewrite(desc);
 +                        }
 +                        // Paper end
-                         if (owner.equals("org/bukkit/block/Biome")) {
-                             switch (name) {
-                                 case "NETHER":
-@@ -278,6 +371,10 @@ public class Commodore {
+                         name = FieldRename.rename(pluginVersion, owner, name);
+ 
+                         if (modern) {
+@@ -296,6 +372,13 @@ public class Commodore {
+                             return;
                          }
  
-                         // Paper start - Rewrite plugins
++                        // Paper start - Rewrite plugins
 +                        owner = getOriginalOrRewrite(owner) ;
 +                        if (desc != null) {
 +                            desc = getOriginalOrRewrite(desc);
 +                        }
-                         if ((owner.equals("org/bukkit/OfflinePlayer") || owner.equals("org/bukkit/entity/Player")) && name.equals("getPlayerProfile") && desc.equals("()Lorg/bukkit/profile/PlayerProfile;")) {
-                             super.visitMethodInsn(opcode, owner, name, "()Lcom/destroystokyo/paper/profile/PlayerProfile;", itf);
-                             return;
-@@ -374,6 +471,13 @@ public class Commodore {
++                        // Paper end - Rewrite plugins
++
+                         if (modern) {
+                             if (owner.equals("org/bukkit/Material") || (instantiatedMethodType != null && instantiatedMethodType.getDescriptor().startsWith("(Lorg/bukkit/Material;)"))) {
+                                 switch (name) {
+@@ -399,6 +482,13 @@ public class Commodore {
  
                      @Override
                      public void visitLdcInsn(Object value) {
@@ -171,7 +146,7 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
                          if (value instanceof String && ((String) value).equals("com.mysql.jdbc.Driver")) {
                              super.visitLdcInsn("com.mysql.cj.jdbc.Driver");
                              return;
-@@ -384,6 +488,14 @@ public class Commodore {
+@@ -409,6 +499,14 @@ public class Commodore {
  
                      @Override
                      public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
@@ -186,7 +161,7 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
                          if (bootstrapMethodHandle.getOwner().equals("java/lang/invoke/LambdaMetafactory")
                                  && bootstrapMethodHandle.getName().equals("metafactory") && bootstrapMethodArguments.length == 3) {
                              Type samMethodType = (Type) bootstrapMethodArguments[0];
-@@ -400,7 +512,7 @@ public class Commodore {
+@@ -425,7 +523,7 @@ public class Commodore {
                                  methodArgs.add(new Handle(newOpcode, newOwner, newName, newDescription, newItf));
                                  methodArgs.add(newInstantiated);
  
@@ -195,3 +170,16 @@ index 6a661bbae8bc35a4c3b4bb7e86dd77a7575fdd97..31714ce05b1023b82e96b36ba52254b4
                              }, implMethod.getTag(), implMethod.getOwner(), implMethod.getName(), implMethod.getDesc(), implMethod.isInterface(), samMethodType, instantiatedMethodType);
                              return;
                          }
+@@ -476,6 +574,12 @@ public class Commodore {
+ 
+             @Override
+             public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
++                // Paper start - Rewrite plugins
++                descriptor = getOriginalOrRewrite(descriptor);
++                if ( signature != null ) {
++                    signature = getOriginalOrRewrite(signature);
++                }
++                // Paper end
+                 return new FieldVisitor(this.api, super.visitField(access, name, descriptor, signature, value)) {
+                     @Override
+                     public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {

patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch

@@ -657,3 +657,60 @@ index 457a963ee6ebd3cf5c3831f6660e3850335af49f..61744d8fde3ba98585cf261fc09f0acc
          boolean runNext(Level world);
      }
  
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
+index 072153a601eb257bd36bba24f356d4eb085e3636..432ad62a82573901673d654b06e87b62369bea7a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
+@@ -65,36 +65,20 @@ public class Commodore {
+     );
+ 
+     // Paper start - Plugin rewrites
+-    private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();
+-    private static Map<String, String> initReplacementsMap() {
+-        Map<String, String> getAndRemove = new HashMap<>();
+-        // Be wary of maven shade's relocations
+-
+-        final java.util.jar.Manifest manifest = io.papermc.paper.util.JarManifests.manifest(Commodore.class);
+-        if (Boolean.getBoolean( "debug.rewriteForIde") && manifest != null)
+-        {
+-            // unversion incoming calls for pre-relocate debug work
+-            final String NMS_REVISION_PACKAGE = "v" + manifest.getMainAttributes().getValue("CraftBukkit-Package-Version") + "/";
+-
+-            getAndRemove.put("org/bukkit/".concat("craftbukkit/" + NMS_REVISION_PACKAGE), NMS_REVISION_PACKAGE);
+-        }
+-
+-        return getAndRemove;
+-    }
++    private static final String CB_PACKAGE_PREFIX = "org/bukkit/".concat("craftbukkit/");
++    private static final String LEGACY_CB_PACKAGE_PREFIX = CB_PACKAGE_PREFIX + io.papermc.paper.util.MappingEnvironment.LEGACY_CB_VERSION + "/";
+ 
+     @Nonnull
+     private static String getOriginalOrRewrite(@Nonnull String original)
+     {
+-        String rewrite = null;
+-        for ( Map.Entry<String, String> entry : SEARCH_AND_REMOVE.entrySet() )
+-        {
+-            if ( original.contains( entry.getKey() ) )
+-            {
+-                rewrite = original.replace( entry.getValue(), "" );
++        // Relocation is applied in reobf, and when mappings are present they handle the relocation
++        if (!io.papermc.paper.util.MappingEnvironment.reobf() && !io.papermc.paper.util.MappingEnvironment.hasMappings()) {
++            if (original.contains(LEGACY_CB_PACKAGE_PREFIX)) {
++                original = original.replace(LEGACY_CB_PACKAGE_PREFIX, CB_PACKAGE_PREFIX);
+             }
+         }
+ 
+-        return rewrite != null ? rewrite : original;
++        return original;
+     }
+     // Paper end - Plugin rewrites
+ 
+@@ -167,7 +151,7 @@ public class Commodore {
+         ClassReader cr = new ClassReader(b);
+         ClassWriter cw = new ClassWriter(cr, 0);
+ 
+-        cr.accept(new ClassRemapper(new ClassVisitor(Opcodes.ASM9, cw) {
++        cr.accept(new ClassRemapper(new ClassVisitor(Opcodes.ASM9, io.papermc.paper.pluginremap.reflect.ReflectionRemapper.visitor(cw)) { // Paper
+             final Set<RerouteMethodData> rerouteMethodData = new HashSet<>();
+             String className;
+             boolean isInterface;