Refactor leaderboard management: replace UserConfig-based implementation with new Leaderboard SQL class, update related classes to use LeaderboardManager, and fix query/logic for best time retrieval.

Reviewed-on: #160
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>

.gitignore

@@ -16,4 +16,8 @@ bin/
 .vscode
 
 # Other
-lib
+lib
+/WebsiteBackend/data
+/WebsiteBackend/logs
+/WebsiteBackend/skins
+/WebsiteBackend/config.json

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java

@@ -109,7 +109,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
 
     @Override
     public void setSelection(Player p, Point minPoint, Point maxPoint) {
-        WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, toBlockVector3(minPoint), toBlockVector3(maxPoint)));
+        WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, minPoint.toBlockVector3(), maxPoint.toBlockVector3()));
     }
 
     @Override
@@ -178,9 +178,9 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
             pastePoint.set(v);
 
             if (pasteBuilder.isReset()) {
-                e.setBlocks(new CuboidRegion(toBlockVector3(pasteBuilder.getMinPoint()), toBlockVector3(pasteBuilder.getMaxPoint())), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
+                e.setBlocks(new CuboidRegion(pasteBuilder.getMinPoint().toBlockVector3(), pasteBuilder.getMaxPoint().toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
                 if (pasteBuilder.getWaterLevel() != 0) {
-                    e.setBlocks(new CuboidRegion(toBlockVector3(pasteBuilder.getMinPoint()), toBlockVector3(pasteBuilder.getMaxPoint()).withY(pasteBuilder.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
+                    e.setBlocks(new CuboidRegion(pasteBuilder.getMinPoint().toBlockVector3(), pasteBuilder.getMaxPoint().toBlockVector3().withY(pasteBuilder.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
                 }
             }
             Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteBuilder.isIgnoreAir()).build());
@@ -193,7 +193,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
     @Override
     public Clipboard copy(Point minPoint, Point maxPoint, Point copyPoint) {
         BukkitWorld bukkitWorld = new BukkitWorld(Bukkit.getWorlds().get(0));
-        CuboidRegion region = new CuboidRegion(bukkitWorld, toBlockVector3(minPoint), toBlockVector3(maxPoint));
+        CuboidRegion region = new CuboidRegion(bukkitWorld, minPoint.toBlockVector3(), maxPoint.toBlockVector3());
         BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
         try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(bukkitWorld, -1)) {
             ForwardExtentCopy copy = new ForwardExtentCopy(
@@ -204,7 +204,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
             copy.setCopyingBiomes(false);
 
             Operations.complete(copy);
-            clipboard.setOrigin(toBlockVector3(copyPoint));
+            clipboard.setOrigin(copyPoint.toBlockVector3());
             return clipboard;
         } catch (WorldEditException e) {
             Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
@@ -224,10 +224,6 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
         }
     }
 
-    private BlockVector3 toBlockVector3(Point point) {
-        return BlockVector3.at(point.getX(), point.getY(), point.getZ());
-    }
-
     @Override
     public boolean inWater(org.bukkit.World world, Vector tntPosition) {
         Block block = world.getBlockAt(tntPosition.getBlockX(), tntPosition.getBlockY(), tntPosition.getBlockZ());

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java

@@ -0,0 +1,140 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.utils;
+
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.utils.bossbar.BossBarService;
+import de.steamwar.bausystem.utils.tps.TPSFreezeUtils;
+import de.steamwar.bausystem.utils.tps.TPSLimitUtils;
+import de.steamwar.core.TPSWarpUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class TickManager15 implements TickManager, Listener {
+
+    private static float currentTPSLimit = 20;
+    private boolean currentlyStepping = false;
+    private float currentLimit;
+    private int stepsTotal;
+    private int stepsLeft;
+
+    @Override
+    public boolean canFreeze() {
+        return TPSFreezeUtils.isCanFreeze();
+    }
+
+    @Override
+    public void setTickRate(float tickRate) {
+        if (currentlyStepping) {
+            currentlyStepping = false;
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                BossBarService.instance.remove(player, Region.getGlobalRegion(), "TickStep");
+            });
+        }
+        TPSWarpUtils.warp(tickRate);
+        if (currentTPSLimit == 0 && tickRate != 0) {
+            TPSFreezeUtils.unfreeze();
+        }
+        currentTPSLimit = tickRate;
+        if (tickRate == 0) {
+            TPSLimitUtils.unlimit();
+            TPSFreezeUtils.freeze();
+        } else if (tickRate < 20.0) {
+            TPSLimitUtils.limit(tickRate);
+        } else if (tickRate >= 20) {
+            TPSLimitUtils.unlimit();
+        }
+    }
+
+    @Override
+    public boolean isFrozen() {
+        return TPSFreezeUtils.frozen();
+    }
+
+    @Override
+    public void setFreeze(boolean freeze) {
+        if (freeze) {
+            setTickRate(0);
+        }
+    }
+
+    @Override
+    public void stepTicks(int ticks) {
+        currentLimit = 0;
+        setTickRate(20);
+        stepsLeft = ticks;
+        stepsTotal = ticks;
+        currentlyStepping = true;
+    }
+
+    @Override
+    public void sprintTicks(int ticks) {
+        currentLimit = currentTPSLimit;
+        setTickRate(4000);
+        stepsLeft = ticks;
+        stepsTotal = ticks;
+        currentlyStepping = true;
+    }
+
+    @Override
+    public boolean isSprinting() {
+        return currentlyStepping && currentTPSLimit > 20;
+    }
+
+    @Override
+    public boolean isStepping() {
+        return currentlyStepping && currentTPSLimit <= 20;
+    }
+
+    @Override
+    public float getTickRate() {
+        return currentTPSLimit;
+    }
+
+    @Override
+    public void setBlockTpsPacket(boolean block) {
+
+    }
+
+    @Override
+    public long getTotalTicks() {
+        return stepsTotal;
+    }
+
+    @Override
+    public long getDoneTicks() {
+        return stepsTotal - stepsLeft;
+    }
+
+    @Override
+    public long getRemainingTicks() {
+        return stepsLeft;
+    }
+
+    @EventHandler
+    public void onTickEnd(TickEndEvent event) {
+        if (!currentlyStepping) return;
+        stepsLeft--;
+        if (stepsLeft <= 0) {
+            setTickRate(currentLimit);
+        }
+    }
+}

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/PacketCache.java

@@ -1,23 +1,23 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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 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.
+ * 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/>.
+ * 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.tpslimit;
+package de.steamwar.bausystem.utils.tps;
 
 import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSFreezeUtils.java

@@ -1,23 +1,23 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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 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.
+ * 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/>.
+ * 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.tpslimit;
+package de.steamwar.bausystem.utils.tps;
 
 import de.steamwar.Reflection;
 import lombok.Getter;

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSLimitUtils.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tpslimit;
+package de.steamwar.bausystem.utils.tps;
 
 import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/TickListener19.java

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.utils;
 import com.destroystokyo.paper.event.server.ServerTickEndEvent;
 import com.destroystokyo.paper.event.server.ServerTickStartEvent;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -37,7 +36,7 @@ public class TickListener19 implements TickListener, Listener {
 
     @EventHandler
     public void onServerTickStart(ServerTickStartEvent event) {
-        if (TPSFreezeUtils.isFrozen()) return;
+        if (TickManager.impl.isFrozen()) return;
         Bukkit.getPluginManager().callEvent(new TickStartEvent());
         tickStartRan = true;
     }

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java

@@ -21,41 +21,39 @@ package de.steamwar.bausystem.utils;
 
 import de.steamwar.Reflection;
 import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.game.PacketPlayInSetCreativeSlot;
-import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
-import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
-import net.minecraft.server.level.EntityPlayer;
-import net.minecraft.server.level.PlayerInteractManager;
-import net.minecraft.world.entity.player.EntityHuman;
-import net.minecraft.world.entity.player.PlayerAbilities;
-import net.minecraft.world.item.component.CustomData;
-import net.minecraft.world.level.EnumGamemode;
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import io.papermc.paper.datacomponent.item.ItemContainerContents;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.network.protocol.game.ClientboundExplodePacket;
+import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.level.ServerPlayerGameMode;
+import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.level.GameType;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.List;
 import java.util.Optional;
 
 public class NMSWrapper21 implements NMSWrapper {
 
-    private static final Reflection.Field<PlayerInteractManager> playerInteractManager = Reflection.getField(EntityPlayer.class, null, PlayerInteractManager.class);
+    private static final Reflection.Field<ServerPlayerGameMode> playerInteractManager = Reflection.getField(ServerPlayer.class, null, ServerPlayerGameMode.class);
+    private static final Reflection.Field<GameType> playerGameMode = Reflection.getField(ServerPlayerGameMode.class, GameType.class, 0);
 
     @Override
     public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerInteractManager.get(((CraftPlayer) player).getHandle()).a(EnumGamemode.a(gameMode.getValue()));
+        playerGameMode.set(playerInteractManager.get(((CraftPlayer) player).getHandle()), GameType.byId(gameMode.getValue()));
     }
 
     @Override
     public void setSlotToItemStack(Player player, Object o) {
-        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
-        int index = packetPlayInSetCreativeSlot.b();
+        ClientboundContainerSetSlotPacket packetPlayInSetCreativeSlot = (ClientboundContainerSetSlotPacket) o;
+        int index = packetPlayInSetCreativeSlot.getSlot();
         if (index >= 36 && index <= 44) {
             index -= 36;
         } else if (index > 44) {
@@ -63,25 +61,23 @@ public class NMSWrapper21 implements NMSWrapper {
         } else if (index <= 8) {
             index = index - 8 + 36;
         }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.e()));
+        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.getItem()));
         if (index < 9) player.getInventory().setHeldItemSlot(index);
         player.updateInventory();
     }
 
-    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
+    private static final Reflection.Field<ClientboundGameEventPacket.Type> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, ClientboundGameEventPacket.Type.class, 14);
 
     @Override
     public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
+        gameStateChangeReason.set(packet, ClientboundGameEventPacket.CHANGE_GAME_MODE);
     }
 
-    private static final Reflection.Field<PlayerAbilities> playerAbilities = Reflection.getField(EntityHuman.class, null, PlayerAbilities.class);
-
     @Override
     public void setPlayerBuildAbilities(Player player) {
-        PlayerAbilities abilities = playerAbilities.get(((CraftPlayer) player).getHandle());
-        abilities.d = true;
-        abilities.e = true;
+        Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
+        abilities.mayBuild = true;
+        abilities.mayfly = true;
     }
 
     @Override
@@ -93,49 +89,45 @@ public class NMSWrapper21 implements NMSWrapper {
 
     @Override
     public boolean checkItemStack(ItemStack item) {
-        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-        NBTTagCompound tag = nmsItem.a(DataComponents.b, CustomData.a).c();
-        if (tag.e("BlockEntityTag")) {
-            NBTTagCompound blockTag = tag.p("BlockEntityTag");
-            if (blockTag.e("Items")) {
-                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
-            }
+        ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
+        if (data == null) {
+            return false;
         }
 
-        return false;
+        return drillDown(data.contents(), 0, 0) > threshold;
     }
 
-    private int drillDown(NBTTagList items, int layer, int start) {
+    private int drillDown(List<ItemStack> items, int layer, int start) {
         if (layer > 2) return start + threshold;
         int invalid = start;
-        for (NBTBase nbtBase : items) {
-            if (!(nbtBase instanceof NBTTagCompound slot))
+        for (int i = start; i < items.size(); i++) {
+            ItemStack item = items.get(i);
+            if (item.isEmpty()) continue;
+
+            invalid += item.getAmount();
+
+            ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
+            if (data == null) {
                 continue;
-            if (slot.e("tag")) {
-                invalid += slot.f("Count");
-                NBTTagCompound iTag = slot.p("tag");
-                if (iTag.e("BlockEntityTag")) {
-                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
-                    if (blockTag.e("Items")) {
-                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
-                    }
-                }
             }
-            if (invalid > threshold)
-                break;
+
+            List<ItemStack> subItems = data.contents();
+            if (subItems.size() > 1) {
+                invalid = drillDown(subItems, layer + 1, invalid);
+            }
         }
         return invalid;
     }
 
     @Override
     public Object resetExplosionKnockback(Object packet) {
-        PacketPlayOutExplosion explosion = (PacketPlayOutExplosion) packet;
+        ClientboundExplodePacket explosion = (ClientboundExplodePacket) packet;
 
-        return new PacketPlayOutExplosion(
-                explosion.b(),
+        return new ClientboundExplodePacket(
+                explosion.center(),
                 Optional.empty(),
-                explosion.f(),
-                explosion.g()
+                explosion.explosionParticle(),
+                explosion.explosionSound()
         );
     }
 }

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/TickManager21.java

@@ -0,0 +1,150 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 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.utils;
+
+import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
+import de.steamwar.bausystem.BauSystem;
+import net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ServerTickRateManager;
+import net.minecraft.world.TickRateManager;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class TickManager21 implements TickManager {
+    private static final ServerTickRateManager manager = MinecraftServer.getServer().tickRateManager();
+    private static final Reflection.Field<Integer> frozenTicksToRun = Reflection.getField(TickRateManager.class, int.class, 0);
+    private static final Reflection.Field<Long> remainingSprintTicks = Reflection.getField(ServerTickRateManager.class, long.class, 0);
+
+    private boolean blockTpsPacket = true;
+    private int totalSteps;
+
+    public TickManager21() {
+        TinyProtocol.instance.addFilter(ClientboundTickingStatePacket.class, this::blockPacket);
+    }
+
+    private Object blockPacket(Player player, Object packet) {
+        if (blockTpsPacket) {
+            return new ClientboundTickingStatePacket(20, manager.isFrozen());
+        } else {
+            return packet;
+        }
+    }
+
+    @Override
+    public boolean canFreeze() {
+        return true;
+    }
+
+    @Override
+    public void setBlockTpsPacket(boolean block) {
+        blockTpsPacket = block;
+        if (blockTpsPacket) {
+            ClientboundTickingStatePacket packet = new ClientboundTickingStatePacket(20, manager.isFrozen());
+            Bukkit.getOnlinePlayers().forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
+        } else {
+            ClientboundTickingStatePacket packet = new ClientboundTickingStatePacket(manager.tickrate(), manager.isFrozen());
+            Bukkit.getOnlinePlayers().forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
+        }
+    }
+
+    @Override
+    public void setTickRate(float tickRate) {
+        if (isFrozen()) {
+            setFreeze(false);
+        }
+        manager.setTickRate(tickRate);
+    }
+
+    @Override
+    public boolean isFrozen() {
+        return manager.isFrozen();
+    }
+
+    @Override
+    public void setFreeze(boolean freeze) {
+        manager.setFrozen(freeze);
+    }
+
+    @Override
+    public void stepTicks(int ticks) {
+        if (manager.isSprinting()) {
+            manager.stopSprinting();
+        } else if (manager.isSteppingForward()) {
+            manager.stopStepping();
+        }
+        this.totalSteps = ticks;
+        manager.setFrozen(true);
+        manager.stepGameIfPaused(ticks);
+        manager.setFrozen(false);
+        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), (bukkitTask) -> {
+            if (manager.isSteppingForward()) return;
+            manager.setFrozen(true);
+            bukkitTask.cancel();
+        }, 1, 1);
+        manager.tick();
+    }
+
+    @Override
+    public void sprintTicks(int ticks) {
+        if (manager.isSteppingForward()) {
+            manager.stopStepping();
+        } else if (manager.isSprinting()) {
+            manager.stopSprinting();
+        }
+        this.totalSteps = ticks;
+        manager.requestGameToSprint(ticks, true);
+    }
+
+    @Override
+    public boolean isSprinting() {
+        return manager.isSprinting();
+    }
+
+    @Override
+    public boolean isStepping() {
+        return manager.isSteppingForward();
+    }
+
+    @Override
+    public float getTickRate() {
+        return manager.tickrate();
+    }
+
+    @Override
+    public long getRemainingTicks() {
+        if (isSprinting()) {
+            return remainingSprintTicks.get(manager);
+        } else {
+            return frozenTicksToRun.get(manager);
+        }
+    }
+
+    @Override
+    public long getDoneTicks() {
+        return totalSteps - getRemainingTicks();
+    }
+
+    @Override
+    public long getTotalTicks() {
+        return totalSteps;
+    }
+}

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -25,7 +25,7 @@ PAGE_LIST=§e Page ({0}/{1}) »»
 LIST_PREVIOUS_PAGE=§ePrevious page
 LIST_NEXT_PAGE=§eNext page
 # Permissions
-NO_PERMISSION=You are not allowed to use that here
+NO_PERMISSION=§7You are not allowed to use that here
 SPECTATOR=§fSpectator
 # Scoreboard
 SCOREBOARD_TIME=Time
@@ -38,6 +38,7 @@ SCOREBOARD_TRACE_TICKS=Ticks
 SCOREBOARD_TECHHIDER=TechHider§8: §aOn
 SCOREBOARD_XRAY=XRay§8: §aOn
 SCOREBOARD_LOCK_TEAM=Bau Lock§8: §eTeam
+SCOREBOARD_LOCK_SUPERVISOR=Bau Lock§8: §eSupervisor
 SCOREBOARD_LOCK_TEAM_AND_SERVERTEAM=Bau Lock§8: §e(Server) Team
 SCOREBOARD_LOCK_SERVERTEAM=Bau Lock§8: §eServer Team
 SCOREBOARD_LOCK_NOBODY=Bau Lock§8: §cNobody
@@ -136,7 +137,9 @@ BAU_INFO_ITEM_LORE_FIRE=§7Fire§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Color§8: §e{0}
 BAU_INFO_ITEM_LORE_PROTECT=§7Protect§8: §e{0}
 BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
-BAU_INFO_ITEM_LORE_NO_GRAVITY = §8NoGravity§8: §e{0}
+BAU_INFO_ITEM_LORE_NO_GRAVITY = §7NoGravity§8: §e{0}
+BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
+BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
 BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -389,6 +392,12 @@ INVENTORY_FILL_HELP=§8/§einventoryfill §8- §7Toggles InventoryFill
 INVENTORY_FILL_INFO=§7Helps you fill containers by looking at them while sneaking and dropping the item. Or just scroll on a container to change the amount of the item inside.
 INVENTORY_FILL_ENABLE=§aInventoryFiller activated
 INVENTORY_FILL_DISABLE=§cInventoryFiller deactivated
+INVENTORY_FILL_GUI_NAME=Inventory Filler
+INVENTORY_FILL_GUI_POWER=§ePower§8:§7 {0}
+INVENTORY_FILL_GUI_TNT=§eTNT
+# Ray Visualizer
+RAY_VISUALIZER_ENABLE=§aRayVisualizer activated
+RAY_VISUALIZER_DISABLE=§aRayVisualizer deactivated
 # Killchecker
 KILLCHECKER_HELP_ENABLE=§8/§ekillchecker enable §8- §7Enables Killchecker / Recalculates kills
 KILLCHECKER_HELP_DISABLE=§8/§ekillchecker disable §8- §7Disables Killchecker
@@ -396,6 +405,7 @@ KILLCHECKER_INFO=§7Shows the overlaps of cannon kills in your build area.
 KILLCHECKER_INFO2=§7Only colorable blocks like Wool, Terractotta, Stained Glass and Concrete are counted.
 KILLCHECKER_ENABLE=§aKillchecker activated
 KILLCHECKER_DISABLE=§cKillchecker deactivated
+KILLCHECKER_NO_BUILD=§cThere is no Build Area in this Region
 KILLCHECKER_BOSSBAR=§e§l{0} §7(§e{1}%§7)   §e§l{2}§7 cannons
 # BlockCounter
 BLOCK_COUNTER_HELP_TOGGLE=§8/§eblockcounter §8- §7Toggle on/off
@@ -406,6 +416,8 @@ BLOCK_COUNTER_MESSAGE_SECOND=§7Damage §8> §e{0} §7Blocks  §e{1} §7TNT  §e
 BLOCK_COUNTER_ENABLE=§7BlockCounter activated
 BLOCK_COUNTER_DISABLE=§7BlockCounter deactivated
 # DepthCounter
+DEPTH_COUNTER_DISABLE=§7Depth Counter disabled
+DEPTH_COUNTER_ENABLE=§7Depth Counter enabled
 DEPTH_COUNTER_MESSAGE=§7Depth §8> §7
 DEPTH_COUNTER_COUNT={0}{1}§8×{2}{3}§8×{4}{5}
 DEPTH_COUNTER_HOVER=§7X§8ק7Y§8ק7Z
@@ -512,7 +524,7 @@ LOADER_HELP_GUI=§8/§7loader gui §8- §7Shows Loader gui
 LOADER_HELP_STOP=§8/§eloader stop §8- §7Stops recording/playback
 LOADER_HELP_WAIT=§8/§7loader wait §8[§7Ticks§8] - §7Sets wait time between shots
 LOADER_HELP_SPEED=§8/§7loader speed §8[§7Ticks§8] - §7Sets wait time between actions
-LOADER_NO_LOADER=§cYou have no Laoder. Create one with /loader setup
+LOADER_NO_LOADER=§cYou have no Loader. Create one with /loader setup
 LOADER_NEW=§7Load your cannon and fire it once, to initialise the loader.
 LOADER_HOW_TO_START=§7Then, execute /§eloader start§7 to start the Loader
 LOADER_ACTIVE=§7The Loader is now active.
@@ -728,12 +740,10 @@ REGION_ITEM_RESET=§eReset
 REGION_ITEM_TESTBLOCK=§eDummy
 REGION_ITEM_TNT_OFF=§7TNT: §eDeactivated
 REGION_ITEM_TNT_ONLY_TB=§7TNT: §eonly dummy
-REGION_ITEM_TNT_ONLY_BUILD=§7TNT: §eonly build
 REGION_ITEM_TNT_ON=§7TNT: §eActivated
 REGION_ITEM_SELECTOR_TITLE=Tnt Mode
 REGION_ITEM_SELECTOR_ON=§eActivate
 REGION_ITEM_SELECTOR_ONLY_TB=§eonly dummy
-REGION_ITEM_SELECTOR_ONLY_BUILD=§eonly build
 REGION_ITEM_SELECTOR_OFF=§eDeactivate
 #Region
 REGION_COLOR_HELP_COLOR=§8/§ecolor §8[§7Color§8] §8- §7Sets the color of the region
@@ -844,7 +854,7 @@ LAUFBAU_SETTINGS_INACTIVE=§cInactive
 LAUFBAU_SETTINGS_MIXED=§e{0}§8/§e{1} §aActive
 LAUFBAU_SETTINGS_GUI_BACK=§eBack
 LAUFBAU_SETTINGS_TOGGLE=§eClick §8-§7 Toggle
-LAUFBAU_SETTINGS_ADVANCED=§eMiddle-Click §8-§7 Advanced settings
+LAUFBAU_SETTINGS_ADVANCED=§eLeft-Click §8-§7 Advanced settings
 LAUFBAU_BLOCK_COBWEB=§eCobweb
 LAUFBAU_BLOCK_GRASS_PATH=§eGrass Path
 LAUFBAU_BLOCK_SOUL_SAND=§eSoul Sand
@@ -930,7 +940,6 @@ SELECT_HELP=§8/§eselect §8[§7RegionsTyp§8] §8- §7Select a region type
 SELECT_EXTENSION_HELP=§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Select a region type with or without extension
 SELECT_GLOBAL_REGION=§cThe global region cannot be selected
 SELECT_NO_TYPE=§cThis region has no {0}
-SELECT_NO_EXTENSION=§cThis region has no extension
 SELECT_MESSAGE=§7WorldEdit selection set to {0}, {1}, {2} and {3}, {4}, {5}
 SKULL_HELP=§8/§eskull §8[§eplayer§8] §8-§7 Receive a player head
 SKULL_INVALID=§cInvalid player name
@@ -945,6 +954,9 @@ SPEED_TAB_NAME=Input speed
 WORLDEDIT_WAND=WorldEdit Wand
 WORLDEDIT_LEFTCLICK=Left click: select pos #1
 WORLDEDIT_RIGHTCLICK=Right click: select pos #2
+TNT_DETAILS_COMMAND=§8/§etntdetails §8-§7 Toggle information printed after clicking on a TNT
+TNT_DETAILS_ON = §eTNTDetails §aactivated
+TNT_DETAILS_OFF = §eTNTDetails §cdeactivated
 TNT_CLICK_HEADER=§8---=== §eTNT §8===---
 TNT_CLICK_ORDER=§eEntity Order§8: §e{0}
 TNT_CLICK_FUSE_TIME=§eFuseTime§8: §e{0}
@@ -968,10 +980,12 @@ SELECT_ITEM_BAUPLATTFORM=§eBuild platform
 SELECT_ITEM_TESTBLOCK=§eDummy
 CHESTFILLER_FILLED=§eChest filled
 CHESTFILLER_COUNT=§7{0}§8: §e§l{1}
-PISTON_HELP_1=§7Right click on piston with a slime ball to calculate the moved blocks.
+PISTON_HELP_1=§7Right click on piston to calculate the moved blocks.
 PISTON_HELP_2=§7Count is red, if one unmoveable block is present.
 PISTON_HELP_3=§7Count is yellow, if too many blocks are present.
 PISTON_INFO=§7Moved Blocks {0}{1}§8/§712
+PISTON_ENABLED=§aCalculator enabled
+PISTON_DISABLED=§cCalculator disabled
 # Warp
 WARP_LOC_X=§7X§8: §e{0}
 WARP_LOC_Y=§7Y§8: §e{0}

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -25,7 +25,7 @@ PAGE_LIST=§e Seite ({0}/{1}) »»
 LIST_PREVIOUS_PAGE=§eVorherige Seite
 LIST_NEXT_PAGE=§eNächste Seite
 # Permission
-NO_PERMISSION=Du darfst dies hier nicht nutzen
+NO_PERMISSION=§7Du darfst dies hier nicht nutzen
 SPECTATOR=§fZuschauer
 # Scoreboard
 SCOREBOARD_TIME=Uhrzeit
@@ -119,12 +119,9 @@ BACKUP_LORE=§eKlicken zum Laden
 BAU_COMMAND_HELP_INFO=§8/§ebau info §8- §7Alias für §8/§ebauinfo
 BAU_INFO_ITEM_NAME=§eBau-Management
 ## This is used in BauInfoBauGuiItem.java
-BAU_INFO_ITEM_LORE_TNT=§7TNT§8: §e{0}
-BAU_INFO_ITEM_LORE_FREEZE=§7Freeze§8: §e{0}
-BAU_INFO_ITEM_LORE_DAMAGE=§7Damage§8: §e{0}
 BAU_INFO_ITEM_LORE_FIRE=§7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Farbe§8: §e{0}
-BAU_INFO_ITEM_LORE_PROTECT=§7Protect§8: §e{0}
+BAU_INFO_ITEM_LORE_CHANGED=§7Verändert§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Gibt Informationen über den Bau
 BAU_INFO_COMMAND_OWNER=§7Besitzer§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -350,8 +347,11 @@ SMART_PLACE_DISABLE=§cSmartPlace deaktiviert
 # InventoryFiller
 INVENTORY_FILL_HELP=§8/§einventoryfill §8- §7Toggled InventoryFill
 INVENTORY_FILL_INFO=§7Hilft dir, Behälter zu füllen, indem du sie beim sneaken ansiehst und den Gegenstand fallen lässt. Oder scrolle einfach auf einen Behälter, um die Menge des gehaltenen Gegenstandes darin zu ändern.
-INVENTORY_FILL_ENABLE=§aInventoryFiller activated
-INVENTORY_FILL_DISABLE=§cInventoryFiller deactivated
+INVENTORY_FILL_ENABLE=§aInventoryFiller aktiviert
+INVENTORY_FILL_DISABLE=§cInventoryFiller deaktiviert
+# Ray Visualizer
+RAY_VISUALIZER_ENABLE=§aRayVisualizer aktiviert
+RAY_VISUALIZER_DISABLE=§aRayVisualizer deaktiviert
 # Killchecker
 KILLCHECKER_HELP_ENABLE=§8/§ekillchecker enable §8- §7Aktiviert Killchecker / Berechnet kills neu
 KILLCHECKER_HELP_DISABLE=§8/§ekillchecker disable §8- §7Deaktiviert Killchecker
@@ -359,6 +359,7 @@ KILLCHECKER_INFO=§7Zeigt Überlappungen der Kanonen Kills im Baubereich an.
 KILLCHECKER_INFO2=§7Nur farbige Blöcke wie Wolle, Terracotta, Stained Glass und Concrete wird gezählt.
 KILLCHECKER_ENABLE=§aKillchecker aktiviert
 KILLCHECKER_DISABLE=§cKillchecker deaktiviert
+KILLCHECKER_NO_BUILD=§cEs gibt keinen Baubereich in dieser Region
 KILLCHECKER_BOSSBAR=§e§l{0} §7(§e{1}%§7)   §e§l{2}§7 Kanonnen
 # BlockCounter
 BLOCK_COUNTER_HELP_TOGGLE=§8/§eblockcounter §8- §7Wechsel zwischen an und aus
@@ -369,6 +370,8 @@ BLOCK_COUNTER_MESSAGE_SECOND=§7Schaden §8> §e{0} §7Blöcke  §e{1} §7TNT
 BLOCK_COUNTER_ENABLE=§7BlockCounter angemacht
 BLOCK_COUNTER_DISABLE=§7BlockCounter ausgemacht
 # DepthCounter
+DEPTH_COUNTER_DISABLE=§7Depth Counter deaktiviert
+DEPTH_COUNTER_ENABLE=§7Depth Counter aktiviert
 DEPTH_COUNTER_MESSAGE=§7Tiefe §8> §7
 # TPSLimit
 TPSLIMIT_FREEZE_HELP=§8/§etpslimit 0 §8-§7 Friere TPS ein
@@ -675,12 +678,10 @@ REGION_ITEM_RESET=§eReset
 REGION_ITEM_TESTBLOCK=§eTestblock
 REGION_ITEM_TNT_OFF=§7TNT: §eAusgeschaltet
 REGION_ITEM_TNT_ONLY_TB=§7TNT: §enur Testblock
-REGION_ITEM_TNT_ONLY_BUILD=§7TNT: §enur Baubereich
 REGION_ITEM_TNT_ON=§7TNT: §eEingeschaltet
 REGION_ITEM_SELECTOR_TITLE=Tnt Modus
 REGION_ITEM_SELECTOR_ON=§eEinschalten
 REGION_ITEM_SELECTOR_ONLY_TB=§enur Testblock
-REGION_ITEM_SELECTOR_ONLY_BUILD=§enur Baubereich
 REGION_ITEM_SELECTOR_OFF=§eAusschalten
 #Region
 REGION_COLOR_HELP_COLOR=§8/§ecolor §8[§7Color§8] §8- §7Setze die Farbe der Region
@@ -790,7 +791,7 @@ LAUFBAU_SETTINGS_INACTIVE=§cInaktiv
 LAUFBAU_SETTINGS_MIXED=§e{0}§8/§e{1} §aAktiv
 LAUFBAU_SETTINGS_GUI_BACK=§eBack
 LAUFBAU_SETTINGS_TOGGLE=§eClick §8-§7 Toggle
-LAUFBAU_SETTINGS_ADVANCED=§eMiddle-Click §8-§7 Erweiterte Einstellung
+LAUFBAU_SETTINGS_ADVANCED=§eLinks-Click §8-§7 Erweiterte Einstellung
 LAUFBAU_BLOCK_COBWEB=§eCobweb
 LAUFBAU_BLOCK_GRASS_PATH=§eGrass Path
 LAUFBAU_BLOCK_SOUL_SAND=§eSoul Sand
@@ -872,7 +873,6 @@ SELECT_HELP=§8/§eselect §8[§7RegionsTyp§8] §8- §7Wähle einen RegionsTyp
 SELECT_EXTENSION_HELP=§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Wähle einen RegionsTyp aus mit oder ohne Extension
 SELECT_GLOBAL_REGION=§cDie globale Region kannst du nicht auswählen
 SELECT_NO_TYPE=§cDiese Region hat keinen {0}
-SELECT_NO_EXTENSION=§cDiese Region hat keine Ausfahrmaße
 SELECT_MESSAGE=§7WorldEdit auswahl auf {0}, {1}, {2} und {3}, {4}, {5} gesetzt
 SKULL_HELP=§8/§eskull §8[§eSpieler§8] §8-§7 Gibt einen SpielerKopf
 SKULL_INVALID=§cUngültiger Spieler
@@ -887,6 +887,9 @@ SPEED_TAB_NAME=Geschwindigkeit eingeben
 WORLDEDIT_WAND=WorldEdit Wand
 WORLDEDIT_LEFTCLICK=Left click: select pos #1
 WORLDEDIT_RIGHTCLICK=Right click: select pos #2
+TNT_DETAILS_COMMAND=§8/§etntdetails §8-§7 Aktiviert/Deaktiviert das senden von Details beim Klick auf TNT
+TNT_DETAILS_ON = §eTNTDetails §aaktiviert
+TNT_DETAILS_OFF = §eTNTDetails §cdeaktiviert
 TNT_CLICK_HEADER=§8---=== §eTNT §8===---
 TNT_CLICK_ORDER=§eEntity Order§8: §e{0}
 TNT_CLICK_FUSE_TIME=§eFuseTime§8: §e{0}
@@ -909,10 +912,12 @@ SELECT_ITEM_BAURAHMEN=§eBaurahmen
 SELECT_ITEM_BAUPLATTFORM=§eBauplattform
 SELECT_ITEM_TESTBLOCK=§eTestblock
 CHESTFILLER_FILLED=§eKiste gefüllt
-PISTON_HELP_1=§7Rechts Klick auf Piston mit einem Slime Ball berechnet dir die bewegten Blöcke.
+PISTON_HELP_1=§7Rechts Klick auf einen Piston berechnet dir die bewegten Blöcke.
 PISTON_HELP_2=§7Die Anzahl ist Rot, wenn ein unmovable Block vorhanden ist.
 PISTON_HELP_3=§7Die Anzahl ist Gelb, wenn zu viele Blöcke vorhanden sind.
 PISTON_INFO=§7Bewegte Blöcke {0}{1}§8/§712
+PISTON_ENABLED=§aPiston-Berechnung aktiviert
+PISTON_DISABLED=§cPiston-Berechnung deaktiviert
 # Warp
 WARP_LOC_X=§7X§8: §e{0}
 WARP_LOC_Y=§7Y§8: §e{0}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java

@@ -28,21 +28,21 @@ import de.steamwar.bausystem.features.script.lua.libs.LuaLib;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.panzern.Panzern;
 import de.steamwar.bausystem.features.slaves.panzern.PanzernAlgorithm;
-import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
 import de.steamwar.bausystem.features.tracer.TraceManager;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.features.world.BauScoreboard;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.loader.PrototypeLoader;
-import de.steamwar.bausystem.region.loader.RegionLoader;
-import de.steamwar.bausystem.region.loader.Updater;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickListener;
+import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
+import de.steamwar.core.CRIUSleepEvent;
 import de.steamwar.core.Core;
+import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.linkage.MaxVersion;
 import de.steamwar.linkage.MinVersion;
@@ -55,6 +55,7 @@ import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
@@ -73,7 +74,7 @@ import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BauSystem extends JavaPlugin {
+public class BauSystem extends JavaPlugin implements Listener {
 
     // This should be treated as final!
     public static Message MESSAGE;
@@ -94,6 +95,8 @@ public class BauSystem extends JavaPlugin {
         instance = this;
         SWUtils.setBausystem(instance);
 
+        RegionSystem.INSTANCE.load();
+        /*
         try {
             PrototypeLoader.load();
             RegionLoader.load();
@@ -106,6 +109,7 @@ public class BauSystem extends JavaPlugin {
 
         new Updater(PrototypeLoader.file, PrototypeLoader::load);
         new Updater(RegionLoader.file, RegionLoader::load);
+         */
 
         SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
         SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
@@ -206,6 +210,13 @@ public class BauSystem extends JavaPlugin {
 
         TraceManager.instance.init();
         TraceRecorder.instance.init();
+
+        new WorldEditRendererCUIEditor();
+    }
+
+    @EventHandler
+    public void onCRIUSleep(CRIUSleepEvent event) {
+        RegionSystem.INSTANCE.save();
     }
 
     @Override
@@ -220,6 +231,7 @@ public class BauSystem extends JavaPlugin {
         });
 
         WorldData.write();
+        RegionSystem.INSTANCE.save();
         Config.getInstance().saveAll();
     }
 
@@ -263,7 +275,7 @@ public class BauSystem extends JavaPlugin {
 
             @Override
             public void run() {
-                if (TPSFreezeUtils.isFrozen()) return;
+                if (TickManager.impl.isFrozen()) return;
                 if (counter >= delay) {
                     runnable.run();
                     cancel();
@@ -281,7 +293,7 @@ public class BauSystem extends JavaPlugin {
 
             @Override
             public void run() {
-                if (TPSFreezeUtils.isFrozen()) return;
+                if (TickManager.impl.isFrozen()) return;
                 if (counter >= (first ? delay : period)) {
                     first = false;
                     runnable.run();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java

@@ -21,11 +21,9 @@ package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.features.world.BauMemberUpdate;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.HashSet;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java

@@ -24,7 +24,6 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java

@@ -24,8 +24,6 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -33,8 +31,6 @@ import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Chest;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -43,9 +39,9 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 @Linked
 public class AutostartListener implements Listener {
@@ -106,11 +102,11 @@ public class AutostartListener implements Listener {
 
     public void activate(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
-        if (!region.hasType(RegionType.TESTBLOCK)) {
+        if (region.getTestblockArea().isEmpty()) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
@@ -131,20 +127,12 @@ public class AutostartListener implements Listener {
         event.blockList().forEach(block -> {
             Region region = Region.getRegion(block.getLocation());
             if (!regionStartTime.containsKey(region)) return;
-            if (!region.hasType(RegionType.TESTBLOCK)) return;
-            if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
+            if (!region.getTestblockArea().inRegion(block.getLocation(), true)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            long preFightDurationInSeconds = getPreFightDurationInSeconds(region);
+            long preFightDurationInSeconds = region.getGameModeConfig().getTimes().getPreFightDuration();
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", preFightDurationInSeconds, ((preFightDurationInSeconds * 20) - tickDiff));
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
         });
     }
-
-    private int getPreFightDurationInSeconds(Region region) {
-        File file = region.gameModeConfig();
-        if (file == null) return 30;
-        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-        return config.getInt("Times.PreFightDuration", 30);
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java

@@ -19,31 +19,23 @@
 
 package de.steamwar.bausystem.features.backup;
 
-import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionBackups;
+import de.steamwar.bausystem.region.flags.ChangedMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
-import de.steamwar.bausystem.region.tags.Tag;
-import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Linked
@@ -54,7 +46,7 @@ public class BackupCommand extends SWCommand {
     }
 
     static boolean checkGlobalRegion(Region region, Player p) {
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("BACKUP_REGION_NO_REGION", p);
             return true;
         }
@@ -67,11 +59,12 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (!region.get(Tag.CHANGED)) {
+        if (region.getFlags().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
             return;
         }
-        if (region.backup()) {
+        Optional<RegionBackups.Backup> backup = region.getBackups().create(RegionBackups.BackupType.MANUAL);
+        if (backup.isPresent()) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_SUCCESS", p);
         } else {
             BauSystem.MESSAGE.send("BACKUP_CREATE_FAILURE", p);
@@ -79,25 +72,12 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "BACKUP_HELP_LOAD")
-    public void backupLoad(@Validator("owner") Player p, @Mapper("backupName") String backupName) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-
-        File backupFile = region.getBackupFile(backupName.replace('_', ' '));
-        if (backupFile == null) {
+    public void backupLoad(@Validator("owner") Player p, @Mapper("backup") @ErrorMessage("BACKUP_LOAD_FAILURE") RegionBackups.Backup backup) {
+        if (backup.load()) {
+            BauSystem.MESSAGE.send("BACKUP_LOAD", p);
+        } else {
             BauSystem.MESSAGE.send("BACKUP_LOAD_FAILURE", p);
-            return;
         }
-        EditSession editSession = new PasteBuilder(new PasteBuilder.FileProvider(backupFile))
-                .pastePoint(region.getMinPoint().add(region.getPrototype().getSizeX() / 2, 0, region.getPrototype().getSizeZ() / 2))
-                .minPoint(region.getMinPoint())
-                .maxPoint(region.getMaxPoint())
-                .waterLevel(region.getWaterLevel())
-                .run();
-        region.remember(editSession);
-        BauSystem.MESSAGE.send("BACKUP_LOAD", p);
     }
 
     @Register(value = "list", description = "BACKUP_HELP_LIST")
@@ -106,10 +86,10 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        List<String> backups = listBackup(p);
+        List<RegionBackups.Backup> backups = listBackup(p);
         BauSystem.MESSAGE.send("BACKUP_LIST_HEAD", p, backups.size());
-        backups.forEach(s -> {
-            BauSystem.MESSAGE.send("BACKUP_LIST_ENTRY", p, "/backup load " + s, new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/backup load " + s), s);
+        backups.forEach(backup -> {
+            BauSystem.MESSAGE.send("BACKUP_LIST_ENTRY", p, "/backup load " + backup.getName(), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/backup load " + backup.getName()), backup.getName());
         });
     }
 
@@ -119,34 +99,44 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        List<String> backups = listBackup(p);
-        List<SWListInv.SWListEntry<String>> swListEntries = new ArrayList<>();
+        List<RegionBackups.Backup> backups = listBackup(p);
+        List<SWListInv.SWListEntry<RegionBackups.Backup>> swListEntries = new ArrayList<>();
         List<String> lore = Arrays.asList(BauSystem.MESSAGE.parse("BACKUP_LORE", p));
         for (int i = 0; i < backups.size(); i++) {
-            String s = backups.get(i);
-            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, s), lore, false, clickType -> {});
+            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.getItemStack().setAmount(i + 1);
-            swListEntries.add(new SWListInv.SWListEntry<>(swItem, s));
+            swListEntries.add(new SWListInv.SWListEntry<>(swItem, backup));
         }
-        SWListInv<String> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
+        SWListInv<RegionBackups.Backup> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
             p.getOpenInventory().close();
-            p.performCommand("backup load " + s);
+            backupLoad(p, s);
         });
         swListInv.open();
     }
 
-    @Mapper(value = "backupName", local = true)
-    public TypeMapper<String> backupMapper() {
-        return SWCommandUtils.createMapper(s -> s, (commandSender, s) -> listBackup((Player) commandSender));
+    @Mapper(value = "backup", local = true)
+    public TypeMapper<RegionBackups.Backup> backupMapper() {
+        return new TypeMapper<>() {
+            @Override
+            public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
+                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
+            }
+
+            @Override
+            public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
+                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).collect(Collectors.toList());
+            }
+        };
     }
 
-    private List<String> listBackup(Player p) {
+    private List<RegionBackups.Backup> listBackup(Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return Collections.emptyList();
         }
         try {
-            return region.listBackup().stream().map(s -> s.substring(0, s.length() - 6).replace(' ', '_')).collect(Collectors.toList());
+            return region.getBackups().list();
         } catch (NullPointerException e) {
             return Collections.emptyList();
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java

@@ -23,6 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.core.Core;
@@ -56,15 +57,10 @@ public class BauInfoBauGuiItem extends BauGuiItem {
         Region region = Region.getRegion(player.getLocation());
         List<String> stringList = new ArrayList<>();
         for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
-                continue;
-            }
-            if (flag == Flag.ITEMS && Core.getVersion() < 19) {
-                continue;
-            }
-            Flag.Value<?> value = region.get(flag);
-            if (value != null) {
-                stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getChatValue(), player)));
+            if (!region.getFlags().has(flag).isApplicable()) continue;
+            FlagOptional<?> value = region.getFlags().get(flag);
+            if (value.isPresent()) {
+                stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
             }
         }
         itemStack.setLore(stringList);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java

@@ -19,13 +19,11 @@
 
 package de.steamwar.bausystem.features.bau;
 
-import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
-import de.steamwar.techhider.TechHider;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java

@@ -3,6 +3,7 @@ package de.steamwar.bausystem.features.bau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
+import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.command.SWCommand;
@@ -30,12 +31,10 @@ public class InfoCommand extends SWCommand {
         BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
         Region region = Region.getRegion(p.getLocation());
         for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
-                continue;
-            }
-            Flag.Value<?> value = region.get(flag);
-            if (value != null) {
-                BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getChatValue(), p));
+            if (!region.getFlags().has(flag).isApplicable()) continue;
+            FlagOptional<?> value = region.getFlags().get(flag);
+            if (value.isPresent()) {
+                BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));
             }
         }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.cannon.depth.Depth;
 import de.steamwar.bausystem.features.cannon.depth.DepthManager;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.TNTPrimed;
@@ -85,8 +84,8 @@ public class CannonDetector implements Listener {
             grouped.forEach((cannonKey, tntPrimeds) -> {
                 if (tntPrimeds.size() <= 5) return;
                 Region region = Region.getRegion(tntPrimeds.get(0).getLocation());
-                if (region.isGlobal()) return;
-                if (!region.hasType(RegionType.TESTBLOCK)) return;
+                if (region.getType().isGlobal()) return;
+                if (region.getTestblockArea().isEmpty()) return;
                 Depth depth = new Depth(region);
                 DepthManager.init(tntPrimeds, depth);
             });

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.cannon;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
 
 import java.util.Set;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java

@@ -20,10 +20,9 @@
 package de.steamwar.bausystem.features.cannon.depth;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -49,7 +48,7 @@ public class Depth {
 
     public void update(List<Block> blocks) {
         List<Block> blocksList = blocks.stream()
-                .filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
+                .filter(block -> region.getTestblockArea().inRegion(block.getLocation(), true))
                 .collect(Collectors.toList());
         tntCount++;
         for (Block block : blocksList) {
@@ -65,7 +64,9 @@ public class Depth {
         dimensions.setZ(Math.abs(dimensions.getZ()));
 
         RegionUtils.message(region, player -> {
-            player.spigot().sendMessage(getMessage(player, dimensions.getBlockX() + 1, dimensions.getBlockY() + 1, dimensions.getBlockZ() + 1, tntCount));
+            if (Config.getInstance().get(player).getPlainValueOrDefault("depth_message", true)) {
+                player.spigot().sendMessage(getMessage(player, dimensions.getBlockX() + 1, dimensions.getBlockY() + 1, dimensions.getBlockZ() + 1, tntCount));
+            }
         });
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthCommand.java

@@ -0,0 +1,45 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.cannon.depth;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.configplayer.Config;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+@Linked
+public class DepthCommand extends SWCommand {
+
+    public DepthCommand() {
+        super("depth");
+    }
+
+    @Register
+    public void toggle(Player player) {
+        if (Config.getInstance().get(player).getPlainValueOrDefault("depth_message", true)) {
+            Config.getInstance().get(player).put("depth_message", false);
+            BauSystem.MESSAGE.send("DEPTH_COUNTER_DISABLE", player);
+        } else {
+            Config.getInstance().get(player).put("depth_message", true);
+            BauSystem.MESSAGE.send("DEPTH_COUNTER_ENABLE", player);
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java

@@ -29,12 +29,11 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class DesignEndStone {
 
@@ -44,18 +43,26 @@ public class DesignEndStone {
     private REntityServer entityServer = new REntityServer();
     private List<REntity> entities = new ArrayList<>();
     private Set<Location> locations = new HashSet<>();
-    private boolean wsOrAs;
-    private double maxBlastResistance;
+    private Set<Material> limited;
+    private boolean calculateFromBottom;
 
     public DesignEndStone(Region region) {
-        this.minX = region.getMinPointBuild().getX();
-        this.minY = region.getMinPointBuild().getY();
-        this.minZ = region.getMinPointBuild().getZ();
-        this.maxX = region.getMaxPointBuild().getX();
-        this.maxY = region.getMaxPointBuild().getY();
-        this.maxZ = region.getMaxPointBuild().getZ();
-        wsOrAs = region.getName().startsWith("ws") || region.getName().startsWith("as");
-        maxBlastResistance = wsOrAs ? 6.1 : 9.0;
+        this.minX = region.getBuildArea().getMinPoint(false).getX();
+        this.minY = region.getBuildArea().getMinPoint(false).getY();
+        this.minZ = region.getBuildArea().getMinPoint(false).getZ();
+        this.maxX = region.getBuildArea().getMaxPoint(false).getX();
+        this.maxY = region.getBuildArea().getMaxPoint(false).getY();
+        this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
+
+        limited = region.getGameModeConfig()
+                .getSchematic()
+                .getLimited()
+                .entrySet()
+                .stream()
+                .filter(entry -> entry.getValue() == 0)
+                .flatMap(entry -> entry.getKey().stream())
+                .collect(Collectors.toSet());
+        calculateFromBottom = region.getGameModeConfig().getArena().isNoFloor();
 
         entityServer.setCallback((player, rEntity, entityAction) -> {
             if (entityAction != REntityServer.EntityAction.ATTACK) return;
@@ -76,7 +83,7 @@ public class DesignEndStone {
         calc(minX, minY, maxZ, maxX, maxY, maxZ, 0, 0, -1, maxZ - minZ);
         calc(minX, minY, minZ, minX, maxY, maxZ, 1, 0, 0, maxX - minX);
         calc(maxX, minY, minZ, maxX, maxY, maxZ, -1, 0, 0, maxX - minX);
-        if (wsOrAs) {
+        if (calculateFromBottom) {
             calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
         } else {
             int airBlocks = 0;
@@ -106,7 +113,7 @@ public class DesignEndStone {
                         int cz = z + step * dirZ;
                         Material material = WORLD.getBlockAt(cx, cy, cz).getType();
 
-                        if (material != Material.WATER && material != Material.LAVA && material.getBlastResistance() >= maxBlastResistance) {
+                        if (material != Material.WATER && material != Material.LAVA && limited.contains(material)) {
                             Location location = new Location(WORLD, cx + 0.5, cy, cz + 0.5);
                             if (!locations.add(location)) break;
                             RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.design.endstone;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -49,7 +48,11 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
     @Register(description = "DESIGN_ENDSTONE_COMMAND_HELP")
     public void genericCommand(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isEmpty()) {
+            BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
+            return;
+        }
+        if (!region.getGameModeConfig().isLoaded()) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java

@@ -23,6 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.core.TrickyTrialsWrapper;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
@@ -74,7 +75,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() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", 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);
         p.getOpenInventory().setCursor(cursor == null ? new SWItem().getItemStack() : cursor);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java

@@ -4,12 +4,45 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.command.SWCommand;
+import de.steamwar.inventory.SWInventory;
+import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.block.Barrel;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Chest;
+import org.bukkit.block.ShulkerBox;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BlockStateMeta;
+
+import java.util.HashMap;
+import java.util.Map;
 
 @Linked
 public class InventoryFillerCommand extends SWCommand {
 
+    private static final Map<Integer, Integer> POWER_TO_FILLLEVEL = new HashMap<>();
+
+    static {
+        POWER_TO_FILLLEVEL.put(0, 0);
+        POWER_TO_FILLLEVEL.put(1, 1);
+        POWER_TO_FILLLEVEL.put(2, 1 * 64 + 60);
+        POWER_TO_FILLLEVEL.put(3, 3 * 64 + 55);
+        POWER_TO_FILLLEVEL.put(4, 5 * 64 + 51);
+        POWER_TO_FILLLEVEL.put(5, 7 * 64 + 46);
+        POWER_TO_FILLLEVEL.put(6, 9 * 64 + 42);
+        POWER_TO_FILLLEVEL.put(7, 11 * 64 + 37);
+        POWER_TO_FILLLEVEL.put(8, 13 * 64 + 32);
+        POWER_TO_FILLLEVEL.put(9, 15 * 64 + 28);
+        POWER_TO_FILLLEVEL.put(10, 17 * 64 + 23);
+        POWER_TO_FILLLEVEL.put(11, 19 * 64 + 19);
+        POWER_TO_FILLLEVEL.put(12, 21 * 64 + 14);
+        POWER_TO_FILLLEVEL.put(13, 23 * 64 + 10);
+        POWER_TO_FILLLEVEL.put(14, 25 * 64 + 5);
+        POWER_TO_FILLLEVEL.put(15, 27 * 64 + 0);
+    }
+
     public InventoryFillerCommand() {
         super("inventoryfill");
     }
@@ -21,8 +54,116 @@ public class InventoryFillerCommand extends SWCommand {
         if (!inventoryFill) {
             SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("INVENTORY_FILL_ENABLE", player));
             BauSystem.MESSAGE.send("INVENTORY_FILL_INFO", player);
-        }else {
+        } else {
             SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("INVENTORY_FILL_DISABLE", player));
         }
     }
+
+    @Register("gui")
+    public void gui(Player player) {
+        SWInventory inventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_NAME", player));
+        inventory.setItem(0, new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 0)).setAmount(1));
+        inventory.setItem(1, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 1)).setAmount(1));
+        inventory.setItem(2, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 2)).setAmount(2));
+        inventory.setItem(3, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 3)).setAmount(3));
+        inventory.setItem(4, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 4)).setAmount(4));
+        inventory.setItem(5, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 5)).setAmount(5));
+        inventory.setItem(6, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 6)).setAmount(6));
+        inventory.setItem(7, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 7)).setAmount(7));
+        inventory.setItem(8, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 8)).setAmount(8));
+        inventory.setItem(9, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 9)).setAmount(9));
+        inventory.setItem(10, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 10)).setAmount(10));
+        inventory.setItem(11, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 11)).setAmount(11));
+        inventory.setItem(12, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 12)).setAmount(12));
+        inventory.setItem(13, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 13)).setAmount(13));
+        inventory.setItem(14, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 14)).setAmount(14));
+        inventory.setItem(15, new SWItem(Material.REDSTONE_TORCH, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_POWER", player, 15)).setAmount(15));
+        inventory.setItem(17, new SWItem(Material.TNT, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_TNT", player)));
+
+        for (int i = 0; i < 16; i++) {
+            inventory.setEventCallback(i, inventoryClickEvent -> {
+                selectInventoryType(player, inventoryClickEvent.getCurrentItem().getItemMeta().getDisplayName(), Material.DANDELION, POWER_TO_FILLLEVEL.get(inventoryClickEvent.getCurrentItem().getAmount()));
+            });
+        }
+        inventory.setEventCallback(17, inventoryClickEvent -> {
+            selectInventoryType(player, inventoryClickEvent.getCurrentItem().getItemMeta().getDisplayName(), Material.TNT, POWER_TO_FILLLEVEL.get(15));
+        });
+
+        inventory.open();
+    }
+
+    private final Material[] SHULKER_BOX_MATERIALS = new Material[]{
+            Material.SHULKER_BOX,
+            Material.WHITE_SHULKER_BOX,
+            Material.LIGHT_GRAY_SHULKER_BOX,
+            Material.GRAY_SHULKER_BOX,
+            Material.BLACK_SHULKER_BOX,
+            Material.BROWN_SHULKER_BOX,
+            Material.RED_SHULKER_BOX,
+            Material.ORANGE_SHULKER_BOX,
+            Material.YELLOW_SHULKER_BOX,
+            Material.LIME_SHULKER_BOX,
+            Material.GREEN_SHULKER_BOX,
+            Material.CYAN_SHULKER_BOX,
+            Material.LIGHT_BLUE_SHULKER_BOX,
+            Material.BLUE_SHULKER_BOX,
+            Material.PURPLE_SHULKER_BOX,
+            Material.MAGENTA_SHULKER_BOX,
+            Material.PINK_SHULKER_BOX
+    };
+
+    private void selectInventoryType(Player player, String name, Material material, int count) {
+        ItemStack[] itemStacks = new ItemStack[27];
+        int index = 0;
+        int amount = count;
+        while (amount > 0) {
+            ItemStack stack;
+            if (amount > 64) {
+                stack = new ItemStack(material, 64);
+                amount -= 64;
+            } else {
+                stack = new ItemStack(material, amount);
+                amount = 0;
+            }
+            itemStacks[index++] = stack;
+        }
+
+        SWInventory inventory = new SWInventory(player, 27, BauSystem.MESSAGE.parse("INVENTORY_FILL_GUI_NAME", player));
+        int i = 0;
+        for (Material type : SHULKER_BOX_MATERIALS) {
+            inventory.setItemEvent(i++, generateFilledInventory(name, type, itemStacks), inventoryClickEvent -> {
+                SWUtils.giveItemToPlayer(player, inventoryClickEvent.getCurrentItem());
+            });
+        }
+        inventory.setItemEvent(27 - 6, generateFilledInventory(name, Material.CHEST, itemStacks), inventoryClickEvent -> {
+            SWUtils.giveItemToPlayer(player, inventoryClickEvent.getCurrentItem());
+        });
+        inventory.setItemEvent(27 - 4, generateFilledInventory(name, Material.BARREL, itemStacks), inventoryClickEvent -> {
+            SWUtils.giveItemToPlayer(player, inventoryClickEvent.getCurrentItem());
+        });
+        inventory.open();
+    }
+
+    private ItemStack generateFilledInventory(String name, Material material, ItemStack[] itemStacks) {
+        ItemStack itemStack = new ItemStack(material);
+        BlockStateMeta meta = (BlockStateMeta) itemStack.getItemMeta();
+        BlockState state = meta.getBlockState();
+
+        if (state instanceof ShulkerBox box) {
+            box.getInventory().setContents(itemStacks);
+            box.update();
+            meta.setBlockState(box);
+        } else if (state instanceof Chest chest) {
+            chest.getInventory().setContents(itemStacks);
+            chest.update();
+            meta.setBlockState(chest);
+        } else if (state instanceof Barrel barrel) {
+            barrel.getInventory().setContents(itemStacks);
+            barrel.update();
+            meta.setBlockState(barrel);
+        }
+        meta.setDisplayName(name);
+        itemStack.setItemMeta(meta);
+        return itemStack;
+    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java

@@ -38,7 +38,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 @Linked
 public class KillcheckerCommand extends SWCommand implements Listener {
@@ -57,6 +56,10 @@ public class KillcheckerCommand extends SWCommand implements Listener {
     @Register(value = "enable", description = "KILLCHECKER_HELP_ENABLE")
     public void genericCommand(@Validator Player player, @OptionalValue("-outline") @StaticValue(value = {"-area", "-outline"}, allowISE = true) boolean onlyOutline) {
         Region region = Region.getRegion(player.getLocation());
+        if (region.getBuildArea().isEmpty()) {
+            BauSystem.MESSAGE.send("KILLCHECKER_NO_BUILD", player);
+            return;
+        }
         KillcheckerVisualizer killcheckerVisualizer = visualizers.computeIfAbsent(region, region1 -> new KillcheckerVisualizer(region1, bossBarService));
         killcheckerVisualizer.recalc();
         killcheckerVisualizer.show(player, onlyOutline);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java

@@ -22,8 +22,6 @@ package de.steamwar.bausystem.features.killchecker;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.entity.REntity;
@@ -75,8 +73,8 @@ public class KillcheckerVisualizer {
 
     public KillcheckerVisualizer(Region region, BossBarService bossBarService) {
         this.region = region;
-        this.minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
-        this.maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+        this.minPoint = region.getBuildArea().getMinPoint(false);
+        this.maxPoint = region.getBuildArea().getMaxPoint(false);
 
         yArea = (maxPoint.getX() - minPoint.getX()) * (maxPoint.getZ() - minPoint.getZ());
         zArea = (maxPoint.getX() - minPoint.getX()) * (maxPoint.getY() - minPoint.getY());

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java

@@ -73,7 +73,7 @@ public class Loader implements Listener {
         Bukkit.getPluginManager().registerEvents(this, BauSystem.getInstance());
 
         BauSystem.runTaskTimer(BauSystem.getInstance(), () -> {
-            if (stage != Stage.RUNNING) return;
+            if (stage != Stage.RUNNING && stage != Stage.SINGLE) return;
             if(!Permission.BUILD.hasPermission(p)) return;
             if (waitTime > 0) {
                 waitTime--;
@@ -149,13 +149,16 @@ public class Loader implements Listener {
     }
 
     public boolean setTicksBetweenShots(int delay) {
-        if (elements.size() == 0) return false;
+        if (elements.isEmpty()) return false;
         LoaderElement loaderElement = elements.get(elements.size() - 1);
         if (loaderElement instanceof LoaderWait) {
             ((LoaderWait) loaderElement).setDelay(delay);
-            return true;
+        } else {
+            LoaderWait loaderWait = new LoaderWait(delay);
+            elements.add(loaderWait);
+            pause();
         }
-        return false;
+        return true;
     }
 
     public void setTicksBetweenBlocks(int delay) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java

@@ -44,7 +44,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 public class LoaderRecorder implements Listener {
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderInteractionElement.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.loader.elements;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -113,7 +114,7 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
         });
         listInv.setItem(48, new SWItem(Material.ARROW, "§7Back", clickType -> {
             backAction.run();
-        }));
+        }).setCustomModelData(CMDs.BACK));
         listInv.setItem(50, new SWItem(Material.GHAST_SPAWN_EGG, "§7Insert another Setting", clickType -> {
             elements.add(defaultSetting);
             extraPower.add(0);
@@ -150,7 +151,7 @@ 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 -> {}));
-        swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> back.run());
+        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");
             swAnvilInv.setCallback(s -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderWait.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.loader.elements.impl;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.loader.elements.LoaderElement;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -60,7 +61,7 @@ public class LoaderWait implements LoaderElement {
     public void click(Player player, Runnable backAction) {
         SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_WAIT_TITLE", player));
         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)).getItemStack(), clickType -> backAction.run());
+        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 -> {
             delay -= clickType.isShiftClick() ? 5 : 1;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java

@@ -22,8 +22,6 @@ package de.steamwar.bausystem.features.loadtimer;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -158,7 +156,7 @@ public class Loadtimer implements Listener {
     }
 
     public void onTntExplode(EntityExplodeEvent event) {
-        if (region.inRegion(event.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION) && stage == Stage.IGNITION) {
+        if (region.getBuildArea().inRegion(event.getLocation(), true) && stage == Stage.IGNITION) {
             stage = Stage.END;
             explode = TPSUtils.currentRealTick.get();
             print();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java

@@ -39,7 +39,7 @@ public class LoadtimerCommand extends SWCommand {
     @Register(value = "start", description = {"LOADTIMER_HELP_START_2", "LOADTIMER_HELP_START_3"})
     public void start(@Validator Player p, TimerMode mode) {
         Region r = Region.getRegion(p.getLocation());
-        if (r.isGlobal()) return;
+        if (r.getType().isGlobal()) return;
         if (!Loadtimer.hasTimer(r))
             Loadtimer.createLoadtimer(r, mode == TimerMode.HALF);
     }
@@ -47,7 +47,7 @@ public class LoadtimerCommand extends SWCommand {
     @Register(value = "stop", description = "LOADTIMER_HELP_STOP")
     public void stop(@Validator Player p) {
         Region r = Region.getRegion(p.getLocation());
-        if (r.isGlobal()) return;
+        if (r.getType().isGlobal()) return;
         if (Loadtimer.hasTimer(r))
             Loadtimer.getTimer(r).delete();
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java

@@ -46,7 +46,7 @@ public class LoadtimerGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region r = Region.getRegion(player.getLocation());
-        if (r.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();
@@ -58,7 +58,7 @@ public class LoadtimerGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         Region r = Region.getRegion(p.getLocation());
-        if (r.isGlobal()) return false;
+        if (r.getType().isGlobal()) return false;
         if (Loadtimer.hasTimer(r)) {
             p.performCommand("lt stop");
         } else {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java

@@ -0,0 +1,207 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.rayvisualizer;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.bausystem.SWUtils;
+import de.steamwar.bausystem.configplayer.Config;
+import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+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;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+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();
+    private BlockData BLOCKED = Material.RED_CONCRETE.createBlockData();
+
+    private class CRayData {
+        private CRay[] rays = new CRay[27 * 400];
+        private boolean[] used = new boolean[27 * 400];
+
+        public void reset() {
+            for (int i = 0; i < 27 * 400; i++) {
+                if (!used[i] && rays[i] != null) {
+                    rays[i].die();
+                    rays[i] = null;
+                }
+                used[i] = false;
+            }
+        }
+
+        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;
+            return true;
+        }
+
+        public CRay get(Location from, Location to) {
+            for (int i = 0; i < rays.length; i++) {
+                if (rays[i] != null && locEquals(from, rays[i].getFrom()) && locEquals(to, rays[i].getTo())) {
+                    used[i] = true;
+                    return rays[i];
+                }
+            }
+            for (int i = 0; i < rays.length; i++) {
+                if (rays[i] != null && locEquals(from, rays[i].getFrom()) && !used[i]) {
+                    used[i] = true;
+                    return rays[i];
+                }
+            }
+            for (int i = 0; i < rays.length; i++) {
+                if (used[i]) continue;
+                CRay ray = rays[i];
+                if (ray != null) {
+                    return ray;
+                }
+                ray = new CRay(server);
+                ray.setBlock(Material.LIME_CONCRETE.createBlockData());
+                ray.setWidth(1 / 32f);
+                rays[i] = ray;
+                used[i] = true;
+                return ray;
+            }
+            return null;
+        }
+    }
+
+    private CRayData rayData = new CRayData();
+
+    private final REntityServer server = new REntityServer();
+    private final World WORLD = Bukkit.getWorlds().get(0);
+
+    public RayVisualizerCommand() {
+        super("rayvisualizer");
+
+        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
+            if (server.getPlayers().isEmpty()) return;
+            List<TNTPrimed> primedList = WORLD.getEntitiesByClass(TNTPrimed.class)
+                    .stream().toList();
+            rayData.reset();
+            if (primedList.isEmpty()) return;
+            calculateRays(primedList, primedList);
+        }, 1, 1);
+    }
+
+    private void calculateRays(List<TNTPrimed> fromTNTs, List<TNTPrimed> toTNTs) {
+        for (TNTPrimed to : toTNTs) {
+            int hitting = 0;
+            int total = 0;
+            for (TNTPrimed from : fromTNTs) {
+                if (from == to) continue;
+                if (from.getFuseTicks() >= to.getFuseTicks()) continue;
+                if (to.getLocation().distanceSquared(from.getLocation()) > 25) continue;
+                if (!from.isInWater()) continue;
+
+                Location fromLoc = from.getLocation();
+                Location toLoc = to.getLocation().clone().add(-0.49, 0, -0.49);
+
+                final double minX = 0.5 * (1 - Math.floor(2 * 0.98 + 1) / (2 * 0.98 + 1));
+                final double minZ = 0.5 * (1 - Math.floor(2 * 0.98 + 1) / (2 * 0.98 + 1));
+                final double spacing = 0.98 / (2 * 0.98 + 1);
+
+                for (int dx = 0; dx < 3; dx++) {
+                    for (int dy = 0; dy < 3; dy++) {
+                        for (int dz = 0; dz < 3; dz++) {
+                            Location end = toLoc.clone().add(minX + dx * spacing, 0 + dy * spacing, minZ + dz * spacing);
+                            RayTraceResult result = fromLoc.getWorld().rayTraceBlocks(fromLoc, end.clone().subtract(fromLoc).toVector(), end.distance(fromLoc), FluidCollisionMode.NEVER, true);
+                            CRay cRay = rayData.get(fromLoc, end);
+                            if (cRay == null) continue;
+                            cRay.setFrom(fromLoc);
+                            cRay.setTo(end);
+                            if (result != null && result.getHitBlock() != null) {
+                                cRay.setBlock(BLOCKED);
+                            } else {
+                                cRay.setBlock(VISIBLE);
+                                hitting++;
+                            }
+                        }
+                    }
+                }
+                total += 27;
+            }
+
+            if (total == 0) {
+                to.setCustomNameVisible(false);
+            } else {
+                int remainder = hitting % 27;
+                int whole = hitting / 27;
+                to.setCustomNameVisible(true);
+                to.setCustomName("§e" + whole + " " + remainder + "/27");
+            }
+        }
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        boolean rayvisualizer = Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("rayvisualizer", false);
+        if (rayvisualizer) server.addPlayer(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        server.removePlayer(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            for (Player player : Bukkit.getOnlinePlayers()) {
+                if (Permission.BUILD.hasPermission(player)) {
+                    boolean rayvisualizer = Config.getInstance().get(player).getPlainValueOrDefault("rayvisualizer", false);
+                    if (rayvisualizer) server.addPlayer(player);
+                } else {
+                    server.removePlayer(player);
+                }
+            }
+        }, 1);
+    }
+
+    @Register
+    public void toggle(@Validator Player player) {
+        boolean rayvisualizer = Config.getInstance().get(player).getPlainValueOrDefault("rayvisualizer", false);
+        Config.getInstance().get(player).put("rayvisualizer", !rayvisualizer);
+        if (!rayvisualizer) {
+            SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("RAY_VISUALIZER_ENABLE", player));
+            server.addPlayer(player);
+        } else {
+            SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("RAY_VISUALIZER_DISABLE", player));
+            server.removePlayer(player);
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java

@@ -23,8 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -34,8 +34,6 @@ import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.entity.Player;
 
-import java.io.IOException;
-
 @Linked
 public class ColorCommand extends SWCommand {
 
@@ -47,29 +45,31 @@ public class ColorCommand extends SWCommand {
     }
 
     @Register(description = "REGION_COLOR_HELP_COLOR")
-    public void genericColor(Player p, ColorMode color) {
+    public void genericColor(@Validator Player p, ColorMode color) {
         genericColorSet(p, color, ColorizationType.LOCAL);
     }
 
     @Register(description = "REGION_COLOR_HELP_COLOR_TYPE")
     public void genericColorSet(@Validator Player p, ColorMode color, ColorizationType colorizationType) {
         if (colorizationType == ColorizationType.GLOBAL) {
-            Region.setGlobal(Flag.COLOR, color);
+            Region.getRegions().forEach(region -> {
+                region.getFlags().set(Flag.COLOR, color);
+            });
             BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, BauSystem.MESSAGE.parse(color.getChatValue(), p));
             return;
         }
         Region region = Region.getRegion(p.getLocation());
-        if (region.isGlobal()) {
+        if (!region.getFlags().has(Flag.COLOR).isWritable()) {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }
-        region.set(Flag.COLOR, color);
+        region.getFlags().set(Flag.COLOR, color);
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)
                     .onlyColors(true)
-                    .color(color.getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(color);
+            region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_COLORED");
             RegionUtils.message(region, "REGION_REGION_COLORED_FAILED");
         } catch (SecurityException e) {
@@ -78,7 +78,7 @@ public class ColorCommand extends SWCommand {
     }
 
     @Register
-    public void genericColorSet(Player p, ColorizationType colorizationType, ColorMode color) {
+    public void genericColorSet(@Validator Player p, ColorizationType colorizationType, ColorMode color) {
         genericColorSet(p, color, colorizationType);
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java

@@ -19,13 +19,11 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -55,14 +53,12 @@ public class FireCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.FIRE, FireMode.class)) {
-            case ALLOW:
-                region.set(Flag.FIRE, FireMode.DENY);
-                return true;
-            default:
-            case DENY:
-                region.set(Flag.FIRE, FireMode.ALLOW);
-                return false;
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+            region.getFlags().set(Flag.FIRE, FireMode.DENY);
+            return true;
+        } else {
+            region.getFlags().set(Flag.FIRE, FireMode.ALLOW);
+            return false;
         }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java

@@ -2,8 +2,8 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -17,12 +17,12 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFireDamage(BlockBurnEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getPlain(Flag.FIRE, FireMode.class) == FireMode.DENY) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @EventHandler
     public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getPlain(Flag.FIRE, FireMode.class) == FireMode.DENY) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.FIRE) == Flag.FIRE.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.FIRE).getChatValue(), p);
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FIRE).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java

@@ -19,13 +19,11 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -55,14 +53,12 @@ public class FreezeCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.FREEZE, FreezeMode.class)) {
-            case ACTIVE:
-                region.set(Flag.FREEZE, FreezeMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.FREEZE, FreezeMode.ACTIVE);
-                return true;
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+            region.getFlags().set(Flag.FREEZE, FreezeMode.INACTIVE);
+            return false;
+        } else {
+            region.getFlags().set(Flag.FREEZE, FreezeMode.ACTIVE);
+            return true;
         }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java

@@ -3,7 +3,7 @@ package de.steamwar.bausystem.features.region;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.core.Core;
 import de.steamwar.core.TrickyTrialsWrapper;
@@ -11,8 +11,9 @@ import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 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;
@@ -28,9 +29,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).get(Flag.FREEZE) == FreezeMode.INACTIVE) {
-            return;
-        }
+        if (Region.getRegion(e.getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         e.setCancelled(true);
         if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -42,8 +41,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onBlockCanBuild(BlockCanBuildEvent e) {
         if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.INACTIVE)
-            return;
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         if (e.getMaterial() == Material.TNT) {
             e.setBuildable(false);
             e.getBlock().setType(Material.TNT, false);
@@ -52,69 +50,87 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+            if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
+                BlockState state = e.getSourceBlock().getState();
+                NoteBlock noteBlock = (NoteBlock) state.getBlockData();
+                if (noteBlock.isPowered()) {
+                    Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                        state.update(true, false);
+                    }, 1);
+                }
+            }
+            if (e.getBlock().getType() == Material.NOTE_BLOCK) {
+                BlockState state = e.getBlock().getState();
+                NoteBlock noteBlock = (NoteBlock) state.getBlockData();
+                if (noteBlock.isPowered()) {
+                    Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                        state.update(true, false);
+                    }, 1);
+                }
+            }
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setNewCurrent(e.getOldCurrent());
         }
     }
 
     @EventHandler
     public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onInventoryMoveEvent(InventoryMoveItemEvent e) {
-        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @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()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
-            if (e.isCancelled()) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
+            e.getBlock().setType(Material.BARRIER, false);
             e.getBlock().setType(Material.AIR, false);
         }
     }
@@ -135,35 +151,35 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -171,7 +187,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent e) {
         if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (Region.getRegion(e.getClickedBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             Block block = e.getClickedBlock();
             if (block.getType() == Material.LEVER) {
                 Switch data = ((Switch) block.getBlockData());
@@ -182,9 +198,9 @@ public class FreezeListener implements Listener, ScoreboardElement {
     }
 
     @EventHandler
-    public void onBlockFade(BlockFadeEvent event) {
-        if (Region.getRegion(event.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
-            event.setCancelled(true);
+    public void onBlockFade(BlockFadeEvent e) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+            e.setCancelled(true);
         }
     }
 
@@ -200,7 +216,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.FREEZE) == Flag.FREEZE.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.FREEZE).getChatValue(), p);
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java

@@ -19,14 +19,11 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ItemMode;
+import de.steamwar.bausystem.region.flags.ItemMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.entity.Player;
@@ -58,14 +55,12 @@ public class ItemsCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.ITEMS, ItemMode.class)) {
-            case ACTIVE:
-                region.set(Flag.ITEMS, ItemMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.ITEMS, ItemMode.ACTIVE);
-                return true;
+        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
+            region.getFlags().set(Flag.ITEMS, ItemMode.INACTIVE);
+            return false;
+        } else {
+            region.getFlags().set(Flag.ITEMS, ItemMode.ACTIVE);
+            return true;
         }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java

@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ItemMode;
+import de.steamwar.bausystem.region.flags.ItemMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
@@ -35,13 +35,9 @@ import org.bukkit.event.entity.ItemSpawnEvent;
 @MinVersion(19)
 public class ItemsListener implements Listener, ScoreboardElement {
 
-    private static ItemMode getMode(Region region) {
-        return region.getPlain(Flag.ITEMS, ItemMode.class);
-    }
-
     @EventHandler
     public void onItemSpawn(ItemSpawnEvent event) {
-        if (getMode(Region.getRegion(event.getLocation())) == ItemMode.INACTIVE) {
+        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
             event.setCancelled(true);
         }
     }
@@ -58,7 +54,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.ITEMS) == Flag.ITEMS.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.ITEMS).getChatValue(), p);
+        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java

@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.NoGravityMode;
+import de.steamwar.bausystem.region.flags.NoGravityMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -53,14 +53,12 @@ public class NoGravityCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.NO_GRAVITY, NoGravityMode.class)) {
-            case ACTIVE:
-                region.set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
-                return true;
+        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
+            return false;
+        } else {
+            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
+            return true;
         }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java

