Prevent spectator block configuration 禁止旁观者修改方块配置

src/main/java/dev/dubhe/anvilcraft/network/AdvancedComparatorUpdatePacket.java

@@ -42,6 +42,9 @@ public Type<AdvancedComparatorUpdatePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!player.hasContainerOpen()) return;
         if (!(player.containerMenu instanceof AdvancedComparatorMenu menu)) return;
         AdvancedComparatorBlockEntity repeater = menu.getBlockEntity();

src/main/java/dev/dubhe/anvilcraft/network/AutoEnchantingTableFluidPacket.java

@@ -35,6 +35,9 @@ public Type<? extends CustomPacketPayload> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         Level level = player.level();
         AbstractContainerMenu containerMenu = player.containerMenu;
         BlockEntity blockEntity = level.getBlockEntity(this.pos);

src/main/java/dev/dubhe/anvilcraft/network/AutoEnchantingTableLevelPacket.java

@@ -24,6 +24,9 @@ public Type<AutoEnchantingTableLevelPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!player.hasContainerOpen()) return;
         if (!(player.containerMenu instanceof AutoEnchantingTableMenu menu)) return;
         menu.setLiquidLevel(this.level);

src/main/java/dev/dubhe/anvilcraft/network/AutoEnchantingTableSyncPacket.java

@@ -26,6 +26,9 @@ public Type<AutoEnchantingTableSyncPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!player.hasContainerOpen()) return;
         if (!(player.containerMenu instanceof AutoEnchantingTableMenu menu)) return;
         if (this.select) {

src/main/java/dev/dubhe/anvilcraft/network/BatchCrafterSelectPacket.java

@@ -32,6 +32,9 @@ public Type<BatchCrafterSelectPacket> type() {
 
     @Override
     public void handleOnBothSide(Player player) {
+        if (!player.level().isClientSide() && player.isSpectator()) {
+            return;
+        }
         Level level = player.level();
         if (!level.isLoaded(this.pos)) return;
 

src/main/java/dev/dubhe/anvilcraft/network/BatchCutterSelectPacket.java

@@ -31,6 +31,9 @@ public Type<BatchCutterSelectPacket> type() {
 
     @Override
     public void handleOnBothSide(Player player) {
+        if (!player.level().isClientSide() && player.isSpectator()) {
+            return;
+        }
         Level level = player.level();
         if (!level.isLoaded(this.pos)) {
             return;

src/main/java/dev/dubhe/anvilcraft/network/ControlValveFilterItemPacket.java

@@ -35,6 +35,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player instanceof ServerPlayer serverPlayer) || !(player.containerMenu instanceof ControlValveMenu menu)
             || menu.getBlockEntity() == null || !menu.stillValid(player)) return;
         FilterContent content = this.filterItem.get(ModComponents.FILTER_CONTENT);

src/main/java/dev/dubhe/anvilcraft/network/ControlValveFilterPacket.java

@@ -38,6 +38,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof ControlValveMenu menu) || menu.getBlockEntity() == null) return;
         menu.getBlockEntity().setFilter(this.index, this.fluid);
         menu.getBlockEntity().sendUpdate();

src/main/java/dev/dubhe/anvilcraft/network/ControlValveUpdatePacket.java

@@ -25,6 +25,9 @@ public Type<ControlValveUpdatePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof ControlValveMenu menu)) return;
         ControlValveBlockEntity be = menu.getBlockEntity();
         if (be == null) return;

src/main/java/dev/dubhe/anvilcraft/network/CreativeLaserUpdatePacket.java

@@ -33,6 +33,9 @@ public Type<CreativeLaserUpdatePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof CreativeLaserMenu menu)) return;
         CreativeLaserBlockEntity blockEntity = menu.getBlockEntity();
         if (blockEntity == null) return;

src/main/java/dev/dubhe/anvilcraft/network/CyclingValueSyncPacket.java

@@ -26,6 +26,9 @@ public Type<CyclingValueSyncPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (player.containerMenu instanceof CyclingValueHandler handler) {
             handler.notify(this.index, this.name);
         }

