Add HullHider

.gitignore

@@ -1,7 +1,5 @@
-# Build files
+# Package Files
 *.jar
-**/bin
-**/build
 
 # Gradle
 .gradle
@@ -12,10 +10,6 @@ steamwar.properties
 # IntelliJ IDEA
 .idea
 *.iml
-plugin.yml
 
 # Other
 lib
-
-#linkage
-LinkageUtils.java

BauSystem_15/src/de/steamwar/bausystem/features/tracer/record/TNTPrimedIterator15.java

@@ -0,0 +1,39 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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.tracer.record;
+
+import net.minecraft.server.v1_15_R1.EntityTNTPrimed;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.stream.Stream;
+
+public class TNTPrimedIterator15 implements TNTPrimedIterator {
+
+    private static final CraftWorld WORLD = (CraftWorld) Bukkit.getWorlds().get(0);
+
+    @Override
+    public Stream<TNTPrimed> iterator() {
+        return WORLD.getHandle().entitiesById.values().stream()
+                .filter(EntityTNTPrimed.class::isInstance)
+                .map(entity -> (TNTPrimed) entity.getBukkitEntity());
+    }
+}

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

@@ -106,7 +106,6 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
 
     private static final WorldEditPlugin WORLDEDIT_PLUGIN = Objects.requireNonNull((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
     private static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
-
     @Override
     public void setSelection(Player p, Point minPoint, Point maxPoint) {
         WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, toBlockVector3(minPoint), toBlockVector3(maxPoint)));
@@ -191,7 +190,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
     }
 
     @Override
-    public Clipboard copy(Point minPoint, Point maxPoint, Point copyPoint) {
+    public boolean backup(Point minPoint, Point maxPoint, File file) {
         BukkitWorld bukkitWorld = new BukkitWorld(Bukkit.getWorlds().get(0));
         CuboidRegion region = new CuboidRegion(bukkitWorld, toBlockVector3(minPoint), toBlockVector3(maxPoint));
         BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
@@ -204,21 +203,12 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
             copy.setCopyingBiomes(false);
 
             Operations.complete(copy);
-            clipboard.setOrigin(toBlockVector3(copyPoint));
-            return clipboard;
-        } catch (WorldEditException e) {
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-            return null;
-        }
-    }
 
-    @Override
-    public boolean backup(Point minPoint, Point maxPoint, File file) {
-        Clipboard clipboard = copy(minPoint, maxPoint, minPoint);
             try (ClipboardWriter writer = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(file))) {
                 writer.write(clipboard);
+            }
             return true;
-        } catch (IOException e) {
+        } catch (WorldEditException | IOException e) {
             Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
             return false;
         }

BauSystem_18/src/de/steamwar/bausystem/features/tracer/record/TNTPrimedIterator18.java

@@ -0,0 +1,46 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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.tracer.record;
+
+import com.comphenix.tinyprotocol.Reflection;
+import net.minecraft.server.level.WorldServer;
+import net.minecraft.world.level.entity.LevelEntityGetter;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class TNTPrimedIterator18 implements TNTPrimedIterator {
+
+    private static final Reflection.MethodInvoker getWorld = Reflection.getMethod(Reflection.getClass("{obc}.CraftWorld"), "getHandle");
+    private static final Reflection.MethodInvoker getWorldEntities = Reflection.getTypedMethod(WorldServer.class, null, LevelEntityGetter.class);
+    private static final Reflection.MethodInvoker getIterable = Reflection.getTypedMethod(LevelEntityGetter.class, null, Iterable.class);
+    private static final Reflection.MethodInvoker getBukkitEntity = Reflection.getTypedMethod(Reflection.getClass("{nms.world.entity}.Entity"), "getBukkitEntity", null);
+
+    @Override
+    public Stream<TNTPrimed> iterator() {
+        return StreamSupport.stream(((Iterable<?>) getIterable.invoke(getWorldEntities.invoke(getWorld.invoke(Bukkit.getWorlds().get(0))))).spliterator(), false)
+                .map(getBukkitEntity::invoke)
+                .filter(TNTPrimed.class::isInstance)
+                .map(TNTPrimed.class::cast);
+    }
+}
+

BauSystem_Linkage/src/de/steamwar/linkage/types/ScoreboardElement_GENERIC.java

@@ -35,6 +35,6 @@ public class ScoreboardElement_GENERIC implements LinkageType {
     @Override
     public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
         buildPlan.addImport("de.steamwar.bausystem.features.world.BauScoreboard");
-        methodBuilder.addLine("BauScoreboard.addElement(" + s + ");");
+        methodBuilder.addLine("BauScoreboard.ELEMENTS.add(" + s + ");");
     }
 }

BauSystem_Main/src/BauSystem.properties

@@ -16,17 +16,17 @@
 # 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/>.
 #
+
 PREFIX = §eBau§8System§8»
 TIME = HH:mm:ss
 DATE=........
 COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
 ONLY_SCHEMS=§cFolders are unselectable
+
 PAGE_LIST=§e Page ({0}/{1}) »»
 LIST_PREVIOUS_PAGE=§ePrevious page
 LIST_NEXT_PAGE=§eNext page
-# Permissions
+
-NO_PERMISSION=You are not allowed to use that here
-SPECTATOR=§fSpectator
 # Scoreboard
 SCOREBOARD_TIME = Time
 SCOREBOARD_REGION = Region
@@ -34,13 +34,12 @@ SCOREBOARD_TRACE=Trace
 SCOREBOARD_LOADER = Loader
 SCOREBOARD_TPS = TPS
 SCOREBOARD_TPS_FROZEN = §eFrozen
+
 SCOREBOARD_TRACE_TICKS = Ticks
+
 SCOREBOARD_TECHHIDER = TechHider§8: §aOn
 SCOREBOARD_XRAY = XRay§8: §aOn
-SCOREBOARD_LOCK_TEAM=Bau Lock§8: §eTeam
+
-SCOREBOARD_LOCK_TEAM_AND_SERVERTEAM=Bau Lock§8: §e(Server) Team
-SCOREBOARD_LOCK_SERVERTEAM=Bau Lock§8: §eServer Team
-SCOREBOARD_LOCK_NOBODY=Bau Lock§8: §cNobody
 # Flags
 FLAG_COLOR = Color
 FLAG_TNT = TNT
@@ -48,23 +47,24 @@ FLAG_FIRE=Fire
 FLAG_FREEZE = Freeze
 FLAG_PROTECT = Protect
 FLAG_ITEMS = Items
-FLAG_NO_GRAVITY = No Gravity
+
-FLAG_TESTBLOCK=Testblock
-FLAG_CHANGED=Changed
 FLAG_FIRE_ALLOW = §con
 FLAG_FIRE_DENY = §aoff
+
 FLAG_FREEZE_ACTIVE = §aon
 FLAG_FREEZE_INACTIVE = §coff
+
 FLAG_PROTECT_ACTIVE = §aon
 FLAG_PROTECT_INACTIVE = §coff
-FLAG_NO_GRAVITY_ACTIVE = §aon
+
-FLAG_NO_GRAVITY_INACTIVE = §coff
 FLAG_TNT_ALLOW = §aon
 FLAG_TNT_DENY = §coff
 FLAG_TNT_ONLY_TB = §7no §ebuild area
 FLAG_TNT_ONLY_BUILD = §7no §etestblock area
+
 FLAG_ITEMS_ACTIVE = §aon
 FLAG_ITEMS_INACTIVE = §coff
+
 FLAG_COLOR_WHITE = §fWhite
 FLAG_COLOR_ORANGE = §6Orange
 FLAG_COLOR_MAGENTA = §dMagenta
@@ -83,23 +83,22 @@ FLAG_COLOR_BROWN=§eBrown
 FLAG_COLOR_GREEN = §2Green
 FLAG_COLOR_RED = §cRed
 FLAG_COLOR_BLACK = §0Black
-FLAG_TESTBLOCK_NO_VALUE=§eNo Value
+
-FLAG_TESTBLOCK_NORTH=§eNorth
-FLAG_TESTBLOCK_SOUTH=§eSouth
-FLAG_CHANGED_NO_CHANGE=§cNo
-FLAG_CHANGED_HAS_CHANGE=§aYes
 # Region
 REGION_TYPE_NORMAL = Normal
 REGION_TYPE_BUILD = Build area
 REGION_TYPE_ONLY_TB = Dummy
+
 # AttributesCopy
 ATTRIBUTES_CANT_COPY = §cYou need to hold the same item type and hover over the same block to copy.
 ATTRIBUTES_NO_COPY = §cNo attributes to copy.
 ATTRIBUTES_COPIED = §eAttributes copied.
+
 ATTRIBUTE_REMOVE_COMMAND_HELP = §8/§eattributeremove §8[§eattribute§8|§7all§8|§7*§8]
 ATTRIBUTE_REMOVE_ALL = §eAll attributes removed.
 ATTRIBUTE_REMOVE_SINGLE = §eAttribute §7{0}§e removed.
 ATTRIBUTE_REMOVE_NOT_FOUND = §cAttribute not found
+
 # AutoStart
 AUTOSTART_COMMAND_HELP = §8/§etimer §8- §7Retrieve AutostartTimer Tool
 AUTOSTART_ITEM_NAME = §eAutostartTimer
@@ -110,12 +109,14 @@ AUTOSTART_MESSAGE_START=§eAutostartTimer started
 AUTOSTART_MESSAGE_RESULT1 = §eTime §7until §eexplosion §7at enemy§8:§e {0}§7 game ticks
 AUTOSTART_MESSAGE_RESULT2 = §7Time difference in §egame-ticks §7until {0} seconds§8:§e {1}
 AUTOSTART_MESSAGE_RESULT3 = §7positive, if too few, negative if too many
+
 # Backup
 BACKUP_HELP_CREATE=§8/§ebackup create §8- §7Create a region backup
 BACKUP_HELP_LOAD=§8/§ebackup load §8[§7BackupName§8] §8- §7Load a region backup
 BACKUP_HELP_LIST=§8/§ebackup list §8- §7List all region backups
 BACKUP_HELP_GUI=§8/§ebackup gui §8- §7Open the backup GUI
 BACKUP_REGION_NO_REGION=§cYou are not inside any region
+BACKUP_NO_PERMS=§You do not have permission to use the backup system
 BACKUP_CREATE_SUCCESS=§7Backup created
 BACKUP_CREATE_FAILURE=§cBackup failed
 BACKUP_CREATE_NO_CHANGE=§7No changes to save
@@ -126,8 +127,15 @@ BACKUP_LOAD=§7Backup loaded
 BACKUP_INV_NAME=§eBackup
 BACKUP_ITEM_NAME=§eBackup §7from §e{0}
 BACKUP_LORE=§eClick to load
+
 # Bau
 BAU_COMMAND_HELP_INFO = §8/§ebau info §8- §7Alias for §8/§ebauinfo
+BAU_COMMAND_HELP_TOGGLEWE = §8/§ebau togglewe §8[§7Player§8] §8- §7Edit the WorldEdit permissions of a player
+BAU_COMMAND_HELP_TOGGLEWORLD = §8/§ebau toggleworld §8[§7Player§8] §8- §7Edit the World permissions of a player
+BAU_UNKNOWN_PLAYER = §cUnknown Player
+BAU_NO_PLAYER = §cThe player is no member of your world!
+BAU_NO_WORLD = §cThis is not your world!
+
 BAU_INFO_ITEM_NAME = §eBau-Management
 ## This is used in BauInfoBauGuiItem.java
 BAU_INFO_ITEM_LORE_TNT = §7TNT§8: §e{0}
@@ -136,12 +144,18 @@ BAU_INFO_ITEM_LORE_FIRE=§7Fire§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR = §7Color§8: §e{0}
 BAU_INFO_ITEM_LORE_PROTECT = §7Protect§8: §e{0}
 BAU_INFO_ITEM_LORE_ITEMS = §7Items§8: §e{0}
-BAU_INFO_ITEM_LORE_NO_GRAVITY = §8NoGravity§8: §e{0}
+
 BAU_INFO_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}
+BAU_INFO_COMMAND_MEMBER = §7Member §8[§7{0}§8]§8: §e
+BAU_INFO_MEMBER_INFO = §e{0}§8[{1}§8,{2}§8] §8
+BAU_INFO_MEMBER_WE_ALLOW = §aWE
+BAU_INFO_MEMBER_WE_DISALLOW = §cWE
+BAU_INFO_MEMBER_WORLD_ALLOW = §aW
+BAU_INFO_MEMBER_WORLD_DISALLOW = §cW
 BAU_INFO_COMMAND_FLAG = §7{0}§8: §7{1}
 BAU_INFO_COMMAND_TPS = §7TPS§8:§e
+
 # Countingwand
 COUNTINGWAND_COMMAND_HELP = §8/§ecountingwand §8- §7Receive a CountingWand
 COUNTINGWAND_ITEM_NAME = §eMeterstick