@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.NoGravityMode;
+import de.steamwar.bausystem.region.flags.NoGravityMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.EntityType;
@@ -34,14 +34,10 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 @Linked
 public class NoGravityListener implements Listener, ScoreboardElement {
 
-    private static NoGravityMode getMode(Region region) {
-        return region.getPlain(Flag.NO_GRAVITY, NoGravityMode.class);
-    }
-
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event) {
         if (event.getEntityType() == EntityType.PLAYER) return;
-        if (getMode(Region.getRegion(event.getLocation())) == NoGravityMode.ACTIVE) {
+        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
             event.getEntity().setGravity(false);
         }
     }
@@ -58,7 +54,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.NO_GRAVITY) == Flag.NO_GRAVITY.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.NO_GRAVITY).getChatValue(), p);
+        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java

@@ -20,13 +20,11 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
+import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -41,22 +39,18 @@ public class ProtectCommand extends SWCommand {
     public void genericProtectCommand(@Validator Player p) {
         Region region = regionCheck(p);
         if (region == null) return;
-        switch (region.getPlain(Flag.PROTECT, ProtectMode.class)) {
-            case ACTIVE:
-                region.set(Flag.PROTECT, ProtectMode.INACTIVE);
-                RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
-                break;
-            default:
-            case INACTIVE:
-                region.set(Flag.PROTECT, ProtectMode.ACTIVE);
-                RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
-                break;
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+            region.getFlags().set(Flag.PROTECT, ProtectMode.INACTIVE);
+            RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
+        } else {
+            region.getFlags().set(Flag.PROTECT, ProtectMode.ACTIVE);
+            RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
         }
     }
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getFloorLevel() == 0) {
+        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
             BauSystem.MESSAGE.send("REGION_PROTECT_FALSE_REGION", player);
             return null;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java

@@ -1,9 +1,10 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
+import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
@@ -21,13 +22,11 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     private void explode(List<Block> blockList, Location location) {
         Region region = Region.getRegion(location);
-        if (region.getFloorLevel() == 0) {
-            return;
-        }
-        if (region.getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.INACTIVE) {
-            return;
-        }
-        blockList.removeIf(block -> block.getY() < region.getFloorLevel());
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
+        Point p1 = region.getBuildArea().getMinPoint(true);
+        Point p2 = region.getTestblockArea().getMinPoint(true);
+        int floorLevel = Math.min(p1.getY(), p2.getY());
+        blockList.removeIf(block -> block.getY() < floorLevel);
     }
 
     @EventHandler
@@ -52,8 +51,7 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFloorLevel() == 0) return null;
-        if (region.get(Flag.PROTECT) != Flag.PROTECT.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.PROTECT).getChatValue(), p);
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java

