diff --git a/FightSystem/FightSystem_Core/build.gradle.kts b/FightSystem/FightSystem_Core/build.gradle.kts
index b346e97c..9b2f746b 100644
--- a/FightSystem/FightSystem_Core/build.gradle.kts
+++ b/FightSystem/FightSystem_Core/build.gradle.kts
@@ -37,4 +37,5 @@ dependencies {
     compileOnly(libs.authlib)
     compileOnly(libs.nms)
     compileOnly(libs.fawe)
+    compileOnly(libs.datafixer)
 }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
index 2519de0c..871d679e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
@@ -21,7 +21,6 @@ package de.steamwar.fightsystem.utils;
 
 import de.steamwar.core.CraftbukkitWrapper;
 import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.events.BoardingEvent;
 import de.steamwar.fightsystem.events.TeamLeaveEvent;
 import de.steamwar.fightsystem.events.TeamSpawnEvent;
@@ -30,27 +29,18 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.sql.SteamwarUser;
 import de.steamwar.techhider.TechHider;
 import lombok.Getter;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import org.bukkit.GameMode;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import javax.crypto.*;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -63,15 +53,16 @@ public class TechHiderWrapper extends StateDependent implements Listener {
     private final ConcurrentHashMap<Player, Region> hiddenRegion = new ConcurrentHashMap<>();
     private final TechHider techHider;
 
+
     public TechHiderWrapper(HullHider hullHider) {
         super(ENABLED, FightState.Schem);
         Set<Block> blocksToObfuscate = Config.GameModeConfig.Techhider.HiddenBlocks.stream()
                 .map(CraftMagicNumbers::getBlock)
                 .collect(Collectors.toUnmodifiableSet());
         Set<BlockEntityType<?>> blockEntityTypeToObfuscate =  Config.GameModeConfig.Techhider.HiddenBlockEntities.stream()
-                .map(id -> {
-                    ResourceLocation parsedId = ResourceLocation.parse(id);
-                    return  BuiltInRegistries.BLOCK_ENTITY_TYPE.get(parsedId).get().value();
+                .map((id) -> {
+                    ResourceLocation loc = ResourceLocation.parse(id);
+                    return BuiltInRegistries.BLOCK_ENTITY_TYPE.get(loc).get().value();
                 })
                 .collect(Collectors.toUnmodifiableSet());
         techHider = new TechHider(CraftMagicNumbers.getBlock(Config.GameModeConfig.Techhider.ObfuscateWith)) {
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
index ec4a5f95..b623c5cf 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
@@ -21,11 +21,15 @@ package de.steamwar.techhider;
 
 import de.steamwar.Reflection;
 import net.minecraft.core.IdMapper;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import org.bukkit.Material;
+import org.bukkit.Registry;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 
 import java.util.HashSet;
@@ -39,18 +43,20 @@ public class BlockIds {
     }
 
     private static final FluidState water = Fluids.WATER.getSource(false);
-    private static final Iterable<BlockState> registryBlockId = (Iterable<BlockState>) Reflection.getField(TechHider.block, IdMapper.class, 0).get(null);
 
     public Set<Integer> materialToAllIds(Material material) {
         Set<Integer> ids = new HashSet<>();
+
         for (BlockState data : getBlock(material).getStateDefinition().getPossibleStates()) {
             ids.add(getCombinedId(data));
         }
 
         if (material == Material.WATER) {
-            for (BlockState data : registryBlockId) {
-                if (data.getFluidState() == water) {
-                    ids.add(getCombinedId(data));
+            for (Block block : BuiltInRegistries.BLOCK) {
+                for (BlockState data : block.getStateDefinition().getPossibleStates()) {
+                    if (data.getFluidState() == water) {
+                        ids.add(getCombinedId(data));
+                    }
                 }
             }
         }