Prepare for Paper's CraftBukkit relocation changes

GeyserMC · Oct 13, 2023 · b153d20 · b153d20
1 parent 1bae049
commit b153d20
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/spigot/base/src/main/java/org/geysermc/floodgate/spigot/util/MappingUtils.java b/spigot/base/src/main/java/org/geysermc/floodgate/spigot/util/MappingUtils.java
@@ -2,10 +2,11 @@
 
 import java.lang.reflect.Field;
 import org.bukkit.Bukkit;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 public class MappingUtils {
-    private static final String LEGACY_MAPPING_PREFIX;
+    private static final @Nullable String LEGACY_MAPPING_PREFIX;
     private static final String CRAFTBUKKIT_MAPPING_PREFTIX;
 
     private MappingUtils() {}
@@ -52,8 +53,15 @@ private static String genericMessage(String specific) {
     }
 
     static {
-        String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-        LEGACY_MAPPING_PREFIX = "net.minecraft.server." + version;
-        CRAFTBUKKIT_MAPPING_PREFTIX = "org.bukkit.craftbukkit." + version;
+        var craftbukkitPackage = Bukkit.getServer().getClass().getPackage().getName();
+        CRAFTBUKKIT_MAPPING_PREFTIX = craftbukkitPackage;
+
+        // Paper might in the future provide jars without CraftBukkit relocation
+        // Newer versions don't use NMS packages, so if something fails in the future it doesn't matter
+        String legacyPrefix = null;
+        try {
+            legacyPrefix = "net.minecraft.server." + craftbukkitPackage.split("\\.")[3];
+        } catch (Throwable ignored) {}
+        LEGACY_MAPPING_PREFIX = legacyPrefix;
     }
 }