@@ -151,11 +165,13 @@ COUNTINGWAND_MESSAGE_RCLICK=§7First position at: §8[§7{0}§8, §7{1}§8, §7{
 COUNTINGWAND_MESSAGE_LCLICK = §7Second position at: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) ({4}§8)
 COUNTINGWAND_MESSAGE_VOLUME = §e{0}
 COUNTINGWAND_MESSAGE_DIMENSION = §e{0}§8, §e{1}§8, §e{2}
+
 # Design Endstone
 DESIGN_ENDSTONE_COMMAND_HELP = §8/§edesignendstone §8- §7Highlight endstone in design
 DESIGN_ENDSTONE_REGION_ERROR = §cThis region has no build area
 DESIGN_ENDSTONE_ENABLE = §aEndstone is highlighted
 DESIGN_ENDSTONE_DISABLE = §cEndstone is no longer hightlighted
+
 # Detonator
 DETONATOR_LOC_REMOVE = §e{0} removed
 DETONATOR_LOC_ADD = §e{0} added
@@ -195,6 +211,11 @@ HOTBAR_INVENTORY=Standard hotbar
 # GUI
 GUI_EDITOR_ITEM_NAME=§eGui editor
 GUI_NAME=Bau GUI
+GUI_NO_PERMISSION=§cYou do not have enough permissions for this
+GUI_NO_OWNER=§cYou are not the owner of this World
+GUI_NO_WORLD=§cYou do not have permissions to change the World
+GUI_NO_WORLDEDIT=§cYou do not have permissions to use WorldEdit
+GUI_NO_MEMBER=§cYou need to be a member of this World
 GUI_ITEM_LORE1=§7Use this item to open the bau gui
 GUI_ITEM_LORE2=§7or press swap hands twice.
 GUI_EDITOR_TITLE=Bau GUI Editor
@@ -205,16 +226,19 @@ GUI_EDITOR_ITEM_TRASH_LORE=§7Drop item here
 GUI_EDITOR_ITEM_MORE=§eMore items
 GUI_EDITOR_ITEM_CLOSE=§eClose
 GUI_EDITOR_TITLE_MORE=Select item
+
 # Script
 ## Errors
 SCRIPT_ERROR_GUI=§cError in parsing script: Line {0}
 SCRIPT_ERROR_GLOBAL=§cError in global script: Line {0}
 SCRIPT_ERROR_CLICK=§cError in script: Line {0}
 SCRIPT_ERROR_ONLY_IN_GLOBAL=§cThis function is only available in global scripts
+
 ## CustomScript
 SCRIPT_HOTKEY_ITEM_NAME = §7Hotkey§8: §e{0}
 SCRIPT_EVENT_ITEM_NAME = §7Event§8: §e{0}
 SCRIPT_COMMAND_ITEM_NAME = §7Command§8: §e/{0}
+
 ## Script Menu GUI
 SCRIPT_MENU_GUI_ITEM_LORE_1 = §7Click to retrieve
 SCRIPT_MENU_GUI_ITEM_LORE_2 = §7Shift-Click to copy
@@ -223,8 +247,10 @@ SCRIPT_MENU_GUI_ITEM_LORE_4=§7Middle-Click to preview
 SCRIPT_MENU_GUI_NAME = §eScript-Menu
 SCRIPT_MENU_GUI_ITEM_ADD_NAME = §eInsert
 SCRIPT_MENU_GUI_ITEM_ADD_LORE = §7Click with a book to insert
+
 SCRIPT_MENU_GUI_ENTER_NAME = §eEnter a name
 SCRIPT_DEPRECATED=§cThe function §8\'§e{0}§8\'§c is deprecated and will be removed in the future. Please use §8\'§e{1}§8\'§c instead.
+
 # Shield Printing
 SHIELD_PRINTING_HELP_START = §8/§eshieldprinting start §8- §7Starts the shield printing
 SHIELD_PRINTING_HELP_COPY = §8/§eshieldprinting copy §8- §7Copies the shield configuration
@@ -237,10 +263,13 @@ SHIELD_PRINTING_HELP_STEP_4=§84. §7Edit the shields if necessary
 SHIELD_PRINTING_HELP_STEP_5 = §85. §7Copy the shields printing with §8/§eshieldprinting copy
 SHIELD_PRINTING_HELP_STEP_6 = §86. §7Paste the original schematic
 SHIELD_PRINTING_HELP_STEP_7 = §87. §7Apply the shield printing with §8/§eshieldprinting apply
+
 SHIELD_PRINTING_NO_REGION = §cYou are not in a region.
 SHIELD_PRINTING_NOT_RUNNING = §cThe shield printing is not running.
+SHIELD_PRINTING_DISALLOWED = §cYou are not allowed to use shield printing here.
 SHIELD_PRINTING_BOSSBAR = §fMovements: {0}
 SHIELD_PRINTING_BOSSBAR_COPIED = §fMovements: {0}   Copied: {1}
+
 SHIELD_PRINTING_GUI_NAME = §7Shield Printing
 SHIELD_PRINTING_GUI_APPLY = §aApply
 SHIELD_PRINTING_GUI_STATE_PREVIOUS = §7R-Click§8: §7Previous
@@ -258,12 +287,15 @@ SHIELD_PRINTING_GUI_STATE_OPENABLE=§7{0} §fOpened
 SHIELD_PRINTING_GUI_STATE_PISTON = §7{0} §fExtended
 SHIELD_PRINTING_GUI_STATE_POWERABLE = §7{0} §fPowered
 SHIELD_PRINTING_GUI_STATE_WALL = §7{0} §fWall Connections
+
 SHIELD_PRINTING_START = §aThe shield printing has been started.
 SHIELD_PRINTING_COPY = §aThe shield has been copied.
 SHIELD_PRINTING_APPLY = §aThe shield has been applied.
 SHIELD_PRINTING_STOP = §aThe shield printing has been stopped.
+
 # Unsign Book
 UNSIGN_HELP=§8/§eunsign §8- §7Make a signed book writable again
+
 # Simulator
 SIMULATOR_HELP = §8/§esimulator §8-§7 Gives you the simulator wand
 SIMULATOR_CREATE_HELP = §8/§esimulator create §8[§7name§8] §8-§7 Create a new simulator
@@ -271,7 +303,10 @@ SIMULATOR_CHANGE_HELP=§8/§esimulator change §8-§7 Change your simulator wand
 SIMULATOR_DELETE_HELP = §8/§esimulator delete §8[§7name§8] §8-§7 Deletes the simulator
 SIMULATOR_START_HELP = §8/§esimulator start §8[§7name§8] §8-§7 Starts the simulator
 SIMULATOR_COPY_HELP = §8/§esimulator copy §8[§7to-copy§8] §8[§7name§8] §8-§7 Copy the simulator
+SIMULATOR_NO_PERMS = §cYou are not allowed to use the simulator here
+
 SIMULATOR_GUI_ITEM_NAME = §eTNT Simulator
+
 SIMULATOR_NO_SIM_IN_HAND = §cNo simulator item selected
 SIMULATOR_GUI_SELECT_SIM = Simulator selection
 SIMULATOR_GUI_CREATE_SIM = §eCreate simulator
@@ -285,7 +320,9 @@ SIMULATOR_EDIT_LOCATION=§7Edit position
 SIMULATOR_EDIT_PROPERTIES = §7Edit properties
 SIMULATOR_EDIT_OTHER = §7Edit other
 SIMULATOR_EDIT_GROUP = §7Edit group
+
 SIMULATOR_EDIT_GROUP_MENU = §eEdit group
+
 SIMULATOR_WAND_NAME = §eSimulator
 SIMULATOR_WAND_NAME_SELECTED = §7Simulator §8- §e{0}
 SIMULATOR_WAND_LORE_1 = §eRight click §8- §7Adds a position
@@ -293,7 +330,9 @@ SIMULATOR_WAND_LORE_2=§eSneaking §8- §7Free movement
 SIMULATOR_WAND_LORE_3 = §eLeft click §8- §7Start the simulation
 SIMULATOR_WAND_LORE_4 = §eRight click in air §8- §7Opens the gui
 SIMULATOR_WAND_LORE_5 = §eDouble Sneak §8- §7Swap between TNT and Redstone Block
+
 SIMULATOR_REGION_FROZEN = §cSimulator cannot be used inside frozen regions
+
 ## Other
 SIMULATOR_PLUS_ONE = §7+1
 SIMULATOR_PLUS_PIXEL_SHIFT = §eShift §7Click for §e+0,0625
@@ -305,8 +344,11 @@ SIMULATOR_POSITION_X=§7x-Position
 SIMULATOR_POSITION_Y = §7y-Position
 SIMULATOR_POSITION_Z = §7z-Position
 SIMULATOR_BACK = §eBack
+
 SIMULATOR_GUI_TOTAL_TNT = §7Total TNT§8: §e{0}
+
 SIMULATOR_DELETED = §cSimulator deleted
+
 ## GUI
 SIMULATOR_POSITION_EDIT = §eEdit position
 SIMULATOR_POSITION_ADD = §eSet position
@@ -330,12 +372,15 @@ SIMULATOR_GUI_NAME=Simulator
 SIMULATOR_GUI_DELETE = §cDelete TNT
 SIMULATOR_GUI_AUTO_TRACE = §eAutoTrace§8: §7{0}
 SIMULATOR_GUI_MOVE_ALL = §eMove all
+
 SIMULATOR_ALIGNMENT_CENTER = §7Alignment§8: §eCenter
 SIMULATOR_ALIGNMENT_POSITIVE_X = §7Alignment§8: §ePositive X
 SIMULATOR_ALIGNMENT_NEGATIVE_X = §7Alignment§8: §eNegative X
 SIMULATOR_ALIGNMENT_POSITIVE_Z = §7Alignment§8: §ePositive Z
 SIMULATOR_ALIGNMENT_NEGATIVE_Z = §7Alignment§8: §eNegative Z
+
 SIMULATOR_MOVE_ALL_GUI_NAME = Move TNT
+
 SIMULATOR_TNT_SPAWN_GUI_NAME = Configure TNT {0}
 SIMULATOR_TNT_SPAWN_EDIT_LOCATION = - Location
 SIMULATOR_TNT_SPAWN_EDIT_PROPERTIES = - Properties
@@ -377,16 +422,19 @@ SIMULATOR_TNT_SPAWN_ADD_IGNITION_PHASE=§eAdd prime phase
 SIMULATOR_TNT_SPAWN_ADD_TNT = §eAdd TNT
 SIMULATOR_TNT_SPAWN_REMOVE_TNT = §cRemove
 SIMULATOR_TNT_SPAWN_POSITION_ANVIL_GUI_NAME = Position
+
 # SmartPlace
 SMART_PLACE_HELP = §8/§esmartplace §8-§7 Toggles SmartPlace
 SMART_PLACE_INFO = §7Places rotatable blocks §eaway§7 from you when §esneaking§7.
 SMART_PLACE_ENABLE = §aSmartPlace activated
 SMART_PLACE_DISABLE = §cSmartPlace deactivated
+
 # InventoryFiller
 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
+
 # Killchecker
 KILLCHECKER_HELP_ENABLE = §8/§ekillchecker enable §8- §7Enables Killchecker / Recalculates kills
 KILLCHECKER_HELP_DISABLE = §8/§ekillchecker disable §8- §7Disables Killchecker
@@ -395,6 +443,7 @@ KILLCHECKER_INFO2=§7Only colorable blocks like Wool, Terractotta, Stained Glass
 KILLCHECKER_ENABLE = §aKillchecker activated
 KILLCHECKER_DISABLE = §cKillchecker deactivated
 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
 BLOCK_COUNTER_HELP_ENABLE = §8/§eblockcounter enable §8- §7Toggles BlockCounter on
@@ -403,17 +452,20 @@ BLOCK_COUNTER_MESSAGE=§7Damage §8> §e{0} §7Blocks  §e{1} §7TNT  §e{2} §7
 BLOCK_COUNTER_MESSAGE_SECOND = §7Damage §8> §e{0} §7Blocks  §e{1} §7TNT  §e{2} §7Blocks/TNT  §e{3} §7Blocks/s
 BLOCK_COUNTER_ENABLE = §7BlockCounter activated
 BLOCK_COUNTER_DISABLE = §7BlockCounter deactivated
+
 # DepthCounter
 DEPTH_COUNTER_MESSAGE = §7Depth §8> §7
 DEPTH_COUNTER_COUNT = {0}{1}§8×{2}{3}§8×{4}{5}
 DEPTH_COUNTER_HOVER = §7X§8ק7Y§8ק7Z
 DEPTH_COUNTER_TNT = §7   TNT§8: §e{0}
+
 # TPSLimit
 TPSLIMIT_FREEZE_HELP = §8/§etpslimit 0 §8-§7 Freeze TPS
 TPSLIMIT_LIMIT_HELP = §8/§etpslimit §8[§720>x>0.5§8] §8-§7 Slow TPS down
 TPSLIMIT_WARP_HELP = §8/§etpslimit §8[§7x>20§8] §8-§7 Speed TPS up
 TPSLIMIT_DEFAULT_HELP = §8/§etpslimit default §8-§7 Set TPS to 20
 TPSLIMIT_HELP = §8/§etpslimit §8-§7 Show current TPS
+
 TICK_FREEZE_HELP = §8/§etick rate 0 §8-§7 Freeze TPS
 TICK_FREEZE_HELP_2 = §8/§etick freeze §8-§7 Freeze TPS
 TICK_UNFREEZE_HELP = §8/§etick unfreeze §8-§7 Set TPS to 20
@@ -421,54 +473,59 @@ TICK_LIMIT_HELP=§8/§etick rate §8[§720>x>0.5§8] §8-§7 Slow TPS down
 TICK_WARP_HELP = §8/§etick rate §8[§7x>20§8] §8-§7 Speed TPS up
 TICK_DEFAULT_HELP = §8/§etick rate default §8-§7 Set TPS to 20
 TICK_HELP = §8/§etick rate §8-§7 Show current TPS
+
 TICK_STEPPING_HELP = §8/§etick step §8<§7Ticks§8> §8-§7 Step n ticks or 1 forward
 TICK_WARPING_HELP = §8/§etick warp §8<§7Ticks§8> §8<§7TPS§8> §8-§7 Warp n ticks or 1 forward
+
 TICK_BOSSBAR = §7Skipped §e{0}§8/§7{1}
 TPSLIMIT_GUI_ITEM_NAME = §eTPS limiter
 TPSLIMIT_GUI_ITEM_LORE = §7Currently: §e{0}
 TPSLIMIT_ANVIL_GUI = New TPS limit
 TPSLIMIT_CURRENT = §7Current TPS limit§8: §e{0}
+TPSLIMIT_NO_PERMS = §cYou are not allowed to use the TPS-Limiter here
 TPSLIMIT_SET = §eSet TPS limit to {0}
 TPSLIMIT_FROZEN = §eTPS frozen
+
 # Trace
 TRACE_RECORD=§aon
 TRACE_HAS_TRACES=§ehas Traces
-TRACE_IDLE_AUTO=§eauto
+TRACE_IDLE_SINGLE=§esingle
+TRACE_IDLE_AUTO_EXPLODE=§eauto §8(§7explode§8)
+TRACE_IDLE_AUTO_IGNITE=§eauto §8(§7ignite§8)
+TRACE_MESSAGE_AUTO_IDLE_EXPLODE = §aAuto-Tracer explode started
+TRACE_MESSAGE_AUTO_IDLE_IGNITE = §aAuto-Tracer ignite started
+TRACE_MESSAGE_AUTO_DELETE_INVALID = §cAuto delete cannot be used currently
+TRACE_MESSAGE_AUTO_DELETE_ALWAYS = §7Last Shot will §ealways §7be deleted
+TRACE_MESSAGE_AUTO_DELETE_NEVER = §7Last Shot will §enever §7be deleted
+TRACE_MESSAGE_AUTO_DELETE_NO_BUILD_DESTROY = §7Last Shot will be deleted if §eno build §7block was destroyed
+TRACE_MESSAGE_AUTO_DELETE_BUILD_DESTROY = §7Last Shot will be deleted if §ea build §7block was destroyed
+TRACE_MESSAGE_AUTO_DELETE_NO_TESTBLOCK_DESTROY = §7Last Shot will be deleted if §eno testblock §7block was destroyed
+TRACE_MESSAGE_AUTO_DELETE_TESTBLOCK_DESTROY = §7Last Shot will be deleted if §ea testlblock §7block was destroyed
 TRACE_MESSAGE_START = §aTNT-Tracer started
-TRACE_MESSAGE_AUTO_START=§eAuto TNT-Tracer started
+TRACE_MESSAGE_SINGLE = §aSingle-Tracer started
-TRACE_MESSAGE_AUTO_STOP=§cAuto TNT-Tracer stopped
 TRACE_MESSAGE_STOP = §cTNT-Tracer stopped
-TRACE_MESSAGE_CLEAR=§cAll TNT-positions deleted
+TRACE_MESSAGE_DELETE = §cAll TNT-positions deleted
-TRACE_MESSAGE_DELETE=§cTrace TNT-positions deleted
 TRACE_MESSAGE_SHOW = §aAll TNT-positions shown
 TRACE_MESSAGE_HIDE = §cAll TNT-positions hidden
-TRACE_MESSAGE_SHOW_AT=§aTNT-positions shown at {0}
-TRACE_MESSAGE_SHOW_FROM=§aAll TNT-positions shown from {0}
-TRACE_MESSAGE_SHOW_FROM_TO=§aAll TNT-positions shown from {0} to {1}
-TRACE_MESSAGE_SHOW_TO_SMALLER=§cTo must be bigger then from
 TRACE_MESSAGE_CLICK_ISOLATE = §eClick to §aisolate§8/§cunisolate
-TRACE_MESSAGE_ISOLATE=§eTNT Positions have been isolated
+TRACE_MESSAGE_DISALLOWED = §cYou are not allowed to use the TNT-Tracer here
-TRACE_MESSAGE_BROADCAST=§e{0} shared his trace show state.
+TRACE_MESSAGE_SHOW_AT = §aTNT-positions shown with {0} at {1}
-TRACE_MESSAGE_BROADCAST_HOVER=§eClick to view
+TRACE_MESSAGE_SHOW_FROM = §aAll TNT-positions shown with {0} from {1}
-TRACE_MESSAGE_FOLLOW=§aYou are now following {0} Trace show state
+TRACE_MESSAGE_SHOW_FROM_TO = §aAll TNT-positions shown with {0} from {1} to {2}
-TRACE_MESSAGE_FOLLOW_SELF=§cYou cannot follow yourself!
+TRACE_MESSAGE_SHOW_TO_SMALLER = §cTo must be bigger then from
-TRACE_MESSAGE_UNFOLLOW=§cYou are no longer following a Trace show state
+
 TRACE_COMMAND_HELP_START = §8/§etrace start §8- §7Starts recording of all TNT-positions
+TRACE_COMMAND_HELP_SINGLE = §8/§etrace single §8- §7Starts a single recording of all TNT-positions
 TRACE_COMMAND_HELP_STOP = §8/§etrace stop §8- §7Stops the TNT-Tracer
 TRACE_COMMAND_HELP_AUTO = §8/§etrace toggleauto §8- §7Automatic start of recording
+TRACE_COMMAND_HELP_AUTO_REMOVE = §8/§etrace autoremove §8<§eParameter§8> §8- §7Remove last Trace Record automatically
 TRACE_COMMAND_HELP_SHOW = §8/§etrace show §8<§eParameter§8> - §7Shows all TNT-positions
-TRACE_COMMAND_HELP_SHOW_AT=§8/§etrace show §7at §8<§eTIME§8> - §7Shows all Trace Positions at §8<§eTIME§8>
+TRACE_COMMAND_HELP_SHOW_AT = §8/§etrace show §8(§etime§8|§7fuse§8) §7at §8<§eTIME§8> - §7Shows all Trace Positions at §8<§eTIME§8>
-TRACE_COMMAND_HELP_SHOW_AT_WITH=§8/§etrace show §7at §8<§eTIME§8> §7with §8<§eParameter§8> - §7Shows all Trace Positions at §8<§eTIME§8>
+TRACE_COMMAND_HELP_SHOW_FROM = §8/§etrace show §8(§etime§8|§7fuse§8) §7from §8<§eFROM§8> - §7Shows all Trace Positions from §8<§eFROM§8>
-TRACE_COMMAND_HELP_SHOW_FROM=§8/§etrace show §7from §8<§eFROM§8> - §7Shows all Trace Positions from §8<§eFROM§8>
+TRACE_COMMAND_HELP_SHOW_FROM_TO = §8/§etrace show §8(§etime§8|§7fuse§8) §7from §8<§eFROM§8> §7to §8<§eTO§8> - §7Shows all Trace Positions from §8<§eFROM§8> to §8<§eTO§8>
-TRACE_COMMAND_HELP_SHOW_FROM_WITH=§8/§etrace show §7from §8<§eFROM§8> §7with §8<§eParameter§8> - §7Shows all Trace Positions from §8<§eFROM§8>
-TRACE_COMMAND_HELP_SHOW_FROM_TO=§8/§etrace show §7from §8<§eFROM§8> §7to §8<§eTO§8> - §7Shows all Trace Positions from §8<§eFROM§8> to §8<§eTO§8>
-TRACE_COMMAND_HELP_SHOW_FROM_TO_WITH=§8/§etrace show §7from §8<§eFROM§8> §7to §8<§eTO§8> §7with §8<§eParameter§8> - §7Shows all Trace Positions from §8<§eFROM§8> to §8<§eTO§8>
 TRACE_COMMAND_HELP_HIDE = §8/§etrace hide §8- §7Hides all TNT-positions
-TRACE_COMMAND_HELP_DELETE=§8/§etrace delete §8[§eTrace§8] §8- §7Deletes all TNT-positions or a Trace
+TRACE_COMMAND_HELP_DELETE = §8/§etrace delete §8- §7Deletes all TNT-positions
-TRACE_COMMAND_HELP_ISOLATE=§8/§etrace isolate §8[§eTrace§8] §8[§eTNT§8] §8- §7Isolates specific TNTs from the Trace
+
-TRACE_COMMAND_HELP_BROADCAST=§8/§etrace broadcast §8- §7Share your current Trace show state with others
-TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Follow a players Trace show state
-TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Unfollow the Trace show state
 TRACE_GUI_ITEM_NAME = §eTracer
 TRACE_GUI_ITEM_LORE = §7Status§8: {0}
 TRACE_GUI_NAME = Trace Gui
@@ -478,12 +535,13 @@ TRACE_GUI_TRACE_ACTIVE_AUTO=§eAuto-Trace is active
 TRACE_GUI_AUTO_TRACE_INACTIVE = §eacitvate Auto-Tracer
 TRACE_GUI_AUTO_TRACE_ACTIVE = §edeactivate Auto-Tracer
 TRACE_GUI_DELETE = §eDelete trace
+
 # Loader
 LOADER_SETUP = §eSetup
 LOADER_RUNNING = §aRunning
 LOADER_PAUSE = §7Pause
 LOADER_END = §8Finished
-LOADER_SINGLE=§aSingle
+
 LOADER_MESSAGE_INTERACT=§e{0} added {1}
 LOADER_MESSAGE_UNINTERACT=§eRemoved Element
 LOADER_BUTTON_TNT=TNT
@@ -501,10 +559,10 @@ LOADER_BUTTON_LECTERN=Lectern
 LOADER_BUTTON_TRAPDOOR=Trapdoor
 LOADER_BUTTON_DOOR=Door
 LOADER_BUTTON_FENCEGATE=Fencegate
+
 LOADER_HELP_SETUP=§8/§eloader setup §8- §7Starts recording actions
 LOADER_SETUP_STOP_FIRST=§cPlease stop the current loader first!
-LOADER_HELP_START=§8/§eloader start §8- §7Playback of previously recorded actions
+LOADER_HELP_START=§8/§eloader start §8- §7Playback of previously recorded action
-LOADER_HELP_SINGLE=§8/§7loader single - §7Single playback of previously recoded actions
 LOADER_HELP_PAUSE=§8/§7loader pause §8- §7Pauses Loader
 LOADER_HELP_GUI=§8/§7loader gui §8- §7Shows Loader gui
 LOADER_HELP_STOP=§8/§eloader stop §8- §7Stops recording/playback
@@ -515,11 +573,12 @@ LOADER_NEW=§7Load your cannon and fire it once, to initialise the loader.
 LOADER_HOW_TO_START=§7Then, execute /§eloader start§7 to start the Loader
 LOADER_ACTIVE=§7The Loader is now active.
 LOADER_STOP=§7The Loader has been stopped.
-LOADER_SINGLE_CMD=§7The Loader does a single playback.
 LOADER_PAUSED=§7The Loader is now paused.
 LOADER_SMALL_TIME=§cThe wait time is too small
 LOADER_NEW_TIME=§7The wait time is now: {0}
 LOADER_NEW_LOAD_TIME=§7The action wait time is now: {0}
+LOADER_PERMS=§cYou are not allowed to use the Loader here
+
 LOADER_NOTHING_RECORDED=§cYou have not recorded anything yet!
 LOADER_GUI_TITLE=Loader GUI
 LOADER_GUI_SHOW_ALL=Show all
@@ -536,6 +595,7 @@ LOADER_GUI_SETTINGS_COPY=§7Copy
 LOADER_GUI_SETTINGS_DELETE=§cDelete
 LOADER_GUI_WAIT_TITLE=Settings
 LOADER_GUI_WAIT_BACK=§8Back
+
 LOADER_GUI_CLICK_TO_EDIT=§7Click to edit
 LOADER_GUI_ITEM_NAME=§7{0}§8: §e{1}
 LOADER_SETTING_NAME=§7{0}
@@ -570,6 +630,7 @@ LOADER_INTERACTION_OPEN=Open
 LOADER_INTERACTION_CLOSED=Closed
 LOADER_INTERACTION_COMPARE=Compare
 LOADER_INTERACTION_SUBTRACT=Subtract
+
 # Loadtimer
 LOADTIMER_HELP_OVERVIEW=§7Compete with your friends loading your cannon and get information about the cannon
 LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Starts the simple Loadtimer
@@ -599,6 +660,7 @@ LOADTIMER_SUMARY_TIMES_LAST=§7\\/
 LOADTIMER_SUMARY_STATS_HEAD=§7Cannon-Stats§8:
 LOADTIMER_SUMARY_STATS_TNT=§7TNT: §e{0}
 LOADTIMER_SUMARY_STATS_FREQ=§7Loading frequency: §e{0}/m§8, §7Shot frequency: §e{1}/m
+
 # Observer
 OBSERVER_HELP = §7Right-Click an Observer to get the Trace. Flame particles have to be enabled. The Particles will be shown in the block.
 OBSERVER_HELP_ENABLE = §8/§eobserver enable §8-§7 Activates the Observer-Tracer
@@ -610,6 +672,7 @@ OBSERVER_DISABLE=§7Observer trace stopped
 OBSERVER_DELETE = §7Observer trace deleted
 OBSERVER_RETRACE_DONE = §7Observer trace retraced
 OBSERVER_RETRACE_NO_TRACE = §7No Observer trace to retrace
+
 # Other
 OTHER_ITEMS_TELEPORT_NAME=§eTeleporter
 OTHER_ITEMS_TELEPORT_GUI_NAME=Teleport
@@ -631,9 +694,10 @@ OTHER_NOCLIP_SLOT_HELP_PICK=§8/§eslot pick §8-§7 Take the faced block into y
 OTHER_NOCLIP_SLOT_HELP_DROP = §8/§eslot drop §8-§7 Clears your slot
 OTHER_CLEAR_HELP_SELF=§8/§eclear §8- §7Clears your inventory
 OTHER_CLEAR_HELP_PLAYER=§8/§eclear §8[§7Player§8] §8- §7Clears a player inventory
-OTHER_CLEAR_CLEARED=§7Your inventory was cleared.
+OTHER_CLEAR_CLEARED=Your inventory was cleared.
-OTHER_CLEAR_FROM=§7Your invetnory was cleared by {0}.
+OTHER_CLEAR_FROM=Your invetnory was cleared by {0}.
-OTHER_CLEAR_TO=§7The inventory of {0} §7was cleared.
+OTHER_CLEAR_TO=The inventory of {0} §7was cleared.
+OTHER_CLEAR_NO_PERMS=§cYou are not allowed to clear other's inventory here.
 OTHER_DECLUTTER_HELP=§8/§edeclutter §8- §7Organise your inventory
 OTHER_DECLUTTER_DONE=§aYour inventory was organised.
 OTHER_GAMEMODE_UNKNOWN=§cUnknown gamemode.
@@ -649,6 +713,7 @@ OTHER_TELEPORT_SELF_2=§cBlocks left to travel: 0; ETA: 0:00
 OTHER_TELEPORT_SELF_3=§cA little Movement is important.
 OTHER_TELEPORT_SELF_4=§cFor such a distance?
 OTHER_TIME_HELP=§8/§etime §8<§7Time 0=Morining§8, §76000=Midday§8, §718000=Midnight§8> - §7Sets the time on the Build
+OTHER_TIME_NO_PERM=§cYou are not allowed to change the time here
 OTHER_TIME_INVALID=§cPlease input a time between 0 and 24000
 OTHER_TIME_RESULT=§7§oWhooosh
 OTHER_TPS_HEAD = §7TPS: 1s     10s    1m     5m     10m
@@ -677,6 +742,7 @@ NIGHT_VISION_OFF=§eNightvision deactivated
 NIGHT_VISION_ON=§eNightvision activated
 NIGHT_VISION_ITEM_ON = §7Nightvision: §eActivated
 NIGHT_VISION_ITEM_OFF = §7Nightvision: §eDeactivated
+
 #Navigation Wand
 NAVIGATION_WAND=§eNavigation Wand
 NAVIGATION_WAND_LEFT_CLICK=§eLeft click: jump to location
@@ -713,6 +779,17 @@ MATERIAL_FLAMMABLE=§8- §eFlammable block
 MATERIAL_BURNABLE=§8- §eBurnable block
 MATERIAL_WATERLOGGABLE=§8- §eWaterloggable block
 MATERIAL_UNMOVABLE=§8- §eUnmovable block
+# Redstonetester
+RT_HELP=§8/§eredstonetester §8-§7 Gives you the redstone tester
+RT_GIVEN=§7Measure the time between activation of components
+RT_ITEM_NAME=§eRedstonetester
+RT_ITEM_LORE_1=§eLeftclick block §8-§7 Sets the 1. Position
+RT_ITEM_LORE_2=§eRightclick block §8-§7 Sets the 2. Position
+RT_ITEM_LORE_3=§eShift-rightclick in air §8-§7 Reset
+RT_LOC=§8: §e{0} {1} {2}
+RT_INVALID_LOC=§cUnknown Position
+RT_RESULT=§7Difference§8: §e{0}§7 Ticks §8,§7 R-Ticks §e{1}
+RT_ACTIVATE=§7Positions deleted§8.
 # Region Items
 REGION_ITEM_COLOR=§7Color: §e{0}
 REGION_ITEM_COLOR_CHOOSE=Choose color
@@ -738,32 +815,35 @@ REGION_COLOR_HELP_COLOR=§8/§ecolor §8[§7Color§8] §8- §7Sets the color of
 REGION_COLOR_HELP_COLOR_TYPE=§8/§ecolor §8[§7Color§8] §8[§7Type§8] §8- §7Sets the color of the region or globally
 REGION_COLOR_GLOBAL=§7All regions color set to §e{0}
 REGION_COLOR_NO_REGION=§cYou are currently not in any region
+REGION_COLOR_NO_PERMS=§cThis is not your world!
 REGION_FIRE_HELP=§8/§efire §8- §7Toggle fire damage
+REGION_FIRE_NO_PERMS=§cYou are not allowed to toggle fire damage here
 REGION_FIRE_ENABLED=§cFire damage deactivated in this region
 REGION_FIRE_DISABLED=§aFire damage activated in this region
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
+REGION_FREEZE_NO_PERMS=§cYou are not allowed to freeze this world
 REGION_FREEZE_ENABLED=§cRegion frozen
 REGION_FREEZE_DISABLED=§aRegion thawed
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
+REGION_ITEMS_NO_PERMS=§cYou are not allowed to toggle items in this world
 REGION_ITEMS_ENABLED=§aItems enabled in this region
+REGION_ITEMS_DISABLED_GLOBAL=§cItems disabled in this world
 REGION_ITEMS_DISABLED=§cItems disabled in this region
 REGION_PROTECT_HELP=§8/§eprotect §8- §7Protect the region
 REGION_PROTECT_DISABLE=§cProtection disabled
 REGION_PROTECT_ENABLE=§aProtection enabled
+REGION_PROTECT_NO_PERMS=§cYou are not allowed to protect the floor here
 REGION_PROTECT_FALSE_REGION=§cYou are not currently in a (M)WG-region
-REGION_NO_GRAVITY_HELP = §8/§enogravity §8- §7Toggle NoGravity
-REGION_NO_GRAVITY_ENABLED = §aNoGravity enabled in this region
-REGION_NO_GRAVITY_DISABLED = §cNoGravity disabled in this region
 REGION_REGION_HELP_UNDO=§8/§eregion undo §8- §7undo the last 20 /testblock or /reset
 REGION_REGION_HELP_REDO=§8/§eregion redo §8- §7redo the last 20 §8/§7rg undo
 REGION_REGION_HELP_RESTORE=§8/§eregion restore §8- §7Resets the region, without removing your builds
 REGION_REGION_HELP_RESTORE_SCHEMATIC=§8/§eregion restore §8[§7Schematic§8] §8- §7Resets the region, withoout removing your builds
 REGION_REGION_HELP_COPYPOINT=§8/§eregion copypoint §8- §7Teleport to the regions copy point
 REGION_REGION_HELP_TESTBLOCKPOINT=§8/§eregion testblockpoint §8- §7Teleport to the regions dummy point
+REGION_REGION_HELP_CHANGETYPE_INFO=§8/§eregion changetype §8- §7Returns the region type
+REGION_REGION_HELP_CHANGETYPE=§8/§eregion changetype §8[§7Type§8] §8- §8Sets the region type
 REGION_REGION_HELP_CHANGESKIN_INFO=§8/§eregion changeskin §8- §7Returns the region skin
 REGION_REGION_HELP_CHANGESKIN=§8/§eregion changeskin §8[§7Skin§8] §8- §8Sets the region skin
-REGION_REGION_HELP_COPY=§8/§eregion copy [-e] [-s] §8- §8Copy the build area optional with extensions or selection at the copypoint 
-REGION_REGION_HELP_PASTE=§8/§eregion paste [-a] [-s] §8[§7Skin§8] §8- §8Pastes at the copypoint optional without air and selecting the pasted region
 REGION_REGION_NOTHING_UNDO=§cNothing left to undo
 REGION_REGION_UNDID=§7Last action undone
 REGION_REGION_NOTHING_REDO=§cNothing left to redo
@@ -777,9 +857,13 @@ REGION_REGION_TP_COPY=§7Teleported to the copy point
 REGION_REGION_TP_TEST_BLOCK=§7Teleported to the tesblock
 REGION_REGION_TP_UNKNOWN=§cUndefined teleport point
 REGION_REGION_NO_REGION=§cYou are not inside any region
-REGION_REGION_NO_BUILD=§cThis region has no build area
+REGION_REGION_NO_PERMS=§cYou are not allowed to change the region
-REGION_REGION_COPY_DONE=§eBuild region or selection copied
+REGION_REGION_CHANGETYPE_INFO=§7RRegion type is §e{0}
-REGION_REGION_PASTE_DONE=§eBuild region or selection pasted
+REGION_REGION_CHANGETYPE_UNKNOWN=§cRegion type is invalid
+REGION_REGION_CHANGETYPE_INVALID=§cRegion type is not allowed here
+REGION_REGION_CHANGETYPE_CHANGE=§7Region type changed to §e{0}
+REGION_REGION_CHANGETYPE_CHANGE_UPDATE=§7Click §e§lHERE §7to change the region type
+REGION_REGION_CHANGETYPE_CHANGE_UPDATE_HOVER=§8/§ereset
 REGION_REGION_CHANGESKIN_INFO=§7Region skin is §e{0}
 REGION_REGION_CHANGESKIN_INFO_CREATOR=§7Skin created by §e{0}
 REGION_REGION_CHANGESKIN_UNKNOWN=§cRegion skin is invalid
@@ -791,6 +875,7 @@ REGION_RESET_HELP_RESET=§8/§ereset §8- §7Resets the region
 REGION_RESET_HELP_SCHEMATIC=§8/§ereset §8[§7Schematic§8] §8- §7Resets the region using a schematic
 REGION_RESET_RESETED=§7Region reset
 REGION_RESET_ERROR=§cError reseting the region
+REGION_RESET_NO_PERMS=§cYou are not allowed to reset the region here
 REGION_RESET_NO_REGION=§cYou are currently not in any region
 REGION_TB_HELP_RESET=§8/§etestblock §8- §7Reset the dummy
 REGION_TB_HELP_RESET_EXTENSION=§8/§etestblock §8[§7ExtensionType§8] §8- §7Reset the dummy
@@ -798,6 +883,7 @@ REGION_TB_HELP_SCHEMATIC=§8/§etestblock §8[§7Schematic§8] §8- §7Reset the
 REGION_TB_HELP_SCHEMATIC_EXTENSION=§8/§etestblock §8[§7Schematic§8] §8[§7ExtensionType§8] §8- §7Reset the dummy using a schematic
 REGION_TB_DONE=§7Dummy reset
 REGION_TB_ERROR=§cError resetting the dummy
+REGION_TB_NO_PERMS=§cYou are not allowed to reset the dummy here
 REGION_TB_NO_REGION=§cYou are currently not in any region
 REGION_TB_NO_SCHEMSHARING=§cYou currently cannot share schematics until {0}.
 REGION_TB_NO_SCHEMRECEIVING=§cThe Owner of this build server cannot receive any schematics until {0}.
@@ -807,42 +893,52 @@ REGION_TNT_ON=§aTNT-Damage activated
 REGION_TNT_OFF=§cTNT-Damage deactivated
 REGION_TNT_TB=§aTNT-Damage activated outside the building area
 REGION_TNT_BUILD=§aTNT-Damage activated outside the testblok area
+REGION_TNT_NO_PERMS=§cYou are not allowed to toggle tnt damage here
 REGION_TNT_BUILD_DESTROY=§cAn explosion would have destroyed blocks in the building area
 REGION_TNT_TB_DESTROY=§cAn explosion would have destroyed blocks in the testblock area
-AFK_KICK_MESSAGE=§cNothing happened on this server for 15 minutes.
+
+AFK_KICK_MESSAGE=§cNothing happened on this server for 5 minutes.
 AFK_WARNING_MESSAGE=§cThis server will stop in one minute if you remain inactive
+
 SKIN_HELP = §8/§eskin §8[§7Shortform§8] §8[§7Creator§8|§epublic§8] §8[§7Name...§8] §8- §7Creates the skin schematic. Use 'public' as creator to have no creator, then copy the message to YoyoNow by clicking
 SKIN_NO_REGION=§7You are not in a region with a changealbe skin
 SKIN_ALREADY_EXISTS=§cThis skin already exists like this
 SKIN_MESSAGE=§7Skin created
 SKIN_MESSAGE_HOVER=§eClick to copy for YoyoNow and send
+
 # Panzern
 PANZERN_HELP = §8/§epanzern §8[§7Block§8] §8[§7Slab§8] §8- §7Armor your WorldEdit selection
 PANZERN_PREPARE1 = §71. Check, if barrels reach until border of armor.
 PANZERN_PREPARE2 = §72. Carpet on the floor in walkways helps with armoring.
 PANZERN_PREPARE3 = §73. Shieldtechnology should be encased.
 PANZERN_PREPARE4 = §74. Standing in the region that is being armored can improve armoring.
+PANZERN_NO_PERM = §cYou are not allowed to use the armoring system here
 PANZERN_NO_WORLDEDIT = §cYou have no WorldEdit selcetion
 PANZERN_PROGRESS = §e{0} §7Blocks left, §e{1} §7Blocks per second, §e{2} §7block delta
 PANZERN_DONE = §aDone
+
 # Laufbau
 LAUFBAU_HELP = §8/§elaufbau §8[§7smallest§8|§7blastresistant§8] §8- §7Build a barrel in your WorldEdit selection using the traces
 LAUFBAU_HELP_SETTINGS = §8/§elaufbau settings §8- §7Opens the settings GUI
 LAUFBAU_PREPARE1 = §71. Trace the cannons as often as necessary, in all modes.
 LAUFBAU_PREPARE2 = §72. Try to delete all fails from the traces.
+LAUFBAU_NO_PERM = §cYou are not allowed to use the barrel building system here
 LAUFBAU_NO_WORLDEDIT = §cYou don't have a WorldEdit selection
 LAUFBAU_STATE_FILTERING_TRACES = Filtering traces
 LAUFBAU_STATE_PROCESSING_TRACES = Connnecting traces
 LAUFBAU_STATE_CREATE_LAUF = Create Barrel
 LAUFBAU_SIMPLE_PROGRESS = §e{0}§8: §e{1}§8/§e{2} §7Time left§8: §e{3}
 LAUFBAU_DONE = §aDone
+
 LAUFBAU_SETTINGS_GUI_NAME = §eLaufbau
 LAUFBAU_SETTINGS_ACTIVE = §aActive
 LAUFBAU_SETTINGS_INACTIVE = §cInactive
 LAUFBAU_SETTINGS_MIXED = §e{0}§8/§e{1} §aActive
 LAUFBAU_SETTINGS_GUI_BACK = §eBack
+
 LAUFBAU_SETTINGS_TOGGLE = §eClick §8-§7 Toggle
 LAUFBAU_SETTINGS_ADVANCED = §eMiddle-Click §8-§7 Advanced settings
+
 LAUFBAU_BLOCK_COBWEB = §eCobweb
 LAUFBAU_BLOCK_GRASS_PATH = §eGrass Path
 LAUFBAU_BLOCK_SOUL_SAND = §eSoul Sand
@@ -885,31 +981,39 @@ LAUFBAU_BLOCK_AZALEA=§eAzalea
 LAUFBAU_BLOCK_CANDLE = §eCandle
 LAUFBAU_BLOCK_CANDLE_CAKE = §eCake with Candle
 LAUFBAU_BLOCK_LECTERN = §eLectern
+
 LAUFBAU_FACING_NORTH = §8-§7 Facing North
 LAUFBAU_FACING_SOUTH = §8-§7 Facing South
 LAUFBAU_FACING_WEST = §8-§7 Facing West
 LAUFBAU_FACING_EAST = §8-§7 Facing East
 LAUFBAU_FACING_UP = §8-§7 Facing Up
 LAUFBAU_FACING_DOWN = §8-§7 Facing Down
+
 LAUFBAU_COUNT_1 = §8-§7 Count 1
 LAUFBAU_COUNT_2 = §8-§7 Count 2
 LAUFBAU_COUNT_3 = §8-§7 Count 3
 LAUFBAU_COUNT_4 = §8-§7 Count 4
+
 LAUFBAU_LAYERS_8 = §8-§7 Layers 8
 LAUFBAU_LAYERS_7 = §8-§7 Layers 7
 LAUFBAU_LAYERS_6 = §8-§7 Layers 6
 LAUFBAU_LAYERS_3 = §8-§7 Layers 3
 LAUFBAU_LAYERS_2 = §8-§7 Layers 2
+
 LAUFBAU_TYPE_BOTTOM = §8-§7 Type bottom
 LAUFBAU_TYPE_TOP = §8-§7 Type top
+
 LAUFBAU_HALF_BOTTOM = §8-§7 Half bottom
 LAUFBAU_HALF_TOP = §8-§7 Half top
+
 LAUFBAU_OPEN = §8-§7 Opened
+
 LAUFBAU_ATTACHMENT_CEILING = §8-§7 Attachment Ceiling
 LAUFBAU_ATTACHMENT_FLOOR = §8-§7 Attachment Floor
 LAUFBAU_ATTACHMENT_DOUBLE_WALL = §8-§7 Attachment double Wall
 LAUFBAU_ATTACHMENT_SINGLE_WALL = §8-§7 Attachment single Wall
 LAUFBAU_ATTACHMENT_WALL = §8-§7 Attachment Wall
+
 LAUFBAU_CONNECTION_FLOOR = §8-§7 Connection Floor
 LAUFBAU_CONNECTION_NORTH = §8-§7 Connection North
 LAUFBAU_CONNECTION_SOUTH = §8-§7 Connection South
@@ -917,22 +1021,29 @@ LAUFBAU_CONNECTION_EAST=§8-§7 Connection East
 LAUFBAU_CONNECTION_WEST = §8-§7 Connection West
 LAUFBAU_CONNECTION_DOWN = §8-§7 Connection Bottom
 LAUFBAU_CONNECTION_UP = §8-§7 Connection Top
+
 LAUFBAU_HANGING = §8-§7 hanging
+
 LAUFBAU_SHAPE_STRAIGHT = §8-§7 Shape straight
 LAUFBAU_SHAPE_OUTER_LEFT = §8-§7 Shape outer links
 LAUFBAU_SHAPE_INNER_LEFT = §8-§7 Shape inner left
+
 LAUFBAU_TILT_NONE = §8-§7 Tilt none
 LAUFBAU_TILT_PARTIAL = §8-§7 Tilt partial
+
 # UTILS
 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_NO_PERMS = §cYou are not allowed to use the slection tool here
 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
 SKULL_ITEM = §e{0}§8s Head
+
 SPEED_HELP = §8/§espeed §8[§71§8-§710§8|§edefault§8] §8-§7 Set your flight and walking speed.
 SPEED_CURRENT = §7Current speed§8: §e{0}
 SPEED_TOO_SMALL = §c{0} is too small
@@ -940,9 +1051,11 @@ SPEED_TOO_HIGH=§c{0} is too big
 SPEED_ITEM = §eSpeed
 SPEED_ITEM_LORE = §7Currently: §e
 SPEED_TAB_NAME = Input speed
+
 WORLDEDIT_WAND = WorldEdit Wand
 WORLDEDIT_LEFTCLICK = Left click: select pos #1
 WORLDEDIT_RIGHTCLICK = Right click: select pos #2
+
 TNT_CLICK_HEADER = §8---=== §eTNT §8===---
 TNT_CLICK_ORDER = §eEntity Order§8: §e{0}
 TNT_CLICK_FUSE_TIME = §eFuseTime§8: §e{0}
@@ -954,6 +1067,7 @@ TNT_CLICK_VELOCITY_Y=§7Velocity §eY§8: §e{0}
 TNT_CLICK_VELOCITY_Z = §7Velocity §eZ§8: §e{0}
 TNT_CLICK_COUNT = §7Count §8: §e{0}
 TNT_CLICK_ISOLATE = §eIsolate
+
 SELECT_ITEM_CHOOSE_EXTENSION = Choose extension
 SELECT_ITEM_CHOOSE_SELECTION = Choose selection
 SELECT_ITEM_NORMAL_EXTENSION = §eNormal
@@ -964,13 +1078,17 @@ SELECT_ITEM_RIGHT_CLICK=§7Right-Click to change
 SELECT_ITEM_BAURAHMEN=§eBuild area
 SELECT_ITEM_BAUPLATTFORM=§eBuild platform
 SELECT_ITEM_TESTBLOCK=§eDummy
+
 CHESTFILLER_FILLED = §eChest filled
 CHESTFILLER_COUNT = §7{0}§8: §e§l{1}
+
 PISTON_HELP_1 = §7Right click on piston with a slime ball to calculate the moved blocks.
 PISTON_HELP_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
+
 # Warp
+WARP_DISALLOWED = §cYou are not allowed to use the warp here
 WARP_LOC_X = §7X§8: §e{0}
 WARP_LOC_Y = §7Y§8: §e{0}
 WARP_LOC_Z = §7Z§8: §e{0}
@@ -985,7 +1103,7 @@ WARP_GUI_NAME=Warps
 WARP_GUI_NO=§cNo warps exist
 WARP_GUI_DISTANCE=§7Distance: §e{0} §7blocks
 WARP_GUI_LCLICK=§7Left click to teleport
-WARP_GUI_RCLICK=§7Right click to edit
+WARP_GUI_RCLICK=§7Rickt click to edit
 WARP_INFO_NAME=§7Name: §e{0}
 WARP_HELP_ADD=§8/§ewarp add §8[§7name§8] §8- §7Create a new warp
 WARP_HELP_TELEPORT=§8/§ewarp §8[§7name§8] §8- §7Teleport to a warp
@@ -993,22 +1111,33 @@ WARP_HELP_INFO=§8/§ewarp info §8[§7name§8] §8- §7Information regarding on
 WARP_HELP_DELETE=§8/§ewarp delete §8[§7name§8] §8- §7Delete a warp
 WARP_HELP_GUI=§8/§ewarp gui §8- §7Open the Warp-GUI
 WARP_HELP_LIST=§8/§ewarp list §8- §7List all warps
+
 # WORLD
 STOP_HELP = §8/§estop §8- §7Stops the server
+STOP_NO_PERMS = §cYou do not have the permission to stop the server
 STOP_MESSAGE = §eServer is stopping
+WORLD_EDIT_NO_PERMS = §cYou do not have the permission to use WorldEdit
+
 KICKALL_HELP = §8/§ekickall §8- §7Kick all players from the server except the owner
+KICKALL_NO_PERM = §cThis is not your world!
+
 # Techhider
 TECHHIDER_HELP = §8/§etechhider §8- §7Toggle Techhider
 TECHHIDER_GLOBAL = §cNo techhider in global region
 TECHHIDER_ON = §aTechhider activated
 TECHHIDER_OFF = §cTechhider deactivated
+
 # XRAY
 XRAY_HELP = §8/§exray §8- §7Toggle Xray
 XRAY_GLOBAL = §cNo xray in global region
 XRAY_ON = §aXray activated
 XRAY_OFF = §cXray deactivated
+
+
 # WorldEdit
 COLORREPLACE_HELP = §8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Replace all blocks of one color with another
-TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
+
+TYPEREPLACE_HELP = §8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
+
 # Schematic
 SCHEMATIC_GUI_ITEM=§eSchematics

BauSystem_Main/src/BauSystem_de.properties

@@ -16,17 +16,17 @@
 # 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/>.
 #
+
 PREFIX = §eBau§8System§8»
 TIME = HH:mm:ss
 DATE=........
 COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
 ONLY_SCHEMS=§cDu kannst hier keinen Ordner angeben
+
 PAGE_LIST=§e Seite ({0}/{1}) »»
 LIST_PREVIOUS_PAGE=§eVorherige Seite
 LIST_NEXT_PAGE=§eNächste Seite
-# Permission
+
-NO_PERMISSION=Du darfst dies hier nicht nutzen
-SPECTATOR=§fZuschauer
 # Scoreboard
 SCOREBOARD_TIME = Uhrzeit
 SCOREBOARD_REGION = Region
@@ -34,13 +34,12 @@ SCOREBOARD_TRACE=Trace
 SCOREBOARD_LOADER = Loader
 SCOREBOARD_TPS = TPS
 SCOREBOARD_TPS_FROZEN = §eEingefroren
+
 SCOREBOARD_TRACE_TICKS = Ticks
+
 SCOREBOARD_TECHHIDER = TechHider§8: §aAn
 SCOREBOARD_XRAY = XRay§8: §aAn
-SCOREBOARD_LOCK_TEAM=Bau Lock§8: §eTeam
+
-SCOREBOARD_LOCK_TEAM_AND_SERVERTEAM=Bau Lock§8: §e(Server-) Team
-SCOREBOARD_LOCK_SERVERTEAM=Bau Lock§8: §eServerteam
-SCOREBOARD_LOCK_NOBODY=Bau Lock§8: §cNiemand
 # Flags
 FLAG_COLOR = Color
 FLAG_TNT = TNT
@@ -48,18 +47,24 @@ FLAG_FIRE=Fire
 FLAG_FREEZE = Freeze
 FLAG_PROTECT = Protect
 FLAG_ITEMS = Items
+
 FLAG_FIRE_ALLOW = §can
 FLAG_FIRE_DENY = §aaus
+
 FLAG_FREEZE_ACTIVE = §aan
 FLAG_FREEZE_INACTIVE = §caus
+
 FLAG_PROTECT_ACTIVE = §aan
 FLAG_PROTECT_INACTIVE = §caus
+
 FLAG_TNT_ALLOW = §aan
 FLAG_TNT_DENY = §caus
 FLAG_TNT_ONLY_TB = §7Kein §eBaurahmen
 FLAG_TNT_ONLY_BUILD = §7Kein §eTestblock
+
 FLAG_ITEMS_ACTIVE = §aan
 FLAG_ITEMS_INACTIVE = §caus
+
 FLAG_COLOR_WHITE = §fWeiß
 FLAG_COLOR_ORANGE = §6Orange
 FLAG_COLOR_MAGENTA = §dMagenta
@@ -78,17 +83,21 @@ FLAG_COLOR_BROWN=§eBraun
 FLAG_COLOR_GREEN = §2Grün
 FLAG_COLOR_RED = §cRot
 FLAG_COLOR_BLACK = §0Schwarz
+
 # Region
 REGION_TYPE_NORMAL = Normal
 REGION_TYPE_BUILD = Baubereich
 REGION_TYPE_ONLY_TB = Testblock
+
 # AttributesCopy
 ATTRIBUTES_CANT_COPY = §cDu musst den Item Type in der Hand halten wo du auch drauf guckst.
 ATTRIBUTES_NO_COPY = §cKeine Attribute kopiert.
 ATTRIBUTES_COPIED = §eAttribute kopiert.
+
 ATTRIBUTE_REMOVE_ALL = §eAlle Attribute entfernt.
 ATTRIBUTE_REMOVE_SINGLE = §eAttribut §7{0}§e entfernt.
 ATTRIBUTE_REMOVE_NOT_FOUND = §cAttribut nicht gefunden
+
 # AutoStart
 AUTOSTART_COMMAND_HELP = §8/§etimer §8- §7Legt den AutostartTimer ins Inventar
 AUTOSTART_ITEM_NAME = §eAutostartTimer
@@ -99,12 +108,14 @@ AUTOSTART_MESSAGE_START=§eAutostartTimer gestartet
 AUTOSTART_MESSAGE_RESULT1 = §eZeit §7bis zur §eExplosion §7am Gegner§8:§e {0}§7 in game ticks
 AUTOSTART_MESSAGE_RESULT2 = §7Zeitdifferenz in §egame ticks §7bis {0} Sekunden§8:§e {1}
 AUTOSTART_MESSAGE_RESULT3 = §7Positiv, wenn zu wenig, negativ wenn zu viel
+
 # Backup
 BACKUP_HELP_CREATE=§8/§ebackup create §8- §7Erstelle ein Backup der Region
 BACKUP_HELP_LOAD=§8/§ebackup load §8[§7BackupName§8] §8- §7 Lade ein Backup
 BACKUP_HELP_LIST=§8/§ebackup list §8- §7Liste alle Backups der Region auf
 BACKUP_HELP_GUI=§8/§ebackup gui §8- §7Öffne die Backups in einer GUI
 BACKUP_REGION_NO_REGION=§cDu bist in keiner Region
+BACKUP_NO_PERMS=§cDu darfst hier nicht das Backup System verwenden
 BACKUP_CREATE_SUCCESS=§7Das Backup wurde erstellt
 BACKUP_CREATE_FAILURE=§cDas Backup erstellen ist schiefgegangen
 BACKUP_CREATE_NO_CHANGE=§7Die Region hat keine Veränderung
@@ -115,8 +126,15 @@ BACKUP_LOAD=§7Backup geladen
 BACKUP_INV_NAME=§eBackup
 BACKUP_ITEM_NAME=§eBackup §7von §e{0}
 BACKUP_LORE=§eKlicken zum Laden
+
 # Bau
 BAU_COMMAND_HELP_INFO = §8/§ebau info §8- §7Alias für §8/§ebauinfo
+BAU_COMMAND_HELP_TOGGLEWE = §8/§ebau togglewe §8[§7Player§8] §8- §7Editiere die WorldEdit Rechte eines Spielers
+BAU_COMMAND_HELP_TOGGLEWORLD = §8/§ebau toggleworld §8[§7Player§8] §8- §7Editiere die Welt Rechte eines Spielers
+BAU_UNKNOWN_PLAYER = §cUnbekannter Spieler
+BAU_NO_PLAYER = §cDer Spieler ist kein Mitglied deiner Welt!
+BAU_NO_WORLD = §cDies ist nicht deine Welt!
+
 BAU_INFO_ITEM_NAME = §eBau-Management
 ## This is used in BauInfoBauGuiItem.java
 BAU_INFO_ITEM_LORE_TNT = §7TNT§8: §e{0}
@@ -125,11 +143,18 @@ BAU_INFO_ITEM_LORE_DAMAGE=§7Damage§8: §e{0}
 BAU_INFO_ITEM_LORE_FIRE = §7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR = §7Farbe§8: §e{0}
 BAU_INFO_ITEM_LORE_PROTECT = §7Protect§8: §e{0}
+
 BAU_INFO_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}
