Fix changes

# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
#	BauSystem_Main/src/de/steamwar/bausystem/features/testblock/depthcounter/DepthCounter.java

.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/build.gradle

@@ -27,8 +27,8 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 17
+sourceCompatibility = 1.8
-targetCompatibility = 17
+targetCompatibility = 1.8
 
 sourceSets {
     main {

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

@@ -37,11 +37,14 @@ import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
+import de.steamwar.bausystem.region.Color;
+import de.steamwar.bausystem.region.PasteOptions;
 import de.steamwar.bausystem.region.Point;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -57,12 +60,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiPredicate;
 import java.util.logging.Level;
 
 public class FlatteningWrapper15 implements FlatteningWrapper {
@@ -106,55 +104,56 @@ 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)));
     }
 
+    private static final BaseBlock WOOL = Objects.requireNonNull(BlockTypes.PINK_WOOL).getDefaultState().toBaseBlock();
+    private static final BaseBlock CLAY = Objects.requireNonNull(BlockTypes.PINK_TERRACOTTA).getDefaultState().toBaseBlock();
+    private static final BaseBlock GLAZED = Objects.requireNonNull(BlockTypes.PINK_GLAZED_TERRACOTTA).getDefaultState().toBaseBlock();
+    private static final BaseBlock GLASS = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS).getDefaultState().toBaseBlock();
+    private static final BaseBlock GLASS_PANE = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock();
+    private static final BaseBlock CONCRETE = Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock();
+    private static final BaseBlock CONCRETE_POWDER = Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock();
+    private static final BaseBlock CARPET = Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock();
+
     @Override
