Platform independent core - part 2

orebfuscator-api/src/main/java/net/imprex/orebfuscator/api/OrebfuscatorService.java

@@ -1,8 +1,8 @@
 package net.imprex.orebfuscator.api;
 
 import java.util.Collection;
-
 import org.bukkit.block.Block;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * <p>
@@ -16,6 +16,7 @@
  *
  * @since 5.2.0
  */
+@NullMarked
 public interface OrebfuscatorService {
 
   /**

orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/OrebfuscatorCompatibility.java

@@ -1,18 +1,12 @@
 package net.imprex.orebfuscator;
 
-import java.lang.reflect.Constructor;
-import java.util.concurrent.CompletableFuture;
-
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import dev.imprex.orebfuscator.config.api.Config;
 import dev.imprex.orebfuscator.logging.OfcLogger;
-import dev.imprex.orebfuscator.util.ChunkCacheKey;
+import java.lang.reflect.Constructor;
 import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
-import net.imprex.orebfuscator.nms.ReadOnlyChunk;
 import net.imprex.orebfuscator.util.ServerVersion;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 public class OrebfuscatorCompatibility {
 
@@ -23,7 +17,7 @@ public static void initialize(Plugin plugin, Config config) {
       throw new IllegalStateException("Compatibility layer is already initialized!");
     }
 
-    String className = "net.imprex.orebfuscator.compatibility.bukkit.BukkitCompatibilityLayer";
+    String className = "net.imprex.orebfuscator.compatibility.spigot.SpigotCompatibilityLayer";
     if (ServerVersion.isFolia()) {
       className = "net.imprex.orebfuscator.compatibility.folia.FoliaCompatibilityLayer";
     } else if (ServerVersion.isPaper()) {
@@ -56,18 +50,6 @@ public static void runAsyncNow(Runnable runnable) {
     instance.getScheduler().runAsyncNow(runnable);
   }
 
-  public static void runAsyncAtFixedRate(Runnable runnable, long delay, long period) {
-    instance.getScheduler().runAsyncAtFixedRate(runnable, delay, period);
-  }
-
-  public static void cancelTasks() {
-    instance.getScheduler().cancelTasks();
-  }
-
-  public static CompletableFuture<ReadOnlyChunk[]> getNeighboringChunks(World world, ChunkCacheKey key) {
-    return instance.getNeighboringChunks(world, key);
-  }
-
   public static void close() {
     if (instance != null) {
       instance.getScheduler().cancelTasks();

orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityLayer.java

@@ -1,17 +1,8 @@
 package net.imprex.orebfuscator.compatibility;
 
-import java.util.concurrent.CompletableFuture;
-
-import org.bukkit.World;
-
-import dev.imprex.orebfuscator.util.ChunkCacheKey;
-import net.imprex.orebfuscator.nms.ReadOnlyChunk;
-
 public interface CompatibilityLayer {
 
   boolean isGameThread();
 
   CompatibilityScheduler getScheduler();
-
-  CompletableFuture<ReadOnlyChunk[]> getNeighboringChunks(World world, ChunkCacheKey key);
 }

orebfuscator-compatibility/orebfuscator-compatibility-api/src/main/java/net/imprex/orebfuscator/compatibility/CompatibilityScheduler.java

@@ -8,7 +8,5 @@ public interface CompatibilityScheduler {
 
   void runAsyncNow(Runnable runnable);
 
-  void runAsyncAtFixedRate(Runnable runnable, long delay, long period);
-
   void cancelTasks();
 }

orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/spigot/SpigotCompatibilityLayer.java

@@ -0,0 +1,27 @@
+package net.imprex.orebfuscator.compatibility.spigot;
+
+import dev.imprex.orebfuscator.config.api.Config;
+import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
+import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
+import org.bukkit.plugin.Plugin;
+
+public class SpigotCompatibilityLayer implements CompatibilityLayer {
+
+  private final Thread mainThread = Thread.currentThread();
+
+  private final SpigotScheduler scheduler;
+
+  public SpigotCompatibilityLayer(Plugin plugin, Config config) {
+    this.scheduler = new SpigotScheduler(plugin);
+  }
+
+  @Override
+  public boolean isGameThread() {
+    return Thread.currentThread() == this.mainThread;
+  }
+
+  @Override
+  public CompatibilityScheduler getScheduler() {
+    return this.scheduler;
+  }
+}

orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/bukkit/BukkitScheduler.java → orebfuscator-compatibility/orebfuscator-compatibility-bukkit/src/main/java/net/imprex/orebfuscator/compatibility/spigot/SpigotScheduler.java

@@ -1,16 +1,15 @@
-package net.imprex.orebfuscator.compatibility.bukkit;
+package net.imprex.orebfuscator.compatibility.spigot;
 
+import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
-
-public class BukkitScheduler implements CompatibilityScheduler {
+public class SpigotScheduler implements CompatibilityScheduler {
 
   private final Plugin plugin;
 
-  public BukkitScheduler(Plugin plugin) {
+  public SpigotScheduler(Plugin plugin) {
     this.plugin = plugin;
   }
 
@@ -28,13 +27,6 @@ public void runAsyncNow(Runnable runnable) {
     }
   }
 
-  @Override
-  public void runAsyncAtFixedRate(Runnable runnable, long delay, long period) {
-    if (this.plugin.isEnabled()) {
-      Bukkit.getScheduler().runTaskTimerAsynchronously(this.plugin, runnable, delay, period);
-    }
-  }
-
   @Override
   public void cancelTasks() {
     Bukkit.getScheduler().cancelTasks(this.plugin);

orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaCompatibilityLayer.java

@@ -1,12 +1,11 @@
 package net.imprex.orebfuscator.compatibility.folia;
 
-import org.bukkit.plugin.Plugin;
-
 import dev.imprex.orebfuscator.config.api.Config;
+import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
 import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
-import net.imprex.orebfuscator.compatibility.paper.AbstractPaperCompatibilityLayer;
+import org.bukkit.plugin.Plugin;
 
-public class FoliaCompatibilityLayer extends AbstractPaperCompatibilityLayer {
+public class FoliaCompatibilityLayer implements CompatibilityLayer {
 
   private static final Class<?> TICK_THREAD_CLASS = getTickThreadClass();
 

orebfuscator-compatibility/orebfuscator-compatibility-folia/src/main/java/net/imprex/orebfuscator/compatibility/folia/FoliaScheduler.java

@@ -1,13 +1,10 @@
 package net.imprex.orebfuscator.compatibility.folia;
 
-import java.util.concurrent.TimeUnit;
-
+import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
-
 public class FoliaScheduler implements CompatibilityScheduler {
 
   private final Plugin plugin;
@@ -30,14 +27,6 @@ public void runAsyncNow(Runnable runnable) {
     }
   }
 
-  @Override
-  public void runAsyncAtFixedRate(Runnable runnable, long delay, long period) {
-    if (this.plugin.isEnabled()) {
-      Bukkit.getAsyncScheduler().runAtFixedRate(this.plugin, task -> runnable.run(),
-          delay * 50, period * 50, TimeUnit.MILLISECONDS);
-    }
-  }
-
   @Override
   public void cancelTasks() {
     Bukkit.getAsyncScheduler().cancelTasks(this.plugin);

orebfuscator-compatibility/orebfuscator-compatibility-paper/src/main/java/net/imprex/orebfuscator/compatibility/paper/PaperCompatibilityLayer.java

@@ -1,19 +1,19 @@
 package net.imprex.orebfuscator.compatibility.paper;
 
-import org.bukkit.plugin.Plugin;
-
 import dev.imprex.orebfuscator.config.api.Config;
+import net.imprex.orebfuscator.compatibility.CompatibilityLayer;
 import net.imprex.orebfuscator.compatibility.CompatibilityScheduler;
-import net.imprex.orebfuscator.compatibility.bukkit.BukkitScheduler;
+import net.imprex.orebfuscator.compatibility.spigot.SpigotScheduler;
+import org.bukkit.plugin.Plugin;
 
-public class PaperCompatibilityLayer extends AbstractPaperCompatibilityLayer {
+public class PaperCompatibilityLayer implements CompatibilityLayer {
 
   private final Thread mainThread = Thread.currentThread();
 
-  private final BukkitScheduler scheduler;
+  private final SpigotScheduler scheduler;
 
   public PaperCompatibilityLayer(Plugin plugin, Config config) {
-    this.scheduler = new BukkitScheduler(plugin);
+    this.scheduler = new SpigotScheduler(plugin);
   }
 
   @Override

orebfuscator-core/pom.xml

@@ -53,12 +53,12 @@
       <version>${dependency.joml.version}</version>
       <scope>provided</scope>
     </dependency>
-    <!--<dependency>
-      <groupId>org.lz4</groupId>
+    <dependency>
+      <groupId>at.yawk.lz4</groupId>
       <artifactId>lz4-java</artifactId>
       <version>${dependency.lz4.version}</version>
-      <scope>compile</scope>
-    </dependency>-->
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>