+BAU_INFO_COMMAND_MEMBER = §7Mitglieder §8[§7{0}§8]§8: §e
+BAU_INFO_MEMBER_INFO = §e{0}§8[{1}§8,{2}§8] §8
+BAU_INFO_MEMBER_WE_ALLOW = §aWE
+BAU_INFO_MEMBER_WE_DISALLOW = §cWE
+BAU_INFO_MEMBER_WORLD_ALLOW = §aW
+BAU_INFO_MEMBER_WORLD_DISALLOW = §cW
 BAU_INFO_COMMAND_FLAG = §7{0}§8: §7{1}
 BAU_INFO_COMMAND_TPS = §7TPS§8:§e
+
 # Countingwand
 COUNTINGWAND_COMMAND_HELP = §8/§ecountingwand §8- §7Gibt dir ein CountingWand
 COUNTINGWAND_ITEM_NAME = §eZollstock
@@ -139,11 +164,13 @@ COUNTINGWAND_MESSAGE_RCLICK=§7Erste Position bei: §8[§7{0}§8, §7{1}§8, §7
 COUNTINGWAND_MESSAGE_LCLICK = §7Zweite Position bei: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) ({4}§8)
 COUNTINGWAND_MESSAGE_VOLUME = §e{0}
 COUNTINGWAND_MESSAGE_DIMENSION = §e{0}§8, §e{1}§8, §e{2}
+
 # Design Endstone
 DESIGN_ENDSTONE_COMMAND_HELP = §8/§edesign endstone §8- §7Zeige End Stone im Design
 DESIGN_ENDSTONE_REGION_ERROR = §cDiese Region hat keinen Baubereich
 DESIGN_ENDSTONE_ENABLE = §aEndstone im Design ist angezeigt
 DESIGN_ENDSTONE_DISABLE = §cEndstone im Design ist versteckt
+
 # Detonator
 DETONATOR_LOC_REMOVE = §e{0} entfernt
 DETONATOR_LOC_ADD = §e{0} hinzugefügt
@@ -183,6 +210,11 @@ HOTBAR_INVENTORY=Standard Hotbar
 # GUI
 GUI_EDITOR_ITEM_NAME=§eGui Editor
 GUI_NAME=Bau GUI
+GUI_NO_PERMISSION=§cDu hast nicht genug Rechte um dies zu tun
+GUI_NO_OWNER=§cDas ist nicht deine Bauwelt
+GUI_NO_WORLD=§cDu darfst hier die Welt nicht einstellen
+GUI_NO_WORLDEDIT=§cDu darfst hier kein Worldedit benutzen
+GUI_NO_MEMBER=§cDu musst ein Member der Bauwelt sein
 GUI_ITEM_LORE1=§7Du kannst dieses Item zum Öffnen der BauGUI nutzen
 GUI_ITEM_LORE2=§7oder Doppel F (Swap hands) drücken.
 GUI_EDITOR_TITLE=Bau GUI Editor
@@ -193,12 +225,14 @@ GUI_EDITOR_ITEM_TRASH_LORE=§7Item hier rein Legen
 GUI_EDITOR_ITEM_MORE=§eMehr Items
 GUI_EDITOR_ITEM_CLOSE=§eSchließen
 GUI_EDITOR_TITLE_MORE=Item auswählen
+
 # Script
 ## CustomScript
 SCRIPT_HOTKEY_ITEM_NAME = §7Hotkey§8: §e{0}
 SCRIPT_EVENT_ITEM_NAME = §7Event§8: §e{0}
 SCRIPT_COMMAND_ITEM_NAME = §7Befehl§8: §e/{0}
 SCRIPT_ERROR_ONLY_IN_GLOBAL=§cDieses Skript kann nur als globales Skript ausgeführt werden
+
 ## Script Menu GUI
 SCRIPT_MENU_GUI_ITEM_LORE_1 = §7Klicke zum rausnehmen
 SCRIPT_MENU_GUI_ITEM_LORE_2 = §7Shiftklick zum kopieren
@@ -208,6 +242,7 @@ SCRIPT_MENU_GUI_NAME=§eSkript-Menü
 SCRIPT_MENU_GUI_ITEM_ADD_NAME = §eHinzufügen
 SCRIPT_MENU_GUI_ITEM_ADD_LORE = §7Klicke mit einem Buch zum hinzufügen
 SCRIPT_DEPRECATED=§cDie Funktion §e{0}§c ist veraltet und wird demnächst entfernt. Bitte benutze §e{1}§c.
+
 # Shield Printing
 SHIELD_PRINTING_HELP_START = §8/§eshieldprinting start §8- §7Starte das Schild drucken
 SHIELD_PRINTING_HELP_COPY = §8/§eshieldprinting copy §8- §7Kopiert die Schilder
@@ -220,10 +255,13 @@ SHIELD_PRINTING_HELP_STEP_4=§84. §7Editiere die Schilde wenn nötig
 SHIELD_PRINTING_HELP_STEP_5 = §85. §7Kopiere das gedruckte mit §8/§eshieldprinting copy
 SHIELD_PRINTING_HELP_STEP_6 = §86. §7Füge die originale Schematic wieder ein
 SHIELD_PRINTING_HELP_STEP_7 = §87. §7Wende das gedruckte mit §8/§eshieldprinting apply§7 an
+
 SHIELD_PRINTING_NO_REGION = §cDu bist in keiner Region.
 SHIELD_PRINTING_NOT_RUNNING = §cShield printing ist nicht aktiv.
+SHIELD_PRINTING_DISALLOWED = §cDu darfst Shield printing nicht benutzen.
 SHIELD_PRINTING_BOSSBAR = §fBewegungen: {0}
 SHIELD_PRINTING_BOSSBAR_COPIED = §fBewegungen: {0}   Kopiert: {1}
+
 SHIELD_PRINTING_GUI_NAME = §7Schild Drucken
 SHIELD_PRINTING_GUI_APPLY = §aAnwenden
 SHIELD_PRINTING_GUI_STATE_PREVIOUS = §7R-Click§8: §7Vorherige
@@ -241,12 +279,15 @@ SHIELD_PRINTING_GUI_STATE_OPENABLE=§7{0} §fGeöffnet
 SHIELD_PRINTING_GUI_STATE_PISTON = §7{0} §fAusgefahren
 SHIELD_PRINTING_GUI_STATE_POWERABLE = §7{0} §fAktiviert
 SHIELD_PRINTING_GUI_STATE_WALL = §7{0} §fWand Verbindungen
+
 SHIELD_PRINTING_START = §aShield printing wurde gestartet.
 SHIELD_PRINTING_COPY = §aSchilde wurden kopiert.
 SHIELD_PRINTING_APPLY = §aSchilde wurden angewendet.
 SHIELD_PRINTING_STOP = §aShield printing wurde gestoppt.
+
 # Unsign Book
 UNSIGN_HELP=§8/§eunsign §8- §7Mache ein Buch beschreibbar
+
 # Simulator
 SIMULATOR_HELP = §8/§esimulator §8-§7 Legt dir den Simulatorstab ins Inventar
 SIMULATOR_CREATE_HELP = §8/§esimulator create §8[§7name§8] §8-§7 Erstelle einen neuen Simulator
@@ -254,7 +295,10 @@ SIMULATOR_CHANGE_HELP=§8/§esimulator change §8-§7 Wechsel zu einem anderen S
 SIMULATOR_DELETE_HELP = §8/§esimulator delete §8[§7name§8] §8-§7 Löscht den Simulator
 SIMULATOR_START_HELP = §8/§esimulator start §8[§7name§8] §8-§7 Startet die Simulation
 SIMULATOR_COPY_HELP = §8/§esimulator copy §8[§7to-copy§8] §8[§7name§8] §8-§7 Kopiert einen Simulator
+SIMULATOR_NO_PERMS = §cDu darfst hier nicht den Simulator nutzen
+
 SIMULATOR_GUI_ITEM_NAME = §eTNT Simulator
+
 SIMULATOR_NO_SIM_IN_HAND = §cKein Simulator Item gewählt
 SIMULATOR_GUI_SELECT_SIM = Simulator wählen
 SIMULATOR_GUI_CREATE_SIM = §eSimulator erstellen
@@ -268,7 +312,9 @@ SIMULATOR_EDIT_LOCATION=§7Editiere Positionen
 SIMULATOR_EDIT_PROPERTIES = §7Editiere Eigenschaften
 SIMULATOR_EDIT_OTHER = §7Editiere Andere
 SIMULATOR_EDIT_GROUP = §7Editiere Gruppe
+
 SIMULATOR_EDIT_GROUP_MENU = §eEditiere Gruppe
+
 SIMULATOR_WAND_NAME = §eKanonensimulator
 SIMULATOR_WAND_NAME_SELECTED = §7Kanonensimulator §8- §e{0}
 SIMULATOR_WAND_LORE_1 = §eRechtsklick §8- §7Füge eine Position hinzu
@@ -276,7 +322,9 @@ SIMULATOR_WAND_LORE_2=§eSneaken §8- §7Freie Bewegung
 SIMULATOR_WAND_LORE_3 = §eLinksklick §8- §7Starte die Simulation
 SIMULATOR_WAND_LORE_4 = §eRechtsklick Luft §8- §7Öffne die GUI
 SIMULATOR_WAND_LORE_5 = §eDoppel Shift §8- §7Wechsel zwischen TNT und Redstone Block
+
 SIMULATOR_REGION_FROZEN = §cSimulator kann nicht in eingefrorenen Regionen genutzt werden
+
 ## Other
 SIMULATOR_PLUS_ONE = §7+1
 SIMULATOR_PLUS_PIXEL_SHIFT = §eShift §7Click für §e+0,0625
@@ -288,8 +336,11 @@ SIMULATOR_POSITION_X=§7x-Position
 SIMULATOR_POSITION_Y = §7y-Position
 SIMULATOR_POSITION_Z = §7z-Position
 SIMULATOR_BACK = §eZurück
+
 SIMULATOR_GUI_TOTAL_TNT = §7Gesamt TNT§8: §e{0}
+
 SIMULATOR_DELETED = §cSimulator gelöscht
+
 ## GUI
 SIMULATOR_POSITION_EDIT = §ePosition bearbeiten
 SIMULATOR_POSITION_ADD = §ePosition setzen
@@ -303,12 +354,15 @@ SIMULATOR_GUI_NAME=Kanonensimulator
 SIMULATOR_GUI_DELETE = §cTNT löschen
 SIMULATOR_GUI_AUTO_TRACE = §eAutoTrace§8: §7{0}
 SIMULATOR_GUI_MOVE_ALL = §eAlle Verschieben
+
 SIMULATOR_ALIGNMENT_CENTER = §7Verschiebung§8: §eMitte
 SIMULATOR_ALIGNMENT_POSITIVE_X = §7Verschiebung§8: §ePositive X
 SIMULATOR_ALIGNMENT_NEGATIVE_X = §7Verschiebung§8: §eNegative X
 SIMULATOR_ALIGNMENT_POSITIVE_Z = §7Verschiebung§8: §ePositive Z
 SIMULATOR_ALIGNMENT_NEGATIVE_Z = §7Verschiebung§8: §eNegative Z
+
 SIMULATOR_MOVE_ALL_GUI_NAME = TNT Verschieben
+
 SIMULATOR_TNT_SPAWN_GUI_NAME = TNT konfigurieren {0}
 SIMULATOR_TNT_SPAWN_LORE = §eZum Ändern klicken
 SIMULATOR_TNT_SPAWN_COUNT = §7TNT-Anzahl §8- §e{0}
@@ -340,16 +394,19 @@ SIMULATOR_TNT_SPAWN_ADD_IGNITION_PHASE=§eZündphase hinzufügen
 SIMULATOR_TNT_SPAWN_ADD_TNT = §eTNT hinzufügen
 SIMULATOR_TNT_SPAWN_REMOVE_TNT = §cEntfernen
 SIMULATOR_TNT_SPAWN_POSITION_ANVIL_GUI_NAME = Position
+
 # SmartPlace
 SMART_PLACE_HELP = §8/§esmartplace §8-§7 Toggled SmartPlace
 SMART_PLACE_INFO = §7Plaziert rotierbare Blöcke beim §esneaken§7 von dir §eweg§7.
 SMART_PLACE_ENABLE = §aSmartPlace aktiviert
 SMART_PLACE_DISABLE = §cSmartPlace deaktiviert
+
 # InventoryFiller
 INVENTORY_FILL_HELP = §8/§einventoryfill §8- §7Toggled InventoryFill
 INVENTORY_FILL_INFO = §7Hilft dir, Behälter zu füllen, indem du sie beim sneaken ansiehst und den Gegenstand fallen lässt. Oder scrolle einfach auf einen Behälter, um die Menge des gehaltenen Gegenstandes darin zu ändern.
 INVENTORY_FILL_ENABLE = §aInventoryFiller activated
 INVENTORY_FILL_DISABLE = §cInventoryFiller deactivated
+
 # Killchecker
 KILLCHECKER_HELP_ENABLE = §8/§ekillchecker enable §8- §7Aktiviert Killchecker / Berechnet kills neu
 KILLCHECKER_HELP_DISABLE = §8/§ekillchecker disable §8- §7Deaktiviert Killchecker
@@ -358,6 +415,7 @@ KILLCHECKER_INFO2=§7Nur farbige Blöcke wie Wolle, Terracotta, Stained Glass un
 KILLCHECKER_ENABLE = §aKillchecker aktiviert
 KILLCHECKER_DISABLE = §cKillchecker deaktiviert
 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
 BLOCK_COUNTER_HELP_ENABLE = §8/§eblockcounter enable §8- §7Schalte den BlockCounter an
@@ -366,14 +424,17 @@ BLOCK_COUNTER_MESSAGE=§7Schaden §8> §e{0} §7Blöcke  §e{1} §7TNT  §e{2}
 BLOCK_COUNTER_MESSAGE_SECOND = §7Schaden §8> §e{0} §7Blöcke  §e{1} §7TNT  §e{2} §7Blöcke/TNT  §e{3} §7Blöcke/s
 BLOCK_COUNTER_ENABLE = §7BlockCounter angemacht
 BLOCK_COUNTER_DISABLE = §7BlockCounter ausgemacht
+
 # DepthCounter
 DEPTH_COUNTER_MESSAGE = §7Tiefe §8> §7
+
 # TPSLimit
 TPSLIMIT_FREEZE_HELP = §8/§etpslimit 0 §8-§7 Friere TPS ein
 TPSLIMIT_LIMIT_HELP = §8/§etpslimit §8[§720>x>0.5§8] §8-§7 Verlangsame die TPS
 TPSLIMIT_WARP_HELP = §8/§etpslimit §8[§7x>20§8] §8-§7 Beschleunige die TPS
 TPSLIMIT_DEFAULT_HELP = §8/§etpslimit default §8-§7 Setze die TPS auf 20
 TPSLIMIT_HELP = §8/§etpslimit §8-§7 Zeige die jetzige TPS
+
 TICK_FREEZE_HELP = §8/§etick rate 0 §8-§7 Friere TPS ein
 TICK_FREEZE_HELP_2 = §8/§etick freeze §8-§7 Friere TPS ein
 TICK_UNFREEZE_HELP = §8/§etick unfreeze §8-§7 Setze die TPS auf 20
@@ -381,47 +442,59 @@ TICK_LIMIT_HELP=§8/§etick rate §8[§720>x>0.5§8] §8-§7 Verlangsame die TPS
 TICK_WARP_HELP = §8/§etick rate §8[§7x>20§8] §8-§7 Beschleunige die TPS
 TICK_DEFAULT_HELP = §8/§etick rate default §8-§7 Setze die TPS auf 20
 TICK_HELP = §8/§etick rate §8-§7 Zeige die jetzige TPS
+
 TICK_STEPPING_HELP = §8/§etick step §8<§7Ticks§8> §8-§7 Spule n ticks oder 1 vor
 TICK_WARPING_HELP = §8/§etick warp §8<§7Ticks§8> §8<§7TPS§8> §8-§7 Warpe n ticks oder 1 vor
+
 TICK_BOSSBAR = §e{0}§8/§7{1} gesprungen
 TPSLIMIT_GUI_ITEM_NAME = §eTPS Limiter
 TPSLIMIT_GUI_ITEM_LORE = §7Aktuell: §e{0}
 TPSLIMIT_ANVIL_GUI = Neues TPS Limit
 TPSLIMIT_CURRENT = §7Jetziges TPS limit§8: §e{0}
+TPSLIMIT_NO_PERMS = §cDu darfst hier nicht den TPS-Limiter nutzen
 TPSLIMIT_SET = §eTPS limit auf {0} gesetzt.
 TPSLIMIT_FROZEN = §eTPS eingefroren.
+
 # Trace
 TRACE_RECORD=§aan
 TRACE_HAS_TRACES=§ehat Traces
+TRACE_IDLE_SINGLE=§esingle
+TRACE_IDLE_AUTO_EXPLODE=§eauto §8(§7explode§8)
+TRACE_IDLE_AUTO_IGNITE=§eauto §8(§7ignite§8)
+TRACE_MESSAGE_AUTO_IDLE_EXPLODE = §aAuto-Tracer explode gestartet
+TRACE_MESSAGE_AUTO_IDLE_IGNITE = §aAuto-Tracer ignite gestartet
+TRACE_MESSAGE_AUTO_DELETE_INVALID = §cAuto delete kann aktuell nicht genutzt werden
+TRACE_MESSAGE_AUTO_DELETE_ALWAYS = §7Der letzte Schuss wird §eimmer§7 gelöscht
+TRACE_MESSAGE_AUTO_DELETE_NEVER = §7Der letzte Schuss wird §enie§7 gelöscht
+TRACE_MESSAGE_AUTO_DELETE_NO_BUILD_DESTROY = §7Der letzte Schuss wird gelöscht, wenn §ekein§7 Block aus dem §eBaubereich§7 zerstört wurde
+TRACE_MESSAGE_AUTO_DELETE_BUILD_DESTROY = §7Der letzte Schuss wird gelöscht, wenn §eein§7 Block aus dem §eBaubereich§7 zerstört wurde
+TRACE_MESSAGE_AUTO_DELETE_NO_TESTBLOCK_DESTROY = §7Der letzte Schuss wird gelöscht, wenn §ekein§7 Block aus dem §eTestblock§7 zerstört wurde
+TRACE_MESSAGE_AUTO_DELETE_TESTBLOCK_DESTROY = §7Der letzte Schuss wird gelöscht, wenn §eein§7 Block aus dem §eTestblock§7 zerstört wurde
 TRACE_MESSAGE_START = §aTNT-Tracer gestartet
-TRACE_MESSAGE_AUTO_START=§eAuto TNT-Tracer gestartet
+TRACE_MESSAGE_SINGLE = §aSingle-Tracer gestartet
-TRACE_MESSAGE_AUTO_STOP=§cAuto TNT-Tracer gestoppt
 TRACE_MESSAGE_STOP = §cTNT-Tracer gestoppt
-TRACE_MESSAGE_CLEAR=§cAlle TNT-Positionen gelöscht
+TRACE_MESSAGE_DELETE = §cAlle TNT-Positionen gelöscht
+TRACE_MESSAGE_SHOW = §aAlle TNT-Positionen angezeigt
+TRACE_MESSAGE_HIDE = §cAlle TNT-Positionen ausgeblendet
 TRACE_MESSAGE_CLICK_ISOLATE = §eKlicken zum §aisolieren§8/§causblenden
-TRACE_MESSAGE_SHOW_AT=§aTNT-positions angezeigt bei {0}
+TRACE_MESSAGE_DISALLOWED = §cDu darfst hier nicht den TNT-Tracer nutzen
-TRACE_MESSAGE_SHOW_FROM=§aAll TNT-positions angezeigt von {0}
+TRACE_MESSAGE_SHOW_AT = §aTNT-positions angezeigt mit {0} bei {1}
-TRACE_MESSAGE_SHOW_FROM_TO=§aAll TNT-positions angezeigt von {0} bis {1}
+TRACE_MESSAGE_SHOW_FROM = §aAll TNT-positions angezeigt mit {0} von {1}
-TRACE_MESSAGE_BROADCAST=§e{0} teilte seinen Trace-Show-Status.
+TRACE_MESSAGE_SHOW_FROM_TO = §aAll TNT-positions angezeigt mit {0} von {1} bis {2}
-TRACE_MESSAGE_BROADCAST_HOVER=§eZum Ansehen klicken.
-TRACE_MESSAGE_FOLLOW=§aSie folgen nun {0} Trace show state
-TRACE_MESSAGE_FOLLOW_SELF=§cSie können sich selbst nicht folgen!
-TRACE_MESSAGE_UNFOLLOW=§cSie folgen nicht mehr dem Status einer Trace-Show
 TRACE_MESSAGE_SHOW_TO_SMALLER = §cBis muss größer als von sein
-TRACE_MESSAGE_ISOLATE=§eTNT Positionen wurden isoliert
+
-TRACE_COMMAND_HELP_BROADCAST=§8/§etrace broadcast §8- §7Teilt den aktuellen Trace-Show-Status mit anderen
-TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Verfolgen eines Spielers Status anzeigen
-TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Den Status der Trace-Anzeige aufheben
 TRACE_COMMAND_HELP_START = §8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen
+TRACE_COMMAND_HELP_SINGLE = §8/§etrace single §8- §7Startet eine einzelne Aufnahme aller TNT-Positionen
 TRACE_COMMAND_HELP_STOP = §8/§etrace stop §8- §7Stoppt den TNT-Tracer
 TRACE_COMMAND_HELP_AUTO = §8/§etrace toggleauto §8- §7Automatischer Aufnahmenstart
+TRACE_COMMAND_HELP_AUTO_REMOVE = §8/§etrace autoremove §8<§eParameter§8> §8- §7Löscht den letzten Trace automatisch
 TRACE_COMMAND_HELP_SHOW = §8/§etrace show §8<§eParameter§8> - §7Zeigt alle TNT-Positionen
 TRACE_COMMAND_HELP_SHOW_AT = §8/§etrace show §8(§etime§8|§7fuse§8) §7at §8<§eTIME§8> - §7Zeigt alle TNT-Positionen bei §8<§eTIME§8> an
 TRACE_COMMAND_HELP_SHOW_FROM = §8/§etrace show §8(§etime§8|§7fuse§8) §7from §8<§eFROM§8> - §7Zeigt alle TNT-Positionen von §8<§eFROM§8>
 TRACE_COMMAND_HELP_SHOW_FROM_TO = §8/§etrace show §8(§etime§8|§7fuse§8) §7from §8<§eFROM§8> §7to §8<§eTO§8> - §7Zeigt alle TNT-Positionen zwischen §8<§eFROM§8> und §8<§eTO§8>
 TRACE_COMMAND_HELP_HIDE = §8/§etrace hide §8- §7Versteckt alle TNT-Positionen
 TRACE_COMMAND_HELP_DELETE = §8/§etrace delete §8- §7Löscht alle TNT-Positionen
-TRACE_COMMAND_HELP_ISOLATE=§8/§etrace isolate §8[§eTrace§8] §8[§eTNT§8] §8- §7Isoliert spezifische TNTs des Traces
+
 TRACE_GUI_ITEM_NAME = §eTracer
 TRACE_GUI_ITEM_LORE = §7Status§8: {0}
 TRACE_GUI_NAME = Tracer Gui
@@ -431,12 +504,13 @@ TRACE_GUI_TRACE_ACTIVE_AUTO=§eAuto-Trace ist Aktiv
 TRACE_GUI_AUTO_TRACE_INACTIVE = §eAuto-Tracer Aktivieren
 TRACE_GUI_AUTO_TRACE_ACTIVE = §eAuto-Tracer Deaktivieren
 TRACE_GUI_DELETE = §eTrace Löschen
+
 # Loader
 LOADER_SETUP = §eEinrichtung
 LOADER_RUNNING = §aLaufend
 LOADER_PAUSE = §7Pausiert
 LOADER_END = §8Beendet
-LOADER_SINGLE=§aEinmal
+
 LOADER_MESSAGE_INTERACT = §e{0} hinzugefügt {1}
 LOADER_BUTTON_TNT = TNT
 LOADER_BUTTON_SWITCH=Hebel
@@ -453,10 +527,10 @@ LOADER_BUTTON_LECTERN=Lectern
 LOADER_BUTTON_TRAPDOOR=Trapdoor
 LOADER_BUTTON_DOOR=Door
 LOADER_BUTTON_FENCEGATE=Fencegate
+
 LOADER_HELP_SETUP=§8/§eloader setup §8- §7Startet die Aufnahme der Aktionen
 LOADER_SETUP_STOP_FIRST=§cBitte stoppe zuerst den Loader
 LOADER_HELP_START=§8/§eloader start §8- §7Spielt die zuvor aufgenommenen Aktionen ab
-LOADER_HELP_SINGLE=§8/§eloader single §8- §7Spielt die zuvor aufgenommenen Aktionen einmal ab
 LOADER_HELP_PAUSE=§8/§7loader pause §8- §7Pausiert das Abspielen
 LOADER_HELP_GUI=§8/§7loader settings §8- §7Zeigt die Einstellungen an
 LOADER_HELP_STOP=§8/§eloader stop §8- §7Stoppt die Aufnahme bzw. das Abspielen
@@ -467,11 +541,12 @@ LOADER_NEW=§7Belade und feuer einmal die Kanone ab, um den Loader zu initialisi
 LOADER_HOW_TO_START=§7Führe dann /§eloader start§7 um den Loader zu starten
 LOADER_ACTIVE=§7Der Loader ist nun aktiviert.
 LOADER_STOP=§7Der Loader ist nun gestoppt.
-LOADER_SINGLE_CMD=§7Der Loader spielt nun einmal ab.
 LOADER_PAUSED=§7Der Loader ist nun pausiert.
 LOADER_SMALL_TIME=§cDie Wartezeit ist zu klein
 LOADER_NEW_TIME=§7Die Schusswartezeit ist nun: {0}
 LOADER_NEW_LOAD_TIME=§7Die Setzwartezeit ist nun: {0}
+LOADER_PERMS=§cDu darfst hier nicht den Detonator nutzen
+
 LOADER_NOTHING_RECORDED=§cEs wurden keine Elemente aufgenommen!
 LOADER_GUI_TITLE=Loader Einstellungen
 LOADER_GUI_SHOW_ALL=Zeige alles
@@ -488,6 +563,7 @@ LOADER_GUI_SETTINGS_COPY=§7Kopieren
 LOADER_GUI_SETTINGS_DELETE=§cLöschen
 LOADER_GUI_WAIT_TITLE=Wartezeit
 LOADER_GUI_WAIT_BACK=§8Zurück