-    public Clipboard loadSchematic(File file) {
+    public EditSession paste(File file, Point pastePoint, PasteOptions pasteOptions) {
         Clipboard clipboard;
         try (ClipboardReader reader = Objects.requireNonNull(ClipboardFormats.findByFile(file)).getReader(new FileInputStream(file))) {
             clipboard = reader.read();
         } catch (NullPointerException | IOException e) {
             throw new SecurityException("Bausystem schematic not found", e);
         }
-        return clipboard;
+
+        EditSession editSession = paste(clipboard, pastePoint, pasteOptions);
+        return editSession;
     }
 
     @Override
-    public EditSession paste(PasteBuilder pasteBuilder) {
+    public EditSession paste(Clipboard clipboard, Point pastePoint, PasteOptions pasteOptions) {
         try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            Clipboard clipboard = pasteBuilder.getClipboard();
+            if (pasteOptions.getColor() != Color.PINK) {
-
+                changeColor(clipboard, pasteOptions.getColor());
-            if (!pasteBuilder.getMappers().isEmpty()) {
-                BlockVector3 minimum = clipboard.getRegion().getMinimumPoint();
-                for (int x = 0; x < clipboard.getDimensions().getX(); x++) {
-                    for (int y = 0; y < clipboard.getDimensions().getY(); y++) {
-                        for (int z = 0; z < clipboard.getDimensions().getZ(); z++) {
-                            BlockVector3 pos = minimum.add(x, y, z);
-                            pasteBuilder.getMappers().forEach(mapper -> mapper.accept(clipboard, pos));
-                        }
-                    }
-                }
             }
+            if (pasteOptions.isOnlyColors()) {
+                Set<String> blocks = new HashSet<>();
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder");
+                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet");
 
-            AtomicReference<BlockVector3> pastePoint = new AtomicReference<>();
-            if (!pasteBuilder.getPredicates().isEmpty()) {
                 e.setMask(new Mask() {
                     @Override
                     public boolean test(BlockVector3 blockVector3) {
-                        BaseBlock block = clipboard.getFullBlock(blockVector3.subtract(pastePoint.get()).add(clipboard.getRegion().getMinimumPoint()));
+                        BaseBlock block = clipboard.getFullBlock(blockVector3);
-                        String blockName = block.getBlockType().toString().toLowerCase();
+                        String blockName = block.toString().toLowerCase();
-                        for (BiPredicate<BaseBlock, String> predicate : pasteBuilder.getPredicates()) {
+                        return blocks.contains(blockName);
-                            if (!predicate.test(block, blockName)) return false;
-                        }
-                        return true;
-                    }
-
-                    public Mask copy() {
-                        return this;
                     }
 
                     @Nullable
@@ -162,28 +161,31 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
                     public Mask2D toMask2D() {
                         return null;
                     }
+
+                    public Mask copy() {
+                        return this;
+                    }
                 });
             }
 
             ClipboardHolder ch = new ClipboardHolder(clipboard);
             BlockVector3 dimensions = clipboard.getDimensions();
-            BlockVector3 v = BlockVector3.at(pasteBuilder.getPastPoint().getX(), pasteBuilder.getPastPoint().getY(), pasteBuilder.getPastPoint().getZ());
+            BlockVector3 v = BlockVector3.at(pastePoint.getX(), pastePoint.getY(), pastePoint.getZ());
             BlockVector3 offset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
-            if (pasteBuilder.isRotate()) {
+            if (pasteOptions.isRotate()) {
                 ch.setTransform(new AffineTransform().rotateY(180));
                 v = v.add(dimensions.getX() / 2, 0, dimensions.getZ() / 2).subtract(offset.multiply(-1, 1, -1)).subtract(0, 0, 1);
             } else {
                 v = v.subtract(dimensions.getX() / 2, 0, dimensions.getZ() / 2).subtract(offset);
             }
-            pastePoint.set(v);
 
-            if (pasteBuilder.isReset()) {
+            if (pasteOptions.isReset()) {
-                e.setBlocks(new CuboidRegion(toBlockVector3(pasteBuilder.getMinPoint()), toBlockVector3(pasteBuilder.getMaxPoint())), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
+                e.setBlocks((Region) new CuboidRegion(toBlockVector3(pasteOptions.getMinPoint()), toBlockVector3(pasteOptions.getMaxPoint())), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
-                if (pasteBuilder.getWaterLevel() != 0) {
+                if (pasteOptions.getWaterLevel() != 0) {
-                    e.setBlocks(new CuboidRegion(toBlockVector3(pasteBuilder.getMinPoint()), toBlockVector3(pasteBuilder.getMaxPoint()).withY(pasteBuilder.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
+                    e.setBlocks((Region) new CuboidRegion(toBlockVector3(pasteOptions.getMinPoint()), toBlockVector3(pasteOptions.getMaxPoint()).withY(pasteOptions.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
                 }
             }
-            Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteBuilder.isIgnoreAir()).build());
+            Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteOptions.isIgnoreAir()).build());
             return e;
         } catch (WorldEditException e) {
             throw new SecurityException(e.getMessage(), e);
@@ -191,7 +193,46 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
     }
 
     @Override
-    public Clipboard copy(Point minPoint, Point maxPoint, Point copyPoint) {
+    public void changeColor(Clipboard clipboard, Color color) throws WorldEditException {
+        BlockVector3 minimum = clipboard.getRegion().getMinimumPoint();
+        BaseBlock wool = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock();
+        BaseBlock clay = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock();
+        BaseBlock glazed = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_glazed_terracotta")).getDefaultState().toBaseBlock();
+        BaseBlock glass = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock();
+        BaseBlock glassPane = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock();
+        BaseBlock carpet = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_carpet")).getDefaultState().toBaseBlock();
+        BaseBlock concrete = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_concrete")).getDefaultState().toBaseBlock();
+        BaseBlock concretePowder = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_concrete_powder")).getDefaultState().toBaseBlock();
+
+        for (int x = 0; x < clipboard.getDimensions().getX(); x++) {
+            for (int y = 0; y < clipboard.getDimensions().getY(); y++) {
+                for (int z = 0; z < clipboard.getDimensions().getZ(); z++) {
+                    BlockVector3 pos = minimum.add(x, y, z);
+                    BaseBlock block = clipboard.getFullBlock(pos);
+                    if (block.equals(WOOL)) {
+                        clipboard.setBlock(pos, wool);
+                    } else if (block.equals(CLAY)) {
+                        clipboard.setBlock(pos, clay);
+                    } else if (block.equals(GLAZED)) {
+                        clipboard.setBlock(pos, glazed);
+                    } else if (block.equals(GLASS)) {
+                        clipboard.setBlock(pos, glass);
+                    } else if (block.equals(GLASS_PANE)) {
+                        clipboard.setBlock(pos, glassPane);
+                    } else if (block.equals(CARPET)) {
+                        clipboard.setBlock(pos, carpet);
+                    } else if (block.equals(CONCRETE)) {
+                        clipboard.setBlock(pos, concrete);
+                    } else if (block.equals(CONCRETE_POWDER)) {
+                        clipboard.setBlock(pos, concretePowder);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    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 +245,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
+            try (ClipboardWriter writer = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(file))) {
-    public boolean backup(Point minPoint, Point maxPoint, File file) {
+                writer.write(clipboard);
-        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;
         }
@@ -240,4 +272,19 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
 
         return ((Waterlogged) data).isWaterlogged();
     }
+
+    @Override
+    public Material getTraceShowMaterial() {
+        return Material.LIME_CONCRETE;
+    }
+
+    @Override
+    public Material getTraceHideMaterial() {
+        return Material.RED_CONCRETE;
+    }
+
+    @Override
+    public Material getTraceXZMaterial() {
+        return Material.QUARTZ_SLAB;
+    }
 }

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

@@ -63,6 +63,38 @@ public class NMSWrapper15 implements NMSWrapper {
         player.updateInventory();
     }
 
+    @Override
+    public void init(LongSupplier longSupplier) {
+        SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong();
+    }
+
+    private static final List<Packet<?>> packets = new ArrayList<>();
+    private static final Vec3D noMotion = new Vec3D(0, 0, 0);
+
+    @Override
+    public void createTickCache(World world) {
+        packets.clear();
+        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
+            packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
+            packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
+
+            if (entity instanceof TNTPrimed) {
+                net.minecraft.server.v1_15_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
+                packets.add(new PacketPlayOutEntityMetadata(serverEntity.getId(), serverEntity.getDataWatcher(), true));
+            }
+        });
+    }
+
+    @Override
+    public void sendTickPackets() {
+        Bukkit.getOnlinePlayers().forEach(player -> {
+            PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection;
+            for (Packet<?> p : packets) {
+                connection.sendPacket(p);
+            }
+        });
+    }
+
     private static final Reflection.FieldAccessor<Integer> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, int.class, 0);
 
     @Override

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

@@ -1,43 +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.utils;
-
-import org.bukkit.Material;
-
-public class PlaceItemWrapper15 implements PlaceItemWrapper {
-
-    public PlaceItemWrapper15() {
-        for (Material material : Material.values()) {
-            if (!material.isBlock()) continue;
-            if (material.isLegacy()) continue;
-
-            String nonWall = material.name().replace("_WALL_", "").replace("WALL_", "").replace("_WALL", "");
-            try {
-                Material nonWallMaterial = Material.valueOf(nonWall);
-                if (nonWallMaterial != material && nonWallMaterial.isItem() && !nonWallMaterial.isBlock()) {
-                    BLOCK_MATERIAL_TO_WALL_BLOCK_MATERIAL.put(nonWallMaterial, material);
-                }
-            } catch (Exception e) {
-                // Ignore
-            }
-        }
-        ITEM_MATERIAL_TO_BLOCK_MATERIAL.put(Material.REDSTONE, Material.REDSTONE_WIRE);
-    }
-}

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

@@ -19,12 +19,9 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
 import de.steamwar.bausystem.utils.PlayerMovementWrapper;
 import net.minecraft.server.v1_15_R1.EntityPlayer;
 import net.minecraft.server.v1_15_R1.PacketPlayInFlying;
-import net.minecraft.server.v1_15_R1.PacketPlayOutEntity;
-import net.minecraft.server.v1_15_R1.PacketPlayOutEntityTeleport;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
@@ -40,20 +37,4 @@ public class PlayerMovementWrapper15 implements PlayerMovementWrapper {
             entityPlayer.setLocation(packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0), packetPlayInFlying.a(0F), packetPlayInFlying.b(0F));
         }
     }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0));
-        if (Float.isNaN(packetPlayInFlying.a(Float.NaN))) {
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.a(0.0F)));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.b(0.0F)));
-        }
-        return packet;
-    }
 }

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

@@ -1,23 +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.utils;
-
-public class TickListener15 implements TickListener {
-}

BauSystem_18/build.gradle

@@ -27,8 +27,8 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 17
+sourceCompatibility = 1.8
-targetCompatibility = 17
+targetCompatibility = 1.8
 
 sourceSets {
     main {

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

@@ -0,0 +1,41 @@
+/*
+ * 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.world.entity.item.EntityTNTPrimed;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class TNTPrimedIterator18 implements TNTPrimedIterator {
+
+    private static final CraftWorld WORLD = (CraftWorld) Bukkit.getWorlds().get(0);
+
+    @Override
+    public Stream<TNTPrimed> iterator() {
+        return StreamSupport.stream(WORLD.getHandle().H().a().spliterator(), false)
+                .filter(EntityTNTPrimed.class::isInstance)
+                .map(entity -> (TNTPrimed) entity.getBukkitEntity());
+    }
+}
+

BauSystem_18/src/de/steamwar/bausystem/utils/NMSWrapper18.java

@@ -73,6 +73,37 @@ public class NMSWrapper18 implements NMSWrapper {
         player.updateInventory();
     }
 
+    @Override
+    public void init(LongSupplier longSupplier) {
+        SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong();
+    }
+
+    private static final List<Packet<?>> packets = new ArrayList<>();
+    private static final Vec3D noMotion = new Vec3D(0, 0, 0);
+
+    @Override
+    public void createTickCache(World world) {
+        packets.clear();
+        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
+            packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
+            packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
+
+            if (entity instanceof TNTPrimed) {
+                net.minecraft.world.entity.Entity serverEntity = ((CraftEntity) entity).getHandle();
+                packets.add(new PacketPlayOutEntityMetadata(serverEntity.ae(), serverEntity.ai(), true));
+            }
+        });
+    }
+
+    @Override
+    public void sendTickPackets() {
+        Bukkit.getOnlinePlayers().forEach(player -> {
+            for (Packet<?> p : packets) {
+                TinyProtocol.instance.sendPacket(player, p);
+            }
+        });
+    }
+
     private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override

BauSystem_18/src/de/steamwar/bausystem/utils/PlayerMovementWrapper18.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
 import de.steamwar.bausystem.utils.PlayerMovementWrapper;
 import net.minecraft.network.protocol.game.PacketPlayInFlying;
 import net.minecraft.server.level.EntityPlayer;
@@ -38,20 +37,4 @@ public class PlayerMovementWrapper18 implements PlayerMovementWrapper {
             entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
         }
     }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        if (packetPlayInFlying.h) {
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
-        }
-        return packet;
-    }
 }

BauSystem_19/build.gradle

@@ -27,8 +27,8 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 17
+sourceCompatibility = 1.8
-targetCompatibility = 17
+targetCompatibility = 1.8
 
 sourceSets {
     main {
@@ -51,7 +51,6 @@ dependencies {
     implementation project(":BauSystem_Main")
 
     compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
-    compileOnly 'io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT'
     compileOnly 'it.unimi.dsi:fastutil:8.5.6'
     compileOnly 'com.mojang:datafixerupper:4.0.26'
     compileOnly 'io.netty:netty-all:4.1.68.Final'

BauSystem_19/src/de/steamwar/bausystem/features/tracer/record/TNTPrimedIterator19.java

@@ -0,0 +1,41 @@
+/*
+ * 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.world.entity.item.EntityTNTPrimed;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class TNTPrimedIterator19 implements TNTPrimedIterator {
+
+    private static final CraftWorld WORLD = (CraftWorld) Bukkit.getWorlds().get(0);
+
+    @Override
+    public Stream<TNTPrimed> iterator() {
+        return StreamSupport.stream(WORLD.getHandle().F().a().spliterator(), false)
+                .filter(EntityTNTPrimed.class::isInstance)
+                .map(entity -> (TNTPrimed) entity.getBukkitEntity());
+    }
+}
+

BauSystem_19/src/de/steamwar/bausystem/utils/NMSWrapper19.java

@@ -55,6 +55,7 @@ public class NMSWrapper19 implements NMSWrapper {
     @SuppressWarnings("deprecation")
     public void setInternalGameMode(Player player, GameMode gameMode) {
         playerGameMode.set(((CraftPlayer) player).getHandle().d, EnumGamemode.a(gameMode.getValue()));
+
     }
 
     @Override
@@ -73,6 +74,39 @@ public class NMSWrapper19 implements NMSWrapper {
         player.updateInventory();
     }
 
+    @Override
+    public void init(LongSupplier longSupplier) {
+        SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong();
+    }
+
+    private static final List<Packet<?>> packets = new ArrayList<>();
+    private static final Vec3D noMotion = new Vec3D(0, 0, 0);
+
+    @Override
+    public void createTickCache(World world) {
+        packets.clear();
+        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
+            packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
+            packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
+
+            if (entity instanceof TNTPrimed) {
+                net.minecraft.world.entity.Entity serverEntity = ((CraftEntity) entity).getHandle();
+                List<DataWatcher.b<?>> list = serverEntity.al().c();
+                if(list != null)
+                    packets.add(new PacketPlayOutEntityMetadata(serverEntity.ah(), list));
+            }
+        });
+    }
+
+    @Override
+    public void sendTickPackets() {
+        Bukkit.getOnlinePlayers().forEach(player -> {
+            for (Packet<?> p : packets) {
+                TinyProtocol.instance.sendPacket(player, p);
+            }
+        });
+    }
+
     private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override

BauSystem_19/src/de/steamwar/bausystem/utils/PlayerMovementWrapper19.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
 import net.minecraft.network.protocol.game.PacketPlayInFlying;
 import net.minecraft.server.level.EntityPlayer;
 import org.bukkit.Location;
@@ -32,30 +31,50 @@ import java.util.UUID;
 
 public class PlayerMovementWrapper19 implements PlayerMovementWrapper {
 
+    private static class Position {
+        private double x;
+        private double y;
+        private double z;
+        private float yaw;
+        private float pitch;
+    }
+
+    private Map<UUID, Position> playerLocationMap = new HashMap<>();
+
     @Override
     public void setPosition(Player player, Object object) {
+        Position position = playerLocationMap.computeIfAbsent(player.getUniqueId(), uuid -> {
+            Position pos = new Position();
+            Location location = player.getLocation();
+            pos.x = location.getX();
+            pos.y = location.getY();
+            pos.z = location.getZ();
+            pos.yaw = location.getYaw();
+            pos.pitch = location.getPitch();
+            return pos;
+        });
         PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
         EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
         if (packetPlayInFlying.h) {
             entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
+            position.x = packetPlayInFlying.a;
+            position.y = packetPlayInFlying.b;
+            position.z = packetPlayInFlying.c;
+            position.yaw = packetPlayInFlying.d;
+            position.pitch = packetPlayInFlying.e;
         } else {
             entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+            position.x = packetPlayInFlying.a;
+            position.y = packetPlayInFlying.b;
+            position.z = packetPlayInFlying.c;
         }
     }
 
     @Override
-    public Object convertToOut(Player player, Object object) {
+    public void disable(Player player) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        Position position = playerLocationMap.remove(player.getUniqueId());
-        Object packet = Reflection.newInstance(teleportPacket);
+        if (position != null) {
-        teleportEntity.set(packet, player.getEntityId());
+            player.teleport(new Location(player.getWorld(), position.x, position.y, position.z, position.yaw, position.pitch));
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        if (packetPlayInFlying.h) {
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
         }
-        return packet;
     }
 }

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

@@ -1,51 +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.utils;
-
-import com.destroystokyo.paper.event.server.ServerTickEndEvent;
-import com.destroystokyo.paper.event.server.ServerTickStartEvent;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class TickListener19 implements TickListener, Listener {
-
-    private boolean tickStartRan = false;
-
-    public TickListener19() {
-        Bukkit.getPluginManager().registerEvents(this, BauSystem.getInstance());
-    }
-
-    @EventHandler
-    public void onServerTickStart(ServerTickStartEvent event) {
-        if (TPSFreezeUtils.isFrozen()) return;
-        Bukkit.getPluginManager().callEvent(new TickStartEvent());
-        tickStartRan = true;
-    }
-
-    @EventHandler
-    public void onServerTickEnd(ServerTickEndEvent event) {
-        if (!tickStartRan) return;
-        Bukkit.getPluginManager().callEvent(new TickEndEvent());
-        tickStartRan = false;
-    }
-}

BauSystem_20/build.gradle

@@ -1,62 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-plugins {
-    id 'base'
-    id 'java'
-}
-
-group 'steamwar'
-version '1.0'
-
-compileJava.options.encoding = 'UTF-8'
-
-sourceCompatibility = 17
-targetCompatibility = 17
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ['src/']
-        }
-        resources {
-            srcDirs = ['src/']
-            exclude '**/*.java', '**/*.kt'
-        }
-    }
-}
-
-dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.22'
-    testCompileOnly 'org.projectlombok:lombok:1.18.22'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
-
-    implementation project(":BauSystem_Main")
-
-    compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
-    compileOnly 'it.unimi.dsi:fastutil:8.5.6'
-    compileOnly 'com.mojang:datafixerupper:4.0.26'
-    compileOnly 'io.netty:netty-all:4.1.68.Final'
-    compileOnly 'com.mojang:authlib:1.5.25'
-    compileOnly 'com.mojang:brigadier:1.0.18'
-
-    compileOnly swdep('Spigot-1.20')
-    compileOnly swdep('SpigotCore')
-}

BauSystem_20/src/de/steamwar/bausystem/utils/NMSWrapper20.java

@@ -1,136 +0,0 @@
-/*
- * 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.utils;
-
-import com.comphenix.tinyprotocol.Reflection;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.game.PacketPlayInSetCreativeSlot;
-import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
-import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
-import net.minecraft.server.level.PlayerInteractManager;
-import net.minecraft.world.level.EnumGamemode;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-
-public class NMSWrapper20 implements NMSWrapper {
-
-    private static final Reflection.FieldAccessor<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerGameMode.set(((CraftPlayer) player).getHandle().e, EnumGamemode.a(gameMode.getValue()));
-    }
-
-    @Override
-    public void setSlotToItemStack(Player player, Object o) {
-        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
-        int index = packetPlayInSetCreativeSlot.a();
-        if (index >= 36 && index <= 44) {
-            index -= 36;
-        } else if (index > 44) {
-            index -= 5;
-        } else if (index <= 8) {
-            index = index - 8 + 36;
-        }
-        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.c()));
-        if (index < 9) player.getInventory().setHeldItemSlot(index);
-        player.updateInventory();
-    }
-
-    private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
-
-    @Override
-    public void setGameStateChangeReason(Object packet) {
-        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
-    }
-
-    @Override
-    public void setPlayerBuildAbilities(Player player) {
-        ((CraftPlayer) player).getHandle().fO().d = true;
-        ((CraftPlayer) player).getHandle().fO().e = true;
-    }
-
-    @Override
-    public Material pathMaterial() {
-        return Material.DIRT_PATH;
-    }
-
-    private static final int threshold = 2048;
-
-    @Override
-    public boolean checkItemStack(ItemStack item) {
-        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-        NBTTagCompound tag = nmsItem.v();
-        if (tag != null && tag.e("BlockEntityTag")) {
-            NBTTagCompound blockTag = tag.p("BlockEntityTag");
-            if (blockTag.e("Items")) {
-                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
-            }
-        }
-
-        return false;
-    }
-
-    private int drillDown(NBTTagList items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (NBTBase nbtBase : items) {
-            if (!(nbtBase instanceof NBTTagCompound))
-                continue;
-            NBTTagCompound slot = (NBTTagCompound) nbtBase;
-            if (slot.e("tag")) {
-                invalid += slot.f("Count");
-                NBTTagCompound iTag = slot.p("tag");
-                if (iTag.e("BlockEntityTag")) {
-                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
-                    if (blockTag.e("Items")) {
-                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
-                    }
-                }
-            }
-            if (invalid > threshold)
-                break;
-        }
-        return invalid;
-    }
-
-    private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
-    private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.FieldAccessor<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.FieldAccessor<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.FieldAccessor<List> e = Reflection.getField(explosionPacket, List.class, 0);
-
-    @Override
-    public Object resetExplosionKnockback(Object packet) {
-        PacketPlayOutExplosion packetPlayOutExplosion = (PacketPlayOutExplosion) packet;
-        return new PacketPlayOutExplosion(a.get(packetPlayOutExplosion), b.get(packetPlayOutExplosion), c.get(packetPlayOutExplosion), d.get(packetPlayOutExplosion), e.get(packetPlayOutExplosion), null);
-    }
-}

BauSystem_20/src/de/steamwar/bausystem/utils/PlaceItemWrapper20.java

@@ -1,43 +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.utils;
-
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-
-public class PlaceItemWrapper20 implements PlaceItemWrapper {
-
-    public PlaceItemWrapper20() {
-        for (Material material : Material.values()) {
-            if (!material.isBlock()) continue;
-            if (material.isLegacy()) continue;
-            BlockData blockData = material.createBlockData();
-            Material placementMaterial = blockData.getPlacementMaterial();
-            if (material == placementMaterial) continue;
-            if (placementMaterial == Material.AIR) continue;
-            if (placementMaterial.isItem() && !placementMaterial.isBlock()) {
-                ITEM_MATERIAL_TO_BLOCK_MATERIAL.put(placementMaterial, material);
-            }
-            if (material.name().contains("WALL")) {
-                BLOCK_MATERIAL_TO_WALL_BLOCK_MATERIAL.put(placementMaterial, material);
-            }
-        }
-    }
-}

BauSystem_20/src/de/steamwar/bausystem/utils/PlayerMovementWrapper20.java

@@ -1,62 +0,0 @@
-/*
- * 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.utils;
-
-import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.network.protocol.game.PacketPlayInFlying;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport;
-import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-public class PlayerMovementWrapper20 implements PlayerMovementWrapper {
-
-    @Override
-    public void setPosition(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
-        if (packetPlayInFlying.h) {
-            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
-        } else {
-            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        }
-    }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
-        Object packet = Reflection.newInstance(teleportPacket);
-        teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
-        if (packetPlayInFlying.h) {
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
-        }
-        return packet;
-    }
-}

BauSystem_Linkage/build.gradle

@@ -27,8 +27,8 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 17
+sourceCompatibility = 1.8
-targetCompatibility = 17
+targetCompatibility = 1.8
 
 sourceSets {
     main {

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_Linkage/src/de/steamwar/linkage/types/SmartPlaceBehaviour_GENERIC.java

@@ -0,0 +1,40 @@
+/*
+ * 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.linkage.types;
+
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.plan.BuildPlan;
+import de.steamwar.linkage.plan.MethodBuilder;
+
+import javax.lang.model.element.TypeElement;
+
+public class SmartPlaceBehaviour_GENERIC implements LinkageType {
+
+    @Override
+    public String method() {
+        return "linkSmartPlace";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        buildPlan.addImport("de.steamwar.bausystem.features.smartplace.SmartPlaceListener");
+        methodBuilder.addLine("SmartPlaceListener.add(" + s + ");");
+    }
+}

BauSystem_Main/build.gradle

@@ -27,8 +27,8 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 17
+sourceCompatibility = 1.8
-targetCompatibility = 17
+targetCompatibility = 1.8
 
 sourceSets {
     main {
@@ -43,9 +43,6 @@ sourceSets {
 }
 
 dependencies {
-    // implementation 'yoyosource:YAPION:0.25.3'
-    implementation files("${projectDir}/../libs/YAPION-SNAPSHOT.jar")
-
     compileOnly 'org.projectlombok:lombok:1.18.22'
     testCompileOnly 'org.projectlombok:lombok:1.18.22'
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
@@ -54,16 +51,16 @@ dependencies {
     implementation project(":BauSystem_Linkage")
     annotationProcessor project(":BauSystem_Linkage")
 
-    compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
     compileOnly 'com.mojang:authlib:1.5.25'
     compileOnly 'io.netty:netty-all:4.1.68.Final'
 
-    compileOnly swdep('Spigot-1.20')
+    compileOnly swdep('Spigot-1.19')
+    // compileOnly swdep('WorldEdit-1.15')
     compileOnly swdep('SpigotCore')
     annotationProcessor swdep('SpigotCore')
 
     compileOnly swdep('FastAsyncWorldEdit-1.18')
-    compileOnly swdep('AxiomPaper')
 
     implementation 'org.luaj:luaj-jse:3.0.1'
 }

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

@@ -21,20 +21,19 @@ 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.tpslimit.FreezeUtils;
+import de.steamwar.bausystem.features.tpslimit.TPSLimitUtils;
+import de.steamwar.bausystem.features.tpslimit.TPSUtils;
+import de.steamwar.bausystem.features.tpslimit.TPSWarpUtils;
+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.World;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -52,13 +51,16 @@ 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;
 
+    private World world;
+
     @Override
     public void onEnable() {
+        world = Bukkit.getWorlds().get(0);
+
         // LOGGER
         fixLogging();
 
@@ -73,48 +75,36 @@ 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);
+        LinkageUtils.link();
-        new Updater(RegionLoader.file, RegionLoader::load);
+        RamUsage.init();
 
-        SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
+        // This could disable any watchdog stuff. We need to investigate if this is a problem.
-        SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
+        /*
-        SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
+        Thread thread = new Thread(() -> {
-        SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
+            while (true) {
-
+                WatchdogThread.tick();
-        try {
+                try {
-            LinkageUtils.link();
+                    Thread.sleep(1000);
-        } catch (Exception e) {
+                } catch (InterruptedException e) {
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
+                    Thread.currentThread().interrupt();
-            Bukkit.shutdown();
-            System.exit(1);
-            return;
-        }
-        TickListener.impl.init();
-    }
-
-    private <T extends CommandSender> AbstractValidator<T, ?> validator(Permission permission) {
-        return (commandSender, object, messageSender) -> {
-            if (commandSender instanceof Player) {
-                if (permission.hasPermission((Player) commandSender)) {
-                    return true;
                 }
-                messageSender.send("NO_PERMISSION");
-                return false;
             }
-            return true;
+        });
-        };
+        thread.setName("WatchdogThread ticker");
+        thread.setDaemon(true);
+        thread.start();
+         */
     }
 
     @Override
     public void onDisable() {
         LinkageUtils.unlink();
 
-        WorldData.write();
+        WorldData.getInstance().save();
-        Config.getInstance().saveAll();
+        Config.saveAll();
         TinyProtocol.instance.close();
     }
 
@@ -145,7 +135,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
             @Override
             public void run() {
-                if (TPSFreezeUtils.isFrozen()) return;
+                if (FreezeUtils.isFrozen()) return;
                 if (counter >= delay) {
                     runnable.run();
                     cancel();
@@ -163,7 +153,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
             @Override
             public void run() {
-                if (TPSFreezeUtils.isFrozen()) return;
+                if (FreezeUtils.isFrozen()) return;
                 if (counter >= (first ? delay : period)) {
                     first = false;
                     runnable.run();

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

@@ -20,77 +20,72 @@
 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;
+        }
+
+        BauweltMember bauMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
+        if (bauMember == null) {
+            return false;
+        }
+
+        return permissionPredicate.test(bauMember);
     }
 
-    public boolean hasPermission(Player member) {
+    public static boolean hasPermission(Player member, Permission permission) {
-        if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
+        return permission.hasPermission(member);
-            return this != REAL_SPECTATOR;
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.PARAMETER)
+    @CommandMetaData.Parameter({Player.class})
+    @CommandMetaData.ImplicitValidator(handler = Perm.Handler.class, order = -10)
+    public @interface Perm {
+        Permission value();
+        String message() default "";
+
+        class Handler implements TypeValidator<Player> {
+
+            private Permission permission;
+            private String message;
+
+            public Handler(Perm perm) {
+                this.permission = perm.value();
+                this.message = perm.message();
+                if (message != null && message.isEmpty()) message = null;
+            }
+
+            @Override
+            public boolean validate(CommandSender commandSender, Player player, MessageSender messageSender) {
+                if (message == null) {
+                    return permission.hasPermission(player);
+                }
+                return !messageSender.send(!permission.hasPermission((Player) commandSender), message);
+            }
         }
-        BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauweltMember == null) return this == REAL_SPECTATOR;
-        return permissionPredicate.test(bauweltMember);
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/config/ConfigField.java

@@ -0,0 +1,31 @@
+/*
+ * 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.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ConfigField {
+    boolean required() default false;
+}

BauSystem_Main/src/de/steamwar/bausystem/config/YamlConfig.java

@@ -0,0 +1,95 @@
+/*
+ * 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.config;
+
+import de.steamwar.sql.UserConfig;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.configuration.serialization.ConfigurationSerialization;
+
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public class YamlConfig implements ConfigurationSerializable {
+
+    public static void register(Class<? extends YamlConfig> configType) {
+        ConfigurationSerialization.registerClass(configType);
+    }
+
+    public static YamlConfiguration fromUserConfig(UUID uuid, String name) {
+        String config = UserConfig.getConfig(uuid, name);
+        if(config == null)
+            return new YamlConfiguration();
+
+        return YamlConfiguration.loadConfiguration(new StringReader(config));
+    }
+
+    public YamlConfig() {}
+
+    public YamlConfig(ConfigurationSection configuration) {
+        this(configuration.getValues(false));
+    }
+
+    public YamlConfig(Map<String, Object> map) {
+        Arrays.stream(getClass().getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(ConfigField.class))
+                .forEach(field -> {
+                    String name = field.getName();
+                    try {
+                        field.setAccessible(true);
+                        field.set(this, map.containsKey(name) ? map.get(name) : getClass().getDeclaredField(name.toUpperCase() + "_DEFAULT").get(null));
+                    } catch (NoSuchFieldException e) {
+                        if(field.getAnnotation(ConfigField.class).required())
+                            throw new IllegalStateException(getClass().getName() + "." + field.getName() + " is required", e);
+                    } catch (IllegalAccessException e) {
+                        throw new IllegalStateException(getClass().getName() + "." + field.getName() + " is inaccessible for deserializer", e);
+                    }
+                });
+    }
+
+    @Override
+    public Map<String, Object> serialize() {
+        return Arrays.stream(getClass().getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(ConfigField.class))
+                .collect(Collectors.toMap(
+                        Field::getName,
+                        field -> {
+                            try {
+                                field.setAccessible(true);
+                                return field.get(this);
+                            } catch (IllegalAccessException e) {
+                                throw new IllegalStateException(getClass().getName() + "." + field.getName() + " is inaccessible for serializer", e);
+                            }
+                        }
+                ));
+    }
+
+    public YamlConfiguration toYaml() {
+        YamlConfiguration config = new YamlConfiguration();
+        for(Map.Entry<String, Object> entry : serialize().entrySet())
+            config.set(entry.getKey(), entry.getValue());
+        return config;
+    }
+}

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

@@ -19,129 +19,120 @@
 
 package de.steamwar.bausystem.configplayer;
 
-import de.steamwar.bausystem.configplayer.serializer.ConfigurationSerializableSerializer;
+import de.steamwar.bausystem.config.ConfigField;
+import de.steamwar.bausystem.config.YamlConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.UserConfig;
 import lombok.Getter;
-import org.bukkit.Bukkit;
+import lombok.Setter;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import yapion.hierarchy.output.StringOutput;
-import yapion.hierarchy.types.YAPIONObject;
-import yapion.parser.YAPIONParser;
-import yapion.serializing.SerializeManager;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Level;
 
-@Linked
+public class Config extends YamlConfig {
-public class Config implements Listener {
 
-    static {
+    private static final Map<UUID, Config> playerConfigurations = new HashMap<>();
-        SerializeManager.add(new ConfigurationSerializableSerializer());
+
+    public static Config get(Player player) { //TODO: NULL
+        return playerConfigurations.computeIfAbsent(player.getUniqueId(), uuid -> new Config(uuid, fromUserConfig(uuid, "bausystem")));
     }
 
-    @Getter
+    public static void saveAll() {
-    private static Config instance;
+        playerConfigurations.forEach((uuid, config) -> config.save());
-
-    {
-        instance = this;
-    }
-
-    private final Map<UUID, YAPIONObject> playerConfigurations = new HashMap<>();
-
-    private static final Map<Integer, ConfigConverter> CONFIG_CONVERTER_MAP = new HashMap<>();
-
-    public static void addConfigConverter(ConfigConverter configConverter) {
-        CONFIG_CONVERTER_MAP.putIfAbsent(configConverter.version(), configConverter);
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        get(event.getPlayer());
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        save(event.getPlayer());
-        playerConfigurations.remove(event.getPlayer().getUniqueId());
-    }
-
-    /**
-     * Get a PlayerConfig, optionally loads it from the DataBase and migrates it if necessary.
-     *
-     * @param player the player from whom to get the config.
-     * @return the config object
-     */
-    public YAPIONObject get(Player player) {
-        UUID uuid = player.getUniqueId();
-        if (!playerConfigurations.containsKey(uuid)) {
-            String s = UserConfig.getConfig(uuid, "bausystem");
-            YAPIONObject yapionObject;
-            if (s == null) {
-                yapionObject = ConfigCreator.createDefaultConfig();
-            } else {
-                yapionObject = YAPIONParser.parse(s);
-            }
-            yapionObject = update(yapionObject);
-            playerConfigurations.put(uuid, yapionObject);
-            return yapionObject;
-        }
-        return playerConfigurations.get(uuid);
-    }
-
-    public void saveAll() {
-        playerConfigurations.forEach((uuid, yapionObject) -> {
-            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\+", "\\");
-            UserConfig.updatePlayerConfig(uuid, "bausystem", string);
-        });
         playerConfigurations.clear();
     }
 
-    /**
+    private final UUID uuid;
-     * Save a PlayerConfig, this does not remove the key value mapping from the map.
+
-     *
+    @Getter
-     * @param player the player to save the config.
+    @Setter
-     */
+    @ConfigField
-    public void save(Player player) {
+    private boolean nightvision;
-        UUID uuid = player.getUniqueId();
+
-        if (playerConfigurations.containsKey(uuid)) {
+    @Getter
-            YAPIONObject yapionObject = playerConfigurations.get(uuid);
+    @Setter
-            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\\\+", "\\\\");
+    @ConfigField
-            UserConfig.updatePlayerConfig(uuid, "bausystem", string);
+    private boolean simulatorAutoTrace;
+
+    @Getter
+    @Setter
+    @ConfigField
+    private boolean detonatorAutostart;
+
+    @Getter
+    @Setter
+    @ConfigField
+    private boolean blockCounter;
+
+    @Getter
+    @Setter
+    @ConfigField
+    private boolean smartPlace;
+
+    @Getter
+    @Setter
+    @ConfigField
+    private boolean inventoryFill;
+
+    @Getter
+    @ConfigField
+    private final Map<String, Integer> baugui = new HashMap<>();
+
+    private Config(UUID uuid, ConfigurationSection configuration) {
+        super(configuration);
+        this.uuid = uuid;
+
+        if(baugui.isEmpty()) {
+            //  0:  ? |  1:  ? |  2: 10 |  3:  3 |  4:  7 |  5: 17 |  6: 15 |  7:  ? |  8:  ?
+            //  9:  5 | 10:  ? | 11:  ? | 12:  ? | 13:  ? | 14:  ? | 15:  ? | 16:  ? | 17: 16
+            // 18:  4 | 19:  ? | 20: 19 | 21: 21 | 22:  9 | 23:  0 | 24:  1 | 25:  ? | 26: 11
+            // 27:  6 | 28:  ? | 29:  ? | 30:  ? | 31:  ? | 32:  ? | 33:  ? | 34:  ? | 35: 18
+            // 36:  ? | 37: 23 | 38: 20 | 39:  8 | 40: 22 | 41: 26 | 42: 12 | 43: 14 | 44:  ?
+
+            baugui.put("size", 45);
+            baugui.put("10", 2);
+            baugui.put("3", 3);
+            baugui.put("7", 4);
+            baugui.put("17", 5);
+            baugui.put("15", 6);
+            baugui.put("5", 9);
+            baugui.put("16", 17);
+            baugui.put("4", 18);
+            baugui.put("19", 20);
+            baugui.put("21", 21);
+            baugui.put("9", 22);
+            baugui.put("0", 23);
+            baugui.put("1", 24);
+            baugui.put("11", 26);
+            baugui.put("6", 27);
+            baugui.put("18", 35);
+            baugui.put("23", 37);
+            baugui.put("20", 38);
+            baugui.put("8", 39);
+            baugui.put("22", 40);
+            baugui.put("26", 41);
+            baugui.put("12", 42);
+            baugui.put("14", 43);
         }
     }
 
-    private YAPIONObject update(YAPIONObject yapionObject) {
+    public void save() {
-        int version = yapionObject.getPlainValue("@version");
+        UserConfig.updatePlayerConfig(uuid, "bausystem", toYaml().saveToString());
-        while (version < ConfigCreator.currentVersion) {
+    }
-            ConfigConverter configConverter = CONFIG_CONVERTER_MAP.getOrDefault(version, null);
+
-            if (configConverter == null) {
+    @Linked
-                Bukkit.getLogger().log(Level.SEVERE, "No updater found for version " + version);
+    public static class ConfigListener implements Listener {
-                return ConfigCreator.createDefaultConfig();
+
-            }
+        @EventHandler
-            try {
+        public void onPlayerQuit(PlayerQuitEvent event) {
-                configConverter.update(yapionObject);
+            get(event.getPlayer()).save();
-            } catch (Exception e) {
+            playerConfigurations.remove(event.getPlayer().getUniqueId());
-                Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-                return ConfigCreator.createDefaultConfig();
-            }
-            int newVersion = yapionObject.getPlainValue("@version");
-            if (version == newVersion) {
-                Bukkit.getLogger().log(Level.SEVERE, "Version Tag was the same after conversion");
-                return ConfigCreator.createDefaultConfig();
-            }
-            if (newVersion < version) {
-                Bukkit.getLogger().log(Level.SEVERE, "Version Tag was earlier after conversion");
-                return ConfigCreator.createDefaultConfig();
-            }
-            version = newVersion;
         }
-        return yapionObject;
     }
 }

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

@@ -1,37 +0,0 @@
-package de.steamwar.bausystem.configplayer;
-
-import yapion.hierarchy.types.YAPIONObject;
-
-/**
- * A new {@link ConfigConverter} should be written when you remove anything
- * from the Config or modify any mayor part. When you move anything from
- * any key to any other key you should write a new {@link ConfigConverter}.
- * For adding any new key you should be able to get the default without
- * having it in the Config. Anything you need to change you should also
- * change the {@link ConfigCreator} accordingly, to produce the new Config.
- */
-public interface ConfigConverter {
-
-    /**
-     * This describes the version this Converter can convert from. The version
-     * it should convert to is the version 1 above this number. But this is not
-     * a necessity. In the config Object as parameter given in {@link #update(YAPIONObject)}
-     * you should update the <b>@version</b> variable in the root object to the
-     * new version this converter produced.
-     *
-     * @return the version number
-     */
-    int version();
-
-    /**
-     * This method should update everything needed to go from a lower config
-     * version to a higher. It should update the <b>@version</b> variable
-     * accordingly. Anything else is up the implementation. If anything goes wrong
-     * do not silently exit this method, throw an Exception. The updater Code will
-     * deal with it. Never leave the inputted object in a corrupted state.
-     *
-     * @param config the config object to update
-     */
-    void update(YAPIONObject config);
-
-}

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

@@ -1,61 +0,0 @@
-/*
- * 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.configplayer;
-
-import de.steamwar.bausystem.features.hotbar.DefaultHotbar;
-import lombok.experimental.UtilityClass;
-import yapion.hierarchy.types.YAPIONObject;
-
-@UtilityClass
-public class ConfigCreator {
-
-    public static final int currentVersion = 1;
-
-    public YAPIONObject createDefaultConfig() {
-        YAPIONObject yapionObject = new YAPIONObject();
-        // This call should never be touched
-        yapionObject.add("@version", currentVersion);
-
-        // Any initialising goes into here
-        yapionObject.add("baugui", defaultBauGui());
-
-        // Default Hotbar Gui
-        yapionObject.add("hotbar", DefaultHotbar.defaultHotbar());
-        return yapionObject;
-    }
-
-    private YAPIONObject defaultBauGui() {
-        YAPIONObject yapionObject = new YAPIONObject();
-
-        //  0:  ? |  1:  ? |  2: 10 |  3:  3 |  4:  7 |  5: 17 |  6: 15 |  7:  ? |  8:  ?
-        //  9:  5 | 10:  ? | 11:  ? | 12:  ? | 13:  ? | 14:  ? | 15:  ? | 16:  ? | 17: 16
-        // 18:  4 | 19:  ? | 20: 19 | 21: 21 | 22:  9 | 23:  0 | 24:  1 | 25:  ? | 26: 11
-        // 27:  6 | 28:  ? | 29:  ? | 30:  ? | 31:  ? | 32:  ? | 33:  ? | 34:  ? | 35: 18
-        // 36:  ? | 37: 23 | 38: 20 | 39:  8 | 40: 22 | 41: 26 | 42: 12 | 43: 14 | 44:  ?
-
-        yapionObject.add("10", 2).add("3", 3).add("7", 4).add("17", 5).add("15", 6);
-        yapionObject.add("5", 9).add("4", 18).add("6", 27);
-        yapionObject.add("16", 17).add("11", 26).add("18", 35);
-        yapionObject.add("19", 20).add("21", 21).add("9", 22).add("0", 23).add("1", 24);
-        yapionObject.add("23", 37).add("20", 38).add("8", 39).add("22", 40).add("26", 41).add("12", 42).add("14", 43);
-        yapionObject.add("size", 45);
-        return yapionObject;
-    }
-}

BauSystem_Main/src/de/steamwar/bausystem/configplayer/serializer/ConfigurationSerializableSerializer.java

@@ -1,90 +0,0 @@
-/*
- * 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.configplayer.serializer;
-
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import yapion.hierarchy.api.groups.YAPIONAnyType;
-import yapion.hierarchy.types.YAPIONObject;
-import yapion.serializing.api.SerializerObject;
-import yapion.serializing.data.DeserializeData;
-import yapion.serializing.data.SerializeData;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static yapion.utils.IdentifierUtils.TYPE_IDENTIFIER;
-
-public class ConfigurationSerializableSerializer extends SerializerObject<ConfigurationSerializable> {
-
-    @Override
-    public Class<ConfigurationSerializable> type() {
-        return ConfigurationSerializable.class;
-    }
-
-    @Override
-    public boolean isInterface() {
-        return true;
-    }
-
-    @Override
-    public YAPIONObject serialize(SerializeData<ConfigurationSerializable> serializeData) {
-        YAPIONObject yapionObject = new YAPIONObject();
-        yapionObject.add(TYPE_IDENTIFIER, serializeData.object.getClass().getTypeName());
-        if (serializeData.object instanceof ItemStack) {
-            yapionObject.add(TYPE_IDENTIFIER, ItemStack.class.getTypeName());
-        }
-        if (serializeData.object instanceof ItemMeta) {
-            yapionObject.add(TYPE_IDENTIFIER, ItemMeta.class.getTypeName());
-        }
-        Map<String, Object> serializeDataMap = serializeData.object.serialize();
-        serializeDataMap.forEach((s, o) -> {
-            YAPIONAnyType yapionAnyType = serializeData.serialize(o);
-            if (yapionAnyType instanceof YAPIONObject) {
-                YAPIONObject object = (YAPIONObject) yapionAnyType;
-                if (object.containsKey(TYPE_IDENTIFIER) && object.getPlainValue(TYPE_IDENTIFIER).equals("com.google.common.collect.RegularImmutableList")) {
-                    object.put(TYPE_IDENTIFIER, ArrayList.class.getTypeName());
-                }
-            }
-            yapionObject.add(s, yapionAnyType);
-        });
-        return yapionObject;
-    }
-
-    @Override
-    public ConfigurationSerializable deserialize(DeserializeData<YAPIONObject> deserializeData) {
-        Map<String, Object> deserializeDataMap = new HashMap<>();
-        deserializeData.object.forEach((s, yapionAnyType) -> {
-            if (s.equals(TYPE_IDENTIFIER)) {
-                if (yapionAnyType.toString().equals("(org.bukkit.inventory.meta.ItemMeta)")) {
-                    deserializeDataMap.put("==", "ItemMeta");
-                } else {
-                    deserializeDataMap.put("==", deserializeData.deserialize(yapionAnyType));
-                }
-                return;
-            }
-            deserializeDataMap.put(s, deserializeData.deserialize(yapionAnyType));
-        });
-        return ConfigurationSerialization.deserializeObject(deserializeDataMap);
-    }
-}

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) {
@@ -73,7 +73,7 @@ public class AttributeRemoveCommand extends SWCommand {
             BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_NOT_FOUND", player);
             return;
         }
-        lore.removeIf(s -> s.startsWith("§8-§7 " + attribute + "§8:"));
+        lore.removeIf(s -> s.equals("§8-§7 " + attribute));
         if (lore.size() == 1) {
             itemStack.setItemMeta(null);
         } else {
@@ -99,13 +99,15 @@ public class AttributeRemoveCommand extends SWCommand {
                 return lore.stream()
                         .skip(1)
                         .map(s1 -> s1.substring(6))
-                        .map(s1 -> s1.substring(0, s1.indexOf("§8:")))
+                        .map(s1 -> s1.replace('§', '&'))
+                        .map(s1 -> s1.replace(' ', '_'))
                         .collect(Collectors.toList());
             }
 
             @Override
             public String map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                return s;
+                return s.replace('_', ' ')
+                        .replace('&', '§');
             }
         };
     }

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,22 +29,19 @@ 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;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
-import java.io.File;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Linked
 public class AutostartListener implements Listener {
@@ -68,42 +64,15 @@ 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;
         }
         if (event.getClickedBlock() == null) {
             return;
         }
-        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());
     }
 
-    @EventHandler
-    public void onInventoryClose(InventoryCloseEvent event) {
-        if (!(event.getPlayer() instanceof Player)) {
-            return;
-        }
-        if(!Permission.BUILD.hasPermission((Player) event.getPlayer())) return;
-        if (!ItemUtils.isItem(event.getPlayer().getInventory().getItemInMainHand(), "autostart")) {
-            return;
-        }
-        if (event.getInventory().getLocation() == null) {
-            return;
-        }
-        if (event.getInventory().getLocation().getBlock().getBlockData() instanceof Chest) {
-            activate((Player) event.getPlayer());
-        }
-    }
-
     public void activate(Player player) {
         Region region = Region.getRegion(player.getLocation());
         if (region.isGlobal()) {
@@ -127,24 +96,17 @@ public class AutostartListener implements Listener {
         if (regionStartTime.isEmpty()) {
             return;
         }
-
         event.blockList().forEach(block -> {
             Region region = Region.getRegion(block.getLocation());
             if (!regionStartTime.containsKey(region)) return;
             if (!region.hasType(RegionType.TESTBLOCK)) return;
             if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            long preFightDurationInSeconds = getPreFightDurationInSeconds(region);
+            RegionUtils.message(region, player -> {
-            RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
+                return BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_RESULT1", player, new SimpleDateFormat(BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_DATE_PATTERN", player)).format(new Date(tickDiff * 50)));
-            RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", preFightDurationInSeconds, ((preFightDurationInSeconds * 20) - tickDiff));
+            });
+            RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", 30, (600 - tickDiff));
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
         });
     }
-
-    private int getPreFightDurationInSeconds(Region region) {
-        File file = region.gameModeConfig();
-        if (file == null) return 30;
-        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-        return config.getInt("Times.PreFightDuration", 30);
-    }
 }

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

@@ -19,15 +19,10 @@
 
 package de.steamwar.bausystem.features.backup;
 
-import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.tags.Tag;
-import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
@@ -62,7 +57,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 +74,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;
@@ -90,13 +85,7 @@ public class BackupCommand extends SWCommand {
             BauSystem.MESSAGE.send("BACKUP_LOAD_FAILURE", p);
             return;
         }
-        EditSession editSession = new PasteBuilder(new PasteBuilder.FileProvider(backupFile))
+        region.reset(backupFile);
-                .pastePoint(region.getMinPoint().add(region.getPrototype().getSizeX() / 2, 0, region.getPrototype().getSizeZ() / 2))
-                .minPoint(region.getMinPoint())
-                .maxPoint(region.getMaxPoint())
-                .waterLevel(region.getWaterLevel())
-                .run();
-        region.remember(editSession);
         BauSystem.MESSAGE.send("BACKUP_LOAD", p);
     }
 
@@ -130,7 +119,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 +129,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,8 +1,8 @@
 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.features.tpslimit.TPSWarpUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.command.SWCommand;
@@ -13,7 +13,9 @@ import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.List;
+
+import static de.steamwar.bausystem.features.tpslimit.TPSWarpUtils.getTps;
 
 @Linked
 public class InfoCommand extends SWCommand {
@@ -25,8 +27,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,48 +50,28 @@ public class InfoCommand extends SWCommand {
             }
         }
 
-        if (Permission.BUILD.hasPermission(p)) {
+        List<BauweltMember> members = BauweltMember.getMembers(bauServer.getOwnerID());
-            List<BauweltMember> members = BauweltMember.getMembers(bauServer.getOwnerID());
+        StringBuilder membermessage = new StringBuilder();
-            Map<Permission, List<BauweltMember>> memberByPermission = new HashMap<>();
+        membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU_INFO_COMMAND_MEMBER", p));
-            members.forEach(member -> {
-                if (Permission.SUPERVISOR.hasPermission(member)) {
-                    memberByPermission.computeIfAbsent(Permission.SUPERVISOR, __ -> new ArrayList<>()).add(member);
-                } else if (Permission.BUILD.hasPermission(member)) {
-                    memberByPermission.computeIfAbsent(Permission.BUILD, __ -> new ArrayList<>()).add(member);
-                } else {
-                    memberByPermission.computeIfAbsent(Permission.MEMBER, __ -> new ArrayList<>()).add(member);
-                }
-            });
 
-            List<BauweltMember> supervisor = memberByPermission.getOrDefault(Permission.SUPERVISOR, Collections.emptyList());
+        for (BauweltMember member : members) {
-            BauSystem.MESSAGE.send("BAU_INFO_COMMAND_MEMBER", p, "§eSupervisor", supervisor.size(), supervisor.isEmpty() ? "§8<none>" : joining(supervisor));
+            membermessage.append(BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_INFO", p,
-
+                    SteamwarUser.get(member.getMemberID()).getUserName(),
-            List<BauweltMember> builder = memberByPermission.getOrDefault(Permission.BUILD, Collections.emptyList());
+                    member.isWorldEdit() ? BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WE_ALLOW", p) : BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WE_DISALLOW", p),
-            BauSystem.MESSAGE.send("BAU_INFO_COMMAND_MEMBER", p, "§6Builder", builder.size(), builder.isEmpty() ? "§8<none>" : joining(builder));
+                    member.isWorld() ? BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WORLD_ALLOW", p) : BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WORLD_DISALLOW", p)
-
+            ));
-            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));
-        tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_SECOND));
+        tpsMessage.append(" ").append(getTps(TPSWatcher.TPSType.ONE_SECOND));
-        tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_SECONDS));
+        tpsMessage.append(" ").append(getTps(TPSWatcher.TPSType.TEN_SECONDS));
-        tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_MINUTE));
+        if (!TPSWarpUtils.isWarping()) {
-        tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES));
+            tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_MINUTE));
-        tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES));
+            tpsMessage.append(" ").append(TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES));
+            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/cannon/CannonDetector.java

@@ -28,29 +28,28 @@ import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.util.Vector;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Linked
 public class CannonDetector implements Listener {
 
     private Map<TNTPrimed, Vector> velocities = new HashMap<>();
-    private Map<TNTPrimed, Set<UUID>> propulsionOfProjectile = new HashMap<>();
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
         if (!(event.getEntity() instanceof TNTPrimed)) {
             return;
         }
 
         TNTPrimed tnt = (TNTPrimed) event.getEntity();
-        propulsionOfProjectile.remove(tnt);
-
         DepthManager.update(tnt, event.blockList());
 
         List<TNTPrimed> tnts = Bukkit.getWorlds().get(0).getEntitiesByClass(TNTPrimed.class)
@@ -67,7 +66,6 @@ public class CannonDetector implements Listener {
         boolean isEmpty = velocities.isEmpty();
         tnts.forEach(tntPrimed -> {
             velocities.put(tntPrimed, tntPrimed.getVelocity().clone());
-            propulsionOfProjectile.computeIfAbsent(tntPrimed, __ -> new HashSet<>()).add(tnt.getUniqueId());
         });
 
         if (!isEmpty) {
@@ -77,10 +75,7 @@ public class CannonDetector implements Listener {
         BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
             Map<CannonKey, List<TNTPrimed>> grouped = new HashMap<>();
             velocities.forEach((tntPrimed, vector) -> {
-                boolean xBiggest = Math.abs(vector.getX()) > Math.abs(vector.getZ());
+                grouped.computeIfAbsent(new CannonKey(round(tntPrimed.getLocation().toVector()), round(vector)), ignored -> new ArrayList<>()).add(tntPrimed);
-                boolean zBiggest = Math.abs(vector.getZ()) > Math.abs(vector.getX());
-                Vector vec = new Vector(xBiggest ? Math.signum(vector.getX()) : 0, Math.round(vector.getY() * 100), zBiggest ? Math.signum(vector.getZ()) : 0);
-                grouped.computeIfAbsent(new CannonKey(propulsionOfProjectile.get(tntPrimed), vec), ignored -> new ArrayList<>()).add(tntPrimed);
             });
             grouped.forEach((cannonKey, tntPrimeds) -> {
                 if (tntPrimeds.size() <= 5) return;
@@ -93,4 +88,12 @@ public class CannonDetector implements Listener {
             velocities.clear();
         }, 1);
     }
+
+    private Vector round(Vector vector) {
+        vector.multiply(10000);
+        vector.setX(Math.round(vector.getX()));
+        vector.setY(Math.round(vector.getY()));
+        vector.setZ(Math.round(vector.getZ()));
+        return vector;
+    }
 }

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

@@ -22,16 +22,12 @@ package de.steamwar.bausystem.features.cannon;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
 
-import java.util.Set;
-import java.util.UUID;
-
 @AllArgsConstructor
 @EqualsAndHashCode
 @Getter
 public final class CannonKey {
-    private Set<UUID> propulsions;
+    private Vector locationVector;
     private Vector velocityVector;
 }

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

@@ -51,6 +51,7 @@ public class Depth {
         List<Block> blocksList = blocks.stream()
                 .filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
                 .collect(Collectors.toList());
+        if (blocksList.isEmpty()) return;
         tntCount++;
         for (Block block : blocksList) {
             internalUpdate(block);

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,20 +53,9 @@ 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() {
+    private void calc() {
         entities.forEach(REntity::die);
         entities.clear();
         locations.clear();
@@ -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,18 +95,15 @@ 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);
+            BauSystem.MESSAGE.send("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);
+            BauSystem.MESSAGE.send("DESIGN_ENDSTONE_ENABLE", player, ChatMessageType.ACTION_BAR);
         }
     }
-
-    public boolean removePlayer(Player player) {
-        entityServer.removePlayer(player);
-        return entityServer.getPlayers().isEmpty();
-    }
 }

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

@@ -22,23 +22,15 @@ 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;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-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
-public class DesignEndStoneCommand extends SWCommand implements Listener {
+public class DesignEndStoneCommand extends SWCommand {
 
     public DesignEndStoneCommand() {
         super("designendstone");
@@ -47,7 +39,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);
@@ -55,43 +47,4 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
         }
         designEndStoneMap.computeIfAbsent(region, DesignEndStone::new).toggle(player);
     }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        disableDesignEndStone(event.getPlayer());
-    }
-
-    @EventHandler
-    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
-    public void onBlockPlace(BlockPlaceEvent event) {
-        update(event.getBlock().getLocation());
-    }
-
-    @EventHandler
-    public void onBlockBreak(BlockBreakEvent event) {
-        BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
-            update(event.getBlock().getLocation());
-        }, 1);
-    }
-
-    private void update(Location location) {
-        Region region = Region.getRegion(location);
-        DesignEndStone designEndStone = designEndStoneMap.get(region);
-        if (designEndStone == null) {
-            return;
-        }
-        designEndStone.calc();
-    }
 }

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

@@ -79,7 +79,7 @@ public class Detonator {
 
     public static void activateDetonator(DetonatorStorage detonator) {
         Player p = detonator.getPlayer();
-        if (Config.getInstance().get(p).getPlainValueOrDefault("detonator-autostart", false)) {
+        if (Config.get(p).isDetonatorAutostart()) {
             AutostartListener.instance.activate(p);
         }
 

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));
     }
 
@@ -76,8 +76,8 @@ public class DetonatorCommand extends SWCommand {
 
     @Register(value = "autostart", description = "DETONATOR_HELP_AUTOSTART")
     public void toggleAutostartTimer(Player p) {
-        boolean current = Config.getInstance().get(p).getPlainValueOrDefault("detonator-autostart", false);
+        boolean current = Config.get(p).isDetonatorAutostart();
-        Config.getInstance().get(p).put("detonator-autostart", !current);
+        Config.get(p).setDetonatorAutostart(!current);
         if (!current) {
             BauSystem.MESSAGE.send("DETONATOR_AUTOSTART_ENABLE", p);
         } else {

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

@@ -67,7 +67,7 @@ public class BauGUI {
         if (!updating) {
             OPEN_INVS.add(p);
         }
-        BauGuiMapping mapping = BauGuiMapping.getGuiMapping(p);
+        BauGuiMapping mapping = new BauGuiMapping(p);
         SWInventory inv = new SWInventory(p, mapping.getSize(), BauSystem.MESSAGE.parse("GUI_NAME", p));
         getITEMS().values().forEach(item -> {
             if (!mapping.isShown(item.getId())) {
@@ -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/gui/editor/BauGuiEditor.java

@@ -53,7 +53,7 @@ public class BauGuiEditor implements Listener {
     private static final List<Player> open_Edits = new ArrayList<>();
 
     public static void openGuiEditor(Player p, ItemStack cursor) {
-        BauGuiMapping mapping = BauGuiMapping.getGuiMapping(p);
+        BauGuiMapping mapping = new BauGuiMapping(p);
         Inventory inv = Bukkit.createInventory(null, mapping.getSize() + 9, BauSystem.MESSAGE.parse("GUI_EDITOR_TITLE", p));
         for (Map.Entry<Integer, Integer> e : mapping.getMapping().entrySet()) {
             if (e.getValue() >= 0) {
@@ -78,7 +78,6 @@ public class BauGuiEditor implements Listener {
         p.openInventory(inv);
         p.getOpenInventory().setCursor(cursor == null ? new SWItem().getItemStack() : cursor);
         open_Edits.add(p);
-        BauGuiMapping.startWatchdog();
     }
 
     private static ItemStack addId(ItemStack itemStack, int id) {
@@ -101,7 +100,7 @@ public class BauGuiEditor implements Listener {
 
         ItemStack i = event.getCurrentItem();
         Player p = (Player) event.getWhoClicked();
-        BauGuiMapping mapping = BauGuiMapping.getGuiMapping(p);
+        BauGuiMapping mapping = new BauGuiMapping(p);
         if (event.getClickedInventory() == p.getInventory()) {
             event.setCancelled(true);
         }
@@ -194,13 +193,10 @@ public class BauGuiEditor implements Listener {
     }
 
     private void saveMapping(Player p) {
-        saveMapping(p.getOpenInventory(), BauGuiMapping.getGuiMapping(p));
+        saveMapping(p.getOpenInventory(), new BauGuiMapping(p));
     }
 
     private void saveMapping(InventoryView view, BauGuiMapping mapping) {
-        if (mapping.isSaved()) {
-            return;
-        }
         HashMap<Integer, Integer> newMapping = new HashMap<>();
 
         for (int i = 0; i < view.getTopInventory().getContents().length; i++) {
@@ -216,7 +212,6 @@ public class BauGuiEditor implements Listener {
         }
 
         mapping.setMapping(newMapping);
-        mapping.save();
     }
 
     @EventHandler
@@ -227,7 +222,7 @@ public class BauGuiEditor implements Listener {
 
         Player p = (Player) event.getPlayer();
 
-        saveMapping(event.getView(), BauGuiMapping.getGuiMapping(p));
+        saveMapping(event.getView(), new BauGuiMapping(p));
         open_Edits.remove(p);
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java

@@ -19,82 +19,50 @@
 
 package de.steamwar.bausystem.features.gui.editor;
 
-import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.features.gui.BauGUI;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import lombok.Getter;
-import lombok.Setter;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
-import yapion.hierarchy.types.YAPIONObject;
 
-import java.util.*;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class BauGuiMapping {
 
-    private static final HashMap<UUID, BauGuiMapping> fromUUID = new HashMap<>();
-    private static final List<BauGuiMapping> mappings = new ArrayList<>();
-
-    private static BukkitTask task;
-
-    public static void startWatchdog() {
-        if (task == null) {
-            Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), bukkitTask -> {
-                mappings.forEach(BauGuiMapping::tick);
-                if (BauGuiEditor.getOpen_Edits().isEmpty()) {
-                    bukkitTask.cancel();
-                    task = null;
-                }
-            }, 1, 1);
-        }
-    }
-
-    @Getter
-    private final YAPIONObject object;
     @Getter
     private final Player owner;
-    @Getter
-    @Setter
-    private boolean saved;
 
-    protected BauGuiMapping(YAPIONObject object, Player p) {
+    public BauGuiMapping(Player p) {
-        this.object = object;
         this.owner = p;
-        fromUUID.put(p.getUniqueId(), this);
-        mappings.add(this);
     }
 
-    public static BauGuiMapping getGuiMapping(Player p) {
+    private Map<String, Integer> getInternalMapping() {
-        BauGuiMapping mapping = fromUUID.get(p.getUniqueId());
+        return Config.get(owner).getBaugui();
-
-        if (mapping == null) {
-            YAPIONObject yapionObject = Config.getInstance().get(p);
-            mapping = new BauGuiMapping(yapionObject.getObject("baugui"), p);
-        }
-
-        return mapping;
     }
 
     public boolean isShown(int id) {
-        return object.getPlainValueOrDefault(Integer.toString(id), -1) >= 0;
+        return getInternalMapping().getOrDefault(Integer.toString(id), -1) >= 0;
     }
 
     public int getSlot(int id) {
-        return object.getPlainValue(Integer.toString(id));
+        return getInternalMapping().getOrDefault(Integer.toString(id), 0);
     }
 
     public Map<Integer, Integer> getMapping() {
-        return internalReadMap();
+        return getInternalMapping().entrySet().stream().collect(Collectors.toMap(entry -> Integer.valueOf(entry.getKey()), Map.Entry::getValue));
     }
 
     public void setMapping(Map<Integer, Integer> mapping) {
-        internalWriteMap(mapping);
+        Map<String, Integer> map = getInternalMapping();
+        map.clear();
+
+        for(Map.Entry<Integer, Integer> entry : mapping.entrySet())
+            map.put(String.valueOf(entry.getKey()), entry.getValue());
+
+        Config.get(owner).save();
     }
 
     public int getSize() {
-        return object.getPlainValueOrDefault("size", 45);
+        return getInternalMapping().getOrDefault("size", 45);
     }
 
     public void setSize(int size) {
@@ -102,37 +70,6 @@ public class BauGuiMapping {
             return;
         }
 
-        object.add("size", size);
+        getInternalMapping().put("size", size);
-    }
-
-    private void tick() {
-        this.saved = false;
-    }
-
-    public void save() {
-        if (saved) return;
-        YAPIONObject config = Config.getInstance().get(owner);
-        config.add("baugui", object);
-        Config.getInstance().save(owner);
-        saved = true;
-    }
-
-    private Map<Integer, Integer> internalReadMap() {
-        Map<Integer, Integer> map = new HashMap<>();
-        for (Map.Entry<Integer, BauGuiItem> e : BauGUI.getITEMS().entrySet()) {
-            Integer value = object.getPlainValueOrDefault(e.getKey().toString(), -1);
-            if (value == -1) continue;
-            map.put(e.getKey(), value);
-        }
-        return map;
-    }
-
-    private void internalWriteMap(Map<Integer, Integer> map) {
-        for (Map.Entry<Integer, BauGuiItem> e : BauGUI.getITEMS().entrySet()) {
-            object.remove(e.getKey().toString());
-            Integer value = map.getOrDefault(e.getKey(), -1);
-            if (value == -1) continue;
-            object.add(e.getKey().toString(), value);
-        }
     }
 }

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

@@ -19,75 +19,89 @@
 
 package de.steamwar.bausystem.features.hotbar;
 
-import de.steamwar.bausystem.configplayer.Config;
+import de.steamwar.bausystem.config.ConfigField;
+import de.steamwar.bausystem.config.YamlConfig;
 import de.steamwar.core.Core;
-import lombok.experimental.UtilityClass;
+import de.steamwar.sql.UserConfig;
+import lombok.Getter;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import yapion.hierarchy.types.YAPIONArray;
+import org.bukkit.inventory.meta.ItemMeta;
-import yapion.hierarchy.types.YAPIONObject;
-import yapion.hierarchy.types.YAPIONValue;
-import yapion.parser.YAPIONParser;
-import yapion.serializing.YAPIONDeserializer;
-import yapion.serializing.YAPIONSerializer;
 
-import java.util.HashSet;
+import java.util.ArrayList;
-import java.util.Set;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
-@UtilityClass
+public class DefaultHotbar extends YamlConfig {
-public class DefaultHotbar {
 
-    private final YAPIONArray DEFAULT_HOTBAR = YAPIONParser.parse("{[{@type(org.bukkit.inventory.ItemStack)v(2230)type(WOODEN_AXE)meta{@type(org.bukkit.inventory.meta.ItemMeta)meta-type(UNSPECIFIC)display-name(WorldEdit Wand)lore{@type(java.util.ArrayList)values[Left click: select pos #1,Right click: select pos #2]}}},{@type(org.bukkit.inventory.ItemStack)v(2230)type(COMPASS)meta{@type(org.bukkit.inventory.meta.ItemMeta)meta-type(UNSPECIFIC)display-name(Navigation Wand)lore{@type(java.util.ArrayList)values[Left click: jump to location,Right click: pass through walls]}}},null,null,null,null,null,null,{@type(org.bukkit.inventory.ItemStack)v(2230)type(NETHER_STAR)meta{@type(org.bukkit.inventory.meta.ItemMeta)meta-type(UNSPECIFIC)display-name(§eBau GUI)}},null,null,{@type(org.bukkit.inventory.ItemStack)v(3117)type(ELYTRA)},null]}").getArray("");
+    public static final String configName = "bauhotbar-" + Core.getVersion();
 
-    public void updateHotbar(Player p) {
+    public static DefaultHotbar get(Player p) {
-        ItemStack[] hotbar = new ItemStack[13];
+        return new DefaultHotbar(p, fromUserConfig(p.getUniqueId(), configName));
-        System.arraycopy(p.getInventory().getContents(), 0, hotbar, 0, 9);
+    }
-        System.arraycopy(p.getInventory().getArmorContents(), 0, hotbar, 9, 4);
+
-        YAPIONArray yapionArray = new YAPIONArray();
+    private final Player player;
-        for (ItemStack itemStack : hotbar) {
+
-            if (itemStack != null) {
+    @Getter
-                yapionArray.add(YAPIONSerializer.serialize(itemStack));
+    @ConfigField
-            } else {
+    private final List<ItemStack> hotbar = new ArrayList<>(13);
-                yapionArray.add(new YAPIONValue<>(null));
+
-            }
+    public DefaultHotbar(Player player, ConfigurationSection config) {
+        super(config);
+        this.player = player;
+
+        if(hotbar.isEmpty()) {
+            hotbar.add(newNamedStack(Material.WOODEN_AXE, "WorldEdit Wand", "Left click: select pos #1", "Right click: select pos #2"));
+            hotbar.add(newNamedStack(Material.COMPASS, "Navigation Wand", "Left click: jump to location", "Right click: pass through walls"));
+            hotbar.add(null);
+            hotbar.add(null);
+            hotbar.add(null);
+            hotbar.add(null);
+            hotbar.add(null);
+            hotbar.add(null);
+            hotbar.add(newNamedStack(Material.NETHER_STAR, "§eBau GUI"));
+            hotbar.add(null);
+            hotbar.add(null);
+            hotbar.add(new ItemStack(Material.ELYTRA));
+            hotbar.add(null);
         }
-        Config.getInstance().get(p).add("hotbar-" + Core.getVersion(), yapionArray);
-        Config.getInstance().save(p);
     }
 
-    public void setHotbar(Player p) {
+    public void update() {
-        ItemStack[] hotbar = getItems(p);
+        hotbar.clear();
-        ItemStack[] inv = p.getInventory().getContents();
+
-        ItemStack[] armor = p.getInventory().getArmorContents();
+        for(int i = 0; i < 9; i++)
-        System.arraycopy(hotbar, 0, inv, 0, 9);
+            hotbar.add(player.getInventory().getContents()[i]);
-        System.arraycopy(hotbar, 9, armor, 0, 4);
+
-        p.getInventory().setContents(inv);
+        for(int i = 0; i < 4; i++)
-        p.getInventory().setArmorContents(armor);
+            hotbar.add(player.getInventory().getArmorContents()[i]);
+
+        UserConfig.updatePlayerConfig(player.getUniqueId(), configName, toYaml().saveToString());
     }
 
-    public ItemStack[] getItems(Player p) {
+    public void load() {
-        Config.getInstance().get(p).remap("hotbar", "hotbar-19");
+        ItemStack[] inv = player.getInventory().getContents();
-        YAPIONArray yapionArray = Config.getInstance().get(p).getYAPIONArrayOrSetDefault("hotbar-" + Core.getVersion(), defaultHotbar());
+        ItemStack[] armor = player.getInventory().getArmorContents();
-        ItemStack[] hotbar = new ItemStack[13];
+        System.arraycopy(hotbar.toArray(new ItemStack[0]), 0, inv, 0, 9);
-        Set<Integer> invalid = new HashSet<>();
+        System.arraycopy(hotbar.toArray(new ItemStack[0]), 9, armor, 0, 4);
-        yapionArray.forEach((integer, yapionAnyType) -> {
+        player.getInventory().setContents(inv);
-            if (yapionAnyType instanceof YAPIONValue) {
+        player.getInventory().setArmorContents(armor);
-                hotbar[integer] = null;
-            } else {
-                try {
-                    hotbar[integer] = YAPIONDeserializer.deserialize((YAPIONObject) yapionAnyType);
-                } catch (Exception e) {
-                    invalid.add(integer);
-                    hotbar[integer] = null;
-                }
-            }
-        });
-        invalid.forEach(i -> yapionArray.set(i, new YAPIONValue<>(null)));
-        if (!invalid.isEmpty()) Config.getInstance().save(p);
-        return hotbar;
     }
 
-    public YAPIONArray defaultHotbar() {
+    private static ItemStack newNamedStack(Material material, String displayName, String... lore) {
-        return DEFAULT_HOTBAR;
+        ItemStack stack = new ItemStack(material);
+        ItemMeta meta = stack.getItemMeta();
+
+        if(displayName != null)
+            meta.setDisplayName(displayName);
+
+        if(lore.length > 0)
+            meta.setLore(Arrays.stream(lore).collect(Collectors.toList()));
+
+        stack.setItemMeta(meta);
+        return stack;
     }
 }

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

@@ -26,6 +26,8 @@ import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.List;
+
 @Linked
 public class HotbarCommand extends SWCommand {
 
@@ -35,24 +37,24 @@ 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);
+        DefaultHotbar.get(p).load();
         BauSystem.MESSAGE.send("HOTBAR_LOADED", p);
     }
 
     @Register(value = "save", description = "HOTBAR_HELP_SAVE")
     public void saveHotbar(Player p) {
-        DefaultHotbar.updateHotbar(p);
+        DefaultHotbar.get(p).update();
         BauSystem.MESSAGE.send("HOTBAR_SAVED", p);
     }
 
     @Register(value = "show", description = "HOTBAR_HELP_SHOW")
     public void showHotbar(Player p) {
         SWInventory inv = new SWInventory(p, 18, BauSystem.MESSAGE.parse("HOTBAR_INVENTORY", p));
-        ItemStack[] hotbar = DefaultHotbar.getItems(p);
+        List<ItemStack> hotbar = DefaultHotbar.get(p).getHotbar();
-        for (int i = 0; i < hotbar.length; i++) {
+        for (int i = 0; i < hotbar.size(); i++) {
-            if (hotbar[i] == null) continue;
+            if (hotbar.get(i) == null) continue;
-            inv.setItem(i, hotbar[i], clickType -> {
+            inv.setItem(i, hotbar.get(i), clickType -> {
             });
         }
         inv.open();

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,9 +30,8 @@ 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());
+            DefaultHotbar.get(event.getPlayer()).load();
         }
     }
 

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

@@ -30,7 +30,7 @@ public class InventoryFillBauGuiItem extends BauGuiItem {
 
     @Override
     public ItemStack getItem(Player player) {
-        String loreKey = Config.getInstance().get(player).getPlainValueOrDefault("inventoryfill", false) ? "OTHER_ITEMS_INVENTORY_FILL_LORE_ACTIVE" : "OTHER_ITEMS_INVENTORY_FILL_LORE_INACTIVE";
+        String loreKey = Config.get(player).isInventoryFill() ? "OTHER_ITEMS_INVENTORY_FILL_LORE_ACTIVE" : "OTHER_ITEMS_INVENTORY_FILL_LORE_INACTIVE";
         return new SWItem(Material.HOPPER, BauSystem.MESSAGE.parse("OTHER_ITEMS_INVENTORY_FILL_NAME", player), Collections.singletonList(BauSystem.MESSAGE.parse(loreKey, player)), false, clickType -> {}).getItemStack();
     }
 

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,8 +38,7 @@ public class InventoryFiller implements Listener {
 
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Config.get(event.getPlayer()).isInventoryFill()) return;
-        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("inventoryfill", false)) return;
         if (!event.getPlayer().isSneaking()) return;
         Block block = event.getPlayer().getTargetBlockExact(5);
         if (block == null) return;
@@ -61,8 +59,7 @@ public class InventoryFiller implements Listener {
      */
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Config.get(event.getPlayer()).isInventoryFill()) return;
-        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("inventoryfill", false)) return;
         if (!event.getPlayer().isSneaking()) return;
         ItemStack itemStack = event.getPlayer().getInventory().getItemInMainHand();
         if (itemStack.getType() == Material.AIR) return;

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

@@ -16,8 +16,8 @@ public class InventoryFillerCommand extends SWCommand {
 
     @Register(description = {"INVENTORY_FILL_HELP", "INVENTORY_FILL_INFO"})
     public void toggle(Player player) {
-        boolean inventoryFill = Config.getInstance().get(player).getPlainValueOrDefault("inventoryfill", false);
+        boolean inventoryFill = Config.get(player).isInventoryFill();
-        Config.getInstance().get(player).put("inventoryfill", !inventoryFill);
+        Config.get(player).setInventoryFill(!inventoryFill);
         if (!inventoryFill) {
             SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("INVENTORY_FILL_ENABLE", player));
             BauSystem.MESSAGE.send("INVENTORY_FILL_INFO", player);

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,25 +45,10 @@ 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;
+    private static final double SURROUND = 4;
     
     private final Point minPoint;
     private final Point maxPoint;
@@ -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);
-        inner.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;
@@ -36,14 +35,9 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 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,45 +68,25 @@ 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()) {
                 LoaderElement element = elements.get(currentElement);
                 currentElement++;
                 element.execute(delay -> waitTime = delay);
                 if (waitTime > 0) {
-                    if (element instanceof LoaderTNT) currentElement--;
+                    break;
-                    return;
                 }
             }
+            if (currentElement >= elements.size()) {
+                currentElement = 0;
+            }
         }, 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;
@@ -147,122 +121,86 @@ public class Loader implements Listener {
         LOADER_MAP.remove(p);
     }
 
-    public boolean setTicksBetweenShots(int delay) {
-        if (elements.size() == 0) return false;
-        LoaderElement loaderElement = elements.get(elements.size() - 1);
-        if (loaderElement instanceof LoaderWait) {
-            ((LoaderWait) loaderElement).setDelay(delay);
-            return true;
-        }
-        return false;
-    }
-
-    public void setTicksBetweenBlocks(int delay) {
-        for (int i = 0; i < elements.size() - 1; i++) {
-            LoaderElement loaderElement = elements.get(i);
-            if (loaderElement instanceof LoaderWait) {
-                ((LoaderWait) loaderElement).setDelay(delay);
-            }
-        }
-    }
-
     public void gui(SettingsSorting settingsSorting) {
         List<SWListInv.SWListEntry<LoaderElement>> list = new ArrayList<>();
-        AtomicBoolean allWait = new AtomicBoolean(true);
+        for (LoaderElement element : elements) {
-        Runnable updateRunnable = () -> {
+            if (settingsSorting != null) {
-            list.clear();
+                if (settingsSorting == SettingsSorting.WAIT && !(element instanceof LoaderWait)) {
-            for (int i = 0; i < elements.size(); i++) {
-                LoaderElement previous = i > 0 ? elements.get(i - 1) : null;
-                LoaderElement current = elements.get(i);
-                LoaderElement next = i < elements.size() - 1 ? elements.get(i + 1) : null;
-
-                if (!settingsSorting.shouldShow(previous, current, next)) {
                     continue;
                 }
-
+                if (settingsSorting == SettingsSorting.INTERACTIONS && (element instanceof LoaderWait || element instanceof LoaderTNT)) {
-                if ((!(current instanceof LoaderWait))) {
+                    continue;
-                    allWait.set(false);
                 }
-
-                SWItem item = current.menu(p);
-                if (current instanceof LoaderInteractionElement<?>) {
-                    LoaderInteractionElement<?> interactionElement = (LoaderInteractionElement<?>) current;
-                    List<String> lore = new ArrayList<>();
-                    if (item.getItemMeta() != null && item.getItemMeta().getLore() != null) {
-                        lore.addAll(item.getItemMeta().getLore());
-                        lore.add("§8");
-                    }
-                    lore.add(BauSystem.MESSAGE.parse("LOADER_SETTING_MODES", p, interactionElement.size()));
-                    lore.add(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", p));
-                    item.setLore(lore);
-                } else {
-                    List<String> lore = new ArrayList<>();
-                    if (item.getItemMeta() != null && item.getItemMeta().getLore() != null) {
-                        lore.addAll(item.getItemMeta().getLore());
-                        lore.add("§8");
-                    }
-                    lore.add(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", p));
-                    item.setLore(lore);
-                }
-                list.add(new SWListInv.SWListEntry<>(item, current));
             }
-            if (list.isEmpty()) {
+            SWItem item = element.menu(p);
-                allWait.set(false);
+            if (element instanceof LoaderInteractionElement<?>) {
-            }
+                LoaderInteractionElement<?> interactionElement = (LoaderInteractionElement<?>) element;
-        };
+                item.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_MODES", p, interactionElement.size()), "§8", BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", p)));
-        updateRunnable.run();
-
-        SWListInv<LoaderElement> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("LOADER_GUI_TITLE", p), false, list, (clickType, loaderElement) -> {});
-        swListInv.setCallback((clickType, entry) -> entry.click(p, () -> {
-            updateRunnable.run();
-            swListInv.open();
-        }));
-
-        SWItem settingItem = new SWItem(settingsSorting.getMaterial(), "§e" + BauSystem.MESSAGE.parse(settingsSorting.getName(), p), clickType -> {
-            if (clickType == ClickType.LEFT) {
-                int index = settingsSorting.ordinal() + 1;
-                if (index >= SettingsSorting.LENGTH) {
-                    index = 0;
-                }
-                gui(SettingsSorting.values()[index]);
-            } else if (clickType == ClickType.RIGHT) {
-                int index = settingsSorting.ordinal() - 1;
-                if (index < 0) {
-                    index = SettingsSorting.LENGTH - 1;
-                }
-                gui(SettingsSorting.values()[index]);
-            }
-        });
-        List<String> strings = new ArrayList<>();
-        for (SettingsSorting setting : SettingsSorting.values()) {
-            if (setting == settingsSorting) {
-                strings.add("§e> §7" + BauSystem.MESSAGE.parse(setting.getName(), p));
             } else {
-                strings.add("§8> §7" + BauSystem.MESSAGE.parse(setting.getName(), p));
+                item.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", p)));
             }
+            list.add(new SWListInv.SWListEntry<>(item, element));
         }
-        settingItem.setLore(strings);
+        SWListInv<LoaderElement> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("LOADER_GUI_TITLE", p), false, list, (clickType, loaderElement) -> {});
-        swListInv.setItem(48, settingItem);
+        swListInv.setCallback((clickType, entry) -> entry.click(p, swListInv::open));
 
-        if (allWait.get()) {
+        SWItem onlyInteractionsElements = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_INTERACTIONS", p), clickType -> {
-            SWItem setWait = new SWItem(Material.PAPER, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_SET_ALL", p), clickType -> {
+            gui(settingsSorting == SettingsSorting.INTERACTIONS ? null : SettingsSorting.INTERACTIONS);
+        });
+        if (settingsSorting == SettingsSorting.INTERACTIONS) onlyInteractionsElements.setEnchanted(true);
+        swListInv.setItem(47, onlyInteractionsElements);
+
+        SWItem onlyWaitElements = new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS", p), clickType -> {
+            gui(settingsSorting == SettingsSorting.WAIT ? null : SettingsSorting.WAIT);
+        });
+        if (settingsSorting == SettingsSorting.WAIT) onlyWaitElements.setEnchanted(true);
+        swListInv.setItem(48, onlyWaitElements);
+
+        if (settingsSorting == SettingsSorting.WAIT) {
+            SWItem waitBetweenTNT = new SWItem(Material.TNT, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_SET_BETWEEN_TNT", p), clickType -> {
                 SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_TITLE", p), "");
                 swAnvilInv.setCallback(s -> {
                     try {
-                        long delay = Math.max(Long.parseLong(s), 0);
+                        long delay = Long.parseLong(s);
-                        list.forEach(loaderElementSWListEntry -> {
+                        if (delay < 0) delay = 0;
-                            ((LoaderWait) loaderElementSWListEntry.getObject()).setDelay(delay);
+                        for (int i = 1; i < elements.size() - 1; i++) {
-                        });
+                            if (!(elements.get(i - 1) instanceof LoaderTNT)) continue;
+                            if (!(elements.get(i + 1) instanceof LoaderTNT)) continue;
+                            if (!(elements.get(i) instanceof LoaderWait)) continue;
+                            ((LoaderWait) elements.get(i)).setDelay(delay);
+                        }
                     } catch (NumberFormatException ignored) {
                     }
                     gui(settingsSorting);
                 });
                 swAnvilInv.open();
             });
-            swListInv.setItem(50, setWait);
+            swListInv.setItem(50, waitBetweenTNT);
+
+            SWItem waitTime = new SWItem(Material.PAPER, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_SET_ALL", p), clickType -> {
+                SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("LOADER_GUI_SHOW_WAITS_TITLE", p), "");
+                swAnvilInv.setCallback(s -> {
+                    try {
+                        long delay = Long.parseLong(s);
+                        if (delay < 0) delay = 0;
+                        long finalDelay = delay;
+                        elements.stream()
+                                .filter(LoaderWait.class::isInstance)
+                                .map(LoaderWait.class::cast)
+                                .forEach(loaderWait -> loaderWait.setDelay(finalDelay));
+                    } catch (NumberFormatException ignored) {
+                    }
+                    gui(settingsSorting);
+                });
+                swAnvilInv.open();
+            });
+            swListInv.setItem(51, waitTime);
         } else {
-            swListInv.setItem(50, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§8"));
+            SWItem empty = new SWItem(Material.STRUCTURE_VOID, "§7", clickType -> {});
+            swListInv.setItem(50, empty);
+            swListInv.setItem(51, empty);
         }
+
         swListInv.open();
     }
 
@@ -273,104 +211,18 @@ public class Loader implements Listener {
     }
 
     public String getProgress() {
-        return Math.max(currentElement, 1) + "§8/§7" + elements.size();
+        return (currentElement + 1) + "§8/§7" + elements.size();
     }
 
     public enum SettingsSorting {
-        ALL {
+        WAIT,
-            @Override
+        INTERACTIONS,
-            public Material getMaterial() {
-                return Material.STRUCTURE_VOID;
-            }
-
-            @Override
-            public String getName() {
-                return "LOADER_GUI_SHOW_ALL";
-            }
-
-            @Override
-            public boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next) {
-                return true;
-            }
-        },
-        WAIT {
-            @Override
-            public Material getMaterial() {
-                return Material.CLOCK;
-            }
-
-            @Override
-            public String getName() {
-                return "LOADER_GUI_SHOW_WAITS";
-            }
-
-            @Override
-            public boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next) {
-                return current instanceof LoaderWait;
-            }
-        },
-        WAIT_BETWEEN_TNT {
-            @Override
-            public Material getMaterial() {
-                return Material.REDSTONE_BLOCK;
-            }
-
-            @Override
-            public String getName() {
-                return "LOADER_GUI_SHOW_WAITS_BETWEEN_TNT";
-            }
-
-            @Override
-            public boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next) {
-                return previous instanceof LoaderTNT && current instanceof LoaderWait && next instanceof LoaderTNT;
-            }
-        },
-        INTERACTIONS {
-            @Override
-            public Material getMaterial() {
-                return Material.REPEATER;
-            }
-
-            @Override
-            public String getName() {
-                return "LOADER_GUI_SHOW_INTERACTIONS";
-            }
-
-            @Override
-            public boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next) {
-                return current instanceof LoaderInteractionElement && !(current instanceof LoaderTNT);
-            }
-        },
-        TNT {
-            @Override
-            public Material getMaterial() {
-                return Material.TNT;
-            }
-
-            @Override
-            public String getName() {
-                return "LOADER_GUI_SHOW_TNT";
-            }
-
-            @Override
-            public boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next) {
-                return current instanceof LoaderTNT;
-            }
-        },
-        ;
-
-        public static int LENGTH = SettingsSorting.values().length;
-
-        public abstract Material getMaterial();
-        public abstract String getName();
-        public abstract boolean shouldShow(LoaderElement previous, LoaderElement current, LoaderElement next);
     }
 
     @AllArgsConstructor
     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");
