[#454] Fix region file cache on paper (#455)

Author: Ingrim4

orebfuscator-core/src/main/java/dev/imprex/orebfuscator/cache/AbstractRegionFileCache.java

@@ -10,11 +10,27 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
+import dev.imprex.orebfuscator.reflect.Reflector;
+import dev.imprex.orebfuscator.reflect.accessor.MethodAccessor;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
 import dev.imprex.orebfuscator.util.SimpleCache;
 
 public abstract class AbstractRegionFileCache<T> {
 
+  private static MethodAccessor serverGetServer;
+
+  protected static <T> T serverHandle(Object server, Class<T> targetClass) {
+    if (serverGetServer == null) {
+      serverGetServer = Reflector.of(server.getClass()).method()
+          .banStatic()
+          .nameIs("getServer")
+          .returnType().is(targetClass)
+          .parameterCount(0)
+          .firstOrThrow();
+    }
+    return targetClass.cast(serverGetServer.invoke(server));
+  }
+
   protected final ReadWriteLock lock = new ReentrantReadWriteLock(true);
   protected final Map<Path, T> regionFiles;
 

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

@@ -6,12 +6,12 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_16_R1.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
 import net.minecraft.server.v1_16_R1.ChunkCoordIntPair;
+import net.minecraft.server.v1_16_R1.DedicatedServer;
 import net.minecraft.server.v1_16_R1.RegionFile;
 import net.minecraft.server.v1_16_R1.RegionFileCompression;
 
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().isSyncChunkWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).isSyncChunkWrites();
     return new RegionFile(path, path.getParent(), RegionFileCompression.c, isSyncChunkWrites);
   }
 

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

@@ -6,12 +6,12 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
 import net.minecraft.server.v1_16_R2.ChunkCoordIntPair;
+import net.minecraft.server.v1_16_R2.DedicatedServer;
 import net.minecraft.server.v1_16_R2.RegionFile;
 import net.minecraft.server.v1_16_R2.RegionFileCompression;
 
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().isSyncChunkWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).isSyncChunkWrites();
     return new RegionFile(path, path.getParent(), RegionFileCompression.c, isSyncChunkWrites);
   }
 

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

@@ -6,12 +6,12 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
 import net.minecraft.server.v1_16_R3.ChunkCoordIntPair;
+import net.minecraft.server.v1_16_R3.DedicatedServer;
 import net.minecraft.server.v1_16_R3.RegionFile;
 import net.minecraft.server.v1_16_R3.RegionFileCompression;
 
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().isSyncChunkWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).isSyncChunkWrites();
     return new RegionFile(path, path.getParent(), RegionFileCompression.c, isSyncChunkWrites);
   }
 

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

@@ -6,11 +6,11 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().forceSynchronousWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).forceSynchronousWrites();
     return new RegionFile(path, path.getParent(), RegionFileVersion.VERSION_NONE, isSyncChunkWrites);
   }
 

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

@@ -6,11 +6,11 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().forceSynchronousWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).forceSynchronousWrites();
     return new RegionFile(path, path.getParent(), RegionFileVersion.VERSION_NONE, isSyncChunkWrites);
   }
 

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

@@ -6,11 +6,11 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().forceSynchronousWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).forceSynchronousWrites();
     return new RegionFile(path, path.getParent(), RegionFileVersion.VERSION_NONE, isSyncChunkWrites);
   }
 

orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/RegionFileCache.java

@@ -6,11 +6,11 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().forceSynchronousWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).forceSynchronousWrites();
     return new RegionFile(path, path.getParent(), RegionFileVersion.VERSION_NONE, isSyncChunkWrites);
   }
 

orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/RegionFileCache.java

@@ -6,11 +6,11 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().forceSynchronousWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).forceSynchronousWrites();
     return new RegionFile(path, path.getParent(), RegionFileVersion.VERSION_NONE, isSyncChunkWrites);
   }
 

orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/RegionFileCache.java

@@ -6,11 +6,11 @@
 import java.nio.file.Path;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
 
 import dev.imprex.orebfuscator.cache.AbstractRegionFileCache;
 import dev.imprex.orebfuscator.config.api.CacheConfig;
 import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileVersion;
@@ -23,7 +23,7 @@ public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
 
   @Override
   protected RegionFile createRegionFile(Path path) throws IOException {
-    boolean isSyncChunkWrites = ((CraftServer) Bukkit.getServer()).getServer().forceSynchronousWrites();
+    boolean isSyncChunkWrites = serverHandle(Bukkit.getServer(), DedicatedServer.class).forceSynchronousWrites();
     return new RegionFile(path, path.getParent(), RegionFileVersion.VERSION_NONE, isSyncChunkWrites);
   }