+
 LOADER_GUI_CLICK_TO_EDIT=§7Klicke zum editieren
 LOADER_GUI_ITEM_NAME=§7{0}§8: §e{1}
 LOADER_SETTING_NAME=§7{0}
@@ -522,6 +598,7 @@ LOADER_INTERACTION_OPEN=Geöffnet
 LOADER_INTERACTION_CLOSED=Geschlossen
 LOADER_INTERACTION_COMPARE=Vergleichen
 LOADER_INTERACTION_SUBTRACT=Subtrahieren
+
 # Loadtimer
 LOADTIMER_HELP_OVERVIEW=§7Messe dich und deine Freunde beim Beladen einer Kanone und bekomme informationen über die Kanone
 LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Startet den einfachen Loadtimer
@@ -551,6 +628,7 @@ LOADTIMER_SUMARY_TIMES_LAST=§7\\/
 LOADTIMER_SUMARY_STATS_HEAD=§7Kanonen-Stats§8:
 LOADTIMER_SUMARY_STATS_TNT=§7TNT: §e{0}
 LOADTIMER_SUMARY_STATS_FREQ=§7Belade Frequenz: §e{0}/m§8, §7Schuss Frequenz: §e{1}/m
+
 # Observer
 OBSERVER_HELP = §7Rechts-Klicke einen Observer um den Trace zu bekommen. Hierfür müssen Flammenpartikel an sein. Die Partikel werden im Block angezeigt.
 OBSERVER_HELP_ENABLE = §8/§eobserver enable §8-§7 Aktiviere den Observer Tracer
@@ -562,6 +640,7 @@ OBSERVER_DISABLE=§7Observer Trace gestoppt
 OBSERVER_DELETE = §7Observer Trace gelöscht
 OBSERVER_RETRACE_DONE = §7Observer Trace neu berechnet
 OBSERVER_RETRACE_NO_TRACE = §7Kein Observer Trace zum neu berechnen
+
 # Other
 OTHER_ITEMS_TELEPORT_NAME=§eTeleporter
 OTHER_ITEMS_TELEPORT_GUI_NAME=Teleportieren
@@ -582,9 +661,10 @@ OTHER_NOCLIP_SLOT_HELP_PICK=§8/§eslot pick §8-§7 Lege den angeguckten Block
 OTHER_NOCLIP_SLOT_HELP_DROP = §8/§eslot drop §8-§7 Cleared deinen Slot
 OTHER_CLEAR_HELP_SELF=§8/§eclear §8- §7Leere dein Inventar
 OTHER_CLEAR_HELP_PLAYER=§8/§eclear §8[§7Player§8] §8- §7Leere ein Spieler Inventar
-OTHER_CLEAR_CLEARED=§7Dein Inventar wurde geleert.
+OTHER_CLEAR_CLEARED=Dein Inventar wurde geleert.
-OTHER_CLEAR_FROM=§7Dein Inventar wurde von {0} §7geleert.
+OTHER_CLEAR_FROM=Dein Inventar wurde von {0} §7geleert.
-OTHER_CLEAR_TO=§7Das Inventar von {0} §7wurde geleert.
+OTHER_CLEAR_TO=Das Inventar von {0} §7wurde geleert.
+OTHER_CLEAR_NO_PERMS=§cDu darfst hier keine fremden Inventare leeren.
 OTHER_DECLUTTER_HELP=§8/§edeclutter §8- §7Räume dein Inventar auf
 OTHER_DECLUTTER_DONE=§aDein Inventar wurde aufgeräumt.
 OTHER_GAMEMODE_UNKNOWN=§cUnbekannter Spielmodus.
@@ -600,6 +680,7 @@ OTHER_TELEPORT_SELF_2=§cNoch zu reisende Blöcke: 0; ETA: 0:00
 OTHER_TELEPORT_SELF_3=§cEin wenig bewegung muss ein.
 OTHER_TELEPORT_SELF_4=§cFür eine solche Distanz?
 OTHER_TIME_HELP=§8/§etime §8<§7Zeit 0=Morgen§8, §76000=Mittag§8, §718000=Mitternacht§8> - §7Setzt die Zeit auf dem Bau
+OTHER_TIME_NO_PERM=§cDu darfst hier nicht die Zeit ändern
 OTHER_TIME_INVALID=§cBitte gib eine Zahl zwischen 0 und 24000 an
 OTHER_TIME_RESULT=§7§oWhooosh
 OTHER_TPS_HEAD = §7TPS: 1s     10s    1m     5m     10m
@@ -626,6 +707,7 @@ NIGHT_VISION_OFF=§eNightvision deaktiviert
 NIGHT_VISION_ON=§eNightvision aktiviert
 NIGHT_VISION_ITEM_ON = §7Nightvision: §eAktiviert
 NIGHT_VISION_ITEM_OFF = §7Nightvision: §eDeaktiviert
+
 #Navigation Wand
 NAVIGATION_WAND=§eNavigation Wand
 NAVIGATION_WAND_LEFT_CLICK=§eLeft click: jump to location
@@ -660,6 +742,17 @@ MATERIAL_INTERACTABLE=§8- §eInterargierbarer Block
 MATERIAL_FLAMMABLE=§8- §eFlammbarer Block
 MATERIAL_BURNABLE=§8- §eBrennbarer Block
 MATERIAL_WATERLOGGABLE=§8- §eWasserspeicherbarer Block
+# Redstonetester
+RT_HELP=§8/§eredstonetester §8-§7 Gibt den RedstoneTester
+RT_GIVEN=§7Messe die Zeit zwischen der Aktivierung zweier Redstone Komponenten
+RT_ITEM_NAME=§eRedstonetester
+RT_ITEM_LORE_1=§eLinksklick Block §8-§7 Setzt die 1. Position
+RT_ITEM_LORE_2=§eRechtsklick Block §8-§7 Setzt die 2. Position
+RT_ITEM_LORE_3=§eShift-Rechtsklick Luft §8-§7 Zurücksetzten
+RT_LOC=§8: §e{0} {1} {2}
+RT_INVALID_LOC=§cUnbekannte Position
+RT_RESULT=§7Differenz§8: §e{0}§7 Ticks §8,§7 R-Ticks §e{1}
+RT_ACTIVATE=§7Positionen gelöscht§8.
 # Region Items
 REGION_ITEM_COLOR=§7Color: §e{0}
 REGION_ITEM_COLOR_CHOOSE=Farbe Wählen
@@ -685,32 +778,35 @@ REGION_COLOR_HELP_COLOR=§8/§ecolor §8[§7Color§8] §8- §7Setze die Farbe de
 REGION_COLOR_HELP_COLOR_TYPE=§8/§ecolor §8[§7Color§8] §8[§7Type§8] §8- §7Setze die Farbe der Region oder Global
 REGION_COLOR_GLOBAL=§7Alle Regions farben auf §e{0}§7 gesetzt
 REGION_COLOR_NO_REGION=§cDu befindest dich derzeit in keiner Region
+REGION_COLOR_NO_PERMS=§cDies ist nicht deine Welt!
 REGION_FIRE_HELP=§8/§efire §8- §7Toggle Feuerschaden
+REGION_FIRE_NO_PERMS=§cDu darfst hier nicht Feuerschaden (de-)aktivieren
 REGION_FIRE_ENABLED=§cRegions Feuerschaden deaktiviert
 REGION_FIRE_DISABLED=§aRegions Feuerschaden aktiviert
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
+REGION_FREEZE_NO_PERMS=§cDu darfst diese Welt nicht einfrieren
 REGION_FREEZE_ENABLED=§cRegion eingefroren
 REGION_FREEZE_DISABLED=§aRegion aufgetaut
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
+REGION_ITEMS_NO_PERMS=§cDu darfst hier nicht Items (de-)aktivieren
 REGION_ITEMS_ENABLED=§aItems aktiviert in dieser Region
 REGION_ITEMS_DISABLED=§cItems deaktiviert in dieser Region
+REGION_ITEMS_DISABLED_GLOBAL=§cItems sind auf dem Server deaktiviert.
 REGION_PROTECT_HELP=§8/§eprotect §8- §7Schütze die Region
 REGION_PROTECT_DISABLE=§cBoden Schutz aufgehoben
 REGION_PROTECT_ENABLE=§aBoden geschützt
+REGION_PROTECT_NO_PERMS=§cDu darfst hier nicht den Boden schützen
 REGION_PROTECT_FALSE_REGION=§cDu befindest dich derzeit in keiner (M)WG-Region
-REGION_NO_GRAVITY_HELP = §8/§enogravity §8- §7Toggle NoGravity
-REGION_NO_GRAVITY_ENABLED = §aNoGravity aktiviert in dieser Region
-REGION_NO_GRAVITY_DISABLED = §cNoGravity deaktiviert in dieser Region
 REGION_REGION_HELP_UNDO=§8/§eregion undo §8- §7Mache die letzten 20 /testblock oder /reset rückgängig
 REGION_REGION_HELP_REDO=§8/§eregion redo §8- §7Wiederhole die letzten 20 §8/§7rg undo
 REGION_REGION_HELP_RESTORE=§8/§eregion restore §8- §7Setzte die Region zurück, ohne das Gebaute zu löschen
 REGION_REGION_HELP_RESTORE_SCHEMATIC=§8/§eregion restore §8[§7Schematic§8] §8- §7Setzte die Region zurück, ohne das Gebaute zu löschen
 REGION_REGION_HELP_COPYPOINT=§8/§eregion copypoint §8- §7Teleportiere dich zum Regions Kopierpunkt
 REGION_REGION_HELP_TESTBLOCKPOINT=§8/§eregion testblockpoint §8- §7Teleportiere dich zum Regions Testblockpunkt
+REGION_REGION_HELP_CHANGETYPE_INFO=§8/§eregion changetype §8- §7Gebe den Regions Type aus
+REGION_REGION_HELP_CHANGETYPE=§8/§eregion changetype §8[§7Type§8] §8- §8Setzte den Regions Type
 REGION_REGION_HELP_CHANGESKIN_INFO=§8/§eregion changeskin §8- §7Gebe den Regions Skin aus
 REGION_REGION_HELP_CHANGESKIN=§8/§eregion changeskin §8[§7Skin§8] §8- §8Setzte den Regions Skin
-REGION_REGION_HELP_COPY=§8/§eregion copy [-e] [-s] §8- §8Kopieren des Baubereichs optional mit Erweiterungen oder Auswahl am Kopierpunkt 
-REGION_REGION_HELP_PASTE=§8/§eregion paste [-a] [-s] §8[§7Skin§8] §8- §8Einfügen am Kopierpunkt optional ohne Luft und Auswahl des eingefügten Bereichs
 REGION_REGION_NOTHING_UNDO=§cNichts zum rückgängig machen
 REGION_REGION_UNDID=§7Letzte Aktion rückgangig gemacht
 REGION_REGION_NOTHING_REDO=§cNichts zum wiederhohlen
@@ -724,9 +820,13 @@ REGION_REGION_TP_COPY=§7Zum Kopierpunkt teleportiert
 REGION_REGION_TP_TEST_BLOCK=§7Zum Testblock teleportiert
 REGION_REGION_TP_UNKNOWN=§cNicht definierter Teleportierpunkt
 REGION_REGION_NO_REGION=§cDu bist in keiner Region
-REGION_REGION_NO_BUILD=§cDiese Region hat kein Baugebiet
+REGION_REGION_NO_PERMS=§cDu darfst hier nicht die Region verändern
-REGION_REGION_COPY_DONE=§eBauregion oder Selektion kopiert
+REGION_REGION_CHANGETYPE_INFO=§7Regions Type ist §e{0}
-REGION_REGION_PASTE_DONE=§eBauregion oder Selektion eingefügt
+REGION_REGION_CHANGETYPE_UNKNOWN=§cRegions Type ist nicht valide
+REGION_REGION_CHANGETYPE_INVALID=§cRegions Type ist nicht erlaubt hier
+REGION_REGION_CHANGETYPE_CHANGE=§7Regions Type ist auf §e{0}§7 geändert
+REGION_REGION_CHANGETYPE_CHANGE_UPDATE=§7Klicke §e§lHIER §7um den Type anzuwenden
+REGION_REGION_CHANGETYPE_CHANGE_UPDATE_HOVER=§8/§ereset
 REGION_REGION_CHANGESKIN_INFO=§7Regions Skin ist §e{0}
 REGION_REGION_CHANGESKIN_INFO_CREATOR=§7Skin erstellt von §e{0}
 REGION_REGION_CHANGESKIN_UNKNOWN=§cRegions Skin ist nicht valide
@@ -738,6 +838,7 @@ REGION_RESET_HELP_RESET=§8/§ereset §8- §7Setzte die Region zurück
 REGION_RESET_HELP_SCHEMATIC=§8/§ereset §8[§7Schematic§8] §8- §7Setzte die Region mit einer Schematic zurück
 REGION_RESET_RESETED=§7Region zurückgesetzt
 REGION_RESET_ERROR=§cFehler beim Zurücksetzen der Region
+REGION_RESET_NO_PERMS=§cDu darfst hier nicht die Region zurücksetzen
 REGION_RESET_NO_REGION=§cDu befindest dich derzeit in keiner Region
 REGION_TB_HELP_RESET=§8/§etestblock §8- §7Setzte den Testblock zurück
 REGION_TB_HELP_RESET_EXTENSION=§8/§etestblock §8[§7ExtensionType§8] §8- §7Setzte den Testblock zurück
@@ -745,6 +846,7 @@ REGION_TB_HELP_SCHEMATIC=§8/§etestblock §8[§7Schematic§8] §8- §7Setzte de
 REGION_TB_HELP_SCHEMATIC_EXTENSION=§8/§etestblock §8[§7Schematic§8] §8[§7ExtensionType§8] §8- §7Setzte den Testblock mit einer Schematic zurück
 REGION_TB_DONE=§7Testblock zurückgesetzt
 REGION_TB_ERROR=§cFehler beim Zurücksetzen des Testblocks
+REGION_TB_NO_PERMS=§cDu darfst hier nicht den Testblock zurücksetzen
 REGION_TB_NO_REGION=§cDu befindest dich derzeit in keiner Region
 REGION_TB_NO_SCHEMSHARING=§cDu kannst aktuell keine Schematics teilen bis {0}.
 REGION_TB_NO_SCHEMRECEIVING=§cDer Besitzer dieses Bauservers kann keine Schematics erhalten bis {0}.
@@ -753,42 +855,51 @@ REGION_TNT_HELP_MODE=§8/§etnt §8[§7Mode§8] §8- §7Setzte das TNT verhalten
 REGION_TNT_ON=§aTNT-Schaden aktiviert
 REGION_TNT_OFF=§cTNT-Schaden deaktiviert
 REGION_TNT_TB=§aTNT-Schaden außerhalb Baurahmen aktiviert
+REGION_TNT_NO_PERMS=§cDu darfst hier nicht TNT-Schaden (de-)aktivieren
 REGION_TNT_BUILD_DESTROY=§cEine Explosion hätte Blöcke im Baubereich zerstört
 REGION_TNT_TB_DESTROY=§cEine Explosion hätte Blöcke im Testblockbereich zerstört
-AFK_KICK_MESSAGE=§cAuf diesem Server ist seit 15 Minuten nichts passiert.
+AFK_KICK_MESSAGE=§cAuf diesem Server ist seit 5 Minuten nichts passiert.
 AFK_WARNING_MESSAGE=§cDieser Server wird bei weiterer Inaktivität in einer Minute gestoppt
+
 SKIN_HELP = §8/§eskin §8[§7Kuerzel§8] §8[§7Creator§8|§epublic§8] §8[§7Name...§8] §8- §7Erstellt die Skin Schematics. 'public' als Creator nutzen für keinen Creator, danach die nachricht an YoyoNow kopieren (mit Click kopieren)
 SKIN_NO_REGION=§7Du steht in keiner Region, welche mit einem Skin versehen werden kann
 SKIN_ALREADY_EXISTS=§cDieser Skin existiert in der Form bereits
 SKIN_MESSAGE=§7Skin erstellt
 SKIN_MESSAGE_HOVER=§eKlicken zum kopieren für YoyoNow und an diesen senden
+
 # Panzern
 PANZERN_HELP = §8/§epanzern §8[§7Block§8] §8[§7Slab§8] §8- §7Panzer deine WorldEdit Auswahl
 PANZERN_PREPARE1 = §71. Gucke nochmal nach, ob Läufe auch bis zur Panzergrenze führen.
 PANZERN_PREPARE2 = §72. Teppich in Gänge auf dem Boden vereinfacht das panzern.
 PANZERN_PREPARE3 = §73. Schildtechnik sollte explizit eingeschlossen sein.
 PANZERN_PREPARE4 = §74. Innerhalb der zu panzernden Region zu stehen, beim Befehlausführen kann das Panzern verbessern.
+PANZERN_NO_PERM = §cDu darfst hier nicht das Panzern System verwenden
 PANZERN_NO_WORLDEDIT = §cDu hast keine WorldEdit Selection
 PANZERN_PROGRESS = §e{0} §7Blöcke übrig, §e{1} §7Blöcke pro Sekunde, §e{2} §7Block Delta
 PANZERN_DONE = §aZuende gepanzert
+
 # Laufbau
 LAUFBAU_HELP = §8/§elaufbau §8[§7smallest§8|§7blastresistant§8] §8- §7Baue einen Lauf in deiner WorldEdit Auswahl mit den Traces
 LAUFBAU_HELP_SETTINGS = §8/§elaufbau settings §8- §7Öffnet die Settings GUI
 LAUFBAU_PREPARE1 = §71. Trace die Kanonen so oft wie nötig, in allen Modi.
 LAUFBAU_PREPARE2 = §72. Versuche alle Fails aus dem Trace zu löschen.
+LAUFBAU_NO_PERM = §cDu darfst hier nicht das Laufbau System verwenden
 LAUFBAU_NO_WORLDEDIT = §cDu hast keine WorldEdit Selection
 LAUFBAU_STATE_FILTERING_TRACES = Traces filtern
 LAUFBAU_STATE_PROCESSING_TRACES = Traces verbinden
 LAUFBAU_STATE_CREATE_LAUF = Lauf erstellen
 LAUFBAU_SIMPLE_PROGRESS = §e{0}§8: §e{1}§8/§e{2} §7Übrige Zeit §8: §e{3}
 LAUFBAU_DONE = §aZuende gebaut
+
 LAUFBAU_SETTINGS_GUI_NAME = §eLaufbau
 LAUFBAU_SETTINGS_ACTIVE = §aAktiv
 LAUFBAU_SETTINGS_INACTIVE = §cInaktiv
 LAUFBAU_SETTINGS_MIXED = §e{0}§8/§e{1} §aAktiv
 LAUFBAU_SETTINGS_GUI_BACK = §eBack
+
 LAUFBAU_SETTINGS_TOGGLE = §eClick §8-§7 Toggle
 LAUFBAU_SETTINGS_ADVANCED = §eMiddle-Click §8-§7 Erweiterte Einstellung
+
 LAUFBAU_BLOCK_COBWEB = §eCobweb
 LAUFBAU_BLOCK_GRASS_PATH = §eGrass Path
 LAUFBAU_BLOCK_SOUL_SAND = §eSoul Sand
@@ -827,31 +938,39 @@ LAUFBAU_BLOCK_AZALEA=§eAzalea
 LAUFBAU_BLOCK_CANDLE = §eKerze
 LAUFBAU_BLOCK_CANDLE_CAKE = §eKuchen mit Kerze
 LAUFBAU_BLOCK_LECTERN = §eLectern
+
 LAUFBAU_FACING_NORTH = §8-§7 Richtung Norden
 LAUFBAU_FACING_SOUTH = §8-§7 Richtung Süden
 LAUFBAU_FACING_WEST = §8-§7 Richtung Westen
 LAUFBAU_FACING_EAST = §8-§7 Richtung Osten
 LAUFBAU_FACING_UP = §8-§7 Richtung Oben
 LAUFBAU_FACING_DOWN = §8-§7 Richtung Unten
+
 LAUFBAU_COUNT_1 = §8-§7 Anzahl 1
 LAUFBAU_COUNT_2 = §8-§7 Anzahl 2
 LAUFBAU_COUNT_3 = §8-§7 Anzahl 3
 LAUFBAU_COUNT_4 = §8-§7 Anzahl 4
+
 LAUFBAU_LAYERS_8 = §8-§7 Ebenen 8
 LAUFBAU_LAYERS_7 = §8-§7 Ebenen 7
 LAUFBAU_LAYERS_6 = §8-§7 Ebenen 6
 LAUFBAU_LAYERS_3 = §8-§7 Ebenen 3
 LAUFBAU_LAYERS_2 = §8-§7 Ebenen 2
+
 LAUFBAU_TYPE_BOTTOM = §8-§7 Type Unten
 LAUFBAU_TYPE_TOP = §8-§7 Type Oben
+
 LAUFBAU_HALF_BOTTOM = §8-§7 Hälfte Unten
 LAUFBAU_HALF_TOP = §8-§7 Hälfte Oben
+
 LAUFBAU_OPEN = §8-§7 Geöffnet
+
 LAUFBAU_ATTACHMENT_CEILING = §8-§7 Befestigung Decke
 LAUFBAU_ATTACHMENT_FLOOR = §8-§7 Befestigung Boden
 LAUFBAU_ATTACHMENT_DOUBLE_WALL = §8-§7 Befestigung beidseitige Wand
 LAUFBAU_ATTACHMENT_SINGLE_WALL = §8-§7 Befestigung einseitige Wand
 LAUFBAU_ATTACHMENT_WALL = §8-§7 Befestigung Wand
+
 LAUFBAU_CONNECTION_FLOOR = §8-§7 Verbindung Boden
 LAUFBAU_CONNECTION_NORTH = §8-§7 Verbindung Norden
 LAUFBAU_CONNECTION_SOUTH = §8-§7 Verbindung Süden
@@ -859,22 +978,29 @@ LAUFBAU_CONNECTION_EAST=§8-§7 Verbindung Osten
 LAUFBAU_CONNECTION_WEST = §8-§7 Verbindung Westen
 LAUFBAU_CONNECTION_DOWN = §8-§7 Verbindung Unten
 LAUFBAU_CONNECTION_UP = §8-§7 Verbindung Oben
+
 LAUFBAU_HANGING = §8-§7 hängend
+
 LAUFBAU_SHAPE_STRAIGHT = §8-§7 Form gerade
 LAUFBAU_SHAPE_OUTER_LEFT = §8-§7 Form äußere links
 LAUFBAU_SHAPE_INNER_LEFT = §8-§7 Form innere links
+
 LAUFBAU_TILT_NONE = §8-§7 Neigung keine
 LAUFBAU_TILT_PARTIAL = §8-§7 Neigung teilweise
+
 # UTILS
 SELECT_HELP = §8/§eselect §8[§7RegionsTyp§8] §8- §7Wähle einen RegionsTyp aus
 SELECT_EXTENSION_HELP = §8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Wähle einen RegionsTyp aus mit oder ohne Extension
+SELECT_NO_PERMS = §cDu darfst hier nicht den Select Befehl verwenden
 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
 SKULL_ITEM = §e{0}§8s Kopf
+
 SPEED_HELP = §8/§espeed §8[§71§8-§710§8|§edefault§8] §8-§7 Setzte deine Flug- und Laufgeschindigkeit.
 SPEED_CURRENT = §7Aktuelle geschwindigkeit§8: §e{0}
 SPEED_TOO_SMALL = §c{0} ist zu klein
@@ -882,9 +1008,11 @@ SPEED_TOO_HIGH=§c{0} ist zu hoch
 SPEED_ITEM = §eGeschwindigkeit
 SPEED_ITEM_LORE = §7Aktuell: §e
 SPEED_TAB_NAME = Geschwindigkeit eingeben
+
 WORLDEDIT_WAND = WorldEdit Wand
 WORLDEDIT_LEFTCLICK = Left click: select pos #1
 WORLDEDIT_RIGHTCLICK = Right click: select pos #2
+
 TNT_CLICK_HEADER = §8---=== §eTNT §8===---
 TNT_CLICK_ORDER = §eEntity Order§8: §e{0}
 TNT_CLICK_FUSE_TIME = §eFuseTime§8: §e{0}
@@ -906,12 +1034,16 @@ SELECT_ITEM_RIGHT_CLICK=§7Rechtklick zum ändern
 SELECT_ITEM_BAURAHMEN=§eBaurahmen
 SELECT_ITEM_BAUPLATTFORM=§eBauplattform
 SELECT_ITEM_TESTBLOCK=§eTestblock
+
 CHESTFILLER_FILLED = §eKiste gefüllt
+
 PISTON_HELP_1 = §7Rechts Klick auf Piston mit einem Slime Ball berechnet dir die bewegten Blöcke.
 PISTON_HELP_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
+
 # Warp
+WARP_DISALLOWED = §cDu darfst hier nicht das Warp System nutzen
 WARP_LOC_X = §7X§8: §e{0}
 WARP_LOC_Y = §7Y§8: §e{0}
 WARP_LOC_Z = §7Z§8: §e{0}
@@ -934,22 +1066,33 @@ WARP_HELP_INFO=§8/§ewarp info §8[§7Name§8] §8- §7Infos zu einem Punkt
 WARP_HELP_DELETE=§8/§ewarp delete §8[§7Name§8] §8- §7Lösche einen Warp
 WARP_HELP_GUI=§8/§ewarp gui §8- §7Öffne die Warp-GUI
 WARP_HELP_LIST=§8/§ewarp list §8- §7Liste alle Warp-Punkt auf
+
 # WORLD
 STOP_HELP = §8/§estop §8- §7Stoppt den Server
+STOP_NO_PERMS = §cDu hast keine Rechte den Server zu stoppen
 STOP_MESSAGE = §eDer Server wird gestoppt
+WORLD_EDIT_NO_PERMS = §cDu darfst hier kein WorldEdit benutzen
+
 KICKALL_HELP = §8/§ekickall §8- §7Kickt alle Spieler vom Server außer den Owner
+KICKALL_NO_PERM = §cDies ist nicht deine Welt!
+
 # Techhider
 TECHHIDER_HELP = §8/§etechhider §8- §7Techhider umschalten
 TECHHIDER_GLOBAL = §cKein Techhider in der globalen region
 TECHHIDER_ON = §aTechhider aktiviert
 TECHHIDER_OFF = §cTechHider deaktiviert
+
 # XRAY
 XRAY_HELP = §8/§exray §8- §7Xray umschalten
 XRAY_GLOBAL = §cKein Xray in der globalen region
 XRAY_ON = §aXray aktiviert
 XRAY_OFF = §cXray deaktiviert
+
+
 # WorldEdit
 COLORREPLACE_HELP = §8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Ersetzt eine Farbe mit einer anderen
+
 TYPEREPLACE_HELP = §8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen
+
 # Schematics
 SCHEMATIC_GUI_ITEM=§eSchematics

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

@@ -22,19 +22,16 @@ package de.steamwar.bausystem;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
+import de.steamwar.bausystem.features.world.RamUsage;
 import de.steamwar.bausystem.linkage.LinkageUtils;
 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.TickListener;
 import de.steamwar.bausystem.worlddata.WorldData;
-import de.steamwar.command.AbstractValidator;
-import de.steamwar.command.SWCommandUtils;
 import de.steamwar.message.Message;
 import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -52,7 +49,6 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     // This should be treated as final!
     public static Message MESSAGE;
-    public static final boolean DEV_SERVER = !System.getProperty("user.home").endsWith("minecraft");
 
     @Getter
     private static BauSystem instance;
@@ -73,40 +69,32 @@ public class BauSystem extends JavaPlugin implements Listener {
         } catch (SecurityException e) {
             Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
             Bukkit.shutdown();
-            System.exit(1);
             return;
         }
 
         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));
-        SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
-        SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
-
-        try {
         LinkageUtils.link();
-        } catch (Exception e) {
+        RamUsage.init();
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-            Bukkit.shutdown();
-            System.exit(1);
-            return;
-        }
         TickListener.impl.init();
-    }
 
-    private <T extends CommandSender> AbstractValidator<T, ?> validator(Permission permission) {
+        // This could disable any watchdog stuff. We need to investigate if this is a problem.
-        return (commandSender, object, messageSender) -> {
+        /*
-            if (commandSender instanceof Player) {
+        Thread thread = new Thread(() -> {
-                if (permission.hasPermission((Player) commandSender)) {
+            while (true) {
-                    return true;
+                WatchdogThread.tick();
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                 }
-                messageSender.send("NO_PERMISSION");
-                return false;
             }
-            return true;
+        });
-        };
+        thread.setName("WatchdogThread ticker");
+        thread.setDaemon(true);
+        thread.start();
+         */
     }
 
     @Override

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

@@ -20,77 +20,43 @@
 package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.features.world.BauMemberUpdate;
+import de.steamwar.command.CommandMetaData;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.sql.BauweltMember;
-import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
-import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.HashSet;
+import java.lang.annotation.ElementType;
-import java.util.Set;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.function.Predicate;
 
 @AllArgsConstructor
 public enum Permission {
 
-    OWNER(bauweltMember -> false),
+    WORLD(BauweltMember::isWorld),
-    SUPERVISOR(bauweltMember -> {
+    WORLDEDIT(BauweltMember::isWorldEdit),
-        return bauweltMember.isSupervisor();
+    MEMBER(bauweltMember -> true),
-    }),
+    OWNER(bauweltMember -> false);
-    BUILD(bauweltMember -> {
-        if (isTempOnlySpectator(bauweltMember)) return false;
-        return bauweltMember.isBuild() || SUPERVISOR.permissionPredicate.test(bauweltMember);
-    }),
-    /**
-     * Only used for {@link BauMemberUpdate}
-     */
-    REAL_SPECTATOR(bauweltMember -> {
-        return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
-    }),
-    /**
-     * Primarily used for {@link de.steamwar.bausystem.linkage.specific.GuiItem}
-     */
-    MEMBER(bauweltMember -> {
-        return true;
-    });
-
-    private static final Set<Integer> TEMP_ONLY_SPECTATOR = new HashSet<>();
-
-    private static boolean isTempOnlySpectator(BauweltMember bauweltMember) {
-        return TEMP_ONLY_SPECTATOR.contains(bauweltMember.getMemberID());
-    }
-    
-    public static boolean isTempOnlySpectator(Player player) {
-        return TEMP_ONLY_SPECTATOR.contains(SteamwarUser.get(player.getUniqueId()).getId());
-    }
-
-    public static void forceOnlySpectator(Player player) {
-        TEMP_ONLY_SPECTATOR.add(SteamwarUser.get(player.getUniqueId()).getId());
-        BauMemberUpdate.baumemberUpdate();
-    }
-
-    /**
-     * Only used by {@link BauMemberUpdate}
-     */
-    public static void removeForceOnlySpectator(Player player) {
-        TEMP_ONLY_SPECTATOR.remove(SteamwarUser.get(player.getUniqueId()).getId());
-    }
 
     private final Predicate<BauweltMember> permissionPredicate;
 
-    public boolean hasPermission(BauweltMember bauweltMember) {
+    public boolean hasPermission(Player member) {
-        if (bauweltMember == null) return false;
+        if (member.getUniqueId().equals(BauServer.getInstance().getOwner())) {
-        return permissionPredicate.test(bauweltMember);
+            return true;
         }
 
-    public boolean hasPermission(Player member) {
+        BauweltMember bauMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
+        if (bauMember == null) {
-            return this != REAL_SPECTATOR;
+            return false;
         }
-        BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
+
-        if (bauweltMember == null) return this == REAL_SPECTATOR;
+        return permissionPredicate.test(bauMember);
-        return permissionPredicate.test(bauweltMember);
+    }
+
+    public static boolean hasPermission(Player member, Permission permission) {
+        return permission.hasPermission(member);
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/configplayer/Config.java

@@ -97,7 +97,7 @@ public class Config implements Listener {
 
     public void saveAll() {
         playerConfigurations.forEach((uuid, yapionObject) -> {
-            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\+", "\\");
+            String string = yapionObject.toYAPION(new StringOutput()).getResult();
             UserConfig.updatePlayerConfig(uuid, "bausystem", string);
         });
         playerConfigurations.clear();
@@ -112,7 +112,7 @@ public class Config implements Listener {
         UUID uuid = player.getUniqueId();
         if (playerConfigurations.containsKey(uuid)) {
             YAPIONObject yapionObject = playerConfigurations.get(uuid);
-            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\\\+", "\\\\");
+            String string = yapionObject.toYAPION(new StringOutput()).getResult();
             UserConfig.updatePlayerConfig(uuid, "bausystem", string);
         }
     }

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

@@ -44,7 +44,7 @@ public class AttributeRemoveCommand extends SWCommand {
 
     @Register({"all"})
     @Register({"*"})
-    public void genericCommand(@Validator Player player) {
+    public void genericCommand(Player player) {
         ItemStack itemStack = player.getInventory().getItemInMainHand();
         ItemMeta itemMeta = itemStack.getItemMeta();
         itemMeta.setLore(new ArrayList<>());
@@ -53,7 +53,7 @@ public class AttributeRemoveCommand extends SWCommand {
     }
 
     @Register(description = "ATTRIBUTE_REMOVE_COMMAND_HELP")
-    public void genericCommand(@Validator Player player, @Mapper("attribute") String attribute) {
+    public void genericCommand(Player player, @Mapper("attribute") String attribute) {
         ItemStack itemStack = player.getInventory().getItemInMainHand();
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta == null) {

BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesCopyCommand.java

@@ -41,7 +41,7 @@ public class AttributesCopyCommand extends SWCommand {
     }
 
     @Register
-    public void genericCommand(@Validator Player player) {
+    public void genericCommand(Player player) {
         Block block = player.getTargetBlockExact(8, FluidCollisionMode.ALWAYS);
         if (block == null) return;
         ItemStack mainHand = player.getInventory().getItemInMainHand();

BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesPlaceListener.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.attributescopy;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -41,7 +40,6 @@ public class AttributesPlaceListener implements Listener {
 
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ItemStack itemStack = event.getItemInHand();
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta == null) return;

BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartCommand.java

@@ -32,7 +32,7 @@ public class AutoStartCommand extends SWCommand {
     }
 
     @Register(description = "AUTOSTART_COMMAND_HELP")
-    public void genericCommand(@Validator Player p) {
+    public void genericCommand(Player p) {
         SWUtils.giveItemToPlayer(p, AutostartListener.getWandItem(p));
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java

@@ -50,6 +50,6 @@ public class AutoStartGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.MEMBER;
     }
 }

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

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
@@ -30,7 +29,6 @@ import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import lombok.Getter;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Chest;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -68,7 +66,6 @@ public class AutostartListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!ItemUtils.isItem(event.getItem(), "autostart")) {
             return;
         }
@@ -78,12 +75,6 @@ public class AutostartListener implements Listener {
         if (event.getClickedBlock().getBlockData() instanceof Chest) {
             return;
         }
-        if (event.getClickedBlock().getType() == Material.BEDROCK) {
-            event.getClickedBlock().setType(Material.SLIME_BLOCK);
-            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-                event.getClickedBlock().setType(Material.BEDROCK, false);
-            }, 1);
-        }
         activate(event.getPlayer());
     }
 
@@ -92,7 +83,6 @@ public class AutostartListener implements Listener {
         if (!(event.getPlayer() instanceof Player)) {
             return;
         }
-        if(!Permission.BUILD.hasPermission((Player) event.getPlayer())) return;
         if (!ItemUtils.isItem(event.getPlayer().getInventory().getItemInMainHand(), "autostart")) {
             return;
         }

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

@@ -62,7 +62,7 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "create", description = "BACKUP_HELP_CREATE")
-    public void backupCreate(@Validator("owner") Player p) {
+    public void backupCreate(@Validator Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
@@ -79,7 +79,7 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "BACKUP_HELP_LOAD")
-    public void backupLoad(@Validator("owner") Player p, @Mapper("backupName") String backupName) {
+    public void backupLoad(@Validator Player p, @Mapper("backupName") String backupName) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
@@ -130,7 +130,7 @@ public class BackupCommand extends SWCommand {
         }
         SWListInv<String> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
             p.getOpenInventory().close();
-            p.performCommand("backup load " + s);
+            backupLoad(p, s);
         });
         swListInv.open();
     }
@@ -140,6 +140,13 @@ public class BackupCommand extends SWCommand {
         return SWCommandUtils.createMapper(s -> s, (commandSender, s) -> listBackup((Player) commandSender));
     }
 
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> backupValidator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLDEDIT), "BACKUP_NO_PERMS");
+        };
+    }
+
     private List<String> listBackup(Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {

BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java

@@ -0,0 +1,41 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2021  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.bau;
+
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
+import org.bukkit.entity.Player;
+
+@Linked
+public class BauCommand extends SWCommand {
+
+    @LinkedInstance
+    public InfoCommand infoCommand;
+
+    public BauCommand() {
+        super("bau", "b", "gs");
+    }
+
+    @Register(value = "info", description = "BAU_COMMAND_HELP_INFO")
+    public void infoCommand(Player p) {
+        infoCommand.sendBauInfo(p);
+    }
+}

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

@@ -1,73 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.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;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-@Linked
-public class ForceSpectatorCommand extends SWCommand {
-
-    public ForceSpectatorCommand() {
-        super("forcespectator");
-    }
-
-    @Register
-    public void forceSpectator(@Validator("supervisor") Player player, @Mapper("builder") Player other) {
-        Permission.forceOnlySpectator(other);
-    }
-
-    @Mapper("builder")
-    public TypeMapper<Player> spectatorMapper() {
-        return new TypeMapper<>() {
-            @Override
-            public Player map(CommandSender commandSender, String[] previousArguments, String s) {
-                Player player = Bukkit.getPlayer(s);
-                if (player == null) {
-                    return null;
-                }
-                if (Permission.BUILD.hasPermission(player) && !Permission.SUPERVISOR.hasPermission(player)) {
-                    return player;
-                }
-                return null;
-            }
-
-            @Override
-            public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
-                return Bukkit.getOnlinePlayers().stream()
-                        .filter(Permission.BUILD::hasPermission)
-                        .filter(player -> !Permission.SUPERVISOR.hasPermission(player))
-                        .map(Player::getName)
-                        .collect(Collectors.toList());
-            }
-        };
-    }
-}

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

@@ -1,7 +1,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.Region;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -13,7 +12,7 @@ import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.List;
 
 @Linked
 public class InfoCommand extends SWCommand {
@@ -25,8 +24,17 @@ public class InfoCommand extends SWCommand {
         super("bauinfo");
     }
 
-    @Register(description = "BAU_INFO_COMMAND_HELP")
+    @Register(help = true)
+    public void genericHelp(Player p, String... args) {
+        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_HELP", p);
+    }
+
+    @Register
     public void genericCommand(Player p) {
+        sendBauInfo(p);
+    }
+
+    public void sendBauInfo(Player p) {
         BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
         Region region = Region.getRegion(p.getLocation());
         for (Flag flag : Flag.getFlags()) {
@@ -39,28 +47,18 @@ public class InfoCommand extends SWCommand {
             }
         }
 
-        if (Permission.BUILD.hasPermission(p)) {
         List<BauweltMember> members = BauweltMember.getMembers(bauServer.getOwnerID());
-            Map<Permission, List<BauweltMember>> memberByPermission = new HashMap<>();
+        StringBuilder membermessage = new StringBuilder();
-            members.forEach(member -> {
+        membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU_INFO_COMMAND_MEMBER", p, members.size()));
-                if (Permission.SUPERVISOR.hasPermission(member)) {
+
-                    memberByPermission.computeIfAbsent(Permission.SUPERVISOR, __ -> new ArrayList<>()).add(member);
+        for (BauweltMember member : members) {
-                } else if (Permission.BUILD.hasPermission(member)) {
+            membermessage.append(BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_INFO", p,
-                    memberByPermission.computeIfAbsent(Permission.BUILD, __ -> new ArrayList<>()).add(member);
+                    SteamwarUser.get(member.getMemberID()).getUserName(),
-                } else {
+                    member.isWorldEdit() ? BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WE_ALLOW", p) : BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WE_DISALLOW", p),
-                    memberByPermission.computeIfAbsent(Permission.MEMBER, __ -> new ArrayList<>()).add(member);
+                    member.isWorld() ? BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WORLD_ALLOW", p) : BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WORLD_DISALLOW", p)
-                }
+            ));
-            });
-
-            List<BauweltMember> supervisor = memberByPermission.getOrDefault(Permission.SUPERVISOR, Collections.emptyList());
-            BauSystem.MESSAGE.send("BAU_INFO_COMMAND_MEMBER", p, "§eSupervisor", supervisor.size(), supervisor.isEmpty() ? "§8<none>" : joining(supervisor));
-
-            List<BauweltMember> builder = memberByPermission.getOrDefault(Permission.BUILD, Collections.emptyList());
-            BauSystem.MESSAGE.send("BAU_INFO_COMMAND_MEMBER", p, "§6Builder", builder.size(), builder.isEmpty() ? "§8<none>" : joining(builder));
-
-            List<BauweltMember> spectator = memberByPermission.getOrDefault(Permission.MEMBER, Collections.emptyList());
-            BauSystem.MESSAGE.send("BAU_INFO_COMMAND_MEMBER", p, "§7Spectator", spectator.size(), spectator.isEmpty() ? "§8<none>" : joining(spectator));
         }
+        p.sendMessage(membermessage.toString());
 
         StringBuilder tpsMessage = new StringBuilder();
         tpsMessage.append(BauSystem.MESSAGE.parsePrefixed("BAU_INFO_COMMAND_TPS", p));
@@ -71,16 +69,4 @@ public class InfoCommand extends SWCommand {
         tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES));
         p.sendMessage(tpsMessage.toString());
     }
-
-    private String joining(List<BauweltMember> bauweltMembers) {
-        StringBuilder st = new StringBuilder();
-        for (int i = 0; i < bauweltMembers.size(); i++) {
-            if (i != 0) {
-                st.append("§8, ");
-            }
-            st.append("§7");
-            st.append(SteamwarUser.get(bauweltMembers.get(i).getMemberID()).getUserName());
-        }
-        return st.toString();
-    }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java

@@ -48,6 +48,6 @@ public class CountingwandGuiItem extends BauGuiItem {
 
 	@Override
 	public Permission permission() {
-		return Permission.MEMBER;
+		return Permission.WORLDEDIT;
 	}
 }

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

@@ -44,8 +44,7 @@ public class DesignEndStone {
     private REntityServer entityServer = new REntityServer();
     private List<REntity> entities = new ArrayList<>();
     private Set<Location> locations = new HashSet<>();
-    private boolean wsOrAs;
+    private List<Player> players = new ArrayList<>();
-    private double maxBlastResistance;
 
     public DesignEndStone(Region region) {
         this.minX = region.getMinPointBuild().getX();
@@ -54,17 +53,6 @@ public class DesignEndStone {
         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;
-            Location location = new Location(WORLD, rEntity.getX(), rEntity.getY(), rEntity.getZ());
-            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-                location.getBlock().breakNaturally();
-                calc();
-            }, 1);
-        });
     }
 
     public void calc() {
@@ -76,24 +64,8 @@ public class DesignEndStone {
         calc(minX, minY, maxZ, maxX, maxY, maxZ, 0, 0, -1, maxZ - minZ);
         calc(minX, minY, minZ, minX, maxY, maxZ, 1, 0, 0, maxX - minX);
         calc(maxX, minY, minZ, maxX, maxY, maxZ, -1, 0, 0, maxX - minX);
-        if (wsOrAs) {
+        // calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY);
-            calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
+        calc(minX, maxY, minZ, maxX, maxY, maxZ, 0, -1, 0, maxY - minY);
-        } else {
-            int airBlocks = 0;
-            double minAirBlocks = (maxX - minX) * (maxZ - minZ) * 0.1;
-            for (int x = minX; x < maxX; x++) {
-                for (int z = minZ; z < maxZ; z++) {
-                    if (WORLD.getBlockAt(x, minY, z).getType().isAir()) {
-                        airBlocks++;
-                        if (airBlocks > minAirBlocks) break;
-                    }
-                }
-            }
-            if (airBlocks > minAirBlocks) {
-                calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
-            }
-        }
-        calc(minX, maxY, minZ, maxX, maxY, maxZ, 0, -1, 0, maxY - minY + 1);
     }
 
     private void calc(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dirX, int dirY, int dirZ, int steps) {
@@ -105,16 +77,15 @@ public class DesignEndStone {
                         int cy = y + step * dirY;
                         int cz = z + step * dirZ;
                         Material material = WORLD.getBlockAt(cx, cy, cz).getType();
-
+                        if (material == Material.END_STONE || material == Material.END_STONE_BRICKS || material == Material.END_STONE_BRICK_SLAB || material == Material.END_STONE_BRICK_STAIRS || material == Material.END_STONE_BRICK_WALL) {
-                        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;
+                            if (locations.contains(location)) break;
                             RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);
                             entity.setNoGravity(true);
                             entity.setGlowing(true);
                             entities.add(entity);
                             break;
-                        } else if (!material.isAir() && material != Material.WATER && material != Material.LAVA) {
+                        } else if (!material.isAir()) {
                             break;
                         }
                     }
@@ -124,10 +95,12 @@ public class DesignEndStone {
     }
 
     public void toggle(Player player) {
-        if (entityServer.getPlayers().contains(player)) {
+        if (players.contains(player)) {
+            players.remove(player);
             entityServer.removePlayer(player);
             BauSystem.MESSAGE.sendPrefixless("DESIGN_ENDSTONE_DISABLE", player, ChatMessageType.ACTION_BAR);
         } else {
+            players.add(player);
             entityServer.addPlayer(player);
             calc();
             BauSystem.MESSAGE.sendPrefixless("DESIGN_ENDSTONE_ENABLE", player, ChatMessageType.ACTION_BAR);
@@ -135,7 +108,7 @@ public class DesignEndStone {
     }
 
     public boolean removePlayer(Player player) {
-        entityServer.removePlayer(player);
+        players.remove(player);
-        return entityServer.getPlayers().isEmpty();
+        return players.isEmpty();
     }
 }

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

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.design.endstone;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
@@ -34,7 +33,6 @@ import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 
 @Linked
@@ -47,7 +45,7 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
     private Map<Region, DesignEndStone> designEndStoneMap = new HashMap<>();
 
     @Register(description = "DESIGN_ENDSTONE_COMMAND_HELP")
-    public void genericCommand(@Validator Player player) {
+    public void genericCommand(Player player) {
         Region region = Region.getRegion(player.getLocation());
         if (!region.hasType(RegionType.BUILD)) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
@@ -58,20 +56,14 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        disableDesignEndStone(event.getPlayer());
+        Region region = Region.getRegion(event.getPlayer().getLocation());
+        DesignEndStone designEndStone = designEndStoneMap.get(region);
+        if (designEndStone == null) {
+            return;
         }
-
+        if (designEndStone.removePlayer(event.getPlayer())) {
-    @EventHandler
+            designEndStoneMap.remove(region);
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(this::disableDesignEndStone);
         }
-
-    private void disableDesignEndStone(Player player) {
-        new HashSet<>(designEndStoneMap.entrySet()).forEach(regionDesignEndStoneEntry -> {
-            if (regionDesignEndStoneEntry.getValue().removePlayer(player)) {
-                designEndStoneMap.remove(regionDesignEndStoneEntry.getKey());
-            }
-        });
     }
 
     @EventHandler

BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java

@@ -47,6 +47,6 @@ public class DetonatorBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.MEMBER;
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorCommand.java

@@ -58,12 +58,12 @@ public class DetonatorCommand extends SWCommand {
     }
 
     @Register(value = "wand", description = "DETONATOR_HELP_WAND")
-    public void giveWand(@Validator Player p) {
+    public void giveWand(Player p) {
         SWUtils.giveItemToPlayer(p, getWAND(p));
     }
 
     @Register(value = "click", description = "DETONATOR_HELP_CLICK")
-    public void clickDetonator(@Validator Player p) {
+    public void clickDetonator(Player p) {
         Detonator.activateDetonator(new ItemStorage(p));
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.detonator;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
@@ -66,7 +65,6 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         Player p = event.getPlayer();
         if (Detonator.isDetonator(p.getInventory().getItemInMainHand())) {
             event.setCancelled(true);
@@ -77,7 +75,6 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!Detonator.isDetonator(event.getItem())) {
             return;
         }
@@ -92,7 +89,7 @@ public class DetonatorListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer()) ||!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
             if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
                 Detonator.hideDetonator(event.getPlayer());
             }
@@ -113,7 +110,6 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
             HAS_UPDATED.add(event.getPlayer());
         }
@@ -121,7 +117,6 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
             HAS_UPDATED.add(event.getPlayer());
         }

BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java

@@ -81,7 +81,7 @@ public class BauGUI {
                     }
                 } else {
                     p.closeInventory();
-                    BauSystem.MESSAGE.send("NO_PERMISSION", p);
+                    BauSystem.MESSAGE.send("GUI_NO_PERMISSION", p);
                 }
             });
         });
@@ -108,13 +108,26 @@ public class BauGUI {
         if (!permission.hasPermission(p)) {
             List<String> lore = meta.getLore();
             if (lore == null) {
-                lore = Collections.singletonList(BauSystem.MESSAGE.parse("NO_PERMISSION", p));
+                lore = Collections.singletonList(BauSystem.MESSAGE.parse(permissionString(permission), p));
             } else {
-                lore.add(BauSystem.MESSAGE.parse("NO_PERMISSION", p));
+                lore.add(BauSystem.MESSAGE.parse(permissionString(permission), p));
             }
             meta.setLore(lore);
         }
         itemStack.setItemMeta(meta);
         return itemStack;
     }
+
+    private static String permissionString(Permission permission) {
+        switch (permission) {
+            case OWNER:
+                return "GUI_NO_OWNER";
+            case WORLD:
+                return "GUI_NO_WORLD";
+            case WORLDEDIT:
+                return "GUI_NO_WORLDEDIT";
+            default:
+                return "GUI_NO_MEMBER";
+        }
+    }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java

@@ -35,7 +35,7 @@ public class HotbarCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "HOTBAR_HELP_LOAD")
-    public void loadHotbar(@Validator Player p) {
+    public void loadHotbar(Player p) {
         DefaultHotbar.setHotbar(p);
         BauSystem.MESSAGE.send("HOTBAR_LOADED", p);
     }

BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarListener.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.features.hotbar;
 
-import de.steamwar.bausystem.Permission;
 import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -31,7 +30,6 @@ public class HotbarListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (allNull(event.getPlayer().getInventory().getContents()) && allNull(event.getPlayer().getInventory().getArmorContents())) {
             DefaultHotbar.setHotbar(event.getPlayer());
         }

BauSystem_Main/src/de/steamwar/bausystem/features/hullhider/HullCalc.java

@@ -0,0 +1,310 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.hullhider;
+
+import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.type.Slab;
+import org.bukkit.entity.Player;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class HullCalc {
+
+
+
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+
+    private static final int[] c1 = new int[]{1, -1, 0, 0};
+    private static final int[] c2 = new int[]{0, 0, 1, -1};
+
+    private int minX, minY, minZ, maxX, maxY, maxZ;
+    private REntityServer entityServer = new REntityServer();
+
+    private Set<Point> nonTechHideBlock = new HashSet<>();
+    private Set<Point> hullBlocks = new HashSet<>();
+
+    public HullCalc(Region region) {
+        this.minX = region.getMinPointBuild().getX();
+        this.minY = region.getMinPointBuild().getY();
+        this.minZ = region.getMinPointBuild().getZ();
+        this.maxX = region.getMaxPointBuild().getX();
+        this.maxY = region.getMaxPointBuild().getY();
+        this.maxZ = region.getMaxPointBuild().getZ();
+    }
+
+    public void calc() {
+        entityServer.getEntities().forEach(REntity::die);
+        long time = System.currentTimeMillis();
+        hullBlocks.clear();
+
+        calc(minX, minY, minZ, maxX, maxY, minZ, 0, 0, 1, maxZ - minZ);
+        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);
+        calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY);
+        calc(minX, maxY, minZ, maxX, maxY, maxZ, 0, -1, 0, maxY - minY);
+
+        hullBlocks.removeIf(point -> {
+            return point.getX() < minX || point.getX() > maxX || point.getY() < minY || point.getY() > maxY || point.getZ() < minZ || point.getZ() > maxZ;
+        });
+        nonTechHideBlock.addAll(hullBlocks);
+
+        System.out.println(System.currentTimeMillis() - time + "ms   " + hullBlocks.size());
+
+        hullBlocks.forEach(point -> {
+            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(entityServer, point.toLocation(WORLD).add(0.5, 0, 0.5), Material.WHITE_STAINED_GLASS);
+            rFallingBlockEntity.setNoGravity(true);
+        });
+    }
+
+    private void calc(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dirX, int dirY, int dirZ, int steps) {
+        boolean sideWays = dirY == 0;
+        Set<Point> points = new HashSet<>();
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    points.add(new Point(dirX == 0 ? x : minX - dirX, dirY == 0 ? y : minY - dirY, dirZ == 0 ? z : minZ - dirZ));
+                }
+            }
+        }
+        for (int i = 0; i <= steps; i++) {
+            Set<Point> nextLayer = new HashSet<>();
+
+            for (Point point : points) {
+                Point next = point.add(dirX, dirY, dirZ);
+                if (!empty(next, sideWays)) {
+                    hullBlocks.add(next);
+
+                    if (dirX != 0) {
+                        for (int c = 0; c < 4; c++) {
+                            if (empty(point.add(0, c1[c], c2[c]), sideWays) && empty(point.add(dirX, c1[c], c2[c]), sideWays)) {
+                                nextLayer.add(point.add(dirX, c1[c], c2[c]));
+                            }
+                        }
+                    } else if (dirY != 0) {
+                        for (int c = 0; c < 4; c++) {
+                            if (empty(point.add(c1[c], 0, c2[c]), sideWays) && empty(point.add(c1[c], dirY, c2[c]), sideWays)) {
+                                nextLayer.add(point.add(c1[c], dirY, c2[c]));
+                            }
+                        }
+                    } else {
+                        for (int c = 0; c < 4; c++) {
+                            if (empty(point.add(c1[c], c2[c], 0), sideWays) && empty(point.add(c1[c], c2[c], dirZ), sideWays)) {
+                                nextLayer.add(point.add(c1[c], c2[c], dirZ));
+                            }
+                        }
+                    }
+                } else {
+                    nextLayer.add(next);
+                    nonTechHideBlock.add(next);
+
+                    if (dirX != 0) {
+                        for (int c = 0; c < 4; c++) {
+                            if (!empty(point.add(0, c1[c], c2[c]), sideWays)) {
+                                hullBlocks.add(point.add(0, c1[c], c2[c]));
+                            }
+                            if (empty(point.add(dirX, c1[c], c2[c]), sideWays)) {
+                                nextLayer.add(point.add(dirX, c1[c], c2[c]));
+                            } else {
+                                hullBlocks.add(point.add(dirX, c1[c], c2[c]));
+                            }
+                        }
+                    } else if (dirY != 0) {
+                        for (int c = 0; c < 4; c++) {
+                            if (!empty(point.add(c1[c], 0, c2[c]), sideWays)) {
+                                hullBlocks.add(point.add(c1[c], 0, c2[c]));
+                            }
+                            if (empty(point.add(c1[c], dirY, c2[c]), sideWays)) {
+                                nextLayer.add(point.add(c1[c], dirY, c2[c]));
+                            } else {
+                                hullBlocks.add(point.add(c1[c], dirY, c2[c]));
+                            }
+                        }
+                    } else {
+                        for (int c = 0; c < 4; c++) {
+                            if (!empty(point.add(c1[c], c2[c], 0), sideWays)) {
+                                hullBlocks.add(point.add(c1[c], c2[c], 0));
+                            }
+                            if (empty(point.add(c1[c], c2[c], dirZ), sideWays)) {
+                                nextLayer.add(point.add(c1[c], c2[c], dirZ));
+                            } else {
+                                hullBlocks.add(point.add(c1[c], c2[c], dirZ));
+                            }
+                        }
+                    }
+                }
+            }
+            points.clear();
+            for (Point point : nextLayer) {
+                if (point.getX() < this.minX || point.getX() > this.maxX) {
+                    continue;
+                }
+                if (point.getY() < this.minY || point.getY() > this.maxY) {
+                    continue;
+                }
+                if (point.getZ() < this.minZ || point.getZ() > this.maxZ) {
+                    continue;
+                }
+                points.add(point);
+            }
+            if (points.isEmpty()) {
+                break;
+            }
+        }
+    }
+
+    private boolean empty(Point point, boolean side) {
+        Block block = point.toLocation(WORLD).getBlock();
+        if (block.getBlockData() instanceof Slab slab && slab.getType() == Slab.Type.DOUBLE) {
+            return false;
+        }
+        Material material = block.getType();
+        if (material.isAir()) {
+            return true;
+        }
+        if (material == Material.WATER) {
+            return true;
+        }
+        if (material == Material.SCAFFOLDING) {
+            return true;
+        }
+        if (material == Material.LADDER) {
+            return true;
+        }
+        if (material == Material.COBWEB) {
+            return true;
+        }
+        if (material == Material.IRON_BARS) {
+            return true;
+        }
+        if (material == Material.PLAYER_HEAD || material == Material.PLAYER_WALL_HEAD) {
+            return true;
+        }
+        if (material == Material.END_ROD) {
+            return true;
+        }
+        if (material == Material.CHAIN) {
+            return true;
+        }
+        if (material == Material.LANTERN) {
+            return true;
+        }
+        if (material == Material.LIGHTNING_ROD) {
+            return true;
+        }
+        if (material == Material.SOUL_LANTERN) {
+            return true;
+        }
+        if (material == Material.VINE) {
+            return true;
+        }
+        if (material == Material.SCULK_VEIN) {
+            return true;
+        }
+        if (material == Material.LEVER) {
+            return true;
+        }
+        if (material == Material.END_STONE_BRICK_WALL) {
+            return false;
+        }
+        if (material == Material.END_STONE_BRICK_SLAB) {
+            return false;
+        }
+        if (material == Material.END_STONE_BRICK_STAIRS) {
+            return false;
+        }
+        String name = material.name();
+        if (name.contains("GLASS")) {
+            return true;
+        }
+        if (name.contains("BANNER")) {
+            return true;
+        }
+        if (side && name.contains("CARPET")) {
+            return true;
+        }
+        if (name.contains("DOOR")) {
+            return true;
+        }
+        if (name.contains("SIGN")) {
+            return true;
+        }
+        if (name.contains("FENCE_GATE")) {
+            return true;
+        }
+        if (name.endsWith("_FENCE")) {
+            return true;
+        }
+        if (name.endsWith("_SKULL")) {
+            return true;
+        }
+        if (name.endsWith("_WALL")) {
+            return true;
+        }
+        if (side && name.endsWith("_SLAB")) {
+            return true;
+        }
+        if (name.endsWith("_STAIRS")) {
+            return true;
+        }
+        if (name.endsWith("_CANDLE")) {
+            return true;
+        }
+        if (name.endsWith("_BUTTON")) {
+            return true;
+        }
+        return false;
+    }
+
+    public void show(Player player) {
+        entityServer.addPlayer(player);
+    }
+
+    public void set() {
+        hullBlocks.forEach(point -> {
+            point.toLocation(WORLD).getBlock().setType(Material.END_STONE);
+        });
+        entityServer.getPlayers().forEach(player -> {
+            entityServer.removePlayer(player);
+        });
+    }
+
+    public void hide() {
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    if (nonTechHideBlock.contains(new Point(x, y, z))) {
+                        continue;
+                    }
+                    WORLD.getBlockAt(x, y, z).setType(Material.END_STONE);
+                }
+            }
+        }
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/hullhider/HullCommand.java

@@ -0,0 +1,67 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.hullhider;
+
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Linked
+public class HullCommand extends SWCommand {
+
+    private Map<Region, Hullhider> hullhiderMap = new HashMap<>();
+
+    public HullCommand() {
+        super("hullhider");
+    }
+
+    @Register
+    public void toggle(Player p) {
+        Region region = Region.getRegion(p.getLocation());
+        if (hullhiderMap.containsKey(region)) {
+            Hullhider hullhider = hullhiderMap.get(region);
+            if (hullhider.togglePlayer(p)) {
+                hullhider.close();
+                hullhiderMap.remove(region);
+            }
+        } else {
+            Hullhider hullhider = new Hullhider(region.getMinPointTestblock().getX(), region.getMaxPointTestblock().getX(),
+                    region.getMinPointTestblock().getY(), region.getMaxPointTestblock().getY(),
+                    region.getMinPointTestblock().getZ(), region.getMaxPointTestblock().getZ());
+            hullhider.init(region.getFloorLevel() == 0);
+            hullhider.togglePlayer(p);
+            hullhiderMap.put(region, hullhider);
+        }
+    }
+
+    @Register("recalc")
+    public void recalc(Player p) {
+        Region region = Region.getRegion(p.getLocation());
+        if (hullhiderMap.containsKey(region)) {
+            Hullhider hullhider = hullhiderMap.get(region);
+            hullhider.close();
+            hullhider.init(region.getFloorLevel() == 0);
+        }
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/hullhider/HullDir.java

@@ -0,0 +1,51 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.hullhider;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum HullDir {
+    UP(0, 1, 0, false),
+    DOWN(0, -1, 0, false),
+    NORTH(0, 0, -1, true),
+    SOUTH(0, 0, 1, true),
+    EAST(1, 0, 0, true),
+    WEST(-1, 0, 0, true);
+
+    private final int dx;
+    private final int dy;
+    private final int dz;
+    private final boolean sideWays;
+
+    private static final HullDir[] Y = new HullDir[]{NORTH, SOUTH, EAST, WEST};
+    private static final HullDir[] Z = new HullDir[]{UP, DOWN, EAST, WEST};
+    private static final HullDir[] X = new HullDir[]{UP, DOWN, NORTH, SOUTH};
+
+    public HullDir[] getSurrounding() {
+        return switch (this) {
+            case UP, DOWN -> Y;
+            case NORTH, SOUTH -> Z;
+            case EAST, WEST -> X;
+        };
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/hullhider/Hullhider.java

@@ -0,0 +1,452 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.hullhider;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.utils.TickEndEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Slab;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import java.util.*;
+
+public class Hullhider implements Listener {
+
+    // TODO:
+    // - Slab y calc diagonal
+    // - Carpet y calc diagonal upwards only!
+
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+
+    private final int minX;
+    private final int maxX;
+    private final int minY;
+    private final int maxY;
+    private final int minZ;
+    private final int maxZ;
+
+    private final int width;
+    private final int height;
+    private final int depth;
+
+    private final Set<Player> players = new HashSet<>();
+
+    private final BitSet airBlocks;
+    private final BitSet hullDirections;
+    private final BitSet invisible;
+
+    public Hullhider(int minX, int maxX, int minY, int maxY, int minZ, int maxZ) {
+        this.minX = minX;
+        this.maxX = maxX;
+        this.minY = minY;
+        this.maxY = maxY;
+        this.minZ = minZ;
+        this.maxZ = maxZ;
+
+        this.width = maxX - minX + 1;
+        this.height = maxY - minY + 1;
+        this.depth = maxZ - minZ + 1;
+
+        this.airBlocks = new BitSet(width * height * depth);
+        this.invisible = new BitSet(width * height * depth);
+        this.hullDirections = new BitSet(width * height * depth * 6);
+    }
+
+    private int toIndex(int x, int y, int z) {
+        return (x - minX) * height * depth + (y - minY) * depth + (z - minZ);
+    }
+
+    private int toIndex(Point point) {
+        return toIndex(point.getX(), point.getY(), point.getZ());
+    }
+
+    public void init(boolean noFloor) {
+        Bukkit.getPluginManager().registerEvents(this, BauSystem.getInstance());
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    Point p = new Point(x, y, z);
+                    invisible.set(toIndex(p));
+                    Block block = p.toLocation(WORLD).getBlock();
+                    if (block.isEmpty()) {
+                        airBlocks.set(toIndex(p));
+                    }
+                }
+            }
+        }
+
+        long time = System.currentTimeMillis();
+        init(minX, minY, minZ, maxX, maxY, minZ, HullDir.SOUTH);
+        init(minX, minY, maxZ, maxX, maxY, maxZ, HullDir.NORTH);
+        init(minX, minY, minZ, minX, maxY, maxZ, HullDir.EAST);
+        init(maxX, minY, minZ, maxX, maxY, maxZ, HullDir.WEST);
+        if (noFloor) {
+            init(minX, minY, minZ, maxX, minY, maxZ, HullDir.UP);
+        }
+        init(minX, maxY, minZ, maxX, maxY, maxZ, HullDir.DOWN);
+        long timeDiff = System.currentTimeMillis() - time;
+        Bukkit.getOnlinePlayers().forEach(player -> {
+            player.sendMessage("Init took: " + timeDiff + "ms");
+        });
+
+        BlockData endStone = Material.END_STONE.createBlockData();
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    if (invisible.get(toIndex(x, y, z))) {
+                        for (Player player : players) {
+                            player.sendBlockChange(new Location(WORLD, x, y, z), endStone);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void init(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, HullDir dir) {
+        Set<Point> points = new HashSet<>();
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    points.add(new Point(dir.getDx() == 0 ? x : minX - dir.getDx(), dir.getDy() == 0 ? y : minY - dir.getDy(), dir.getDz() == 0 ? z : minZ - dir.getDz()));
+                }
+            }
+        }
+        calc(points, dir);
+    }
+
+    private void calc(Set<Point> points, HullDir dir) {
+        while (true) {
+            Set<Point> nextLayer = new HashSet<>();
+
+            for (Point point : points) {
+                Point next = point.add(dir.getDx(), dir.getDy(), dir.getDz());
+
+                if (next.getX() >= minX && next.getX() <= maxX && next.getY() >= minY && next.getY() <= maxY && next.getZ() >= minZ && next.getZ() <= maxZ) {
+                    invisible.clear(toIndex(next));
+                }
+                if (!empty(next, dir)) {
+                    if (next.getX() >= minX && next.getX() <= maxX && next.getY() >= minY && next.getY() <= maxY && next.getZ() >= minZ && next.getZ() <= maxZ) {
+                        hullDirections.set(toIndex(next) * 6 + dir.ordinal());
+                    }
+
+                    for (HullDir hullDir : dir.getSurrounding()) {
+                        Point p1 = point.add(hullDir.getDx(), hullDir.getDy(), hullDir.getDz());
+                        Point p2 = p1.add(dir.getDx(), dir.getDy(), dir.getDz());
+                        if (empty(p1, hullDir) && empty(p2, dir)) {
+                            nextLayer.add(p2);
+                        }
+                        if (p1.getX() >= minX && p1.getX() <= maxX && p1.getY() >= minY && p1.getY() <= maxY && p1.getZ() >= minZ && p1.getZ() <= maxZ) {
+                            invisible.clear(toIndex(p1));
+                        }
+                        if (p2.getX() >= minX && p2.getX() <= maxX && p2.getY() >= minY && p2.getY() <= maxY && p2.getZ() >= minZ && p2.getZ() <= maxZ) {
+                            invisible.clear(toIndex(p2));
+                        }
+                    }
+                } else {
+                    nextLayer.add(next);
+
+                    for (HullDir hullDir : dir.getSurrounding()) {
+                        Point p1 = point.add(hullDir.getDx(), hullDir.getDy(), hullDir.getDz());
+                        Point p2 = p1.add(dir.getDx(), dir.getDy(), dir.getDz());
+                        if (empty(p2, dir)) {
+                            nextLayer.add(p2);
+                        }
+                        if (p1.getX() >= minX && p1.getX() <= maxX && p1.getY() >= minY && p1.getY() <= maxY && p1.getZ() >= minZ && p1.getZ() <= maxZ) {
+                            invisible.clear(toIndex(p1));
+                        }
+                        if (p2.getX() >= minX && p2.getX() <= maxX && p2.getY() >= minY && p2.getY() <= maxY && p2.getZ() >= minZ && p2.getZ() <= maxZ) {
+                            invisible.clear(toIndex(p2));
+                        }
+                    }
+                }
+            }
+
+            points.clear();
+            for (Point point : nextLayer) {
+                if (point.getX() < minX || point.getX() > maxX) {
+                    continue;
+                }
+                if (point.getY() < minY || point.getY() > maxY) {
+                    continue;
+                }
+                if (point.getZ() < minZ || point.getZ() > maxZ) {
+                    continue;
+                }
+                points.add(point);
+            }
+            if (points.isEmpty()) {
+                break;
+            }
+        }
+    }
+
+    private boolean empty(Point point, HullDir dir) {
+        if (point.getX() >= minX && point.getX() <= maxX && point.getY() >= minY && point.getY() <= maxY && point.getZ() >= minZ && point.getZ() <= maxZ && airBlocks.get(toIndex(point))) {
+            return true;
+        }
+        Block block = point.toLocation(WORLD).getBlock();
+        if (block.getBlockData() instanceof Slab slab && slab.getType() == Slab.Type.DOUBLE) {
+            return false;
+        }
+        Material material = block.getType();
+        if (material.isAir()) {
+            return true;
+        }
+        if (material == Material.WATER) {
+            return true;
+        }
+        if (material == Material.SCAFFOLDING) {
+            return true;
+        }
+        if (material == Material.LADDER) {
+            return true;
+        }
+        if (material == Material.COBWEB) {
+            return true;
+        }
+        if (material == Material.IRON_BARS) {
+            return true;
+        }
+        if (material == Material.PLAYER_HEAD || material == Material.PLAYER_WALL_HEAD) {
+            return true;
+        }
+        if (material == Material.END_ROD) {
+            return true;
+        }
+        if (material == Material.CHAIN) {
+            return true;
+        }
+        if (material == Material.LANTERN) {
+            return true;
+        }
+        if (material == Material.LIGHTNING_ROD) {
+            return true;
+        }
+        if (material == Material.SOUL_LANTERN) {
+            return true;
+        }
+        if (material == Material.VINE) {
+            return true;
+        }
+        if (material == Material.SCULK_VEIN) {
+            return true;
+        }
+        if (material == Material.LEVER) {
+            return true;
+        }
+        if (material == Material.END_STONE_BRICK_WALL) {
+            return false;
+        }
+        if (material == Material.END_STONE_BRICK_SLAB) {
+            return false;
+        }
+        if (material == Material.END_STONE_BRICK_STAIRS) {
+            return false;
+        }
+        String name = material.name();
+        if (name.contains("GLASS")) {
+            return true;
+        }
+        if (name.contains("BANNER")) {
+            return true;
+        }
+        if (dir.isSideWays() && name.contains("CARPET")) {
+            return true;
+        }
+        if (name.contains("DOOR")) {
+            return true;
+        }
+        if (name.contains("SIGN")) {
+            return true;
+        }
+        if (name.contains("FENCE_GATE")) {
+            return true;
+        }
+        if (name.endsWith("_FENCE")) {
+            return true;
+        }
+        if (name.endsWith("_SKULL")) {
+            return true;
+        }
+        if (name.endsWith("_WALL")) {
+            return true;
+        }
+        if (dir.isSideWays() && name.endsWith("_SLAB")) {
+            return true;
+        }
+        if (name.endsWith("_STAIRS")) {
+            return true;
+        }
+        if (name.endsWith("_CANDLE")) {
+            return true;
+        }
+        if (name.endsWith("_BUTTON")) {
+            return true;
+        }
+        return false;
+    }
+
+    public void close() {
+        HandlerList.unregisterAll(this);
+        airBlocks.clear();
+        invisible.clear();
+        hullDirections.clear();
+
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    Block block = WORLD.getBlockAt(x, y, z);
+                    players.forEach(player -> {
+                        player.sendBlockChange(block.getLocation(), block.getBlockData());
+                    });
+                }
+            }
+        }
+    }
+
+    public boolean togglePlayer(Player player) {
+        if (players.contains(player)) {
+            players.remove(player);
+
+            for (int x = minX; x <= maxX; x++) {
+                for (int y = minY; y <= maxY; y++) {
+                    for (int z = minZ; z <= maxZ; z++) {
+                        Block block = WORLD.getBlockAt(x, y, z);
+                        player.sendBlockChange(block.getLocation(), block.getBlockData());
+                    }
+                }
+            }
+            return players.isEmpty();
+        } else {
+            players.add(player);
+
+            BlockData endStone = Material.END_STONE.createBlockData();
+            for (int x = minX; x <= maxX; x++) {
+                for (int y = minY; y <= maxY; y++) {
+                    for (int z = minZ; z <= maxZ; z++) {
+                        if (invisible.get(toIndex(x, y, z))) {
+                            player.sendBlockChange(new Location(WORLD, x, y, z), endStone);
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    }
+
+    private Set<Point> pointsToReshow = new HashSet<>();
+    private Map<HullDir, Set<Point>> changedInTick = new HashMap<>();
+
+    @EventHandler
+    public void onBlockBreak(BlockBreakEvent event) {
+        Point point = new Point(event.getBlock().getX(), event.getBlock().getY(), event.getBlock().getZ());
+        airBlocks.set(toIndex(point));
+        Set<HullDir> hullDirs = new HashSet<>();
+        for (HullDir hullDir : HullDir.values()) {
+            if (hullDirections.get(toIndex(point) * 6 + hullDir.ordinal())) {
+                hullDirs.add(hullDir);
+            }
+        }
+
+        pointsToReshow.add(point);
+        hullDirs.forEach(dir -> {
+            changedInTick.computeIfAbsent(dir, __ -> new HashSet<>()).add(point);
+        });
+    }
+
+    @EventHandler
+    public void onEntityExplode(EntityExplodeEvent event) {
+        for (Block block : event.blockList()) {
+            Point point = new Point(block.getX(), block.getY(), block.getZ());
+            airBlocks.set(toIndex(point));
+            pointsToReshow.add(point);
+            Set<HullDir> hullDirs = new HashSet<>();
+            for (HullDir hullDir : HullDir.values()) {
+                if (hullDirections.get(toIndex(point) * 6 + hullDir.ordinal())) {
+                    hullDirs.add(hullDir);
+                }
+            }
+            hullDirs.forEach(dir -> {
+                changedInTick.computeIfAbsent(dir, __ -> new HashSet<>()).add(point);
+            });
+        }
+    }
+
+    @EventHandler
+    public void onTickEnd(TickEndEvent event) {
+        if (!changedInTick.isEmpty()) {
+            BitSet oldInvisible = BitSet.valueOf(invisible.toLongArray());
+            long time = System.currentTimeMillis();
+            changedInTick.forEach((dir, points) -> {
+                calc(points, dir);
+            });
+            long timeDiff = System.currentTimeMillis() - time;
+            players.forEach(player -> {
+                player.sendMessage("Calculated in " + timeDiff + "ms");
+            });
+
+            for (int x = minX; x <= maxX; x++) {
+                for (int y = minY; y <= maxY; y++) {
+                    for (int z = minZ; z <= maxZ; z++) {
+                        if (invisible.get(toIndex(x, y, z))) continue;
+                        if (!oldInvisible.get(toIndex(x, y, z))) continue;
+                        Location location = new Location(WORLD, x, y, z);
+                        BlockData blockData = location.getBlock().getBlockData();
+                        players.forEach(player -> {
+                            player.sendBlockChange(location, blockData);
+                        });
+                    }
+                }
+            }
+            changedInTick.clear();
+        }
+
+        if (!pointsToReshow.isEmpty()) {
+            BlockData endStone = Material.END_STONE.createBlockData();
+            pointsToReshow.forEach(point -> {
+                for (int x = point.getX() - 1; x <= point.getX() + 1; x++) {
+                    for (int y = point.getY() - 1; y <= point.getY() + 1; y++) {
+                        for (int z = point.getZ() - 1; z <= point.getZ() + 1; z++) {
+                            Location location = point.toLocation(WORLD);
+                            if (x >= minX && x <= maxX && y >= minY && y <= maxY && z >= minZ && z <= maxZ && invisible.get(toIndex(x, y, z))) {
+                                players.forEach(player -> {
+                                    player.sendBlockChange(location, endStone);
+                                });
+                            }
+                        }
+                    }
+                }
+            });
+            pointsToReshow.clear();
+        }
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFiller.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.inventoryfiller;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
@@ -39,7 +38,6 @@ public class InventoryFiller implements Listener {
 
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("inventoryfill", false)) return;
         if (!event.getPlayer().isSneaking()) return;
         Block block = event.getPlayer().getTargetBlockExact(5);
@@ -61,7 +59,6 @@ public class InventoryFiller implements Listener {
      */
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("inventoryfill", false)) return;
         if (!event.getPlayer().isSneaking()) return;
         ItemStack itemStack = event.getPlayer().getInventory().getItemInMainHand();

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

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.killchecker;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -55,7 +54,7 @@ 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) {
+    public void genericCommand(Player player, @OptionalValue("-outline") @StaticValue(value = {"-area", "-outline"}, allowISE = true) boolean onlyOutline) {
         Region region = Region.getRegion(player.getLocation());
         KillcheckerVisualizer killcheckerVisualizer = visualizers.computeIfAbsent(region, region1 -> new KillcheckerVisualizer(region1, bossBarService));
         killcheckerVisualizer.recalc();
@@ -75,22 +74,16 @@ public class KillcheckerCommand extends SWCommand implements Listener {
         BauSystem.MESSAGE.send("KILLCHECKER_DISABLE", player);
     }
 
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(this::hide);
-    }
-
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        hide(event.getPlayer());
+        Player player = event.getPlayer();
-    }
+        Set<Region> regions = new HashSet<>();
-
+        visualizers.forEach((region, visualizer) -> {
-    private void hide(Player player) {
+            if (visualizer.disconnect(player)) {
-        new HashSet<>(visualizers.entrySet()).forEach(regionKillcheckerVisualizerEntry -> {
+                regions.add(region);
-            if (regionKillcheckerVisualizerEntry.getValue().hide(player)) {
-                visualizers.remove(regionKillcheckerVisualizerEntry.getKey());
             }
         });
+        regions.forEach(visualizers::remove);
     }
 
     private void recalc(Block block) {

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

@@ -34,6 +34,8 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.boss.BarColor;
+import org.bukkit.boss.BarStyle;
+import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
@@ -43,22 +45,7 @@ import java.util.Set;
 
 public class KillcheckerVisualizer {
 
-    private static final Material[] MATERIALS = new Material[]{
+    private static final Material[] MATERIALS = new Material[] {Material.YELLOW_STAINED_GLASS, Material.ORANGE_STAINED_GLASS, Material.RED_STAINED_GLASS, Material.PURPLE_STAINED_GLASS, Material.BLACK_STAINED_GLASS};
-            Material.LIME_STAINED_GLASS,
-            Material.LIME_CONCRETE,
-            Material.GREEN_STAINED_GLASS,
-            Material.GREEN_CONCRETE,
-            Material.YELLOW_STAINED_GLASS,
-            Material.YELLOW_CONCRETE,
-            Material.ORANGE_STAINED_GLASS,
-            Material.ORANGE_CONCRETE,
-            Material.RED_STAINED_GLASS,
-            Material.RED_CONCRETE,
-            Material.PURPLE_STAINED_GLASS,
-            Material.PURPLE_CONCRETE,
-            Material.BLACK_STAINED_GLASS,
-            Material.BLACK_CONCRETE,
-    };
     private static final World WORLD = Bukkit.getWorlds().get(0);
     
     private static final double SURROUND = 4.5;
@@ -70,6 +57,9 @@ public class KillcheckerVisualizer {
     private final int zArea;
     private final int xArea;
 
+    private final Set<Player> players = new HashSet<>();
+    private final Set<Player> areaPlayers = new HashSet<>();
+
     private final Region region;
     private final BossBarService bossBarService;
 
@@ -271,7 +261,7 @@ public class KillcheckerVisualizer {
         double zPercent = xCount / (double) zArea;
         percent = (xPercent + yPercent + zPercent) / 3;
         kills = zKills + yKills + xKills;
-        outline.getPlayers().forEach(this::updateBossBar);
+        players.forEach(this::updateBossBar);
 
         Set<Point> pointSet = new HashSet<>(killCount.keySet());
         Set<Point> outlinePointsCacheLast = new HashSet<>(outlinePointsCache);
@@ -366,21 +356,40 @@ public class KillcheckerVisualizer {
         return new Cuboid(minX, minY, minZ, maxX, maxY, maxZ);
     }
 
-    public void show(Player player, boolean onlyOutline) {
+    public boolean show(Player player, boolean onlyOutline) {
         outline.addPlayer(player);
         if (!onlyOutline) {
             inner.addPlayer(player);
-        } else {
+            areaPlayers.add(player);
+        } else if (areaPlayers.contains(player)) {
             inner.removePlayer(player);
+            areaPlayers.remove(player);
         }
         updateBossBar(player);
+        return players.add(player);
     }
 
     public boolean hide(Player player) {
         outline.removePlayer(player);
+        if (areaPlayers.contains(player)) {
             inner.removePlayer(player);
+        }
+        players.remove(player);
+        areaPlayers.remove(player);
         bossBarService.remove(player, region, "killchecker");
-        if (outline.getPlayers().isEmpty() && inner.getPlayers().isEmpty()) {
+        if (players.isEmpty()) {
+            outline.close();
+            inner.close();
+            return true;
+        }
+        return false;
+    }
+
+    public boolean disconnect(Player player) {
+        players.remove(player);
+        areaPlayers.remove(player);
+        bossBarService.remove(player, region, "killchecker");
+        if (players.isEmpty()) {
             outline.close();
             inner.close();
             return true;

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

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.loader;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.loader.elements.LoaderElement;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderTNT;
@@ -39,10 +38,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class Loader implements Listener {
@@ -74,17 +70,12 @@ public class Loader implements Listener {
 
         BauSystem.runTaskTimer(BauSystem.getInstance(), () -> {
             if (stage != Stage.RUNNING) return;
-            if(!Permission.BUILD.hasPermission(p)) return;
             if (waitTime > 0) {
                 waitTime--;
                 return;
             }
             if (currentElement >= elements.size()) {
                 currentElement = 0;
-                if (stage == Stage.SINGLE) {
-                    stage = Stage.PAUSE;
-                    return;
-                }
             }
 
             while (currentElement < elements.size()) {
@@ -99,20 +90,6 @@ public class Loader implements Listener {
         }, 0, 1);
     }
 
-    public void single() {
-        if (stage == Stage.END) return;
-        if (stage == Stage.RUNNING) return;
-        stage = Stage.SINGLE;
-        if (recorder != null) {
-            recorder.stop();
-            recorder = null;
-        }
-        if (elements.isEmpty()) {
-            BauSystem.MESSAGE.send("LOADER_NOTHING_RECORDED", p);
-            stop();
-        }
-    }
-
     public void start() {
         if (stage == Stage.END) return;
         if (stage == Stage.RUNNING) return;
@@ -370,7 +347,6 @@ public class Loader implements Listener {
     public enum Stage implements EnumDisplay {
         SETUP("LOADER_SETUP"),
         RUNNING("LOADER_RUNNING"),
-        SINGLE("LOADER_SINGLE"),
         PAUSE("LOADER_PAUSE"),
         END("LOADER_END");
 

BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java

@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.loader;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.bausystem.Permission;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 
 @Linked
-public class LoaderCommand extends SWCommand implements Listener {
+public class LoaderCommand extends SWCommand {
 
     public LoaderCommand() {
         super("loader");
@@ -103,20 +102,10 @@ public class LoaderCommand extends SWCommand implements Listener {
         loader.setTicksBetweenBlocks(delay);
     }
 
-    @Register(value = "single", description = "LOADER_HELP_SINGLE")
+    @ClassValidator(value = Player.class, local = true)
-    public void singleLoader(@Validator Player p) {
+    public TypeValidator<Player> loaderValidator() {
-        Loader loader = Loader.getLoader(p);
+        return (commandSender, player, messageSender) -> {
-        if (loaderNullCheck(loader, p)) return;
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), "LOADER_PERMS");
-        loader.single();
+        };
-        BauSystem.MESSAGE.send("LOADER_SINGLE_CMD", p);
-    }
-
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(player -> {
-            Loader loader = Loader.getLoader(player);
-            if (loader == null) return;
-            loader.stop();
-        });
     }
 }

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

@@ -43,8 +43,6 @@ import org.bukkit.inventory.EquipmentSlot;
 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 {
 
@@ -126,10 +124,53 @@ public class LoaderRecorder implements Listener {
 
         addWaitTime(false);
         Block block = event.getClickedBlock();
-        getLoaderInteractionElement(block, (loaderInteractionElement, s) -> {
+        Material type = block.getType();
-            loaderElementList.add(loaderInteractionElement);
+        switch (type) {
-            message(s);
+            case COMPARATOR:
-        });
+                loaderElementList.add(new LoaderComparator(block.getLocation()));
+                message("LOADER_BUTTON_COMPARATOR");
+                break;
+            case REPEATER:
+                loaderElementList.add(new LoaderRepeater(block.getLocation()));
+                message("LOADER_BUTTON_REPEATER");
+                break;
+            case NOTE_BLOCK:
+                loaderElementList.add(new LoaderNoteBlock(block.getLocation()));
+                message("LOADER_BUTTON_NOTEBLOCK");
+                break;
+            case LEVER:
+                loaderElementList.add(new LoaderLever(block.getLocation()));
+                message("LOADER_BUTTON_SWITCH");
+                break;
+            case DAYLIGHT_DETECTOR:
+                loaderElementList.add(new LoaderDaylightDetector(block.getLocation()));
+                message("LOADER_BUTTON_DAYLIGHT_DETECTOR");
+                break;
+            case LECTERN:
+                loaderElementList.add(new LoaderLectern(block.getLocation()));
+                message("LOADER_BUTTON_LECTERN");
+                break;
+            case IRON_TRAPDOOR:
+                break;
+            default:
+                if (type.name().endsWith("_TRAPDOOR")) {
+                    loaderElementList.add(new LoaderOpenable(block.getLocation(), "LOADER_BUTTON_TRAPDOOR", type));
+                    message("LOADER_BUTTON_TRAPDOOR");
+                } else if (type.name().endsWith("_DOOR")) {
+                    loaderElementList.add(new LoaderOpenable(block.getLocation(), "LOADER_BUTTON_DOOR", type));
+                    message("LOADER_BUTTON_DOOR");
+                } else if (type.name().endsWith("FENCE_GATE")) {
+                    loaderElementList.add(new LoaderOpenable(block.getLocation(), "LOADER_BUTTON_FENCEGATE", type));
+                    message("LOADER_BUTTON_FENCEGATE");
+                } else if (type.name().endsWith("STONE_BUTTON")) {
+                    loaderElementList.add(new LoaderTicks(block.getLocation(), "LOADER_BUTTON_STONE_BUTTON", type, 20));
+                    message("LOADER_BUTTON_STONE_BUTTON");
+                } else if (type.name().endsWith("BUTTON")) {
+                    loaderElementList.add(new LoaderTicks(block.getLocation(), "LOADER_BUTTON_WOOD_BUTTON", type, 30));
+                    message("LOADER_BUTTON_WOOD_BUTTON");
+                }
+                break;
+        }
     }
 
     private Map<Location, Long> blockSet = new HashMap<>();
@@ -185,46 +226,6 @@ public class LoaderRecorder implements Listener {
         }
     }
 
-    public static void getLoaderInteractionElement(Block block, BiConsumer<LoaderInteractionElement<?>, String> consumer) {
-        Material type = block.getType();
-        switch (type) {
-            case COMPARATOR:
-                consumer.accept(new LoaderComparator(block.getLocation()), "LOADER_BUTTON_COMPARATOR");
-                break;
-            case REPEATER:
-                consumer.accept(new LoaderRepeater(block.getLocation()), "LOADER_BUTTON_REPEATER");
-                break;
-            case NOTE_BLOCK:
-                consumer.accept(new LoaderNoteBlock(block.getLocation()), "LOADER_BUTTON_NOTEBLOCK");
-                break;
-            case LEVER:
-                consumer.accept(new LoaderLever(block.getLocation()), "LOADER_BUTTON_SWITCH");
-                break;
-            case DAYLIGHT_DETECTOR:
-                consumer.accept(new LoaderDaylightDetector(block.getLocation()), "LOADER_BUTTON_DAYLIGHT_DETECTOR");
-                break;
-            case LECTERN:
-                consumer.accept(new LoaderLectern(block.getLocation()), "LOADER_BUTTON_LECTERN");
-                break;
-            case IRON_TRAPDOOR:
-            case IRON_DOOR:
-                break;
-            default:
-                if (type.name().endsWith("_TRAPDOOR")) {
-                    consumer.accept(new LoaderOpenable(block.getLocation(), "LOADER_BUTTON_TRAPDOOR", type), "LOADER_BUTTON_TRAPDOOR");
-                } else if (type.name().endsWith("_DOOR")) {
-                    consumer.accept(new LoaderOpenable(block.getLocation(), "LOADER_BUTTON_DOOR", type), "LOADER_BUTTON_DOOR");
-                } else if (type.name().endsWith("FENCE_GATE")) {
-                    consumer.accept(new LoaderOpenable(block.getLocation(), "LOADER_BUTTON_FENCEGATE", type), "LOADER_BUTTON_FENCEGATE");
-                } else if (type.name().endsWith("STONE_BUTTON")) {
-                    consumer.accept(new LoaderTicks(block.getLocation(), "LOADER_BUTTON_STONE_BUTTON", type, 20), "LOADER_BUTTON_STONE_BUTTON");
-                } else if (type.name().endsWith("BUTTON")) {
-                    consumer.accept(new LoaderTicks(block.getLocation(), "LOADER_BUTTON_WOOD_BUTTON", type, 30), "LOADER_BUTTON_WOOD_BUTTON");
-                }
-                break;
-        }
-    }
-
     private void message(String type) {
         SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("LOADER_MESSAGE_INTERACT", player, BauSystem.MESSAGE.parse(type, player), loaderElementList.size()));
     }

BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderScoreboardElement.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.loader;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
@@ -41,7 +40,6 @@ public class LoaderScoreboardElement implements ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if(!Permission.BUILD.hasPermission(p)) return null;
         Loader loader = Loader.getLoader(p);
         if (loader == null) return null;
         if (loader.getStage() == Loader.Stage.RUNNING) {

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

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

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

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -47,13 +46,13 @@ public class ObserverTracerCommand extends SWCommand {
     }
 
     @Register(value = "delete", description = "OBSERVER_HELP_DELETE")
-    public void delete(@Validator Player p) {
+    public void delete(Player p) {
         ObserverTracerListener.observerTracerMap.remove(p);
         BauSystem.MESSAGE.send("OBSERVER_DELETE", p);
     }
 
     @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
-    public void retrace(@Validator Player p) {
+    public void retrace(Player p) {
         if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
             BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
             return;

BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java

@@ -20,8 +20,6 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -57,7 +55,6 @@ public class ObserverTracerListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!enabled.contains(event.getPlayer())) {
             return;
         }
@@ -90,11 +87,6 @@ public class ObserverTracerListener implements Listener {
         }
     }
 
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(observerTracerMap::remove);
-    }
-
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         enabled.add(event.getPlayer());

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

@@ -85,7 +85,7 @@ public class ColorCommand extends SWCommand {
     @ClassValidator(value = Player.class, local = true)
     public TypeValidator<Player> validator() {
         return (commandSender, player, messageSender) -> {
-            return !messageSender.send(!bauServer.getOwner().equals(player.getUniqueId()), "NO_PERMISSION");
+            return !messageSender.send(!bauServer.getOwner().equals(player.getUniqueId()), "REGION_COLOR_NO_PERMS");
         };
     }
 

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

@@ -46,6 +46,10 @@ public class FireCommand extends SWCommand {
         }
     }
 
+    private String getNoPermMessage() {
+        return "REGION_FIRE_NO_PERMS";
+    }
+
     private String getEnableMessage() {
         return "REGION_FIRE_ENABLED";
     }
@@ -65,4 +69,11 @@ public class FireCommand extends SWCommand {
                 return false;
         }
     }
+
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), getNoPermMessage());
+        };
+    }
 }

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

@@ -46,6 +46,10 @@ public class FreezeCommand extends SWCommand {
         }
     }
 
+    private String getNoPermMessage() {
+        return "REGION_FREEZE_NO_PERMS";
+    }
+
     private String getEnableMessage(){
         return "REGION_FREEZE_ENABLED";
     }
@@ -65,4 +69,11 @@ public class FreezeCommand extends SWCommand {
                 return true;
         }
     }
+
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), getNoPermMessage());
+        };
+    }
 }

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

@@ -49,6 +49,10 @@ public class ItemsCommand extends SWCommand {
         }
     }
 
+    private String getNoPermMessage() {
+        return "REGION_ITEMS_NO_PERMS";
+    }
+
     private String getEnableMessage(){
         return "REGION_ITEMS_ENABLED";
     }
@@ -68,4 +72,11 @@ public class ItemsCommand extends SWCommand {
                 return true;
         }
     }
+
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), getNoPermMessage());
+        };
+    }
 }

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

@@ -1,66 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.region;
-
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.NoGravityMode;
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import org.bukkit.entity.Player;
-
-@Linked
-public class NoGravityCommand extends SWCommand {
-
-    public NoGravityCommand() {
-        super("nogravity");
-    }
-
-    @Register(description = "REGION_NO_GRAVITY_HELP")
-    public void toggleCommand(@Validator Player p) {
-        Region region = Region.getRegion(p.getLocation());
-        if (toggle(region)) {
-            RegionUtils.actionBar(region, getEnableMessage());
-        } else {
-            RegionUtils.actionBar(region, getDisableMessage());
-        }
-    }
-
-    private String getEnableMessage() {
-        return "REGION_NO_GRAVITY_ENABLED";
-    }
-
-    private String getDisableMessage() {
-        return "REGION_NO_GRAVITY_DISABLED";
-    }
-
-    private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.NO_GRAVITY, NoGravityMode.class)) {
-            case ACTIVE:
-                region.set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
-                return true;
-        }
-    }
-}

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

@@ -1,64 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.region;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.NoGravityMode;
-import de.steamwar.bausystem.utils.ScoreboardElement;
-import de.steamwar.linkage.Linked;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntitySpawnEvent;
-
-@Linked
-public class NoGravityListener implements Listener, ScoreboardElement {
-
-    private static NoGravityMode getMode(Region region) {
-        return region.getPlain(Flag.NO_GRAVITY, NoGravityMode.class);
-    }
-
-    @EventHandler
-    public void onEntitySpawn(EntitySpawnEvent event) {
-        if (event.getEntityType() == EntityType.PLAYER) return;
-        if (getMode(Region.getRegion(event.getLocation())) == NoGravityMode.ACTIVE) {
-            event.getEntity().setGravity(false);
-        }
-    }
-
-    @Override
-    public ScoreboardGroup getGroup() {
-        return ScoreboardGroup.REGION;
-    }
-
-    @Override
-    public int order() {
-        return 4;
-    }
-
-    @Override
-    public String get(Region region, Player p) {
-        if (region.get(Flag.NO_GRAVITY) == Flag.NO_GRAVITY.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.NO_GRAVITY).getChatValue(), p);
-    }
-}

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

@@ -54,6 +54,13 @@ public class ProtectCommand extends SWCommand {
         }
     }
 
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLDEDIT), "REGION_PROTECT_NO_PERMS");
+        };
+    }
+
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
         if (region.getFloorLevel() == 0) {

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

@@ -19,39 +19,31 @@
 
 package de.steamwar.bausystem.features.region;
 
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.function.operation.Operations;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.SelectCommand;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.region.Prototype;
 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.command.TypeValidator;
 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.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -79,7 +71,7 @@ public class RegionCommand extends SWCommand {
     }
 
     @Register(value = "undo", description = "REGION_REGION_HELP_UNDO")
-    public void undoCommand(@Validator Player p) {
+    public void undoCommand(@Validator("WORLD_EDIT") Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) return;
 
@@ -91,7 +83,7 @@ public class RegionCommand extends SWCommand {
     }
 
     @Register(value = "redo", description = "REGION_REGION_HELP_REDO")
-    public void redoCommand(@Validator Player p) {
+    public void redoCommand(@Validator("WORLD_EDIT") Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
@@ -105,7 +97,7 @@ public class RegionCommand extends SWCommand {
     }
 
     @Register(value = "restore", description = "REGION_REGION_HELP_RESTORE")
-    public void genericRestoreCommand(@Validator Player p) {
+    public void genericRestoreCommand(@Validator("WORLD_EDIT") Player p) {
         Region region = Region.getRegion(p.getLocation());
         if(checkGlobalRegion(region, p)) return;
 
@@ -122,7 +114,7 @@ public class RegionCommand extends SWCommand {
     }
 
     @Register(value = "restore", description = "REGION_REGION_HELP_RESTORE_SCHEMATIC")
-    public void schematicRestoreCommand(@Validator Player p, SchematicNode node) {
+    public void schematicRestoreCommand(@Validator("WORLD_EDIT") Player p, SchematicNode node) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) return;
 
@@ -172,6 +164,36 @@ public class RegionCommand extends SWCommand {
         BauSystem.MESSAGE.send("REGION_REGION_TP_TEST_BLOCK", p);
     }
 
+    @Register(value = "changetype", description = "REGION_REGION_HELP_CHANGETYPE_INFO")
+    @Register("type")
+    public void changeTypeCommand(Player p) {
+        Region region = Region.getRegion(p.getLocation());
+        if (checkGlobalRegion(region, p)) {
+            return;
+        }
+        BauSystem.MESSAGE.send("REGION_REGION_CHANGETYPE_INFO", p, region.getPrototype().getDisplayName());
+    }
+
+    @Register(value = "changetype", description = "REGION_REGION_HELP_CHANGETYPE")
+    @Register("type")
+    public void changeTypeCommand(@Validator("WORLD") Player p, @Mapper("regionTypeMapper") String s) {
+        Region region = Region.getRegion(p.getLocation());
+        if (checkGlobalRegion(region, p)) {
+            return;
+        }
+        Prototype prototype = Prototype.getByDisplayName(s);
+        if (prototype == null) {
+            BauSystem.MESSAGE.send("REGION_REGION_CHANGETYPE_UNKNOWN", p);
+        } else {
+            if (region.setPrototype(prototype)) {
+                BauSystem.MESSAGE.send("REGION_REGION_CHANGETYPE_CHANGE", p, s);
+                BauSystem.MESSAGE.send("REGION_REGION_CHANGETYPE_CHANGE_UPDATE", p, BauSystem.MESSAGE.parse("REGION_REGION_CHANGETYPE_CHANGE_UPDATE_HOVER", p), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/reset"));
+            } else {
+                BauSystem.MESSAGE.send("REGION_REGION_CHANGETYPE_INVALID", p);
+            }
+        }
+    }
+
     @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN_INFO")
     @Register("skin")
     public void changeSkinCommand(Player p) {
@@ -188,7 +210,7 @@ public class RegionCommand extends SWCommand {
 
     @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN")
     @Register("skin")
-    public void changeSkinCommand(@Validator Player p, @Mapper("skinTypeMapper") String s) {
+    public void changeSkinCommand(@Validator("WORLD") Player p, @Mapper("skinTypeMapper") String s) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
@@ -205,106 +227,26 @@ public class RegionCommand extends SWCommand {
         }
     }
 
-    @Register(value = "copy", description = "REGION_REGION_HELP_COPY")
+    @Mapper(value = "regionTypeMapper", local = true)
-    public void copyCommand(@Validator Player p, @OptionalValue("") @StaticValue(value = {"", "-e", "-s"}, allowISE = true) int option) {
+    private TypeMapper<String> regionTypeMapper() {
+        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 (checkGlobalRegion(region, p)) {
+                if (region.isGlobal()) {
-            return;
+                    return Collections.emptyList();
                 }
-        if (!region.hasType(RegionType.BUILD)) {
+                return region.getPrototypes().stream().map(Prototype::getByName).map(Prototype::getDisplayName).map(c -> c.replace(' ', '_')).collect(Collectors.toList());
-            BauSystem.MESSAGE.send("REGION_REGION_NO_BUILD", p);
-            return;
-        }
-        if (region.getCopyPoint() == null) {
-            BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
-            return;
             }
 
-        Point minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+            @Override
-        Point maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+            public String map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-        switch (option) {
+                return s.replace('_', ' ');
-            case 0:
-                break;
-            case 1:
-                minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
-                maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
-                break;
-            case 2:
-                Pair<Location, Location> selection = WorldEditUtils.getSelection(p);
-                minPoint = Point.fromLocation(selection.getKey());
-                maxPoint = Point.fromLocation(selection.getValue());
-                break;
-            default:
-                break;
             }
-
+        };
-        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getCopyPoint());
-        WorldEdit.getInstance()
-                .getSessionManager()
-                .get(BukkitAdapter.adapt(p))
-                .setClipboard(new ClipboardHolder(clipboard));
-        BauSystem.MESSAGE.send("REGION_REGION_COPY_DONE", p);
     }
 
-    @Register(value = "paste", description = "REGION_REGION_HELP_PASTE")
-    public void pasteCommand(@Validator Player p, @OptionalValue("") @StaticValue(value = {"", "-a", "-s", "-as", "-sa"}, allowISE = true) int options) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-        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()
-                .get(BukkitAdapter.adapt(p))
-                .getClipboard();
-
-        boolean selectPasted = false;
-        boolean ignoreAir = false;
-        switch (options) {
-            case 0:
-                break;
-            case 1:
-                ignoreAir = true;
-                break;
-            case 2:
-                selectPasted = true;
-                break;
-            case 3:
-            case 4:
-                selectPasted = true;
-                ignoreAir = true;
-                break;
-            default:
-                break;
-        }
-
-        try (EditSession e = WorldEditUtils.getEditSession(p)) {
-            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.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);
-        }
-    }
-
-    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>() {
@@ -324,4 +266,18 @@ public class RegionCommand extends SWCommand {
             }
         };
     }
+
+    @Validator(value = "WORLD", local = true)
+    public TypeValidator<Player> worldValidator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), "REGION_REGION_NO_PERMS");
+        };
+    }
+
+    @Validator(value = "WORLD_EDIT", local = true)
+    public TypeValidator<Player> worldEditValidator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLDEDIT), "REGION_REGION_NO_PERMS");
+        };
+    }
 }

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

@@ -97,6 +97,13 @@ public class ResetCommand extends SWCommand {
         }
     }
 
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), "REGION_RESET_NO_PERMS");
+        };
+    }
+
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
         if (region == GlobalRegion.getInstance()) {

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

@@ -157,4 +157,11 @@ public class TNTCommand extends SWCommand {
                 break;
         }
     }
+
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), "REGION_TNT_NO_PERMS");
+        };
+    }
 }

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

@@ -157,6 +157,11 @@ public class TestblockCommand extends SWCommand {
         };
     }
 
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> !messageSender.send(!Permission.hasPermission(player, Permission.WORLDEDIT), "REGION_TB_NO_PERMS");
+    }
+
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
         if (!region.hasType(RegionType.TESTBLOCK)) {

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

@@ -57,6 +57,6 @@ public class FireBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.WORLD;
     }
 }

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

@@ -57,6 +57,6 @@ public class FreezeBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.WORLD;
     }
 }

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

@@ -58,6 +58,6 @@ public class ProtectBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.WORLDEDIT;
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java

@@ -65,6 +65,6 @@ public class ResetBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.WORLDEDIT;
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java

@@ -64,6 +64,6 @@ public class TestblockBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.WORLDEDIT;
     }
 }

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

@@ -116,6 +116,6 @@ public class TntBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.BUILD;
+        return Permission.WORLD;
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptCommand.java

@@ -31,7 +31,7 @@ public class ScriptCommand extends SWCommand {
     }
 
     @Register
-    public void genericCommand(@Validator Player player) {
+    public void genericCommand(Player player) {
         ScriptGUI.open(player);
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java

@@ -19,8 +19,6 @@
 
 package de.steamwar.bausystem.features.script;
 
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -44,8 +42,6 @@ public class ScriptListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onLeftClick(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-
         ItemStack item = event.getItem();
         if (item == null || FlatteningWrapper.impl.isNoBook(item) || item.getItemMeta() == null) {
             return;
@@ -72,13 +68,6 @@ public class ScriptListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ScriptRunner.updateGlobalScript(event.getPlayer());
     }
-
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(ScriptRunner::remove);
-        event.getNewBuilder().forEach(ScriptRunner::updateGlobalScript);
-    }
 }

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

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.features.script.event;
 
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -42,7 +41,6 @@ public class CommandListener implements Listener {
 
     @EventHandler
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         String[] split = event.getMessage().split(" ");
         if (calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).contains(split[0])) {
             return;

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

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.script.event;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
@@ -65,20 +64,17 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfJoin, LuaValue.NIL, event);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerQuit(PlayerQuitEvent event) {
         StorageLib.removePlayer(event.getPlayer());
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (LAST_FS.containsKey(event.getPlayer())) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DoubleSwap, LuaValue.NIL, event);
@@ -90,7 +86,6 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         LuaTable table = new LuaTable();
         table.set("x", event.getBlock().getX());
         table.set("y", event.getBlock().getY());
@@ -101,7 +96,6 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockBreak(BlockBreakEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         LuaTable table = new LuaTable();
         table.set("x", event.getBlock().getX());
         table.set("y", event.getBlock().getY());
@@ -114,7 +108,6 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (ignore.remove(event.getPlayer())) {
             return;
         }
@@ -132,7 +125,6 @@ public class EventListener implements Listener {
             table.set("blockY", event.getClickedBlock().getY());
             table.set("blockZ", event.getClickedBlock().getZ());
             table.set("blockFace", event.getBlockFace().name());
-            table.set("blockType", event.getClickedBlock().getType().name());
         } else {
             table.set("hasBlock", LuaValue.valueOf(false));
         }
@@ -152,7 +144,6 @@ public class EventListener implements Listener {
         Region tntRegion = Region.getRegion(event.getLocation());
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
             if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
             }
@@ -174,7 +165,6 @@ public class EventListener implements Listener {
         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.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                 if (inBuild) {
@@ -186,7 +176,6 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ignore.add(event.getPlayer());
         LuaTable table = new LuaTable();
         table.set("type", event.getItemDrop().getItemStack().getType().name());
@@ -196,7 +185,6 @@ public class EventListener implements Listener {
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDeath(EntityDeathEvent event) {
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
             LuaTable table = new LuaTable();
             table.set("type", event.getEntityType().name());
             ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.EntityDeath, table, event);

BauSystem_Main/src/de/steamwar/bausystem/features/script/event/HotkeyListener.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.script.event;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Plain;
@@ -37,7 +36,6 @@ public class HotkeyListener implements PluginMessageListener, Plain {
 
     @Override
     public void onPluginMessageReceived(String channel, Player player, byte[] message) {
-        if(!Permission.BUILD.hasPermission(player)) return;
         if (!channel.equals("sw:hotkeys")) return;
         if (message.length < 5) return;
         int action = message[4] & 0xFF;

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

@@ -22,19 +22,14 @@ package de.steamwar.bausystem.features.script.lua;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.bukkit.BukkitPlayer;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.extension.platform.Actor;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.libs.LuaLib;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.inventory.SWAnvilInv;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -45,10 +40,11 @@ import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.lib.ThreeArgFunction;
+import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.lib.VarArgFunction;
 
-import java.lang.reflect.Proxy;
-import java.net.InetSocketAddress;
 import java.util.*;
 import java.util.logging.Level;
 
@@ -107,7 +103,14 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
                 double x = arg1.checkdouble();
                 double y = arg2.checkdouble();
                 double z = arg3.checkdouble();
-                return pos(x, y, z);
+
+                Location loc = new Location(player.getWorld(), x, y, z);
+
+                return tableOf(new LuaValue[] {
+                        valueOf("x"), valueOf(loc.getBlockX()),
+                        valueOf("y"), valueOf(loc.getBlockY()),
+                        valueOf("z"), valueOf(loc.getBlockZ())
+                });
             }
         });
         env.set("exec", new VarArgFunction() {
@@ -120,7 +123,6 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
                     return LuaValue.NIL;
                 }
 
-                command = preprocessEvent.getMessage().substring(1);
                 Bukkit.getLogger().log(Level.INFO, player.getName() + " dispatched command: " + command);
                 String[] commandSplit = command.split(" ");
                 if (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
@@ -165,86 +167,11 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
         env.set("rawget", NIL);
         env.set("rawlen", NIL);
         env.set("rawset", NIL);
+        env.set("setmetatable", NIL);
         env.set("xpcall", NIL);
         return null;
     }
 
-    public static LuaTable pos(double x, double y, double z) {
-        LuaTable position = new LuaTable();
-        position.set("x", x);
-        position.set("y", y);
-        position.set("z", z);
-
-        position.set("add", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                LuaTable table = luaValue.checktable();
-                double dx = table.get("x").checkdouble();
-                double dy = table.get("y").checkdouble();
-                double dz = table.get("z").checkdouble();
-                return pos(x + dx, y + dy, z + dz);
-            }
-        });
-
-        position.set("subtract", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                LuaTable table = luaValue.checktable();
-                double dx = table.get("x").checkdouble();
-                double dy = table.get("y").checkdouble();
-                double dz = table.get("z").checkdouble();
-                return pos(x - dx, y - dy, z - dz);
-            }
-        });
-
-        position.set("addX", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                return pos(x + luaValue.checkdouble(), y, z);
-            }
-        });
-        position.set("subtractX", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                return pos(x - luaValue.checkdouble(), y, z);
-            }
-        });
-        position.set("addY", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                return pos(x, y + luaValue.checkdouble(), z);
-            }
-        });
-        position.set("subtractY", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                return pos(x, y - luaValue.checkdouble(), z);
-            }
-        });
-        position.set("addZ", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                return pos(x, y, z + luaValue.checkdouble());
-            }
-        });
-        position.set("subtractZ", new OneArgFunction() {
-            @Override
-            public LuaValue call(LuaValue luaValue) {
-                return pos(x, y, z - luaValue.checkdouble());
-            }
-        });
-
-        position.set("blockPos", new ZeroArgFunction() {
-            @Override
-            public LuaValue call() {
-                Location location = new Location(Bukkit.getWorlds().get(0), x, y, z);
-                return pos(location.getBlockX(), location.getBlockY(), location.getBlockZ());
-            }
-        });
-
-        return position;
-    }
-
     public static String varArgsToString(Varargs args) {
         StringBuilder builder = new StringBuilder();
         for (int i = 1; i <= args.narg(); i++) {

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

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.features.script.lua.libs;
 
-import de.steamwar.bausystem.features.script.lua.SteamWarLuaPlugin;
 import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -45,12 +44,6 @@ public class PlayerLib implements LuaLib {
         table.set("chat", new Print(player));
         table.set("actionbar", new SendActionbar(player));
 
-        table.set("pos", getter(() -> {
-            return SteamWarLuaPlugin.pos(player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ());
-        }));
-        table.set("blockPos", getter(() -> {
-            return SteamWarLuaPlugin.pos(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ());
-        }));
         table.set("x", getterAndSetter("x", () -> player.getLocation().getX(), x -> {
             Location location = player.getLocation();
             location.setX(x);

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

@@ -20,6 +20,9 @@
 package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.features.loader.Loader;
+import de.steamwar.bausystem.features.tracer.record.ActiveTracer;
+import de.steamwar.bausystem.features.tracer.record.AutoTraceRecorder;
+import de.steamwar.bausystem.features.tracer.record.Recorder;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -68,13 +71,13 @@ public class RegionLib implements LuaLib {
         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();
+        LuaValue traceLib = LuaValue.tableOf();
-        //traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));
+        traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));
-        //traceLib.set("auto", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof AutoTraceRecorder));
+        traceLib.set("auto", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof AutoTraceRecorder));
-        //traceLib.set("status", getter(() -> Recorder.INSTANCE.get(region.get()).scriptState()));
+        traceLib.set("status", getter(() -> Recorder.INSTANCE.get(region.get()).scriptState()));
-        //traceLib.set("time", getter(() -> Recorder.INSTANCE.get(region.get()).scriptTime()));
+        traceLib.set("time", getter(() -> Recorder.INSTANCE.get(region.get()).scriptTime()));
 
-        //table.set("trace", traceLib);
+        table.set("trace", traceLib);
 
         Loader loader = Loader.getLoader(player);
         table.set("loader", getter(() -> loader == null ? "OFF" : loader.getStage().name()));

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

@@ -1,75 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.script.lua.libs;
-
-import de.steamwar.bausystem.features.world.BauScoreboard;
-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
-public class ScoreboardLib implements LuaLib {
-
-    @Override
-    public String name() {
-        return "scoreboard";
-    }
-
-    @Override
-    public LuaTable get(Player player) {
-        LuaTable luaTable = new LuaTable();
-
-        LuaTable groups = new LuaTable();
-        for (ScoreboardElement.ScoreboardGroup group : ScoreboardElement.ScoreboardGroup.values()) {
-            groups.set(group.name(), group.ordinal());
-        }
-        luaTable.set("group", groups);
-
-        luaTable.set("element", new VarArgFunction() {
-            @Override
-            public Varargs invoke(Varargs varargs) {
-                if (varargs.narg() < 2) {
-                    return NIL;
-                }
-                String elementKey = varargs.arg(1).checkjstring();
-                ScoreboardElement.ScoreboardGroup elementGroup = ScoreboardElement.ScoreboardGroup.values()[varargs.arg(2).checkint()];
-                int priority = varargs.narg() > 2 ? varargs.arg(2).checkint() : Integer.MAX_VALUE;
-
-                return new VarArgFunction() {
-                    @Override
-                    public Varargs invoke(Varargs args) {
-                        if (args.narg() == 0) {
-                            BauScoreboard.setAdditionalElement(player, elementKey, elementGroup, priority, null);
-                        } else {
-                            BauScoreboard.setAdditionalElement(player, elementKey, elementGroup, priority, args.arg1().checkjstring());
-                        }
-                        return NIL;
-                    }
-                };
-            }
-        });
-        return luaTable;
-    }
-}

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

@@ -20,15 +20,11 @@
 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.core.TPSWatcher;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaTable;
@@ -50,14 +46,10 @@ public class ServerLib implements LuaLib {
     public LuaTable get(Player player) {
         LuaTable serverLib = LuaValue.tableOf();
         serverLib.set("time", getter(() -> new SimpleDateFormat(BauSystem.MESSAGE.parse("TIME", player)).format(Calendar.getInstance().getTime())));
-        serverLib.set("onlinePlayerCount", getter(Bukkit.getOnlinePlayers()::size));
         serverLib.set("ticks", getter(TPSUtils.currentTick));
         serverLib.set("getBlockAt", new OneArgFunction() {
             @Override
             public LuaValue call(LuaValue arg1) {
-                if (!Permission.SUPERVISOR.hasPermission(player)) {
-                    return LuaValue.NIL;
-                }
                 LuaTable pos = arg1.checktable();
                 return valueOf(player.getWorld().getBlockAt(pos.get("x").checkint(), pos.get("y").checkint(), pos.get("z").checkint()).getType().name());
             }
@@ -65,9 +57,6 @@ public class ServerLib implements LuaLib {
         serverLib.set("setBlockAt", new TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue arg1, LuaValue arg2) {
-                if (!Permission.SUPERVISOR.hasPermission(player)) {
-                    return LuaValue.NIL;
-                }
                 LuaTable pos = arg1.checktable();
                 LuaString material = arg2.checkstring();
                 Material mat = SWItem.getMaterial(material.tojstring());
@@ -78,19 +67,17 @@ public class ServerLib implements LuaLib {
                 return NIL;
             }
         });
-        serverLib.set("interactAt", new OneArgFunction() {
+
-            @Override
+        LuaValue tpsLib = LuaValue.tableOf();
-            public LuaValue call(LuaValue arg1) {
+        tpsLib.set("oneSecond", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_SECOND)));
-                LuaTable pos = arg1.checktable();
+        tpsLib.set("tenSecond", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_SECONDS)));
-                Block block = player.getWorld().getBlockAt(pos.get("x").checkint(), pos.get("y").checkint(), pos.get("z").checkint());
+        tpsLib.set("oneMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_MINUTE)));
-                LoaderRecorder.getLoaderInteractionElement(block, (loaderInteractionElement, s) -> {
+        tpsLib.set("fiveMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES)));
-                    loaderInteractionElement.execute(aLong -> {
+        tpsLib.set("tenMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)));
-                        // Ignore
+        tpsLib.set("current", getter(TPSWatcher::getTPS));
-                    });
+        // tpsLib.set("limit", getter(TPSLimitUtils::getCurrentTPSLimit));
-                });
+
-                return NIL;
+        serverLib.set("tps", tpsLib);
-            }
-        });
         return serverLib;
     }
 }

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.core.Core;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Disable;
 import de.steamwar.linkage.api.Enable;
@@ -55,7 +54,6 @@ public class StorageLib implements LuaLib, Enable, Disable {
 
     @Override
     public void enable() {
-        if (Core.getVersion() <= 15) return;
         if (!storageDirectory.exists()) storageDirectory.mkdirs();
 
         try {
@@ -131,7 +129,6 @@ public class StorageLib implements LuaLib, Enable, Disable {
 
     @Override
     public void disable() {
-        if (Core.getVersion() <= 15) return;
         if (!storageDirectory.exists()) storageDirectory.mkdirs();
         try {
             FileWriter fileWriter = new FileWriter(new File(storageDirectory, "global.json"));

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

@@ -1,57 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.script.lua.libs;
-
-import de.steamwar.bausystem.features.tpslimit.TPSSystem;
-import de.steamwar.core.TPSWatcher;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.LinkedInstance;
-import org.bukkit.entity.Player;
-import org.luaj.vm2.LuaTable;
-
-@Linked
-public class TpsLib implements LuaLib {
-
-    @LinkedInstance
-    public TPSSystem tpsSystem;
-
-    @Override
-    public Class<? extends LuaLib> parent() {
-        return ServerLib.class;
-    }
-
-    @Override
-    public String name() {
-        return "tps";
-    }
-
-    @Override
-    public LuaTable get(Player player) {
-        LuaTable tpsLib = new LuaTable();
-        tpsLib.set("oneSecond", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_SECOND)));
-        tpsLib.set("tenSecond", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_SECONDS)));
-        tpsLib.set("oneMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_MINUTE)));
-        tpsLib.set("fiveMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES)));
-        tpsLib.set("tenMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)));
-        tpsLib.set("current", getter(TPSWatcher::getTPS));
-        tpsLib.set("limit", getter(tpsSystem::getCurrentTPSLimit));
-        return tpsLib;
-    }
-}

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

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.shieldprinting;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.shieldprinting.impl.*;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.inventory.SWItem;
@@ -48,6 +47,7 @@ import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.util.Vector;
 
@@ -259,14 +259,18 @@ public class ShieldPrinting implements Listener {
     }
 
     @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
+    public void onPlayerInteract(PlayerInteractEvent event) {
-        updateBossbar(event.getPlayer());
+        if (event.getClickedBlock() == null) return;
+        if (event.getItem() == null) return;
+        if (Region.getRegion(event.getClickedBlock().getLocation()) != region) return;
+        Vector vector = event.getClickedBlock().getLocation().toVector();
+        if (!shieldMap.containsKey(vector)) return;
+        event.getClickedBlock().setType(Material.AIR);
     }
 
     @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+    public void onPlayerJoin(PlayerJoinEvent event) {
-        event.getNewSpectator().forEach(player -> BossBarService.instance.remove(player, region, "shieldprinting"));
+        updateBossbar(event.getPlayer());
-        event.getNewBuilder().forEach(this::updateBossbar);
     }
 
     private void updateBossbars() {

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

@@ -26,7 +26,9 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEvent;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -106,8 +108,8 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
     @ClassValidator(value = Player.class, local = true)
     public TypeValidator<Player> validator() {
         return (commandSender, player, messageSender) -> {
-            if (!Permission.BUILD.hasPermission(player)) {
+            if (!Permission.hasPermission(player, Permission.WORLD)) {
-                messageSender.send("NO_PERMISSION", player);
+                messageSender.send("SHIELD_PRINTING_DISALLOWED", player);
                 return false;
             }
             Region region = Region.getRegion(player.getLocation());
@@ -118,4 +120,20 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
             return true;
         };
     }
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getClickedBlock() == null) {
+            return;
+        }
+        Region region = Region.getRegion(event.getClickedBlock().getLocation());
+        if (region.isGlobal()) {
+            return;
+        }
+        ShieldPrinting shieldPrinting = SHIELD_PRINTING_MAP.get(region);
+        if (shieldPrinting == null) {
+            return;
+        }
+        shieldPrinting.onPlayerInteract(event);
+    }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java

@@ -1,60 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.inventory.SWItem;
-import de.steamwar.linkage.Linked;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-@Linked
-public class SimulatorBauGuiItem extends BauGuiItem {
-
-    public SimulatorBauGuiItem() {
-        super(20);
-    }
-
-    @Override
-    public ItemStack getItem(Player player) {
-        ItemStack itemStack = new SWItem(Material.BLAZE_ROD, BauSystem.MESSAGE.parse("SIMULATOR_GUI_ITEM_NAME", player)).getItemStack();
-        ItemMeta itemMeta = itemStack.getItemMeta();
-        itemMeta.setCustomModelData(1);
-        itemStack.setItemMeta(itemMeta);
-        return itemStack;
-    }
-
-    @Override
-    public boolean click(ClickType click, Player p) {
-        p.closeInventory();
-        p.performCommand("sim");
-        return false;
-    }
-
-    @Override
-    public Permission permission() {
-        return Permission.BUILD;
-    }
-}

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

@@ -102,4 +102,11 @@ public class SimulatorCommand extends SWCommand {
             }
         };
     }
+
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLD), "SIMULATOR_NO_PERMS");
+        };
+    }
 }

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

@@ -22,13 +22,10 @@ package de.steamwar.bausystem.features.simulator;
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
@@ -37,7 +34,6 @@ import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
 import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
 import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.bausystem.utils.RayTraceUtils;
 import de.steamwar.entity.REntity;
@@ -62,7 +58,10 @@ import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -78,7 +77,6 @@ public class SimulatorCursor implements Listener {
 
     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");
@@ -96,7 +94,6 @@ public class SimulatorCursor implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             calcCursor(event.getPlayer());
         }, 0);
@@ -104,30 +101,20 @@ public class SimulatorCursor implements Listener {
 
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         calcCursor(event.getPlayer());
     }
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             calcCursor(event.getPlayer());
         }, 1);
     }
 
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getChanged().forEach(this::calcCursor);
-    }
-
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         cursorType.remove(event.getPlayer());
         cursors.remove(event.getPlayer());
-        synchronized (calculating) {
-            calculating.remove(event.getPlayer());
-        }
     }
 
     private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
@@ -154,18 +141,11 @@ public class SimulatorCursor implements Listener {
         }
     }
 
-    public void calcCursor(Player player) {
+    public synchronized void calcCursor(Player player) {
-        synchronized (calculating) {
+        if (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand())) {
-            if (calculating.contains(player)) return;
-            calculating.add(player);
-        }
-        if (!Permission.BUILD.hasPermission(player) || (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand()))) {
             if (removeCursor(player) || SimulatorWatcher.show(null, player)) {
                 SWUtils.sendToActionbar(player, "");
             }
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
             return;
         }
         Simulator simulator = SimulatorStorage.getSimulator(player);
@@ -180,16 +160,10 @@ public class SimulatorCursor implements Listener {
             } else {
                 SWUtils.sendToActionbar(player, "§eOpen Simulator");
             }
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
             return;
         }
 
         showCursor(player, rayTraceResult, simulator != null);
-        synchronized (calculating) {
-            calculating.remove(player);
-        }
     }
 
     private synchronized boolean removeCursor(Player player) {
@@ -242,7 +216,7 @@ public class SimulatorCursor implements Listener {
         }
     }
 
-    public static Vector getPosFree(Player player, RayTraceUtils.RRayTraceResult result) {
+    public static Vector getPosTNT(Player player, RayTraceUtils.RRayTraceResult result) {
         Vector pos = result.getHitPosition();
 
         BlockFace face = result.getHitBlockFace();
@@ -282,7 +256,7 @@ public class SimulatorCursor implements Listener {
         return pos;
     }
 
-    private static Vector getPosBlockAligned(Player player, RayTraceUtils.RRayTraceResult result) {
+    private static Vector getPosRedstoneBlock(Player player, RayTraceUtils.RRayTraceResult result) {
         Vector pos = result.getHitPosition();
 
         BlockFace face = result.getHitBlockFace();
@@ -321,9 +295,8 @@ public class SimulatorCursor implements Listener {
     @Getter
     @AllArgsConstructor
     public enum CursorType {
-        TNT(Material.TNT, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
+        TNT(Material.TNT, SimulatorCursor::getPosTNT, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
+        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, SimulatorCursor::getPosRedstoneBlock, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
         ;
 
         private Material material;
@@ -335,16 +308,12 @@ public class SimulatorCursor implements Listener {
             if (this == TNT) {
                 return REDSTONE_BLOCK;
             }
-            if (this == REDSTONE_BLOCK) {
-                return OBSERVER;
-            }
             return TNT;
         }
     }
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!ItemUtils.isItem(event.getItem(), "simulator")) {
             return;
         }

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java

@@ -84,9 +84,7 @@ public class SimulatorStorage implements Enable {
         SimulatorFormatSimulatorLoader simulatorFormatSimulatorLoader = new SimulatorFormatSimulatorLoader();
         YAPIONFormatSimulatorLoader yapionFormatSimulatorLoader = new YAPIONFormatSimulatorLoader();
 
-        File[] files = simulatorsDir.listFiles();
+        for (File file : simulatorsDir.listFiles()) {
-        if (files == null) return;
-        for (File file : files) {
             try {
                 List<Simulator> simulators = simFormatSimulatorLoader.load(file)
                         .orElse(null);

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java

@@ -1,35 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.data;
-
-import org.bukkit.Material;
-import org.bukkit.util.Vector;
-
-public abstract class SimulatorBlockAlignedElement<T extends SimulatorPhase> extends SimulatorElement<T> {
-
-    protected SimulatorBlockAlignedElement(Material material, Vector position) {
-        super(material, position);
-    }
-
-    @Override
-    public final boolean canBeInGroup(SimulatorGroup simulatorGroup) {
-        return simulatorGroup.getElements().stream().allMatch(SimulatorBlockAlignedElement.class::isInstance);
-    }
-}

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java

@@ -1,99 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.data.observer;
-
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorBlockAlignedElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
-import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorObserverGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiConsumer;
-
-public final class ObserverElement extends SimulatorBlockAlignedElement<ObserverPhase> {
-
-    public ObserverElement(Vector position) {
-        super(Material.OBSERVER, position);
-    }
-
-    @Override
-    public String getName(Player player) {
-        return "Observer";
-    }
-
-    @Override
-    public Material getWorldMaterial() {
-        return Material.OBSERVER;
-    }
-
-    @Override
-    public Material getWorldDisabledMaterial() {
-        return Material.GRAY_STAINED_GLASS;
-    }
-
-    public void toSimulatorActions(BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd) {
-        if (disabled) return;
-        phases.forEach(phase -> {
-            phase.toSimulatorActions(position.clone(), tickStart, tickEnd);
-        });
-
-        int end = phases.stream().mapToInt(SimulatorPhase::getTickOffset).max().orElse(0) + 4;
-        AtomicReference<BlockState> blockState = new AtomicReference<>();
-        tickStart.accept(0, new SimulatorAction(-100, 1) {
-            @Override
-            public void accept(World world) {
-                Block block = world.getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
-                blockState.set(block.getState());
-                block.setType(Material.OBSERVER, false);
-            }
-        });
-        tickEnd.accept(end, new SimulatorAction(0, 1) {
-            @Override
-            public void accept(World world) {
-                BlockState oldState = blockState.get();
-                if (oldState != null) {
-                    oldState.update(true, true);
-                } else {
-                    Block block = world.getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
-                    block.setType(Material.AIR);
-                }
-            }
-        });
-    }
-
-    @Override
-    public void open(Player player, Simulator simulator, SimulatorGroup group, SimulatorBaseGui back) {
-        new SimulatorObserverGui(player, simulator, group, this, back).open();
-    }
-
-    @Override
-    public String getType() {
-        return "Observer";
-    }
-}

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java

@@ -1,81 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.data.observer;
-
-import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
-import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.data.type.Observer;
-import org.bukkit.util.Vector;
-import yapion.hierarchy.types.YAPIONObject;
-
-import java.util.function.BiConsumer;
-
-@NoArgsConstructor
-public final class ObserverPhase extends SimulatorPhase {
-
-    @Getter
-    @Setter
-    private BlockFace orientation = BlockFace.UP;
-
-    public ObserverPhase(int tickOffset) {
-        this.tickOffset = tickOffset;
-    }
-
-    {
-        this.lifetime = 0;
-    }
-
-    @Override
-    public void toSimulatorActions(Vector position, BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd) {
-        Observer observer = (Observer) Material.OBSERVER.createBlockData();
-        observer.setFacing(orientation.getOppositeFace());
-        observer.setPowered(true);
-
-        tickStart.accept(tickOffset, new SimulatorAction(order, 1) {
-            @Override
-            public void accept(World world) {
-                Block block = world.getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
-                Block updateBlock = block.getRelative(orientation);
-                BlockState state = updateBlock.getState();
-                updateBlock.setType(Material.SPONGE, true);
-                block.setBlockData(observer, true);
-                state.update(true, true);
-            }
-        });
-    }
-
-    @Override
-    public void saveExtra(YAPIONObject phaseObject) {
-        phaseObject.add("orientation", orientation.name());
-    }
-
-    @Override
-    public void loadExtra(YAPIONObject phaseObject) {
-        orientation = BlockFace.valueOf(phaseObject.getPlainValue("orientation"));
-    }
-}

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java

@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.simulator.data.redstone;
 
 import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorBlockAlignedElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.gui.SimulatorRedstoneGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
@@ -28,7 +28,7 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-public final class RedstoneElement extends SimulatorBlockAlignedElement<RedstonePhase> {
+public final class RedstoneElement extends SimulatorElement<RedstonePhase> {
 
     public RedstoneElement(Vector position) {
         super(Material.REDSTONE_BLOCK, position);
@@ -49,6 +49,11 @@ public final class RedstoneElement extends SimulatorBlockAlignedElement<Redstone
         return Material.WHITE_STAINED_GLASS;
     }
 
+    @Override
+    public boolean canBeInGroup(SimulatorGroup simulatorGroup) {
+        return simulatorGroup.getElements().stream().allMatch(RedstoneElement.class::isInstance);
+    }
+
     @Override
     public Vector getWorldPos() {
         return position.clone().add(new Vector(0.5, 0, 0.5));

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java

@@ -54,7 +54,7 @@ public final class RedstonePhase extends SimulatorPhase {
                 block.setType(Material.REDSTONE_BLOCK);
             }
         });
-        tickStart.accept(tickOffset + lifetime, new SimulatorAction(ORDER_LIMIT + 1, 1) {
+        tickEnd.accept(tickOffset + lifetime, new SimulatorAction(0, 1) {
             @Override
             public void accept(World world) {
                 BlockState state = blockState.get();

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

@@ -26,18 +26,12 @@ import de.steamwar.bausystem.features.simulator.gui.SimulatorTNTGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.inventory.InvCallback;
 import de.steamwar.inventory.SWItem;
-import lombok.Getter;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
-import yapion.hierarchy.types.YAPIONObject;
 
 public final class TNTElement extends SimulatorElement<TNTPhase> {
 
-    public static final double SUB_PIXEL = 0.00999999046326;
-    @Getter
-    private final Vector alignment = new Vector();
-
     public TNTElement(Vector position) {
         super(Material.TNT, position);
     }
@@ -53,16 +47,26 @@ public final class TNTElement extends SimulatorElement<TNTPhase> {
         position.setZ(position.getZ() + z);
     }
 
-    public void alignX(int direction) {
+    public void align(Vector offset) {
-        position.setX(position.getX() - SUB_PIXEL * alignment.getX());
+        if (offset.getX() != 0) {
-        alignment.setX(direction);
+            if (position.getX() - (int) position.getX() == 0.49) {
-        position.setX(position.getX() + SUB_PIXEL * alignment.getX());
+                position.setX(position.getX() + 0.02);
+            }
+            if (position.getX() - (int) position.getX() == -0.49) {
+                position.setX(position.getX() - 0.02);
+            }
+            position.setX(position.getBlockX() + offset.getX());
         }
 
-    public void alignZ(int direction) {
+        if (offset.getZ() != 0) {
-        position.setZ(position.getZ() - SUB_PIXEL * alignment.getZ());
+            if (position.getZ() - (int) position.getZ() == 0.49) {
-        alignment.setZ(direction);
+                position.setZ(position.getZ() + 0.02);
-        position.setZ(position.getZ() + SUB_PIXEL * alignment.getZ());
+            }
+            if (position.getZ() - (int) position.getZ() == -0.49) {
+                position.setZ(position.getZ() - 0.02);
+            }
+            position.setZ(position.getBlockZ() + offset.getZ());
+        }
     }
 
     @Override
@@ -98,16 +102,4 @@ public final class TNTElement extends SimulatorElement<TNTPhase> {
     public String getType() {
         return "TNT";
     }
-
-    @Override
-    public void saveExtra(YAPIONObject elementObject) {
-        elementObject.add("alignmentX", alignment.getX());
-        elementObject.add("alignmentZ", alignment.getZ());
-    }
-
-    @Override
-    public void loadExtra(YAPIONObject elementObject) {
-        alignment.setX(elementObject.getDoubleOrSetDefault("alignmentX", 0));
-        alignment.setZ(elementObject.getDoubleOrSetDefault("alignmentZ", 0));
-    }
 }

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

@@ -21,13 +21,9 @@ package de.steamwar.bausystem.features.simulator.data.tnt;
 
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
@@ -63,9 +59,7 @@ public final class TNTPhase extends SimulatorPhase {
         tickStart.accept(tickOffset, new SimulatorAction(order, count) {
             @Override
             public void accept(World world) {
-                Location location = position.toLocation(world);
+                TNTPrimed tnt = world.spawn(position.toLocation(world), TNTPrimed.class);
-                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));
                 if (!zJump) tnt.setVelocity(tnt.getVelocity().setZ(0));

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

@@ -23,7 +23,8 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
-import de.steamwar.bausystem.features.tracer.TraceRecorder;
+import de.steamwar.bausystem.features.tracer.record.Recorder;
+import de.steamwar.bausystem.features.tracer.record.SingleTraceRecorder;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.TickEndEvent;
 import de.steamwar.bausystem.utils.TickStartEvent;
@@ -68,20 +69,6 @@ public class SimulatorExecutor implements Listener {
                     @Override
                     public void accept(World world) {
                         currentlyRunning.remove(simulator);
-
-                        if (simulator.isAutoTrace()) {
-                            simulator.getGroups()
-                                    .stream()
-                                    .map(SimulatorGroup::getElements)
-                                    .flatMap(List::stream)
-                                    .map(SimulatorElement::getPosition)
-                                    .map(pos -> pos.toLocation(WORLD))
-                                    .map(Region::getRegion)
-                                    .distinct()
-                                    .forEach(region -> {
-                                        TraceRecorder.instance.stopRecording(region);
-                                    });
-                        }
                     }
                 });
 
@@ -95,7 +82,9 @@ public class SimulatorExecutor implements Listener {
                     .map(Region::getRegion)
                     .distinct()
                     .forEach(region -> {
-                        TraceRecorder.instance.startRecording(region);
+                        if (Recorder.INSTANCE.isDisabled(region)) {
+                            Recorder.INSTANCE.set(region, new SingleTraceRecorder(region));
+                        }
                     });
         }
         return true;

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

@@ -97,69 +97,41 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         if (allTNT) {
             // Subpixel Alignment
             inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> {
-                simulatorGroup.getElements().stream()
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> {
-                        .map(TNTElement.class::cast)
+                    tnt.align(new Vector(0.5, 0, 0.5));
-                        .forEach(tntElement -> {
-                            tntElement.alignX(0);
-                            tntElement.alignZ(0);
                 });
                 SimulatorWatcher.update(simulator);
             }));
 
             // Z
-            SWItem negativZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> {
+            inventory.setItem(20, new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> {
-                simulatorGroup.getElements().stream()
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> {
-                        .map(TNTElement.class::cast)
+                    tnt.align(new Vector(0, 0, 0.49));
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getZ() != -1) tntElement.alignZ(-1);
                 });
                 SimulatorWatcher.update(simulator);
-            });
+            }));
-            negativZItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getZ() == -1));
-            inventory.setItem(20, negativZItem);
 
-            SWItem positivZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> {
+            inventory.setItem(22, new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> {
-                simulatorGroup.getElements().stream()
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> {
-                        .map(TNTElement.class::cast)
+                    tnt.align(new Vector(0, 0, 0.51));
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getZ() != 1) tntElement.alignZ(1);
                 });
                 SimulatorWatcher.update(simulator);
-            });
+            }));
-            positivZItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getZ() == 1));
-            inventory.setItem(22, positivZItem);
 
             // X
-            SWItem negativXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> {
+            inventory.setItem(12, new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> {
-                simulatorGroup.getElements().stream()
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> {
-                        .map(TNTElement.class::cast)
+                    tnt.align(new Vector(0.49, 0, 0));
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getX() != -1) tntElement.alignX(-1);
-                        });
-
-                SimulatorWatcher.update(simulator);
-            });
-            negativXItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
-            inventory.setItem(12, negativXItem);
-
-            SWItem positivXItem =  new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
-                simulatorGroup.getElements().stream()
-                        .map(TNTElement.class::cast)
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getX() != 1) tntElement.alignX(1);
                 });
                 SimulatorWatcher.update(simulator);
+            }));
+
+            inventory.setItem(30, new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tnt -> {
+                    tnt.align(new Vector(0.51, 0, 0));
                 });
-            positivXItem.setEnchanted(simulatorGroup.getElements().stream()
+                SimulatorWatcher.update(simulator);
-                    .map(TNTElement.class::cast)
+            }));
-                    .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
-            inventory.setItem(30, positivXItem);
         }
 
         //Pos X
@@ -168,14 +140,6 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
-            new SimulatorAnvilGui<>(player, "Relative X", "", Double::parseDouble, number -> {
-                if(!allTNT){
-                    number = (double) Math.round(number);
-                }
-                simulatorGroup.move(number, 0, 0);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).setItem(Material.PAPER).open();
         }));
         inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
             simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0, 0);
@@ -188,14 +152,6 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
-            new SimulatorAnvilGui<>(player, "Relative Y", "", Double::parseDouble, number -> {
-                if(!allTNT){
-                    number = (double) Math.round(number);
-                }
-                simulatorGroup.move(0, number, 0);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).setItem(Material.PAPER).open();
         }));
         inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
             simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0);
@@ -208,14 +164,6 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
-            new SimulatorAnvilGui<>(player, "Relative Z", "", Double::parseDouble, number -> {
-                if(!allTNT){
-                    number = (double) Math.round(number);
-                }
-                simulatorGroup.move(0, 0, number);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).setItem(Material.PAPER).open();
         }));
         inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
             simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1);

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

@@ -1,188 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.gui;
-
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
-import de.steamwar.inventory.SWItem;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
-
-    private final SimulatorGroup parent;
-    private final ObserverElement observer;
-    private final SimulatorBaseGui back;
-
-    public SimulatorObserverGui(Player player, Simulator simulator, SimulatorGroup parent, ObserverElement observer, SimulatorBaseGui back) {
-        super(player, simulator, 6 * 9, observer.getPhases());
-        this.parent = parent;
-        this.observer = observer;
-        this.back = back;
-    }
-
-    @Override
-    public String baseTitle() {
-        return "Observer";
-    }
-
-    @Override
-    public void headerAndFooter() {
-        if (observer.getPhases().isEmpty()) {
-            back.open();
-            SimulatorWatcher.update(simulator);
-            return;
-        }
-
-        observer.sort();
-
-        // Back Arrow
-        inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
-            if (parent.getElements().contains(observer)) {
-                back.open();
-            } else {
-                SimulatorGroup newParent = observer.getGroup(simulator);
-                if (newParent == null) {
-                    player.closeInventory();
-                    return;
-                }
-                SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                if (newParent.getElements().size() == 1) {
-                    simulatorGui.open();
-                } else {
-                    new SimulatorGroupGui(player, simulator, newParent, simulatorGui).open();
-                }
-            }
-        }));
-
-        inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
-            observer.getPhases().clear();
-            SimulatorWatcher.update(simulator);
-        }));
-
-        // Material Chooser
-        inventory.setItem(4, observer.toItem(player, clickType -> {
-            new SimulatorMaterialGui(player, simulator, observer::getMaterial, observer::setMaterial, this).open();
-        }));
-
-        // Settings
-        inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
-            new SimulatorObserverSettingsGui(player, simulator, observer, this).open();
-        }));
-
-        // Enable/Disable
-        inventory.setItem(48, new SWItem(observer.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, observer.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            observer.setDisabled(!observer.isDisabled());
-            SimulatorWatcher.update(simulator);
-        }));
-
-        // Group chooser
-        inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
-            new SimulatorGroupChooserGui(player, simulator, observer, observer.getGroup(simulator), this).open();
-        }));
-    }
-
-    @Override
-    public SWItem[] column(ObserverPhase observerPhase, int index) {
-        int min;
-        if (index > 0) {
-            min = data.get(index - 1).getTickOffset() + 4;
-        } else {
-            min = 0;
-        }
-
-        int max;
-        if (index < data.size() - 1) {
-            max = data.get(index + 1).getTickOffset() - 4;
-        } else {
-            max = Integer.MAX_VALUE - 4;
-        }
-
-        List<String> lore = new ArrayList<>();
-        lore.add("§7Time§8:§e " + observerPhase.getTickOffset());
-        lore.add("§7Order§8:§e " + observerPhase.getOrder());
-        lore.add("");
-        lore.add("§7Orientation§8:§e " + observerPhase.getOrientation().name());
-        lore.add("");
-        lore.add("§7Click§8:§e Edit");
-        lore.add("§7Middle-Click§8:§e Remove");
-        SWItem observer = new SWItem(Material.OBSERVER, "§eObserver", lore, false, clickType -> {
-            if (clickType == ClickType.MIDDLE) {
-                this.observer.getPhases().remove(observerPhase);
-                SimulatorWatcher.update(simulator);
-            } else {
-                new SimulatorObserverPhaseSettingsGui(player, simulator, this.observer, observerPhase, this).open();
-            }
-        });
-        observer.getItemStack().setAmount(Math.min(Math.max(observerPhase.getTickOffset(), 1), 64));
-
-        Supplier<Integer> getter = observerPhase::getTickOffset;
-        Consumer<Integer> setter = observerPhase::setTickOffset;
-        return new SWItem[] {
-                new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }),
-                observer,
-                new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
-                    setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }),
-                new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
-                    new SimulatorObserverPhaseSettingsGui(player, simulator, this.observer, observerPhase, this).open();
-                }),
-        };
-    }
-
-    @Override
-    public SWItem[] lastColumn() {
-        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    addNewPhase(clickType.isShiftClick());
-                }),
-                new SWItem(Material.QUARTZ, "§eObserver§8:§a New Phase", clickType -> {
-                    addNewPhase(false);
-                }),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }),
-        };
-    }
-
-    private void addNewPhase(boolean shift) {
-        ObserverPhase lastElement = observer.getPhases().get(observer.getPhases().size() - 1);
-        ObserverPhase newPhase = new ObserverPhase(lastElement.getTickOffset() + 4);
-        if (shift) newPhase.setTickOffset(newPhase.getTickOffset() + 5);
-        scroll += 2;
-        observer.add(newPhase);
-        SimulatorWatcher.update(simulator);
-    }
-}

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

@@ -1,172 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.gui;
-
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.core.Core;
-import de.steamwar.inventory.SWItem;
-import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
-
-public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
-
-    private final ObserverElement observerElement;
-    private final ObserverPhase observer;
-    private final SimulatorBaseGui back;
-
-    public SimulatorObserverPhaseSettingsGui(Player player, Simulator simulator, ObserverElement observerElement, ObserverPhase observer, SimulatorBaseGui back) {
-        super(player, simulator, 5 * 9);
-        this.observerElement = observerElement;
-        this.observer = observer;
-        this.back = back;
-    }
-
-    @Override
-    public String title() {
-        return "Observer";
-    }
-
-    @Override
-    public void populate() {
-        if (!observerElement.getPhases().contains(observer)) {
-            back.open();
-            return;
-        }
-
-        // Back Arrow
-        inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
-            back.open();
-        }));
-
-        // Material Chooser
-        inventory.setItem(4, observerElement.toItem(player, clickType -> {
-            new SimulatorMaterialGui(player, simulator, observerElement::getMaterial, observerElement::setMaterial, this).open();
-        }));
-
-        // Delete
-        inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
-            observerElement.getPhases().remove(observer);
-            back.open();
-            SimulatorWatcher.update(simulator);
-        }));
-
-        int index = observerElement.getPhases().indexOf(observer);
-        int min;
-        if (index > 0) {
-            ObserverPhase previous = observerElement.getPhases().get(index - 1);
-            min = previous.getTickOffset() + 4;
-        } else {
-            min = 0;
-        }
-
-        int max;
-        if (index < observerElement.getPhases().size() - 1) {
-            ObserverPhase next = observerElement.getPhases().get(index + 1);
-            max = next.getTickOffset() - 4;
-        } else {
-            max = Integer.MAX_VALUE - 4;
-        }
-
-        //Tick Offset
-        int offset = observer.getTickOffset();
-        inventory.setItem(10, SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        });
-
-        SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
-            new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
-                observer.setTickOffset(Math.min(Math.max(integer, min), max));
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).setItem(Material.REPEATER).open();
-        });
-        offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
-        inventory.setItem(19, offsetItem);
-
-        inventory.setItem(28, SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        });
-
-        //Order
-        int order = observer.getOrder();
-        inventory.setItem(13, SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        });
-
-        Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
-        SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
-            new SimulatorAnvilGui<>(player, "Activation Order", order + "", Integer::parseInt, integer -> {
-                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
-                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
-                observer.setOrder(integer);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
-        });
-        orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
-        inventory.setItem(22, orderItem);
-
-        inventory.setItem(31, SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        });
-
-        // Update orientation
-        inventory.setItem(25, new SWItem(Material.SUNFLOWER, "§7", clickType -> {
-        }));
-        inventory.setItem(15, new SWItem(observer.getOrientation() == BlockFace.UP ? Material.LIME_CONCRETE : Material.GRAY_CONCRETE, "§eUp", clickType -> {
-            observer.setOrientation(BlockFace.UP);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(33, new SWItem(observer.getOrientation() == BlockFace.DOWN ? Material.RED_CONCRETE : Material.GRAY_CONCRETE, "§eDown", clickType -> {
-            observer.setOrientation(BlockFace.DOWN);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(16, new SWItem(observer.getOrientation() == BlockFace.NORTH ? Material.LIME_WOOL : Material.GRAY_WOOL, "§eNorth", clickType -> {
-            observer.setOrientation(BlockFace.NORTH);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(34, new SWItem(observer.getOrientation() == BlockFace.SOUTH ? Material.RED_WOOL : Material.GRAY_WOOL, "§eSouth", clickType -> {
-            observer.setOrientation(BlockFace.SOUTH);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(24, new SWItem(observer.getOrientation() == BlockFace.EAST ? Material.LIME_STAINED_GLASS : Material.GRAY_STAINED_GLASS, "§eEast", clickType -> {
-            observer.setOrientation(BlockFace.EAST);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(26, new SWItem(observer.getOrientation() == BlockFace.WEST ? Material.RED_STAINED_GLASS : Material.GRAY_STAINED_GLASS, "§eWest", clickType -> {
-            observer.setOrientation(BlockFace.WEST);
-            SimulatorWatcher.update(simulator);
-        }));
-    }
-}

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

@@ -1,142 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.gui;
-
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.inventory.SWItem;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
-
-public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
-
-    private final ObserverElement observer;
-    private final SimulatorBaseGui back;
-
-    public SimulatorObserverSettingsGui(Player player, Simulator simulator, ObserverElement observer, SimulatorBaseGui back) {
-        super(player, simulator, 5 * 9);
-        this.observer = observer;
-        this.back = back;
-    }
-
-    @Override
-    public String title() {
-        return "Observer";
-    }
-
-    @Override
-    public void populate() {
-        if (observer.getPhases().isEmpty()) {
-            back.open();
-            return;
-        }
-
-        // Back Arrow
-        inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
-            back.open();
-        }));
-
-        // Material Chooser
-        inventory.setItem(4, observer.toItem(player, clickType -> {
-            new SimulatorMaterialGui(player, simulator, observer::getMaterial, observer::setMaterial, this).open();
-        }));
-
-        // Base Tick
-        int baseTicks = observer.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
-        });
-        SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
-            new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
-                observer.changeBaseTicks(integer - baseTicks);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).setItem(Material.REPEATER).open();
-        });
-        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
-        inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
-                observer.changeBaseTicks(-baseTicks);
-            } else {
-                observer.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
-            }
-            SimulatorWatcher.update(simulator);
-        });
-
-        //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
-            SimulatorWatcher.update(simulator);
-        });
-        inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + observer.getPosition().getBlockX(), clickType -> {
-            new SimulatorAnvilGui<>(player, "X", observer.getPosition().getBlockX() + "", Integer::parseInt, i -> {
-                observer.getPosition().setX(i);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).open();
-        }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
-            SimulatorWatcher.update(simulator);
-        });
-
-        //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
-            SimulatorWatcher.update(simulator);
-        });
-        inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + observer.getPosition().getBlockY(), clickType -> {
-            new SimulatorAnvilGui<>(player, "Y", observer.getPosition().getBlockY() + "", Integer::parseInt, i -> {
-                observer.getPosition().setY(i);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).open();
-        }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
-            SimulatorWatcher.update(simulator);
-        });
-
-        //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
-        });
-        inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + observer.getPosition().getBlockZ(), clickType -> {
-            new SimulatorAnvilGui<>(player, "Z", observer.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
-                observer.getPosition().setZ(i);
-                SimulatorWatcher.update(simulator);
-                return true;
-            }, this).open();
-        }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
-            SimulatorWatcher.update(simulator);
-        });
-    }
-}

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

@@ -101,19 +101,19 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         }));
 
         // Settings
-        inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
+        inventory.setItem(48, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorRedstoneSettingsGui(player, simulator, redstone, this).open();
         }));
 
-        // Enable/Disable
+        // Group chooser
-        inventory.setItem(48, new SWItem(redstone.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, redstone.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
+        inventory.setItem(49, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
-            redstone.setDisabled(!redstone.isDisabled());
+            new SimulatorGroupChooserGui(player, simulator, redstone, redstone.getGroup(simulator), this).open();
-            SimulatorWatcher.update(simulator);
         }));
 
-        // Group chooser
+        // Enable/Disable
-        inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
+        inventory.setItem(50, new SWItem(redstone.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, redstone.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            new SimulatorGroupChooserGui(player, simulator, redstone, redstone.getGroup(simulator), this).open();
+            redstone.setDisabled(!redstone.isDisabled());
+            SimulatorWatcher.update(simulator);
         }));
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java

@@ -93,9 +93,8 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorTNTSettingsGui(player, simulator, tnt, this).open();
         }));
-        inventory.setItem(48, new SWItem(tnt.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, tnt.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
+        inventory.setItem(48, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
-            tnt.setDisabled(!tnt.isDisabled());
+            new SimulatorGroupChooserGui(player, simulator, tnt, tnt.getGroup(simulator), this).open();
-            SimulatorWatcher.update(simulator);
         }));
         inventory.setItem(50, new SWItem(Material.CHEST, parent.getElements().size() == 1 ? "§eMake Group" : "§eAdd another TNT to Group", clickType -> {
             TNTElement tntElement = new TNTElement(tnt.getPosition().clone());
@@ -104,8 +103,9 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
             new SimulatorGroupGui(player, simulator, parent, new SimulatorGui(player, simulator)).open();
             SimulatorWatcher.update(simulator);
         }));
-        inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
+        inventory.setItem(51, new SWItem(tnt.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, tnt.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            new SimulatorGroupChooserGui(player, simulator, tnt, tnt.getGroup(simulator), this).open();
+            tnt.setDisabled(!tnt.isDisabled());
+            SimulatorWatcher.update(simulator);
         }));
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java

@@ -83,7 +83,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         SWItem countItem = new SWItem(Material.TNT, "§eCount§8:§7 " + count, clickType -> {
             new SimulatorAnvilGui<>(player, "Count", count + "", Integer::parseInt, integer -> {
-                if (integer < 1) return false;
+                if (integer < 0) return false;
                 tnt.setCount(integer);
                 SimulatorWatcher.update(simulator);
                 return true;

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java

@@ -99,40 +99,31 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
 
         // Subpixel Alignment
         inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> {
-            tnt.alignX(0);
+            tnt.align(new Vector(0.5, 0, 0.5));
-            tnt.alignZ(0);
             SimulatorWatcher.update(simulator);
         }));
 
         // Z
-        SWItem negativZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> {
+        inventory.setItem(20, new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> {
-            if (tnt.getAlignment().getZ() != -1) tnt.alignZ(-1);
+            tnt.align(new Vector(0, 0, 0.49));
             SimulatorWatcher.update(simulator);
-        });
+        }));
-        negativZItem.setEnchanted(tnt.getAlignment().getZ() == -1);
-        inventory.setItem(20, negativZItem);
 
-        SWItem positivZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> {
+        inventory.setItem(22, new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> {
-            if (tnt.getAlignment().getZ() != 1) tnt.alignZ(1);
+            tnt.align(new Vector(0, 0, 0.51));
             SimulatorWatcher.update(simulator);
-        });
+        }));
-        positivZItem.setEnchanted(tnt.getAlignment().getZ() == 1);
-        inventory.setItem(22, positivZItem);
 
         // X
-        SWItem negativXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> {
+        inventory.setItem(12, new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> {
-            if (tnt.getAlignment().getX() != -1) tnt.alignX(-1);
+            tnt.align(new Vector(0.49, 0, 0));
             SimulatorWatcher.update(simulator);
-        });
+        }));
-        negativXItem.setEnchanted(tnt.getAlignment().getX() == -1);
-        inventory.setItem(12, negativXItem);
 
-        SWItem positivXItem =  new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
+        inventory.setItem(30, new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
-            if(tnt.getAlignment().getX() != 1) tnt.alignX(1);
+            tnt.align(new Vector(0.51, 0, 0));
             SimulatorWatcher.update(simulator);
-        });
+        }));
-        positivXItem.setEnchanted(tnt.getAlignment().getX() == 1);
-        inventory.setItem(30, positivXItem);
 
         // Pos X
         inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java

@@ -62,10 +62,6 @@ public abstract class SimulatorBaseGui {
                 player.getOpenInventory().setTitle(title());
             }
             populate();
-            if (player.getOpenInventory().getTopInventory() == inv) {
-                inventory.open();
-                SimulatorWatcher.watch(player, simulator, this::open);
-            }
             return;
         }
 
@@ -80,9 +76,9 @@ public abstract class SimulatorBaseGui {
             SimulatorWatcher.watch(player, null, null);
         });
 
+        inventory.open();
         SimulatorWatcher.watch(player, simulator, this::open);
         populate();
-        inventory.open();
     }
 
     private void setup() {

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

@@ -23,8 +23,6 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
@@ -96,10 +94,6 @@ public class SimFormatSimulatorLoader implements SimulatorLoader {
                     element = new RedstoneElement(position);
                     phaseConstructor = RedstonePhase::new;
                     break;
-                case "Observer":
-                    element = new ObserverElement(position);
-                    phaseConstructor = ObserverPhase::new;
-                    break;
                 default:
                     element = null;
                     phaseConstructor = null;

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

@@ -32,10 +32,6 @@ import java.io.IOException;
 public class SimulatorSaver {
 
     public void saveSimulator(File directory, Simulator simulator) {
-        if (!directory.exists()) {
-            directory.mkdirs();
-        }
-
         YAPIONObject simulatorObject = new YAPIONObject();
         simulatorObject.add("material", simulator.getMaterial().name());
         simulatorObject.add("autoTrace", simulator.isAutoTrace());

BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Laufbau.java

@@ -20,7 +20,9 @@
 package de.steamwar.bausystem.features.slaves.laufbau;
 
 import com.sk89q.worldedit.EditSession;
+import de.steamwar.bausystem.features.slaves.laufbau.states.FilteringTracesState;
 import de.steamwar.bausystem.features.slaves.laufbau.states.LaufbauState;
+import de.steamwar.bausystem.features.slaves.laufbau.states.CreatingLaufState;
 import de.steamwar.bausystem.features.slaves.laufbau.states.ProcessingTracesState;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import lombok.Getter;
@@ -38,7 +40,9 @@ public class Laufbau {
     private Location pos1;
     private Location pos2;
 
-    private LaufbauState active;
+    private FilteringTracesState filteringTracesState = null;
+    private ProcessingTracesState processingTracesState = null;
+    private CreatingLaufState creatingLaufState = null;
 
     private List<BlockBoundingBox> elements;
 
@@ -58,6 +62,8 @@ public class Laufbau {
         int zFactor = (int) (Math.abs(selectionSize.getZ()) / 9.875);
         factor = Math.max(Math.max(xFactor, Math.max(yFactor, zFactor)), 8);
 
+        filteringTracesState = new FilteringTracesState(world, this::inRegion);
+
         editSession = WorldEditUtils.getEditSession(player);
 
         elements = BlockBoundingBox.elements.stream().filter(blockBoundingBox -> {
@@ -80,32 +86,49 @@ public class Laufbau {
                 return -Double.compare(o1.blockData.getMaterial().getBlastResistance(), o2.blockData.getMaterial().getBlastResistance());
             });
         }
+    }
 
-        active = new ProcessingTracesState(world, this::inRegion, editSession, elements, factor);
+    private LaufbauState getActive() {
+        if (creatingLaufState != null) {
+            return creatingLaufState;
+        }
+        if (processingTracesState != null) {
+            return processingTracesState;
+        }
+        return filteringTracesState;
     }
 
     private void createNextState() {
-        if (active == null) return;
+        if (creatingLaufState != null) {
-        active = active.getNextState();
+            return;
+        }
+        if (processingTracesState != null) {
+            creatingLaufState = new CreatingLaufState(processingTracesState.getBlocks(), processingTracesState.getCuboidIntersectionCache(), world, editSession, elements, factor);
+            return;
+        }
+        processingTracesState = new ProcessingTracesState(filteringTracesState.getTntPositions(), this::inRegion, factor);
     }
 
     public String actionBarMessage(Player p) {
-        return active.actionBarMessage(p);
+        return getActive().actionBarMessage(p);
     }
 
     public boolean hasNext() {
-        if (active == null) return false;
+        return getActive().hasNext();
-        return active.hasNext();
     }
 
     public void next() {
-        LaufbauState state = active;
+        LaufbauState state = getActive();
         state.next();
         if (!state.hasNext()) {
             createNextState();
         }
     }
 
+    private boolean inRegion(Location location, int expansion) {
+        return inRegion(location.toVector(), expansion);
+    }
+
     private boolean inRegion(Vector location, int expansion) {
         if (location.getBlockX() >= pos1.getBlockX() - expansion) {
             if (location.getBlockY() >= pos1.getBlockY() - expansion) {

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

@@ -78,4 +78,11 @@ public class LaufbauCommand extends SWCommand {
     public void laufbauSettings(@Validator Player player) {
         new LaufbauSettings(player);
     }
+
+    @ClassValidator(value = Player.class, local = true)
+    public TypeValidator<Player> validator() {
+        return (commandSender, player, messageSender) -> {
+            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLDEDIT), "LAUFBAU_NO_PERM");
+        };
+    }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java

@@ -196,9 +196,4 @@ public class CreatingLaufState implements LaufbauState {
             }
         }
     }
-
-    @Override
-    public LaufbauState getNextState() {
-        return null;
-    }
 }