Resolve open comments

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java

@@ -104,7 +104,7 @@ public class TechHiderWrapper extends StateDependent implements Listener {
             }
 
             @Override
-            public boolean isPlayerPrivilegedToAccessBlocEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type) {
+            public boolean isPlayerPrivilegedToAccessBlockEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type) {
                 Region hiddenRegion = getHiddenRegion(p);
                 return !hiddenRegion.inRegion(blockX, blockY, blockZ) || !blockEntityTypeToObfuscate.contains(type);
             }

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/AccessPrivilegeProvider.java

@@ -0,0 +1,31 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.techhider;
+
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import org.bukkit.entity.Player;
+
+public interface AccessPrivilegeProvider {
+    boolean isPlayerPrivilegedToAccessPosition(Player p, int blockX, int blockY, int blockZ);
+    boolean isPlayerPrivilegedToAccessBlock(Player p, int blockX, int blockY, int blockZ, Block block);
+    boolean isPlayerPrivilegedToAccessEntity(Player p, int entityId);
+    boolean isPlayerPrivilegedToAccessBlockEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type);
+}

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java

@@ -38,7 +38,7 @@ import java.util.*;
 import java.util.function.UnaryOperator;
 
 
-public abstract class ChunkHider {
+public class ChunkHider {
     private static final UnaryOperator<Object> chunkPacketShallowCloner = ProtocolUtils.shallowCloneGenerator(ClientboundLevelChunkWithLightPacket.class);
     private static final UnaryOperator<Object> chunkDataShallowCloner = ProtocolUtils.shallowCloneGenerator(ClientboundLevelChunkPacketData.class);
 
@@ -54,12 +54,14 @@ public abstract class ChunkHider {
     private final int BLOCKS_PER_SECTION = 4096;
     private final int BIOMES_PER_SECTION = 64;
 
-    private final byte BITS_PER_LONG = 64;
+    private final byte BITS_PER_LONG = Long.SIZE;
 
     private final int blockIdUsedForHiding;
+    private final AccessPrivilegeProvider accessPrivilegeProvider;
 
-    public ChunkHider(Block blockUsedForObfuscation) {
+    public ChunkHider(Block blockUsedForObfuscation, AccessPrivilegeProvider accessPrivilegeProvider) {
         blockIdUsedForHiding =  Block.BLOCK_STATE_REGISTRY.getId(blockUsedForObfuscation.defaultBlockState());
+        this.accessPrivilegeProvider = accessPrivilegeProvider;
     }
 
     private int getLongsRequiredToEncodeEntries(int bitsPerEntry, int entryCount) {
@@ -208,7 +210,7 @@ public abstract class ChunkHider {
 
 
 
-                    if(isPlayerPrivilegedToAccessPosition(player, worldX, worldY, worldZ) && isPlayerPrivilegedToAccessBlock(player, worldX, worldY, worldZ, block)) {
+                    if(accessPrivilegeProvider.isPlayerPrivilegedToAccessPosition(player, worldX, worldY, worldZ) && accessPrivilegeProvider.isPlayerPrivilegedToAccessBlock(player, worldX, worldY, worldZ, block)) {
                         obfuscatedData[blockDataIndex] = blockId;
                     }
                     else {
@@ -245,10 +247,6 @@ public abstract class ChunkHider {
         return reEncodedData.getRaw();
     }
 
-    public abstract boolean isPlayerPrivilegedToAccessPosition(Player p, int blockX, int blockY, int blockZ);
-    public abstract boolean isPlayerPrivilegedToAccessBlock(Player p, int blockX, int blockY, int blockZ, Block block);
-    public abstract boolean isPlayerPrivilegedToAccessBlockEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type);
-
     private ClientboundLevelChunkWithLightPacket buildNewChunkPacket(ClientboundLevelChunkWithLightPacket originalPacket, byte[] newBlockDataBuffer, List<Object> newBlockEntities) {
         ClientboundLevelChunkWithLightPacket clonedPacket = (ClientboundLevelChunkWithLightPacket) chunkPacketShallowCloner.apply(originalPacket);
         ClientboundLevelChunkPacketData clonedPacketChunkData = (ClientboundLevelChunkPacketData) chunkDataShallowCloner.apply(originalPacket.getChunkData());
@@ -278,7 +276,7 @@ public abstract class ChunkHider {
                     int x = SectionPos.sectionRelativeX((short) packedXZ);
                     int z = SectionPos.sectionRelativeZ((short) packedXZ);
 
-                    return isPlayerPrivilegedToAccessPosition(player, x, y, z) && isPlayerPrivilegedToAccessBlockEntity(player, x, y, z, type);
+                    return accessPrivilegeProvider.isPlayerPrivilegedToAccessPosition(player, x, y, z) && accessPrivilegeProvider.isPlayerPrivilegedToAccessBlockEntity(player, x, y, z, type);
                 }).toList();
     }
 

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java

@@ -1,3 +1,22 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package de.steamwar.techhider;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
@@ -7,7 +26,6 @@ import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.shorts.ShortArraySet;
 import it.unimi.dsi.fastutil.shorts.ShortSets;
 import net.minecraft.network.protocol.game.*;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.entity.Player;
@@ -41,35 +59,20 @@ import java.util.function.ToIntFunction;
  * any packet must be explicitly whitelisted or processed in a
  * way that is also compliant with the principle of default-deny.
  */
-public abstract class TechHider {
+public abstract class TechHider implements AccessPrivilegeProvider {
     private final Set<Class<?>> bypassingPackets;
     private final Map<Class<? extends Packet<? extends PacketListener>>, BiFunction<Player, Packet<? extends PacketListener>, Packet<? extends PacketListener>>> packetProcessors;
 
     private final Block blockUsedForObfuscation;
     private final BlockState blockStateUsedForObfuscation;
-    private ChunkHider chunkHider;
+    private final ChunkHider chunkHider;
 
     // TODO handle packet bundle
     public TechHider(Block blockUsedForObfuscation) {
         this.blockUsedForObfuscation = blockUsedForObfuscation;
         this.blockStateUsedForObfuscation = blockUsedForObfuscation.defaultBlockState();
 
-        this.chunkHider = new ChunkHider(blockUsedForObfuscation) {
+        this.chunkHider = new ChunkHider(blockUsedForObfuscation, this);
-            @Override
-            public boolean isPlayerPrivilegedToAccessBlock(Player p, int blockX, int blockY, int blockZ, Block block) {
-                return TechHider.this.isPlayerPrivilegedToAccessBlock(p, blockX, blockY, blockZ, block);
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToAccessBlockEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type) {
-                return TechHider.this.isPlayerPrivilegedToAccessBlocEntity(p, blockX, blockY, blockZ, type);
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToAccessPosition(Player p, int blockX, int blockY, int blockZ) {
-                return TechHider.this.isPlayerPrivilegedToAccessPosition(p, blockX, blockY, blockZ);
-            }
-        };
 
         this.bypassingPackets = new HashSet<>(List.of(
                 // --- 5.1.x Login Protocol ---
@@ -447,7 +450,7 @@ public abstract class TechHider {
         int blockY = blockPos.getY();
         int blockZ = blockPos.getZ();
 
-        if (isPlayerPrivilegedToAccessPosition(player, blockX, blockY, blockZ) && isPlayerPrivilegedToAccessBlocEntity(player, blockX, blockY, blockZ, blockEntityType)) {
+        if (isPlayerPrivilegedToAccessPosition(player, blockX, blockY, blockZ) && isPlayerPrivilegedToAccessBlockEntity(player, blockX, blockY, blockZ, blockEntityType)) {
             return packet;
         } else {
             return null;
@@ -559,5 +562,5 @@ public abstract class TechHider {
     public abstract boolean isPlayerPrivilegedToAccessPosition(Player p, int blockX, int blockY, int blockZ);
     public abstract boolean isPlayerPrivilegedToAccessBlock(Player p, int blockX, int blockY, int blockZ, Block block);
     public abstract boolean isPlayerPrivilegedToAccessEntity(Player p, int entityId);
-    public abstract boolean isPlayerPrivilegedToAccessBlocEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type);
+    public abstract boolean isPlayerPrivilegedToAccessBlockEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type);
 }