@@ -32,30 +32,20 @@ import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.WorldEditUtils;
-import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.SchematicNode;
-import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 @Linked
 public class RegionCommand extends SWCommand {
@@ -71,7 +61,7 @@ public class RegionCommand extends SWCommand {
     }
 
     static boolean checkGlobalRegion(Region region, Player p) {
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_REGION", p);
             return true;
         }
@@ -83,7 +73,7 @@ public class RegionCommand extends SWCommand {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) return;
 
-        if (region.undo()) {
+        if (region.getHistory().undo()) {
             RegionUtils.message(region, "REGION_REGION_UNDID");
         } else {
             BauSystem.MESSAGE.send("REGION_REGION_NOTHING_UNDO", p);
@@ -97,7 +87,7 @@ public class RegionCommand extends SWCommand {
             return;
         }
 
-        if (region.redo()) {
+        if (region.getHistory().redo()) {
             RegionUtils.message(region, "REGION_REGION_REDID");
         } else {
             BauSystem.MESSAGE.send("REGION_REGION_NOTHING_REDO", p);
@@ -110,10 +100,10 @@ public class RegionCommand extends SWCommand {
         if(checkGlobalRegion(region, p)) return;
 
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -134,8 +124,8 @@ public class RegionCommand extends SWCommand {
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
                     .ignoreAir(true)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -149,11 +139,11 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getCopyPoint() == null) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
             return;
         }
-        p.teleport(region.getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
+        p.teleport(region.getBuildArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
         BauSystem.MESSAGE.send("REGION_REGION_TP_COPY", p);
     }
 
@@ -164,70 +154,33 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getTestBlockPoint() == null) {
+        if (region.getTestblockArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
             return;
         }
-        p.teleport(region.getTestBlockPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
+        p.teleport(region.getTestblockArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
         BauSystem.MESSAGE.send("REGION_REGION_TP_TEST_BLOCK", p);
     }
 
-    @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN_INFO")
-    @Register("skin")
-    public void changeSkinCommand(Player p) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-        BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO", p, region.getSkin());
-        String creator = region.getPrototype().getSkinMap().get(region.getSkin()).getCreator();
-        if (creator != null) {
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO_CREATOR", p, creator);
-        }
-    }
-
-    @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN")
-    @Register("skin")
-    public void changeSkinCommand(@Validator Player p, @Mapper("skinTypeMapper") String s) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-        if (!region.getPrototype().getSkinMap().containsKey(s)) {
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_UNKNOWN", p);
-        } else {
-            if (region.setSkin(s)) {
-                BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE", p, s);
-                BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE_UPDATE", p, BauSystem.MESSAGE.parse("REGION_REGION_CHANGESKIN_CHANGE_UPDATE_HOVER", p), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/reset"));
-            } else {
-                BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INVALID", p);
-            }
-        }
-    }
-
     @Register(value = "copy", description = "REGION_REGION_HELP_COPY")
     public void copyCommand(@Validator Player p, @OptionalValue("") @StaticValue(value = {"", "-e", "-s"}, allowISE = true) int option) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (!region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_BUILD", p);
             return;
         }
-        if (region.getCopyPoint() == null) {
-            BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
-            return;
-        }
 
-        Point minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
-        Point maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+        Point minPoint = region.getBuildArea().getMinPoint(false);
+        Point maxPoint = region.getBuildArea().getMaxPoint(false);
         switch (option) {
             case 0:
                 break;
             case 1:
-                minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
-                maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
+                minPoint = region.getBuildArea().getMinPoint(true);
+                maxPoint = region.getBuildArea().getMaxPoint(true);
                 break;
             case 2:
                 Pair<Location, Location> selection = WorldEditUtils.getSelection(p);
@@ -238,7 +191,7 @@ public class RegionCommand extends SWCommand {
                 break;
         }
 
-        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getCopyPoint());
+        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getBuildArea().getCopyPoint());
         WorldEdit.getInstance()
                 .getSessionManager()
                 .get(BukkitAdapter.adapt(p))
@@ -252,14 +205,10 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (!region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_BUILD", p);
             return;
         }
-        if (region.getCopyPoint() == null) {
-            BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
-            return;
-        }
 
         ClipboardHolder clipboardHolder = WorldEdit.getInstance()
                 .getSessionManager()
@@ -287,13 +236,13 @@ public class RegionCommand extends SWCommand {
         }
 
         try (EditSession e = WorldEditUtils.getEditSession(p)) {
-            Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getCopyPoint())).build());
+            Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getBuildArea().getCopyPoint())).build());
             WorldEditUtils.addToPlayer(p, e);
 
             if (selectPasted) {
                 Clipboard clipboard = clipboardHolder.getClipboards().get(0);
-                BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getCopyPoint()));
-                BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getCopyPoint()));
+                BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
+                BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
                 FlatteningWrapper.impl.setSelection(p, Point.fromBlockVector3(minPointSelection), Point.fromBlockVector3(maxPointSelection));
             }
             BauSystem.MESSAGE.send("REGION_REGION_PASTE_DONE", p);