src/main/java/dev/dubhe/anvilcraft/network/ExpCollectorSyncPacket.java

@@ -33,6 +33,9 @@ public Type<ExpCollectorSyncPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof ExpCollectorMenu menu)) return;
         ExpCollectorBlockEntity collector = menu.getBlockEntity();
         if (!collector.getBlockPos().equals(this.pos)) return;

src/main/java/dev/dubhe/anvilcraft/network/HammerChangeFlexibleMultiPartBlockPacket.java

@@ -37,6 +37,9 @@ public Type<? extends CustomPacketPayload> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         Level level = player.level();
         if (!level.isLoaded(this.pos)) {
             return;

src/main/java/dev/dubhe/anvilcraft/network/ItemDetectorChangeRangePacket.java

@@ -24,6 +24,9 @@ public Type<ItemDetectorChangeRangePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof ItemDetectorMenu menu)) return;
         menu.setRange(this.range);
     }

src/main/java/dev/dubhe/anvilcraft/network/MachineCycleFilterModePacket.java

@@ -25,6 +25,9 @@ public Type<MachineCycleFilterModePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof ItemDetectorMenu menu)) return;
         menu.setFilterMode(this.filterMode);
         menu.flush();

src/main/java/dev/dubhe/anvilcraft/network/MachineEnableFilterPacket.java

@@ -37,6 +37,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!player.hasContainerOpen()) return;
         if (!(player.containerMenu instanceof IFilterMenu menu)) return;
         menu.setFilterEnabled(this.filterEnabled());

src/main/java/dev/dubhe/anvilcraft/network/MachineOutputDirectionPacket.java

@@ -35,6 +35,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof BaseMachineMenu menu)) return;
         Direction direction = this.direction();
         menu.setDirection(direction);

src/main/java/dev/dubhe/anvilcraft/network/PulseGeneratorUpdatePacket.java

@@ -37,6 +37,9 @@ public Type<? extends CustomPacketPayload> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof PulseGeneratorMenu menu)) return;
         PulseGeneratorBlockEntity repeater = menu.getBlockEntity();
         repeater.setStartMode(this.startMode);

src/main/java/dev/dubhe/anvilcraft/network/SilencerAddMutedPacket.java

@@ -24,6 +24,9 @@ public Type<SilencerAddMutedPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (player.containerMenu instanceof ActiveSilencerMenu menu) {
             menu.addSound(this.soundId);
         }

src/main/java/dev/dubhe/anvilcraft/network/SilencerRemoveMutedPacket.java

@@ -24,6 +24,9 @@ public Type<SilencerRemoveMutedPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (player.containerMenu instanceof ActiveSilencerMenu menu) {
             menu.removeSound(this.soundId);
         }

src/main/java/dev/dubhe/anvilcraft/network/SilencerSyncPacket.java

@@ -32,6 +32,9 @@ public Type<SilencerSyncPacket> type() {
 
     @Override
     public void handleOnBothSide(Player player) {
+        if (!player.level().isClientSide() && player.isSpectator()) {
+            return;
+        }
         if (player.level().isLoaded(this.pos)) {
             return;
         }

src/main/java/dev/dubhe/anvilcraft/network/SliderUpdatePacket.java

@@ -25,6 +25,9 @@ public Type<SliderUpdatePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof SliderMenu menu)) return;
         Callback<Integer> callback = menu.getCallback();
         if (callback == null) return;

src/main/java/dev/dubhe/anvilcraft/network/SlotDisableChangePacket.java

@@ -36,6 +36,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof IFilterMenu menu)) return;
         menu.setSlotDisabled(this.index, this.state);
         menu.flush();

src/main/java/dev/dubhe/anvilcraft/network/SlotFilterChangePacket.java

@@ -45,6 +45,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof IFilterMenu menu)) return;
         menu.setFilter(this.index, this.filter);
         menu.flush();

src/main/java/dev/dubhe/anvilcraft/network/SlotFilterMaxStackSizeChangePacket.java

@@ -39,6 +39,9 @@ public void handleOnClient(Player player) {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!player.hasContainerOpen()) return;
         if (!(player.containerMenu instanceof IFilterMenu menu)) return;
         IFilterBlockEntity filter = menu.getFilterBlockEntity();

src/main/java/dev/dubhe/anvilcraft/network/SmartBlockPlacerActionPacket.java

@@ -45,6 +45,9 @@ public Type<SmartBlockPlacerActionPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof SmartBlockPlacerMenu menu)) {
             return;
         }

src/main/java/dev/dubhe/anvilcraft/network/SpacetimeSupercomputerExecuteCommandPacket.java

@@ -33,6 +33,9 @@ public Type<? extends CustomPacketPayload> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         Level level = player.level();
         BlockEntity blockEntity = level.getBlockEntity(this.pos);
         if (blockEntity instanceof SpacetimeSupercomputerBlockEntity spacetimeSupercomputerBlockEntity) {

src/main/java/dev/dubhe/anvilcraft/network/StoragePortUnmarkPacket.java

@@ -31,6 +31,9 @@ public Type<? extends CustomPacketPayload> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.getMainHandItem().getItem() instanceof AnvilHammerItem)) {
             return;
         }

src/main/java/dev/dubhe/anvilcraft/network/StructureScannerActionPacket.java

@@ -79,6 +79,9 @@ public Type<StructureScannerActionPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof StructureScannerMenu menu) || !menu.stillValid(player)) {
             return;
         }

src/main/java/dev/dubhe/anvilcraft/network/StructureScannerFilePacket.java

@@ -45,6 +45,9 @@ public Type<StructureScannerFilePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator() && this.action != Action.LIST) {
+            return;
+        }
         if (!(player instanceof ServerPlayer serverPlayer) || !(player.containerMenu instanceof StructureScannerMenu menu)
             || menu.containerId != this.containerId || !menu.stillValid(player)) return;
         StructureScannerFiles.handle(serverPlayer, menu, this);

src/main/java/dev/dubhe/anvilcraft/network/StructureScannerSavePacket.java

@@ -37,6 +37,9 @@ public Type<StructureScannerSavePacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (!(player.containerMenu instanceof StructureScannerMenu menu)
             || menu.containerId != this.containerId || !menu.stillValid(player)) return;
         var scanner = menu.getBlockEntity();

src/main/java/dev/dubhe/anvilcraft/network/TeslaAddFilterPacket.java

@@ -26,6 +26,9 @@ public Type<TeslaAddFilterPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (player.containerMenu instanceof TeslaTowerMenu menu) {
             menu.addFilter(this.id, this.arg);
         }

src/main/java/dev/dubhe/anvilcraft/network/TeslaRemoveFilterPacket.java

@@ -26,6 +26,9 @@ public Type<TeslaRemoveFilterPacket> type() {
 
     @Override
     public void handleOnServer(Player player) {
+        if (player.isSpectator()) {
+            return;
+        }
         if (player.containerMenu instanceof TeslaTowerMenu menu) {
             menu.removeFilter(this.id, this.arg);
         }

src/main/java/dev/dubhe/anvilcraft/network/multiple/TradingStationPackets.java

@@ -52,6 +52,9 @@ public Type<SyncFilter> type() {
 
         @Override
         public void handleOnServer(Player player) {
+            if (player.isSpectator()) {
+                return;
+            }
             if (this.slot < 0 || this.slot >= 3) return;
             Level level = player.level();
             Optional<TradingStationBlockEntity> beOp = TradingStationPackets.getOpenStation(player, this.pos);
@@ -92,6 +95,9 @@ public Type<SyncAllowing> type() {
 
         @Override
         public void handleOnServer(Player player) {
+            if (player.isSpectator()) {
+                return;
+            }
             Optional<TradingStationBlockEntity> beOp = TradingStationPackets.getOpenStation(player, this.pos);
             if (beOp.isEmpty()) return;
             TradingStationBlockEntity be = beOp.get();