Update SimulatorPreviewTNT

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

@@ -1,140 +0,0 @@
-/*
- * 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_19/src/de/steamwar/bausystem/utils/TickListener19.java

@@ -22,6 +22,7 @@ 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;
@@ -36,7 +37,7 @@ public class TickListener19 implements TickListener, Listener {
 
     @EventHandler
     public void onServerTickStart(ServerTickStartEvent event) {
-        if (TickManager.impl.isFrozen()) return;
+        if (TPSFreezeUtils.isFrozen()) return;
         Bukkit.getPluginManager().callEvent(new TickStartEvent());
         tickStartRan = true;
     }

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

@@ -35,6 +35,7 @@ import org.bukkit.Material;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
@@ -43,11 +44,10 @@ import java.util.Optional;
 public class NMSWrapper21 implements NMSWrapper {
 
     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) {
-        playerGameMode.set(playerInteractManager.get(((CraftPlayer) player).getHandle()), GameType.byId(gameMode.getValue()));
+        playerInteractManager.get(((CraftPlayer) player).getHandle()).changeGameModeForPlayer(GameType.byId(gameMode.getValue()), PlayerGameModeChangeEvent.Cause.UNKNOWN, null);
     }
 
     @Override
@@ -66,7 +66,7 @@ public class NMSWrapper21 implements NMSWrapper {
         player.updateInventory();
     }
 
-    private static final Reflection.Field<ClientboundGameEventPacket.Type> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, ClientboundGameEventPacket.Type.class, 14);
+    private static final Reflection.Field<ClientboundGameEventPacket.Type> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, ClientboundGameEventPacket.Type.class, 12);
 
     @Override
     public void setGameStateChangeReason(Object packet) {
@@ -94,7 +94,7 @@ public class NMSWrapper21 implements NMSWrapper {
             return false;
         }
 
-        return drillDown(data.contents(), 0, 0) > threshold;
+        return drillDown(data.contents(), 0, 0) <= threshold;
     }
 
     private int drillDown(List<ItemStack> items, int layer, int start) {

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

@@ -1,150 +0,0 @@
-/*
- *   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=§7You are not allowed to use that here
+NO_PERMISSION=You are not allowed to use that here
 SPECTATOR=§fSpectator
 # Scoreboard
 SCOREBOARD_TIME=Time
@@ -137,9 +137,7 @@ 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 = §7NoGravity§8: §e{0}
-BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
-BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
+BAU_INFO_ITEM_LORE_NO_GRAVITY = §8NoGravity§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}
@@ -392,12 +390,6 @@ 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
@@ -405,7 +397,6 @@ 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
@@ -740,10 +731,12 @@ 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
@@ -940,6 +933,7 @@ 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
@@ -980,12 +974,10 @@ 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 to calculate the moved blocks.
+PISTON_HELP_1=§7Right click on piston with a slime ball 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=§7Du darfst dies hier nicht nutzen
+NO_PERMISSION=Du darfst dies hier nicht nutzen
 SPECTATOR=§fZuschauer
 # Scoreboard
 SCOREBOARD_TIME=Uhrzeit
@@ -119,9 +119,12 @@ 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_CHANGED=§7Verändert§8: §e{0}
+BAU_INFO_ITEM_LORE_PROTECT=§7Protect§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}
@@ -347,11 +350,8 @@ 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 aktiviert
-INVENTORY_FILL_DISABLE=§cInventoryFiller deaktiviert
-# Ray Visualizer
-RAY_VISUALIZER_ENABLE=§aRayVisualizer aktiviert
-RAY_VISUALIZER_DISABLE=§aRayVisualizer deaktiviert
+INVENTORY_FILL_ENABLE=§aInventoryFiller activated
+INVENTORY_FILL_DISABLE=§cInventoryFiller deactivated
 # Killchecker
 KILLCHECKER_HELP_ENABLE=§8/§ekillchecker enable §8- §7Aktiviert Killchecker / Berechnet kills neu
 KILLCHECKER_HELP_DISABLE=§8/§ekillchecker disable §8- §7Deaktiviert Killchecker
@@ -359,7 +359,6 @@ 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
@@ -678,10 +677,12 @@ 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
@@ -873,6 +874,7 @@ 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
@@ -912,12 +914,10 @@ SELECT_ITEM_BAURAHMEN=§eBaurahmen
 SELECT_ITEM_BAUPLATTFORM=§eBauplattform
 SELECT_ITEM_TESTBLOCK=§eTestblock
 CHESTFILLER_FILLED=§eKiste gefüllt
-PISTON_HELP_1=§7Rechts Klick auf einen Piston berechnet dir die bewegten Blöcke.
+PISTON_HELP_1=§7Rechts Klick auf Piston mit einem Slime Ball 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

@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem;
 
+import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.configplayer.ConfigConverter;
@@ -28,21 +29,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.RegionSystem;
+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.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,7 +56,6 @@ 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;
@@ -74,7 +74,7 @@ import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BauSystem extends JavaPlugin implements Listener {
+public class BauSystem extends JavaPlugin {
 
     // This should be treated as final!
     public static Message MESSAGE;
@@ -95,8 +95,6 @@ public class BauSystem extends JavaPlugin implements Listener {
         instance = this;
         SWUtils.setBausystem(instance);
 
-        RegionSystem.INSTANCE.load();
-        /*
         try {
             PrototypeLoader.load();
             RegionLoader.load();
@@ -109,7 +107,6 @@ public class BauSystem extends JavaPlugin implements Listener {
 
         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));
@@ -214,11 +211,6 @@ public class BauSystem extends JavaPlugin implements Listener {
         new WorldEditRendererCUIEditor();
     }
 
-    @EventHandler
-    public void onCRIUSleep(CRIUSleepEvent event) {
-        RegionSystem.INSTANCE.save();
-    }
-
     @Override
     public void onDisable() {
         instances.forEach((aClass, o) -> {
@@ -231,7 +223,6 @@ public class BauSystem extends JavaPlugin implements Listener {
         });
 
         WorldData.write();
-        RegionSystem.INSTANCE.save();
         Config.getInstance().saveAll();
     }
 
@@ -275,7 +266,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
             @Override
             public void run() {
-                if (TickManager.impl.isFrozen()) return;
+                if (TPSFreezeUtils.isFrozen()) return;
                 if (counter >= delay) {
                     runnable.run();
                     cancel();
@@ -293,7 +284,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
             @Override
             public void run() {
-                if (TickManager.impl.isFrozen()) return;
+                if (TPSFreezeUtils.isFrozen()) return;
                 if (counter >= (first ? delay : period)) {
                     first = false;
                     runnable.run();

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

@@ -21,9 +21,11 @@ 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,6 +24,7 @@ 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,6 +24,8 @@ 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;
@@ -31,6 +33,8 @@ 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;
@@ -39,9 +43,9 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Linked
 public class AutostartListener implements Listener {
@@ -102,11 +106,11 @@ public class AutostartListener implements Listener {
 
     public void activate(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getType().isGlobal()) {
+        if (region.isGlobal()) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
-        if (region.getTestblockArea().isEmpty()) {
+        if (!region.hasType(RegionType.TESTBLOCK)) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
@@ -127,12 +131,20 @@ public class AutostartListener implements Listener {
         event.blockList().forEach(block -> {
             Region region = Region.getRegion(block.getLocation());
             if (!regionStartTime.containsKey(region)) return;
-            if (!region.getTestblockArea().inRegion(block.getLocation(), true)) return;
+            if (!region.hasType(RegionType.TESTBLOCK)) return;
+            if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            long preFightDurationInSeconds = region.getGameModeConfig().getTimes().getPreFightDuration();
+            long preFightDurationInSeconds = getPreFightDurationInSeconds(region);
             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,23 +19,31 @@
 
 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.command.PreviousArguments;
+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.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.util.*;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Linked
@@ -46,7 +54,7 @@ public class BackupCommand extends SWCommand {
     }
 
     static boolean checkGlobalRegion(Region region, Player p) {
-        if (region.getType().isGlobal()) {
+        if (region.isGlobal()) {
             BauSystem.MESSAGE.send("BACKUP_REGION_NO_REGION", p);
             return true;
         }
@@ -59,12 +67,11 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getFlags().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
+        if (!region.get(Tag.CHANGED)) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
             return;
         }
-        Optional<RegionBackups.Backup> backup = region.getBackups().create(RegionBackups.BackupType.MANUAL);
-        if (backup.isPresent()) {
+        if (region.backup()) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_SUCCESS", p);
         } else {
             BauSystem.MESSAGE.send("BACKUP_CREATE_FAILURE", p);
@@ -72,12 +79,25 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "BACKUP_HELP_LOAD")
-    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);
+    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) {
+            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")
@@ -86,10 +106,10 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        List<RegionBackups.Backup> backups = listBackup(p);
+        List<String> backups = listBackup(p);
         BauSystem.MESSAGE.send("BACKUP_LIST_HEAD", p, backups.size());
-        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());
+        backups.forEach(s -> {
+            BauSystem.MESSAGE.send("BACKUP_LIST_ENTRY", p, "/backup load " + s, new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/backup load " + s), s);
         });
     }
 
@@ -99,44 +119,34 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        List<RegionBackups.Backup> backups = listBackup(p);
-        List<SWListInv.SWListEntry<RegionBackups.Backup>> swListEntries = new ArrayList<>();
+        List<String> backups = listBackup(p);
+        List<SWListInv.SWListEntry<String>> swListEntries = new ArrayList<>();
         List<String> lore = Arrays.asList(BauSystem.MESSAGE.parse("BACKUP_LORE", p));
         for (int i = 0; i < backups.size(); i++) {
-            RegionBackups.Backup backup = backups.get(i);
-            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, backup.getName()), lore, false, clickType -> {});
+            String s = backups.get(i);
+            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, s), lore, false, clickType -> {});
             swItem.getItemStack().setAmount(i + 1);
-            swListEntries.add(new SWListInv.SWListEntry<>(swItem, backup));
+            swListEntries.add(new SWListInv.SWListEntry<>(swItem, s));
         }
-        SWListInv<RegionBackups.Backup> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
+        SWListInv<String> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
             p.getOpenInventory().close();
-            backupLoad(p, s);
+            p.performCommand("backup load " + s);
         });
         swListInv.open();
     }
 
-    @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());
-            }
-        };
+    @Mapper(value = "backupName", local = true)
+    public TypeMapper<String> backupMapper() {
+        return SWCommandUtils.createMapper(s -> s, (commandSender, s) -> listBackup((Player) commandSender));
     }
 
-    private List<RegionBackups.Backup> listBackup(Player p) {
+    private List<String> listBackup(Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return Collections.emptyList();
         }
         try {
-            return region.getBackups().list();
+            return region.listBackup().stream().map(s -> s.substring(0, s.length() - 6).replace(' ', '_')).collect(Collectors.toList());
         } catch (NullPointerException e) {
             return Collections.emptyList();
         }

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

@@ -23,7 +23,6 @@ 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;
@@ -57,10 +56,15 @@ public class BauInfoBauGuiItem extends BauGuiItem {
         Region region = Region.getRegion(player.getLocation());
         List<String> stringList = new ArrayList<>();
         for (Flag flag : Flag.getFlags()) {
-            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)));
+            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)));
             }
         }
         itemStack.setLore(stringList);

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

@@ -19,11 +19,13 @@
 
 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,7 +3,6 @@ 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;
@@ -31,10 +30,12 @@ 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 (!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));
+            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));
             }
         }
 

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

@@ -23,6 +23,7 @@ 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;
@@ -84,8 +85,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.getType().isGlobal()) return;
-                if (region.getTestblockArea().isEmpty()) return;
+                if (region.isGlobal()) return;
+                if (!region.hasType(RegionType.TESTBLOCK)) return;
                 Depth depth = new Depth(region);
                 DepthManager.init(tntPrimeds, depth);
             });

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

@@ -22,6 +22,7 @@ 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

@@ -23,6 +23,8 @@ 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;
@@ -48,7 +50,7 @@ public class Depth {
 
     public void update(List<Block> blocks) {
         List<Block> blocksList = blocks.stream()
-                .filter(block -> region.getTestblockArea().inRegion(block.getLocation(), true))
+                .filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
                 .collect(Collectors.toList());
         tntCount++;
         for (Block block : blocksList) {

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

@@ -29,11 +29,12 @@ 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.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class DesignEndStone {
 
@@ -43,26 +44,18 @@ public class DesignEndStone {
     private REntityServer entityServer = new REntityServer();
     private List<REntity> entities = new ArrayList<>();
     private Set<Location> locations = new HashSet<>();
-    private Set<Material> limited;
-    private boolean calculateFromBottom;
+    private boolean wsOrAs;
+    private double maxBlastResistance;
 
     public DesignEndStone(Region region) {
-        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();
+        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;
 
         entityServer.setCallback((player, rEntity, entityAction) -> {
             if (entityAction != REntityServer.EntityAction.ATTACK) return;
@@ -83,7 +76,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 (calculateFromBottom) {
+        if (wsOrAs) {
             calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
         } else {
             int airBlocks = 0;
@@ -113,7 +106,7 @@ public class DesignEndStone {
                         int cz = z + step * dirZ;
                         Material material = WORLD.getBlockAt(cx, cy, cz).getType();
 
-                        if (material != Material.WATER && material != Material.LAVA && limited.contains(material)) {
+                        if (material != Material.WATER && material != Material.LAVA && material.getBlastResistance() >= maxBlastResistance) {
                             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,6 +21,7 @@ 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;
@@ -48,11 +49,7 @@ 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.getBuildArea().isEmpty()) {
-            BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
-            return;
-        }
-        if (!region.getGameModeConfig().isLoaded()) {
+        if (!region.hasType(RegionType.BUILD)) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }

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

@@ -4,45 +4,12 @@ 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");
     }
@@ -54,116 +21,8 @@ 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,6 +38,7 @@ 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 {
@@ -56,10 +57,6 @@ 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,6 +22,8 @@ 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;
@@ -73,8 +75,8 @@ public class KillcheckerVisualizer {
 
     public KillcheckerVisualizer(Region region, BossBarService bossBarService) {
         this.region = region;
-        this.minPoint = region.getBuildArea().getMinPoint(false);
-        this.maxPoint = region.getBuildArea().getMaxPoint(false);
+        this.minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+        this.maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
 
         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 && stage != Stage.SINGLE) return;
+            if (stage != Stage.RUNNING) return;
             if(!Permission.BUILD.hasPermission(p)) return;
             if (waitTime > 0) {
                 waitTime--;
@@ -149,16 +149,13 @@ public class Loader implements Listener {
     }
 
     public boolean setTicksBetweenShots(int delay) {
-        if (elements.isEmpty()) return false;
+        if (elements.size() == 0) return false;
         LoaderElement loaderElement = elements.get(elements.size() - 1);
         if (loaderElement instanceof LoaderWait) {
             ((LoaderWait) loaderElement).setDelay(delay);
-        } else {
-            LoaderWait loaderWait = new LoaderWait(delay);
-            elements.add(loaderWait);
-            pause();
+            return true;
         }
-        return true;
+        return false;
     }
 
     public void setTicksBetweenBlocks(int delay) {

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

@@ -44,6 +44,7 @@ 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/loadtimer/Loadtimer.java

@@ -22,6 +22,8 @@ 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;
@@ -156,7 +158,7 @@ public class Loadtimer implements Listener {
     }
 
     public void onTntExplode(EntityExplodeEvent event) {
-        if (region.getBuildArea().inRegion(event.getLocation(), true) && stage == Stage.IGNITION) {
+        if (region.inRegion(event.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION) && 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.getType().isGlobal()) return;
+        if (r.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.getType().isGlobal()) return;
+        if (r.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.getType().isGlobal())
+        if (r.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.getType().isGlobal()) return false;
+        if (r.isGlobal()) return false;
         if (Loadtimer.hasTimer(r)) {
             p.performCommand("lt stop");
         } else {

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

@@ -20,6 +20,7 @@
 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

@@ -1,207 +0,0 @@
-/*
- * 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,6 +34,8 @@ 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 {
 
@@ -45,31 +47,29 @@ public class ColorCommand extends SWCommand {
     }
 
     @Register(description = "REGION_COLOR_HELP_COLOR")
-    public void genericColor(@Validator Player p, ColorMode color) {
+    public void genericColor(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.getRegions().forEach(region -> {
-                region.getFlags().set(Flag.COLOR, color);
-            });
+            Region.setGlobal(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.getFlags().has(Flag.COLOR).isWritable()) {
+        if (region.isGlobal()) {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }
-        region.getFlags().set(Flag.COLOR, color);
+        region.set(Flag.COLOR, color);
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .ignoreAir(true)
                     .onlyColors(true)
-                    .color(color);
-            region.getArea().reset(pasteBuilder, false);
+                    .color(color.getColor());
+            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             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(@Validator Player p, ColorizationType colorizationType, ColorMode color) {
+    public void genericColorSet(Player p, ColorizationType colorizationType, ColorMode color) {
         genericColorSet(p, color, colorizationType);
     }
 

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

@@ -19,11 +19,13 @@
 
 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;
 
@@ -53,12 +55,14 @@ public class FireCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        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;
+        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;
         }
     }
 }

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()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getPlain(Flag.FIRE, FireMode.class) == FireMode.DENY) e.setCancelled(true);
     }
 
     @EventHandler
     public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getPlain(Flag.FIRE, FireMode.class) == 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.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);
+        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);
     }
 }

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

@@ -19,11 +19,13 @@
 
 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.FreezeMode;
+import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -53,12 +55,14 @@ public class FreezeCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        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;
+        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;
         }
     }
 }

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.FreezeMode;
+import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.core.Core;
 import de.steamwar.core.TrickyTrialsWrapper;
@@ -29,7 +29,9 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getLocation()).get(Flag.FREEZE) == FreezeMode.INACTIVE) {
+            return;
+        }
         e.setCancelled(true);
         if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -41,7 +43,8 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onBlockCanBuild(BlockCanBuildEvent e) {
         if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.INACTIVE)
+            return;
         if (e.getMaterial() == Material.TNT) {
             e.setBuildable(false);
             e.getBlock().setType(Material.TNT, false);
@@ -50,14 +53,14 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
                 BlockState state = e.getSourceBlock().getState();
                 NoteBlock noteBlock = (NoteBlock) state.getBlockData();
@@ -82,44 +85,143 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
+    @EventHandler
+    public void onNotePlay(NotePlayEvent event) {
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=45, z=98},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=44, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=97},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=97},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=96},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-108, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=45, z=98},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-104, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
+
+
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=49, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        ////[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=102},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-108, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-104, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
+    }
+
+
     @EventHandler
     public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setNewCurrent(e.getOldCurrent());
         }
     }
 
     @EventHandler
     public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onInventoryMoveEvent(InventoryMoveItemEvent e) {
-        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
@@ -128,7 +230,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     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()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
             e.getBlock().setType(Material.BARRIER, false);
             e.getBlock().setType(Material.AIR, false);
@@ -151,35 +253,35 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             e.setCancelled(true);
         }
     }
@@ -187,7 +289,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()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
             Block block = e.getClickedBlock();
             if (block.getType() == Material.LEVER) {
                 Switch data = ((Switch) block.getBlockData());
@@ -198,9 +300,9 @@ public class FreezeListener implements Listener, ScoreboardElement {
     }
 
     @EventHandler
-    public void onBlockFade(BlockFadeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
-            e.setCancelled(true);
+    public void onBlockFade(BlockFadeEvent event) {
+        if (Region.getRegion(event.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+            event.setCancelled(true);
         }
     }
 
@@ -216,7 +318,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player 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);
+        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);
     }
 }

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

@@ -19,11 +19,14 @@
 
 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.ItemMode;
+import de.steamwar.bausystem.region.flags.flagvalues.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;
@@ -55,12 +58,14 @@ public class ItemsCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        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;
+        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;
         }
     }
 }

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.ItemMode;
+import de.steamwar.bausystem.region.flags.flagvalues.ItemMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
@@ -35,9 +35,13 @@ 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 (Region.getRegion(event.getLocation()).getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
+        if (getMode(Region.getRegion(event.getLocation())) == ItemMode.INACTIVE) {
             event.setCancelled(true);
         }
     }
@@ -54,7 +58,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player 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);
+        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);
     }
 }

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.NoGravityMode;
+import de.steamwar.bausystem.region.flags.flagvalues.NoGravityMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -53,12 +53,14 @@ public class NoGravityCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        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;
+        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;
         }
     }
 }

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.NoGravityMode;
+import de.steamwar.bausystem.region.flags.flagvalues.NoGravityMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.EntityType;
@@ -34,10 +34,14 @@ 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 (Region.getRegion(event.getLocation()).getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+        if (getMode(Region.getRegion(event.getLocation())) == NoGravityMode.ACTIVE) {
             event.getEntity().setGravity(false);
         }
     }
@@ -54,7 +58,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player 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);
+        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);
     }
 }

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

@@ -20,11 +20,13 @@
 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.ProtectMode;
+import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -39,18 +41,22 @@ public class ProtectCommand extends SWCommand {
     public void genericProtectCommand(@Validator Player p) {
         Region region = regionCheck(p);
         if (region == null) return;
-        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");
+        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;
         }
     }
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
+        if (region.getFloorLevel() == 0) {
             BauSystem.MESSAGE.send("REGION_PROTECT_FALSE_REGION", player);
             return null;
         }

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

@@ -1,10 +1,9 @@
 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.ProtectMode;
+import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
@@ -22,11 +21,13 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     private void explode(List<Block> blockList, Location location) {
         Region region = Region.getRegion(location);
-        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);
+        if (region.getFloorLevel() == 0) {
+            return;
+        }
+        if (region.getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.INACTIVE) {
+            return;
+        }
+        blockList.removeIf(block -> block.getY() < region.getFloorLevel());
     }
 
     @EventHandler
@@ -51,7 +52,8 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player 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);
+        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);
     }
 }

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

@@ -32,20 +32,30 @@ 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 {
@@ -61,7 +71,7 @@ public class RegionCommand extends SWCommand {
     }
 
     static boolean checkGlobalRegion(Region region, Player p) {
-        if (region.getType().isGlobal()) {
+        if (region.isGlobal()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_REGION", p);
             return true;
         }
@@ -73,7 +83,7 @@ public class RegionCommand extends SWCommand {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) return;
 
-        if (region.getHistory().undo()) {
+        if (region.undo()) {
             RegionUtils.message(region, "REGION_REGION_UNDID");
         } else {
             BauSystem.MESSAGE.send("REGION_REGION_NOTHING_UNDO", p);
@@ -87,7 +97,7 @@ public class RegionCommand extends SWCommand {
             return;
         }
 
-        if (region.getHistory().redo()) {
+        if (region.redo()) {
             RegionUtils.message(region, "REGION_REGION_REDID");
         } else {
             BauSystem.MESSAGE.send("REGION_REGION_NOTHING_REDO", p);
@@ -100,10 +110,10 @@ public class RegionCommand extends SWCommand {
         if(checkGlobalRegion(region, p)) return;
 
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .ignoreAir(true)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
-            region.getArea().reset(pasteBuilder, false);
+                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -124,8 +134,8 @@ public class RegionCommand extends SWCommand {
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
                     .ignoreAir(true)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
-            region.getArea().reset(pasteBuilder, false);
+                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -139,11 +149,11 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getBuildArea().isEmpty()) {
+        if (region.getCopyPoint() == null) {
             BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
             return;
         }
-        p.teleport(region.getBuildArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
+        p.teleport(region.getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
         BauSystem.MESSAGE.send("REGION_REGION_TP_COPY", p);
     }
 
@@ -154,33 +164,70 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getTestblockArea().isEmpty()) {
+        if (region.getTestBlockPoint() == null) {
             BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
             return;
         }
-        p.teleport(region.getTestblockArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
+        p.teleport(region.getTestBlockPoint().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.getBuildArea().isEmpty()) {
+        if (!region.hasType(RegionType.BUILD)) {
             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.getBuildArea().getMinPoint(false);
-        Point maxPoint = region.getBuildArea().getMaxPoint(false);
+        Point minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+        Point maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
         switch (option) {
             case 0:
                 break;
             case 1:
-                minPoint = region.getBuildArea().getMinPoint(true);
-                maxPoint = region.getBuildArea().getMaxPoint(true);
+                minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
+                maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
                 break;
             case 2:
                 Pair<Location, Location> selection = WorldEditUtils.getSelection(p);
@@ -191,7 +238,7 @@ public class RegionCommand extends SWCommand {
                 break;
         }
 
-        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getBuildArea().getCopyPoint());
+        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getCopyPoint());
         WorldEdit.getInstance()
                 .getSessionManager()
                 .get(BukkitAdapter.adapt(p))
@@ -205,10 +252,14 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getBuildArea().isEmpty()) {
+        if (!region.hasType(RegionType.BUILD)) {
             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()
@@ -236,13 +287,13 @@ public class RegionCommand extends SWCommand {
         }
 
         try (EditSession e = WorldEditUtils.getEditSession(p)) {
-            Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getBuildArea().getCopyPoint())).build());
+            Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.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.getBuildArea().getCopyPoint()));
-                BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
+                BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getCopyPoint()));
+                BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getCopyPoint()));
                 FlatteningWrapper.impl.setSelection(p, Point.fromBlockVector3(minPointSelection), Point.fromBlockVector3(maxPointSelection));
             }
             BauSystem.MESSAGE.send("REGION_REGION_PASTE_DONE", p);
@@ -252,4 +303,25 @@ 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,8 +21,7 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.ChangedMode;
-import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.tags.Tag;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -181,7 +180,13 @@ public class RegionListener implements Listener {
         }
     }
 
+
     private static void tagChangedRegion(final Location location) {
-        Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                Region.getRegion(location).set(Tag.CHANGED);
+            }
+        }.runTaskAsynchronously(BauSystem.getInstance());
     }
 }

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

@@ -20,16 +20,12 @@
 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 {
 
@@ -45,10 +41,7 @@ public class RegionScoreboardElement implements ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        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);
+        if (GlobalRegion.getInstance() == region) return null;
+        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getDisplayName();
     }
 }

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

@@ -21,10 +21,13 @@ 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;
@@ -52,11 +55,12 @@ public class ResetCommand extends SWCommand {
         Region region = regionCheck(p);
         if (region == null) return;
         try {
-            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();
+            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());
+            }
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
@@ -84,8 +88,8 @@ public class ResetCommand extends SWCommand {
         }
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
-            region.getArea().reset(pasteBuilder, true);
+                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
@@ -95,7 +99,7 @@ public class ResetCommand extends SWCommand {
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region == RegionSystem.INSTANCE.getGlobalRegion()) {
+        if (region == GlobalRegion.getInstance()) {
             BauSystem.MESSAGE.send("REGION_RESET_NO_REGION", player);
             return null;
         }

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

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

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

@@ -23,7 +23,9 @@ 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.TNTMode;
+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.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
@@ -35,6 +37,7 @@ 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 {
@@ -42,14 +45,27 @@ public class TNTListener implements Listener, ScoreboardElement {
     private void explode(List<Block> blockList) {
         blockList.removeIf(block -> {
             Region region = Region.getRegion(block.getLocation());
-            TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
+            TNTMode value = region.getPlain(Flag.TNT);
             if (value == TNTMode.ALLOW) {
                 return false;
             } else if (value == TNTMode.ONLY_TB) {
-                if (region.getBuildArea().inRegion(block.getLocation(), true)) {
+                if (region.hasType(RegionType.BUILD) && region.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.NORMAL)) {
                     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;
         });
@@ -77,7 +93,6 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player 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);
+        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.TNT).getChatValue(), p);
     }
 }

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

@@ -20,18 +20,21 @@
 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;
@@ -40,8 +43,10 @@ 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;
@@ -93,44 +98,15 @@ 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.getFlags().get(Flag.COLOR).getWithDefault());
-            region.getTestblockArea().reset(pasteBuilder, regionExtensionType == RegionExtensionType.EXTENSION);
+                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            region.reset(pasteBuilder, RegionType.TESTBLOCK, regionExtensionType);
             RegionUtils.message(region, "REGION_TB_DONE");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_TB_ERROR", p);
@@ -183,7 +159,7 @@ public class TestblockCommand extends SWCommand {
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getTestblockArea().isEmpty()) {
+        if (!region.hasType(RegionType.TESTBLOCK)) {
             BauSystem.MESSAGE.send("REGION_TB_NO_REGION", player);
             return null;
         }

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

@@ -22,9 +22,10 @@ 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;
@@ -44,7 +45,7 @@ public class ColorBauGuiItem extends BauGuiItem {
         super(2);
     }
 
-    private static Material mapColor(ColorMode color) {
+    private static Material mapColor(Color color) {
         switch (color) {
             case RED:
                 return Material.RED_CONCRETE;
@@ -84,17 +85,17 @@ public class ColorBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        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();
+        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();
     }
 
     @Override
     public boolean click(ClickType click, Player p) {
         p.closeInventory();
-        ColorMode current = Region.getRegion(p.getLocation()).getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode current = Region.getRegion(p.getLocation()).getPlain(Flag.COLOR, ColorMode.class);
         List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
         for (ColorMode value : ColorMode.values()) {
-            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
+            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (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,10 +42,7 @@ public class FireBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.FIRE).isApplicable()) {
-            return new SWItem(Material.BARRIER, "").getItemStack();
-        }
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+        if (region.getPlain(Flag.FIRE, FireMode.class) == 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.FreezeMode;
+import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -42,10 +42,7 @@ public class FreezeBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.FREEZE).isApplicable()) {
-            return new SWItem(Material.BARRIER, "").getItemStack();
-        }
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (region.getPlain(Flag.FREEZE, FreezeMode.class) == 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.ProtectMode;
+import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -43,10 +43,7 @@ public class ProtectBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
-            return new SWItem(Material.BARRIER, "").getItemStack();
-        }
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+        if (region.getPlain(Flag.PROTECT, ProtectMode.class) == 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,7 +24,8 @@ 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.TNTMode;
+import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
+import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -42,11 +43,13 @@ public class TntBauGuiItem extends BauGuiItem {
 
     @Override
     public ItemStack getItem(Player player) {
-        switch (Region.getRegion(player.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
+        switch (Region.getRegion(player.getLocation()).getPlain(Flag.TNT, TNTMode.class)) {
             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();
         }
@@ -55,12 +58,12 @@ public class TntBauGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         if (click == ClickType.LEFT) {
-            switch (Region.getRegion(p.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
+            switch (Region.getRegion(p.getLocation()).getPlain(Flag.TNT, TNTMode.class)) {
                 case DENY:
                     updateTntMode(TNTMode.ALLOW, p);
                     break;
                 case ALLOW:
-                    if (!Region.getRegion(p.getLocation()).getBuildArea().isEmpty() && !Region.getRegion(p.getLocation()).getTestblockArea().isEmpty()) {
+                    if (Region.getRegion(p.getLocation()).hasType(RegionType.BUILD) && Region.getRegion(p.getLocation()).hasType(RegionType.TESTBLOCK)) {
                         updateTntMode(TNTMode.ONLY_TB, p);
                         break;
                     }
@@ -74,11 +77,15 @@ public class TntBauGuiItem extends BauGuiItem {
                 updateTntMode(TNTMode.ALLOW, p);
                 p.closeInventory();
             }));
-            if (!Region.getRegion(p.getLocation()).getBuildArea().isEmpty() && !Region.getRegion(p.getLocation()).getTestblockArea().isEmpty()) {
+            if (Region.getRegion(p.getLocation()).hasType(RegionType.BUILD) && Region.getRegion(p.getLocation()).hasType(RegionType.TESTBLOCK)) {
                 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);
@@ -94,6 +101,9 @@ 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,6 +22,7 @@ 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,6 +28,7 @@ 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.getArea().inRegion(player.getLocation(), false)) {
+            if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
                 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.getBuildArea().inRegion(block.getLocation(), true));
+        boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION));
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
+            if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
                 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,14 +22,19 @@ 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;
@@ -42,6 +47,8 @@ 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;
 

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

@@ -20,17 +20,19 @@
 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.RegionSystem;
-import de.steamwar.bausystem.region.flags.*;
+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.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
@@ -44,29 +46,27 @@ public class RegionLib implements LuaLib {
     private LuaTable create(Supplier<Region> region, Player player) {
         LuaTable table = LuaValue.tableOf();
 
-        table.set("name", getter(() -> region.get().getID().toString()));
-        table.set("id", getter(() -> region.get().getID().toString()));
+        table.set("name", getter(() -> region.get().getName()));
         table.set("type", getter(() -> {
-            Region rg = region.get();
-            if (rg.getType().isGlobal()) {
+            Region region1 = region.get();
+            if (region1 instanceof GlobalRegion) {
                 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().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));
+        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));
+
         table.set("tnt", tntLib);
 
-        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));
+        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));
 
         //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().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))));
+        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())));
 
         return table;
     }
@@ -99,11 +99,11 @@ public class RegionLib implements LuaLib {
         table.set("get", new OneArgFunction() {
             @Override
             public LuaValue call(LuaValue arg) {
-                return create(() -> RegionSystem.INSTANCE.getRegion(UUID.fromString(arg.checkjstring())).orElse(RegionSystem.INSTANCE.getGlobalRegion()), player);
+                return create(() -> Region.getREGION_MAP().get(arg.checkjstring()), player);
             }
         });
 
-        table.set("list", getter(() -> LuaValue.listOf(RegionSystem.INSTANCE.getRegions().map(region -> create(() -> region, player)).toArray(LuaTable[]::new))));
+        table.set("list", getter(() -> LuaValue.listOf(Region.getREGION_MAP().values().stream().map(region -> create(() -> region, player)).toArray(LuaTable[]::new))));
 
         return table;
     }

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

@@ -24,7 +24,9 @@ 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,6 +21,7 @@ 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,7 +21,6 @@ package de.steamwar.bausystem.features.script.lua.libs;
 
 import com.google.gson.*;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.core.Core;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Disable;
@@ -75,7 +74,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                 jsonObject.keySet().forEach(key -> {
                     map.put(key, fromJson(jsonObject.get(key)));
                 });
-                Region region = RegionSystem.INSTANCE.getRegion(UUID.fromString(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length()))).orElse(null);
+                Region region = Region.getREGION_MAP().get(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length()));
                 REGION_STORAGE.put(region, map);
             } catch (Exception e) {}
         }
@@ -144,7 +143,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().getID().toString() + ".json"));
+                FileWriter fileWriter = new FileWriter(new File(regionStorageDirectory, entry.getKey().getName() + ".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,7 +20,6 @@
 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;
@@ -52,7 +51,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(() -> (double) TickManager.impl.getTickRate()));
+        tpsLib.set("limit", getter(TPSSystem::getCurrentTPSLimit));
         return tpsLib;
     }
 }

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.getType().isGlobal()) {
+        if (region.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.getType().isGlobal()) {
+        if (region.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.getType().isGlobal()) {
+            if (region.isGlobal()) {
                 messageSender.send("SHIELD_PRINTING_NO_REGION", player);
                 return false;
             }

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

@@ -23,6 +23,7 @@ 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

@@ -23,6 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
+import de.steamwar.bausystem.features.simulator.preview.SimulatorPreviewCalculator;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -30,6 +31,7 @@ import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.linkage.MinVersion;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -76,7 +78,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(p, simulator, null);
+        SimulatorExecutor.run(simulator, () -> {});
     }
 
     @Register(value = "rename", description = "SIMULATOR_RENAME_HELP")
@@ -90,6 +92,20 @@ public class SimulatorCommand extends SWCommand {
         }
     }
 
+    @Register(value = "test")
+    public void test(Player player) {
+        for (int i = 0; i < 1; i++) {
+            SimulatorPreviewCalculator data = new SimulatorPreviewCalculator(null);
+            data.spawnTNT(0, 166, 0);
+            data.calculate(simulatorPreviewResult -> {
+                simulatorPreviewResult.show(player);
+                Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                    simulatorPreviewResult.hide(player);
+                }, 100);
+            });
+        }
+    }
+
     @ClassMapper(value = Simulator.class, local = true)
     public TypeMapper<Simulator> allSimulators() {
         return new TypeMapper<>() {

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

@@ -19,8 +19,8 @@
 
 package de.steamwar.bausystem.features.simulator;
 
-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.Reflection;
+import com.comphenix.tinyprotocol.TinyProtocol;
 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 static final World WORLD = Bukkit.getWorlds().get(0);
+    private 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 static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
-    private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
-    private static final Set<Player> calculating = new HashSet<>();
+    private Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
+    private Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
+    private 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(SimulatorCursor::calcCursor);
+        event.getChanged().forEach(this::calcCursor);
     }
 
     @EventHandler
@@ -147,28 +147,14 @@ public class SimulatorCursor implements Listener {
             return;
         }
         if (LAST_SNEAKS.containsKey(player)) {
-            CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
-            if (currentType == CursorType.TNT) {
-                cursorType.put(player, CursorType.REDSTONE_BLOCK);
-            } else {
-                cursorType.put(player, CursorType.TNT);
-            }
+            cursorType.put(player, cursorType.getOrDefault(player, CursorType.TNT).switchType());
             calcCursor(player);
         } else {
             LAST_SNEAKS.put(player, System.currentTimeMillis());
         }
     }
 
-    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) {
+    public void calcCursor(Player player) {
         synchronized (calculating) {
             if (calculating.contains(player)) return;
             calculating.add(player);
@@ -216,7 +202,7 @@ public class SimulatorCursor implements Listener {
         }
     }
 
-    private static synchronized boolean removeCursor(Player player) {
+    private synchronized boolean removeCursor(Player player) {
         REntityServer entityServer = cursors.get(player);
         boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
         if (entityServer != null) {
@@ -225,7 +211,7 @@ public class SimulatorCursor implements Listener {
         return hadCursor;
     }
 
-    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
+    private synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
         REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
             REntityServer rEntityServer = new REntityServer();
             rEntityServer.addPlayer(player);
@@ -345,16 +331,25 @@ public class SimulatorCursor implements Listener {
     @Getter
     @AllArgsConstructor
     public enum CursorType {
-        TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
+        TNT(Material.TNT, 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())),
         ;
 
-        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;
+        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;
+        }
     }
 
     @EventHandler
@@ -372,7 +367,7 @@ public class SimulatorCursor implements Listener {
             if (simulator == null) {
                 return;
             }
-            SimulatorExecutor.run(event.getPlayer(), simulator, null);
+            SimulatorExecutor.run(simulator, () -> {});
             return;
         }
 

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

@@ -40,10 +40,8 @@ public final class Simulator {
     private SimulatorStabGenerator stabGenerator = null;
     private Material material = Material.BARREL;
     private final String name;
-    private final List<SimulatorGroup> groups = new ArrayList<>();
-
     private boolean autoTrace = false;
-    private boolean autoTestblock = false;
+    private final List<SimulatorGroup> groups = new ArrayList<>();
 
     public void move(int x, int y, int z) {
         groups.forEach(simulatorGroup -> {

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

@@ -33,6 +33,7 @@ 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,6 +25,8 @@ 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.FreezeMode;
+import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -65,7 +65,7 @@ public final class TNTPhase extends SimulatorPhase {
             @Override
             public void accept(World world) {
                 Location location = position.toLocation(world);
-                if (Region.getRegion(location).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
+                if (Region.getRegion(location).get(Flag.FREEZE) == 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/SimulatorExecutor.java

@@ -31,7 +31,6 @@ 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;
 
@@ -47,7 +46,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(Player player, Simulator simulator, Runnable onEnd) {
+    public static boolean run(Simulator simulator, Runnable onEnd) {
         if (currentlyRunning.contains(simulator)) return false;
         currentlyRunning.add(simulator);
 
@@ -84,15 +83,10 @@ public class SimulatorExecutor implements Listener {
                                     });
                         }
 
-                        if (onEnd != null) {
-                            onEnd.run();
-                        }
+                        onEnd.run();
                     }
                 });
 
-        if (player != null && simulator.isAutoTestblock()) {
-            player.performCommand("tb");
-        }
         if (simulator.isAutoTrace() && onEnd == null) {
             simulator.getGroups()
                     .stream()

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

@@ -45,7 +45,7 @@ public class StabDirection extends StabStep {
     @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());
+            e.setBlocks((com.sk89q.worldedit.regions.Region) new CuboidRegion(data.region.getMinPointTestblockExtension().toBlockVector3(), data.region.getMaxPointTestblockExtension().toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
         }
 
         Trace trace = TraceRecorder.instance.startRecording(data.region);

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

@@ -19,8 +19,12 @@
 
 package de.steamwar.bausystem.features.simulator.execute;
 
+import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 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.bausystem.utils.bossbar.BauSystemBossbar;
 
@@ -34,11 +38,9 @@ public class StabFinalizer extends StabStep {
     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);
+            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
+                    .color(data.region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
         } catch (SecurityException e) {
             stop();
             throw e;

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

@@ -22,6 +22,9 @@ 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.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.bausystem.utils.bossbar.BauSystemBossbar;
 import org.bukkit.Bukkit;
@@ -53,8 +56,7 @@ public class StabGenerator extends StabStep implements Listener {
     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;
+                if (!data.region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
                 int component = data.direction.component.apply(block.getLocation().toVector());
                 destroyedBlocksPerSlice.computeIfAbsent(component, __ -> new HashSet<>())
                         .add(block.getLocation());
@@ -70,11 +72,9 @@ public class StabGenerator extends StabStep implements Listener {
     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);
+            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
+                    .color(data.region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
         } catch (SecurityException e) {
             stop();
             throw e;

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

@@ -72,7 +72,7 @@ public class StabSetup extends StabStep {
         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());
+        data.clipboard = FlatteningWrapper.impl.copy(data.region.getMinPointTestblockExtension(), data.region.getMaxPointTestblockExtension(), data.region.getTestBlockPoint());
 
         new StabDirection(data);
     }

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

@@ -58,7 +58,7 @@ public abstract class StabStep {
     protected abstract void start();
 
     protected final void runSimulator(Runnable onFinish) {
-        SimulatorExecutor.run(null, data.simulator, () -> {
+        SimulatorExecutor.run(data.simulator, () -> {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (this instanceof Listener) {
                     HandlerList.unregisterAll((Listener) this);

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

@@ -1,67 +0,0 @@
-/*
- * 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/SimulatorGui.java

@@ -19,7 +19,6 @@
 
 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;
@@ -50,11 +49,7 @@ public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
         inventory.setItem(4, simulator.toItem(player, clickType -> {
             new SimulatorMaterialGui(player, simulator, simulator::getMaterial, simulator::setMaterial, 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 -> {
+        inventory.setItem(49, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorSettingsGui(player, simulator, this).open();
         }).setCustomModelData(CMDs.Simulator.SETTINGS));
     }

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

@@ -56,14 +56,10 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
         }));
 
         //AutoTrace
-        inventory.setItem(19, new SWItem(simulator.isAutoTrace() ? Material.CHAIN_COMMAND_BLOCK : Material.COMMAND_BLOCK, "§eAutoTrace§8: " + (simulator.isAutoTrace() ? "§aOn" : "§cOff"), clickType -> {
+        inventory.setItem(20, new SWItem(simulator.isAutoTrace() ? Material.CHAIN_COMMAND_BLOCK : Material.COMMAND_BLOCK, "§eAutoTrace§8: " + (simulator.isAutoTrace() ? "§aOn" : "§cOff"), clickType -> {
             simulator.setAutoTrace(!simulator.isAutoTrace());
             SimulatorWatcher.update(simulator);
         }));
-        inventory.setItem(20, new SWItem(simulator.isAutoTestblock() ? Material.END_STONE : Material.BARRIER, "§eTestblock§8: " + (simulator.isAutoTestblock() ? "§aOn" : "§cOff"), clickType -> {
-            simulator.setAutoTestblock(!simulator.isAutoTestblock());
-            SimulatorWatcher.update(simulator);
-        }));
 
         //Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreview.java

@@ -0,0 +1,23 @@
+/*
+ * 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.preview;
+
+public class SimulatorPreview {
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreviewAABB.java

@@ -0,0 +1,76 @@
+/*
+ * 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.preview;
+
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import org.bukkit.util.BoundingBox;
+import org.bukkit.util.VoxelShape;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@ToString
+public class SimulatorPreviewAABB {
+    public double minX;
+    public double minY;
+    public double minZ;
+    public double maxX;
+    public double maxY;
+    public double maxZ;
+
+    public SimulatorPreviewAABB copy() {
+        return new SimulatorPreviewAABB(minX, minY, minZ, maxX, maxY, maxZ);
+    }
+
+    public void expandTowards(double vx, double vy, double vz) {
+        if (vx < 0) {
+            minX += vx;
+        } else {
+            maxX += vx;
+        }
+        if (vy < 0) {
+            minY += vy;
+        } else {
+            maxY += vy;
+        }
+        if (vz < 0) {
+            minZ += vz;
+        } else {
+            maxZ += vz;
+        }
+    }
+
+    public void add(double vx, double vy, double vz) {
+        minX += vx;
+        minY += vy;
+        minZ += vz;
+    }
+
+    public boolean intersects(double x, double y, double z, BoundingBox boundingBox) {
+        return minX - (x + boundingBox.getMaxX()) < -1.0E-7 &&
+                maxX - (x + boundingBox.getMinX()) > 1.0E-7 &&
+                minY - (y + boundingBox.getMaxY()) < -1.0E-7 &&
+                maxY - (y + boundingBox.getMinY()) > 1.0E-7 &&
+                minZ - (z + boundingBox.getMaxZ()) < -1.0E-7 &&
+                maxZ - (z + boundingBox.getMinZ()) > 1.0E-7;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreviewCalculator.java

@@ -0,0 +1,114 @@
+/*
+ * 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.preview;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.tracer.TNTPoint;
+import de.steamwar.bausystem.features.tracer.Trace;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.util.Consumer;
+import org.bukkit.util.Vector;
+import org.bukkit.util.VoxelShape;
+
+import java.util.*;
+
+@RequiredArgsConstructor
+public class SimulatorPreviewCalculator {
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+
+    public final Simulator simulator;
+    public final List<SimulatorPreviewTNT> tnts = new ArrayList<>();
+
+    private int ticks = 0;
+    private final Set<SimulatorPreviewPos> air = new HashSet<>();
+    private final Map<SimulatorPreviewPos, BlockData> datas = new HashMap<>();
+    private final Map<SimulatorPreviewPos, VoxelShape> shapes = new HashMap<>();
+
+    public BlockData getBlockData(int x, int y, int z) {
+        SimulatorPreviewPos pos = new SimulatorPreviewPos(x, y, z);
+        if (air.contains(pos)) return null;
+        return datas.computeIfAbsent(pos, __ -> {
+            BlockData blockData = WORLD.getBlockData(x, y, z);
+            if (blockData.getMaterial().isAir()) {
+                air.add(pos);
+                return null;
+            }
+            return blockData;
+        });
+    }
+
+    public VoxelShape getBlockShape(int x, int y, int z) {
+        SimulatorPreviewPos pos = new SimulatorPreviewPos(x, y, z);
+        if (air.contains(pos)) return null;
+        return shapes.computeIfAbsent(pos, __ -> {
+            Block block = WORLD.getBlockAt(x, y, z);
+            if (block.getType().isAir()) {
+                air.add(pos);
+                return null;
+            }
+            return block.getCollisionShape();
+        });
+    }
+
+    public void setAir(int x, int y, int z) {
+        SimulatorPreviewPos pos = new SimulatorPreviewPos(x, y, z);
+        air.add(pos);
+        datas.remove(pos);
+        shapes.remove(pos);
+    }
+
+    public void spawnTNT(double x, double y, double z) {
+        tnts.add(new SimulatorPreviewTNT(this, x, y, z));
+    }
+
+    public void calculate(Consumer<SimulatorPreviewResult> result) {
+        List<TNTPoint> tntPoints = new ArrayList<>();
+        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), bukkitTask -> {
+            long time = System.currentTimeMillis();
+            while (!tnts.isEmpty()) {
+                if (System.currentTimeMillis() - time > 40) {
+                    return;
+                }
+                tick(tntPoints);
+            }
+            bukkitTask.cancel();
+            System.out.println(tntPoints);
+            result.accept(new SimulatorPreviewResult(new Trace(null, tntPoints), air));
+        }, 1, 1);
+    }
+
+    private void tick(List<TNTPoint> tntPoints) {
+        System.out.println("TICK");
+        tnts.removeIf(simulatorPreviewTNT -> {
+            tntPoints.add(new TNTPoint(0, false, false, true, false, false, ticks, simulatorPreviewTNT.fuse, new Location(WORLD, simulatorPreviewTNT.x + 0.49, simulatorPreviewTNT.y, simulatorPreviewTNT.z + 0.49), new Vector(simulatorPreviewTNT.vx, simulatorPreviewTNT.vy, simulatorPreviewTNT.vz), tntPoints));
+            simulatorPreviewTNT.tick();
+            if (!simulatorPreviewTNT.removed) return false;
+            tntPoints.add(new TNTPoint(0, true, false, true, false, false, ticks, simulatorPreviewTNT.fuse, new Location(WORLD, simulatorPreviewTNT.x + 0.49, simulatorPreviewTNT.y, simulatorPreviewTNT.z + 0.49), new Vector(simulatorPreviewTNT.vx, simulatorPreviewTNT.vy, simulatorPreviewTNT.vz), tntPoints));
+            return true;
+        });
+        ticks++;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreviewPos.java

@@ -0,0 +1,31 @@
+/*
+ * 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.preview;
+
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@EqualsAndHashCode
+final class SimulatorPreviewPos {
+    public final int x;
+    public final int y;
+    public final int z;
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreviewResult.java

@@ -0,0 +1,61 @@
+/*
+ * 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.preview;
+
+import de.steamwar.bausystem.features.tracer.Trace;
+import de.steamwar.bausystem.features.tracer.rendering.BundleFilter;
+import de.steamwar.bausystem.features.tracer.rendering.PlayerTraceShowData;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+
+import java.util.Set;
+
+@Getter
+public class SimulatorPreviewResult {
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+    private static final BlockData AIR = Material.AIR.createBlockData();
+
+    private final Trace trace;
+    private final Set<SimulatorPreviewPos> air;
+
+    public SimulatorPreviewResult(Trace trace, Set<SimulatorPreviewPos> air) {
+        this.trace = trace;
+        this.air = air;
+    }
+
+    public void show(Player player) {
+        trace.render(player, new PlayerTraceShowData(BundleFilter.DEFAULT));
+        air.forEach(simulatorPreviewPos -> {
+            player.sendBlockChange(new Location(WORLD, simulatorPreviewPos.x, simulatorPreviewPos.y, simulatorPreviewPos.z, 0, 0), AIR);
+        });
+    }
+
+    public void hide(Player player) {
+        trace.hide(player);
+        air.forEach(simulatorPreviewPos -> {
+            player.sendBlockChange(new Location(WORLD, simulatorPreviewPos.x, simulatorPreviewPos.y, simulatorPreviewPos.z, 0, 0), WORLD.getBlockData(simulatorPreviewPos.x, simulatorPreviewPos.y, simulatorPreviewPos.z));
+        });
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreviewTNT.java

@@ -0,0 +1,228 @@
+/*
+ * 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.preview;
+
+import org.bukkit.Axis;
+import org.bukkit.util.BoundingBox;
+import org.bukkit.util.Vector;
+import org.bukkit.util.VoxelShape;
+
+import java.util.Random;
+
+public class SimulatorPreviewTNT {
+
+    private static final double size = 0.98;
+    private static final Random random = new Random();
+
+    private final SimulatorPreviewCalculator data;
+    private boolean gravity = true;
+    int fuse = 80;
+    double x;
+    double y;
+    double z;
+    double vx;
+    double vy;
+    double vz;
+
+    private SimulatorPreviewVec collide = new SimulatorPreviewVec();
+    private boolean onGround;
+    boolean removed = false;
+
+    public SimulatorPreviewTNT(SimulatorPreviewCalculator data, double x, double y, double z) {
+        this.data = data;
+
+        this.x = x;
+        this.y = y;
+        this.z = z;
+
+        double d = random.nextDouble() * Math.PI * 2;
+        this.vx = -Math.sin(d) * 0.02;
+        this.vy = 0.2;
+        this.vz = -Math.cos(d) * 0.02;
+    }
+
+    public void tick() {
+        System.out.println(x + " " + y + " " + z);
+        // TODO: Issue in movement still!
+        // System.out.println(x + " " + y + " " + z);
+        // Gravity
+        if (gravity) {
+            vy -= 0.04;
+        }
+
+        // Movement
+        move();
+
+        // TODO: EffectsFromOtherBlocks
+
+        // Velocity * 0.98
+        vx *= 0.98;
+        vy *= 0.98;
+        vz *= 0.98;
+
+        // OnGround Velocity * 0.7 -0.5 0.7
+        if (onGround) {
+            vx *= 0.7;
+            vy *= -0.5;
+            vz *= 0.7;
+        }
+
+        // Decrease Fuse
+        fuse--;
+        if (fuse <= 0) {
+            // Explode on zero Fuse
+            explode();
+        } else {
+            // TODO: or do water Movement!
+        }
+    }
+
+    public void move() {
+        collide();
+        double collisionLengthSquared = collide.lengthSquared();
+        if (collisionLengthSquared > 1.0E-7 || new Vector(vx, vy, vz).lengthSquared() - collisionLengthSquared < 1.0E-7) {
+            x += collide.x;
+            y += collide.y;
+            z += collide.z;
+        }
+
+        boolean xCollision = !equal(vx, collide.x);
+        boolean zCollision = !equal(vz, collide.z);
+        boolean horizontalCollision = xCollision || zCollision;
+        if (Math.abs(vy) > 0.0F) {
+            boolean verticalCollision = vy != collide.y;
+            onGround = verticalCollision && vy < (double) 0.0F;
+        }
+
+        if (horizontalCollision) {
+            if (xCollision) vx = 0;
+            if (zCollision) vz = 0;
+        }
+        vx = collide.x;
+        vy = collide.y;
+        vz = collide.z;
+        // TODO: Get Block -> updateEntityMovementAfterFallOn!
+        // TODO: Get BlockSpeedFactor multiply
+    }
+
+    public static boolean equal(double first, double second) {
+        return Math.abs(second - first) < (double) 1.0E-5F;
+    }
+
+    public void collide() {
+        boolean xZero = vx == 0;
+        boolean zZero = vz == 0;
+        if (xZero && vy == 0 && zZero) {
+            collide.x = 0;
+            collide.y = 0;
+            collide.z = 0;
+            return;
+        }
+        SimulatorPreviewAABB box = new SimulatorPreviewAABB(x, y, z, x + size, y + size, z + size);
+
+        double vx = this.vx;
+        double vy = this.vy;
+        double vz = this.vz;
+
+        if (vy != 0) {
+            vy = iterateBlocks(box.copy(), Axis.Y, vy);
+            if (vy != 0) box.add(0, vy, 0);
+        }
+
+        boolean xSmaller = Math.abs(vx) < Math.abs(vz);
+        if (xSmaller && vz != 0) {
+            vz = iterateBlocks(box.copy(), Axis.Z, vz);
+            if (vz != 0) box.add(0, 0, vz);
+        }
+
+        if (vx != 0) {
+            vx = iterateBlocks(box.copy(), Axis.X, vx);
+            if (vx != 0) box.add(vx, 0, 0);
+        }
+
+        if (!xSmaller && vz != 0) {
+            vz = iterateBlocks(box.copy(), Axis.Z, vz);
+            if (vz != 0) box.add(0, 0, vz);
+        }
+
+        collide.x = vx;
+        collide.y = vy;
+        collide.z = vz;
+    }
+
+    private double iterateBlocks(SimulatorPreviewAABB box, Axis axis, double v) {
+        switch (axis) {
+            case X -> box.expandTowards(v, 0, 0);
+            case Y -> box.expandTowards(0, v, 0);
+            case Z -> box.expandTowards(0, 0, v);
+        }
+        boolean negative = v < 0;
+        for (int x = floor(box.minX - 1.0E-7) - 1; x < floor(box.maxX + 1.0E-7) + 1; x++) {
+            for (int y = floor(box.minY - 1.0E-7) - 1; y < floor(box.maxY + 1.0E-7) + 1; y++) {
+                for (int z = floor(box.minZ - 1.0E-7) - 1; z < floor(box.maxZ + 1.0E-7) + 1; z++) {
+                    VoxelShape shape = data.getBlockShape(x, y, z);
+                    if (shape == null) continue;
+                    for (BoundingBox other : shape.getBoundingBoxes()) {
+                        switch (axis) {
+                            case X -> {
+                                if (box.intersects(x, y, z, other)) {
+                                    if (negative) {
+                                        v = Math.max(v, x + other.getMaxX() - this.x);
+                                    } else {
+                                        v = Math.min(v, x + other.getMinX() - this.x - size);
+                                    }
+                                }
+                            }
+                            case Y -> {
+                                if (box.intersects(x, y, z, other)) {
+                                    if (negative) {
+                                        v = Math.max(v, y + other.getMaxY() - this.y);
+                                    } else {
+                                        v = Math.min(v, y + other.getMinY() - this.y - size);
+                                    }
+                                }
+                            }
+                            case Z -> {
+                                if (box.intersects(x, y, z, other)) {
+                                    if (negative) {
+                                        v = Math.max(v, z + other.getMaxZ() - this.z);
+                                    } else {
+                                        v = Math.min(v, z + other.getMinZ() - this.z - size);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return v;
+    }
+
+    public static int floor(double value) {
+        int i = (int) value;
+        return value < (double) i ? i - 1 : i;
+    }
+
+    public void explode() {
+        removed = true;
+        // TODO: Implement
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/preview/SimulatorPreviewVec.java

@@ -0,0 +1,30 @@
+/*
+ * 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.preview;
+
+public class SimulatorPreviewVec {
+    public double x;
+    public double y;
+    public double z;
+
+    public double lengthSquared() {
+        return x * x + y * y + z * z;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java

@@ -68,7 +68,6 @@ public class SimFormatSimulatorLoader implements SimulatorLoader {
     private void loadSimulator(YAPIONObject simulatorObject, Simulator simulator) {
         simulator.setMaterial(Material.valueOf(simulatorObject.getPlainValue("material")));
         simulator.setAutoTrace(simulatorObject.getPlainValue("autoTrace"));
-        simulator.setAutoTestblock(simulatorObject.getPlainValueOrDefault("autoTestblock", false));
 
         YAPIONArray groups = simulatorObject.getArray("groups");
         groups.streamObject().forEach(groupObject -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java

@@ -39,7 +39,6 @@ public class SimulatorSaver {
         YAPIONObject simulatorObject = new YAPIONObject();
         simulatorObject.add("material", simulator.getMaterial().name());
         simulatorObject.add("autoTrace", simulator.isAutoTrace());
-        simulatorObject.add("autoTestblock", simulator.isAutoTestblock());
 
         YAPIONArray groups = new YAPIONArray();
         simulator.getGroups().forEach(group -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java

@@ -20,10 +20,12 @@
 package de.steamwar.bausystem.features.slaves.laufbau;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java

@@ -20,12 +20,14 @@
 package de.steamwar.bausystem.features.slaves.panzern;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 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.Bukkit;
 import org.bukkit.Location;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java

@@ -19,10 +19,11 @@
 
 package de.steamwar.bausystem.features.team;
 
-import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.team.boundary.BoundaryViewer;
+import de.steamwar.bausystem.region.Prototype;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -68,14 +69,14 @@ public class SkinCommand extends SWCommand {
             return;
         }
         Region region = Region.getRegion(p.getLocation());
-        if (region.getType().isGlobal()) {
+        if (region.isGlobal()) {
             BauSystem.MESSAGE.send("SKIN_NO_REGION", p);
             return;
         }
 
         String name = String.join(" ", names);
         File arenaFile = new File("sections19/" + name + "/" + typeKuerzel + "Arena.schem");
-        File testblockFile = !region.getTestblockArea().isEmpty() ? new File("sections19/" + name + "/" + typeKuerzel + "Testblock.schem") : null;
+        File testblockFile = region.hasType(RegionType.TESTBLOCK) ? new File("sections19/" + name + "/" + typeKuerzel + "Testblock.schem") : null;
 
         arenaFile.getParentFile().mkdirs();
         if (testblockFile != null) {
@@ -90,11 +91,9 @@ public class SkinCommand extends SWCommand {
             return;
         }
 
-        EditSession editSession = region.getArea().copy(false);
-        // TODO: Save editSession to file
+        Region.copy(region.getMinPoint(), region.getMaxPoint(), arenaFile);
         if (testblockFile != null) {
-            editSession = region.getTestblockArea().copy(false);
-            // TODO: Save editSession to file
+            Region.copy(region.getMinPointTestblock(), region.getMaxPointTestblock(), testblockFile);
         }
 
         YAPIONObject yapionObject = new YAPIONObject();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java

@@ -22,7 +22,9 @@ package de.steamwar.bausystem.features.team.boundary;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.core.TrickyParticleWrapper;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Particle;
@@ -46,19 +48,22 @@ public class BoundaryViewer implements Listener {
             }
             viewers.forEach(player -> {
                 Region region = Region.getRegion(player.getLocation());
-                if (region.getType().isGlobal()) return;
+                if (region.isGlobal()) return;
                 showRegion(region, player);
+                if (region.getLinkedRegion() != null) {
+                    showRegion(region.getLinkedRegion(), player);
+                }
             });
         }, 20, 20);
     }
 
     private void showRegion(Region region, Player player) {
-        drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getArea().getMinPoint(false), region.getArea().getMaxPoint(false));
-        if (!region.getTestblockArea().isEmpty()) {
-            drawCuboid(player, Particle.END_ROD, region.getTestblockArea().getMinPoint(true), region.getTestblockArea().getMaxPoint(true));
+        drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getMinPoint(), region.getMaxPoint());
+        if (region.hasType(RegionType.TESTBLOCK)) {
+            drawCuboid(player, Particle.END_ROD, region.getMinPointTestblockExtension(), region.getMaxPointTestblockExtension());
         }
-        if (!region.getBuildArea().isEmpty()) {
-            drawCuboid(player, Particle.END_ROD, region.getBuildArea().getMinPoint(true), region.getBuildArea().getMaxPoint(true));
+        if (region.hasType(RegionType.BUILD)) {
+            drawCuboid(player, Particle.END_ROD, region.getMinPointBuildExtension(), region.getMaxPointBuildExtension());
         }
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java

@@ -63,22 +63,32 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
     @Register(description = "TECHHIDER_HELP")
     public void toggleHider(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getType().isGlobal()) {
+        if (region.isGlobal()) {
             BauSystem.MESSAGE.send("TECHHIDER_GLOBAL", player);
             return;
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            if (!region.getGameModeConfig().getTechhider().isActive()) {
+            File file = rg.gameModeConfig();
+            if (file == null) {
+                return Optional.empty();
+            }
+
+            FileConfiguration config = YamlConfiguration.loadConfiguration(file);
+            if (!config.getBoolean("Techhider.Active", false)) {
                 return Optional.empty();
             }
 
             hidden.put(rg, new HashSet<>());
 
-            TechHider current = new TechHider((p, cX, cY) -> {
-                if (rg.getBuildArea().isChunkOutside(cX, cY)) return true;
+            String obfuscateWith = config.getString("Techhider.ObfuscateWith", "end_stone");
+            Set<String> hiddenBlocks = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlocks")));
+            Set<String> hiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
+
+            TechHider current = new TechHider((TechHider.LocationEvaluator) (p, cX, cY) -> {
+                if (rg.buildChunkOutside(cX, cY)) return true;
                 return !hidden.get(rg).contains(p);
-            }, region.getGameModeConfig().getTechhider().getObfuscateWith(), region.getGameModeConfig().getTechhider().getHiddenBlocks(), region.getGameModeConfig().getTechhider().getHiddenBlockEntities());
+            }, Material.valueOf(obfuscateWith.toUpperCase()), hiddenBlocks.stream().map(String::toUpperCase).map(Material::valueOf).collect(Collectors.toSet()), hiddenBlockEntities);
             current.enable();
 
             return Optional.of(current);
@@ -95,7 +105,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             hidden.get(region).add(player);
             BauSystem.MESSAGE.sendPrefixless("TECHHIDER_ON", player, ChatMessageType.ACTION_BAR);
         }
-        region.getBuildArea().forEachChunk((x, z) -> {
+        region.forEachChunk((x, z) -> {
             CraftbukkitWrapper.impl.sendChunk(player, x, z);
         });
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import lombok.ToString;
+import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.scheduler.BukkitTask;
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java

@@ -20,6 +20,8 @@
 package de.steamwar.bausystem.features.testblock.blockcounter;
 
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.utils.RegionExtensionType;
+import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -35,13 +37,11 @@ public class BlockCounterListener implements Listener {
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
         Region region = Region.getRegion(event.getLocation());
-        if (region.getType().isGlobal()) {
+        if (region.isGlobal()) {
             return;
         }
         List<Block> blockList = event.blockList();
-        blockList = blockList.stream()
-                .filter(block -> region.getTestblockArea().inRegion(block.getLocation(), true))
-                .collect(Collectors.toList());
+        blockList = blockList.stream().filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)).collect(Collectors.toList());
         if (blockList.isEmpty()) {
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/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) 2020  SteamWar.de-Serverteam
+ *   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 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.utils.tps;
+package de.steamwar.bausystem.features.tpslimit;
 
 import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSCommand.java

@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/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) 2020  SteamWar.de-Serverteam
+ *   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 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.utils.tps;
+package de.steamwar.bausystem.features.tpslimit;
 
 import de.steamwar.Reflection;
 import lombok.Getter;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSLimitUtils.java

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

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java

@@ -23,20 +23,23 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickEndEvent;
-import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
+import de.steamwar.core.TPSWarpUtils;
 import de.steamwar.core.TPSWatcher;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
+import de.steamwar.linkage.MaxVersion;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.boss.BarColor;
@@ -49,61 +52,91 @@ import org.bukkit.inventory.ItemStack;
 import java.util.Arrays;
 
 @Linked
+@MaxVersion(20) // Hotfix for 1.21 tps limit! -> Backport coming later
 public class TPSSystem implements Listener {
 
+    @Getter
+    private static double currentTPSLimit = 20;
+
     public TPSSystem() {
-        if (TickManager.impl.canFreeze()) {
+        if (TPSFreezeUtils.isCanFreeze()) {
             new TPSFreezeCommand();
             new TickFreezeCommand();
             new TickStepCommand();
         }
         new TPSLimitCommand();
         new TickLimitCommand();
-        if (Core.getVersion() >= 15) {
+        if (Core.getVersion() >= 15 && Core.getVersion() <= 20) { // If 1.21 support is not directly present
             new TPSWarpCommand();
             new TickWarpCommand();
-            if (TickManager.impl.canFreeze()) {
+            if (TPSFreezeUtils.isCanFreeze()) {
                 new TickWarpingCommand();
             }
         }
-        if (Core.getVersion() >= 21) {
-            new Tick21Command();
-        }
         new TPSDefaultCommand();
         new TickDefaultCommand();
         new TPSBaseCommand();
         new TickBaseCommand();
-        Bukkit.getPluginManager().registerEvents(TickManager.impl, BauSystem.getInstance());
+    }
+
+    private void setTPS(double tps) {
+        if (currentlyStepping) {
+            currentlyStepping = false;
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                BossBarService.instance.remove(player, GlobalRegion.getInstance(), "TickStep");
+            });
+        }
+        TPSWarpUtils.warp(tps);
+        if (currentTPSLimit == 0 && tps != 0) {
+            TPSFreezeUtils.unfreeze();
+        }
+        currentTPSLimit = tps;
+        if (tps == 0) {
+            TPSLimitUtils.unlimit();
+            TPSFreezeUtils.freeze();
+        } else if (tps < 20.0) {
+            TPSLimitUtils.limit(tps);
+        } else if (tps >= 20) {
+            TPSLimitUtils.unlimit();
+        }
+
+        Bukkit.getOnlinePlayers().forEach(player -> {
+            if (currentTPSLimit == 0) {
+                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_FROZEN", player));
+            } else {
+                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_SET", player, currentTPSLimit));
+            }
+        });
+    }
+
+    private boolean currentlyStepping = false;
+    private double currentLimit;
+    private int stepsTotal;
+    private int stepsLeft;
+
+    private void setSkip(int steps, double tpsLimitToUse) {
+        currentLimit = tpsLimitToUse == 20 ? 0 : currentTPSLimit;
+        setTPS(tpsLimitToUse);
+        stepsLeft = steps;
+        stepsTotal = steps;
+        currentlyStepping = true;
     }
 
     @EventHandler
     public void onTickEnd(TickEndEvent event) {
-        bossbar();
-    }
-
-    private void bossbar() {
-        if ((TickManager.impl.isStepping() || TickManager.impl.isSprinting()) && TickManager.impl.getRemainingTicks() > 0) {
+        if (!currentlyStepping) return;
+        if (stepsTotal > 1) {
             Bukkit.getOnlinePlayers().forEach(player -> {
-                BauSystemBossbar bossbar = BossBarService.instance.get(player, Region.getGlobalRegion(), "TickStep");
+                BauSystemBossbar bossbar = BossBarService.instance.get(player, GlobalRegion.getInstance(), "TickStep");
                 bossbar.setColor(BarColor.YELLOW);
-                bossbar.setTitle(BauSystem.MESSAGE.parse("TICK_BOSSBAR", player, TickManager.impl.getDoneTicks(), TickManager.impl.getTotalTicks()));
-                bossbar.setProgress(TickManager.impl.getDoneTicks() / (double) TickManager.impl.getTotalTicks());
-            });
-        } else {
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                BossBarService.instance.remove(player, Region.getGlobalRegion(), "TickStep");
+                bossbar.setTitle(BauSystem.MESSAGE.parse("TICK_BOSSBAR", player, (stepsTotal - stepsLeft), stepsTotal));
+                bossbar.setProgress((stepsTotal - stepsLeft) / (double) stepsTotal);
             });
         }
-    }
-
-    public static void sendTickRateChange() {
-        Bukkit.getOnlinePlayers().forEach(player -> {
-            if (TickManager.impl.isFrozen()) {
-                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_FROZEN", player));
-            } else {
-                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_SET", player, TickManager.impl.getTickRate()));
-            }
-        });
+        stepsLeft--;
+        if (stepsLeft <= 0) {
+            setTPS(currentLimit);
+        }
     }
 
     private class TPSBaseCommand extends SWCommand {
@@ -124,8 +157,7 @@ public class TPSSystem implements Listener {
 
         @Register(value = "0", description = "TPSLIMIT_FREEZE_HELP")
         public void freeze(@Validator Player player) {
-            TickManager.impl.setFreeze(true);
-            sendTickRateChange();
+            setTPS(0);
         }
     }
 
@@ -137,9 +169,8 @@ public class TPSSystem implements Listener {
         }
 
         @Register(description = "TPSLIMIT_LIMIT_HELP")
-        public void limit(@Validator Player player, @Min(doubleValue = 0.5) @Max(doubleValue = 20.0) float tpsLimit) {
-            TickManager.impl.setTickRate(tpsLimit);
-            sendTickRateChange();
+        public void limit(@Validator Player player, @Min(doubleValue = 0.5) @Max(doubleValue = 20.0) double tpsLimit) {
+            setTPS(tpsLimit);
         }
     }
 
@@ -151,9 +182,8 @@ public class TPSSystem implements Listener {
         }
 
         @Register(description = "TPSLIMIT_WARP_HELP")
-        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) float tpsLimit) {
-            TickManager.impl.setTickRate(tpsLimit);
-            sendTickRateChange();
+        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) double tpsLimit) {
+            setTPS(tpsLimit);
         }
     }
 
@@ -166,13 +196,12 @@ public class TPSSystem implements Listener {
 
         @Register(description = "TPSLIMIT_HELP")
         public void currentLimit(Player player) {
-            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, TickManager.impl.getTickRate());
+            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, currentTPSLimit);
         }
 
         @Register(value = "default", description = "TPSLIMIT_DEFAULT_HELP")
         public void reset(@Validator Player player) {
-            TickManager.impl.setTickRate(20.0F);
-            sendTickRateChange();
+            setTPS(20);
         }
     }
 
@@ -194,14 +223,12 @@ public class TPSSystem implements Listener {
         @Register(value = {"rate", "0"}, description = "TICK_FREEZE_HELP")
         @Register(value = "freeze", description = "TICK_FREEZE_HELP_2")
         public void freeze(@Validator Player player) {
-            TickManager.impl.setFreeze(true);
-            sendTickRateChange();
+            setTPS(0);
         }
 
         @Register(value = "unfreeze", description = "TICK_UNFREEZE_HELP")
         public void unfreeze(@Validator Player player) {
-            TickManager.impl.setTickRate(20.0F);
-            sendTickRateChange();
+            setTPS(20);
         }
     }
 
@@ -214,9 +241,7 @@ public class TPSSystem implements Listener {
 
         @Register(value = "step", description = "TICK_STEPPING_HELP")
         public void step(@Validator Player player, @Min(intValue = 1) @OptionalValue("1") int steps) {
-            TickManager.impl.stepTicks(steps);
-            sendTickRateChange();
-            bossbar();
+            setSkip(steps, 20);
         }
     }
 
@@ -228,9 +253,8 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "warp", description = "TICK_WARPING_HELP")
-        public void warp(@Validator Player player, @Min(intValue = 1) @OptionalValue("1") int steps) {
-            TickManager.impl.sprintTicks(steps);
-            sendTickRateChange();
+        public void warp(@Validator Player player, @Min(intValue = 1) @OptionalValue("1") int steps, @Min(doubleValue = 20) @OptionalValue("4000") double tps) {
+            setSkip(steps, tps);
         }
     }
 
@@ -242,9 +266,8 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "rate", description = "TICK_LIMIT_HELP")
-        public void limit(@Validator Player player, @Min(doubleValue = 0.5, inclusive = false) @Max(doubleValue = 20.0) float tpsLimit) {
-            TickManager.impl.setTickRate(tpsLimit);
-            sendTickRateChange();
+        public void limit(@Validator Player player, @Min(doubleValue = 0.5, inclusive = false) @Max(doubleValue = 20.0) double tpsLimit) {
+            setTPS(tpsLimit);
         }
     }
 
@@ -256,9 +279,8 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "rate", description = "TICK_WARP_HELP")
-        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) float tpsLimit) {
-            TickManager.impl.setTickRate(tpsLimit);
-            sendTickRateChange();
+        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) double tpsLimit) {
+            setTPS(tpsLimit);
         }
     }
 
@@ -271,31 +293,12 @@ public class TPSSystem implements Listener {
 
         @Register(value = "rate", description = "TICK_HELP")
         public void currentLimit(Player player) {
-            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, TickManager.impl.getTickRate());
+            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, currentTPSLimit);
         }
 
         @Register(value = {"rate", "default"}, description = "TICK_DEFAULT_HELP")
         public void reset(@Validator Player player) {
-            TickManager.impl.setTickRate(20.0F);
-            sendTickRateChange();
-        }
-    }
-
-    @AbstractSWCommand.PartOf(TickBaseCommand.class)
-    private class Tick21Command extends SWCommand {
-
-        private Tick21Command() {
-            super("");
-        }
-
-        @Register(value = "normalclient")
-        public void smooth(@Validator Player player) {
-            TickManager.impl.setBlockTpsPacket(true);
-        }
-
-        @Register(value = "slowclient")
-        public void unsmooth(@Validator Player player) {
-            TickManager.impl.setBlockTpsPacket(false);
+            setTPS(20);
         }
     }
 
@@ -317,10 +320,7 @@ public class TPSSystem implements Listener {
 
         @Override
         public String get(Region region, Player p) {
-            boolean isWarping = TickManager.impl.isSprinting();
-            boolean isFrozen = TickManager.impl.isFrozen();
-
-            if (tpsSystem != null && isWarping) {
+            if (tpsSystem != null && tpsSystem.currentlyStepping) {
                 long time = System.currentTimeMillis() % 1000;
                 if (time < 250) {
                     return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: §7•••";
@@ -331,7 +331,7 @@ public class TPSSystem implements Listener {
                 } else {
                     return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: §7••§e•";
                 }
-            } else if (isFrozen) {
+            } else if (TPSFreezeUtils.frozen()) {
                 return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + BauSystem.MESSAGE.parse("SCOREBOARD_TPS_FROZEN", p);
             } else {
                 return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + tpsColor() + TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND) + tpsLimit();
@@ -340,20 +340,20 @@ public class TPSSystem implements Listener {
 
         private String tpsColor() {
             double tps = TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND);
-            if (tps > TickManager.impl.getTickRate() * 0.9) {
+            if (tps > TPSSystem.getCurrentTPSLimit() * 0.9) {
                 return "§a";
             }
-            if (tps > TickManager.impl.getTickRate() * 0.5) {
+            if (tps > TPSSystem.getCurrentTPSLimit() * 0.5) {
                 return "§e";
             }
             return "§c";
         }
 
         private String tpsLimit() {
-            if (TickManager.impl.getTickRate() == 20) {
+            if (TPSSystem.getCurrentTPSLimit() == 20) {
                 return "";
             }
-            return "§8/§7" + TickManager.impl.getTickRate();
+            return "§8/§7" + TPSSystem.getCurrentTPSLimit();
         }
     }
 
@@ -369,7 +369,7 @@ public class TPSSystem implements Listener {
 
         @Override
         public ItemStack getItem(Player player) {
-            return new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_LORE", player, TickManager.impl.getTickRate())), false, clickType -> {
+            return new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_LORE", player, tpsSystem.currentTPSLimit)), false, clickType -> {
             }).getItemStack();
         }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java

@@ -20,7 +20,8 @@
 package de.steamwar.bausystem.features.tracer;
 
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.core.Core;
+import de.steamwar.bausystem.region.utils.RegionExtensionType;
+import de.steamwar.bausystem.region.utils.RegionType;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -35,9 +36,9 @@ import java.util.Optional;
 /**
  * Recording of a tnt at a specific tick
  */
-@AllArgsConstructor(access = AccessLevel.PACKAGE)
+@AllArgsConstructor
 @Getter
-public class TNTPoint {
+public class TNTPoint{
     /**
      * Unique number to identify records being of the same tnt
      */
@@ -97,14 +98,10 @@ public class TNTPoint {
      * Constructor for object creation in trace recording
      */
     protected TNTPoint(int tntId, TNTPrimed tnt, boolean explosion, boolean afterFirstExplosion, long ticksSinceStart,
-                       List<TNTPoint> history, List<Block> destroyedBlocks) {
+                    List<TNTPoint> history, List<Block> destroyedBlocks) {
         this.tntId = tntId;
         this.explosion = explosion;
-        if (Core.getVersion() > 15) {
-            this.inWater = tnt.isInWater();
-        } else {
-            this.inWater = false;
-        }
+        this.inWater = tnt.isInWater();
         this.afterFirstExplosion = afterFirstExplosion;
         this.ticksSinceStart = ticksSinceStart;
         fuse = tnt.getFuseTicks();
@@ -115,10 +112,12 @@ public class TNTPoint {
         boolean buildDestroy = false;
         boolean testblockDestroy = false;
         for (Block destroyedBlock : destroyedBlocks) {
-            if (Region.getRegion(destroyedBlock.getLocation()).getBuildArea().inRegion(destroyedBlock.getLocation(), true)) {
+            if (Region.getRegion(destroyedBlock.getLocation()).inRegion(destroyedBlock.getLocation(), RegionType.BUILD,
+                    RegionExtensionType.EXTENSION)) {
                 buildDestroy = true;
             }
-            if (Region.getRegion(destroyedBlock.getLocation()).getTestblockArea().inRegion(destroyedBlock.getLocation(), true)) {
+            if (Region.getRegion(destroyedBlock.getLocation()).inRegion(destroyedBlock.getLocation(),
+                    RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) {
                 testblockDestroy = true;
             }
         }