@@ -303,25 +252,4 @@ public class RegionCommand extends SWCommand {
     private BlockVector3 toBlockVector3(Point point) {
         return BlockVector3.at(point.getX(), point.getY(), point.getZ());
     }
-
-
-    @Mapper(value = "skinTypeMapper", local = true)
-    private TypeMapper<String> skinTypeMapper() {
-        return new TypeMapper<String>() {
-            @Override
-            public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                Player p = (Player) commandSender;
-                Region region = Region.getRegion(p.getLocation());
-                if (region.isGlobal()) {
-                    return Collections.emptyList();
-                }
-                return region.getPrototype().getSkinMap().keySet().stream().map(c -> c.replace(' ', '_')).collect(Collectors.toList());
-            }
-
-            @Override
-            public String map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                return s.replace('_', ' ');
-            }
-        };
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java

@@ -21,7 +21,8 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.bausystem.region.flags.ChangedMode;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -180,13 +181,7 @@ public class RegionListener implements Listener {
         }
     }
 
-
     private static void tagChangedRegion(final Location location) {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                Region.getRegion(location).set(Tag.CHANGED);
-            }
-        }.runTaskAsynchronously(BauSystem.getInstance());
+        Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java

@@ -20,12 +20,16 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
+import java.io.File;
+import java.util.List;
+import java.util.Optional;
+
 @Linked
 public class RegionScoreboardElement implements ScoreboardElement {
 
@@ -41,7 +45,10 @@ public class RegionScoreboardElement implements ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (GlobalRegion.getInstance() == region) return null;
-        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getDisplayName();
+        if (region.getType().isGlobal()) return null;
+        if (!region.getGameModeConfig().isLoaded()) return null;
+        List<String> names = region.getGameModeConfig().getServer().getChatNames();
+        if (names.isEmpty()) return null;
+        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + names.get(0);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java

@@ -21,13 +21,10 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -55,12 +52,11 @@ public class ResetCommand extends SWCommand {
         Region region = regionCheck(p);
         if (region == null) return;
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
-            for (Flag value : Flag.getResetFlags()) {
-                region.set(value, value.getDefaultValue());
-            }
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, false);
+            region.getFlags().clear();
+            region.getRegionData().clear();
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
@@ -88,8 +84,8 @@ public class ResetCommand extends SWCommand {
         }
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, true);
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
@@ -99,7 +95,7 @@ public class ResetCommand extends SWCommand {
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region == GlobalRegion.getInstance()) {
+        if (region == RegionSystem.INSTANCE.getGlobalRegion()) {
             BauSystem.MESSAGE.send("REGION_RESET_NO_REGION", player);
             return null;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java

@@ -20,16 +20,14 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
-import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.region.flags.TNTMode;
+import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -74,9 +72,6 @@ public class TNTCommand extends SWCommand {
             case ONLY_TB:
                 requestedMessage = getTestblockEnableMessage();
                 break;
-            case ONLY_BUILD:
-                requestedMessage = getBuildEnableMessage();
-                break;
         }
         tntToggle(region, tntMode, requestedMessage);
     }
@@ -92,13 +87,12 @@ public class TNTCommand extends SWCommand {
         Map<String, TNTMode> tntModeMap = new HashMap<>(tntModeMapReduced);
         tntModeMap.put("testblock", TNTMode.ONLY_TB);
         tntModeMap.put("tb", TNTMode.ONLY_TB);
-        tntModeMap.put("build", TNTMode.ONLY_BUILD);
 
-        return new TypeMapper<TNTMode>() {
+        return new TypeMapper<>() {
             @Override
             public List<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                     return new ArrayList<>(tntModeMap.keySet());
                 } else {
                     return new ArrayList<>(tntModeMapReduced.keySet());
@@ -108,7 +102,7 @@ public class TNTCommand extends SWCommand {
             @Override
             public TNTMode map(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                     return tntModeMap.getOrDefault(s, null);
                 } else {
                     return tntModeMapReduced.getOrDefault(s, null);
@@ -134,24 +128,23 @@ public class TNTCommand extends SWCommand {
     }
 
     private void tntToggle(Region region, TNTMode requestedMode, String requestedMessage) {
-        if (requestedMode != null && region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
-            region.set(Flag.TNT, requestedMode);
+        if (requestedMode != null && region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+            region.getFlags().set(Flag.TNT, requestedMode);
             RegionUtils.actionBar(region, requestedMessage);
             return;
         }
-        switch (region.getPlain(Flag.TNT, TNTMode.class)) {
+        switch (region.getFlags().get(Flag.TNT).getWithDefault()) {
             case ALLOW:
             case ONLY_TB:
-            case ONLY_BUILD:
-                region.set(Flag.TNT, TNTMode.DENY);
+                region.getFlags().set(Flag.TNT, TNTMode.DENY);
                 RegionUtils.actionBar(region, getDisableMessage());
                 break;
             case DENY:
-                if (region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
-                    region.set(Flag.TNT, TNTMode.ONLY_TB);
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                    region.getFlags().set(Flag.TNT, TNTMode.ONLY_TB);
                     RegionUtils.actionBar(region, getTestblockEnableMessage());
                 } else {
-                    region.set(Flag.TNT, TNTMode.ALLOW);
+                    region.getFlags().set(Flag.TNT, TNTMode.ALLOW);
                     RegionUtils.actionBar(region, getEnableMessage());
                 }
                 break;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java

@@ -23,9 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
@@ -37,7 +35,6 @@ import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 @Linked
 public class TNTListener implements Listener, ScoreboardElement {
@@ -45,27 +42,14 @@ public class TNTListener implements Listener, ScoreboardElement {
     private void explode(List<Block> blockList) {
         blockList.removeIf(block -> {
             Region region = Region.getRegion(block.getLocation());
-            TNTMode value = region.getPlain(Flag.TNT);
+            TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
             if (value == TNTMode.ALLOW) {
                 return false;
             } else if (value == TNTMode.ONLY_TB) {
-                if (region.hasType(RegionType.BUILD) && region.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.NORMAL)) {
+                if (region.getBuildArea().inRegion(block.getLocation(), true)) {
                     RegionUtils.actionBar(region, "REGION_TNT_BUILD_DESTROY");
                     return true;
                 }
-                if (region.hasType(RegionType.BUILD) && region.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION)) {
-                    RegionUtils.actionBar(region, "REGION_TNT_BUILD_DESTROY");
-                    return true;
-                }
-            } else if (value == TNTMode.ONLY_BUILD) {
-                if (region.hasType(RegionType.TESTBLOCK) && region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.NORMAL)) {
-                    RegionUtils.actionBar(region, "REGION_TNT_TB_DESTROY");
-                    return true;
-                }
-                if (region.hasType(RegionType.TESTBLOCK) && region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) {
-                    RegionUtils.actionBar(region, "REGION_TNT_TB_DESTROY");
-                    return true;
-                }
             }
             return value == TNTMode.DENY;
         });
@@ -93,6 +77,7 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.TNT).getChatValue(), p);
+        if (region.getFlags().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.TNT).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java

@@ -20,21 +20,18 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
+import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -43,10 +40,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -98,15 +93,44 @@ public class TestblockCommand extends SWCommand {
             }
         }
 
+        // Beta Tester enabled
+        switch (BauServer.getInstance().getOwnerID()) {
+            case 245:
+            case 403:
+            case 1898:
+            case 3320:
+            case 4603:
+            case 5262:
+            case 6032:
+            case 11077:
+            case 11888:
+            case 12258:
+            case 16009:
+                if (node == null) {
+                    node = region.getRegionData().getTestblockSchematic();
+                } else {
+                    region.getRegionData().setTestblockSchematic(node);
+                }
+                break;
+            default:
+                break;
+        }
+
+        PasteBuilder.ClipboardProvider clipboardProvider;
+        if (node == null) {
+            clipboardProvider = new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile());
+        } else {
+            clipboardProvider = new PasteBuilder.SchematicProvider(node);
+        }
+
         try {
-            PasteBuilder.ClipboardProvider clipboardProvider = node == null ? new PasteBuilder.FileProvider(region.getResetFile(RegionType.TESTBLOCK)) : new PasteBuilder.SchematicProvider(node);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
                     .ignoreAir(ignoreAir)
                     .onlyColors(onlyColors)
                     .removeTNT(removeTNT)
                     .removeWater(removeWater)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.TESTBLOCK, regionExtensionType);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getTestblockArea().reset(pasteBuilder, regionExtensionType == RegionExtensionType.EXTENSION);
             RegionUtils.message(region, "REGION_TB_DONE");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_TB_ERROR", p);
@@ -159,7 +183,7 @@ public class TestblockCommand extends SWCommand {
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasType(RegionType.TESTBLOCK)) {
+        if (region.getTestblockArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_TB_NO_REGION", player);
             return null;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java

@@ -22,10 +22,9 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
@@ -45,7 +44,7 @@ public class ColorBauGuiItem extends BauGuiItem {
         super(2);
     }
 
-    private static Material mapColor(Color color) {
+    private static Material mapColor(ColorMode color) {
         switch (color) {
             case RED:
                 return Material.RED_CONCRETE;
@@ -85,17 +84,17 @@ public class ColorBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        ColorMode mode = region.getPlain(Flag.COLOR, ColorMode.class);
-        return new SWItem(mapColor(mode.getColor()), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
+        ColorMode mode = region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        return new SWItem(mapColor(mode), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
     }
 
     @Override
     public boolean click(ClickType click, Player p) {
         p.closeInventory();
-        ColorMode current = Region.getRegion(p.getLocation()).getPlain(Flag.COLOR, ColorMode.class);
+        ColorMode current = Region.getRegion(p.getLocation()).getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
         List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
         for (ColorMode value : ColorMode.values()) {
-            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
+            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
             }), value));
         }
         SWListInv<ColorMode> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("REGION_ITEM_COLOR_CHOOSE", p), items, (clickType, colorMode) -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java

@@ -23,8 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -42,7 +42,10 @@ public class FireBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getPlain(Flag.FIRE, FireMode.class) == FireMode.ALLOW) {
+        if (!region.getFlags().has(Flag.FIRE).isApplicable()) {
+            return new SWItem(Material.BARRIER, "").getItemStack();
+        }
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
             return new SWItem(Material.FIRE_CHARGE, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_DISALLOW", player)).getItemStack();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java

@@ -24,7 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -42,7 +42,10 @@ public class FreezeBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getPlain(Flag.FREEZE, FreezeMode.class) == FreezeMode.ACTIVE) {
+        if (!region.getFlags().has(Flag.FREEZE).isApplicable()) {
+            return new SWItem(Material.BARRIER, "").getItemStack();
+        }
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             return new SWItem(Material.GUNPOWDER, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_DISALLOW", player)).getItemStack();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java

@@ -25,7 +25,7 @@ import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
+import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -43,7 +43,10 @@ public class ProtectBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.ACTIVE) {
+        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
+            return new SWItem(Material.BARRIER, "").getItemStack();
+        }
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
             return SWUtils.setCustomModelData(new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_ALLOW", player)), 1).getItemStack();
         } else {
             return SWUtils.setCustomModelData(new SWItem(Material.STONE, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_DISALLOW", player)), 1).getItemStack();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java

@@ -24,8 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
-import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -43,13 +42,11 @@ public class TntBauGuiItem extends BauGuiItem {
 
     @Override
     public ItemStack getItem(Player player) {
-        switch (Region.getRegion(player.getLocation()).getPlain(Flag.TNT, TNTMode.class)) {
+        switch (Region.getRegion(player.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
             case DENY:
                 return new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_OFF", player)).getItemStack();
             case ONLY_TB:
                 return new SWItem(Material.TNT_MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_ONLY_TB", player)).getItemStack();
-            case ONLY_BUILD:
-                return new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_ONLY_BUILD", player)).getItemStack();
             default:
                 return new SWItem(Material.TNT, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_ON", player)).getItemStack();
         }
@@ -58,12 +55,12 @@ public class TntBauGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         if (click == ClickType.LEFT) {
-            switch (Region.getRegion(p.getLocation()).getPlain(Flag.TNT, TNTMode.class)) {
+            switch (Region.getRegion(p.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
                 case DENY:
                     updateTntMode(TNTMode.ALLOW, p);
                     break;
                 case ALLOW:
-                    if (Region.getRegion(p.getLocation()).hasType(RegionType.BUILD) && Region.getRegion(p.getLocation()).hasType(RegionType.TESTBLOCK)) {
+                    if (!Region.getRegion(p.getLocation()).getBuildArea().isEmpty() && !Region.getRegion(p.getLocation()).getTestblockArea().isEmpty()) {
                         updateTntMode(TNTMode.ONLY_TB, p);
                         break;
                     }
@@ -77,15 +74,11 @@ public class TntBauGuiItem extends BauGuiItem {
                 updateTntMode(TNTMode.ALLOW, p);
                 p.closeInventory();
             }));
-            if (Region.getRegion(p.getLocation()).hasType(RegionType.BUILD) && Region.getRegion(p.getLocation()).hasType(RegionType.TESTBLOCK)) {
+            if (!Region.getRegion(p.getLocation()).getBuildArea().isEmpty() && !Region.getRegion(p.getLocation()).getTestblockArea().isEmpty()) {
                 selector.setItem(3, new SWItem(Material.TNT_MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_SELECTOR_ONLY_TB", p), clickType -> {
                     updateTntMode(TNTMode.ONLY_TB, p);
                     p.closeInventory();
                 }));
-                selector.setItem(5, new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_SELECTOR_ONLY_BUILD", p), clickType -> {
-                    updateTntMode(TNTMode.ONLY_BUILD, p);
-                    p.closeInventory();
-                }));
             }
             selector.setItem(7, new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_SELECTOR_OFF", p), clickType -> {
                 updateTntMode(TNTMode.DENY, p);
@@ -101,9 +94,6 @@ public class TntBauGuiItem extends BauGuiItem {
             case ONLY_TB:
                 p.performCommand("tnt tb");
                 break;
-            case ONLY_BUILD:
-                p.performCommand("tnt build");
-                break;
             case ALLOW:
                 p.performCommand("tnt on");
                 break;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.script;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.script.lua.SteamWarPlatform;
-import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java

@@ -28,7 +28,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.luaj.vm2.LuaValue;
 
 import java.util.HashMap;
 import java.util.HashSet;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java

@@ -153,7 +153,7 @@ public class EventListener implements Listener {
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
+            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
             }
         }
@@ -171,11 +171,11 @@ public class EventListener implements Listener {
         table.set("y", event.getLocation().getY());
         table.set("z", event.getLocation().getZ());
 
-        boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION));
+        boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.getBuildArea().inRegion(block.getLocation(), true));
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
+            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                 if (inBuild) {
                     ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplodeInBuild, table, event);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java

@@ -22,19 +22,14 @@ package de.steamwar.bausystem.features.script.lua;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.bukkit.BukkitPlayer;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.extension.platform.Actor;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.libs.LuaLib;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.inventory.SWAnvilInv;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -47,8 +42,6 @@ import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
 import org.luaj.vm2.lib.*;
 
-import java.lang.reflect.Proxy;
-import java.net.InetSocketAddress;
 import java.util.*;
 import java.util.logging.Level;
 
@@ -166,6 +159,8 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
         env.set("rawlen", NIL);
         env.set("rawset", NIL);
         env.set("xpcall", NIL);
+        env.set("require", NIL);
+        env.set("package", NIL);
         return null;
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java

@@ -20,19 +20,17 @@
 package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.features.loader.Loader;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
+import de.steamwar.bausystem.region.RegionSystem;
+import de.steamwar.bausystem.region.flags.*;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.lib.OneArgFunction;
 
+import java.util.List;
+import java.util.UUID;
 import java.util.function.Supplier;
 
 @Linked
@@ -46,27 +44,29 @@ public class RegionLib implements LuaLib {
     private LuaTable create(Supplier<Region> region, Player player) {
         LuaTable table = LuaValue.tableOf();
 
-        table.set("name", getter(() -> region.get().getName()));
+        table.set("name", getter(() -> region.get().getID().toString()));
+        table.set("id", getter(() -> region.get().getID().toString()));
         table.set("type", getter(() -> {
-            Region region1 = region.get();
-            if (region1 instanceof GlobalRegion) {
+            Region rg = region.get();
+            if (rg.getType().isGlobal()) {
                 return "global";
-            } else {
-                return region1.getPrototype().getName();
             }
+            List<String> chatNames = rg.getGameModeConfig().getServer().getChatNames();
+            if (chatNames.isEmpty()) {
+                return "unknown";
+            }
+            return chatNames.get(0).toLowerCase();
         }));
 
         LuaValue tntLib = LuaValue.tableOf();
-        tntLib.set("mode", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class).name()));
-        tntLib.set("enabled", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class) != TNTMode.DENY));
-        tntLib.set("onlyTb", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class) == TNTMode.ONLY_TB));
-        tntLib.set("onlyBuild", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class) == TNTMode.ONLY_BUILD));
-
+        tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
+        tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
+        tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
         table.set("tnt", tntLib);
 
-        table.set("fire", getter(() -> region.get().getPlain(Flag.FIRE, FireMode.class) == FireMode.ALLOW));
-        table.set("freeze", getter(() -> region.get().getPlain(Flag.FREEZE, FreezeMode.class) == FreezeMode.ACTIVE));
-        table.set("protect", getter(() -> region.get().getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.ACTIVE));
+        table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
+        table.set("freeze", getter(() -> region.get().getFlags().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
+        table.set("protect", getter(() -> region.get().getFlags().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
 
         //LuaValue traceLib = LuaValue.tableOf();
         //traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));
@@ -79,16 +79,16 @@ 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().getCopyPoint())));
-        table.set("minPointBuild", getter(() -> toPos(region.get().getMinPointBuild())));
-        table.set("maxPointBuild", getter(() -> toPos(region.get().getMaxPointBuild())));
-        table.set("minPointBuildExtension", getter(() -> toPos(region.get().getMinPointBuildExtension())));
-        table.set("maxPointBuildExtension", getter(() -> toPos(region.get().getMaxPointBuildExtension())));
-        table.set("testblockPoint", getter(() -> toPos(region.get().getTestBlockPoint())));
-        table.set("minPointTestblock", getter(() -> toPos(region.get().getMinPointTestblock())));
-        table.set("maxPointTestblock", getter(() -> toPos(region.get().getMaxPointTestblock())));
-        table.set("minPointTestblockExtension", getter(() -> toPos(region.get().getMinPointTestblockExtension())));
-        table.set("maxPointTestblockExtension", getter(() -> toPos(region.get().getMaxPointTestblockExtension())));
+        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))));
+        table.set("minPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
+        table.set("maxPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
+        table.set("testblockPoint", getter(() -> toPos(region.get().getTestblockArea().getCopyPoint())));
+        table.set("minPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
+        table.set("maxPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
+        table.set("minPointTestblockExtension", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(true))));
+        table.set("maxPointTestblockExtension", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(true))));
 
         return table;
     }
@@ -99,11 +99,11 @@ public class RegionLib implements LuaLib {
         table.set("get", new OneArgFunction() {
             @Override
             public LuaValue call(LuaValue arg) {
-                return create(() -> Region.getREGION_MAP().get(arg.checkjstring()), player);
+                return create(() -> RegionSystem.INSTANCE.getRegion(UUID.fromString(arg.checkjstring())).orElse(RegionSystem.INSTANCE.getGlobalRegion()), player);
             }
         });
 
-        table.set("list", getter(() -> LuaValue.listOf(Region.getREGION_MAP().values().stream().map(region -> create(() -> region, player)).toArray(LuaTable[]::new))));
+        table.set("list", getter(() -> LuaValue.listOf(RegionSystem.INSTANCE.getRegions().map(region -> create(() -> region, player)).toArray(LuaTable[]::new))));
 
         return table;
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java

@@ -24,9 +24,7 @@ import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.TwoArgFunction;
 import org.luaj.vm2.lib.VarArgFunction;
 
 @Linked

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.features.loader.Loader;
 import de.steamwar.bausystem.features.loader.LoaderRecorder;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.inventory.SWItem;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java

@@ -21,6 +21,7 @@ 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;
@@ -74,7 +75,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                 jsonObject.keySet().forEach(key -> {
                     map.put(key, fromJson(jsonObject.get(key)));
                 });
-                Region region = Region.getREGION_MAP().get(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length()));
+                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) {}
         }
@@ -143,7 +144,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
         regionStorageDirectory.mkdirs();
         for (Map.Entry<Region, HashMap<String, LuaValue>> entry : REGION_STORAGE.entrySet()) {
             try {
-                FileWriter fileWriter = new FileWriter(new File(regionStorageDirectory, entry.getKey().getName() + ".json"));
+                FileWriter fileWriter = new FileWriter(new File(regionStorageDirectory, entry.getKey().getID().toString() + ".json"));
                 gson.toJson(toJson(entry.getValue()), fileWriter);
                 fileWriter.close();
             } catch (IOException e) {}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TpsLib.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.features.tpslimit.TPSSystem;
+import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.core.TPSWatcher;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
@@ -51,7 +52,7 @@ public class TpsLib implements LuaLib {
         tpsLib.set("fiveMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES)));
         tpsLib.set("tenMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)));
         tpsLib.set("current", getter(TPSWatcher::getTPS));
-        tpsLib.set("limit", getter(tpsSystem::getCurrentTPSLimit));
+        tpsLib.set("limit", getter(() -> (double) TickManager.impl.getTickRate()));
         return tpsLib;
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TracerLib.java

@@ -0,0 +1,113 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  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.script.lua.libs;
+
+import de.steamwar.bausystem.features.tracer.TNTPoint;
+import de.steamwar.bausystem.features.tracer.Trace;
+import de.steamwar.bausystem.features.tracer.TraceManager;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+import org.luaj.vm2.LuaTable;
+import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.lib.ZeroArgFunction;
+
+@Linked
+public class TracerLib implements LuaLib {
+    @Override
+    public String name() {
+        return "tracer";
+    }
+
+    private static LuaTable convertTrace(Trace trace) {
+        LuaTable luaTrace = new LuaTable();
+
+        luaTrace.set("getRecords", new ZeroArgFunction() {
+            @Override
+            public LuaValue call() {
+                return LuaValue.listOf(
+                        trace.getHistories()
+                                .stream()
+                                .map((history) -> LuaValue.listOf(history
+                                        .stream()
+                                        .map(TracerLib::convertTntPoint)
+                                        .toArray(LuaValue[]::new)))
+                                .toArray(LuaValue[]::new));
+            }
+        });
+
+        luaTrace.set("getId", new ZeroArgFunction() {
+            @Override
+            public LuaValue call() {
+                return LuaValue.valueOf(trace.getUuid().toString());
+            }
+        });
+
+
+        return luaTrace;
+    }
+
+    private static LuaTable convertTntPoint(TNTPoint tntPoint) {
+        Location pointPos = tntPoint.getLocation();
+        LuaTable luaPos = LuaValue.tableOf(new LuaValue[]{
+                LuaValue.valueOf("x"), LuaValue.valueOf(pointPos.getX()),
+                LuaValue.valueOf("y"), LuaValue.valueOf(pointPos.getY()),
+                LuaValue.valueOf("z"), LuaValue.valueOf(pointPos.getZ()),
+        });
+
+        Vector pointVel = tntPoint.getVelocity();
+        LuaTable luaVel = LuaValue.tableOf(new LuaValue[]{
+                LuaValue.valueOf("x"), LuaValue.valueOf(pointVel.getX()),
+                LuaValue.valueOf("y"), LuaValue.valueOf(pointVel.getY()),
+                LuaValue.valueOf("z"), LuaValue.valueOf(pointVel.getZ()),
+        });
+
+        return LuaValue.tableOf(new LuaValue[]{
+                LuaValue.valueOf("pos"), luaPos,
+                LuaValue.valueOf("vel"), luaVel,
+                LuaValue.valueOf("ticksSinceStart"), LuaValue.valueOf(tntPoint.getTicksSinceStart()),
+                LuaValue.valueOf("fuse"), LuaValue.valueOf(tntPoint.getFuse()),
+                LuaValue.valueOf("isExplosion"), LuaValue.valueOf(tntPoint.isExplosion()),
+                LuaValue.valueOf("isInWater"), LuaValue.valueOf(tntPoint.isInWater()),
+                LuaValue.valueOf("hasDestroyedBuild"), LuaValue.valueOf(tntPoint.isDestroyedBuildArea()),
+                LuaValue.valueOf("hasDestroyedTestblock"), LuaValue.valueOf(tntPoint.isDestroyedTestBlock())
+        });
+    }
+
+    @Override
+    public LuaTable get(Player player) {
+        LuaTable rootTable = LuaValue.tableOf();
+
+        rootTable.set("getTraces", new ZeroArgFunction() {
+                    @Override
+                    public LuaValue call() {
+                        return LuaValue.listOf(TraceManager.instance.getAll()
+                                .stream()
+                                .map(TracerLib::convertTrace)
+                                .toArray(LuaValue[]::new));
+                    }
+                }
+
+        );
+
+        return rootTable;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrinting.java

@@ -160,6 +160,11 @@ public class ShieldPrinting implements Listener {
 
     private void paste(Map<Material, BlockDataConfiguration<?>[]> stateConfiguration) {
         for (Map.Entry<Vector, BlockData> entry : shieldData.entrySet()) {
+            BlockData copied = entry.getValue();
+            if (copied.getMaterial().isAir()) {
+                continue;
+            }
+
             Block block = entry.getKey().toLocation(WORLD).getBlock();
             if (entry.getValue().getMaterial() != block.getType()) {
                 block.setBlockData(entry.getValue(), false);
@@ -171,12 +176,11 @@ public class ShieldPrinting implements Listener {
 
             BlockDataConfiguration[] stateConfigurations = stateConfiguration.get(entry.getValue().getMaterial());
             if (stateConfigurations == null) {
-                block.setBlockData(entry.getValue(), false);
                 continue;
             }
 
             BlockData worldOriginal = block.getBlockData();
-            BlockData copied = entry.getValue().clone();
+            copied = copied.clone();
             for (BlockDataConfiguration blockDataConfiguration : stateConfigurations) {
                 if (blockDataConfiguration == null) continue;
                 blockDataConfiguration.apply(copied, worldOriginal);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java

@@ -54,7 +54,7 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
     @Register
     public void genericCommand(@Validator Player player, ShieldPrintingState shieldPrintingState) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SHIELD_PRINTING_NO_REGION", player);
             return;
         }
@@ -90,7 +90,7 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
     @Register("stop")
     public void stopCommand(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SHIELD_PRINTING_NO_REGION", player);
             return;
         }
@@ -111,7 +111,7 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
                 return false;
             }
             Region region = Region.getRegion(player.getLocation());
-            if (region.isGlobal()) {
+            if (region.getType().isGlobal()) {
                 messageSender.send("SHIELD_PRINTING_NO_REGION", player);
                 return false;
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.shieldprinting.BlockDataConfiguration;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Piston;
 import org.bukkit.entity.Player;
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java

@@ -76,7 +76,7 @@ public class SimulatorCommand extends SWCommand {
 
     @Register(value = "start", description = "SIMULATOR_START_HELP")
     public void start(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator) {
-        SimulatorExecutor.run(simulator);
+        SimulatorExecutor.run(p, simulator, null);
     }
 
     @Register(value = "rename", description = "SIMULATOR_RENAME_HELP")

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java

@@ -19,8 +19,8 @@
 
 package de.steamwar.bausystem.features.simulator;
 
-import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
@@ -71,14 +71,14 @@ import java.util.stream.Collectors;
 @MinVersion(19)
 public class SimulatorCursor implements Listener {
 
-    private final World WORLD = Bukkit.getWorlds().get(0);
+    private static final World WORLD = Bukkit.getWorlds().get(0);
     private Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
     private Class<?> look = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
     private Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
 
-    private Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
-    private Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
-    private final Set<Player> calculating = new HashSet<>();
+    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<>();
 
     public static boolean isSimulatorItem(ItemStack itemStack) {
         return ItemUtils.isItem(itemStack, "simulator");
@@ -118,7 +118,7 @@ public class SimulatorCursor implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getChanged().forEach(this::calcCursor);
+        event.getChanged().forEach(SimulatorCursor::calcCursor);
     }
 
     @EventHandler
@@ -147,14 +147,28 @@ public class SimulatorCursor implements Listener {
             return;
         }
         if (LAST_SNEAKS.containsKey(player)) {
-            cursorType.put(player, cursorType.getOrDefault(player, CursorType.TNT).switchType());
+            CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
+            if (currentType == CursorType.TNT) {
+                cursorType.put(player, CursorType.REDSTONE_BLOCK);
+            } else {
+                cursorType.put(player, CursorType.TNT);
+            }
             calcCursor(player);
         } else {
             LAST_SNEAKS.put(player, System.currentTimeMillis());
         }
     }
 
-    public void calcCursor(Player player) {
+    public static CursorType getCursorType(Player player) {
+        return cursorType.getOrDefault(player, CursorType.TNT);
+    }
+
+    public static void setCursorType(Player player, CursorType cursorType) {
+        SimulatorCursor.cursorType.put(player, cursorType);
+        calcCursor(player);
+    }
+
+    public static void calcCursor(Player player) {
         synchronized (calculating) {
             if (calculating.contains(player)) return;
             calculating.add(player);
@@ -168,9 +182,19 @@ public class SimulatorCursor implements Listener {
             }
             return;
         }
-        Simulator simulator = SimulatorStorage.getSimulator(player);
-        SimulatorWatcher.show(simulator, player);
 
+        Simulator simulator = SimulatorStorage.getSimulator(player);
+        if (simulator != null && simulator.getStabGenerator() != null) {
+            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) {
@@ -192,7 +216,7 @@ public class SimulatorCursor implements Listener {
         }
     }
 
-    private synchronized boolean removeCursor(Player player) {
+    private static synchronized boolean removeCursor(Player player) {
         REntityServer entityServer = cursors.get(player);
         boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
         if (entityServer != null) {
@@ -201,7 +225,7 @@ public class SimulatorCursor implements Listener {
         return hadCursor;
     }
 
-    private synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
+    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
         REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
             REntityServer rEntityServer = new REntityServer();
             rEntityServer.addPlayer(player);
@@ -321,25 +345,16 @@ public class SimulatorCursor implements Listener {
     @Getter
     @AllArgsConstructor
     public enum CursorType {
-        TNT(Material.TNT, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
+        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())),
         ;
 
-        private Material material;
-        private BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
-        private String name;
-        private Function<Vector, SimulatorElement<?>> elementFunction;
-
-        public CursorType switchType() {
-            if (this == TNT) {
-                return REDSTONE_BLOCK;
-            }
-            if (this == REDSTONE_BLOCK) {
-                return OBSERVER;
-            }
-            return TNT;
-        }
+        public final Material material;
+        public final Material nonSelectedMaterial;
+        public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
+        public final String name;
+        public final Function<Vector, SimulatorElement<?>> elementFunction;
     }
 
     @EventHandler
@@ -357,7 +372,7 @@ public class SimulatorCursor implements Listener {
             if (simulator == null) {
                 return;
             }
-            SimulatorExecutor.run(simulator);
+            SimulatorExecutor.run(event.getPlayer(), simulator, null);
             return;
         }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.simulator.data;
 
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
+import de.steamwar.bausystem.features.simulator.execute.SimulatorStabGenerator;
 import de.steamwar.inventory.InvCallback;
 import de.steamwar.inventory.SWItem;
 import lombok.Getter;
@@ -30,18 +31,20 @@ import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 @Getter
 @Setter
 @RequiredArgsConstructor
 public final class Simulator {
+    private SimulatorStabGenerator stabGenerator = null;
     private Material material = Material.BARREL;
     private final String name;
-    private boolean autoTrace = false;
     private final List<SimulatorGroup> groups = new ArrayList<>();
 
+    private boolean autoTrace = false;
+    private boolean autoTestblock = false;
+
     public void move(int x, int y, int z) {
         groups.forEach(simulatorGroup -> {
             simulatorGroup.move(x, y, z);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java

@@ -33,7 +33,6 @@ import yapion.hierarchy.types.YAPIONObject;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 @Getter

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java

@@ -25,8 +25,6 @@ import lombok.Setter;
 import org.bukkit.util.Vector;
 import yapion.hierarchy.types.YAPIONObject;
 
-import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 @Getter

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java

@@ -23,7 +23,7 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -60,11 +60,12 @@ public final class TNTPhase extends SimulatorPhase {
 
     @Override
     public void toSimulatorActions(Vector position, BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd) {
+        if (count <= 0) return;
         tickStart.accept(tickOffset, new SimulatorAction(order, count) {
             @Override
             public void accept(World world) {
                 Location location = position.toLocation(world);
-                if (Region.getRegion(location).get(Flag.FREEZE) == FreezeMode.ACTIVE) return;
+                if (Region.getRegion(location).getFlags().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));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/Direction.java

@@ -0,0 +1,34 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import lombok.AllArgsConstructor;
+import org.bukkit.util.Vector;
+
+import java.util.function.Function;
+
+@AllArgsConstructor
+public enum Direction {
+    X(Vector::getBlockX),
+    Y(Vector::getBlockY),
+    Z(Vector::getBlockZ);
+
+    public final Function<Vector, Integer> component;
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java

@@ -31,6 +31,7 @@ import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
@@ -46,7 +47,7 @@ public class SimulatorExecutor implements Listener {
     private static Map<Long, Map<Integer, List<SimulatorAction>>> tickStartActions = new HashMap<>();
     private static Map<Long, List<SimulatorAction>> tickEndActions = new HashMap<>();
 
-    public static boolean run(Simulator simulator) {
+    public static boolean run(Player player, Simulator simulator, Runnable onEnd) {
         if (currentlyRunning.contains(simulator)) return false;
         currentlyRunning.add(simulator);
 
@@ -69,7 +70,7 @@ public class SimulatorExecutor implements Listener {
                     public void accept(World world) {
                         currentlyRunning.remove(simulator);
 
-                        if (simulator.isAutoTrace()) {
+                        if (simulator.isAutoTrace() && onEnd == null) {
                             simulator.getGroups()
                                     .stream()
                                     .map(SimulatorGroup::getElements)
@@ -82,10 +83,17 @@ public class SimulatorExecutor implements Listener {
                                         TraceRecorder.instance.stopRecording(region);
                                     });
                         }
+
+                        if (onEnd != null) {
+                            onEnd.run();
+                        }
                     }
                 });
 
-        if (simulator.isAutoTrace()) {
+        if (player != null && simulator.isAutoTestblock()) {
+            player.performCommand("tb");
+        }
+        if (simulator.isAutoTrace() && onEnd == null) {
             simulator.getGroups()
                     .stream()
                     .map(SimulatorGroup::getElements)

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java

@@ -0,0 +1,45 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.utils.bossbar.BossBarService;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class SimulatorStabGenerator {
+
+    private final StabData stabData;
+
+    public SimulatorStabGenerator(Region region, Simulator simulator, TNTElement tntElement, int depthLimit) {
+        stabData = new StabData(region, simulator, tntElement, tntElement.getPhases(), depthLimit);
+        new StabSetup(stabData);
+    }
+
+    public void cancel() {
+        stabData.cancel = true;
+        stabData.simulator.setStabGenerator(null);
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            BossBarService.instance.remove(player, stabData.region, "simulator_stab_generator");
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java

@@ -0,0 +1,52 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.region.Region;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+import java.util.logging.Level;
+
+@RequiredArgsConstructor
+public class StabData {
+
+    protected static final int MAX_RECORDINGS = 5;
+    protected static final int MAX_TICK_DIFFERENCE = 3;
+    protected static final Level LEVEL = Level.INFO;
+    protected static final int TNT_INCREASE = 10;
+    protected static final int MIN_BLOCK_TO_COUNT_AS_DEPTH = 20;
+
+    protected final Region region;
+    protected final Simulator simulator;
+    protected final TNTElement tntElement;
+    protected final List<TNTPhase> phases;
+    protected final int depthLimit;
+
+    protected Clipboard clipboard;
+    protected boolean cancel = false;
+
+    protected Direction direction = null;
+    protected int currentDepth = 0;
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java

@@ -0,0 +1,103 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
+import de.steamwar.bausystem.features.tracer.TNTPoint;
+import de.steamwar.bausystem.features.tracer.Trace;
+import de.steamwar.bausystem.features.tracer.TraceManager;
+import de.steamwar.bausystem.features.tracer.TraceRecorder;
+import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
+import org.bukkit.Bukkit;
+import org.bukkit.util.Vector;
+
+import java.util.List;
+import java.util.Objects;
+
+public class StabDirection extends StabStep {
+
+    public StabDirection(StabData data) {
+        super(data);
+    }
+
+    @Override
+    protected void start() {
+        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
+            e.setBlocks((com.sk89q.worldedit.regions.Region) new CuboidRegion(data.region.getTestblockArea().getMinPoint(true).toBlockVector3(), data.region.getTestblockArea().getMaxPoint(true).toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
+        }
+
+        Trace trace = TraceRecorder.instance.startRecording(data.region);
+        runSimulator(() -> {
+            TraceRecorder.instance.stopRecording(data.region);
+            calculateDirection(trace);
+        });
+    }
+
+    private void calculateDirection(Trace trace) {
+        long tickSinceStart = -1;
+        List<TNTPoint> points = null;
+        for (List<TNTPoint> current : trace.getHistories()) {
+            long ticks = current.get(0).getTicksSinceStart();
+            if (points == null || ticks > tickSinceStart) {
+                tickSinceStart = ticks;
+                points = current;
+            } else if (ticks == tickSinceStart && points.get(0).getTntId() < current.get(0).getTntId()) {
+                points = current;
+            }
+        }
+        TraceManager.instance.remove(trace);
+        if (points == null) {
+            stop();
+            return;
+        }
+
+        TNTPoint current = points.getLast();
+        Vector velocity = current.getVelocity();
+        if (velocity.getX() < 0) velocity.setX(-velocity.getX());
+        if (velocity.getY() < 0) velocity.setY(-velocity.getY());
+        if (velocity.getZ() < 0) velocity.setZ(-velocity.getZ());
+        if (velocity.getX() > velocity.getY() && velocity.getX() > velocity.getZ()) {
+            data.direction = Direction.X;
+        } else if (velocity.getY() > velocity.getX() && velocity.getY() > velocity.getZ()) {
+            data.direction = Direction.Y;
+        } else if (velocity.getZ() > velocity.getX() && velocity.getZ() > velocity.getY()) {
+            data.direction = Direction.Z;
+        } else {
+            stop();
+            return;
+        }
+
+        Bukkit.getLogger().log(StabData.LEVEL, "Direction: {0}", data.direction);
+        data.phases.getFirst().setOrder(SimulatorPhase.ORDER_LIMIT);
+        data.phases.getFirst().setCount(StabData.TNT_INCREASE);
+        new StabGenerator(data);
+    }
+
+    @Override
+    protected void bossbar(BauSystemBossbar bossbar, boolean finished) {
+        bossbar.setProgress(0);
+        bossbar.setTitle("§eCalculating Stab Direction");
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java

@@ -0,0 +1,59 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import de.steamwar.bausystem.features.tracer.TraceRecorder;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
+
+public class StabFinalizer extends StabStep {
+
+    public StabFinalizer(StabData data) {
+        super(data);
+    }
+
+    @Override
+    protected void start() {
+        try {
+            PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
+            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
+            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
+            }
+            data.region.getTestblockArea().reset(pasteBuilder, true);
+        } catch (SecurityException e) {
+            stop();
+            throw e;
+        }
+
+        TraceRecorder.instance.startRecording(data.region);
+        runSimulator(() -> {
+            TraceRecorder.instance.stopRecording(data.region);
+            stop();
+        });
+    }
+
+    @Override
+    protected void bossbar(BauSystemBossbar bossbar, boolean stopped) {
+        bossbar.setProgress(Math.min(data.currentDepth / (double) data.depthLimit, 1.0));
+        bossbar.setTitle("§e" + data.currentDepth + "§8/§7" + data.depthLimit);
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java

@@ -0,0 +1,250 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static de.steamwar.bausystem.features.simulator.execute.Direction.Y;
+
+public class StabGenerator extends StabStep implements Listener {
+
+    private int recordings = 0;
+    private List<Integer> currentDepths = new ArrayList<>();
+    private int lastDepth = 0;
+
+    private int retries = 0;
+
+    private final Map<Integer, Set<Location>> destroyedBlocksPerSlice = new HashMap<>();
+
+    private Set<Integer> gabStart = new HashSet<>();
+    private Set<TNTPhase> failedAtLeastOnce = new HashSet<>();
+
+    @EventHandler
+    public void onEntityExplode(EntityExplodeEvent event) {
+        if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
+            event.blockList().forEach(block -> {
+                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());
+            });
+        }
+    }
+
+    public StabGenerator(StabData data) {
+        super(data);
+    }
+
+    @Override
+    protected void start() {
+        try {
+            PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
+            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
+            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
+            }
+            data.region.getTestblockArea().reset(pasteBuilder, true);
+        } catch (SecurityException e) {
+            stop();
+            throw e;
+        }
+
+        if (data.cancel) {
+            HandlerList.unregisterAll(this);
+            return;
+        }
+
+        runSimulator(this::calculateStab);
+    }
+
+    private void calculateStab() {
+        TNTPhase lastPhase = data.phases.getLast();
+
+        List<Map.Entry<Integer, Set<Location>>> locations = destroyedBlocksPerSlice.entrySet()
+                .stream()
+                .sorted(Comparator.comparingInt(Map.Entry::getKey))
+                .collect(Collectors.toList());
+        int depth = 0;
+        for (int i = 0; i < locations.size(); i++) {
+            if (data.direction != Y && i > 0 && Math.abs(locations.get(i - 1).getKey() - locations.get(i).getKey()) > 3) {
+                if (gabStart.add(locations.get(i).getKey())) {
+                    Bukkit.getLogger().log(StabData.LEVEL, "Increasing tnt count by {0} because of gap", StabData.TNT_INCREASE);
+                    lastPhase.setCount(lastPhase.getCount() + StabData.TNT_INCREASE);
+                    recordings = 0;
+                    currentDepths.clear();
+
+                    run();
+                    return;
+                }
+            }
+            if (i == 0 || i == locations.size() - 1) {
+                if (locations.get(i).getValue().size() > StabData.MIN_BLOCK_TO_COUNT_AS_DEPTH) {
+                    depth++;
+                }
+            } else {
+                depth++;
+            }
+        }
+
+        if (depth > 0) {
+            Bukkit.getLogger().log(StabData.LEVEL, "{0} {1} {2}", new Object[]{depth, destroyedBlocksPerSlice.size(), destroyedBlocksPerSlice.values().stream().map(Set::size).collect(Collectors.toList())});
+            destroyedBlocksPerSlice.clear();
+            currentDepths.add(depth);
+        } else {
+            destroyedBlocksPerSlice.clear();
+            lastPhase.setTickOffset(lastPhase.getTickOffset() + 1);
+            Bukkit.getLogger().log(StabData.LEVEL, "No dimension - Increasing tickOffset to: {0}", lastPhase.getTickOffset());
+            lastPhase.setOrder(0);
+            if (lastPhase.getTickOffset() > 80) {
+                stop();
+            } else {
+                run();
+            }
+            return;
+        }
+
+        int minDepth = currentDepths.stream().min(Integer::compareTo).orElse(0);
+        int maxDepth = currentDepths.stream().max(Integer::compareTo).orElse(0);
+        data.currentDepth = maxDepth;
+
+        int countWithoutLast = 0;
+        for (int i = 0; i < data.phases.size() - 1; i++) {
+            countWithoutLast += data.phases.get(i).getCount();
+        }
+        countWithoutLast -= gabStart.size();
+
+        boolean moreTNTNeeded = maxDepth - countWithoutLast >= lastPhase.getCount() - 5;
+        if (moreTNTNeeded) {
+            Bukkit.getLogger().log(StabData.LEVEL, "Increasing tnt count by {0}", StabData.TNT_INCREASE);
+            lastPhase.setCount(lastPhase.getCount() + StabData.TNT_INCREASE);
+            recordings = 0;
+            currentDepths.clear();
+
+            run();
+            return;
+        }
+
+        if (recordings++ < StabData.MAX_RECORDINGS) {
+            run();
+            return;
+        }
+
+        recordings = 0;
+        currentDepths.clear();
+
+        if (maxDepth - minDepth > lastPhase.getCount()) {
+            Bukkit.getLogger().log(StabData.LEVEL, "Stab failed at least once. Adding one tnt to {0}", minDepth - 3);
+            int current = 0;
+            TNTPhase last = null;
+            for (TNTPhase phase : data.phases) {
+                if (current < minDepth - 3) {
+                    current += phase.getCount();
+                    last = phase;
+                    continue;
+                }
+
+                if (failedAtLeastOnce.add(last)) {
+                    last = null;
+                    break;
+                }
+
+                if (last != null) {
+                    last.setCount(last.getCount() + 1);
+                    Bukkit.getLogger().log(StabData.LEVEL, "Added to phase {0} now has {1} tnt", new Object[]{data.phases.indexOf(last), last.getCount()});
+                }
+                break;
+            }
+
+            if (last != null) {
+                run();
+                return;
+            }
+        }
+
+        Bukkit.getLogger().log(StabData.LEVEL, "No more TNT needed on phase adjusting - {0} new count; {1} current count", new Object[]{maxDepth - countWithoutLast, lastPhase.getCount()});
+        lastPhase.setCount(maxDepth - countWithoutLast);
+        if (lastPhase.getCount() <= 0) {
+            Bukkit.getLogger().log(StabData.LEVEL, "Count was 0 or negative - removing last phase");
+            data.phases.removeLast();
+        }
+
+        if (maxDepth > data.depthLimit) {
+            Bukkit.getLogger().log(StabData.LEVEL, "Depth is greater than {0} - finished", data.depthLimit);
+            new StabFinalizer(data);
+            return;
+        }
+        if (maxDepth <= lastDepth) {
+            if (lastPhase.getCount() <= 0) {
+                retries++;
+            }
+            if (lastPhase.getCount() > 0 || retries > StabData.MAX_TICK_DIFFERENCE) {
+                Bukkit.getLogger().log(StabData.LEVEL, "Depth is equal to last depth recorded {0} - finished", maxDepth);
+                new StabFinalizer(data);
+                return;
+            }
+        }
+        lastDepth = maxDepth;
+
+        newPhase(data, lastPhase);
+        run();
+    }
+
+    public static void newPhase(StabData data, TNTPhase lastPhase) {
+        Bukkit.getLogger().log(StabData.LEVEL, "Adding new phase in next tick");
+        TNTPhase nextPhase = new TNTPhase();
+        nextPhase.setCount(StabData.TNT_INCREASE);
+        nextPhase.setTickOffset(lastPhase.getTickOffset() + 1);
+        nextPhase.setXJump(lastPhase.isXJump());
+        nextPhase.setYJump(lastPhase.isYJump());
+        nextPhase.setZJump(lastPhase.isZJump());
+        data.phases.add(nextPhase);
+    }
+
+    @Override
+    protected void bossbar(BauSystemBossbar bossbar, boolean finished) {
+        bossbar.setProgress(Math.min(data.currentDepth / (double) data.depthLimit, 1.0));
+        if (finished) {
+            bossbar.setTitle("§e" + data.currentDepth + "§8/§7" + data.depthLimit);
+            return;
+        }
+
+        StringBuilder st = new StringBuilder();
+        st.append("§7Direction §e").append(data.direction);
+        st.append("   §e").append(data.currentDepth).append("§8/§7").append(data.depthLimit);
+        if (recordings > 0) {
+            st.append("   §7Retries§8:§e ").append(recordings).append("§8/§7").append(StabData.MAX_RECORDINGS);
+        }
+        bossbar.setTitle(st.toString());
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java

@@ -0,0 +1,85 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.features.tracer.TraceRecorder;
+import de.steamwar.bausystem.utils.FlatteningWrapper;
+import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+public class StabSetup extends StabStep {
+
+    public StabSetup(StabData data) {
+        super(data);
+    }
+
+    @Override
+    protected void start() {
+        TNTPhase tntPhase = data.simulator.getGroups().stream()
+                .filter(simulatorGroup -> !simulatorGroup.isDisabled())
+                .map(SimulatorGroup::getElements)
+                .flatMap(List::stream)
+                .filter(TNTElement.class::isInstance)
+                .map(TNTElement.class::cast)
+                .filter(tntElement -> !tntElement.isDisabled())
+                .filter(tntElement -> data.tntElement != tntElement)
+                .map(tntElement -> tntElement.getPhases().stream().max(Comparator.comparingInt(TNTPhase::getTickOffset)))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .peek(phase -> {
+                    if (phase.getOrder() > TNTPhase.ORDER_LIMIT) {
+                        phase.setOrder(TNTPhase.ORDER_LIMIT);
+                    }
+                })
+                .filter(phase -> phase != data.phases.get(0))
+                .max(Comparator.comparingInt(TNTPhase::getTickOffset))
+                .orElse(null);
+        if (tntPhase == null) {
+            throw new SecurityException("");
+        }
+
+        TNTPhase phase = data.phases.get(0);
+        data.phases.clear();
+        data.phases.add(phase);
+        phase.setCount(1);
+        phase.setTickOffset(tntPhase.getTickOffset());
+        phase.setOrder(100);
+
+        TraceRecorder.instance.stopRecording(data.region);
+        if (TraceRecorder.instance.isAutoTraceEnabledInRegion(data.region)) {
+            TraceRecorder.instance.removeAutoTraceRegion(data.region);
+        }
+        data.clipboard = FlatteningWrapper.impl.copy(data.region.getTestblockArea().getMinPoint(true), data.region.getTestblockArea().getMaxPoint(true), data.region.getTestblockArea().getCopyPoint());
+
+        new StabDirection(data);
+    }
+
+    @Override
+    protected void bossbar(BauSystemBossbar bossbar, boolean finished) {
+        bossbar.setProgress(0);
+        bossbar.setTitle("§eSetting up Simulator");
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java

@@ -0,0 +1,95 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.execute;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
+import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
+import de.steamwar.bausystem.utils.bossbar.BossBarService;
+import org.bukkit.Bukkit;
+import org.bukkit.boss.BarColor;
+import org.bukkit.boss.BarStyle;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+
+public abstract class StabStep {
+
+    protected final StabData data;
+
+    protected StabStep(StabData data) {
+        this.data = data;
+        run();
+    }
+
+    protected final void run() {
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            for (Player player : Bukkit.getOnlinePlayers()) {
+                BauSystemBossbar bossbar = BossBarService.instance.get(player, data.region, "simulator_stab_generator");
+                bossbar.setColor(BarColor.GREEN);
+                bossbar.setStyle(BarStyle.SEGMENTED_10);
+                bossbar(bossbar, false);
+            }
+        }, 1);
+
+        if (this instanceof Listener) {
+            Bukkit.getPluginManager().registerEvents((Listener) this, BauSystem.getInstance());
+        }
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), this::start, 20);
+    }
+
+    protected abstract void start();
+
+    protected final void runSimulator(Runnable onFinish) {
+        SimulatorExecutor.run(null, data.simulator, () -> {
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                if (this instanceof Listener) {
+                    HandlerList.unregisterAll((Listener) this);
+                }
+                onFinish.run();
+            }, 20);
+        });
+    }
+
+    protected abstract void bossbar(BauSystemBossbar bossbar, boolean stopped);
+
+    protected final void stop() {
+        data.simulator.setStabGenerator(null);
+        SimulatorWatcher.update(data.simulator);
+
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            BauSystemBossbar bossbar = BossBarService.instance.get(player, data.region, "simulator_stab_generator");
+            bossbar.setColor(BarColor.GREEN);
+            bossbar.setStyle(BarStyle.SEGMENTED_10);
+            bossbar(bossbar, true);
+        }
+        new Thread(() -> {
+            try {
+                Thread.sleep(4000);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } finally {
+                for (Player player : Bukkit.getOnlinePlayers()) {
+                    BossBarService.instance.remove(player, data.region, "simulator_stab_generator");
+                }
+            }
+        }).start();
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java

@@ -0,0 +1,67 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.gui;
+
+import de.steamwar.bausystem.features.simulator.SimulatorCursor;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
+import de.steamwar.inventory.SWItem;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.Collections;
+
+public class SimulatorCursorSwitcherGui extends SimulatorBaseGui {
+
+    private SimulatorBaseGui back;
+
+    public SimulatorCursorSwitcherGui(Player player, Simulator simulator, SimulatorBaseGui back) {
+        super(player, simulator, 9);
+        this.back = back;
+    }
+
+    @Override
+    public String title() {
+        return "Simulator Cursor";
+    }
+
+    @Override
+    public void populate() {
+        inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
+            back.open();
+        }).setCustomModelData(CMDs.BACK));
+
+        int slot = 2;
+        SimulatorCursor.CursorType currentType = SimulatorCursor.getCursorType(player);
+        for (SimulatorCursor.CursorType type : SimulatorCursor.CursorType.values()) {
+            boolean selected = type == currentType;
+            SWItem swItem = new SWItem(selected ? type.material : type.nonSelectedMaterial, "§e" + type.name)
+                    .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE)
+                    .setLore(Collections.singletonList("§eClick to select"))
+                    .setCallback(click -> {
+                        SimulatorCursor.setCursorType(player, type);
+                        player.closeInventory();
+                    });
+            inventory.setItem(slot, swItem);
+            slot += 2;
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java

@@ -25,6 +25,7 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -70,12 +71,12 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
 
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             simulatorGroup.getElements().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         inventory.setItem(4, simulatorGroup.toItem(player, clickType -> {
             if (simulatorGroup.getMaterial() == null) return;
@@ -85,7 +86,7 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
 
         inventory.setItem(48, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorGroupSettingsGui(player, simulator, simulatorGroup, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
         boolean disabled = simulatorGroup.getMaterial() == null ? simulatorGroup.getElements().stream().allMatch(SimulatorElement::isDisabled) : simulatorGroup.isDisabled();
         inventory.setItem(50, new SWItem(disabled ? Material.ENDER_PEARL : Material.ENDER_EYE, simulatorGroup.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             if (simulatorGroup.getMaterial() == null) {
@@ -96,7 +97,7 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
                 simulatorGroup.setDisabled(!disabled);
             }
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java

@@ -25,10 +25,10 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
 
 import java.util.Arrays;
 
@@ -58,7 +58,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, simulatorGroup.toItem(player, clickType -> {
@@ -69,10 +69,10 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = simulatorGroup.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§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));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -83,14 +83,14 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 simulatorGroup.changeBaseTicks(-baseTicks);
             } else {
                 simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         boolean allTNT = simulatorGroup.getElements().stream().allMatch(TNTElement.class::isInstance);
 
@@ -163,10 +163,10 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         }
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§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){
@@ -177,16 +177,16 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§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, SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§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){
@@ -197,16 +197,16 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§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, SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§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){
@@ -217,9 +217,9 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§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));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java

@@ -19,11 +19,13 @@
 
 package de.steamwar.bausystem.features.simulator.gui;
 
+import de.steamwar.bausystem.features.simulator.SimulatorCursor;
 import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -48,9 +50,13 @@ public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
         inventory.setItem(4, simulator.toItem(player, clickType -> {
             new SimulatorMaterialGui(player, simulator, simulator::getMaterial, simulator::setMaterial, this).open();
         }));
-        inventory.setItem(49, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
-            new SimulatorSettingsGui(player, simulator, this).open();
+        SimulatorCursor.CursorType cursorType = SimulatorCursor.getCursorType(player);
+        inventory.setItem(48, new SWItem(cursorType.material, "§7Placing §8-§e " + cursorType.name, clickType -> {
+            new SimulatorCursorSwitcherGui(player, simulator, this).open();
         }));
+        inventory.setItem(50, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
+            new SimulatorSettingsGui(player, simulator, this).open();
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java

@@ -23,6 +23,7 @@ import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -53,6 +54,16 @@ public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
         this.back = back;
     }
 
+    @Override
+    public boolean shouldOpen() {
+        if (player.getItemOnCursor().getType().isAir()) {
+            return true;
+        }
+        change.accept(player.getItemOnCursor().getType());
+        SimulatorWatcher.update(simulator);
+        return false;
+    }
+
     @Override
     public String baseTitle() {
         return "Material";
@@ -65,7 +76,7 @@ public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
         }));
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java

@@ -26,6 +26,7 @@ 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.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -82,12 +83,12 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
                     new SimulatorGroupGui(player, simulator, newParent, simulatorGui).open();
                 }
             }
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             observer.getPhases().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
         inventory.setItem(4, observer.toItem(player, clickType -> {
@@ -97,18 +98,18 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         // Settings
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorObserverSettingsGui(player, simulator, observer, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
 
         // Enable/Disable
         inventory.setItem(48, new SWItem(observer.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, observer.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             observer.setDisabled(!observer.isDisabled());
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         // Group chooser
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
             new SimulatorGroupChooserGui(player, simulator, observer, observer.getGroup(simulator), this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.JOIN_GROUP));
     }
 
     @Override
@@ -151,15 +152,15 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     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 -> {
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
                 new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
                     new SimulatorObserverPhaseSettingsGui(player, simulator, this.observer, observerPhase, this).open();
-                }),
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
         };
     }
 
@@ -168,12 +169,12 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§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 -> {
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java

@@ -27,6 +27,7 @@ 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;
 import org.bukkit.block.BlockFace;
@@ -62,7 +63,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, observerElement.toItem(player, clickType -> {
@@ -74,7 +75,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
             observerElement.getPhases().remove(observer);
             back.open();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         int index = observerElement.getPhases().indexOf(observer);
         int min;
@@ -95,10 +96,10 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = observer.getTickOffset();
-        inventory.setItem(10, SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
@@ -111,17 +112,17 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Order
         int order = observer.getOrder();
-        inventory.setItem(13, SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             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 -> {
@@ -136,10 +137,10 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Update orientation
         inventory.setItem(25, new SWItem(Material.SUNFLOWER, "§7", clickType -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -56,7 +57,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, observer.toItem(player, clickType -> {
@@ -65,10 +66,10 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = observer.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -79,20 +80,20 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 observer.changeBaseTicks(-baseTicks);
             } else {
                 observer.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + observer.getPosition().getBlockX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", observer.getPosition().getBlockX() + "", Integer::parseInt, i -> {
                 observer.getPosition().setX(i);
@@ -100,16 +101,16 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + observer.getPosition().getBlockY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", observer.getPosition().getBlockY() + "", Integer::parseInt, i -> {
                 observer.getPosition().setY(i);
@@ -117,16 +118,16 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + observer.getPosition().getBlockZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", observer.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
                 observer.getPosition().setZ(i);
@@ -134,9 +135,9 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java

@@ -26,6 +26,7 @@ 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.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import lombok.AllArgsConstructor;
 import org.bukkit.Material;
@@ -88,12 +89,12 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
                     new SimulatorGroupGui(player, simulator, newParent, simulatorGui).open();
                 }
             }
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             redstone.getPhases().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
         inventory.setItem(4, redstone.toItem(player, clickType -> {
@@ -103,18 +104,18 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         // Settings
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorRedstoneSettingsGui(player, simulator, redstone, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
 
         // Enable/Disable
         inventory.setItem(48, new SWItem(redstone.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, redstone.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             redstone.setDisabled(!redstone.isDisabled());
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         // Group chooser
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
             new SimulatorGroupChooserGui(player, simulator, redstone, redstone.getGroup(simulator), this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.JOIN_GROUP));
     }
 
     @Override
@@ -166,15 +167,15 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     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 -> {
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
                 new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
                     new SimulatorRedstonePhaseSettingsGui(player, simulator, this.redstone, redstoneSubPhase.phase, this).open();
-                }),
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
         };
     }
 
@@ -183,12 +184,12 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§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 -> {
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java

@@ -27,6 +27,7 @@ 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;
 import org.bukkit.entity.Player;
@@ -60,7 +61,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, redstoneElement.toItem(player, clickType -> {
@@ -72,7 +73,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
             redstoneElement.getPhases().remove(redstone);
             back.open();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         int index = redstoneElement.getPhases().indexOf(redstone);
         int min;
@@ -96,10 +97,10 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = redstone.getTickOffset();
-        inventory.setItem(10, SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
@@ -112,17 +113,17 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Lifetime
         int lifetime = redstone.getLifetime();
-        inventory.setItem(11, SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eActivation Time§8:§7 " + lifetime, clickType -> {
             new SimulatorAnvilGui<>(player, "Activation Time", lifetime + "", Integer::parseInt, integer -> {
@@ -135,17 +136,17 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
         inventory.setItem(20, lifetimeItem);
 
-        inventory.setItem(29, SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Order
         int order = redstone.getOrder();
-        inventory.setItem(13, SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             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 -> {
@@ -160,9 +161,9 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -55,7 +56,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, redstone.toItem(player, clickType -> {
@@ -64,10 +65,10 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = redstone.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -78,20 +79,20 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 redstone.changeBaseTicks(-baseTicks);
             } else {
                 redstone.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + redstone.getPosition().getBlockX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", redstone.getPosition().getBlockX() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setX(i);
@@ -99,16 +100,16 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + redstone.getPosition().getBlockY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", redstone.getPosition().getBlockY() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setY(i);
@@ -116,16 +117,16 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + redstone.getPosition().getBlockZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", redstone.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setZ(i);
@@ -133,9 +134,9 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }