Merge branch 'main' into swui-v2

Cleanup for Merge
Signed-off-by: Chaoscaot <max@maxsp.de>
2026-06-10 21:43:25 +02:00 · 2026-06-10 21:43:02 +02:00 · 2026-06-10 20:46:13 +02:00 · 2026-06-10 16:07:37 +02:00 · 2026-06-10 09:28:24 +02:00 · 2026-06-10 09:28:16 +02:00
730 changed files with 15909 additions and 14085 deletions
@@ -1,6 +1,6 @@
 name: Feature Idee
 about: Du hast eine Idee für ein neues Feature, welches SteamWar nicht hat? Stelle sie hier vor.
-labels: ["typ/idee"]
+labels: [ "typ/idee" ]
 body:
  - type: textarea
    id: description
@@ -41,7 +41,7 @@ jobs:
        run: |
          echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
      - name: Build with Gradle
-        run: ./gradlew build --no-daemon
+        run: ./gradlew clean build --no-daemon --no-build-cache --refresh-dependencies 

      - name: Stage deploy artifacts
        shell: bash
@@ -52,7 +52,6 @@ jobs:
          mkdir -p deploy

          cp "BauSystem/build/libs/BauSystem-all.jar" "deploy/BauSystem.jar"
-          cp "LegacyBauSystem/build/libs/LegacyBauSystem.jar" "deploy/BauSystem-1.12.jar"
          cp "FightSystem/build/libs/FightSystem-all.jar" "deploy/FightSystem.jar"
          cp "KotlinCore/build/libs/KotlinCore-all.jar" "deploy/KotlinCore.jar"
          cp "TNTLeague/build/libs/TNTLeague.jar" "deploy/TNTLeague.jar"
@@ -130,7 +129,12 @@ jobs:
          ssh-keyscan -p "$port" "$DEPLOY_HOST" >> ~/.ssh/known_hosts

          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH'"
-          scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/"
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH/upload'"
+          scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/upload"
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -f '$DEPLOY_PATH'/*.jar '$DEPLOY_PATH'/*.zip"
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mv '$DEPLOY_PATH'/upload/* '$DEPLOY_PATH'"
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -r '$DEPLOY_PATH/upload'"
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "chmod o-w '$DEPLOY_PATH'/*"
      - name: Restart Services
        shell: bash
        env:
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Remote JVM Debugger" type="Remote">
+    <option name="USE_SOCKET_TRANSPORT" value="true" />
+    <option name="SERVER_MODE" value="false" />
+    <option name="SHMEM_ADDRESS" />
+    <option name="HOST" value="localhost" />
+    <option name="PORT" value="5005" />
+    <option name="AUTO_RESTART" value="false" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
+    <method v="2" />
+  </configuration>
+</component>
@@ -34,14 +34,16 @@ dependencies {
    compileOnly(libs.classindex)
    annotationProcessor(libs.classindex)
    compileOnly(project(":SpigotCore", "default"))
+    compileOnly(project(":KotlinCore", "default"))

    compileOnly(libs.axiom)
    compileOnly(libs.authlib)

-    compileOnly(libs.paperapi21)
-    compileOnly(libs.nms21)
+    compileOnly(libs.paperapi)
+    compileOnly(libs.nms)

-    compileOnly(libs.fawe18)
+    compileOnly(libs.fawe)
+    compileOnly(libs.netty)

    implementation(libs.luaj)
    implementation(files("$projectDir/../libs/YAPION-SNAPSHOT.jar"))
@@ -76,13 +76,21 @@ public class AttributesCopyCommand extends SWCommand {
        if (itemStack.getType() == Material.ZOMBIE_HEAD && block.getType() == Material.ZOMBIE_WALL_HEAD) return true;
        if (itemStack.getType() == Material.CREEPER_HEAD && block.getType() == Material.CREEPER_WALL_HEAD) return true;
        if (itemStack.getType() == Material.DRAGON_HEAD && block.getType() == Material.DRAGON_WALL_HEAD) return true;
-        if (itemStack.getType() == Material.SKELETON_SKULL && block.getType() == Material.SKELETON_WALL_SKULL) return true;
-        if (itemStack.getType() == Material.WITHER_SKELETON_SKULL && block.getType() == Material.WITHER_SKELETON_WALL_SKULL) return true;
+        if (itemStack.getType() == Material.SKELETON_SKULL && block.getType() == Material.SKELETON_WALL_SKULL) {
+            return true;
+        }
+        if (itemStack.getType() == Material.WITHER_SKELETON_SKULL && block.getType() == Material.WITHER_SKELETON_WALL_SKULL) {
+            return true;
+        }
        if (itemStack.getType() == Material.TORCH && block.getType() == Material.WALL_TORCH) return true;
        if (itemStack.getType() == Material.SOUL_TORCH && block.getType() == Material.SOUL_WALL_TORCH) return true;
-        if (itemStack.getType() == Material.REDSTONE_TORCH && block.getType() == Material.REDSTONE_WALL_TORCH) return true;
+        if (itemStack.getType() == Material.REDSTONE_TORCH && block.getType() == Material.REDSTONE_WALL_TORCH) {
+            return true;
+        }
        if (itemStack.getType() == Material.WHEAT_SEEDS && block.getType() == Material.WHEAT) return true;
-        if (itemStack.getType().name().contains("_BANNER") && block.getType().name().contains("_WALL_BANNER")) return true;
+        if (itemStack.getType().name().contains("_BANNER") && block.getType().name().contains("_WALL_BANNER")) {
+            return true;
+        }
        return false;
    }
 }
@@ -41,7 +41,7 @@ public class AttributesPlaceListener implements Listener {

    @EventHandler
    public void onBlockPlace(BlockPlaceEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        ItemStack itemStack = event.getItemInHand();
        ItemMeta itemMeta = itemStack.getItemMeta();
        if (itemMeta == null) return;
@@ -65,7 +65,7 @@ public class AutostartListener implements Listener {

    @EventHandler
    public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (!ItemUtils.isItem(event.getItem(), "autostart")) {
            return;
        }
@@ -89,7 +89,7 @@ public class AutostartListener implements Listener {
        if (!(event.getPlayer() instanceof Player)) {
            return;
        }
-        if(!Permission.BUILD.hasPermission((Player) event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission((Player) event.getPlayer())) return;
        if (!ItemUtils.isItem(event.getPlayer().getInventory().getItemInMainHand(), "autostart")) {
            return;
        }
@@ -104,7 +104,8 @@ public class BackupCommand extends SWCommand {
        List<String> lore = Arrays.asList(BauSystem.MESSAGE.parse("BACKUP_LORE", p));
        for (int i = 0; i < backups.size(); i++) {
            RegionBackups.Backup backup = backups.get(i);
-            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, backup.getName()), lore, false, clickType -> {});
+            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, backup.getName()), lore, false, clickType -> {
+            });
            swItem.getItemStack().setAmount(i + 1);
            swListEntries.add(new SWListInv.SWListEntry<>(swItem, backup));
        }
@@ -58,14 +58,14 @@ public class Countingwand {
        }
    }

-	public static ItemStack getWandItem(Player player) {
-		ItemStack itemStack = new SWItem(Material.STICK, BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE1", player), BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE2", player)), false, null).getItemStack();
-		ItemUtils.setItem(itemStack, "countingwand");
-		ItemMeta itemMeta = itemStack.getItemMeta();
-		itemMeta.setCustomModelData(1);
-		itemStack.setItemMeta(itemMeta);
-		return itemStack;
-	}
+    public static ItemStack getWandItem(Player player) {
+        ItemStack itemStack = new SWItem(Material.STICK, BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE1", player), BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE2", player)), false, null).getItemStack();
+        ItemUtils.setItem(itemStack, "countingwand");
+        ItemMeta itemMeta = itemStack.getItemMeta();
+        itemMeta.setCustomModelData(1);
+        itemStack.setItemMeta(itemMeta);
+        return itemStack;
+    }

    public boolean isCountingwand(ItemStack itemStack) {
        return ItemUtils.isItem(itemStack, "countingwand");
@@ -28,12 +28,12 @@ import org.bukkit.entity.Player;
@Linked
 public class CountingwandCommand extends SWCommand {

-	public CountingwandCommand() {
-		super("countingwand", "/countingwand", "cwand", "/cwand", "zollstock", "/zollstock");
-	}
+    public CountingwandCommand() {
+        super("countingwand", "/countingwand", "cwand", "/cwand", "zollstock", "/zollstock");
+    }

-	@Register(description = "COUNTINGWAND_COMMAND_HELP")
-	public void genericCommand(final Player p) {
-		SWUtils.giveItemToPlayer(p, Countingwand.getWandItem(p));
-	}
+    @Register(description = "COUNTINGWAND_COMMAND_HELP")
+    public void genericCommand(final Player p) {
+        SWUtils.giveItemToPlayer(p, Countingwand.getWandItem(p));
+    }
 }
@@ -30,24 +30,24 @@ import org.bukkit.inventory.ItemStack;
@Linked
 public class CountingwandGuiItem extends BauGuiItem {

-	public CountingwandGuiItem() {
-		super(22);
-	}
+    public CountingwandGuiItem() {
+        super(22);
+    }

-	@Override
-	public ItemStack getItem(Player player) {
-		return Countingwand.getWandItem(player);
-	}
+    @Override
+    public ItemStack getItem(Player player) {
+        return Countingwand.getWandItem(player);
+    }

-	@Override
-	public boolean click(ClickType click, Player p) {
-		p.closeInventory();
-		p.performCommand("countingwand");
-		return false;
-	}
+    @Override
+    public boolean click(ClickType click, Player p) {
+        p.closeInventory();
+        p.performCommand("countingwand");
+        return false;
+    }

-	@Override
-	public Permission permission() {
-		return Permission.MEMBER;
-	}
+    @Override
+    public Permission permission() {
+        return Permission.MEMBER;
+    }
 }
@@ -35,35 +35,35 @@ import java.util.Objects;
@Linked
 public class CountingwandListener implements Listener {

-	@EventHandler
-	public void onBlockBreak(final BlockBreakEvent event) {
-		if (!Countingwand.isCountingwand(event.getPlayer().getInventory().getItemInMainHand())) {
-			return;
-		}
+    @EventHandler
+    public void onBlockBreak(final BlockBreakEvent event) {
+        if (!Countingwand.isCountingwand(event.getPlayer().getInventory().getItemInMainHand())) {
+            return;
+        }

-		event.setCancelled(true);
-		Countingwand.checkSelection(Point.fromLocation(event.getBlock().getLocation()), true, event.getPlayer());
-	}
+        event.setCancelled(true);
+        Countingwand.checkSelection(Point.fromLocation(event.getBlock().getLocation()), true, event.getPlayer());
+    }

-	@EventHandler
-	public void onPlayerInteract(final PlayerInteractEvent event) {
-		if (!Countingwand.isCountingwand(event.getItem())) {
-			return;
-		}
+    @EventHandler
+    public void onPlayerInteract(final PlayerInteractEvent event) {
+        if (!Countingwand.isCountingwand(event.getItem())) {
+            return;
+        }

-		if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_AIR) {
-			RayTraceResult rayTraceResult = event.getPlayer().rayTraceBlocks(200, FluidCollisionMode.NEVER);
-			if (rayTraceResult == null) {
-				return;
-			}
-			Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(rayTraceResult.getHitBlock()).getLocation()), event.getAction() == Action.LEFT_CLICK_AIR, event.getPlayer());
-			return;
-		}
-		if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
-			return;
-		}
+        if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_AIR) {
+            RayTraceResult rayTraceResult = event.getPlayer().rayTraceBlocks(200, FluidCollisionMode.NEVER);
+            if (rayTraceResult == null) {
+                return;
+            }
+            Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(rayTraceResult.getHitBlock()).getLocation()), event.getAction() == Action.LEFT_CLICK_AIR, event.getPlayer());
+            return;
+        }
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }

-		event.setCancelled(true);
-		Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(event.getClickedBlock()).getLocation()), false, event.getPlayer());
-	}
+        event.setCancelled(true);
+        Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(event.getClickedBlock()).getLocation()), false, event.getPlayer());
+    }
 }
@@ -21,9 +21,7 @@ package de.steamwar.bausystem.features.design.endstone;

 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
+import de.steamwar.entity.*;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -59,15 +57,15 @@ public class DesignEndStone {
                .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
                .collect(Collectors.toSet());
        calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
+    }

-        entityServer.setCallback((player, rEntity, entityAction) -> {
-            if (entityAction != REntityServer.EntityAction.ATTACK) return;
-            Location location = new Location(WORLD, rEntity.getX(), rEntity.getY(), rEntity.getZ());
-            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-                location.getBlock().breakNaturally();
-                calc();
-            }, 1);
-        });
+    private void interact(Player player, RInteraction entity, REntityAction action) {
+        if (action != REntityAction.ATTACK) return;
+        Location location = new Location(WORLD, entity.getX(), entity.getY(), entity.getZ());
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            location.getBlock().breakNaturally();
+            calc();
+        }, 1);
    }

    public void calc() {
@@ -110,12 +108,15 @@ public class DesignEndStone {
                        Material material = WORLD.getBlockAt(cx, cy, cz).getType();

                        if (material != Material.WATER && material != Material.LAVA && limited.contains(material)) {
-                            Location location = new Location(WORLD, cx + 0.5, cy, cz + 0.5);
+                            Location location = new Location(WORLD, cx, cy, cz);
                            if (!locations.add(location)) break;
-                            RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);
-                            entity.setNoGravity(true);
+                            RBlockDisplay entity = new RBlockDisplay(entityServer, location);
+                            entity.setBlock(Material.RED_STAINED_GLASS.createBlockData());
                            entity.setGlowing(true);
                            entities.add(entity);
+                            RInteraction interaction = new RInteraction(entityServer, location);
+                            interaction.setCallback(this::interact);
+                            entities.add(interaction);
                            break;
                        } else if (!material.isAir() && material != Material.WATER && material != Material.LAVA) {
                            break;
@@ -26,8 +26,9 @@ import de.steamwar.bausystem.features.autostart.AutostartListener;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
 import de.steamwar.core.SWPlayer;
+import de.steamwar.entity.RBlockDisplay;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
+import de.steamwar.entity.RInteraction;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.UtilityClass;
@@ -58,10 +59,6 @@ public class Detonator {
        @Override
        public void onMount(SWPlayer player) {
            entities.addPlayer(player.getPlayer());
-            entities.setCallback((player1, entity, action) -> {
-                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
-                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player1);
-            });
        }

        @Override
@@ -70,8 +67,6 @@ public class Detonator {
        }
    }

-    private static final Vector HALF = new Vector(0.5, 0, 0.5);
-
    public static boolean isDetonator(ItemStack itemStack) {
        return ItemStorage.isDetonator(itemStack);
    }
@@ -79,8 +74,14 @@ public class Detonator {
    public static void showDetonator(Player p, List<Location> locs) {
        DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
        locs.forEach(location -> {
-            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
-            entity.setNoGravity(true);
+            RBlockDisplay blockDisplay = new RBlockDisplay(detonatorComponent.entities, location);
+            blockDisplay.setBlock(Material.RED_STAINED_GLASS.createBlockData());
+
+            RInteraction interaction = new RInteraction(detonatorComponent.entities, location);
+            interaction.setCallback((player, entity, action) -> {
+                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
+                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
+            });
        });
    }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -17,15 +17,15 @@
 *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package de.steamwar.linkage;
+package de.steamwar.bausystem.features.experimental;

-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;

-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface MaxVersion {
-    int value();
+@Linked
+public class ExperimentalCommand extends SWCommand {
+
+    public ExperimentalCommand() {
+        super("experimental", "experiment");
+    }
 }
@@ -0,0 +1,135 @@
+/*
+ *   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.bausystem.features.experimental.redstone_engine;
+
+import de.steamwar.bausystem.features.experimental.ExperimentalCommand;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.command.AbstractSWCommand;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import io.papermc.paper.configuration.WorldConfiguration;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.title.TitlePart;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import java.util.Collection;
+import java.util.List;
+
+@AbstractSWCommand.PartOf(ExperimentalCommand.class)
+@Linked
+public class RedstoneEngine extends SWCommand implements Listener, ScoreboardElement {
+
+    public RedstoneEngine() {
+        super("");
+    }
+
+    private WorldConfiguration.Misc getConfig() {
+        return ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle().paperConfig().misc;
+    }
+
+    @Register("redstone")
+    @Register("redstoneengine")
+    public void setRedstoneEngine(Player player, @StaticValue("alternate_current") String __, WorldConfiguration.Misc.AlternateCurrentUpdateOrder updateOrder) {
+        WorldConfiguration.Misc misc = getConfig();
+        misc.redstoneImplementation = WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT;
+        misc.alternateCurrentUpdateOrder = updateOrder;
+        broadcastTitle(Bukkit.getOnlinePlayers());
+    }
+
+    @Register("redstone")
+    @Register("redstoneengine")
+    public void setRedstoneEngine(Player player, WorldConfiguration.Misc.RedstoneImplementation implementation) {
+        getConfig().redstoneImplementation = implementation;
+        broadcastTitle(Bukkit.getOnlinePlayers());
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        WorldConfiguration.Misc misc = getConfig();
+        if (misc.redstoneImplementation != WorldConfiguration.Misc.RedstoneImplementation.EIGENCRAFT) {
+            broadcastTitle(List.of(event.getPlayer()));
+        }
+    }
+
+    private void broadcastTitle(Collection<? extends Player> players) {
+        WorldConfiguration.Misc misc = getConfig();
+        Component title = switch (misc.redstoneImplementation) {
+            case VANILLA -> Component.text("⚠").color(NamedTextColor.RED).append(Component.text(" Redstone: Vanilla ").color(NamedTextColor.WHITE)).append(Component.text("⚠").color(NamedTextColor.RED));
+            case EIGENCRAFT -> Component.text("Redstone: Eigencraft");
+            case ALTERNATE_CURRENT -> Component.text("⚠").color(NamedTextColor.RED).append(Component.text(" Redstone: AC ").color(NamedTextColor.WHITE)).append(Component.text("⚠").color(NamedTextColor.RED));
+        };
+        Component subtitle;
+        if (misc.redstoneImplementation != WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) {
+            subtitle = Component.text().build();
+        } else {
+            subtitle = switch (misc.alternateCurrentUpdateOrder) {
+                case VERTICAL_FIRST_INWARD -> Component.text("Y first inwards"); // Y before XZ
+                case VERTICAL_FIRST_OUTWARD -> Component.text("Y first outwards"); // XZ before Y
+                case HORIZONTAL_FIRST_INWARD -> Component.text("XZ first inwards"); // Y before XZ
+                case HORIZONTAL_FIRST_OUTWARD -> Component.text("XZ first outwards"); // XZ before Y
+            };
+        }
+        players.forEach(player -> {
+            player.sendTitlePart(TitlePart.TITLE, title);
+            player.sendTitlePart(TitlePart.SUBTITLE, subtitle);
+        });
+    }
+
+    @Override
+    public ScoreboardGroup getGroup() {
+        return ScoreboardGroup.FOOTER;
+    }
+
+    @Override
+    public int order() {
+        return Integer.MAX_VALUE;
+    }
+
+    @Override
+    public String get(Region region, Player p) {
+        WorldConfiguration.Misc misc = getConfig();
+        switch (misc.redstoneImplementation) {
+            case ALTERNATE_CURRENT:
+                switch (misc.alternateCurrentUpdateOrder) {
+                    case VERTICAL_FIRST_INWARD:
+                        return "§eRedstone§8: §cAC §8(§7Y in§8)";
+                    case VERTICAL_FIRST_OUTWARD:
+                        return "§eRedstone§8: §cAC §8(§7Y out§8)";
+                    case HORIZONTAL_FIRST_INWARD:
+                        return "§eRedstone§8: §cAC §8(§7XZ in§8)";
+                    case HORIZONTAL_FIRST_OUTWARD:
+                        return "§eRedstone§8: §cAC §8(§7XZ out§8)";
+                }
+                return "§eRedstone§8: §cAC";
+            case EIGENCRAFT:
+                return null;
+            case VANILLA:
+            default:
+                return "§eRedstone§8: §cVanilla";
+        }
+    }
+}
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.gui.editor;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
 import de.steamwar.bausystem.linkage.BauGuiItem;
-import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
@@ -74,7 +73,7 @@ public class BauGuiEditor implements Listener {

        inv.setItem(mapping.getSize() + 5, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH", p), Arrays.asList(BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH_LORE", p)), false, clickType -> {
        }).getItemStack());
-        inv.setItem(mapping.getSize() + 6, new SWItem(TrickyTrialsWrapper.impl.getTurtleScute(), BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
+        inv.setItem(mapping.getSize() + 6, new SWItem(Material.TURTLE_SCUTE, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
        inv.setItem(mapping.getSize() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", p)).setCustomModelData(CMDs.BACK).getItemStack());

        p.openInventory(inv);
@@ -31,7 +31,7 @@ public class HotbarListener implements Listener {

    @EventHandler(priority = EventPriority.LOWEST)
    public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (allNull(event.getPlayer().getInventory().getContents()) && allNull(event.getPlayer().getInventory().getArmorContents())) {
            DefaultHotbar.setHotbar(event.getPlayer());
        }
@@ -50,7 +50,8 @@ public class InventoryFillBauGuiItem extends BauGuiItem {
    @Override
    public ItemStack getItem(Player player) {
        String loreKey = Config.getInstance().get(player).getPlainValueOrDefault("inventoryfill", false) ? "OTHER_ITEMS_INVENTORY_FILL_LORE_ACTIVE" : "OTHER_ITEMS_INVENTORY_FILL_LORE_INACTIVE";
-        return new SWItem(Material.HOPPER, BauSystem.MESSAGE.parse("OTHER_ITEMS_INVENTORY_FILL_NAME", player), Collections.singletonList(BauSystem.MESSAGE.parse(loreKey, player)), false, clickType -> {}).getItemStack();
+        return new SWItem(Material.HOPPER, BauSystem.MESSAGE.parse("OTHER_ITEMS_INVENTORY_FILL_NAME", player), Collections.singletonList(BauSystem.MESSAGE.parse(loreKey, player)), false, clickType -> {
+        }).getItemStack();
    }

    @Override
@@ -39,7 +39,7 @@ public class InventoryFiller implements Listener {

    @EventHandler
    public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("inventoryfill", false)) return;
        if (!event.getPlayer().isSneaking()) return;
        Block block = event.getPlayer().getTargetBlockExact(5);
@@ -61,7 +61,7 @@ public class InventoryFiller implements Listener {
     */
    @EventHandler
    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("inventoryfill", false)) return;
        if (!event.getPlayer().isSneaking()) return;
        ItemStack itemStack = event.getPlayer().getInventory().getItemInMainHand();
@@ -24,9 +24,9 @@ import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
+import de.steamwar.entity.RBlockDisplay;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -58,9 +58,9 @@ public class KillcheckerVisualizer {
            Material.BLACK_CONCRETE,
    };
    private static final World WORLD = Bukkit.getWorlds().get(0);
-    
+
    private static final double SURROUND = 4.5;
-    
+
    private final Point minPoint;
    private final Point maxPoint;

@@ -104,7 +104,9 @@ public class KillcheckerVisualizer {
                    Block block = WORLD.getBlockAt(x, y, z);
                    if (block.getType().isAir()) continue;
                    String name = block.getType().name();
-                    if (!name.endsWith("_WOOL") && !name.endsWith("_STAINED_GLASS") && !name.endsWith("_CONCRETE") && !name.endsWith("_TERRACOTTA")) continue;
+                    if (!name.endsWith("_WOOL") && !name.endsWith("_STAINED_GLASS") && !name.endsWith("_CONCRETE") && !name.endsWith("_TERRACOTTA")) {
+                        continue;
+                    }
                    if (name.equals("_GLAZED_TERRACOTTA")) continue;
                    Cuboid cuboid = create(block.getType(), x, y, z);
                    cuboids.add(cuboid);
@@ -283,11 +285,13 @@ public class KillcheckerVisualizer {
        }
        kill.forEach((point, count) -> {
            if (rEntities.containsKey(point)) {
-                if (killCount.get(point) == count && outlinePoints.contains(point) == outlinePointsCacheLast.contains(point)) return;
+                if (killCount.get(point) == count && outlinePoints.contains(point) == outlinePointsCacheLast.contains(point)) {
+                    return;
+                }
                rEntities.get(point).die();
            }
-            RFallingBlockEntity entity = new RFallingBlockEntity(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0.5, 0, 0.5), MATERIALS[Math.min(count - 1, MATERIALS.length) - 1]);
-            entity.setNoGravity(true);
+            RBlockDisplay entity = new RBlockDisplay(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0.5, 0, 0.5));
+            entity.setBlock(MATERIALS[Math.min(count - 1, MATERIALS.length) - 1].createBlockData());
            rEntities.put(point, entity);
            if (outlinePoints.contains(point)) outlinePointsCache.add(point);
            killCount.put(point, count);
@@ -325,7 +329,7 @@ public class KillcheckerVisualizer {
            if (point.getX() < minPoint.getX() || point.getX() > maxPoint.getX()) continue;
            if (point.getY() < minPoint.getY() || point.getY() > maxPoint.getY()) continue;
            if (point.getZ() < minPoint.getZ() || point.getZ() > maxPoint.getZ()) continue;
-            
+
            if (WORLD.getBlockAt(point.getX() + 1, point.getY(), point.getZ()).getType() == type) {
                points.add(new Point(point.getX() + 1, point.getY(), point.getZ()));
            }
@@ -71,7 +71,7 @@ public class Loader implements Listener, SWPlayer.Component {

        BauSystem.runTaskTimer(BauSystem.getInstance(), () -> {
            if (stage != Stage.RUNNING && stage != Stage.SINGLE) return;
-            if(!Permission.BUILD.hasPermission(p)) return;
+            if (!Permission.BUILD.hasPermission(p)) return;
            if (waitTime > 0) {
                waitTime--;
                return;
@@ -213,7 +213,8 @@ public class Loader implements Listener, SWPlayer.Component {
        };
        updateRunnable.run();

-        SWListInv<LoaderElement> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("LOADER_GUI_TITLE", p), false, list, (clickType, loaderElement) -> {});
+        SWListInv<LoaderElement> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("LOADER_GUI_TITLE", p), false, list, (clickType, loaderElement) -> {
+        });
        swListInv.setCallback((clickType, entry) -> entry.click(p, () -> {
            updateRunnable.run();
            swListInv.open();
@@ -363,7 +364,9 @@ public class Loader implements Listener, SWPlayer.Component {
        public static int LENGTH = SettingsSorting.values().length;

        public abstract Material getMaterial();
+
        public abstract String getName();
+
        public abstract boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next);
    }

@@ -41,7 +41,7 @@ public class LoaderScoreboardElement implements ScoreboardElement {

    @Override
    public String get(Region region, Player p) {
-        if(!Permission.BUILD.hasPermission(p)) return null;
+        if (!Permission.BUILD.hasPermission(p)) return null;
        Loader loader = Loader.getLoader(p);
        if (loader == null) return null;
        if (loader.getStage() == Loader.Stage.RUNNING) {
@@ -26,6 +26,8 @@ import java.util.function.Consumer;

 public interface LoaderElement {
    SWItem menu(Player player);
+
    void execute(Consumer<Long> delay);
+
    void click(Player player, Runnable backAction);
 }
@@ -95,7 +95,8 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
        };
        updateRunnable.run();

-        SWListInv<Integer> listInv = new SWListInv<>(player, "Interaction Settings", false, entries, (clickType, entry) -> {});
+        SWListInv<Integer> listInv = new SWListInv<>(player, "Interaction Settings", false, entries, (clickType, entry) -> {
+        });
        listInv.setCallback((clickType, entry) -> {
            openIndividualSettingsMenu(player, entry, () -> {
                updateRunnable.run();
@@ -150,7 +151,10 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
        }

        SWInventory swInventory = new SWInventory(player, guiSize, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
-        for (int i = guiSize - 9; i < guiSize; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7", clickType -> {}));
+        for (int i = guiSize - 9; i < guiSize; i++) {
+            swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7", clickType -> {
+            }));
+        }
        swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).setCustomModelData(CMDs.BACK).getItemStack(), clickType -> back.run());
        swInventory.setItem(guiSize - 5, new SWItem(Material.WOODEN_AXE, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_COPY", player)).getItemStack(), clickType -> {
            SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_GUI_COPY_TITLE", player), "1");
@@ -197,7 +201,8 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
            for (int power = 0; power < 16; power++) {
                int finalPowerPosition = power;
                if (power >= 9) finalPowerPosition++;
-                SWItem powerItem = new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("LOADER_SETTING_POWER", player, power), Arrays.asList(), false, clickType -> {});
+                SWItem powerItem = new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("LOADER_SETTING_POWER", player, power), Arrays.asList(), false, clickType -> {
+                });
                powerItem.getItemStack().setAmount(Math.max(power, 1));
                if (extraPower.get(index) == power) powerItem.setEnchanted(true);

@@ -210,7 +215,8 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
        }

        if (currentElement.hasTicks(this)) {
-            swInventory.setItem(ticksStart + 3, new SWItem(SWItem.getDye(1), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+            swInventory.setItem(ticksStart + 3, new SWItem(Material.RED_DYE, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {
+            }).getItemStack(), clickType -> {
                long ticks = extraTicks.get(index);
                ticks -= clickType.isShiftClick() ? 5 : 1;
                if (ticks < 1) ticks = 1;
@@ -218,7 +224,8 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
                openIndividualSettingsMenu(player, index, back, delete);
            });

-            SWItem ticksItem = new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS", player, extraTicks.get(index)), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)), false, clickType -> {});
+            SWItem ticksItem = new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS", player, extraTicks.get(index)), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)), false, clickType -> {
+            });
            ticksItem.getItemStack().setAmount((int) Math.min(extraTicks.get(index), 64));
            swInventory.setItem(ticksStart + 4, ticksItem.getItemStack(), clickType -> {
                SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_NAME", player), extraTicks.get(index) + "");
@@ -234,7 +241,8 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
                swAnvilInv.open();
            });

-            swInventory.setItem(ticksStart + 5, new SWItem(SWItem.getDye(10), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+            swInventory.setItem(ticksStart + 5, new SWItem(Material.LIME_DYE, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {
+            }).getItemStack(), clickType -> {
                long ticks = extraTicks.get(index);
                ticks += clickType.isShiftClick() ? 5 : 1;
                extraTicks.set(index, ticks);
@@ -28,10 +28,13 @@ import java.util.function.Consumer;

 public interface LoaderSettingsEnum<T, P extends LoaderInteractionElement<E>, E extends Enum<E> & LoaderSettingsEnum<T, P, E>> {
    int getPos();
+
    SWItem menu(Player player, P parent, int power, long ticks);
+
    default boolean hasPower(P parent) {
        return false;
    }
+
    default boolean hasTicks(P parent) {
        return false;
    }
@@ -63,7 +63,8 @@ public class LoaderWait implements LoaderElement {
        for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
        swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_WAIT_BACK", player)).setCustomModelData(CMDs.BACK).getItemStack(), clickType -> backAction.run());

-        swInventory.setItem(3, new SWItem(SWItem.getDye(1), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+        swInventory.setItem(3, new SWItem(Material.RED_DYE, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {
+        }).getItemStack(), clickType -> {
            delay -= clickType.isShiftClick() ? 5 : 1;
            if (delay < 0) delay = 0;
            swInventory.setItem(4, menu(player));
@@ -80,7 +81,8 @@ public class LoaderWait implements LoaderElement {
            });
            swAnvilInv.open();
        });
-        swInventory.setItem(5, new SWItem(SWItem.getDye(10), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+        swInventory.setItem(5, new SWItem(Material.LIME_DYE, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {
+        }).getItemStack(), clickType -> {
            delay += clickType.isShiftClick() ? 5 : 1;
            swInventory.setItem(4, menu(player));
        });
@@ -146,8 +146,7 @@ public class Loadtimer implements Listener {
        if ((stage == Stage.COUNTING || stage == Stage.ACTIVATED)) {
            stage = Stage.IGNITION;
            ignite = TPSUtils.currentRealTick.get();
-            if (activate == -1)
-                activate = TPSUtils.currentRealTick.get();
+            if (activate == -1) activate = TPSUtils.currentRealTick.get();
            if (finishOnActive) {
                stage = Stage.END;
                print();
@@ -184,8 +183,7 @@ public class Loadtimer implements Listener {

        long ignTime = ignite - activate;
        long explTime = explode - ignTime - activate;
-        if (explTime < 0)
-            explTime = loadTime;
+        if (explTime < 0) explTime = loadTime;

        int finalAllTnt = allTnt;
        long finalExplTime = explTime;
@@ -40,16 +40,18 @@ public class LoadtimerCommand extends SWCommand {
    public void start(@Validator Player p, TimerMode mode) {
        Region r = Region.getRegion(p.getLocation());
        if (r.getType().isGlobal()) return;
-        if (!Loadtimer.hasTimer(r))
+        if (!Loadtimer.hasTimer(r)) {
            Loadtimer.createLoadtimer(r, mode == TimerMode.HALF);
+        }
    }

    @Register(value = "stop", description = "LOADTIMER_HELP_STOP")
    public void stop(@Validator Player p) {
        Region r = Region.getRegion(p.getLocation());
        if (r.getType().isGlobal()) return;
-        if (Loadtimer.hasTimer(r))
+        if (Loadtimer.hasTimer(r)) {
            Loadtimer.getTimer(r).delete();
+        }
    }

    public enum TimerMode {
@@ -46,8 +46,9 @@ public class LoadtimerGuiItem extends BauGuiItem {
    @Override
    public ItemStack getItem(Player player) {
        Region r = Region.getRegion(player.getLocation());
-        if (r.getType().isGlobal())
+        if (r.getType().isGlobal()) {
            return new SWItem(Material.BOWL, BauSystem.MESSAGE.parse("LOADTIMER_GUI_GLOBAL", player)).getItemStack();
+        }
        if (Loadtimer.hasTimer(r)) {
            return new SWItem(Material.BOW, BauSystem.MESSAGE.parse("LOADTIMER_GUI_STOP", player)).getItemStack();
        } else {
@@ -20,9 +20,9 @@
 package de.steamwar.bausystem.features.loadtimer;

 import de.steamwar.bausystem.region.Region;
-import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
@@ -57,7 +57,7 @@ public class LoadtimerListener implements Listener {

    @EventHandler
    public void onEntitySpawn(EntitySpawnEvent event) {
-        if (!getTimers().isEmpty() && event.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
+        if (!getTimers().isEmpty() && event.getEntityType() == EntityType.TNT) {
            Region r = Region.getRegion(event.getLocation());
            if (hasTimer(r)) {
                getTimer(r).onTntSpawn();
@@ -67,7 +67,7 @@ public class LoadtimerListener implements Listener {

    @EventHandler
    public void onEntityExplode(EntityExplodeEvent event) {
-        if (!getTimers().isEmpty() && event.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
+        if (!getTimers().isEmpty() && event.getEntityType() == EntityType.TNT) {
            Region r = Region.getRegion(event.getLocation());
            if (hasTimer(r)) {
                getTimer(r).onTntExplode(event);
@@ -54,7 +54,7 @@ public class ObserverTracerListener implements Listener {

    @EventHandler
    public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (!enabled.contains(event.getPlayer())) return;
        if (event.getClickedBlock() == null) return;
        ObserverTracer observerTracer = SWPlayer.of(event.getPlayer()).getComponent(ObserverTracer.class).orElse(null);
@@ -28,7 +28,6 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.entity.CRay;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.*;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
@@ -42,7 +41,6 @@ import org.bukkit.util.RayTraceResult;
 import java.util.List;

@Linked
-@MinVersion(20)
 public class RayVisualizerCommand extends SWCommand implements Listener {

    private BlockData VISIBLE = Material.LIME_CONCRETE.createBlockData();
@@ -63,9 +61,9 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
        }

        private boolean locEquals(Location loc1, Location loc2) {
-            if ((long)(loc1.getX() * 1000) != (long)(loc2.getX() * 1000)) return false;
-            if ((long)(loc1.getY() * 1000) != (long)(loc2.getY() * 1000)) return false;
-            if ((long)(loc1.getZ() * 1000) != (long)(loc2.getZ() * 1000)) return false;
+            if ((long) (loc1.getX() * 1000) != (long) (loc2.getX() * 1000)) return false;
+            if ((long) (loc1.getY() * 1000) != (long) (loc2.getY() * 1000)) return false;
+            if ((long) (loc1.getZ() * 1000) != (long) (loc2.getZ() * 1000)) return false;
            return true;
        }

@@ -36,12 +36,16 @@ public class FireListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onFireDamage(BlockBurnEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) {
+            e.setCancelled(true);
+        }
    }

    @EventHandler
    public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) {
+            e.setCancelled(true);
+        }
    }

    @Override
@@ -44,11 +44,11 @@ public class FreezeCommand extends SWCommand {
        }
    }

-    private String getEnableMessage(){
+    private String getEnableMessage() {
        return "REGION_FREEZE_ENABLED";
    }

-    private String getDisableMessage(){
+    private String getDisableMessage() {
        return "REGION_FREEZE_DISABLED";
    }

@@ -24,8 +24,6 @@ import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
-import de.steamwar.core.Core;
-import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -33,6 +31,7 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.type.NoteBlock;
 import org.bukkit.block.data.type.Switch;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -48,7 +47,9 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onBlockExplode(BlockExplodeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) {
+            return;
+        }
        e.setCancelled(true);
        BlockState state = e.getBlock().getState();
        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -58,9 +59,11 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) {
+            return;
+        }
        e.setCancelled(true);
-        if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
+        if (e.getEntityType() == EntityType.TNT) {
            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                e.getLocation().getBlock().setType(Material.TNT, false);
            }, 1L);
@@ -70,7 +73,9 @@ public class FreezeListener implements Listener, ScoreboardElement {
    @EventHandler
    public void onBlockCanBuild(BlockCanBuildEvent e) {
        if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) {
+            return;
+        }
        if (e.getMaterial() == Material.TNT) {
            e.setBuildable(false);
            e.getBlock().setType(Material.TNT, false);
@@ -155,7 +160,6 @@ public class FreezeListener implements Listener, ScoreboardElement {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onBlockBreak(BlockBreakEvent e) {
-        if (Core.getVersion() < 19) return;
        if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
            e.setCancelled(true);
@@ -25,11 +25,9 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ItemMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.entity.Player;

@Linked
-@MinVersion(19)
 public class ItemsCommand extends SWCommand {

    public ItemsCommand() {
@@ -46,11 +44,11 @@ public class ItemsCommand extends SWCommand {
        }
    }

-    private String getEnableMessage(){
+    private String getEnableMessage() {
        return "REGION_ITEMS_ENABLED";
    }

-    private String getDisableMessage(){
+    private String getDisableMessage() {
        return "REGION_ITEMS_DISABLED";
    }

@@ -25,14 +25,12 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ItemMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.ItemSpawnEvent;

@Linked
-@MinVersion(19)
 public class ItemsListener implements Listener, ScoreboardElement {

    @EventHandler
@@ -97,7 +97,7 @@ public class RegionCommand extends SWCommand {
    @Register(value = "restore", description = "REGION_REGION_HELP_RESTORE")
    public void genericRestoreCommand(@Validator Player p) {
        Region region = Region.getRegion(p.getLocation());
-        if(checkGlobalRegion(region, p)) return;
+        if (checkGlobalRegion(region, p)) return;

        try {
            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
@@ -116,7 +116,7 @@ public class RegionCommand extends SWCommand {
        Region region = Region.getRegion(p.getLocation());
        if (checkGlobalRegion(region, p)) return;

-        if(node.isDir()) {
+        if (node.isDir()) {
            BauSystem.MESSAGE.send("ONLY_SCHEMS", p);
            return;
        }
@@ -59,7 +59,9 @@ public class RegionListener implements Listener {

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onBlockPhysics(final BlockPhysicsEvent event) {
-        if (event.getBlock().getType() != event.getChangedType()) RegionListener.tagChangedRegion(event.getBlock().getLocation());
+        if (event.getBlock().getType() != event.getChangedType()) {
+            RegionListener.tagChangedRegion(event.getBlock().getLocation());
+        }
    }

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -72,7 +72,7 @@ public class TestblockCommand extends SWCommand {
        resetRegion(p, node, isExtension ? RegionExtensionType.EXTENSION : RegionExtensionType.NORMAL, isIgnoreAir, isOnlyColor, replaceTNT, replaceWater);
    }

-    @Register(value="default")
+    @Register(value = "default")
    public void setTestblockDefault(Player p) {
        Region region = regionCheck(p);
        if (region == null) return;
@@ -33,11 +33,11 @@ public class WaterDestroyCommand extends SWCommand {
        super("waterdestroy");
    }

-    private String getEnableMessage(){
+    private String getEnableMessage() {
        return "REGION_WATER_ENABLED";
    }

-    private String getDisableMessage(){
+    private String getDisableMessage() {
        return "REGION_WATER_DISABLED";
    }

@@ -36,7 +36,9 @@ public class WaterDestroyListener implements Listener, ScoreboardElement {

    @EventHandler
    public void onBlockFromTo(BlockFromToEvent event) {
-        if (event.getBlock().getType() == Material.WATER && event.getToBlock().getType() != Material.AIR && Region.getRegion(event.getBlock().getLocation()).getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) event.setCancelled(true);
+        if (event.getBlock().getType() == Material.WATER && event.getToBlock().getType() != Material.AIR && Region.getRegion(event.getBlock().getLocation()).getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) {
+            event.setCancelled(true);
+        }
    }

    @Override
@@ -67,7 +67,7 @@ public class ScriptGUI implements Listener {
                lore.add(BauSystem.MESSAGE.parse("SCRIPT_ERROR_GUI", player, String.join(":", Arrays.copyOfRange(sp, 1, sp.length))));
            }

-            if(!lore.isEmpty()) {
+            if (!lore.isEmpty()) {
                lore.add("");
            }
            lore.add(BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_ITEM_LORE_1", player));
@@ -75,16 +75,17 @@ public class ScriptGUI implements Listener {
            lore.add(BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_ITEM_LORE_3", player));
            lore.add(BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_ITEM_LORE_4", player));

-            entries.add(new SWListInv.SWListEntry<>(new SWItem(Material.ENCHANTED_BOOK, script.getName(), new ArrayList<>(lore), false, clickType -> {}), script));
+            entries.add(new SWListInv.SWListEntry<>(new SWItem(Material.ENCHANTED_BOOK, script.getName(), new ArrayList<>(lore), false, clickType -> {
+            }), script));
            lore.clear();
        });

        SWListInv<Script> inv = new SWListInv<>(player, BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_NAME", player), false, entries, (clickType, script) -> {
            ItemStack itemStack = ScriptHelper.getScriptItem(script, clickType.isRightClick());

-            if(clickType == ClickType.MIDDLE) {
+            if (clickType == ClickType.MIDDLE) {
                player.openBook(itemStack);
-            } else if(!clickType.isShiftClick()) {
+            } else if (!clickType.isShiftClick()) {
                script.delete();
                ScriptRunner.updateGlobalScript(player);
                open(player, itemStack);
@@ -93,14 +94,14 @@ public class ScriptGUI implements Listener {
            }
        });
        inv.setItem(49, Material.HOPPER, BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_ITEM_ADD_NAME", player), Collections.singletonList(BauSystem.MESSAGE.parse("SCRIPT_MENU_GUI_ITEM_ADD_LORE", player)), false, click -> {
-            if(player.getOpenInventory().getCursor() != null) {
+            if (player.getOpenInventory().getCursor() != null) {
                ItemStack cursor = player.getOpenInventory().getCursor();
-                if(!(cursor.getItemMeta() instanceof BookMeta)) {
+                if (!(cursor.getItemMeta() instanceof BookMeta)) {
                    return;
                }

                BookMeta meta = (BookMeta) cursor.getItemMeta();
-                if(meta == null) {
+                if (meta == null) {
                    return;
                }

@@ -108,14 +109,14 @@ public class ScriptGUI implements Listener {
            }
        });
        inv.open();
-        if(setCursor != null) {
+        if (setCursor != null) {
            player.getOpenInventory().setCursor(setCursor);
        }
    }

    private static void saveWithName(Player player, BookMeta meta, String name) {
        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
-        if(name != null && Script.list(user).stream().noneMatch(script -> script.getName().equalsIgnoreCase(name))) {
+        if (name != null && Script.list(user).stream().noneMatch(script -> script.getName().equalsIgnoreCase(name))) {
            Script.create(user, name, ScriptHelper.getScriptString(meta.getPages()));
            player.getOpenInventory().setCursor(null);
            ScriptRunner.updateGlobalScript(player);
@@ -36,7 +36,7 @@ public class ScriptHelper {
    public static ItemStack getScriptItem(Script script, boolean writeable) {
        ItemStack itemStack = new ItemStack(writeable ? Material.WRITABLE_BOOK : Material.WRITTEN_BOOK);
        BookMeta meta = (BookMeta) itemStack.getItemMeta();
-        if(!writeable) {
+        if (!writeable) {
            meta.setTitle(script.getName());
            meta.setAuthor(SteamwarUser.byId(script.getUserId()).getUserName());
        }
@@ -44,7 +44,7 @@ public class ScriptListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH)
    public void onLeftClick(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;

        ItemStack item = event.getItem();
        if (item == null || FlatteningWrapper.impl.isNoBook(item) || item.getItemMeta() == null) {
@@ -72,7 +72,7 @@ public class ScriptListener implements Listener {

    @EventHandler
    public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        ScriptRunner.updateGlobalScript(event.getPlayer());
    }

@@ -102,7 +102,7 @@ public class ScriptRunner {
                .orElse(Collections.emptyMap())
                .getOrDefault(event, Collections.emptyList());
        if (luaFunctions.isEmpty()) {
-            if(event == SteamWarGlobalLuaPlugin.EventType.DoubleSwap) {
+            if (event == SteamWarGlobalLuaPlugin.EventType.DoubleSwap) {
                player.performCommand("gui");
            }
            return;
@@ -32,7 +32,7 @@ public class CommandListener implements Listener {

    @EventHandler
    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        String[] split = event.getMessage().split(" ");
        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
        if (scriptData.getCalledCommands().contains(split[0])) return;
@@ -26,10 +26,10 @@ import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.core.SWPlayer;
-import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -141,7 +141,7 @@ public class EventListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH)
    public void onEntitySpawn(EntitySpawnEvent event) {
-        if (event.getEntityType() != TrickyTrialsWrapper.impl.getTntEntityType()) {
+        if (event.getEntityType() != EntityType.TNT) {
            return;
        }
        Region tntRegion = Region.getRegion(event.getLocation());
@@ -156,7 +156,7 @@ public class EventListener implements Listener {

    @EventHandler(priority = EventPriority.LOWEST)
    public void onEntityExplode(EntityExplodeEvent event) {
-        if (event.getEntityType() != TrickyTrialsWrapper.impl.getTntEntityType()) {
+        if (event.getEntityType() != EntityType.TNT) {
            return;
        }
        Region tntRegion = Region.getRegion(event.getLocation());
@@ -72,7 +72,7 @@ public interface LuaLib {

    default LuaTable toPos(Point point) {
        if (point == null) return LuaTable.tableOf();
-        return LuaValue.tableOf(new LuaValue[] {
+        return LuaValue.tableOf(new LuaValue[]{
                LuaValue.valueOf("x"), LuaValue.valueOf(point.getX()),
                LuaValue.valueOf("y"), LuaValue.valueOf(point.getY()),
                LuaValue.valueOf("z"), LuaValue.valueOf(point.getZ())
@@ -82,7 +82,9 @@ public interface LuaLib {
    default Class<? extends LuaLib> parent() {
        return null;
    }
+
    String name();
+
    LuaTable get(Player player);

    @AllArgsConstructor
@@ -103,27 +105,33 @@ public interface LuaLib {
                        try {
                            consumer.accept(luaValue.toboolean());
                            return NIL;
-                        } catch (Exception ingored) {}
+                        } catch (Exception ingored) {
+                        }
                        try {
                            consumer.accept((long) luaValue.toint());
                            return NIL;
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                        try {
                            consumer.accept(luaValue.toint());
                            return NIL;
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                        try {
                            consumer.accept(luaValue.todouble());
                            return NIL;
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                        try {
                            consumer.accept((float) luaValue.todouble());
                            return NIL;
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                        try {
                            consumer.accept(luaValue.toString());
                            return NIL;
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                        throw new LuaError("Invalid lua type: " + luaValue.typename());
                    } catch (Throwable throwable) {
                        throw new LuaError("Error in '" + name + "' " + throwable.getMessage());
@@ -84,12 +84,12 @@ public class RandomLib implements LuaLib {

    private static class NextBool extends VarArgFunction {

-            @Override
-            public Varargs invoke(Varargs args) {
-                if (args.narg() == 0) {
-                    return LuaValue.valueOf(random.nextBoolean());
-                }
-                throw new LuaError("Invalid number of arguments for random.nextBoolean() zero expected got " + args.narg());
+        @Override
+        public Varargs invoke(Varargs args) {
+            if (args.narg() == 0) {
+                return LuaValue.valueOf(random.nextBoolean());
            }
+            throw new LuaError("Invalid number of arguments for random.nextBoolean() zero expected got " + args.narg());
+        }
    }
 }
@@ -78,7 +78,7 @@ public class RegionLib implements LuaLib {

        Loader loader = Loader.getLoader(player);
        table.set("loader", getter(() -> loader == null ? "OFF" : loader.getStage().name()));
-        
+
        table.set("copyPoint", getter(() -> toPos(region.get().getBuildArea().getCopyPoint())));
        table.set("minPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
        table.set("maxPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.script.lua.libs;
 import com.google.gson.*;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionSystem;
-import de.steamwar.core.Core;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Disable;
 import de.steamwar.linkage.api.Enable;
@@ -56,7 +55,6 @@ public class StorageLib implements LuaLib, Enable, Disable {

    @Override
    public void enable() {
-        if (Core.getVersion() <= 15) return;
        if (!storageDirectory.exists()) storageDirectory.mkdirs();

        try {
@@ -64,7 +62,8 @@ public class StorageLib implements LuaLib, Enable, Disable {
            jsonObject.keySet().forEach(key -> {
                GLOBAL_STORAGE.put(key, fromJson(jsonObject.get(key)));
            });
-        } catch (Exception e) {}
+        } catch (Exception e) {
+        }

        File regionStorageDirectory = new File(storageDirectory, "region");
        regionStorageDirectory.mkdirs();
@@ -77,7 +76,8 @@ public class StorageLib implements LuaLib, Enable, Disable {
                });
                Region region = RegionSystem.INSTANCE.getRegion(UUID.fromString(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length()))).orElse(null);
                REGION_STORAGE.put(region, map);
-            } catch (Exception e) {}
+            } catch (Exception e) {
+            }
        }

        File playerStorageDirectory = new File(storageDirectory, "player");
@@ -91,7 +91,8 @@ public class StorageLib implements LuaLib, Enable, Disable {
                });
                SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
                PLAYER_STORAGE.put(steamwarUser.getUUID(), map);
-            } catch (Exception e) {}
+            } catch (Exception e) {
+            }
        }
    }

@@ -107,10 +108,12 @@ public class StorageLib implements LuaLib, Enable, Disable {
            if (jsonPrimitive.isNumber()) {
                try {
                    return LuaValue.valueOf(jsonPrimitive.getAsInt());
-                } catch (NumberFormatException e) {}
+                } catch (NumberFormatException e) {
+                }
                try {
                    return LuaValue.valueOf(jsonPrimitive.getAsDouble());
-                } catch (NumberFormatException e) {}
+                } catch (NumberFormatException e) {
+                }
            }
            if (jsonPrimitive.isString()) {
                return LuaValue.valueOf(jsonPrimitive.getAsString());
@@ -132,13 +135,13 @@ public class StorageLib implements LuaLib, Enable, Disable {

    @Override
    public void disable() {
-        if (Core.getVersion() <= 15) return;
        if (!storageDirectory.exists()) storageDirectory.mkdirs();
        try {
            FileWriter fileWriter = new FileWriter(new File(storageDirectory, "global.json"));
            gson.toJson(toJson(GLOBAL_STORAGE), fileWriter);
            fileWriter.close();
-        } catch (IOException e) {}
+        } catch (IOException e) {
+        }

        File regionStorageDirectory = new File(storageDirectory, "region");
        regionStorageDirectory.mkdirs();
@@ -147,7 +150,8 @@ public class StorageLib implements LuaLib, Enable, Disable {
                FileWriter fileWriter = new FileWriter(new File(regionStorageDirectory, entry.getKey().getID().toString() + ".json"));
                gson.toJson(toJson(entry.getValue()), fileWriter);
                fileWriter.close();
-            } catch (IOException e) {}
+            } catch (IOException e) {
+            }
        }

        File playerStorageDirectory = new File(storageDirectory, "player");
@@ -157,7 +161,8 @@ public class StorageLib implements LuaLib, Enable, Disable {
                FileWriter fileWriter = new FileWriter(new File(playerStorageDirectory, SteamwarUser.get(entry.getKey()).getId() + ".json"));
                gson.toJson(toJson(entry.getValue()), fileWriter);
                fileWriter.close();
-            } catch (IOException e) {}
+            } catch (IOException e) {
+            }
        }
    }

@@ -177,13 +182,16 @@ public class StorageLib implements LuaLib, Enable, Disable {
        }
        try {
            return new JsonPrimitive(luaValue.checkboolean());
-        } catch (Exception e) {}
+        } catch (Exception e) {
+        }
        try {
            return new JsonPrimitive(luaValue.checkint());
-        } catch (Exception e) {}
+        } catch (Exception e) {
+        }
        try {
            return new JsonPrimitive(luaValue.checkdouble());
-        } catch (Exception e) {}
+        } catch (Exception e) {
+        }

        if (luaValue.isstring()) {
            return new JsonPrimitive(luaValue.tojstring());
@@ -196,7 +204,8 @@ public class StorageLib implements LuaLib, Enable, Disable {
                if (value == null) continue;
                try {
                    jsonObject.add(key.checkjstring(), value);
-                } catch (Exception e) {}
+                } catch (Exception e) {
+                }
            }
            return jsonObject;
        }
@@ -252,7 +261,9 @@ public class StorageLib implements LuaLib, Enable, Disable {
                        }
                    }
                };
-            };
+            }
+
+            ;
        });
        storageLib.set("global", global);

@@ -297,7 +308,9 @@ public class StorageLib implements LuaLib, Enable, Disable {
                        }
                    }
                };
-            };
+            }
+
+            ;
        });
        storageLib.set("player", playerStorage);

@@ -346,7 +359,9 @@ public class StorageLib implements LuaLib, Enable, Disable {
                        }
                    }
                };
-            };
+            }
+
+            ;
        });
        storageLib.set("region", regionStorage);

@@ -45,7 +45,7 @@ public class WorldEditLib implements LuaLib {
            return selection;
        }, o -> {
            LuaTable selection = o.checktable();
-            if(selection.length() != 2) {
+            if (selection.length() != 2) {
                throw new IllegalArgumentException("selection must have exactly 2 elements");
            }

@@ -26,7 +26,9 @@ import org.bukkit.entity.Player;
 public interface BlockDataConfiguration<T extends BlockData> {

    void previous();
+
    void next();
+
    SWItem get(Player player);

    void apply(T copied, T worldOriginal);
@@ -29,14 +29,12 @@ import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import java.util.Collection;

@Linked
-@MinVersion(19)
 public class SimulatorCommand extends SWCommand {

    @LinkedInstance
@@ -19,7 +19,6 @@

 package de.steamwar.bausystem.features.simulator;

-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
@@ -38,79 +37,88 @@ import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.ItemUtils;
-import de.steamwar.bausystem.utils.RayTraceUtils;
+import de.steamwar.core.SWPlayer;
+import de.steamwar.cursor.Cursor;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.player.*;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;

-import java.util.*;
-import java.util.function.BiFunction;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;

@Linked
-@MinVersion(19)
 public class SimulatorCursor implements Listener {

-    private static final World WORLD = Bukkit.getWorlds().get(0);
-
-    private static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
-    private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
-    private static final Set<Player> calculating = new HashSet<>();
+    private static final Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<Player, REntityServer> emptyTargetServers = Collections.synchronizedMap(new HashMap<>());

    public static boolean isSimulatorItem(ItemStack itemStack) {
        return ItemUtils.isItem(itemStack, "simulator");
    }

-    public SimulatorCursor() {
-        BiFunction<Player, Object, Object> function = (player, object) -> {
-            calcCursor(player);
-            return object;
-        };
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, function);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, function);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, function);
+    private static boolean hasSimulatorItem(Player player) {
+        return isSimulatorItem(player.getInventory().getItemInMainHand()) || isSimulatorItem(player.getInventory().getItemInOffHand());
+    }
+
+    private static void scheduleCursorUpdate(Player player) {
+        BauSystem.runTaskLater(BauSystem.getInstance(), () -> calcCursor(player), 1);
    }

    @EventHandler
    public void onPlayerJoin(PlayerJoinEvent event) {
        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            calcCursor(event.getPlayer());
-        }, 0);
+        scheduleCursorUpdate(event.getPlayer());
    }

    @EventHandler
    public void onPlayerDropItem(PlayerDropItemEvent event) {
        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        calcCursor(event.getPlayer());
+        scheduleCursorUpdate(event.getPlayer());
    }

    @EventHandler
    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            calcCursor(event.getPlayer());
-        }, 1);
+        scheduleCursorUpdate(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        if (!(event.getWhoClicked() instanceof Player player)) return;
+        if (!Permission.BUILD.hasPermission(player)) return;
+        scheduleCursorUpdate(player);
+    }
+
+    @EventHandler
+    public void onInventoryDrag(InventoryDragEvent event) {
+        if (!(event.getWhoClicked() instanceof Player player)) return;
+        if (!Permission.BUILD.hasPermission(player)) return;
+        scheduleCursorUpdate(player);
    }

    @EventHandler
@@ -121,10 +129,7 @@ public class SimulatorCursor implements Listener {
    @EventHandler
    public void onPlayerQuit(PlayerQuitEvent event) {
        cursorType.remove(event.getPlayer());
-        cursors.remove(event.getPlayer());
-        synchronized (calculating) {
-            calculating.remove(event.getPlayer());
-        }
+        removeCursor(event.getPlayer());
    }

    private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
@@ -140,7 +145,7 @@ public class SimulatorCursor implements Listener {
    public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
        if (!event.isSneaking()) return;
        Player player = event.getPlayer();
-        if (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand())) {
+        if (!hasSimulatorItem(player)) {
            return;
        }
        if (LAST_SNEAKS.containsKey(player)) {
@@ -166,17 +171,10 @@ public class SimulatorCursor implements Listener {
    }

    public static void calcCursor(Player player) {
-        synchronized (calculating) {
-            if (calculating.contains(player)) return;
-            calculating.add(player);
-        }
-        if (!Permission.BUILD.hasPermission(player) || (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand()))) {
-            if (removeCursor(player) || SimulatorWatcher.show(null, player)) {
+        if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
+            if (removeCursor(player) | SimulatorWatcher.show(null, player)) {
                SWUtils.sendToActionbar(player, "");
            }
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
            return;
        }

@@ -185,202 +183,98 @@ public class SimulatorCursor implements Listener {
            removeCursor(player);
            SimulatorWatcher.show(null, player);
            SWUtils.sendToActionbar(player, "§cGenerating Stab");
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
            return;
        }

        SimulatorWatcher.show(simulator, player);
-        List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
-        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
-        if (rayTraceResult == null) {
-            removeCursor(player);
-            if (simulator == null) {
-                SWUtils.sendToActionbar(player, "§eSelect Simulator");
-            } else {
-                SWUtils.sendToActionbar(player, "§eOpen Simulator");
-            }
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
-            return;
+        Cursor cursor = getOrCreateCursor(player, simulator, cursorType.getOrDefault(player, CursorType.TNT));
+        cursor.renderDeduplicated();
+    }
+
+    private static Cursor getOrCreateCursor(Player player, Simulator simulator, CursorType type) {
+        REntityServer targetServer = simulator == null ? emptyTargetServers.computeIfAbsent(player, __ -> new REntityServer()) : SimulatorWatcher.getEntityServerOfSimulator(simulator);
+        SWPlayer swPlayer = SWPlayer.of(player);
+        Optional<Cursor> activeCursor = swPlayer.getComponent(Cursor.class);
+
+        Cursor cursor = activeCursor.orElse(null);
+        if (cursor == null || cursor.getTargetServer() != targetServer) {
+            swPlayer.removeComponent(Cursor.class);
+            cursor = new Cursor(
+                    targetServer,
+                    player,
+                    Material.GLASS,
+                    type.material,
+                    type.cursorModes,
+                    (location, hitEntity, action) -> handlePlayerClick(player, location, hitEntity, action),
+                    (location, hitEntity) -> sendCursorActionbar(player, SimulatorStorage.getSimulator(player), location != null, hitEntity.isPresent())
+            );
+        } else {
+            cursor.setCursorMaterial(type.material);
+            cursor.setAllowedCursorModes(type.cursorModes);
        }

-        showCursor(player, rayTraceResult, simulator != null);
-        synchronized (calculating) {
-            calculating.remove(player);
-        }
+        return cursor;
    }

    private static synchronized boolean removeCursor(Player player) {
-        REntityServer entityServer = cursors.get(player);
-        boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
-        if (entityServer != null) {
-            entityServer.getEntities().forEach(REntity::die);
+        Optional<Cursor> cursor = SWPlayer.of(player).getComponent(Cursor.class);
+        cursor.ifPresent(__ -> SWPlayer.of(player).removeComponent(Cursor.class));
+        REntityServer emptyTargetServer = emptyTargetServers.remove(player);
+        if (emptyTargetServer != null) {
+            emptyTargetServer.close();
        }
-        return hadCursor;
+        return cursor.isPresent();
    }

-    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
-        REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
-            REntityServer rEntityServer = new REntityServer();
-            rEntityServer.addPlayer(player);
-            return rEntityServer;
-        });
-
-        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
-        REntity hitEntity = rayTraceResult.getHitEntity();
-        Location location = hitEntity != null ? new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD) :
-                type.position.apply(player, rayTraceResult).toLocation(WORLD);
-
-        Material material = hitEntity != null ? Material.GLASS : type.getMaterial();
-        List<RFallingBlockEntity> entities = entityServer.getEntitiesByType(RFallingBlockEntity.class);
-        entities.removeIf(rFallingBlockEntity -> {
-            if (rFallingBlockEntity.getMaterial() != material) {
-                rFallingBlockEntity.die();
-                return true;
-            }
-            rFallingBlockEntity.move(location);
-            return false;
-        });
-        if (entities.isEmpty()) {
-            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(entityServer, location, material);
-            rFallingBlockEntity.setNoGravity(true);
-            if (material == Material.GLASS) {
-                rFallingBlockEntity.setGlowing(true);
-            }
-        }
-
-        if (hasSimulatorSelected) {
-            if (hitEntity != null) {
-                SWUtils.sendToActionbar(player, "§eEdit Position");
-            } else {
-                SWUtils.sendToActionbar(player, "§eAdd new " + type.name);
-            }
-        } else {
+    private static void sendCursorActionbar(Player player, Simulator simulator, boolean hasCursorLocation, boolean hasHitEntity) {
+        if (!hasCursorLocation) {
+            SWUtils.sendToActionbar(player, simulator == null ? "§eSelect Simulator" : "§eOpen Simulator");
+        } else if (simulator == null) {
            SWUtils.sendToActionbar(player, "§eCreate new Simulator");
-        }
-    }
-
-    public static Vector getPosFree(Player player, RayTraceUtils.RRayTraceResult result) {
-        Vector pos = result.getHitPosition();
-
-        BlockFace face = result.getHitBlockFace();
-        if (face != null) {
-            switch (face) {
-                case DOWN:
-                    pos.setY(pos.getY() - 0.98);
-                    break;
-                case EAST:
-                    pos.setX(pos.getX() + 0.49);
-                    break;
-                case WEST:
-                    pos.setX(pos.getX() - 0.49);
-                    break;
-                case NORTH:
-                    pos.setZ(pos.getZ() - 0.49);
-                    break;
-                case SOUTH:
-                    pos.setZ(pos.getZ() + 0.49);
-                    break;
-                default:
-                    break;
-            }
-
-            if (face.getModY() == 0 && player.isSneaking()) {
-                pos.setY(pos.getY() - 0.49);
-            }
-        }
-
-        if (!player.isSneaking()) {
-            pos.setX(pos.getBlockX() + 0.5);
-            if (face == null || face.getModY() == 0)
-                pos.setY(pos.getBlockY() + 0.0);
-            pos.setZ(pos.getBlockZ() + 0.5);
-        }
-
-        return pos;
-    }
-
-    private static Vector getPosBlockAligned(Player player, RayTraceUtils.RRayTraceResult result) {
-        Vector pos = result.getHitPosition();
-
-        BlockFace face = result.getHitBlockFace();
-        if (face != null) {
-            switch (face) {
-                case DOWN:
-                    pos.setY(pos.getY() - 0.98);
-                    break;
-                case EAST:
-                    pos.setX(pos.getX() + 0.49);
-                    break;
-                case WEST:
-                    pos.setX(pos.getX() - 0.49);
-                    break;
-                case NORTH:
-                    pos.setZ(pos.getZ() - 0.49);
-                    break;
-                case SOUTH:
-                    pos.setZ(pos.getZ() + 0.49);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        pos.setX(pos.getBlockX() + 0.5);
-        if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
-            pos.setY(pos.getBlockY() + 1.0);
+        } else if (hasHitEntity) {
+            SWUtils.sendToActionbar(player, "§eEdit Position");
        } else {
-            pos.setY(pos.getBlockY());
+            SWUtils.sendToActionbar(player, "§eAdd new " + cursorType.getOrDefault(player, CursorType.TNT).name);
        }
-        pos.setZ(pos.getBlockZ() + 0.5);
-        return pos;
    }

    @Getter
    @AllArgsConstructor
    public enum CursorType {
-        TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
+        TNT(Material.TNT, Material.GUNPOWDER, List.of(Cursor.CursorMode.FREE, Cursor.CursorMode.SURFACE_ALIGNED), "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
+        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
+        OBSERVER(Material.OBSERVER, Material.QUARTZ, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
        ;

        public final Material material;
        public final Material nonSelectedMaterial;
-        public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
+        public final List<Cursor.CursorMode> cursorModes;
        public final String name;
        public final Function<Vector, SimulatorElement<?>> elementFunction;
    }

-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!ItemUtils.isItem(event.getItem(), "simulator")) {
+    private static void handlePlayerClick(Player player, Location cursorLocation, Optional<REntity> hitEntity, Action action) {
+        if (!Permission.BUILD.hasPermission(player)) return;
+        if (!hasSimulatorItem(player)) {
            return;
        }

-        event.setCancelled(true);
-        Player player = event.getPlayer();
        Simulator simulator = SimulatorStorage.getSimulator(player);

-        if (event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_AIR) {
+        if (action == Action.LEFT_CLICK_BLOCK || action == Action.LEFT_CLICK_AIR) {
            if (simulator == null) {
                return;
            }
-            SimulatorExecutor.run(event.getPlayer(), simulator, null);
+            SimulatorExecutor.run(player, simulator, null);
            return;
        }

-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
+        if (action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) {
            return;
        }

-
-        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), SimulatorWatcher.getEntitiesOfSimulator(simulator));
        if (simulator == null) {
-            if (rayTraceResult == null) {
+            if (cursorLocation == null) {
                SimulatorStorage.openSimulatorSelector(player);
            } else {
                SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
@@ -396,7 +290,7 @@ public class SimulatorCursor implements Listener {
                    }
                    sim = new Simulator(s);
                    SimulatorStorage.addSimulator(s, sim);
-                    createElement(player, rayTraceResult, sim);
+                    createElement(player, cursorLocation, sim);
                    SimulatorStorage.setSimulator(player, sim);
                });
                anvilInv.open();
@@ -404,57 +298,56 @@ public class SimulatorCursor implements Listener {
            return;
        }

-        if (rayTraceResult == null) {
+        if (cursorLocation == null) {
            new SimulatorGui(player, simulator).open();
            return;
        }

-        if (rayTraceResult.getHitEntity() != null) {
-            REntity hitEntity = rayTraceResult.getHitEntity();
-            Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
-            List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
-                return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
-            }).collect(Collectors.toList());
-
-            switch (elements.size()) {
-                case 0:
-                    return;
-                case 1:
-                    // Open single element present in Simulator
-                    SimulatorElement<?> element = elements.get(0);
-                    SimulatorGroup group1 = element.getGroup(simulator);
-                    SimulatorBaseGui back = new SimulatorGui(player, simulator);
-                    if (group1.getElements().size() > 1) {
-                        back = new SimulatorGroupGui(player, simulator, group1, back);
-                    }
-                    element.open(player, simulator, group1, back);
-                    break;
-                default:
-                    List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
-                    if (parents.size() == 1) {
-                        // Open multi element present in Simulator in existing group
-                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                        new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
-                    } else {
-                        // Open multi element present in Simulator in implicit group
-                        SimulatorGroup group2 = new SimulatorGroup();
-                        group2.setMaterial(null);
-                        group2.getElements().addAll(elements);
-                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                        new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
-                    }
-                    break;
-            }
+        if (hitEntity.isPresent()) {
+            openElement(player, simulator, hitEntity.get());
            return;
        }

-        // Add new Element to current simulator
-        createElement(player, rayTraceResult, simulator);
+        createElement(player, cursorLocation, simulator);
    }

-    private void createElement(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, Simulator simulator) {
+    private static void openElement(Player player, Simulator simulator, REntity hitEntity) {
+        Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
+        List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
+            return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
+        }).collect(Collectors.toList());
+
+        switch (elements.size()) {
+            case 0:
+                return;
+            case 1:
+                SimulatorElement<?> element = elements.get(0);
+                SimulatorGroup group1 = element.getGroup(simulator);
+                SimulatorBaseGui back = new SimulatorGui(player, simulator);
+                if (group1.getElements().size() > 1) {
+                    back = new SimulatorGroupGui(player, simulator, group1, back);
+                }
+                element.open(player, simulator, group1, back);
+                break;
+            default:
+                List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
+                if (parents.size() == 1) {
+                    SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                    new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
+                } else {
+                    SimulatorGroup group2 = new SimulatorGroup();
+                    group2.setMaterial(null);
+                    group2.getElements().addAll(elements);
+                    SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                    new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
+                }
+                break;
+        }
+    }
+
+    private static void createElement(Player player, Location cursorLocation, Simulator simulator) {
        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
-        Vector vector = type.position.apply(player, rayTraceResult);
+        Vector vector = cursorLocation.toVector();
        if (type == CursorType.REDSTONE_BLOCK) {
            vector.subtract(new Vector(0.5, 0, 0.5));
        }
@@ -32,7 +32,6 @@ import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.api.Enable;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -47,7 +46,6 @@ import java.util.*;
 import java.util.stream.Collectors;

@Linked
-@MinVersion(19)
 public class SimulatorStorage implements Enable {

    public static final File simulatorsDir = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "simulators");
@@ -28,7 +28,6 @@ import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RFallingBlockEntity;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -75,7 +74,6 @@ public class SimulatorWatcher {
    }

    @Linked
-    @MinVersion(19)
    public static class QuitListener implements Listener {

        @EventHandler
@@ -126,4 +124,11 @@ public class SimulatorWatcher {
        }
        return entityServer.getEntities();
    }
+
+    synchronized REntityServer getEntityServerOfSimulator(Simulator simulator) {
+        if (simulator == null) {
+            return null;
+        }
+        return entityServers.computeIfAbsent(simulator, __ -> createSim(new REntityServer(), simulator));
+    }
 }
@@ -120,6 +120,10 @@ public abstract class SimulatorElement<T extends SimulatorPhase> {
    }

    public abstract String getType();
-    public void saveExtra(YAPIONObject elementObject) {}
-    public void loadExtra(YAPIONObject elementObject) {}
+
+    public void saveExtra(YAPIONObject elementObject) {
+    }
+
+    public void loadExtra(YAPIONObject elementObject) {
+    }
 }
@@ -37,6 +37,10 @@ public abstract class SimulatorPhase {
    protected int order = 0;

    public abstract void toSimulatorActions(Vector position, BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd);
-    public void saveExtra(YAPIONObject phaseObject) {}
-    public void loadExtra(YAPIONObject phaseObject) {}
+
+    public void saveExtra(YAPIONObject phaseObject) {
+    }
+
+    public void loadExtra(YAPIONObject phaseObject) {
+    }
 }
@@ -65,7 +65,9 @@ public final class TNTPhase extends SimulatorPhase {
            @Override
            public void accept(World world) {
                Location location = position.toLocation(world);
-                if (Region.getRegion(location).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
+                if (Region.getRegion(location).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+                    return;
+                }
                TNTPrimed tnt = world.spawn(location, TNTPrimed.class);
                if (!xJump) tnt.setVelocity(tnt.getVelocity().setX(0));
                if (!yJump) tnt.setVelocity(tnt.getVelocity().setY(0));
@@ -29,7 +29,6 @@ import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -40,7 +39,6 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;

@Linked
-@MinVersion(19)
 public class SimulatorExecutor implements Listener {

    private static final World WORLD = Bukkit.getWorlds().get(0);
@@ -142,7 +140,7 @@ public class SimulatorExecutor implements Listener {
    private void runActions(List<SimulatorAction> actionsToRun) {
        while (!actionsToRun.isEmpty()) {
            Collections.shuffle(actionsToRun);
-            for (int i = actionsToRun.size() - 1 ; i >= 0; i--) {
+            for (int i = actionsToRun.size() - 1; i >= 0; i--) {
                SimulatorAction action = actionsToRun.get(i);
                action.accept(WORLD);
                action.setCount(action.getCount() - 1);
@@ -55,8 +55,9 @@ public class StabGenerator extends StabStep implements Listener {
        if (!(event.getEntity() instanceof TNTPrimed)) return;
        if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
            event.blockList().forEach(block -> {
-                if (!data.region.getTestblockArea().inRegion(block.getLocation(), true))
+                if (!data.region.getTestblockArea().inRegion(block.getLocation(), true)) {
                    return;
+                }
                int component = data.direction.component.apply(block.getLocation().toVector());
                destroyedBlocksPerSlice.computeIfAbsent(component, __ -> new HashSet<>())
                        .add(block.getLocation());
@@ -69,7 +69,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {

        // Base Tick
        int baseTicks = simulatorGroup.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -83,7 +83,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
        });
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                simulatorGroup.changeBaseTicks(-baseTicks);
            } else {
@@ -148,7 +148,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                    .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
            inventory.setItem(12, negativXItem);

-            SWItem positivXItem =  new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
+            SWItem positivXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
                simulatorGroup.getElements().stream()
                        .map(TNTElement.class::cast)
                        .forEach(tntElement -> {
@@ -163,13 +163,13 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
        }

        //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
            simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
        inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
            new SimulatorAnvilGui<>(player, "Relative X", "", Double::parseDouble, number -> {
-                if(!allTNT){
+                if (!allTNT) {
                    number = (double) Math.round(number);
                }
                simulatorGroup.move(number, 0, 0);
@@ -177,19 +177,19 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).setItem(Material.PAPER).open();
        }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
            simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
            simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
        inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
            new SimulatorAnvilGui<>(player, "Relative Y", "", Double::parseDouble, number -> {
-                if(!allTNT){
+                if (!allTNT) {
                    number = (double) Math.round(number);
                }
                simulatorGroup.move(0, number, 0);
@@ -197,19 +197,19 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).setItem(Material.PAPER).open();
        }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
            simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));

        //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
            simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
        inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
            new SimulatorAnvilGui<>(player, "Relative Z", "", Double::parseDouble, number -> {
-                if(!allTNT){
+                if (!allTNT) {
                    number = (double) Math.round(number);
                }
                simulatorGroup.move(0, 0, number);
@@ -217,7 +217,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).setItem(Material.PAPER).open();
        }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
            simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -148,14 +148,14 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {

        Supplier<Integer> getter = observerPhase::getTickOffset;
        Consumer<Integer> setter = observerPhase::setTickOffset;
-        return new SWItem[] {
-                new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+        return new SWItem[]{
+                new SWItem(getter.get() < max ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                observer,
-                new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                new SWItem(getter.get() > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
@@ -169,13 +169,13 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
    @Override
    public SWItem[] lastColumn() {
        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                    addNewPhase(clickType.isShiftClick());
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                new SWItem(Material.QUARTZ, "§eObserver§8:§a New Phase", clickType -> {
                    addNewPhase(false);
                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
+                new SWItem(Material.GRAY_DYE, "§7", clickType -> {
                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
        };
    }
@@ -26,7 +26,6 @@ import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
@@ -97,7 +96,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {

        //Tick Offset
        int offset = observer.getTickOffset();
-        inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(offset < max ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -114,7 +113,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
        offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
        inventory.setItem(19, offsetItem);

-        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(offset > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -122,26 +121,25 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {

        //Order
        int order = observer.getOrder();
-        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(order < SimulatorPhase.ORDER_LIMIT ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));

-        Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
-        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
+        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : Material.RECOVERY_COMPASS, "§eActivation Order§8:§7 " + order, clickType -> {
            new SimulatorAnvilGui<>(player, "Activation Order", order + "", Integer::parseInt, integer -> {
                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
                observer.setOrder(integer);
                SimulatorWatcher.update(simulator);
                return true;
-            }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
+            }, this).setItem(order >= 0 ? Material.COMPASS : Material.RECOVERY_COMPASS).open();
        });
        orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
        inventory.setItem(22, orderItem);

-        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(order > -SimulatorPhase.ORDER_LIMIT ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -67,7 +67,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {

        // Base Tick
        int baseTicks = observer.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
@@ -82,7 +82,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
        });
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                observer.changeBaseTicks(-baseTicks);
@@ -93,7 +93,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos X
-        inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
@@ -105,14 +105,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
            SimulatorWatcher.update(simulator);
@@ -124,14 +124,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
@@ -143,7 +143,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
            SimulatorWatcher.update(simulator);
@@ -163,14 +163,14 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu

        Supplier<Integer> getter = redstoneSubPhase.place ? redstoneSubPhase.phase::getTickOffset : redstoneSubPhase.phase::getLifetime;
        Consumer<Integer> setter = redstoneSubPhase.place ? redstoneSubPhase.phase::setTickOffset : redstoneSubPhase.phase::setLifetime;
-        return new SWItem[] {
-                new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+        return new SWItem[]{
+                new SWItem(getter.get() < max ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                redstone,
-                new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                new SWItem(getter.get() > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
@@ -184,13 +184,13 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
    @Override
    public SWItem[] lastColumn() {
        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                    addNewPhase(clickType.isShiftClick());
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                new SWItem(Material.REDSTONE, "§eRedstone§8:§a New Phase", clickType -> {
                    addNewPhase(false);
                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
+                new SWItem(Material.GRAY_DYE, "§7", clickType -> {
                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
        };
    }
@@ -26,7 +26,6 @@ import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
@@ -98,7 +97,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {

        //Tick Offset
        int offset = redstone.getTickOffset();
-        inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(offset < maxOffset ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -115,7 +114,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
        inventory.setItem(19, offsetItem);

-        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(offset > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -123,7 +122,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {

        //Lifetime
        int lifetime = redstone.getLifetime();
-        inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(lifetime < maxLifetime ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -140,7 +139,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
        inventory.setItem(20, lifetimeItem);

-        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(lifetime > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -148,26 +147,25 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {

        //Order
        int order = redstone.getOrder();
-        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(order < SimulatorPhase.ORDER_LIMIT ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));

-        Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
-        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
+        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : Material.RECOVERY_COMPASS, "§eActivation Order§8:§7 " + order, clickType -> {
            new SimulatorAnvilGui<>(player, "Activation Order", order + "", Integer::parseInt, integer -> {
                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
                redstone.setOrder(integer);
                SimulatorWatcher.update(simulator);
                return true;
-            }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
+            }, this).setItem(order >= 0 ? Material.COMPASS : Material.RECOVERY_COMPASS).open();
        });
        orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
        inventory.setItem(22, orderItem);

-        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(order > -SimulatorPhase.ORDER_LIMIT ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -66,7 +66,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {

        // Base Tick
        int baseTicks = redstone.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
@@ -81,7 +81,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
        });
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                redstone.changeBaseTicks(-baseTicks);
@@ -92,7 +92,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
@@ -104,14 +104,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
            SimulatorWatcher.update(simulator);
@@ -123,14 +123,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
@@ -142,7 +142,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
            SimulatorWatcher.update(simulator);
@@ -66,37 +66,37 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
        }));

        //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            simulator.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
        inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
        }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            simulator.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            simulator.move(0, clickType.isShiftClick() ? 5 : 1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
        inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
        }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            simulator.move(0, clickType.isShiftClick() ? -5 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            simulator.move(0, 0, clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
        inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
        }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            simulator.move(0, 0, clickType.isShiftClick() ? -5 : -1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -29,7 +29,6 @@ import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
@@ -102,16 +101,14 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
            tnt.setDisabled(!tnt.isDisabled());
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
-        if (Core.getVersion() > 19) {
-            inventory.setItem(49, new SWItem(Material.CALIBRATED_SCULK_SENSOR, "§eCreate Stab", click -> {
-                new SimulatorAnvilGui<>(player, "Depth Limit", "", Integer::parseInt, depthLimit -> {
-                    if (depthLimit <= 0) return false;
-                    simulator.setStabGenerator(new SimulatorStabGenerator(Region.getRegion(player.getLocation()), simulator, tnt, depthLimit));
-                    SimulatorWatcher.update(simulator);
-                    return true;
-                }, null).open();
-            }).setCustomModelData(CMDs.Simulator.CREATE_STAB));
-        }
+        inventory.setItem(49, new SWItem(Material.CALIBRATED_SCULK_SENSOR, "§eCreate Stab", click -> {
+            new SimulatorAnvilGui<>(player, "Depth Limit", "", Integer::parseInt, depthLimit -> {
+                if (depthLimit <= 0) return false;
+                simulator.setStabGenerator(new SimulatorStabGenerator(Region.getRegion(player.getLocation()), simulator, tnt, depthLimit));
+                SimulatorWatcher.update(simulator);
+                return true;
+            }, null).open();
+        }).setCustomModelData(CMDs.Simulator.CREATE_STAB));
        inventory.setItem(50, new SWItem(Material.CHEST, parent.getElements().size() == 1 ? "§eMake Group" : "§eAdd another TNT to Group", clickType -> {
            TNTElement tntElement = new TNTElement(tnt.getPosition().clone());
            tntElement.add(new TNTPhase());
@@ -137,13 +134,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
        tnt.getItemStack().setAmount(Math.min(tntSetting.getCount(), 64));

        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                tnt,
-                new SWItem(SWItem.getDye(tntSetting.getCount() > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                new SWItem(tntSetting.getCount() > 1 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
@@ -157,13 +154,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
    @Override
    public SWItem[] lastColumn() {
        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                    addNewPhase(clickType.isShiftClick());
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                new SWItem(Material.GUNPOWDER, "§eTNT§8:§a New Phase", clickType -> {
                    addNewPhase(false);
                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
+                new SWItem(Material.GRAY_DYE, "§7", clickType -> {
                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
        };
    }
@@ -26,7 +26,6 @@ import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
@@ -78,7 +77,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {

        //Count
        int count = tnt.getCount();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
            SimulatorWatcher.update(simulator);
@@ -95,7 +94,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        countItem.getItemStack().setAmount(Math.max(1, Math.min(count, 64)));
        inventory.setItem(18, countItem);

-        inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(count > 1 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -103,7 +102,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {

        //Tick Offset
        int offset = tnt.getTickOffset();
-        inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
            SimulatorWatcher.update(simulator);
@@ -120,7 +119,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
        inventory.setItem(19, offsetItem);

-        inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(offset > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -128,7 +127,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {

        //Lifetime
        int lifetime = tnt.getLifetime();
-        inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
            SimulatorWatcher.update(simulator);
@@ -145,7 +144,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
        inventory.setItem(20, lifetimeItem);

-        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(lifetime > 0 ? Material.GRAY_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -153,26 +152,25 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {

        //Order
        int order = tnt.getOrder();
-        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(order < SimulatorPhase.ORDER_LIMIT ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));

-        Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
-        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eCalculation Order§8:§7 " + order, clickType -> {
+        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : Material.RECOVERY_COMPASS, "§eCalculation Order§8:§7 " + order, clickType -> {
            new SimulatorAnvilGui<>(player, "Calculation Order", order + "", Integer::parseInt, integer -> {
                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
                tnt.setOrder(integer);
                SimulatorWatcher.update(simulator);
                return true;
-            }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
+            }, this).setItem(order >= 0 ? Material.COMPASS : Material.RECOVERY_COMPASS).open();
        });
        orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
        inventory.setItem(22, orderItem);

-        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(order > -SimulatorPhase.ORDER_LIMIT ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
@@ -75,7 +75,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {

        // Base Tick
        int baseTicks = tnt.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
@@ -90,7 +90,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
        });
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                tnt.changeBaseTicks(-baseTicks);
@@ -130,15 +130,15 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
        negativXItem.setEnchanted(tnt.getAlignment().getX() == -1);
        inventory.setItem(12, negativXItem);

-        SWItem positivXItem =  new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
-            if(tnt.getAlignment().getX() != 1) tnt.alignX(1);
+        SWItem positivXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
+            if (tnt.getAlignment().getX() != 1) tnt.alignX(1);
            SimulatorWatcher.update(simulator);
        });
        positivXItem.setEnchanted(tnt.getAlignment().getX() == 1);
        inventory.setItem(30, positivXItem);

        // Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
@@ -150,14 +150,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        // Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
            SimulatorWatcher.update(simulator);
@@ -169,14 +169,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        // Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
            SimulatorWatcher.update(simulator);
@@ -188,7 +188,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                return true;
            }, this).open();
        }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
            SimulatorWatcher.update(simulator);
@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.simulator.gui.base;

 import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.core.Core;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Bukkit;
@@ -47,10 +46,7 @@ public abstract class SimulatorBaseGui {
    public final void open() {
        if (!shouldOpen()) return;

-        String newTitle = title();
-        String originalTitle = player.getOpenInventory().getTitle();
-
-        if (inv != null && (Core.getVersion() > 19 || newTitle.equals(originalTitle))) {
+        if (inv != null) {
            // TODO: Flickering is better but not gone!
            for (int i = 9; i < size - 9; i++) {
                inv.setItem(i, null);
@@ -60,9 +56,7 @@ public abstract class SimulatorBaseGui {
                inventory.open();
                SimulatorWatcher.watch(player, simulator, this::open);
            }
-            if (Core.getVersion() > 19) {
-                player.getOpenInventory().setTitle(title());
-            }
+            player.getOpenInventory().setTitle(title());
            if (simulator != null && simulator.getStabGenerator() != null) {
                populateStabGenerator();
            } else {
@@ -23,6 +23,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;

 import java.util.List;
@@ -51,14 +52,14 @@ public abstract class SimulatorPageGui<T> extends SimulatorBaseGui {
        headerAndFooter();
        page = Math.min(page, maxPage());

-        inventory.setItem(size - 9, new SWItem(SWItem.getDye(page > 0 ? 10 : 8), page > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(page > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 9, new SWItem(page > 0 ? Material.LIME_DYE : Material.GRAY_DYE, page > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(page > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
            if (page > 0) {
                page--;
                open();
            }
        }).setCustomModelData(CMDs.PREVIOUS_PAGE));
        boolean hasNext = page < maxPage() - (data.size() % (size - 18) == 0 ? 1 : 0);
-        inventory.setItem(size - 1, new SWItem(SWItem.getDye(hasNext ? 10 : 8), hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 1, new SWItem(hasNext ? Material.LIME_DYE : Material.GRAY_DYE, hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
            if (hasNext) {
                page++;
                open();
@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;

 import java.util.List;
@@ -51,14 +52,14 @@ public abstract class SimulatorScrollGui<T> extends SimulatorBaseGui {
        headerAndFooter();
        scroll = maxScroll();

-        inventory.setItem(size - 9, new SWItem(SWItem.getDye(scroll > 0 ? 10 : 8), scroll > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(scroll > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 9, new SWItem(scroll > 0 ? Material.LIME_DYE : Material.GRAY_DYE, scroll > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(scroll > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
            if (scroll > 0) {
                scroll = Math.max(0, scroll - 9);
                open();
            }
        }).setCustomModelData(CMDs.PREVIOUS_PAGE));
        boolean hasNext = (data.size() + 1) - scroll > 9;
-        inventory.setItem(size - 1, new SWItem(SWItem.getDye(hasNext ? 10 : 8), hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 1, new SWItem(hasNext ? Material.LIME_DYE : Material.GRAY_DYE, hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
            if (hasNext) {
                scroll = Math.min(scroll + 9, data.size() + 1 - 9);
                open();
@@ -0,0 +1,73 @@
+/*
+ *   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.bausystem.features.slaves.blastresistance;
+
+import com.google.common.util.concurrent.AtomicDouble;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.world.block.BlockState;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Linked
+public class BlastResistanceCommand extends SWCommand {
+
+    public BlastResistanceCommand() {
+        super("blastresistance");
+    }
+
+    @Register(description = "BLASTRESISTANCE_HELP")
+    public void command(@Validator Player player) {
+        LocalSession localSession = WorldEdit.getInstance().getSessionManager().get(BukkitAdapter.adapt(player));
+        Clipboard clipboard;
+        try {
+            clipboard = localSession.getClipboard().getClipboards().getFirst();
+        } catch (WorldEditException e) {
+            BauSystem.MESSAGE.send("BLASTRESISTANCE_NO_CLIPBOARD", player);
+            return;
+        }
+
+        AtomicDouble min = new AtomicDouble(0);
+        AtomicDouble max = new AtomicDouble(0);
+        AtomicDouble sum = new AtomicDouble(0);
+        AtomicInteger count = new AtomicInteger(0);
+        clipboard.forEach(blockVector3 -> {
+            BlockState blockState = clipboard.getBlock(blockVector3);
+            Material material = BukkitAdapter.adapt(blockState).getMaterial();
+            if (material == Material.WATER || material == Material.LAVA) return;
+            double blastResistance = BukkitAdapter.adapt(blockState).getMaterial().getBlastResistance();
+            min.set(Math.min(min.get(), blastResistance));
+            max.set(Math.max(max.get(), blastResistance));
+            sum.addAndGet(blastResistance);
+            count.getAndIncrement();
+        });
+
+        BauSystem.MESSAGE.send("BLASTRESISTANCE_RESULT", player, min.get(), max.get(), sum.get() / count.get());
+    }
+}
@@ -21,8 +21,6 @@ package de.steamwar.bausystem.features.slaves.laufbau;

 import com.sk89q.worldedit.blocks.SkullBlock;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import de.steamwar.bausystem.utils.NMSWrapper;
-import de.steamwar.core.Core;
 import de.steamwar.inventory.SWItem;
 import lombok.Getter;
 import lombok.ToString;
@@ -100,7 +98,7 @@ public class BlockBoundingBox {
        // addPixel(Material.COBWEB.createBlockData(), 0, 0, 0, 0, 0, 0, createItem("LAUFBAU_BLOCK_COBWEB", Material.COBWEB));
        addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);

-        addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
+        addPixel(Material.DIRT_PATH.createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", Material.DIRT_PATH));
        addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));

        Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
@@ -235,19 +233,17 @@ public class BlockBoundingBox {
        endRodEastWest.setFacing(BlockFace.EAST);
        addPixel(endRodEastWest, 0, 6, 6, 16, 4, 4, createItem("LAUFBAU_BLOCK_END_ROD", Material.END_ROD, "LAUFBAU_FACING_EAST", "LAUFBAU_FACING_WEST"));

-        if (Core.getVersion() >= 19) {
-            Directional lightningRodBottomTop = (Directional) Material.LIGHTNING_ROD.createBlockData();
-            lightningRodBottomTop.setFacing(BlockFace.UP);
-            addPixel(lightningRodBottomTop, 6, 0, 6, 4, 16, 4, createItem("LAUFBAU_BLOCK_LIGHTNING_ROD", Material.LIGHTNING_ROD, "LAUFBAU_FACING_UP", "LAUFBAU_FACING_DOWN"));
+        Directional lightningRodBottomTop = (Directional) Material.LIGHTNING_ROD.createBlockData();
+        lightningRodBottomTop.setFacing(BlockFace.UP);
+        addPixel(lightningRodBottomTop, 6, 0, 6, 4, 16, 4, createItem("LAUFBAU_BLOCK_LIGHTNING_ROD", Material.LIGHTNING_ROD, "LAUFBAU_FACING_UP", "LAUFBAU_FACING_DOWN"));

-            Directional lightningRodNorthSouth = (Directional) Material.LIGHTNING_ROD.createBlockData();
-            lightningRodNorthSouth.setFacing(BlockFace.NORTH);
-            addPixel(lightningRodNorthSouth, 6, 6, 0, 4, 4, 16, createItem("LAUFBAU_BLOCK_LIGHTNING_ROD", Material.LIGHTNING_ROD, "LAUFBAU_FACING_NORTH", "LAUFBAU_FACING_SOUTH"));
+        Directional lightningRodNorthSouth = (Directional) Material.LIGHTNING_ROD.createBlockData();
+        lightningRodNorthSouth.setFacing(BlockFace.NORTH);
+        addPixel(lightningRodNorthSouth, 6, 6, 0, 4, 4, 16, createItem("LAUFBAU_BLOCK_LIGHTNING_ROD", Material.LIGHTNING_ROD, "LAUFBAU_FACING_NORTH", "LAUFBAU_FACING_SOUTH"));

-            Directional lightningRodEastWest = (Directional) Material.LIGHTNING_ROD.createBlockData();
-            lightningRodEastWest.setFacing(BlockFace.EAST);
-            addPixel(lightningRodEastWest, 0, 6, 6, 16, 4, 4, createItem("LAUFBAU_BLOCK_LIGHTNING_ROD", Material.LIGHTNING_ROD, "LAUFBAU_FACING_EAST", "LAUFBAU_FACING_WEST"));
-        }
+        Directional lightningRodEastWest = (Directional) Material.LIGHTNING_ROD.createBlockData();
+        lightningRodEastWest.setFacing(BlockFace.EAST);
+        addPixel(lightningRodEastWest, 0, 6, 6, 16, 4, 4, createItem("LAUFBAU_BLOCK_LIGHTNING_ROD", Material.LIGHTNING_ROD, "LAUFBAU_FACING_EAST", "LAUFBAU_FACING_WEST"));

        Waterlogged conduit = (Waterlogged) Material.CONDUIT.createBlockData();
        conduit.setWaterlogged(false);
@@ -25,14 +25,12 @@ import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

@Linked
-@MinVersion(19)
 public class LaufbauCommand extends SWCommand {

    public LaufbauCommand() {
@@ -33,6 +33,7 @@ import java.util.*;
 public class LaufbauSettings {

    private static Map<Pair<Material, String>, List<BlockBoundingBox>> groupMap = new LinkedHashMap<>();
+
    static {
        BlockBoundingBox.elements.forEach(blockBoundingBox -> {
            if (blockBoundingBox.getSwItem() == null) return;
@@ -115,12 +116,15 @@ public class LaufbauSettings {
        } else {
            long count = blockBoundingBoxes.stream().filter(bb -> LaufbauUtils.isDeactivated(p, bb)).count();
            if (count == 0) {
-                return new SWItem(material, BauSystem.MESSAGE.parse(group, p), Arrays.asList("", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ACTIVE", p), "", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ADVANCED", p), BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_TOGGLE", p)), false, clickType -> {});
+                return new SWItem(material, BauSystem.MESSAGE.parse(group, p), Arrays.asList("", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ACTIVE", p), "", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ADVANCED", p), BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_TOGGLE", p)), false, clickType -> {
+                });
            }
            if (count == blockBoundingBoxes.size()) {
-                return new SWItem(material, BauSystem.MESSAGE.parse(group, p), Arrays.asList("", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_INACTIVE", p), "", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ADVANCED", p), BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_TOGGLE", p)), false, clickType -> {});
+                return new SWItem(material, BauSystem.MESSAGE.parse(group, p), Arrays.asList("", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_INACTIVE", p), "", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ADVANCED", p), BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_TOGGLE", p)), false, clickType -> {
+                });
            }
-            return new SWItem(material, BauSystem.MESSAGE.parse(group, p), Arrays.asList("", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_MIXED", p, blockBoundingBoxes.size() - count, blockBoundingBoxes.size()), "", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ADVANCED", p), BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_TOGGLE", p)), false, clickType -> {});
+            return new SWItem(material, BauSystem.MESSAGE.parse(group, p), Arrays.asList("", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_MIXED", p, blockBoundingBoxes.size() - count, blockBoundingBoxes.size()), "", BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_ADVANCED", p), BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_TOGGLE", p)), false, clickType -> {
+            });
        }
    }

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.type.AmethystCluster;
@@ -35,7 +34,6 @@ import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.createI
 import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.pixelCuboid;

@Linked
-@MinVersion(19)
 public class AmethystBoundingBox implements BoundingBoxLoader {

    @Override
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

@@ -34,7 +33,6 @@ import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.createI
 import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.pixelCuboid;

@Linked
-@MinVersion(19)
 public class AzaleaBoundingBox implements BoundingBoxLoader {

    @Override
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Material;
 import org.bukkit.block.data.Lightable;
 import org.bukkit.block.data.type.Candle;
@@ -35,7 +34,6 @@ import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.createI
 import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.pixelCuboid;

@Linked
-@MinVersion(19)
 public class CandleBoundingBox implements BoundingBoxLoader {

    @Override
@@ -58,7 +56,7 @@ public class CandleBoundingBox implements BoundingBoxLoader {
        Candle candle = (Candle) Material.CYAN_CANDLE.createBlockData();
        candle.setCandles(1);
        List<Cuboid> cuboidList = new ArrayList<>();
-        cuboidList.add(pixelCuboid(7, 0,7, 2, 6, 2));
+        cuboidList.add(pixelCuboid(7, 0, 7, 2, 6, 2));
        new BlockBoundingBox(candle, cuboidList, createItem("LAUFBAU_BLOCK_CANDLE", Material.CYAN_CANDLE, "LAUFBAU_COUNT_1"));
    }
 }
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Axis;
 import org.bukkit.Material;
 import org.bukkit.block.data.Orientable;
@@ -35,7 +34,6 @@ import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.createI
 import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.pixelCuboid;

@Linked
-@MinVersion(19)
 public class ChainBoundingBox implements BoundingBoxLoader {

    @Override
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

@@ -34,7 +33,6 @@ import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.createI
 import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.pixelCuboid;

@Linked
-@MinVersion(19)
 public class DragonEggBoundingBox implements BoundingBoxLoader {

    @Override
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.BigDripleaf;

@@ -34,7 +33,6 @@ import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.createI
 import static de.steamwar.bausystem.features.slaves.laufbau.LaufbauUtils.pixelCuboid;

@Linked
-@MinVersion(19)
 public class DripLeafBoundingBox implements BoundingBoxLoader {

    @Override
@@ -22,11 +22,9 @@ package de.steamwar.bausystem.features.slaves.laufbau.boundingboxes;
 import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
-import de.steamwar.core.Core;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.type.Fence;
 import org.bukkit.block.data.type.Wall;

 import java.util.ArrayList;
@@ -40,11 +38,7 @@ public class WallBoundingBox implements BoundingBoxLoader {

    @Override
    public void load() {
-        if (Core.getVersion() > 15) {
-            v18();
-        } else {
-            v15();
-        }
+        v18();
    }

    private void v18() {
@@ -82,40 +76,4 @@ public class WallBoundingBox implements BoundingBoxLoader {
            }
        }
    }
-
-    private void v15() {
-        for (int nx = 0; nx < 2; nx++) {
-            for (int nz = 0; nz < 2; nz++) {
-                for (int px = 0; px < 2; px++) {
-                    for (int pz = 0; pz < 2; pz++) {
-                        Fence fence = (Fence) Material.END_STONE_BRICK_WALL.createBlockData();
-                        List<String> lore = new ArrayList<>();
-                        List<Cuboid> cuboidList = new ArrayList<>();
-                        cuboidList.add(pixelCuboid(4, 0, 4, 8, 24, 8));
-                        if (nz == 1) {
-                            lore.add("LAUFBAU_CONNECTION_NORTH");
-                            fence.setFace(BlockFace.NORTH, true);
-                            cuboidList.add(pixelCuboid(5, 0, 0, 6, 24, 4));
-                        }
-                        if (pz == 1) {
-                            lore.add("LAUFBAU_CONNECTION_SOUTH");
-                            fence.setFace(BlockFace.SOUTH, true);
-                            cuboidList.add(pixelCuboid(5, 0, 12, 6, 24, 4));
-                        }
-                        if (nx == 1) {
-                            lore.add("LAUFBAU_CONNECTION_WEST");
-                            fence.setFace(BlockFace.WEST, true);
-                            cuboidList.add(pixelCuboid(0, 0, 5, 4, 24, 6));
-                        }
-                        if (px == 1) {
-                            lore.add("LAUFBAU_CONNECTION_EAST");
-                            fence.setFace(BlockFace.EAST, true);
-                            cuboidList.add(pixelCuboid(12, 0, 5, 4, 24, 6));
-                        }
-                        new BlockBoundingBox(fence, cuboidList, createItem("LAUFBAU_BLOCK_END_STONE_BRICK_WALL", Material.END_STONE_BRICK_WALL, lore.toArray(new String[0])));
-                    }
-                }
-            }
-        }
-    }
 }
@@ -87,8 +87,9 @@ public class ProcessingTracesState implements LaufbauState {

        TNTPoint current = TNTPoints.remove(0);
        if (FlatteningWrapper.impl.inWater(world, current.getLocation().toVector())) return;
-        if (!(inRegion(current.getLocation().toVector(), 1) || (current.getPrevious().isPresent() && inRegion(current.getPrevious().get().getLocation().toVector(), 1))))
+        if (!(inRegion(current.getLocation().toVector(), 1) || (current.getPrevious().isPresent() && inRegion(current.getPrevious().get().getLocation().toVector(), 1)))) {
            return;
+        }

        Location location = current.getLocation();
        if (current.getPrevious().isPresent()) {
@@ -25,7 +25,6 @@ import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.bausystem.utils.WorldEditUtils;
-import de.steamwar.core.Core;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import org.bukkit.Location;
@@ -41,6 +40,7 @@ import java.util.*;
 public class Panzern {

    private static List<PanzernAlgorithm> panzernAlgorithmList = new ArrayList<>();
+
    public static void add(PanzernAlgorithm panzernAlgorithm) {
        panzernAlgorithmList.add(panzernAlgorithm);
    }
@@ -57,9 +57,8 @@ public class Panzern {

    private BaseBlock blockType;
    private BaseBlock slabType;
-    private static final BaseBlock jukeboxType = (Core.getVersion() > 19 ? BlockTypes.get("lodestone"): BlockTypes.get("jukebox")).getDefaultState().toBaseBlock();
+    private static final BaseBlock jukeboxType = BlockTypes.get("lodestone").getDefaultState().toBaseBlock();
    private static final BaseBlock cobwebType = BlockTypes.COBWEB.getDefaultState().toBaseBlock();
-    private static final BaseBlock airType = BlockTypes.AIR.getDefaultState().toBaseBlock();

    @Getter
    private EditSession editSession;
@@ -121,7 +121,7 @@ public class PanzernCommand extends SWCommand {
            if (!material.isBlock()) {
                continue;
            }
-            if (material.name().contains("STAIRS") || material.name().contains("SLAB") ||  material.name().contains("GLASS")) {
+            if (material.name().contains("STAIRS") || material.name().contains("SLAB") || material.name().contains("GLASS")) {
                strings.add(material.name().toLowerCase());
            }
        }
@@ -23,8 +23,6 @@ import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.core.Core;
-import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
 import org.bukkit.*;
@@ -77,8 +75,8 @@ public class SmartPlaceListener implements Listener {

        IGNORED.add(Material.TNT);
        IGNORED.add(Material.REDSTONE_ORE);
-        IGNORED.add(SWItem.getMaterial("BEEHIVE"));
-        IGNORED.add(SWItem.getMaterial("SEA_PICKLE"));
+        IGNORED.add(Material.BEEHIVE);
+        IGNORED.add(Material.SEA_PICKLE);
        IGNORED.remove(Material.STONE);
        IGNORED.remove(Material.BARRIER);
    }
@@ -88,7 +86,7 @@ public class SmartPlaceListener implements Listener {

    public SmartPlaceListener() {
        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, (player, packet) -> {
-            if(!Permission.BUILD.hasPermission(player)) return packet;
+            if (!Permission.BUILD.hasPermission(player)) return packet;
            if (!Config.getInstance().get(player).getPlainValueOrDefault("smartPlace", false)) return packet;
            RayTraceResult rayTraceResult = player.rayTraceBlocks(6);
            Block block = rayTraceResult != null ? rayTraceResult.getHitBlock() : null;
@@ -128,7 +126,7 @@ public class SmartPlaceListener implements Listener {

    @EventHandler
    public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
        WAS_EXECUTED.add(event.getPlayer());
        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
@@ -150,7 +148,7 @@ public class SmartPlaceListener implements Listener {
        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
        if (!SMART_PLACING.contains(event.getPlayer())) {
-            if (Core.getVersion() >= 20 && CONTAINERS.contains(event.getBlockAgainst().getType())) {
+            if (CONTAINERS.contains(event.getBlockAgainst().getType())) {
                SoundGroup soundGroup = event.getBlockPlaced().getBlockData().getSoundGroup();
                event.getPlayer().playSound(event.getBlockPlaced().getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F);
            }
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.team.boundary;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.core.TrickyParticleWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Particle;
@@ -53,7 +52,7 @@ public class BoundaryViewer implements Listener {
    }

    private void showRegion(Region region, Player player) {
-        drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getArea().getMinPoint(false), region.getArea().getMaxPoint(false));
+        drawCuboid(player, Particle.HAPPY_VILLAGER, region.getArea().getMinPoint(false), region.getArea().getMaxPoint(false));
        if (!region.getTestblockArea().isEmpty()) {
            drawCuboid(player, Particle.END_ROD, region.getTestblockArea().getMinPoint(true), region.getTestblockArea().getMaxPoint(true));
        }
@@ -31,7 +31,6 @@ import de.steamwar.command.TypeMapper;
 import de.steamwar.core.CraftbukkitWrapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -39,6 +38,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
+import de.steamwar.techhider.legacy.TechHider;

 import java.util.*;
 import java.util.stream.Collectors;
@@ -92,7 +92,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
            BauSystem.MESSAGE.sendPrefixless("TECHHIDER_ON", player, ChatMessageType.ACTION_BAR);
        }
        region.getBuildArea().forEachChunk((x, z) -> {
-            CraftbukkitWrapper.impl.sendChunk(player, x, z);
+            CraftbukkitWrapper.sendChunk(player, x, z);
        });
    }

@@ -50,7 +50,7 @@ public class BlockCounter {
    }

    public String getMessage(Player player, int count, int tntCount, long tick, long lastTick) {
-        if(!Permission.BUILD.hasPermission(player)) return null;
+        if (!Permission.BUILD.hasPermission(player)) return null;

        double countPerTNT = (double) count / tntCount;
        double countPerTick = (double) count / Math.max((lastTick - tick), 1);
@@ -19,19 +19,18 @@

 package de.steamwar.bausystem.features.tpslimit;

+import com.destroystokyo.paper.event.server.ServerTickEndEvent;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
-import de.steamwar.bausystem.utils.TickEndEvent;
 import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
-import de.steamwar.core.Core;
 import de.steamwar.core.TPSWatcher;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
@@ -59,16 +58,12 @@ public class TPSSystem implements Listener {
        }
        new TPSLimitCommand();
        new TickLimitCommand();
-        if (Core.getVersion() >= 15) {
-            new TPSWarpCommand();
-            new TickWarpCommand();
-            if (TickManager.impl.canFreeze()) {
-                new TickWarpingCommand();
-            }
-        }
-        if (Core.getVersion() >= 21) {
-            new Tick21Command();
+        new TPSWarpCommand();
+        new TickWarpCommand();
+        if (TickManager.impl.canFreeze()) {
+            new TickWarpingCommand();
        }
+        new Tick21Command();
        new TPSDefaultCommand();
        new TickDefaultCommand();
        new TPSBaseCommand();
@@ -77,7 +72,7 @@ public class TPSSystem implements Listener {
    }

    @EventHandler
-    public void onTickEnd(TickEndEvent event) {
+    public void onTickEnd(ServerTickEndEvent event) {
        bossbar();
    }

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.tracer;

 import de.steamwar.bausystem.region.Region;
-import de.steamwar.core.Core;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -100,11 +99,7 @@ public class TNTPoint {
                       List<TNTPoint> history, List<Block> destroyedBlocks) {
        this.tntId = tntId;
        this.explosion = explosion;
-        if (Core.getVersion() > 15) {
-            this.inWater = tnt.isInWater();
-        } else {
-            this.inWater = false;
-        }
+        this.inWater = tnt.isInWater();
        this.afterFirstExplosion = afterFirstExplosion;
        this.ticksSinceStart = ticksSinceStart;
        fuse = tnt.getFuseTicks();
--- a/Show More
+++ b/Show More