feat: add support for 1.21.9

Author: Ingrim4

.github/workflows/buildtools.sh

@@ -41,4 +41,5 @@ checkVersion "1.21.1" "21"
 checkVersion "1.21.3" "21"
 checkVersion "1.21.4" "21"
 checkVersion "1.21.5" "21"
-checkVersion "1.21.6" "21"
+checkVersion "1.21.8" "21"
+checkVersion "1.21.9" "21"

orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorNms.java

@@ -1,10 +1,8 @@
 package net.imprex.orebfuscator;
 
 import java.lang.reflect.Constructor;
-
 import org.bukkit.World;
 import org.bukkit.entity.Player;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.interop.RegistryAccessor;
@@ -25,11 +23,11 @@ public static void initialize() {
     }
 
     String nmsVersion = MinecraftVersion.nmsVersion();
-    if (ServerVersion.isMojangMapped() && !ServerVersion.isPaper()) {
+    if (ServerVersion.isMojangMapped()) {
       nmsVersion += "_mojang";
     }
 
-    OfcLogger.debug("Searching NMS adapter for server version \"" + nmsVersion + "\"!");
+    OfcLogger.info("Searching NMS adapter for server version \"" + nmsVersion + "\"!");
 
     try {
       String className = "net.imprex.orebfuscator.nms." + nmsVersion + ".NmsManager";
@@ -42,7 +40,7 @@ public static void initialize() {
       throw new RuntimeException("Couldn't initialize NMS adapter", e);
     }
 
-    OfcLogger.debug("NMS adapter for server version \"" + nmsVersion + "\" found!");
+    OfcLogger.info("NMS adapter for server version \"" + nmsVersion + "\" found!");
   }
 
   public static RegistryAccessor registry() {

orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractNmsManager.java

@@ -2,10 +2,12 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-
+import dev.imprex.orebfuscator.reflect.Reflector;
+import dev.imprex.orebfuscator.reflect.accessor.MethodAccessor;
 import dev.imprex.orebfuscator.util.BlockProperties;
 import dev.imprex.orebfuscator.util.BlockStateProperties;
 import dev.imprex.orebfuscator.util.BlockTag;
@@ -14,6 +16,33 @@
 
 public abstract class AbstractNmsManager implements NmsManager {
 
+  private static MethodAccessor worldGetHandle;
+  private static MethodAccessor playerGetHandle;
+
+  protected static <T> T worldHandle(World world, Class<T> targetClass) {
+    if (worldGetHandle == null) {
+      worldGetHandle = Reflector.of(world.getClass()).method()
+          .banStatic()
+          .nameIs("getHandle")
+          .returnType().is(targetClass)
+          .parameterCount(0)
+          .firstOrThrow();
+    }
+    return targetClass.cast(worldGetHandle.invoke(world));
+  }
+
+  protected static <T> T playerHandle(Player player, Class<T> targetClass) {
+    if (playerGetHandle == null) {
+      playerGetHandle = Reflector.of(player.getClass()).method()
+          .banStatic()
+          .nameIs("getHandle")
+          .returnType().is(targetClass)
+          .parameterCount(0)
+          .firstOrThrow();
+    }
+    return targetClass.cast(playerGetHandle.invoke(player));
+  }
+
   private final int uniqueBlockStateCount;
   private final int maxBitsPerBlockState;
 

orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/util/MinecraftVersion.java

@@ -17,6 +17,7 @@ private static final class NmsMapping {
     private static final List<NmsMapping> MAPPINGS = new ArrayList<>();
 
     static {
+      MAPPINGS.add(new NmsMapping("1.21.9", "v1_21_R6"));
       MAPPINGS.add(new NmsMapping("1.21.6", "v1_21_R5"));
       MAPPINGS.add(new NmsMapping("1.21.5", "v1_21_R4"));
       MAPPINGS.add(new NmsMapping("1.21.4", "v1_21_R3"));

orebfuscator-nms/orebfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java

@@ -8,19 +8,14 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
-
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.ChunkCoordIntPair;
 import com.comphenix.protocol.wrappers.MultiBlockChangeInfo;
 import com.comphenix.protocol.wrappers.WrappedBlockData;
 import com.google.common.collect.ImmutableList;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.util.BlockPos;
@@ -68,11 +63,11 @@ static int getBlockState(Chunk chunk, int x, int y, int z) {
   }
 
   private static WorldServer level(World world) {
-    return ((CraftWorld) world).getHandle();
+    return worldHandle(world, WorldServer.class);
   }
 
   private static EntityPlayer player(Player player) {
-    return ((CraftPlayer) player).getHandle();
+    return playerHandle(player, EntityPlayer.class);
   }
 
   public NmsManager() {

orebfuscator-nms/orebfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/NmsManager.java

@@ -8,15 +8,10 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
-
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.util.BlockPos;
@@ -67,11 +62,11 @@ static int getBlockState(Chunk chunk, int x, int y, int z) {
   }
 
   private static WorldServer level(World world) {
-    return ((CraftWorld) world).getHandle();
+    return worldHandle(world, WorldServer.class);
   }
 
   private static EntityPlayer player(Player player) {
-    return ((CraftPlayer) player).getHandle();
+    return playerHandle(player, EntityPlayer.class);
   }
 
   public NmsManager() {

orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/NmsManager.java

@@ -8,15 +8,10 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
-
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.util.BlockPos;
@@ -67,11 +62,11 @@ static int getBlockState(Chunk chunk, int x, int y, int z) {
   }
 
   private static WorldServer level(World world) {
-    return ((CraftWorld) world).getHandle();
+    return worldHandle(world, WorldServer.class);
   }
 
   private static EntityPlayer player(Player player) {
-    return ((CraftPlayer) player).getHandle();
+    return playerHandle(player, EntityPlayer.class);
   }
 
   public NmsManager() {

orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/NmsManager.java

@@ -7,16 +7,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.util.BlockProperties;
@@ -65,11 +60,11 @@ static int getBlockState(LevelChunk chunk, int x, int y, int z) {
   }
 
   private static ServerLevel level(World world) {
-    return ((CraftWorld) world).getHandle();
+    return worldHandle(world, ServerLevel.class);
   }
 
   private static ServerPlayer player(Player player) {
-    return ((CraftPlayer) player).getHandle();
+    return playerHandle(player, ServerPlayer.class);
   }
 
   public NmsManager() {

orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/NmsManager.java

@@ -7,15 +7,10 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.util.BlockProperties;
@@ -67,11 +62,11 @@ static int getBlockState(LevelChunk chunk, int x, int y, int z) {
   }
 
   private static ServerLevel level(World world) {
-    return ((CraftWorld) world).getHandle();
+    return worldHandle(world, ServerLevel.class);
   }
 
   private static ServerPlayer player(Player player) {
-    return ((CraftPlayer) player).getHandle();
+    return playerHandle(player, ServerPlayer.class);
   }
 
   public NmsManager() {

orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/NmsManager.java

@@ -8,16 +8,11 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
-
 import com.comphenix.protocol.events.PacketContainer;
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
-
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.util.BlockProperties;
@@ -66,11 +61,11 @@ static int getBlockState(LevelChunk chunk, int x, int y, int z) {
   }
 
   private static ServerLevel level(World world) {
-    return ((CraftWorld) world).getHandle();
+    return worldHandle(world, ServerLevel.class);
   }
 
   private static ServerPlayer player(Player player) {
-    return ((CraftPlayer) player).getHandle();
+    return playerHandle(player, ServerPlayer.class);
   }
 
   public NmsManager() {