@@ -81,42 +80,13 @@ public class LoaderCommand extends SWCommand implements Listener {
     public void guiLoader(@Validator Player player) {
         Loader loader = Loader.getLoader(player);
         if (loaderNullCheck(loader, player)) return;
-        loader.gui(Loader.SettingsSorting.ALL);
+        loader.gui(null);
     }
 
-    @Register(value = "wait", description = "LOADER_HELP_WAIT")
+    @ClassValidator(value = Player.class, local = true)
-    public void shotDelayLoader(@Validator Player p, @Min(intValue = 1) @ErrorMessage("LOADER_SMALL_TIME") int delay) {
+    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");
-        if (loader.setTicksBetweenShots(delay)) {
+        };
-            BauSystem.MESSAGE.send("LOADER_NEW_TIME", p, delay);
-        } else {
-            BauSystem.MESSAGE.send("LOADER_SMALL_TIME", p);
-        }
-    }
-
-    @Register(value = "speed", description = "LOADER_HELP_SPEED")
-    public void speedLoader(@Validator Player p, @Min(intValue = 0) @ErrorMessage("LOADER_SMALL_TIME") int delay) {
-        Loader loader = Loader.getLoader(p);
-        if (loaderNullCheck(loader, p)) return;
-        BauSystem.MESSAGE.send("LOADER_NEW_LOAD_TIME", p, delay);
-        loader.setTicksBetweenBlocks(delay);
-    }
-
-    @Register(value = "single", description = "LOADER_HELP_SINGLE")
-    public void singleLoader(@Validator Player p) {
-        Loader loader = Loader.getLoader(p);
-        if (loaderNullCheck(loader, p)) return;
-        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

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.loader;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.loader.elements.LoaderElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
 import de.steamwar.bausystem.features.loader.elements.impl.*;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import org.bukkit.Bukkit;
@@ -34,7 +33,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
@@ -43,8 +41,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 {
 
@@ -74,7 +70,7 @@ public class LoaderRecorder implements Listener {
             return;
         }
         long diff = TPSUtils.currentRealTick.get() - lastInteraction;
-        if (last) diff = 120;
+        if (last && diff > 160) diff = 160;
         lastInteraction = TPSUtils.currentRealTick.get();
         loaderElementList.add(new LoaderWait(diff));
     }
@@ -90,34 +86,7 @@ public class LoaderRecorder implements Listener {
     }
 
     @EventHandler
-    public void onBlockBreak(BlockBreakEvent event) {
+    public void onPlayerInteractEntity(PlayerInteractEvent event) {
-        if (event.getPlayer() != player) return;
-
-        boolean removedOne = false;
-        for (int i = 0; i < loaderElementList.size(); i++) {
-            LoaderElement element = loaderElementList.get(i);
-            if (!(element instanceof LoaderInteractionElement)) continue;
-            LoaderInteractionElement interactionElement = (LoaderInteractionElement) element;
-            if (interactionElement.getLocation().equals(event.getBlock().getLocation())) {
-                loaderElementList.remove(i);
-                if (i > 0) {
-                    loaderElementList.remove(i - 1);
-                }
-                removedOne = true;
-                break;
-            }
-        }
-
-        if (removedOne) {
-            if (event.getBlock().getType() != Material.TNT) {
-                event.setCancelled(true);
-            }
-            SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("LOADER_MESSAGE_UNINTERACT", player));
-        }
-    }
-
-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
         if (event.getPlayer() != player) return;
         if (player.isSneaking()) return;
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.PHYSICAL) return;
@@ -126,10 +95,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 +197,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/loader/elements/ElementSettings.java

