Merge branch 'master' into gradle

Ingrim4 · Ingrim4 · commit 079d0b0d2b49 · 2026-06-16T23:45:08.000+02:00
diff --git a/.github/workflows/buildtools.sh b/.github/workflows/buildtools.sh
@@ -42,4 +42,4 @@ checkVersion "1.21.5" "R0.1" "21"
 checkVersion "1.21.8" "R0.1" "21"
 checkVersion "1.21.10" "R0.1" "21"
 checkVersion "1.21.11" "R0.2" "21"
-checkVersion "26.1.1" "R0.1" "25"
+checkVersion "26.1.2" "R0.1" "25"
diff --git a/orebfuscator-bukkit/orebfuscator-bukkit-nms/orebfuscator-bukkit-nms-v26_1/build.gradle b/orebfuscator-bukkit/orebfuscator-bukkit-nms/orebfuscator-bukkit-nms-v26_1/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     compileOnly(libs.protocollib)
     compileOnly(project(":orebfuscator-bukkit:orebfuscator-bukkit-nms"))
-    compileOnly("org.spigotmc:spigot:26.1.1-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot:26.1.2-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitChunkPacketAccessor.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitChunkPacketAccessor.java
@@ -14,6 +14,7 @@
 import net.imprex.orebfuscator.util.MinecraftVersion;
 import net.imprex.orebfuscator.util.WrappedClientboundLevelChunkPacketData;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @NullMarked
 public class BukkitChunkPacketAccessor implements ChunkPacketAccessor {
@@ -29,7 +30,7 @@ public class BukkitChunkPacketAccessor implements ChunkPacketAccessor {
   private final byte[] data;
 
   private final PacketContainer packet;
-  private final WrappedClientboundLevelChunkPacketData packetData;
+  private final @Nullable WrappedClientboundLevelChunkPacketData packetData;
 
   public BukkitChunkPacketAccessor(PacketContainer packet, BukkitWorldAccessor worldAccessor) {
     this.packet = packet;
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitPlayerAccessor.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitPlayerAccessor.java
@@ -12,7 +12,6 @@
 import java.util.Objects;
 import java.util.WeakHashMap;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.OrebfuscatorCompatibility;
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitPlayerAccessorManager.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitPlayerAccessorManager.java
@@ -1,11 +1,8 @@
 package net.imprex.orebfuscator.iterop;
 
-import dev.imprex.orebfuscator.interop.PlayerAccessor;
-import dev.imprex.orebfuscator.logging.OfcLogger;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import net.imprex.orebfuscator.Orebfuscator;
+import java.util.concurrent.ConcurrentHashMap;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -17,11 +14,13 @@
 import org.bukkit.event.server.PluginDisableEvent;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+import dev.imprex.orebfuscator.interop.PlayerAccessor;
+import net.imprex.orebfuscator.Orebfuscator;
 
 @NullMarked
 public class BukkitPlayerAccessorManager implements Listener {
 
-  private final Map<Player, BukkitPlayerAccessor> players = new HashMap<>();
+  private final Map<Player, BukkitPlayerAccessor> players = new ConcurrentHashMap<>();
 
   private final Orebfuscator orebfuscator;
   private final BukkitWorldAccessorManager worldManager;
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitWorldAccessorManager.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/iterop/BukkitWorldAccessorManager.java
@@ -1,9 +1,9 @@
 package net.imprex.orebfuscator.iterop;
 
 import dev.imprex.orebfuscator.interop.WorldAccessor;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import net.imprex.orebfuscator.Orebfuscator;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -17,7 +17,7 @@
 @NullMarked
 public class BukkitWorldAccessorManager implements Listener {
 
-  private final Map<World, BukkitWorldAccessor> worlds = new HashMap<>();
+  private final Map<World, BukkitWorldAccessor> worlds = new ConcurrentHashMap<>();
 
   private final Orebfuscator orebfuscator;
 
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationAsyncListener.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationAsyncListener.java
@@ -1,5 +1,9 @@
 package net.imprex.orebfuscator.obfuscation;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
+import org.jspecify.annotations.NullMarked;
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -11,16 +15,11 @@
 import dev.imprex.orebfuscator.logging.OfcLogger;
 import dev.imprex.orebfuscator.obfuscation.ObfuscationPipeline;
 import dev.imprex.orebfuscator.statistics.InjectorStatistics;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.iterop.BukkitChunkPacketAccessor;
 import net.imprex.orebfuscator.iterop.BukkitPlayerAccessor;
 import net.imprex.orebfuscator.iterop.BukkitPlayerAccessorManager;
 import net.imprex.orebfuscator.iterop.BukkitWorldAccessor;
-import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 public class ObfuscationAsyncListener extends PacketAdapter {
@@ -102,7 +101,7 @@ public void onPacketSending(PacketEvent event) {
         if (packet.isEmpty()) {
           future = CompletableFuture.completedFuture(null);
         } else {
-          OfcLogger.throttle(LogLevel.WARN, "Processing chunk packet async without an obfuscation future, that shouldn't happen!");
+          OfcLogger.throttle(LogLevel.DEBUG, "Processing chunk packet async without an obfuscation future");
           future = pipeline.request(world, player, packet, null).toCompletableFuture();
         }
       }
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java
@@ -1,25 +1,21 @@
 package net.imprex.orebfuscator.obfuscation;
 
+import java.util.List;
+import java.util.stream.Stream;
+import org.jspecify.annotations.NullMarked;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import dev.imprex.orebfuscator.PermissionRequirements;
-import dev.imprex.orebfuscator.logging.OfcLogger;
 import dev.imprex.orebfuscator.obfuscation.ObfuscationPipeline;
 import dev.imprex.orebfuscator.statistics.InjectorStatistics;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Stream;
 import net.imprex.orebfuscator.Orebfuscator;
 import net.imprex.orebfuscator.iterop.BukkitChunkPacketAccessor;
 import net.imprex.orebfuscator.iterop.BukkitPlayerAccessor;
 import net.imprex.orebfuscator.iterop.BukkitPlayerAccessorManager;
 import net.imprex.orebfuscator.iterop.BukkitWorldAccessor;
-import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 public class ObfuscationSyncListener extends PacketAdapter {
@@ -29,6 +25,7 @@ public class ObfuscationSyncListener extends PacketAdapter {
       // 1.16.5
       PacketType.Play.Server.RESPAWN,
       PacketType.Play.Server.VIEW_DISTANCE,
+      PacketType.Play.Server.VIEW_CENTRE,
       PacketType.Play.Server.POSITION,
       PacketType.Play.Server.SPAWN_POSITION,
       PacketType.Play.Server.SERVER_DIFFICULTY,
diff --git a/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/util/WrappedClientboundLevelChunkPacketData.java b/orebfuscator-bukkit/src/main/java/net/imprex/orebfuscator/util/WrappedClientboundLevelChunkPacketData.java
@@ -5,6 +5,7 @@
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import dev.imprex.orebfuscator.util.BlockPos;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Predicate;
@@ -43,7 +44,8 @@ public void setBuffer(byte[] buffer) {
   }
 
   public void removeBlockEntityIf(Predicate<BlockPos> predicate) {
-    List<?> blockEntities = (List<?>) BLOCK_ENTITIES.get(this.handle);
+    // work on copy only to prevent ConcurrentModificationException
+    List<?> blockEntities = new ArrayList<>((List<?>) BLOCK_ENTITIES.get(this.handle));
     for (Iterator<?> iterator = blockEntities.iterator(); iterator.hasNext(); ) {
       Object blockEntityInfo = iterator.next();
       int packedXZ = (int) PACKED_XZ.get(blockEntityInfo);
@@ -56,5 +58,6 @@ public void removeBlockEntityIf(Predicate<BlockPos> predicate) {
         iterator.remove();
       }
     }
+    BLOCK_ENTITIES.set(this.handle, blockEntities);
   }
 }
diff --git a/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/OrebfuscatorDumpFile.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/OrebfuscatorDumpFile.java
@@ -59,6 +59,7 @@ private void initialize() {
     set("versions.orebfuscator", orebfuscator.orebfuscatorVersion().toString());
 
     orebfuscator.systemMonitor().dump(createSection("system"));
+    orebfuscator.executor().dump(createSection("executor"));
 
     var statistics = createSection("statistics");
     orebfuscator.statisticsRegistry().entries().stream()
diff --git a/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/obfuscation/DeobfuscationWorker.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/obfuscation/DeobfuscationWorker.java
@@ -79,7 +79,7 @@ public void deobfuscate(WorldAccessor world, @Nullable List<BlockPos> blocks) {
       return;
     }
 
-    var timer = statistics.debofuscation.start();
+    var timer = statistics.deobfuscation.start();
     try {
       this.deobfuscateNow(world, blocks);
     } finally {
diff --git a/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/player/OrebfuscatorPlayer.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/player/OrebfuscatorPlayer.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -22,6 +23,8 @@ public class OrebfuscatorPlayer {
 
   private final AtomicReference<@Nullable WorldAccessor> world = new AtomicReference<>();
   private final Map<Long, OrebfuscatorPlayerChunk> chunks = new ConcurrentHashMap<>();
+  
+  private final AtomicBoolean pendingUpdate = new AtomicBoolean(false);
 
   private volatile long latestUpdateTimestamp = System.currentTimeMillis();
   private volatile EntityPose location = EntityPose.ZERO;
@@ -45,6 +48,13 @@ public boolean needsProximityUpdate(boolean rotation) {
     }
 
     long timestamp = System.currentTimeMillis();
+    if (this.pendingUpdate.compareAndSet(true, false)) {
+      this.location = player.pose();
+      this.latestUpdateTimestamp = timestamp;
+
+      return true;
+    }
+
     if (this.config.hasProximityPlayerCheckInterval()
         && timestamp - this.latestUpdateTimestamp > this.config.proximityPlayerCheckInterval()) {
 
@@ -106,6 +116,13 @@ public void addChunk(WorldAccessor world, int chunkX, int chunkZ, List<Proximity
     if (Objects.equals(this.world.getAcquire(), world)) {
       long key = ChunkAccessor.chunkCoordsToLong(chunkX, chunkZ);
       this.chunks.put(key, new OrebfuscatorPlayerChunk(chunkX, chunkZ, blocks));
+
+      int dChunkX = chunkX - (this.location.blockX() >> 4);
+      int dChunkZ = chunkZ - (this.location.blockZ() >> 4);
+
+      if (dChunkX >= -1 && dChunkX <= 1 && dChunkZ >= -1 && dChunkZ <= 1) {
+        this.pendingUpdate.set(true);
+      }
     }
   }
 
diff --git a/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/proximity/ProximitySystem.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/proximity/ProximitySystem.java
@@ -44,32 +44,51 @@ public void start() {
   @Override
   public void run() {
     long processStart = System.nanoTime();
-    process().whenComplete((v, throwable) -> {
-      if (throwable != null) {
-        OfcLogger.error("An error occurred while running proximity worker", throwable);
-      }
-
-      if (this.executor.isShutdown()) {
-        return;
-      }
-
-      long processTime = System.nanoTime() - processStart;
-      this.statistics.proximityProcess.add(processTime);
-
-      // check if we have enough time to sleep
-      long waitTime = Math.max(0, this.checkInterval - processTime);
-      long waitMillis = TimeUnit.NANOSECONDS.toMillis(waitTime);
-
-      if (waitMillis > 0) {
-        // measure wait time
-        this.statistics.proximityWait.add(TimeUnit.MILLISECONDS.toNanos(waitMillis));
-        this.executor.schedule(this, waitMillis, TimeUnit.MILLISECONDS);
-      } else {
-        this.executor.execute(this);
+    invokeProcess().whenComplete((v, throwable) -> {
+      try {
+        if (throwable != null) {
+          OfcLogger.error("An error occurred while running proximity worker", throwable);
+        }
+
+        if (this.executor.isShutdown()) {
+          return;
+        }
+
+        long processTime = System.nanoTime() - processStart;
+        this.statistics.proximityProcess.add(processTime);
+
+        // check if we have enough time to sleep
+        long waitTime = Math.max(0, this.checkInterval - processTime);
+        long waitMillis = TimeUnit.NANOSECONDS.toMillis(waitTime);
+
+        if (waitMillis > 0) {
+          // measure wait time
+          this.statistics.proximityWait.add(TimeUnit.MILLISECONDS.toNanos(waitMillis));
+          this.executor.schedule(this, waitMillis, TimeUnit.MILLISECONDS);
+        } else {
+          // Schedule instead of executing directly to break reentrant execution chains of
+          // OrebfuscatorExecutor and avoid potential StackOverflowError.
+          this.statistics.proximityWait.add(0);
+          this.executor.schedule(this, 0L, TimeUnit.NANOSECONDS);
+        }
+      } catch (Exception e) {
+        OfcLogger.error("An error occurred while scheduling proximity worker", e);
+
+        // backoff for 1sec on reschedule failure
+        this.statistics.proximityWait.add(TimeUnit.SECONDS.toNanos(1));
+        this.executor.schedule(this, 1L, TimeUnit.SECONDS);
       }
     });
   }
 
+  private CompletableFuture<Void> invokeProcess() {
+    try {
+      return process();
+    } catch (Exception e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
   private CompletableFuture<Void> process() {
     var players = this.orebfuscator.players();
     if (players.isEmpty()) {
diff --git a/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/statistics/ObfuscationStatistics.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/statistics/ObfuscationStatistics.java
@@ -1,15 +1,13 @@
 package dev.imprex.orebfuscator.statistics;
 
-import java.util.Map;
 import java.util.StringJoiner;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import dev.imprex.orebfuscator.util.RollingAverage;
 import dev.imprex.orebfuscator.util.RollingTimer;
 
 public class ObfuscationStatistics implements StatisticsSource {
 
-  public final RollingTimer debofuscation = new RollingTimer(4096);
+  public final RollingTimer deobfuscation = new RollingTimer(4096);
 
   public final RollingTimer executorWaitTime = new RollingTimer(4096);
   public final RollingTimer executorUtilization = new RollingTimer(4096);
@@ -24,10 +22,10 @@ public class ObfuscationStatistics implements StatisticsSource {
 
   @Override
   public void add(StringJoiner joiner) {
-    long debofuscation = (long) this.debofuscation.average();
+    long deobfuscation = (long) this.deobfuscation.average();
 
-    joiner.add(String.format(" - debofuscation: %s",
-        time(debofuscation)));
+    joiner.add(String.format(" - deobfuscation: %s",
+        time(deobfuscation)));
 
     long executorWaitTime = (long) this.executorWaitTime.average();
     double executorUtilization = this.executorUtilization.average();
@@ -66,13 +64,13 @@ public void add(StringJoiner joiner) {
 
   @Override
   public void debug(BiConsumer<String, String> consumer) {
-    consumer.accept("debofuscation", this.debofuscation.debugLong(this::time));
+    consumer.accept("deobfuscation", this.deobfuscation.debugLong(this::time));
 
     consumer.accept("executorWaitTime", this.executorWaitTime.debugLong(this::time));
     consumer.accept("executorUtilization", this.executorUtilization.debugDouble(this::percent));
 
     consumer.accept("proximityWait", this.proximityWait.debugLong(this::time));
-    consumer.accept("proximityProcess", this.proximityProcess.debugDouble(this::percent));
+    consumer.accept("proximityProcess", this.proximityProcess.debugLong(this::time));
 
     consumer.accept("missingNeighboringChunks", this.missingNeighboringChunks.debugDouble(this::faction));
 
diff --git a/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/concurrent/OrebfuscatorExecutor.java b/orebfuscator-core/src/main/java/dev/imprex/orebfuscator/util/concurrent/OrebfuscatorExecutor.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compileOnly(libs.protocollib)`
`3`	`3`	`compileOnly(project(":orebfuscator-bukkit:orebfuscator-bukkit-nms"))`
`4`		`- compileOnly("org.spigotmc:spigot:26.1.1-R0.1-SNAPSHOT")`
	`4`	`+ compileOnly("org.spigotmc:spigot:26.1.2-R0.1-SNAPSHOT")`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import com.comphenix.protocol.reflect.accessors.FieldAccessor;`
`6`	`6`	`import com.comphenix.protocol.utility.MinecraftReflection;`
`7`	`7`	`import dev.imprex.orebfuscator.util.BlockPos;`
	`8`	`+import java.util.ArrayList;`
`8`	`9`	`import java.util.Iterator;`
`9`	`10`	`import java.util.List;`
`10`	`11`	`import java.util.function.Predicate;`
`@@ -43,7 +44,8 @@ public void setBuffer(byte[] buffer) {`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public void removeBlockEntityIf(Predicate<BlockPos> predicate) {`
`46`		`- List<?> blockEntities = (List<?>) BLOCK_ENTITIES.get(this.handle);`
	`47`	`+ // work on copy only to prevent ConcurrentModificationException`
	`48`	`+ List<?> blockEntities = new ArrayList<>((List<?>) BLOCK_ENTITIES.get(this.handle));`
`47`	`49`	`for (Iterator<?> iterator = blockEntities.iterator(); iterator.hasNext(); ) {`
`48`	`50`	`Object blockEntityInfo = iterator.next();`
`49`	`51`	`int packedXZ = (int) PACKED_XZ.get(blockEntityInfo);`
`@@ -56,5 +58,6 @@ public void removeBlockEntityIf(Predicate<BlockPos> predicate) {`
`56`	`58`	`iterator.remove();`
`57`	`59`	`}`
`58`	`60`	`}`
	`61`	`+ BLOCK_ENTITIES.set(this.handle, blockEntities);`
`59`	`62`	`}`
`60`	`63`	`}`