mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
77a5779e24
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: 2ec53f49 PR-1050: Fix empty result check for Complex Recipes 10671012 PR-1044: Add CrafterCraftEvent 4d87ffe0 Use correct method in JavaDoc ae5e5817 SPIGOT-7850: Add API for Bogged shear state 46b6d445 SPIGOT-7837: Support data pack banner patterns d5d0cefc Fix JavaDoc error b3c2b83d PR-1036: Add API for InventoryView derivatives 1fe2c75a SPIGOT-7809: Add ShieldMeta CraftBukkit Changes: 8ee6fd1b8 SPIGOT-7857: Improve ItemMeta block data deserialization 8f26c30c6 SPIGOT-7857: Fix spurious internal NBT tag when deserializing BlockStateMeta 759061b93 SPIGOT-7855: Fire does not spread or burn blocks 00fc9fb64 SPIGOT-7853: AnvilInventory#getRepairCost() always returns 0 7501e2e04 PR-1450: Add CrafterCraftEvent 8c51673e7 SPIGOT-5731: PortalCreateEvent#getEntity returns null for nether portals ignited by flint and steel d53d0d0b1 PR-1456: Fix inverted logic in CraftCrafterView#setSlotDisabled 682a678c8 SPIGOT-7850: Add API for Bogged shear state fccf5243a SPIGOT-7837: Support data pack banner patterns 9c3bd4390 PR-1431: Add API for InventoryView derivatives 0cc6acbc4 SPIGOT-7849: Fix FoodComponent serialize with "using-converts-to" using null 2c5474952 Don't rely on tags for CraftItemMetas 20d107e46 SPIGOT-7846: Fix ItemMeta for hanging signs 76f59e315 Remove redundant clone in Dropper InventoryMoveItemEvent e61a53d25 SPIGOT-7817: Call InventoryMoveItemEvent for Crafters 894682e2d SPIGOT-7839: Remove redundant Java version checks 2c12b2187 SPIGOT-7809: Add ShieldMeta and fix setting shield base colours Spigot Changes: fb8fb722 Rebuild patches 34bd42b7 SPIGOT-7835: Fix issue with custom hopper settings
186 lines
9.1 KiB
Diff
186 lines
9.1 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 f80625a2b1dc266131ba3bfda9a918c72a592d82..ebc160fd4c8aed95087130bb6fddc1d4f83c6f87 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
|
@@ -11,6 +11,7 @@ import java.util.Arrays;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Enumeration;
|
|
+import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
@@ -20,6 +21,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;
|
|
@@ -100,6 +102,40 @@ public class Commodore {
|
|
private static final Map<String, RerouteMethodData> METHOD_REROUTE = Commodore.createReroutes(MethodRerouting.class);
|
|
private static final Map<String, RerouteMethodData> ENUM_METHOD_REROUTE = Commodore.createReroutes(EnumEvil.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();
|
|
@@ -253,9 +289,49 @@ public class Commodore {
|
|
}
|
|
|
|
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) {
|
|
@@ -375,6 +451,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) {
|
|
@@ -471,6 +554,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;
|
|
@@ -481,6 +571,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];
|
|
@@ -497,7 +595,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;
|
|
}
|
|
@@ -548,6 +646,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) {
|