@@ -0,0 +1,38 @@
+/*
+ * 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.loader.elements;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.inventory.SWItem;
+import org.bukkit.entity.Player;
+
+import java.util.function.Consumer;
+
+public interface ElementSettings {
+    SWItem menu(Player player);
+    void execute(Consumer<Long> delay);
+    void click(Player player, Runnable backAction, Runnable deleteAction);
+
+    default void playerInteract() {}
+
+    default String translateItemName(String name, String mode, Player player, Object... args) {
+        return BauSystem.MESSAGE.parse("LOADER_GUI_ITEM_NAME", player, BauSystem.MESSAGE.parse(name, player), BauSystem.MESSAGE.parse(mode, player, args));
+    }
+}

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

@@ -20,94 +20,56 @@
 package de.steamwar.bausystem.features.loader.elements;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.inventory.SWAnvilInv;
-import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
-import lombok.Getter;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.*;
+import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Door;
+import org.bukkit.block.data.FaceAttachable;
 import org.bukkit.block.data.type.Switch;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 
-public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSettingsEnum> implements LoaderElement {
+public abstract class LoaderInteractionElement<T extends ElementSettings> implements LoaderElement {
 
-    @Getter
     protected final Location location;
     protected int currentShot = 0;
-    protected T defaultSetting;
-    protected T newSetting;
-    protected T[] allSettings;
     protected List<T> elements = new ArrayList<>();
-    protected List<Integer> extraPower = new ArrayList<>();
-    protected List<Long> extraTicks = new ArrayList<>();
-    protected int settingsGuiSize = 0;
 
-    protected LoaderInteractionElement(Location location, T defaultSetting, T newSetting, T[] allSettings) {
+    protected LoaderInteractionElement(Location location) {
         this.location = location;
 
-        this.defaultSetting = defaultSetting;
+        T element = createNewElement();
-        this.newSetting = newSetting;
+        element.playerInteract();
-        this.allSettings = allSettings;
+        elements.add(element);
-
-        elements.add(defaultSetting);
-        extraPower.add(0);
-        extraTicks.add(0L);
-
-        for (T element : allSettings) {
-            settingsGuiSize = Math.max(element.getPos(), settingsGuiSize);
-        }
-        while (settingsGuiSize % 9 != 0) settingsGuiSize++;
-        settingsGuiSize += 9;
     }
 
     @Override
     public void execute(Consumer<Long> delay) {
         if (currentShot >= elements.size()) currentShot = 0;
-        if (checkBlockInWorld()) {
+        elements.get(currentShot).execute(delay);
-            BlockData blockData = location.getBlock().getBlockData();
-            elements.get(currentShot).execute(location, blockData, this, extraPower.get(currentShot), extraTicks.get(currentShot), delay);
-        }
         currentShot++;
         if (currentShot >= elements.size()) currentShot = 0;
     }
 
     @Override
     public void click(Player player, Runnable backAction) {
-        List<SWListInv.SWListEntry<Integer>> entries = new ArrayList<>();
+        List<SWListInv.SWListEntry<T>> entries = new ArrayList<>();
-        Runnable updateRunnable = () -> {
+        for (T element : elements) {
-            entries.clear();
+            entries.add(new SWListInv.SWListEntry<>(element.menu(player), element));
-            for (int i = 0; i < elements.size(); i++) {
+        }
-                SWItem swItem = elements.get(i).menu(player, this, extraPower.get(i), extraTicks.get(i));
-                swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
-                entries.add(new SWListInv.SWListEntry<>(swItem, i));
-            }
-        };
-        updateRunnable.run();
 
-        SWListInv<Integer> listInv = new SWListInv<>(player, "Interaction Settings", false, entries, (clickType, entry) -> {});
+        SWListInv<T> listInv = new SWListInv<>(player, "Interaction Settings", false, entries, (clickType, entry) -> {
-        listInv.setCallback((clickType, entry) -> {
+            entry.click(player, () -> {
-            openIndividualSettingsMenu(player, entry, () -> {
+                click(player, backAction);
-                updateRunnable.run();
-                listInv.open();
             }, () -> {
-                elements.remove((int) entry);
+                if (elements.size() == 1) return;
-                extraPower.remove((int) entry);
+                elements.remove(entry);
-                extraTicks.remove((int) entry);
-                if (elements.isEmpty()) {
-                    elements.add(newSetting);
-                    extraPower.add(0);
-                    extraTicks.add(1L);
-                }
                 click(player, backAction);
             });
         });
@@ -115,190 +77,48 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
             backAction.run();
         }));
         listInv.setItem(50, new SWItem(Material.GHAST_SPAWN_EGG, "§7Insert another Setting", clickType -> {
-            elements.add(defaultSetting);
+            T element = createNewElement();
-            extraPower.add(0);
+            elements.add(element);
-            extraTicks.add(1L);
+            element.click(player, () -> click(player, backAction), () -> {
-            openIndividualSettingsMenu(player, elements.size() - 1, () -> {
+                if (elements.size() == 1) return;
-                updateRunnable.run();
+                elements.remove(element);
-                listInv.open();
-            }, () -> {
-                elements.remove(elements.size() - 1);
-                extraPower.remove(extraPower.size() - 1);
-                extraTicks.remove(extraTicks.size() - 1);
-                if (elements.isEmpty()) {
-                    elements.add(newSetting);
-                    extraPower.add(0);
-                    extraTicks.add(1L);
-                }
                 click(player, backAction);
             });
         }));
         listInv.open();
     }
 
-    private void openIndividualSettingsMenu(Player player, int index, Runnable back, Runnable delete) {
-        T currentElement = elements.get(index);
-        int guiSize = settingsGuiSize;
-        int powerStart = guiSize - 9;
-        if (currentElement.hasPower(this)) {
-            guiSize += 18;
-        }
-        int ticksStart = guiSize - 9;
-        if (currentElement.hasTicks(this)) {
-            guiSize += 9;
-        }
-
-        SWInventory swInventory = new SWInventory(player, guiSize, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
-        for (int i = guiSize - 9; i < guiSize; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7", clickType -> {}));
-        swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> back.run());
-        swInventory.setItem(guiSize - 5, new SWItem(Material.WOODEN_AXE, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_COPY", player)).getItemStack(), clickType -> {
-            SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_GUI_COPY_TITLE", player), "1");
-            swAnvilInv.setCallback(s -> {
-                try {
-                    int count = Integer.parseInt(s);
-                    if (count < 1) count = 1;
-                    if (count > 65536) count = 65536;
-
-                    int power = extraPower.get(index);
-                    long ticks = extraTicks.get(index);
-                    for (int i = 0; i < count; i++) {
-                        elements.add(currentElement);
-                        extraPower.add(power);
-                        extraTicks.add(ticks);
-                    }
-
-                    if (count == 1) {
-                        openIndividualSettingsMenu(player, elements.size() - 1, back, delete);
-                    } else {
-                        back.run();
-                    }
-                } catch (NumberFormatException e) {
-                    back.run();
-                }
-            });
-            swAnvilInv.open();
-        });
-        swInventory.setItem(guiSize - 1, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> delete.run());
-
-        for (T element : allSettings) {
-            SWItem item = element.menu(player, this, extraPower.get(index), extraTicks.get(index));
-            if (element == currentElement) {
-                item.setEnchanted(true);
-            }
-
-            swInventory.setItem(element.getPos(), item.getItemStack(), clickType -> {
-                elements.set(index, element);
-                openIndividualSettingsMenu(player, index, back, delete);
-            });
-        }
-
-        if (currentElement.hasPower(this)) {
-            for (int power = 0; power < 16; power++) {
-                int finalPowerPosition = power;
-                if (power >= 9) finalPowerPosition++;
-                SWItem powerItem = new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("LOADER_SETTING_POWER", player, power), Arrays.asList(), false, clickType -> {});
-                powerItem.getItemStack().setAmount(Math.max(power, 1));
-                if (extraPower.get(index) == power) powerItem.setEnchanted(true);
-
-                int finalPower = power;
-                swInventory.setItem(finalPowerPosition + powerStart, powerItem.getItemStack(), clickType -> {
-                    extraPower.set(index, finalPower);
-                    openIndividualSettingsMenu(player, index, back, delete);
-                });
-            }
-        }
-
-        if (currentElement.hasTicks(this)) {
-            swInventory.setItem(ticksStart + 3, new SWItem(SWItem.getDye(1), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
-                long ticks = extraTicks.get(index);
-                ticks -= clickType.isShiftClick() ? 5 : 1;
-                if (ticks < 1) ticks = 1;
-                extraTicks.set(index, ticks);
-                openIndividualSettingsMenu(player, index, back, delete);
-            });
-
-            SWItem ticksItem = new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS", player, extraTicks.get(index)), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)), false, clickType -> {});
-            ticksItem.getItemStack().setAmount((int) Math.min(extraTicks.get(index), 64));
-            swInventory.setItem(ticksStart + 4, ticksItem.getItemStack(), clickType -> {
-                SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_NAME", player), extraTicks.get(index) + "");
-                swAnvilInv.setCallback(s -> {
-                    try {
-                        long ticks = Long.parseLong(s);
-                        if (ticks < 1) ticks = 1;
-                        extraTicks.set(index, ticks);
-                    } catch (NumberFormatException ignored) {
-                    }
-                    openIndividualSettingsMenu(player, index, back, delete);
-                });
-                swAnvilInv.open();
-            });
-
-            swInventory.setItem(ticksStart + 5, new SWItem(SWItem.getDye(10), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
-                long ticks = extraTicks.get(index);
-                ticks += clickType.isShiftClick() ? 5 : 1;
-                extraTicks.set(index, ticks);
-                openIndividualSettingsMenu(player, index, back, delete);
-            });
-        }
-
-        swInventory.open();
-    }
-
     protected void update(BlockData blockData) {
+        Material material = blockData.getMaterial();
         Block block = location.getBlock();
-        if (blockData instanceof Door) {
+        if (blockData instanceof Switch) {
-            Door door = (Door) blockData;
-            block.setBlockData(door);
-            if (door.getHalf() == Bisected.Half.BOTTOM) {
-                updateBlock(block.getRelative(BlockFace.UP), door.isOpen() ? 15 : 0);
-            } else {
-                updateBlock(block.getRelative(BlockFace.DOWN), door.isOpen() ? 15 : 0);
-            }
-        } else if (blockData instanceof Switch) {
             Switch sw = (Switch) blockData;
             updateBlock(block, sw);
             FaceAttachable.AttachedFace face = sw.getAttachedFace();
             if (face == FaceAttachable.AttachedFace.FLOOR) {
-                updateBlock(block.getRelative(BlockFace.DOWN), sw.isPowered() ? 15 : 0);
+                updateBlock(block.getRelative(BlockFace.DOWN));
             } else if (face == FaceAttachable.AttachedFace.CEILING) {
-                updateBlock(block.getRelative(BlockFace.UP), sw.isPowered() ? 15 : 0);
+                updateBlock(block.getRelative(BlockFace.UP));
             } else {
-                updateBlock(block.getRelative(sw.getFacing().getOppositeFace()), sw.isPowered() ? 15 : 0);
+                updateBlock(block.getRelative(sw.getFacing().getOppositeFace()));
             }
-        } else if (blockData instanceof Powerable) {
+        } else if (material == Material.TRIPWIRE) {
-            updateBlock(block, blockData);
-            updateBlock(block.getRelative(BlockFace.DOWN), ((Powerable) blockData).isPowered() ? 15 : 0);
-        } else if (blockData instanceof AnaloguePowerable) {
-            updateBlock(block, blockData);
-            updateBlock(block.getRelative(BlockFace.DOWN), ((AnaloguePowerable) blockData).getPower());
-        } else {
             updateBlock(block, blockData);
+        } else if (material.name().endsWith("_PLATE")) {
+            updateBlock(block.getRelative(BlockFace.DOWN));
         }
     }
 
-    private void updateBlock(Block block, int powered) {
+    protected void updateBlock(Block block) {
-        BlockData data = block.getBlockData();
+        updateBlock(block, block.getBlockData());
-        if (data instanceof Door) {
-            Door door = (Door) data;
-            door.setOpen(powered > 0);
-            block.setBlockData(door);
-            return;
-        } else if (data instanceof Powerable) {
-            Powerable powerable = (Powerable) data;
-            powerable.setPowered(powered > 0);
-        } else if (data instanceof AnaloguePowerable) {
-            AnaloguePowerable analoguePowerable = (AnaloguePowerable) data;
-            analoguePowerable.setPower(powered);
-        }
-        updateBlock(block, data);
     }
 
-    private void updateBlock(Block block, BlockData data) {
+    protected void updateBlock(Block block, BlockData data) {
-        block.setType(Material.BARRIER);
+        block.setType(Material.BARRIER, true);
-        block.setBlockData(data);
+        block.setBlockData(data, true);
     }
 
-    public abstract boolean checkBlockInWorld();
+    public abstract T createNewElement();
 
     protected final String translateItemName(String name, Player player) {
         return BauSystem.MESSAGE.parse("LOADER_SETTING_NAME", player, BauSystem.MESSAGE.parse(name, player));

BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderSettingsEnum.java

@@ -1,44 +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.loader.elements;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.inventory.SWItem;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-import java.util.function.Consumer;
-
-public interface LoaderSettingsEnum<T, P extends LoaderInteractionElement<E>, E extends Enum<E> & LoaderSettingsEnum<T, P, E>> {
-    int getPos();
-    SWItem menu(Player player, P parent, int power, long ticks);
-    default boolean hasPower(P parent) {
-        return false;
-    }
-    default boolean hasTicks(P parent) {
-        return false;
-    }
-
-    void execute(Location location, T blockData, P parent, int power, long ticks, Consumer<Long> delay);
-
-    default String translateItemName(String name, String mode, Player player, Object... args) {
-        return BauSystem.MESSAGE.parse("LOADER_GUI_ITEM_NAME", player, BauSystem.MESSAGE.parse(name, player), BauSystem.MESSAGE.parse(mode, player, args));
-    }
-}

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

@@ -19,8 +19,10 @@
 
 package de.steamwar.bausystem.features.loader.elements.impl;
 
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -28,83 +30,95 @@ import org.bukkit.block.data.type.Comparator;
 import org.bukkit.entity.Player;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderComparator extends LoaderInteractionElement<LoaderComparator.ComparatorSettingsEnum> {
+public class LoaderComparator extends LoaderInteractionElement<LoaderComparator.ComparatorSettings> {
 
     public LoaderComparator(Location location) {
-        super(location, ComparatorSettingsEnum.INTERACT, ComparatorSettingsEnum.NOOP, ComparatorSettingsEnum.values());
+        super(location);
     }
 
-    public enum ComparatorSettingsEnum implements LoaderSettingsEnum<Comparator, LoaderComparator, ComparatorSettingsEnum> {
+    public class ComparatorSettings implements ElementSettings {
-        NOOP {
-            @Override
-            public int getPos() {
-                return 2;
-            }
 
-            @Override
+        private boolean interact = false;
-            public SWItem menu(Player player, LoaderComparator parent, int power, long ticks) {
+        private Comparator.Mode mode = Comparator.Mode.COMPARE;
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_COMPARATOR", "LOADER_INTERACTION_NOOP", player));
-            }
 
-            @Override
+        @Override
-            public void execute(Location location, Comparator blockData, LoaderComparator parent, int power, long ticks, Consumer<Long> delay) {
+        public SWItem menu(Player player) {
-            }
+            return menu(player, interact, mode);
-        },
+        }
 
-        INTERACT {
+        private SWItem menu(Player player, boolean interact, Comparator.Mode mode) {
-            @Override
+            SWItem swItem;
-            public int getPos() {
+            if (interact) {
-                return 3;
+                swItem = new SWItem(Material.STICK, "§7Comparator§8: §eInteract");
+            } else if (mode == null) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, "§7Comparator§8: §eNOOP");
+            } else {
+                swItem = new SWItem(Material.COMPARATOR, "§7Comparator§8: §e" + mode.name());
             }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderComparator parent, int power, long ticks) {
+        public void execute(Consumer<Long> delay) {
-                return new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_COMPARATOR", "LOADER_INTERACTION_INTERACT", player));
+            if (location.getBlock().getType() != Material.COMPARATOR) return;
+            Comparator comparator = (Comparator) location.getBlock().getBlockData();
+            if (interact) {
+                comparator.setMode(comparator.getMode() == Comparator.Mode.COMPARE ? Comparator.Mode.SUBTRACT : Comparator.Mode.COMPARE);
+            } else if (mode == null) {
+                return;
+            } else {
+                comparator.setMode(mode);
             }
+            location.getBlock().setBlockData(comparator, true);
+        }
 
-            @Override
+        @Override
-            public void execute(Location location, Comparator blockData, LoaderComparator parent, int power, long ticks, Consumer<Long> delay) {
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
-                blockData.setMode(blockData.getMode() == Comparator.Mode.COMPARE ? Comparator.Mode.SUBTRACT : Comparator.Mode.COMPARE);
+            SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
-                parent.update(blockData);
+            for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
-            }
+            swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
-        },
+            swInventory.setItem(17, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
 
-        COMPARE {
+            swInventory.setItem(2, item(player, false, null).getItemStack(), clickType -> {
-            @Override
+                interact = false;
-            public int getPos() {
+                mode = null;
-                return 5;
+                click(player, backAction, deleteAction);
-            }
+            });
+            swInventory.setItem(3, item(player, true, null).getItemStack(), clickType -> {
+                interact = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(5, item(player, false, Comparator.Mode.COMPARE).getItemStack(), clickType -> {
+                interact = false;
+                mode = Comparator.Mode.COMPARE;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(6, item(player, false, Comparator.Mode.SUBTRACT).getItemStack(), clickType -> {
+                interact = false;
+                mode = Comparator.Mode.SUBTRACT;
+                click(player, backAction, deleteAction);
+            });
 
-            @Override
+            swInventory.open();
-            public SWItem menu(Player player, LoaderComparator parent, int power, long ticks) {
+        }
-                return new SWItem(Material.COMPARATOR, translateItemName("LOADER_BUTTON_COMPARATOR", "LOADER_INTERACTION_COMPARE", player));
-            }
 
-            @Override
+        private SWItem item(Player player, boolean interact, Comparator.Mode mode) {
-            public void execute(Location location, Comparator blockData, LoaderComparator parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem = menu(player, interact, mode);
-                blockData.setMode(Comparator.Mode.COMPARE);
+            if (swItem.getItemStack().equals(menu(player, this.interact, this.mode).getItemStack())) {
-                parent.update(blockData);
+                swItem.setEnchanted(true);
             }
-        },
+            swItem.setLore(Collections.emptyList());
+            return swItem;
+        }
 
-        SUBTRACT {
+        @Override
-            @Override
+        public void playerInteract() {
-            public int getPos() {
+            interact = true;
-                return 6;
+            mode = null;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderComparator parent, int power, long ticks) {
-                return new SWItem(Material.COMPARATOR, translateItemName("LOADER_BUTTON_COMPARATOR", "LOADER_INTERACTION_SUBTRACT", player));
-            }
-
-            @Override
-            public void execute(Location location, Comparator blockData, LoaderComparator parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setMode(Comparator.Mode.SUBTRACT);
-                parent.update(blockData);
-            }
         }
     }
 
@@ -116,7 +130,7 @@ public class LoaderComparator extends LoaderInteractionElement<LoaderComparator.
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public ComparatorSettings createNewElement() {
-        return location.getBlock().getType() == Material.COMPARATOR;
+        return new ComparatorSettings();
     }
 }

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

@@ -19,98 +19,130 @@
 
 package de.steamwar.bausystem.features.loader.elements.impl;
 
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.DaylightDetector;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderDaylightDetector extends LoaderInteractionElement<LoaderDaylightDetector.DaylightSettingsEnum> {
+public class LoaderDaylightDetector extends LoaderInteractionElement<LoaderDaylightDetector.DaylightDetectorSettings> {
 
     public LoaderDaylightDetector(Location location) {
-        super(location, DaylightSettingsEnum.INTERACT, DaylightSettingsEnum.NOOP, DaylightSettingsEnum.values());
+        super(location);
     }
 
-    public enum DaylightSettingsEnum implements LoaderSettingsEnum<DaylightDetector, LoaderDaylightDetector, DaylightSettingsEnum> {
+    public class DaylightDetectorSettings implements ElementSettings {
-        NOOP {
+
-            @Override
+        private boolean noop = false;
-            public int getPos() {
+        private boolean interact = false;
-                return 2;
+        private boolean inverted = true;
+        private int power = 0;
+
+        @Override
+        public SWItem menu(Player player) {
+            return menu(player, noop, interact, inverted);
+        }
+
+        private SWItem menu(Player player, boolean noop, boolean interact, boolean powered) {
+            SWItem swItem;
+            if (noop) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", "LOADER_INTERACTION_NOOP", player));
+            } else if (interact) {
+                swItem = new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", "LOADER_INTERACTION_INTERACT", player));
+            } else {
+                swItem = new SWItem(Material.DAYLIGHT_DETECTOR, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", powered ? "LOADER_INTERACTION_POWERED": "LOADER_INTERACTION_UNPOWERED", player));
+            }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
+
+        @Override
+        public void execute(Consumer<Long> delay) {
+            if (location.getBlock().getType() != Material.DAYLIGHT_DETECTOR) return;
+            DaylightDetector daylightDetector = (DaylightDetector) location.getBlock().getBlockData();
+            if (noop) {
+                return;
+            } else if (interact) {
+                daylightDetector.setInverted(!daylightDetector.isInverted());
+            } else {
+                daylightDetector.setInverted(inverted);
+            }
+            daylightDetector.setPower(daylightDetector.isInverted() ? 15 - power : power);
+            location.getBlock().setBlockData(daylightDetector);
+            updateBlock(location.getBlock().getRelative(0, -1, 0));
+        }
+
+        @Override
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
+            SWInventory swInventory = new SWInventory(player, 36, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
+            for (int i = 27; i < 35; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(27, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(35, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
+
+            swInventory.setItem(2, item(player, true, false, false).getItemStack(), clickType -> {
+                noop = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(3, item(player, false, true, false).getItemStack(), clickType -> {
+                noop = false;
+                interact = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(5, item(player, false, false, false).getItemStack(), clickType -> {
+                noop = false;
+                interact = false;
+                inverted = false;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(6, item(player, false, false, true).getItemStack(), clickType -> {
+                noop = false;
+                interact = false;
+                inverted = true;
+                click(player, backAction, deleteAction);
+            });
+
+            for (int i = 0; i < 16; i++) {
+                int finalI = i;
+                int finalI2 = i;
+                if (i >= 9) finalI2++;
+                swInventory.setItem(finalI2 + 9, item(player, finalI).getItemStack(), clickType -> {
+                    power = finalI;
+                    click(player, backAction, deleteAction);
+                });
             }
 
-            @Override
+            swInventory.open();
-            public SWItem menu(Player player, LoaderDaylightDetector parent, int power, long ticks) {
+        }
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", "LOADER_INTERACTION_NOOP", player));
-            }
 
-            @Override
+        private SWItem item(Player player, boolean noop, boolean interact, boolean inverted) {
-            public void execute(Location location, DaylightDetector blockData, LoaderDaylightDetector parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem = menu(player, noop, interact, inverted);
+            if (swItem.getItemStack().equals(menu(player, this.noop, this.interact, this.inverted).getItemStack())) {
+                swItem.setEnchanted(true);
             }
-        },
+            swItem.setLore(Collections.emptyList());
+            return swItem;
+        }
 
-        INTERACT {
+        private SWItem item(Player player, int power) {
-            @Override
+            SWItem swItem = new SWItem(power == 0 ? Material.GUNPOWDER : Material.REDSTONE, BauSystem.MESSAGE.parse("LOADER_SETTING_POWER", player, power));
-            public int getPos() {
+            swItem.getItemStack().setAmount(power == 0 ? 1 : power);
-                return 3;
+            if (!this.noop && this.power == power) swItem.setEnchanted(true);
-            }
+            return swItem;
+        }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderDaylightDetector parent, int power, long ticks) {
+        public void playerInteract() {
-                return new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", "LOADER_INTERACTION_INTERACT", player));
+            noop = false;
-            }
+            interact = true;
-
+            inverted = false;
-            @Override
-            public void execute(Location location, DaylightDetector blockData, LoaderDaylightDetector parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setInverted(!blockData.isInverted());
-                blockData.setPower(15 - blockData.getPower());
-                parent.update(blockData);
-            }
-        },
-
-        DAY_MODE {
-            @Override
-            public int getPos() {
-                return 5;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderDaylightDetector parent, int power, long ticks) {
-                return new SWItem(Material.DAYLIGHT_DETECTOR, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", "LOADER_INTERACTION_UNPOWERED", player));
-            }
-
-            @Override
-            public void execute(Location location, DaylightDetector blockData, LoaderDaylightDetector parent, int power, long ticks, Consumer<Long> delay) {
-                if (blockData.isInverted()) {
-                    blockData.setInverted(false);
-                    blockData.setPower(15 - blockData.getPower());
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        NIGHT_MODE {
-            @Override
-            public int getPos() {
-                return 6;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderDaylightDetector parent, int power, long ticks) {
-                return new SWItem(Material.DAYLIGHT_DETECTOR, translateItemName("LOADER_BUTTON_DAYLIGHT_DETECTOR", "LOADER_INTERACTION_POWERED", player));
-            }
-
-            @Override
-            public void execute(Location location, DaylightDetector blockData, LoaderDaylightDetector parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.isInverted()) {
-                    blockData.setInverted(true);
-                    blockData.setPower(15 - blockData.getPower());
-                    parent.update(blockData);
-                }
-            }
         }
     }
 
@@ -120,7 +152,7 @@ public class LoaderDaylightDetector extends LoaderInteractionElement<LoaderDayli
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public DaylightDetectorSettings createNewElement() {
-        return location.getBlock().getType() == Material.DAYLIGHT_DETECTOR;
+        return new DaylightDetectorSettings();
     }
 }

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

@@ -19,493 +19,127 @@
 
 package de.steamwar.bausystem.features.loader.elements.impl;
 
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Lectern;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.BookMeta;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderLectern extends LoaderInteractionElement<LoaderLectern.LecternSettingsEnum> {
+public class LoaderLectern extends LoaderInteractionElement<LoaderLectern.LecternSettings> {
 
 
     public LoaderLectern(Location location) {
-        super(location, LecternSettingsEnum.NEXT_PAGE, LecternSettingsEnum.NOOP, LecternSettingsEnum.values());
+        super(location);
     }
 
-    public enum LecternSettingsEnum implements LoaderSettingsEnum<org.bukkit.block.data.type.Lectern, LoaderLectern, LecternSettingsEnum> {
+    public class LecternSettings implements ElementSettings {
-        NOOP {
-            @Override
-            public int getPos() {
-                return 2;
-            }
 
-            @Override
+        private boolean noop = true;
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
+        private LecternAction action = LecternAction.PAGE_NEXT;
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_NOOP", player));
+        private int page = 0;
-            }
 
-            @Override
+        @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
+        public SWItem menu(Player player) {
-            }
+            return menu(player, noop, action, page);
-        },
-
-        PREVIOUS_PAGE {
-            @Override
-            public int getPos() {
-                return 5;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                return new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE_PREV", player));
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                if (lectern.getPage() > 0) {
-                    lectern.setPage(lectern.getPage() - 1);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        NEXT_PAGE {
-            @Override
-            public int getPos() {
-                return 6;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                return new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE_NEXT", player));
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (lectern.getPage() < pages) {
-                    lectern.setPage(lectern.getPage() + 1);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_1 {
-            @Override
-            public int getPos() {
-                return 9;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 1));
-                swItem.getItemStack().setAmount(1);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (1 <= pages) {
-                    lectern.setPage(1);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_2 {
-            @Override
-            public int getPos() {
-                return 10;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 2));
-                swItem.getItemStack().setAmount(2);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (2 <= pages) {
-                    lectern.setPage(2);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_3 {
-            @Override
-            public int getPos() {
-                return 11;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 3));
-                swItem.getItemStack().setAmount(3);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (3 <= pages) {
-                    lectern.setPage(3);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_4 {
-            @Override
-            public int getPos() {
-                return 12;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 4));
-                swItem.getItemStack().setAmount(4);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (4 <= pages) {
-                    lectern.setPage(4);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_5 {
-            @Override
-            public int getPos() {
-                return 13;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 5));
-                swItem.getItemStack().setAmount(5);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (5 <= pages) {
-                    lectern.setPage(5);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_6 {
-            @Override
-            public int getPos() {
-                return 14;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 6));
-                swItem.getItemStack().setAmount(6);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (6 <= pages) {
-                    lectern.setPage(6);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_7 {
-            @Override
-            public int getPos() {
-                return 15;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 7));
-                swItem.getItemStack().setAmount(7);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (7 <= pages) {
-                    lectern.setPage(7);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_8 {
-            @Override
-            public int getPos() {
-                return 16;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 8));
-                swItem.getItemStack().setAmount(8);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (8 <= pages) {
-                    lectern.setPage(8);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_9 {
-            @Override
-            public int getPos() {
-                return 17;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 9));
-                swItem.getItemStack().setAmount(9);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (9 <= pages) {
-                    lectern.setPage(9);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_10 {
-            @Override
-            public int getPos() {
-                return 19;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 10));
-                swItem.getItemStack().setAmount(10);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (10 <= pages) {
-                    lectern.setPage(10);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_11 {
-            @Override
-            public int getPos() {
-                return 20;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 11));
-                swItem.getItemStack().setAmount(11);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (11 <= pages) {
-                    lectern.setPage(11);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_12 {
-            @Override
-            public int getPos() {
-                return 21;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 12));
-                swItem.getItemStack().setAmount(12);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (12 <= pages) {
-                    lectern.setPage(12);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_13 {
-            @Override
-            public int getPos() {
-                return 23;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 13));
-                swItem.getItemStack().setAmount(13);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (13 <= pages) {
-                    lectern.setPage(13);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_14 {
-            @Override
-            public int getPos() {
-                return 24;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 14));
-                swItem.getItemStack().setAmount(14);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (14 <= pages) {
-                    lectern.setPage(14);
-                    parent.update(blockData);
-                }
-            }
-        },
-
-        PAGE_15 {
-            @Override
-            public int getPos() {
-                return 25;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLectern parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, 15));
-                swItem.getItemStack().setAmount(15);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, org.bukkit.block.data.type.Lectern blockData, LoaderLectern parent, int power, long ticks, Consumer<Long> delay) {
-                if (!blockData.hasBook()) return;
-                Lectern lectern = (Lectern) location.getBlock().getState();
-                ItemStack itemStack = lectern.getInventory().getItem(0);
-                if (itemStack == null) return;
-                int pages = ((BookMeta) itemStack.getItemMeta()).getPages().size();
-                if (15 <= pages) {
-                    lectern.setPage(15);
-                    parent.update(blockData);
-                }
-            }
         }
+
+        private SWItem menu(Player player, boolean noop, LecternAction action, int page) {
+            SWItem swItem;
+            if (noop) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_NOOP", player));
+            } else if (action == LecternAction.PAGE_PREV) {
+                swItem = new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE_PREV", player));
+            } else if (action == LecternAction.PAGE_NEXT) {
+                swItem = new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE_NEXT", player));
+            } else {
+                swItem = new SWItem(Material.LECTERN, translateItemName("LOADER_BUTTON_LECTERN", "LOADER_INTERACTION_PAGE", player, page));
+                swItem.getItemStack().setAmount(page);
+            }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
+
+        @Override
+        public void execute(Consumer<Long> delay) {
+            if (location.getBlock().getType() != Material.LECTERN) return;
+            Lectern lectern  = (Lectern) location.getBlock().getState();
+            if (!((org.bukkit.block.data.type.Lectern) lectern.getBlockData()).hasBook()) return;
+            int pages = ((BookMeta) lectern.getInventory().getItem(0).getItemMeta()).getPages().size();
+            if (noop) {
+                return;
+            } else if (action == LecternAction.PAGE_PREV) {
+                int page = lectern.getPage();
+                if (page > 1) lectern.setPage(page - 1);
+            } else if (action == LecternAction.PAGE_NEXT) {
+                int page = lectern.getPage();
+                if (page < pages) lectern.setPage(page + 1);
+            } else if (action == LecternAction.PAGE_SET) {
+                if (page <= pages) lectern.setPage(page);
+            }
+            lectern.update(false, true);
+        }
+
+        @Override
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
+            SWInventory swInventory = new SWInventory(player, 36, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
+            for (int i = 27; i < 35; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(27, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(35, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
+
+            swInventory.setItem(2, item(player, true, LecternAction.PAGE_SET, 0).getItemStack(), clickType -> {
+                noop = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(5, item(player, false, LecternAction.PAGE_PREV, 0).getItemStack(), clickType -> {
+                noop = false;
+                action = LecternAction.PAGE_PREV;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(6, item(player, false, LecternAction.PAGE_NEXT, 0).getItemStack(), clickType -> {
+                noop = false;
+                action = LecternAction.PAGE_NEXT;
+                click(player, backAction, deleteAction);
+            });
+
+            for (int i = 0; i < 15; i++) {
+                int finalI = i;
+                int finalI2 = i;
+                if (i >= 9) finalI2++;
+                if (i >= 12) finalI2++;
+                swInventory.setItem(finalI2 + 9, item(player, false, LecternAction.PAGE_SET, finalI + 1).getItemStack(), clickType -> {
+                    noop = false;
+                    action = LecternAction.PAGE_SET;
+                    page = finalI + 1;
+                    click(player, backAction, deleteAction);
+                });
+            }
+
+            swInventory.open();
+        }
+
+        private SWItem item(Player player, boolean noop, LecternAction action, int page) {
+            SWItem swItem = menu(player, noop, action, page);
+            if (swItem.getItemStack().equals(menu(player, this.noop, this.action, this.page).getItemStack())) {
+                swItem.setEnchanted(true);
+            }
+            swItem.setLore(Collections.emptyList());
+            return swItem;
+        }
+    }
+
+    public enum LecternAction {
+        PAGE_NEXT,
+        PAGE_PREV,
+        PAGE_SET
     }
 
     @Override
@@ -514,7 +148,7 @@ public class LoaderLectern extends LoaderInteractionElement<LoaderLectern.Lecter
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public LecternSettings createNewElement() {
-        return location.getBlock().getType() == Material.LECTERN;
+        return new LecternSettings();
     }
 }

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

@@ -19,91 +19,103 @@
 
 package de.steamwar.bausystem.features.loader.elements.impl;
 
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Switch;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderLever extends LoaderInteractionElement<LoaderLever.LeverSettingsEnum> {
+public class LoaderLever extends LoaderInteractionElement<LoaderLever.LeverSettings> {
 
     public LoaderLever(Location location) {
-        super(location, LeverSettingsEnum.INTERACT, LeverSettingsEnum.NOOP, LeverSettingsEnum.values());
+        super(location);
     }
 
-    public enum LeverSettingsEnum implements LoaderSettingsEnum<Switch, LoaderLever, LeverSettingsEnum> {
+    public class LeverSettings implements ElementSettings {
 
-        NOOP {
+        private boolean noop = false;
-            @Override
+        private boolean interact = false;
-            public int getPos() {
+        private boolean power = false;
-                return 2;
-            }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderLever parent, int power, long ticks) {
+        public SWItem menu(Player player) {
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_SWITCH", "LOADER_INTERACTION_NOOP", player));
+            return menu(player, noop, interact, power);
-            }
+        }
 
-            @Override
+        private SWItem menu(Player player, boolean noop, boolean interact, boolean power) {
-            public void execute(Location location, Switch blockData, LoaderLever parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem;
+            if (noop) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_SWITCH", "LOADER_INTERACTION_NOOP", player));
+            } else if (interact) {
+                swItem = new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_SWITCH", "LOADER_INTERACTION_INTERACT", player));
+            } else {
+                swItem = new SWItem(Material.LEVER, translateItemName("LOADER_BUTTON_SWITCH", power ? "LOADER_INTERACTION_ACTIVE" : "LOADER_INTERACTION_INACTIVE", player));
             }
-        },
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
 
-        INTERACT {
+        @Override
-            @Override
+        public void execute(Consumer<Long> delay) {
-            public int getPos() {
+            if (location.getBlock().getType() != Material.LEVER) return;
-                return 3;
+            if (noop) return;
-            }
 
-            @Override
+            Switch lever = (Switch) location.getBlock().getBlockData();
-            public SWItem menu(Player player, LoaderLever parent, int power, long ticks) {
+            if (interact) {
-                return new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_SWITCH", "LOADER_INTERACTION_INTERACT", player));
+                lever.setPowered(!lever.isPowered());
+            } else {
+                lever.setPowered(power);
             }
+            location.getBlock().setBlockData(lever, true);
+        }
 
-            @Override
+        @Override
-            public void execute(Location location, Switch blockData, LoaderLever parent, int power, long ticks, Consumer<Long> delay) {
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
-                blockData.setPowered(!blockData.isPowered());
+            SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
-                parent.update(blockData);
+            for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
-            }
+            swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
-        },
+            swInventory.setItem(17, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
 
-        POWER_OFF {
+            swInventory.setItem(2, item(player, true, false, false).getItemStack(), clickType -> {
-            @Override
+                noop = true;
-            public int getPos() {
+                click(player, backAction, deleteAction);
-                return 5;
+            });
-            }
+            swInventory.setItem(3, item(player, false, true, false).getItemStack(), clickType -> {
+                noop = false;
+                interact = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(5, item(player, false, false, false).getItemStack(), clickType -> {
+                noop = false;
+                interact = false;
+                power = false;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(6, item(player, false, false, true).getItemStack(), clickType -> {
+                noop = false;
+                interact = false;
+                power = true;
+                click(player, backAction, deleteAction);
+            });
 
-            @Override
+            swInventory.open();
-            public SWItem menu(Player player, LoaderLever parent, int power, long ticks) {
+        }
-                return new SWItem(Material.LEVER, translateItemName("LOADER_BUTTON_SWITCH", "LOADER_INTERACTION_INACTIVE", player));
-            }
 
-            @Override
+        private SWItem item(Player player, boolean noop, boolean interact, boolean power) {
-            public void execute(Location location, Switch blockData, LoaderLever parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem = menu(player, noop, interact, power);
-                blockData.setPowered(false);
+            if (swItem.getItemStack().equals(menu(player, this.noop, this.interact, this.power).getItemStack())) {
-                parent.update(blockData);
+                swItem.setEnchanted(true);
-            }
-        },
-
-        POWER_ON {
-            @Override
-            public int getPos() {
-                return 6;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderLever parent, int power, long ticks) {
-                return new SWItem(Material.LEVER, translateItemName("LOADER_BUTTON_SWITCH", "LOADER_INTERACTION_ACTIVE", player));
-            }
-
-            @Override
-            public void execute(Location location, Switch blockData, LoaderLever parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setPowered(true);
             }
+            swItem.setLore(Collections.emptyList());
+            return swItem;
         }
     }
 
@@ -113,7 +125,7 @@ public class LoaderLever extends LoaderInteractionElement<LoaderLever.LeverSetti
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public LeverSettings createNewElement() {
-        return location.getBlock().getType() == Material.LEVER;
+        return new LeverSettings();
     }
 }

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

@@ -20,9 +20,12 @@
 package de.steamwar.bausystem.features.loader.elements.impl;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWAnvilInv;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.data.AnaloguePowerable;
@@ -30,16 +33,18 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Powerable;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.MovementSettingsEnum> {
+public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.MovementSettings> {
 
     private String name;
     private Material material;
     private boolean analogue;
 
     public LoaderMovement(Location location, String name, Material material) {
-        super(location, MovementSettingsEnum.NO_WAIT_FOR, MovementSettingsEnum.NOOP, MovementSettingsEnum.values());
+        super(location);
         this.name = name;
         this.material = material;
         this.analogue = location.getBlock().getBlockData() instanceof AnaloguePowerable;
@@ -47,108 +52,161 @@ public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.Move
 
     public void setInitialTicks(long ticks) {
         if (ticks < 1) ticks = 1;
-        extraTicks.set(currentShot, ticks);
+        elements.get(currentShot).ticks = ticks;
     }
 
-    public enum MovementSettingsEnum implements LoaderSettingsEnum<BlockData, LoaderMovement, MovementSettingsEnum> {
+    public class MovementSettings implements ElementSettings {
 
-        NOOP {
+        private boolean noop = false;
-            @Override
+        private boolean waitFor = false;
-            public int getPos() {
+        private int power = 15;
-                return 2;
+        private long ticks = 1;
-            }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderMovement parent, int power, long ticks) {
+        public SWItem menu(Player player) {
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName(parent.name, "LOADER_INTERACTION_NOOP", player));
+            return menu(player, noop, waitFor);
-            }
+        }
 
-            @Override
+        private SWItem menu(Player player, boolean noop, boolean waitFor) {
-            public void execute(Location location, BlockData blockData, LoaderMovement parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem;
-            }
+            if (noop) {
-        },
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName(name, "LOADER_INTERACTION_NOOP", player));
-
+            } else if (waitFor) {
-        NO_WAIT_FOR {
+                swItem = new SWItem(material, translateItemName(name, "LOADER_INTERACTION_WAIT_FOR", player));
-            @Override
-            public int getPos() {
-                return 5;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderMovement parent, int power, long ticks) {
-                SWItem swItem = new SWItem(parent.material, translateItemName(parent.name, "LOADER_INTERACTION_WAIT_FOR", player));
                 swItem.getItemStack().setAmount((int) Math.min(ticks, 64));
-                return swItem;
+            } else {
+                swItem = new SWItem(material, translateItemName(name, "LOADER_INTERACTION_NO_WAIT_FOR", player));
+                swItem.getItemStack().setAmount((int) Math.min(ticks, 64));
+                swItem.setEnchanted(true);
             }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
 
-            @Override
+        @Override
-            public boolean hasPower(LoaderMovement parent) {
+        public void execute(Consumer<Long> delay) {
-                return parent.analogue;
+            if (!(material == Material.STRING && location.getBlock().getType() == Material.TRIPWIRE) && location.getBlock().getType() != material) return;
-            }
+            if (noop) return;
 
-            @Override
+            BlockData blockData = location.getBlock().getBlockData();
-            public boolean hasTicks(LoaderMovement parent) {
+            if (blockData instanceof AnaloguePowerable) {
-                return true;
+                AnaloguePowerable analoguePowerable = (AnaloguePowerable) location.getBlock().getBlockData();
-            }
+                analoguePowerable.setPower(power);
-
+                location.getBlock().setBlockData(analoguePowerable, true);
-            @Override
+                update(analoguePowerable);
-            public void execute(Location location, BlockData blockData, LoaderMovement parent, int power, long ticks, Consumer<Long> delay) {
+            } else if (blockData instanceof Powerable) {
-                if (blockData instanceof AnaloguePowerable) {
+                Powerable powerable = (Powerable) location.getBlock().getBlockData();
-                    AnaloguePowerable analoguePowerable = (AnaloguePowerable) location.getBlock().getBlockData();
+                if (ticks < 0) {
-                    analoguePowerable.setPower(power);
+                    powerable.setPowered(power > 0);
-                    parent.update(analoguePowerable);
+                } else {
-                } else if (blockData instanceof Powerable) {
+                    powerable.setPowered(true);
-                    Powerable powerable = (Powerable) location.getBlock().getBlockData();
-                    if (ticks < 0) {
-                        powerable.setPowered(power > 0);
-                    } else {
-                        powerable.setPowered(true);
-                    }
-                    parent.update(powerable);
                 }
+                location.getBlock().setBlockData(powerable, true);
+                update(powerable);
+            }
 
+            if (ticks >= 0) {
+                if (waitFor) {
+                    delay.accept(ticks);
+                }
                 BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
                     if (blockData instanceof AnaloguePowerable) {
                         AnaloguePowerable analoguePowerable = (AnaloguePowerable) blockData;
                         analoguePowerable.setPower(0);
-                        parent.update(analoguePowerable);
+                        location.getBlock().setBlockData(analoguePowerable, true);
+                        update(analoguePowerable);
                     } else {
                         Powerable powerable = (Powerable) blockData;
                         powerable.setPowered(false);
-                        parent.update(powerable);
+                        location.getBlock().setBlockData(powerable, true);
+                        update(powerable);
                     }
                 }, ticks);
             }
-        },
+        }
 
-        WAIT_FOR {
+        @Override
-            @Override
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
-            public int getPos() {
+            SWInventory swInventory = new SWInventory(player, analogue ? 45 : 27, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
-                return 6;
+            for (int i = analogue ? 36 : 18; i < (analogue ? 44 : 26); i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(analogue ? 36 : 18, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(analogue ? 44 : 26, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
+
+            swInventory.setItem(2, item(player, true, false).getItemStack(), clickType -> {
+                noop = true;
+                click(player, backAction, deleteAction);
+            });
+            if (ticks >= 0) {
+                swInventory.setItem(5, item(player, false, false).getItemStack(), clickType -> {
+                    noop = false;
+                    waitFor = false;
+                    click(player, backAction, deleteAction);
+                });
+                swInventory.setItem(6, item(player, false, true).getItemStack(), clickType -> {
+                    noop = false;
+                    waitFor = true;
+                    click(player, backAction, deleteAction);
+                });
             }
 
-            @Override
+            swInventory.setItem(12, new SWItem(SWItem.getDye(1), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
-            public SWItem menu(Player player, LoaderMovement parent, int power, long ticks) {
+                ticks -= clickType.isShiftClick() ? 5 : 1;
-                SWItem swItem = new SWItem(parent.material, translateItemName(parent.name, "LOADER_INTERACTION_NO_WAIT_FOR", player));
+                if (ticks < 1) ticks = 1;
-                swItem.getItemStack().setAmount((int) Math.min(ticks, 64));
+                swInventory.setItem(13, item(player));
-                return swItem;
+            });
+            swInventory.setItem(13, item(player).getItemStack(), clickType -> {
+                SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_NAME", player), ticks + "");
+                swAnvilInv.setCallback(s -> {
+                    try {
+                        ticks = Long.parseLong(s);
+                        if (ticks < 1) ticks = 1;
+                    } catch (NumberFormatException ignored) {
+                    }
+                    click(player, backAction, deleteAction);
+                });
+                swAnvilInv.open();
+            });
+            swInventory.setItem(14, new SWItem(SWItem.getDye(10), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+                ticks += clickType.isShiftClick() ? 5 : 1;
+                swInventory.setItem(13, item(player));
+            });
+
+            if (analogue) {
+                for (int i = 0; i < 16; i++) {
+                    int finalI = i;
+                    int finalI2 = i;
+                    if (i >= 9) finalI2++;
+                    swInventory.setItem(finalI2 + 18, item(player, finalI).getItemStack(), clickType -> {
+                        power = finalI;
+                        click(player, backAction, deleteAction);
+                    });
+                }
             }
 
-            @Override
+            swInventory.open();
-            public boolean hasPower(LoaderMovement parent) {
+        }
-                return parent.analogue;
-            }
 
-            @Override
+        private SWItem item(Player player, boolean noop, boolean waitFor) {
-            public boolean hasTicks(LoaderMovement parent) {
+            SWItem swItem = menu(player, noop, waitFor);
-                return true;
+            if (swItem.getItemStack().equals(menu(player, this.noop, this.waitFor).getItemStack())) {
+                swItem.setEnchanted(true);
             }
+            swItem.setLore(Collections.emptyList());
+            return swItem;
+        }
 
-            @Override
+        private SWItem item(Player player, int power) {
-            public void execute(Location location, BlockData blockData, LoaderMovement parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem = new SWItem(power == 0 ? Material.GUNPOWDER : Material.REDSTONE, BauSystem.MESSAGE.parse("LOADER_SETTING_POWER", player, power));
-                NO_WAIT_FOR.execute(location, blockData, parent, power, ticks, delay);
+            swItem.getItemStack().setAmount(power == 0 ? 1 : power);
-                delay.accept(ticks);
+            if (!this.noop && this.power == power) swItem.setEnchanted(true);
-            }
+            return swItem;
+        }
+
+        private SWItem item(Player player) {
+            SWItem swItem = new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS", player, ticks));
+            swItem.getItemStack().setAmount((int) Math.min(ticks, 64));
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
         }
     }
 
@@ -158,8 +216,7 @@ public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.Move
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public MovementSettings createNewElement() {
-        if (material == Material.STRING && location.getBlock().getType() == Material.TRIPWIRE) return true;
+        return new MovementSettings();
-        return location.getBlock().getType() == material;
     }
 }

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

@@ -19,8 +19,10 @@
 
 package de.steamwar.bausystem.features.loader.elements.impl;
 
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Instrument;
 import org.bukkit.Location;
@@ -28,50 +30,75 @@ import org.bukkit.Material;
 import org.bukkit.block.data.type.NoteBlock;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderNoteBlock extends LoaderInteractionElement<LoaderNoteBlock.NoteBlockSettingsEnum> {
+public class LoaderNoteBlock extends LoaderInteractionElement<LoaderNoteBlock.NoteBlockSettings> {
 
     public LoaderNoteBlock(Location location) {
-        super(location, NoteBlockSettingsEnum.INTERACT, NoteBlockSettingsEnum.NOOP, NoteBlockSettingsEnum.values());
+        super(location);
     }
 
-    public enum NoteBlockSettingsEnum implements LoaderSettingsEnum<NoteBlock, LoaderNoteBlock, NoteBlockSettingsEnum> {
+    public class NoteBlockSettings implements ElementSettings {
 
-        NOOP {
+        private boolean interact = true;
-            @Override
+
-            public int getPos() {
+        @Override
-                return 2;
+        public SWItem menu(Player player) {
+            return menu(player, interact);
+        }
+
+        private SWItem menu(Player player, boolean interact) {
+            SWItem swItem;
+            if (interact) {
+                swItem = new SWItem(Material.NOTE_BLOCK, translateItemName("LOADER_BUTTON_NOTEBLOCK", "LOADER_INTERACTION_INTERACT", player));
+            } else {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_NOTEBLOCK", "LOADER_INTERACTION_NOOP", player));
             }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderNoteBlock parent, int power, long ticks) {
+        public void execute(Consumer<Long> delay) {
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_NOTEBLOCK", "LOADER_INTERACTION_NOOP", player));
+            if (location.getBlock().getType() != Material.NOTE_BLOCK) return;
+            NoteBlock noteBlock = (NoteBlock) location.getBlock().getBlockData();
+            if (interact) {
+                if (noteBlock.getInstrument() == Instrument.BANJO) noteBlock.setInstrument(Instrument.BIT);
+                else noteBlock.setInstrument(Instrument.BANJO);
+            } else {
+                return;
             }
+            location.getBlock().setBlockData(noteBlock);
+        }
 
-            @Override
+        @Override
-            public void execute(Location location, NoteBlock blockData, LoaderNoteBlock parent, int power, long ticks, Consumer<Long> delay) {
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
+            SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
+            for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(17, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
 
+            swInventory.setItem(2, item(player, false).getItemStack(), clickType -> {
+                interact = false;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(3, item(player, true).getItemStack(), clickType -> {
+                interact = true;
+                click(player, backAction, deleteAction);
+            });
+
+            swInventory.open();
+        }
+
+        private SWItem item(Player player, boolean interact) {
+            SWItem swItem = menu(player, interact);
+            if (swItem.getItemStack().equals(menu(player, this.interact).getItemStack())) {
+                swItem.setEnchanted(true);
             }
-        },
+            swItem.setLore(Collections.emptyList());
-
+            return swItem;
-        INTERACT {
-            @Override
-            public int getPos() {
-                return 3;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderNoteBlock parent, int power, long ticks) {
-                return new SWItem(Material.NOTE_BLOCK, translateItemName("LOADER_BUTTON_NOTEBLOCK", "LOADER_INTERACTION_INTERACT", player));
-            }
-
-            @Override
-            public void execute(Location location, NoteBlock blockData, LoaderNoteBlock parent, int power, long ticks, Consumer<Long> delay) {
-                if (blockData.getInstrument() == Instrument.BANJO) blockData.setInstrument(Instrument.BIT);
-                else blockData.setInstrument(Instrument.BANJO);
-                parent.update(blockData);
-            }
         }
     }
 
@@ -81,7 +108,7 @@ public class LoaderNoteBlock extends LoaderInteractionElement<LoaderNoteBlock.No
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public NoteBlockSettings createNewElement() {
-        return location.getBlock().getType() == Material.NOTE_BLOCK;
+        return new NoteBlockSettings();
     }
 }

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

@@ -19,97 +19,108 @@
 
 package de.steamwar.bausystem.features.loader.elements.impl;
 
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.data.Openable;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderOpenable extends LoaderInteractionElement<LoaderOpenable.OpenableSettingsEnum> {
+public class LoaderOpenable extends LoaderInteractionElement<LoaderOpenable.TrapdoorSettings> {
 
     private String name;
     private Material material;
 
     public LoaderOpenable(Location location, String name, Material material) {
-        super(location, OpenableSettingsEnum.INTERACT, OpenableSettingsEnum.NOOP, OpenableSettingsEnum.values());
+        super(location);
         this.name = name;
         this.material = material;
     }
 
-    public enum OpenableSettingsEnum implements LoaderSettingsEnum<Openable, LoaderOpenable, OpenableSettingsEnum> {
+    public class TrapdoorSettings implements ElementSettings {
 
-        NOOP {
+        private boolean noop = false;
-            @Override
+        private boolean interact = true;
-            public int getPos() {
+        private boolean open = false;
-                return 2;
-            }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderOpenable parent, int power, long ticks) {
+        public SWItem menu(Player player) {
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName(parent.name, "LOADER_INTERACTION_NOOP", player));
+            return menu(player, noop, interact, open);
-            }
+        }
 
-            @Override
+        private SWItem menu(Player player, boolean noop, boolean interact, boolean powered) {
-            public void execute(Location location, Openable blockData, LoaderOpenable parent, int power, long ticks, Consumer<Long> delay) {
+            SWItem swItem;
+            if (noop) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName(name, "LOADER_INTERACTION_NOOP", player));
+            } else if (interact) {
+                swItem = new SWItem(Material.STICK, translateItemName(name, "LOADER_INTERACTION_INTERACT", player));
+            } else {
+                swItem = new SWItem(material, translateItemName(name, open ? "LOADER_INTERACTION_OPEN" : "LOADER_INTERACTION_CLOSED", player));
             }
-        },
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
 
-        INTERACT {
+        @Override
-            @Override
+        public void execute(Consumer<Long> delay) {
-            public int getPos() {
+            if (location.getBlock().getType() != material) return;
-                return 3;
+            Openable openable = (Openable) location.getBlock().getBlockData();
+            if (noop) {
+                return;
+            } else if (interact) {
+                openable.setOpen(!openable.isOpen());
+            } else {
+                openable.setOpen(open);
             }
+            location.getBlock().setBlockData(openable);
+        }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderOpenable parent, int power, long ticks) {
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
-                return new SWItem(Material.STICK, translateItemName(parent.name, "LOADER_INTERACTION_INTERACT", player));
+            SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
-            }
+            for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(17, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
 
-            @Override
+            swInventory.setItem(2, item(player, true, false, false).getItemStack(), clickType -> {
-            public void execute(Location location, Openable blockData, LoaderOpenable parent, int power, long ticks, Consumer<Long> delay) {
+                noop = true;
-                blockData.setOpen(!blockData.isOpen());
+                click(player, backAction, deleteAction);
-                parent.update(blockData);
+            });
-            }
+            swInventory.setItem(3, item(player, false, true, false).getItemStack(), clickType -> {
-        },
+                noop = false;
+                interact = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(5, item(player, false, false, false).getItemStack(), clickType -> {
+                noop = false;
+                interact = false;
+                open = false;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(6, item(player, false, false, true).getItemStack(), clickType -> {
+                noop = false;
+                interact = false;
+                open = true;
+                click(player, backAction, deleteAction);
+            });
 
-        CLOSED {
+            swInventory.open();
-            @Override
+        }
-            public int getPos() {
-                return 5;
-            }
 
-            @Override
+        private SWItem item(Player player, boolean noop, boolean interact, boolean open) {
-            public SWItem menu(Player player, LoaderOpenable parent, int power, long ticks) {
+            SWItem swItem = menu(player, noop, interact, open);
-                return new SWItem(parent.material, translateItemName(parent.name, "LOADER_INTERACTION_CLOSED", player));
+            if (swItem.getItemStack().equals(menu(player, this.noop, this.interact, this.open).getItemStack())) {
-            }
+                swItem.setEnchanted(true);
-
-            @Override
-            public void execute(Location location, Openable blockData, LoaderOpenable parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setOpen(false);
-                parent.update(blockData);
-            }
-        },
-
-        OPEN {
-            @Override
-            public int getPos() {
-                return 6;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderOpenable parent, int power, long ticks) {
-                return new SWItem(parent.material, translateItemName(parent.name, "LOADER_INTERACTION_OPEN", player));
-            }
-
-            @Override
-            public void execute(Location location, Openable blockData, LoaderOpenable parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setOpen(true);
-                parent.update(blockData);
             }
+            swItem.setLore(Collections.emptyList());
+            return swItem;
         }
     }
 
@@ -119,7 +130,7 @@ public class LoaderOpenable extends LoaderInteractionElement<LoaderOpenable.Open
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public TrapdoorSettings createNewElement() {
-        return location.getBlock().getType() == material;
+        return new TrapdoorSettings();
     }
 }

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

@@ -20,140 +20,119 @@
 package de.steamwar.bausystem.features.loader.elements.impl;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Repeater;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderRepeater extends LoaderInteractionElement<LoaderRepeater.RepeaterSettingsEnum> {
+public class LoaderRepeater extends LoaderInteractionElement<LoaderRepeater.RepeaterSettings> {
 
     public LoaderRepeater(Location location) {
-        super(location, RepeaterSettingsEnum.INTERACT, RepeaterSettingsEnum.NOOP, RepeaterSettingsEnum.values());
+        super(location);
     }
 
-    public enum RepeaterSettingsEnum implements LoaderSettingsEnum<Repeater, LoaderRepeater, RepeaterSettingsEnum> {
+    public class RepeaterSettings implements ElementSettings {
 
-        NOOP {
+        private boolean interact = false;
-            @Override
+        private int delay = 1;
-            public int getPos() {
+
-                return 1;
+        @Override
+        public SWItem menu(Player player) {
+            return menu(player, interact, delay);
+        }
+
+        private SWItem menu(Player player, boolean interact, int delay) {
+            SWItem swItem;
+            if (interact) {
+                swItem = new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_REPEATER", "LOADER_INTERACTION_INTERACT", player));
+            } else if (delay == 0) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_REPEATER", "LOADER_INTERACTION_NOOP", player));
+            } else {
+                swItem = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_SETTING_REPEATER", player, delay));
+                swItem.getItemStack().setAmount(delay);
             }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
 
-            @Override
+        @Override
-            public SWItem menu(Player player, LoaderRepeater parent, int power, long ticks) {
+        public void execute(Consumer<Long> __) {
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_REPEATER", "LOADER_INTERACTION_NOOP", player));
+            if (location.getBlock().getType() != Material.REPEATER) return;
+            Repeater repeater = (Repeater) location.getBlock().getBlockData();
+            if (interact) {
+                int delay = repeater.getDelay();
+                delay++;
+                if (delay > 4) delay = 1;
+                repeater.setDelay(delay);
+            } else if (delay == 0) {
+                return;
+            } else {
+                repeater.setDelay(delay);
             }
+            location.getBlock().setBlockData(repeater, true);
+        }
 
-            @Override
+        @Override
-            public void execute(Location location, Repeater blockData, LoaderRepeater parent, int power, long ticks, Consumer<Long> delay) {
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
+            SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
+            for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(17, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
 
+            swInventory.setItem(1, item(player, false, 0).getItemStack(), clickType -> {
+                interact = false;
+                delay = 0;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(2, item(player, true, -1).getItemStack(), clickType -> {
+                interact = true;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(4, item(player, false, 1).getItemStack(), clickType -> {
+                interact = false;
+                delay = 1;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(5, item(player, false, 2).getItemStack(), clickType -> {
+                interact = false;
+                delay = 2;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(6, item(player, false, 3).getItemStack(), clickType -> {
+                interact = false;
+                delay = 3;
+                click(player, backAction, deleteAction);
+            });
+            swInventory.setItem(7, item(player, false, 4).getItemStack(), clickType -> {
+                interact = false;
+                delay = 4;
+                click(player, backAction, deleteAction);
+            });
+
+            swInventory.open();
+        }
+
+        private SWItem item(Player player, boolean interact, int delay) {
+            SWItem swItem = menu(player, interact, delay);
+            if (swItem.getItemStack().equals(menu(player, this.interact, this.delay).getItemStack())) {
+                swItem.setEnchanted(true);
             }
-        },
+            swItem.setLore(Collections.emptyList());
+            return swItem;
+        }
 
-        INTERACT {
+        @Override
-            @Override
+        public void playerInteract() {
-            public int getPos() {
+            interact = true;
-                return 2;
+            delay = 0;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderRepeater parent, int power, long ticks) {
-                return new SWItem(Material.STICK, translateItemName("LOADER_BUTTON_REPEATER", "LOADER_INTERACTION_INTERACT", player));
-            }
-
-            @Override
-            public void execute(Location location, Repeater blockData, LoaderRepeater parent, int power, long ticks, Consumer<Long> delay) {
-                int repeaterDelay = blockData.getDelay();
-                repeaterDelay++;
-                if (repeaterDelay > 4) repeaterDelay = 1;
-                blockData.setDelay(repeaterDelay);
-                parent.update(blockData);
-            }
-        },
-
-        DELAY_1 {
-            @Override
-            public int getPos() {
-                return 4;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderRepeater parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_SETTING_REPEATER", player, 1));
-                swItem.getItemStack().setAmount(1);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, Repeater blockData, LoaderRepeater parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setDelay(1);
-                parent.update(blockData);
-            }
-        },
-
-        DELAY_2 {
-            @Override
-            public int getPos() {
-                return 5;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderRepeater parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_SETTING_REPEATER", player, 2));
-                swItem.getItemStack().setAmount(2);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, Repeater blockData, LoaderRepeater parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setDelay(2);
-                parent.update(blockData);
-            }
-        },
-
-        DELAY_3 {
-            @Override
-            public int getPos() {
-                return 6;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderRepeater parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_SETTING_REPEATER", player, 3));
-                swItem.getItemStack().setAmount(3);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, Repeater blockData, LoaderRepeater parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setDelay(3);
-                parent.update(blockData);
-            }
-        },
-
-        DELAY_4 {
-            @Override
-            public int getPos() {
-                return 7;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderRepeater parent, int power, long ticks) {
-                SWItem swItem = new SWItem(Material.REPEATER, BauSystem.MESSAGE.parse("LOADER_SETTING_REPEATER", player, 4));
-                swItem.getItemStack().setAmount(4);
-                return swItem;
-            }
-
-            @Override
-            public void execute(Location location, Repeater blockData, LoaderRepeater parent, int power, long ticks, Consumer<Long> delay) {
-                blockData.setDelay(4);
-                parent.update(blockData);
-            }
         }
     }
 
@@ -163,7 +142,7 @@ public class LoaderRepeater extends LoaderInteractionElement<LoaderRepeater.Repe
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public RepeaterSettings createNewElement() {
-        return location.getBlock().getType() == Material.REPEATER;
+        return new RepeaterSettings();
     }
 }

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

@@ -20,57 +20,23 @@
 package de.steamwar.bausystem.features.loader.elements.impl;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
+import de.steamwar.bausystem.features.loader.elements.LoaderElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
 import de.steamwar.inventory.SWItem;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 
 import java.util.Arrays;
 import java.util.function.Consumer;
 
-public class LoaderTNT extends LoaderInteractionElement<LoaderTNT.TNTSettingsEnum> {
+public class LoaderTNT implements LoaderElement {
+
+    private Location location;
 
     public LoaderTNT(Location location) {
-        super(location, TNTSettingsEnum.PLACE, TNTSettingsEnum.NOOP, TNTSettingsEnum.values());
+        this.location = location;
-    }
-
-    public enum TNTSettingsEnum implements LoaderSettingsEnum<BlockData, LoaderTNT, TNTSettingsEnum> {
-        NOOP {
-            @Override
-            public int getPos() {
-                return 2;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderTNT parent, int power, long ticks) {
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName("LOADER_BUTTON_TNT", "LOADER_INTERACTION_NOOP", player));
-            }
-
-            @Override
-            public void execute(Location location, BlockData blockData, LoaderTNT parent, int power, long ticks, Consumer<Long> delay) {
-            }
-        },
-
-        PLACE {
-            @Override
-            public int getPos() {
-                return 3;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderTNT parent, int power, long ticks) {
-                return new SWItem(Material.TNT, translateItemName("LOADER_BUTTON_TNT", "LOADER_INTERACTION_PLACE", player));
-            }
-
-            @Override
-            public void execute(Location location, BlockData blockData, LoaderTNT parent, int power, long ticks, Consumer<Long> delay) {
-                location.getBlock().setType(Material.TNT);
-            }
-        }
     }
 
     @Override
@@ -88,11 +54,10 @@ public class LoaderTNT extends LoaderInteractionElement<LoaderTNT.TNTSettingsEnu
             return;
         }
 
-        super.execute(delay);
+        block.setType(Material.TNT, true);
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public void click(Player player, Runnable backAction) {
-        return true;
     }
 }

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

@@ -20,87 +20,115 @@
 package de.steamwar.bausystem.features.loader.elements.impl;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.loader.elements.ElementSettings;
 import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
-import de.steamwar.bausystem.features.loader.elements.LoaderSettingsEnum;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.data.Powerable;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Consumer;
 
-public class LoaderTicks extends LoaderInteractionElement<LoaderTicks.TicksSettingsEnum> {
+public class LoaderTicks extends LoaderInteractionElement<LoaderTicks.TicksSettings> {
 
     private String name;
     private Material material;
     private int ticks;
 
     public LoaderTicks(Location location, String name, Material material, int ticks) {
-        super(location, TicksSettingsEnum.NO_WAIT_FOR, TicksSettingsEnum.NOOP, TicksSettingsEnum.values());
+        super(location);
         this.name = name;
         this.material = material;
         this.ticks = ticks;
     }
 
-    public enum TicksSettingsEnum implements LoaderSettingsEnum<Powerable, LoaderTicks, TicksSettingsEnum> {
+    public class TicksSettings implements ElementSettings {
 
-        NOOP {
+        private boolean noop = false;
-            @Override
+        private boolean waitFor = false;
-            public int getPos() {
+
-                return 2;
+        @Override
+        public SWItem menu(Player player) {
+            return menu(player, noop, waitFor);
+        }
+
+        private SWItem menu(Player player, boolean noop, boolean waitFor) {
+            SWItem swItem;
+            if (noop) {
+                swItem = new SWItem(Material.STRUCTURE_VOID, translateItemName(name, "LOADER_INTERACTION_NOOP", player));
+            } else if (waitFor) {
+                swItem = new SWItem(material, translateItemName(name, "LOADER_INTERACTION_WAIT_FOR", player, ticks));
+            } else {
+                swItem = new SWItem(material, translateItemName(name, "LOADER_INTERACTION_NO_WAIT_FOR", player, ticks));
+                swItem.setEnchanted(true);
+            }
+            swItem.setLore(Arrays.asList(BauSystem.MESSAGE.parse("LOADER_GUI_CLICK_TO_EDIT", player)));
+            return swItem;
+        }
+
+        @Override
+        public void execute(Consumer<Long> delay) {
+            if (location.getBlock().getType() != material) {
+                return;
+            }
+            if (noop) {
+                return;
             }
 
-            @Override
+            Powerable powerable = (Powerable) location.getBlock().getBlockData();
-            public SWItem menu(Player player, LoaderTicks parent, int power, long ticks) {
+            powerable.setPowered(true);
-                return new SWItem(Material.STRUCTURE_VOID, translateItemName(parent.name, "LOADER_INTERACTION_NOOP", player));
+            location.getBlock().setBlockData(powerable, true);
+            update(powerable);
+
+            if (waitFor) {
+                delay.accept((long) ticks);
+            }
+            BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
+                powerable.setPowered(false);
+                location.getBlock().setBlockData(powerable, true);
+                update(powerable);
+            }, ticks);
+        }
+
+        @Override
+        public void click(Player player, Runnable backAction, Runnable deleteAction) {
+            SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
+            for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
+            swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> backAction.run());
+            swInventory.setItem(17, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_DELETE", player)).getItemStack(), clickType -> deleteAction.run());
+
+            swInventory.setItem(2, item(player, true, false).getItemStack(), clickType -> {
+                noop = true;
+                click(player, backAction, deleteAction);
+            });
+            if (ticks >= 0) {
+                swInventory.setItem(5, item(player, false, false).getItemStack(), clickType -> {
+                    noop = false;
+                    waitFor = false;
+                    click(player, backAction, deleteAction);
+                });
+                swInventory.setItem(6, item(player, false, true).getItemStack(), clickType -> {
+                    noop = false;
+                    waitFor = true;
+                    click(player, backAction, deleteAction);
+                });
             }
 
-            @Override
+            swInventory.open();
-            public void execute(Location location, Powerable blockData, LoaderTicks parent, int power, long ticks, Consumer<Long> delay) {
+        }
-            }
-        },
 
-        NO_WAIT_FOR {
+        private SWItem item(Player player, boolean noop, boolean waitFor) {
-            @Override
+            SWItem swItem = menu(player, noop, waitFor);
-            public int getPos() {
+            if (swItem.getItemStack().equals(menu(player, this.noop, this.waitFor).getItemStack())) {
-                return 5;
+                swItem.setEnchanted(true);
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderTicks parent, int power, long ticks) {
-                return new SWItem(parent.material, translateItemName(parent.name, "LOADER_INTERACTION_NO_WAIT_FOR", player, ticks));
-            }
-
-            @Override
-            public void execute(Location location, Powerable blockData, LoaderTicks parent, int power, long ticks, Consumer<Long> delay) {
-                Powerable powerable = (Powerable) location.getBlock().getBlockData();
-                powerable.setPowered(true);
-                parent.update(powerable);
-
-                BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
-                    powerable.setPowered(false);
-                    parent.update(powerable);
-                }, parent.ticks);
-            }
-        },
-
-        WAIT_FOR {
-            @Override
-            public int getPos() {
-                return 6;
-            }
-
-            @Override
-            public SWItem menu(Player player, LoaderTicks parent, int power, long ticks) {
-                return new SWItem(parent.material, translateItemName(parent.name, "LOADER_INTERACTION_WAIT_FOR", player, ticks));
-            }
-
-            @Override
-            public void execute(Location location, Powerable blockData, LoaderTicks parent, int power, long ticks, Consumer<Long> delay) {
-                NO_WAIT_FOR.execute(location, blockData, parent, power, ticks, delay);
-                delay.accept((long) parent.ticks);
             }
+            swItem.setLore(Collections.emptyList());
+            return swItem;
         }
     }
 
@@ -110,7 +138,7 @@ public class LoaderTicks extends LoaderInteractionElement<LoaderTicks.TicksSetti
     }
 
     @Override
-    public boolean checkBlockInWorld() {
+    public TicksSettings createNewElement() {
-        return location.getBlock().getType() == material;
+        return new TicksSettings();
     }
 }

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

@@ -26,13 +26,15 @@ import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import lombok.Getter;
 import lombok.Setter;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
 
 import java.util.Arrays;
 import java.util.function.Consumer;
 
-public class LoaderWait implements LoaderElement {
+public class LoaderWait implements LoaderElement, Listener {
 
     @Getter
     @Setter
@@ -52,8 +54,8 @@ public class LoaderWait implements LoaderElement {
     }
 
     @Override
-    public void execute(Consumer<Long> wait) {
+    public void execute(Consumer<Long> __) {
-        wait.accept(delay);
+        __.accept(delay);
     }
 
     @Override

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/redstonetester/RedstoneTesterGuiItem.java

@@ -0,0 +1,62 @@
+/*
+ * 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.redstonetester;
+
+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 java.util.Arrays;
+
+@Linked
+public class RedstoneTesterGuiItem extends BauGuiItem {
+
+    public RedstoneTesterGuiItem() {
+        super(23);
+    }
+
+    @Override
+    public ItemStack getItem(Player player) {
+        return new SWItem(Material.REPEATER,
+                BauSystem.MESSAGE.parse("RT_ITEM_NAME", player),
+                Arrays.asList(BauSystem.MESSAGE.parse("RT_ITEM_LORE_1", player),
+                        BauSystem.MESSAGE.parse("RT_ITEM_LORE_2", player),
+                        BauSystem.MESSAGE.parse("RT_ITEM_LORE_3", player))
+                , false, null).getItemStack();
+    }
+
+    @Override
+    public boolean click(ClickType click, Player p) {
+        p.closeInventory();
+        p.performCommand("redstonetester");
+        return false;
+    }
+
+    @Override
+    public Permission permission() {
+        return Permission.MEMBER;
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/redstonetester/RedstonetesterCommand.java

@@ -0,0 +1,40 @@
+/*
+ * 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.redstonetester;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.SWUtils;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+@Linked
+public class RedstonetesterCommand extends SWCommand {
+
+	public RedstonetesterCommand() {
+		super("redstonetester", "rt");
+	}
+
+	@Register(description = "RT_HELP")
+	public void genericCommand(Player p) {
+		BauSystem.MESSAGE.send("RT_GIVEN", p);
+		SWUtils.giveItemToPlayer(p, RedstonetesterUtils.getWand(p));
+	}
+}

BauSystem_Main/src/de/steamwar/bausystem/features/redstonetester/RedstonetesterUtils.java

@@ -0,0 +1,108 @@
+/*
+ * 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.redstonetester;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.tpslimit.TPSUtils;
+import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.inventory.SWItem;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Powerable;
+import org.bukkit.block.data.type.Piston;
+import org.bukkit.block.data.type.RedstoneWire;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@UtilityClass
+public class RedstonetesterUtils {
+
+	public static ItemStack getWand(Player player) {
+		ItemStack i = new SWItem(Material.BLAZE_ROD,
+				BauSystem.MESSAGE.parse("RT_ITEM_NAME", player),
+				Arrays.asList(BauSystem.MESSAGE.parse("RT_ITEM_LORE_1", player),
+						BauSystem.MESSAGE.parse("RT_ITEM_LORE_2", player),
+						BauSystem.MESSAGE.parse("RT_ITEM_LORE_3", player)),
+				false, null).getItemStack();
+		ItemUtils.setItem(i, "redstonetester");
+		return i;
+	}
+
+	@Getter
+	private final Map<Player, RedstoneTester> playerMap = new HashMap<>();
+
+	public void sendLocation(Player player, String prefix, Location location) {
+		BauSystem.MESSAGE.send("RT_LOC", player, location.getBlockX(), location.getBlockY(), location.getBlockZ());
+	}
+
+	@SuppressWarnings("BooleanMethodIsAlwaysInverted")
+	public boolean validBlock(Player player, BlockData block) {
+		if (block instanceof Powerable) return true;
+		if (block instanceof Piston) return true;
+		if (block instanceof RedstoneWire) return true;
+		BauSystem.MESSAGE.send("RT_INVALID_LOC", player);
+		return false;
+	}
+
+	@Getter
+	@Setter
+	public static class RedstoneTester {
+
+		private final Player player;
+		private Location loc1 = null;
+		private Location loc2 = null;
+
+		private long lastTick = 0;
+		private Long tick = null;
+
+		public RedstoneTester(Player player) {
+			this.player = player;
+		}
+
+		public void activate(Location location) {
+			if (loc1 == null || loc2 == null) {
+				tick = null;
+				return;
+			}
+			if (TPSUtils.currentRealTick.get() - lastTick > 100) {
+				tick = null;
+			}
+			if (loc1.equals(location)) {
+				lastTick = TPSUtils.currentRealTick.get();
+				if (tick == null) {
+					tick = TPSUtils.currentRealTick.get();
+				}
+				return;
+			}
+			if (tick != null && loc2.equals(location)) {
+				BauSystem.MESSAGE.send("RT_RESULT", player, (TPSUtils.currentRealTick.get() - tick), ((TPSUtils.currentRealTick.get() - tick) / 2.0));
+			}
+		}
+
+	}
+}

BauSystem_Main/src/de/steamwar/bausystem/features/redstonetester/RestonetesterListener.java

@@ -0,0 +1,94 @@
+/*
+ * 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.redstonetester;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.linkage.Linked;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockDispenseEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.Objects;
+
+@Linked
+public class RestonetesterListener implements Listener {
+
+	@EventHandler
+	public void onPlayerInteract(PlayerInteractEvent event) {
+		if (!ItemUtils.isItem(event.getItem(), "redstonetester")) return;
+		Player player = event.getPlayer();
+		Block block = event.getClickedBlock();
+		event.setCancelled(true);
+
+		switch (event.getAction()) {
+			case RIGHT_CLICK_AIR:
+				if (player.isSneaking()) {
+					RedstonetesterUtils.getPlayerMap().remove(event.getPlayer());
+					BauSystem.MESSAGE.send("RT_ACTIVATE", player);
+				}
+				break;
+			case LEFT_CLICK_BLOCK:
+				if (!RedstonetesterUtils.validBlock(event.getPlayer(), Objects.requireNonNull(block).getBlockData())) return;
+				RedstonetesterUtils.getPlayerMap().computeIfAbsent(event.getPlayer(), RedstonetesterUtils.RedstoneTester::new).setLoc1(block.getLocation());
+				RedstonetesterUtils.sendLocation(event.getPlayer(), "POS1", block.getLocation());
+				break;
+			case RIGHT_CLICK_BLOCK:
+				if (!RedstonetesterUtils.validBlock(event.getPlayer(), Objects.requireNonNull(block).getBlockData())) return;
+				RedstonetesterUtils.getPlayerMap().computeIfAbsent(event.getPlayer(), RedstonetesterUtils.RedstoneTester::new).setLoc2(block.getLocation());
+				RedstonetesterUtils.sendLocation(event.getPlayer(), "POS2", block.getLocation());
+				break;
+			default:
+				break;
+		}
+	}
+
+	@EventHandler
+	public void onPlayerQuit(PlayerQuitEvent event) {
+		RedstonetesterUtils.getPlayerMap().remove(event.getPlayer());
+	}
+
+	@EventHandler
+	public void onPistonExtend(BlockPistonExtendEvent e) {
+		RedstonetesterUtils.getPlayerMap().forEach((player, redstoneTester) -> redstoneTester.activate(e.getBlock().getLocation()));
+	}
+
+	@EventHandler
+	public void onPistonRetract(BlockPistonRetractEvent e) {
+		RedstonetesterUtils.getPlayerMap().forEach((player, redstoneTester) -> redstoneTester.activate(e.getBlock().getLocation()));
+	}
+
+	@EventHandler
+	public void onRedstoneEvent(BlockRedstoneEvent e) {
+		RedstonetesterUtils.getPlayerMap().forEach((player, redstoneTester) -> redstoneTester.activate(e.getBlock().getLocation()));
+	}
+
+	@EventHandler
+	public void onBlockDispense(BlockDispenseEvent e) {
+		RedstonetesterUtils.getPlayerMap().forEach((player, redstoneTester) -> redstoneTester.activate(e.getBlock().getLocation()));
+	}
+}

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

@@ -27,7 +27,6 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
@@ -65,14 +64,10 @@ public class ColorCommand extends SWCommand {
         }
         region.set(Flag.COLOR, color);
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            region.reset(null, RegionType.NORMAL, RegionExtensionType.NORMAL, true, true);
-                    .ignoreAir(true)
-                    .onlyColors(true)
-                    .color(color.getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_REGION_COLORED");
             RegionUtils.message(region, "REGION_REGION_COLORED_FAILED");
-        } catch (SecurityException e) {
+        } catch (IOException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_COLORED", p);
         }
     }
@@ -85,7 +80,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

@@ -42,6 +42,11 @@ public class ItemsCommand extends SWCommand {
     @Register(description = "REGION_ITEMS_HELP")
     public void toggleCommand(@Validator Player p) {
         Region region = Region.getRegion(p.getLocation());
+        if (region != GlobalRegion.getInstance() && GlobalRegion.getInstance().getPlain(Flag.ITEMS, ItemMode.class) == ItemMode.INACTIVE) {
+            RegionUtils.actionBar(region, "REGION_ITEMS_DISABLED_GLOBAL");
+            return;
+        }
+
         if (toggle(region)) {
             RegionUtils.actionBar(region, getEnableMessage());
         } else {
@@ -49,6 +54,10 @@ public class ItemsCommand extends SWCommand {
         }
     }
 
+    private String getNoPermMessage() {
+        return "REGION_ITEMS_NO_PERMS";
+    }
+
     private String getEnableMessage(){
         return "REGION_ITEMS_ENABLED";
     }
@@ -68,4 +77,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,28 @@
 
 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.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.worlddata.WorldData;
-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 +68,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 +80,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,24 +94,21 @@ 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;
 
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            region.reset(null, RegionType.NORMAL, RegionExtensionType.NORMAL, true, false);
-                    .ignoreAir(true)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
-        } catch (SecurityException e) {
+        } catch (IOException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
             Bukkit.getLogger().log(Level.WARNING, "Failed restore", e);
         }
     }
 
     @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;
 
@@ -132,12 +118,9 @@ public class RegionCommand extends SWCommand {
         }
 
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
+            region.reset(node, RegionType.NORMAL, RegionExtensionType.NORMAL, true);
-                    .ignoreAir(true)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
-        } catch (SecurityException e) {
+        } catch (IOException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
             Bukkit.getLogger().log(Level.WARNING, "Failed restore", e);
         }
@@ -180,7 +163,7 @@ public class RegionCommand extends SWCommand {
             return;
         }
         BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO", p, region.getSkin());
-        String creator = region.getPrototype().getSkinMap().get(region.getSkin()).getCreator();
+        String creator = region.getPrototype().getSkins().get(region.getSkin()).getCreator();
         if (creator != null) {
             BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO_CREATOR", p, creator);
         }
@@ -188,15 +171,16 @@ 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;
         }
-        if (!region.getPrototype().getSkinMap().containsKey(s)) {
+        if (!region.getPrototype().getSkins().containsKey(s)) {
             BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_UNKNOWN", p);
         } else {
             if (region.setSkin(s)) {
+                WorldData.getInstance().save();
                 BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE", p, s);
                 BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE_UPDATE", p, BauSystem.MESSAGE.parse("REGION_REGION_CHANGESKIN_CHANGE_UPDATE_HOVER", p), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/reset"));
             } else {
@@ -205,106 +189,6 @@ public class RegionCommand extends SWCommand {
         }
     }
 
-    @Register(value = "copy", description = "REGION_REGION_HELP_COPY")
-    public void copyCommand(@Validator Player p, @OptionalValue("") @StaticValue(value = {"", "-e", "-s"}, allowISE = true) int option) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-        if (!region.hasType(RegionType.BUILD)) {
-            BauSystem.MESSAGE.send("REGION_REGION_NO_BUILD", p);
-            return;
-        }
-        if (region.getCopyPoint() == null) {
-            BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
-            return;
-        }
-
-        Point minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
-        Point maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
-        switch (option) {
-            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>() {
@@ -315,7 +199,7 @@ public class RegionCommand extends SWCommand {
                 if (region.isGlobal()) {
                     return Collections.emptyList();
                 }
-                return region.getPrototype().getSkinMap().keySet().stream().map(c -> c.replace(' ', '_')).collect(Collectors.toList());
+                return region.getPrototype().getSkins().keySet().stream().map(c -> c.replace(' ', '_')).collect(Collectors.toList());
             }
 
             @Override
@@ -324,4 +208,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

@@ -21,22 +21,14 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
-import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -46,9 +38,6 @@ import java.util.logging.Level;
 @Linked
 public class ResetCommand extends SWCommand {
 
-    @LinkedInstance
-    public BauServer bauServer;
-
     public ResetCommand() {
         super("reset");
     }
@@ -58,11 +47,9 @@ public class ResetCommand extends SWCommand {
         Region region = regionCheck(p);
         if (region == null) return;
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            region.reset(null, RegionType.NORMAL);
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_RESET_RESETED");
-        } catch (SecurityException e) {
+        } catch (IOException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
             Bukkit.getLogger().log(Level.WARNING, "Failed testblock", e);
         }
@@ -72,31 +59,26 @@ public class ResetCommand extends SWCommand {
     public void schematicResetCommand(@Validator Player p, SchematicNode node) {
         Region region = regionCheck(p);
         if (region == null) return;
-
-        if (!p.getUniqueId().equals(bauServer.getOwner())) {
-            if (Punishment.isPunished(SteamwarUser.get(bauServer.getOwner()), Punishment.PunishmentType.NoSchemReceiving, punishment -> BauSystem.MESSAGE.send("REGION_TB_NO_SCHEMRECEIVING", p, punishment.getEndTime()))) {
-                return;
-            }
-            if (Punishment.isPunished(SteamwarUser.get(p.getUniqueId()), Punishment.PunishmentType.NoSchemSharing, punishment -> BauSystem.MESSAGE.send("REGION_TB_NO_SCHEMSHARING", p, punishment.getEndTime()))) {
-                return;
-            }
-        }
-
         if (node.isDir()) {
             BauSystem.MESSAGE.send("ONLY_SCHEMS", p);
             return;
         }
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
+            region.reset(node, RegionType.NORMAL);
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
             RegionUtils.message(region, "REGION_RESET_RESETED");
-        } catch (SecurityException e) {
+        } catch (IOException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
             Bukkit.getLogger().log(Level.WARNING, "Failed reset", e);
         }
     }
 
+    @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()) {