Reduce decompile API blockers
Some checks failed
Build / build (push) Failing after 6m48s

This commit is contained in:
MrSphay
2026-05-04 13:33:41 +02:00
parent e41adca82b
commit 93c8d5efae
40 changed files with 472 additions and 1083 deletions

View File

@@ -87,7 +87,6 @@ import net.neoforged.neoforge.event.server.ServerStoppedEvent;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.network.PacketDistributor;
import net.neoforged.neoforge.server.ServerLifecycleHooks;
@EventBusSubscriber
@@ -386,7 +385,7 @@ public class BlockIndexManager {
if (server != null) {
for (ServerPlayer player : server.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(player)) continue;
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
}
}
}
@@ -402,7 +401,7 @@ public class BlockIndexManager {
if (server != null) {
for (ServerPlayer player : server.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(player)) continue;
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
}
}
}
@@ -414,7 +413,7 @@ public class BlockIndexManager {
private static void sendScanPromptPacket(ServerPlayer player) {
try {
ScanPromptPacket packet = new ScanPromptPacket(true);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
ExplosionOverhaul.LOGGER.info("Sent scan prompt to authorized player: {}", (Object)player.m_7755_().getString());
}
catch (Exception e) {
@@ -459,14 +458,14 @@ public class BlockIndexManager {
try {
if (requestingPlayer != null && requestingPlayer.m_6084_()) {
ScanPromptPacket packet = new ScanPromptPacket(false);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> requestingPlayer), (Object)packet);
PacketHandler.sendToPlayer(requestingPlayer, packet);
} else {
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
if (server != null) {
for (ServerPlayer player : server.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(player)) continue;
ScanPromptPacket packet = new ScanPromptPacket(false);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
}
}
}
@@ -495,7 +494,7 @@ public class BlockIndexManager {
for (ServerPlayer serverPlayer : currentServer.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(serverPlayer)) continue;
packet = new ScanLoadPromptPacket(false);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), (Object)packet);
PacketHandler.sendToPlayer(serverPlayer, packet);
ExplosionOverhaul.LOGGER.debug("Hidden load prompt for authorized player: {}", (Object)serverPlayer.m_7755_().getString());
}
}
@@ -522,9 +521,9 @@ public class BlockIndexManager {
for (ServerPlayer serverPlayer : server.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(serverPlayer)) continue;
ScanLoadPromptPacket hideLoadPacket = new ScanLoadPromptPacket(false);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), (Object)hideLoadPacket);
PacketHandler.sendToPlayer(serverPlayer, hideLoadPacket);
ScanPromptPacket showScanPacket = new ScanPromptPacket(true);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), (Object)showScanPacket);
PacketHandler.sendToPlayer(serverPlayer, showScanPacket);
ExplosionOverhaul.LOGGER.debug("Switched prompts for authorized player: {}", (Object)serverPlayer.m_7755_().getString());
}
}
@@ -554,14 +553,14 @@ public class BlockIndexManager {
try {
if (requestingPlayer != null && requestingPlayer.m_6084_()) {
ScanPromptPacket packet = new ScanPromptPacket(false);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> requestingPlayer), (Object)packet);
PacketHandler.sendToPlayer(requestingPlayer, packet);
} else {
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
if (server != null) {
for (ServerPlayer player : server.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(player)) continue;
ScanPromptPacket packet = new ScanPromptPacket(false);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
}
}
}
@@ -606,7 +605,7 @@ public class BlockIndexManager {
serverScanDecisionMade = false;
try {
ScanPromptPacket packet = new ScanPromptPacket(true);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
ExplosionOverhaul.LOGGER.info("BlockIndexManager: showing rescan prompt to player: {}", (Object)player.m_7755_().getString());
}
catch (Exception e) {
@@ -621,7 +620,7 @@ public class BlockIndexManager {
for (ServerPlayer player : server.m_6846_().m_11314_()) {
if (!BlockIndexManager.isPlayerAuthorized(player)) continue;
ScanPromptPacket packet = new ScanPromptPacket(show);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), (Object)packet);
PacketHandler.sendToPlayer(player, packet);
if (!show) continue;
ExplosionOverhaul.LOGGER.debug("Sent scan prompt to authorized player: {}", (Object)player.m_7755_().getString());
}
@@ -1186,7 +1185,7 @@ public class BlockIndexManager {
hasSaveFile = true;
try {
ScanLoadPromptPacket packet = new ScanLoadPromptPacket(true);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player2), (Object)packet);
PacketHandler.sendToPlayer(player2, packet);
ExplosionOverhaul.LOGGER.info("BlockIndexManager: showing load prompt for existing save file in world: {}", (Object)level.m_46472_().m_135782_());
}
catch (Exception e) {
@@ -1201,7 +1200,7 @@ public class BlockIndexManager {
} else if (BlockIndexManager.isScanning() || !chunkScanQueue.isEmpty() && totalChunksToScan > 0) {
try {
ScanProgressPacket packet = new ScanProgressPacket(totalChunksToScan, chunksScanned, scanningComplete, lampsFound, dripstonesFound, glassBlocksFound);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player2), (Object)packet);
PacketHandler.sendToPlayer(player2, packet);
ExplosionOverhaul.LOGGER.debug("Sent scan progress to rejoining OP player: {}/{} chunks", (Object)chunksScanned, (Object)totalChunksToScan);
}
catch (Exception e) {
@@ -1221,7 +1220,7 @@ public class BlockIndexManager {
hasSaveFile = true;
try {
ScanLoadPromptPacket packet = new ScanLoadPromptPacket(true);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player2), (Object)packet);
PacketHandler.sendToPlayer(player2, packet);
ExplosionOverhaul.LOGGER.info("BlockIndexManager: showing load prompt for existing save file to OP: {}", (Object)player2.m_7755_().getString());
}
catch (Exception e) {
@@ -1232,7 +1231,7 @@ public class BlockIndexManager {
hasSaveFile = false;
try {
ScanPromptPacket packet = new ScanPromptPacket(true);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player2), (Object)packet);
PacketHandler.sendToPlayer(player2, packet);
ExplosionOverhaul.LOGGER.info("BlockIndexManager: showing scan prompt to OP: {}", (Object)player2.m_7755_().getString());
}
catch (Exception e) {
@@ -1242,7 +1241,7 @@ public class BlockIndexManager {
} else if (totalChunksToScan > 0 && !scanningComplete) {
try {
ScanProgressPacket packet = new ScanProgressPacket(totalChunksToScan, chunksScanned, scanningComplete, lampsFound, dripstonesFound, glassBlocksFound);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player2), (Object)packet);
PacketHandler.sendToPlayer(player2, packet);
ExplosionOverhaul.LOGGER.debug("Sent scan progress to joining OP player: {}/{} chunks", (Object)chunksScanned, (Object)totalChunksToScan);
}
catch (Exception e) {
@@ -1380,7 +1379,7 @@ public class BlockIndexManager {
INITIAL_SCAN_ENQUEUED = false;
try {
ScanProgressPacket packet = new ScanProgressPacket(0, 0, true, 0, 0, 0);
PacketHandler.INSTANCE.send(PacketDistributor.ALL.noArg(), (Object)packet);
PacketHandler.sendToAll(packet);
}
catch (Exception exception) {
// empty catch block
@@ -1415,7 +1414,7 @@ public class BlockIndexManager {
ServerPlayer player2 = (ServerPlayer)player;
try {
ScanProgressPacket packet = new ScanProgressPacket(0, 0, true, 0, 0, 0);
PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player2), (Object)packet);
PacketHandler.sendToPlayer(player2, packet);
}
catch (Exception exception) {
// empty catch block