diff --git a/orebfuscator-nms/orebfuscator-nms-v26_1/pom.xml b/orebfuscator-nms/orebfuscator-nms-v26_1/pom.xml index 4fcbf095..2a521129 100644 --- a/orebfuscator-nms/orebfuscator-nms-v26_1/pom.xml +++ b/orebfuscator-nms/orebfuscator-nms-v26_1/pom.xml @@ -23,7 +23,7 @@ org.spigotmc spigot - 26.1-R0.1-SNAPSHOT + 26.1.2-R0.1-SNAPSHOT provided diff --git a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationAsyncListener.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationAsyncListener.java index b1e4358a..ffb76a17 100644 --- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationAsyncListener.java +++ b/orebfuscator-plugin/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-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java index 825686d6..64f2e4b5 100644 --- a/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java +++ b/orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/ObfuscationSyncListener.java @@ -1,33 +1,31 @@ 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 { + @SuppressWarnings("deprecation") public static final List PACKET_TYPES_RESPAWN = Stream.of( // 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,