mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 17:07:34 +01:00
2641c02193
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 69fa4695 Add some missing deprecation annotations f850da2e Update Maven plugins/versions 8d8400db Use regular compiler seeing as ECJ doesn't support Java 21 JRE c29e1688 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 07bce714 SPIGOT-7355: More field renames and fixes 6a8ea764 Fix bad merge in penultimate commit 50a7920c Fix imports in previous commit 83640dd1 PR-995: Add required feature to MinecraftExperimental for easy lookups fc1f96cf BUILDTOOLS-676: Downgrade Maven compiler version CraftBukkit Changes: 90f1059ba Fix item placement 661afb43c SPIGOT-7633: Clearer error message for missing particle data 807b465b3 SPIGOT-7634: Armadillo updates infrequently 590cf09a8 Fix unit tests always seeing Mojang server as unavailable 7c7ac5eb2 SPIGOT-7636: Fix clearing ItemMeta 4a72905cf SPIGOT-7635: Fix Player#transfer and cookie methods ebb50e136 Fix incorrect Vault implementation b33fed8b7 Update Maven plugins/versions 6f00f0608 SPIGOT-7632: Control middle clicking chest does not copy contents db821f405 Use regular compiler seeing as ECJ doesn't support Java 21 JRE 8a2976737 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 0297f87bb SPIGOT-7355: More field renames and fixes 2d03bdf6a SPIGOT-7629: Fix loading banner patterns e77951fac Fix equality of deserialized display names c66f3e4fd SPIGOT-7631: Fix deserialisation of BlockStateMeta 9c2c7be8d SPIGOT-7630: Fix crash saving unticked leashed entities 8c1e7c841 PR-1384: Disable certain PlayerProfile tests, if Mojang's services or internet are not available ced93d572 SPIGOT-7626: sendSignChange() has no effect c77362cae SPIGOT-7625: ItemStack with lore cannot be serialized in 1.20.5 ff2004387 SPIGOT-7620: Fix server crash when hoppers transfer items to double chests 8b4abeb03 BUILDTOOLS-676: Downgrade Maven compiler version
186 lines
9.2 KiB
Diff
186 lines
9.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach@zachbr.io>
|
|
Date: Wed, 3 Oct 2018 20:09:18 -0400
|
|
Subject: [PATCH] Hook into CB plugin rewrites
|
|
|
|
Allows us to do fun stuff like rewrite the OBC util fastutil location to
|
|
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 2b0cf967e382e982200d73857b08c0f01a4e409c..8420a53672cfb0f060d9c85c445d200b6701f521 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;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Enumeration;
|
|
+import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
@@ -16,6 +17,7 @@ import java.util.jar.JarEntry;
|
|
import java.util.jar.JarFile;
|
|
import java.util.jar.JarOutputStream;
|
|
import java.util.zip.ZipEntry;
|
|
+import javax.annotation.Nonnull;
|
|
import joptsimple.OptionParser;
|
|
import joptsimple.OptionSet;
|
|
import joptsimple.OptionSpec;
|
|
@@ -73,6 +75,40 @@ public class Commodore {
|
|
public static final List<Map<String, RerouteMethodData>> REROUTES = new ArrayList<>(); // Only used for testing
|
|
private static final Map<String, RerouteMethodData> FIELD_RENAME_METHOD_REROUTE = Commodore.createReroutes(FieldRename.class);
|
|
|
|
+ // 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;
|
|
+ }
|
|
+
|
|
+ @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(), "" );
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return rewrite != null ? rewrite : original;
|
|
+ }
|
|
+ // 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();
|
|
@@ -199,9 +235,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) {
|
|
+ type = getOriginalOrRewrite(type);
|
|
+
|
|
+ super.visitTypeInsn(opcode, type);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) {
|
|
+ for (int i = 0; i < local.length; i++)
|
|
+ {
|
|
+ if (!(local[i] instanceof String)) { continue; }
|
|
+
|
|
+ local[i] = getOriginalOrRewrite((String) local[i]);
|
|
+ }
|
|
+
|
|
+ for (int i = 0; i < stack.length; i++)
|
|
+ {
|
|
+ if (!(stack[i] instanceof String)) { continue; }
|
|
+
|
|
+ stack[i] = getOriginalOrRewrite((String) stack[i]);
|
|
+ }
|
|
+
|
|
+ super.visitFrame(type, nLocal, local, nStack, stack);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void visitLocalVariable(String name, String descriptor, String signature, Label start, Label end, int index) {
|
|
+ descriptor = getOriginalOrRewrite(descriptor);
|
|
+
|
|
+ super.visitLocalVariable(name, descriptor, signature, start, end, index);
|
|
+ }
|
|
+ // Paper end - Plugin rewrites
|
|
|
|
@Override
|
|
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
|
|
+ // Paper start - Rewrite plugins
|
|
+ owner = getOriginalOrRewrite(owner);
|
|
+ if (desc != null) {
|
|
+ desc = getOriginalOrRewrite(desc);
|
|
+ }
|
|
+ // Paper end
|
|
name = FieldRename.rename(pluginVersion, owner, name);
|
|
|
|
if (modern) {
|
|
@@ -305,6 +381,13 @@ public class Commodore {
|
|
return;
|
|
}
|
|
|
|
+ // Paper start - Rewrite plugins
|
|
+ owner = getOriginalOrRewrite(owner) ;
|
|
+ if (desc != null) {
|
|
+ desc = getOriginalOrRewrite(desc);
|
|
+ }
|
|
+ // Paper end - Rewrite plugins
|
|
+
|
|
if (modern) {
|
|
if (owner.equals("org/bukkit/Material") || (instantiatedMethodType != null && instantiatedMethodType.getDescriptor().startsWith("(Lorg/bukkit/Material;)"))) {
|
|
switch (name) {
|
|
@@ -408,6 +491,13 @@ public class Commodore {
|
|
|
|
@Override
|
|
public void visitLdcInsn(Object value) {
|
|
+ // Paper start
|
|
+ if (value instanceof Type type) {
|
|
+ if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
|
|
+ value = Type.getType(getOriginalOrRewrite(type.getDescriptor()));
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
if (value instanceof String && ((String) value).equals("com.mysql.jdbc.Driver")) {
|
|
super.visitLdcInsn("com.mysql.cj.jdbc.Driver");
|
|
return;
|
|
@@ -418,6 +508,14 @@ public class Commodore {
|
|
|
|
@Override
|
|
public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
|
|
+ // Paper start - Rewrite plugins
|
|
+ name = getOriginalOrRewrite(name);
|
|
+ if (descriptor != null) {
|
|
+ descriptor = getOriginalOrRewrite(descriptor);
|
|
+ }
|
|
+ final String fName = name;
|
|
+ final String fDescriptor = descriptor;
|
|
+ // Paper end - Rewrite plugins
|
|
if (bootstrapMethodHandle.getOwner().equals("java/lang/invoke/LambdaMetafactory")
|
|
&& bootstrapMethodHandle.getName().equals("metafactory") && bootstrapMethodArguments.length == 3) {
|
|
Type samMethodType = (Type) bootstrapMethodArguments[0];
|
|
@@ -434,7 +532,7 @@ public class Commodore {
|
|
methodArgs.add(new Handle(newOpcode, newOwner, newName, newDescription, newItf));
|
|
methodArgs.add(newInstantiated);
|
|
|
|
- super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, methodArgs.toArray(Object[]::new));
|
|
+ super.visitInvokeDynamicInsn(fName, fDescriptor, bootstrapMethodHandle, methodArgs.toArray(Object[]::new)); // Paper - use final local vars
|
|
}, implMethod.getTag(), implMethod.getOwner(), implMethod.getName(), implMethod.getDesc(), implMethod.isInterface(), samMethodType, instantiatedMethodType);
|
|
return;
|
|
}
|
|
@@ -485,6 +583,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) {
|