Move a lot more logic into component

.gitea/workflows/build.yml

@@ -51,7 +51,6 @@ jobs:
           rm -rf deploy
           mkdir -p deploy
 
-          cp "AccessWidener/build/libs/AccessWidener-all.jar" "deploy/AccessWidener.jar"
           cp "BauSystem/build/libs/BauSystem-all.jar" "deploy/BauSystem.jar"
           cp "FightSystem/build/libs/FightSystem-all.jar" "deploy/FightSystem.jar"
           cp "KotlinCore/build/libs/KotlinCore-all.jar" "deploy/KotlinCore.jar"

.gitignore

@@ -15,11 +15,6 @@ bin/
 .vscode
 .settings
 
-# Language Server
-**/.project
-**/.factorypath
-**/.classpath
-
 # Other
 lib
 /WebsiteBackend/data

AccessWidener/build.gradle.kts

@@ -1,45 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-plugins {
-    `java-library`
-    alias(libs.plugins.shadow)
-}
-
-dependencies {
-    implementation("org.ow2.asm:asm:9.7")
-    implementation("org.ow2.asm:asm-commons:9.7")
-}
-
-tasks.shadowJar {
-    manifest {
-        attributes(
-            "Manifest-Version" to "1.0",
-            "Build-Jdk-Spec" to "21",
-            "Main-Class" to "de.steamwar.Main",
-            "Premain-Class" to "de.steamwar.Agent",
-            "Can-Retransform-Classes" to "true",
-            "Can-Redefine-Classes" to "true",
-        )
-    }
-}
-
-tasks.build {
-    dependsOn(tasks.shadowJar)
-}

AccessWidener/src/main/java/de/steamwar/AccessWidenerEntry.java

@@ -1,49 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-/**
- * A single parsed line from a .accesswidener file.
- * <p>
- * Examples:
- * accessible class  net/minecraft/server/level/ServerPlayer
- * accessible method net/minecraft/server/level/ServerPlayer getStats ()V
- * mutable    field  net/minecraft/world/entity/Entity id I
- * extendable class  net/minecraft/world/level/chunk/LevelChunk
- */
-public record AccessWidenerEntry(
-        /** accessible | mutable | extendable (may have "transitive-" prefix) */
-        String directive,
-        /** class | method | field */
-        String memberType,
-        /** Internal class name, e.g. net/minecraft/server/level/ServerPlayer */
-        String target,
-        /** Method/field name, null for class entries */
-        String name,
-        /** Descriptor, null for class entries */
-        String descriptor) {
-    /**
-     * Returns true if this entry targets the class with the given internal name.
-     */
-    public boolean targets(String internalName) {
-        return target.equals(internalName);
-    }
-}
-

AccessWidener/src/main/java/de/steamwar/AccessWidenerParser.java

@@ -1,104 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Parses Fabric-compatible .accesswidener files.
- * <p>
- * Supported format:
- * <pre>
- *   accessWidener v2 named
- *
- *   # comments are supported
- *   accessible class  net/minecraft/Foo
- *   accessible method net/minecraft/Foo someMethod ()V
- *   accessible field  net/minecraft/Foo someField I
- *   mutable    field  net/minecraft/Foo someField I
- *   extendable class  net/minecraft/Foo
- *   extendable method net/minecraft/Foo someMethod ()V
- *
- *   # transitive variants (expose widening to dependents)
- *   transitive-accessible class net/minecraft/Foo
- * </pre>
- */
-public final class AccessWidenerParser {
-
-    private AccessWidenerParser() {
-    }
-
-    public static List<AccessWidenerEntry> parse(InputStream in) throws IOException {
-        List<AccessWidenerEntry> entries = new ArrayList<>();
-
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
-
-            String line;
-            boolean headerSeen = false;
-
-            while ((line = reader.readLine()) != null) {
-                // Strip inline comments
-                int commentIdx = line.indexOf('#');
-                if (commentIdx >= 0) line = line.substring(0, commentIdx);
-                line = line.strip();
-
-                if (line.isEmpty()) continue;
-
-                if (!headerSeen) {
-                    // First non-blank, non-comment line must be the header
-                    if (!line.startsWith("accessWidener")) {
-                        throw new IOException("Missing accessWidener header, got: " + line);
-                    }
-                    headerSeen = true;
-                    continue;
-                }
-
-                AccessWidenerEntry entry = parseLine(line);
-                if (entry != null) entries.add(entry);
-            }
-        }
-
-        return entries;
-    }
-
-    private static AccessWidenerEntry parseLine(String line) {
-        String[] parts = line.split("\\s+");
-        if (parts.length < 3) return null;
-
-        String directive = parts[0]; // accessible / mutable / extendable / transitive-*
-        String memberType = parts[1]; // class / method / field
-        String target = parts[2]; // internal class name
-
-        return switch (memberType) {
-            case "class" -> new AccessWidenerEntry(directive, "class", target, null, null);
-            case "method", "field" -> {
-                if (parts.length < 5) yield null;
-                yield new AccessWidenerEntry(directive, memberType, target, parts[3], parts[4]);
-            }
-            default -> null;
-        };
-    }
-}

AccessWidener/src/main/java/de/steamwar/Agent.java

@@ -1,75 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.instrument.Instrumentation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- * Java agent entry point.
- * <p>
- * At JVM startup:  java -javaagent:paper-access-widener-agent.jar -jar server.jar
- * <p>
- * On attach the agent:
- * <ol>
- *     <li>Find all .jar files inside the plugins folder</li>
- *     <li>Scan all found jars for *.accesswidener resources</li>
- *     <li>Transform any class during loading</li>
- * </ol>
- */
-public class Agent {
-    private Agent() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    private static final Logger LOG = Logger.getLogger("AccessWidenerAgent");
-
-    // -javaagent: startup
-    public static void premain(String args, Instrumentation inst) {
-        init(inst);
-    }
-
-    private static void init(Instrumentation inst) {
-        LOG.info("[AccessWidener] Agent initialising.");
-
-        List<AccessWidenerEntry> entries = new ArrayList<>();
-        File file = new File(new File(".").getAbsoluteFile(), "plugins/");
-        File[] files = file.listFiles();
-        if (files == null) files = new File[0];
-        for (File jarFile : files) {
-            if (!jarFile.isFile()) continue;
-            if (!jarFile.getName().endsWith(".jar")) continue;
-            try {
-                entries.addAll(Utils.findAndParseAccessWideners(jarFile.toPath()));
-            } catch (IOException e) {
-                LOG.warning("Failed to parse access wideners from " + jarFile.getAbsolutePath());
-            }
-        }
-        LOG.info("[AccessWidener] Loaded " + entries.size() + " access wideners.");
-
-        inst.addTransformer(new WideningTransformer(entries), false);
-        LOG.info("[AccessWidener] Agent ready.");
-    }
-}
-

AccessWidener/src/main/java/de/steamwar/ClassPatcher.java

@@ -1,83 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Uses ASM to patch class bytecode according to a list of access widener entries.
- *
- * Returns {@code null} if the class is not targeted by any entry (no-op signal
- * to the caller so it can skip the write).
- */
-public class ClassPatcher {
-
-    private static final Logger LOG = Logger.getLogger("ClassPatcher");
-
-    private final List<AccessWidenerEntry> entries;
-
-    /** Pre-computed set of targeted internal names for fast filtering. */
-    private final Set<String> targets;
-
-    private final Set<String> targetsPublicConstructor;
-
-    public ClassPatcher(List<AccessWidenerEntry> entries) {
-        this.entries = entries;
-        this.targets = entries.stream()
-                .map(AccessWidenerEntry::target)
-                .flatMap(s -> {
-                    if (!s.contains("$")) return Stream.of(s);
-                    int index = s.lastIndexOf('$');
-                    return Stream.of(s, s.substring(0, index));
-                })
-                .collect(Collectors.toSet());
-        this.targetsPublicConstructor = entries.stream()
-                .filter(entry -> entry.directive().equals("transitive-extendable"))
-                .map(AccessWidenerEntry::target)
-                .collect(Collectors.toSet());
-    }
-
-    /**
-     * Patches {@code classBytes} if {@code className} is targeted.
-     *
-     * @return patched bytes, or {@code null} if no changes were needed
-     */
-    public byte[] patch(String className, byte[] classBytes) {
-        if (!targets.contains(className)) return null;
-
-        try {
-            ClassReader cr = new ClassReader(classBytes);
-            ClassWriter cw = new ClassWriter(cr, 0);
-            cr.accept(new ClassTransformer(cw, className, entries, targetsPublicConstructor.contains(className)), ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
-            return cw.toByteArray();
-        } catch (Exception e) {
-            LOG.warning("[AccessWidener] Failed to transform " + className + ": " + e.getMessage());
-            return null;
-        }
-    }
-}
-

AccessWidener/src/main/java/de/steamwar/ClassTransformer.java

@@ -1,125 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import java.util.List;
-
-public class ClassTransformer extends ClassVisitor {
-
-    private final String internalName;
-    private final List<AccessWidenerEntry> entries;
-    private final boolean appendPublicConstructor;
-
-    public ClassTransformer(ClassVisitor cv, String internalName, List<AccessWidenerEntry> entries, boolean appendPublicConstructor) {
-        super(Opcodes.ASM9, cv);
-        this.internalName = internalName;
-        this.entries = entries;
-        this.appendPublicConstructor = appendPublicConstructor;
-    }
-
-    @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        int newAccess = access;
-        for (AccessWidenerEntry e : entries) {
-            if (!e.targets(internalName) || !"class".equals(e.memberType())) continue;
-            newAccess = applyDirective(e.directive(), newAccess, false);
-        }
-        if (appendPublicConstructor) {
-            MethodVisitor methodVisitor = visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
-            methodVisitor.visitCode();
-            methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
-            methodVisitor.visitMethodInsn(
-                    Opcodes.INVOKESPECIAL,
-                    "java/lang/Object",
-                    "<init>",
-                    "()V",
-                    false
-            );
-            methodVisitor.visitInsn(Opcodes.RETURN);
-            methodVisitor.visitMaxs(1, 1);
-            methodVisitor.visitEnd();
-        }
-        super.visit(version, newAccess, name, signature, superName, interfaces);
-    }
-
-    @Override
-    public void visitInnerClass(String name, String outerName, String innerName, int access) {
-        int newAccess = access;
-        for (AccessWidenerEntry e : entries) {
-            if (!e.target().equals(name) || !"class".equals(e.memberType())) continue;
-            newAccess = applyDirective(e.directive(), newAccess, false);
-        }
-        super.visitInnerClass(name, outerName, innerName, newAccess);
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-        int newAccess = access;
-        for (AccessWidenerEntry e : entries) {
-            if (!e.targets(internalName) || !"method".equals(e.memberType())) continue;
-            if (!name.equals(e.name()) || !descriptor.equals(e.descriptor())) continue;
-            newAccess = applyDirective(e.directive(), newAccess, false);
-        }
-        return super.visitMethod(newAccess, name, descriptor, signature, exceptions);
-    }
-
-    @Override
-    public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
-        int newAccess = access;
-        for (AccessWidenerEntry e : entries) {
-            if (!e.targets(internalName) || !"field".equals(e.memberType())) continue;
-            if (!name.equals(e.name())) continue;
-            newAccess = applyDirective(e.directive(), newAccess, true);
-        }
-        return super.visitField(newAccess, name, descriptor, signature, value);
-    }
-
-    /**
-     * Apply a directive to an access bitmask.
-     *
-     * @param directive accessible / mutable / extendable (with optional "transitive-" prefix)
-     * @param access    current access flags
-     * @param isField   true when processing a field (mutable removes final)
-     */
-    private static int applyDirective(String directive, int access, boolean isField) {
-        // Strip transitive- prefix — the widening itself is the same
-        String effective = directive.startsWith("transitive-") ? directive.substring("transitive-".length()) : directive;
-
-        return switch (effective) {
-            case "accessible" -> makePublic(access);
-            case "extendable" -> makePublic(removeFinal(access));
-            case "mutable" -> isField ? removeFinal(access) : access;
-            default -> access;
-        };
-    }
-
-    private static int makePublic(int access) {
-        return (access & ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) | Opcodes.ACC_PUBLIC;
-    }
-
-    private static int removeFinal(int access) {
-        return access & ~Opcodes.ACC_FINAL;
-    }
-}

AccessWidener/src/main/java/de/steamwar/Main.java

@@ -1,125 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.*;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Command-line tool that produces a widened copy of a JAR for use as a
- * compile-time stub in IntelliJ / Gradle.
- *
- * Usage:
- *   java -jar jar-widener.jar <input.jar> <output.jar> [file.accesswidener ...]
- *
- * The output JAR is identical to the input JAR except that every class
- * targeted by the access widener entries has its access flags patched:
- *   accessible  → public
- *   extendable  → public + non-final
- *   mutable     → non-final field
- *
- * Intended for use as a Gradle task so IntelliJ sees the already-widened
- * class when you Ctrl+click NMS code, and javac compiles without complaints.
- */
-public class Main {
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 2) {
-            System.err.println("Usage: jar-widener <input.jar> <output.jar> [*.accesswidener ...]");
-            System.exit(1);
-        }
-
-        Path inputJar  = Path.of(args[0]);
-        Path outputJar = Path.of(args[1]);
-
-        if (!Files.exists(inputJar)) {
-            System.err.println("Input JAR not found: " + inputJar);
-            System.exit(1);
-        }
-
-        // --- Collect all access widener entries ---
-        List<AccessWidenerEntry> entries = new ArrayList<>();
-
-        if (args.length > 2) {
-            for (int i = 2; i < args.length; i++) {
-                Path awFile = Path.of(args[i]);
-                if (!Files.exists(awFile)) {
-                    System.err.println("Warning: access widener file not found, skipping: " + awFile);
-                    continue;
-                }
-                try (InputStream in = Files.newInputStream(awFile)) {
-                    List<AccessWidenerEntry> parsed = AccessWidenerParser.parse(in);
-                    System.out.println("Loaded " + parsed.size() + " entries from " + awFile.getFileName());
-                    entries.addAll(parsed);
-                }
-            }
-        }
-
-        if (entries.isEmpty()) {
-            System.out.println("No access widener entries found — copying JAR unchanged.");
-            Files.createDirectories(outputJar.getParent());
-            Files.copy(inputJar, outputJar, StandardCopyOption.REPLACE_EXISTING);
-            return;
-        }
-
-        System.out.println("Widening " + inputJar.getFileName()
-                + " with " + entries.size() + " total entr"
-                + (entries.size() == 1 ? "y" : "ies") + "...");
-
-        // --- Copy input → output, transforming .class files in place ---
-        Files.createDirectories(outputJar.getParent());
-        Files.copy(inputJar, outputJar, StandardCopyOption.REPLACE_EXISTING);
-
-        ClassPatcher patcher = new ClassPatcher(entries);
-
-        try (FileSystem fs = FileSystems.newFileSystem(outputJar)) {
-            // Walk every .class entry in the JAR
-            try (var stream = Files.walk(fs.getPath("/"))) {
-                stream.filter(p -> p.toString().endsWith(".class"))
-                        .forEach(classPath -> patchClass(fs, classPath, patcher));
-            }
-        }
-
-        System.out.println("Done. Widened JAR written to " + outputJar);
-    }
-
-    private static void patchClass(FileSystem fs, Path classPath, ClassPatcher patcher) {
-        // Derive internal class name from path  e.g. /net/minecraft/Foo.class → net/minecraft/Foo
-        String internalName = classPath.toString()
-                .replaceFirst("^/", "")
-                .replace(".class", "");
-
-        try {
-            byte[] original = Files.readAllBytes(classPath);
-            byte[] patched  = patcher.patch(internalName, original);
-
-            if (patched != null) {
-                Files.write(classPath, patched);
-                System.out.println("  Widened: " + internalName);
-            }
-        } catch (IOException e) {
-            System.err.println("  Warning: failed to patch " + internalName + ": " + e.getMessage());
-        }
-    }
-}
-

AccessWidener/src/main/java/de/steamwar/Utils.java

@@ -1,60 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class Utils {
-
-    private static final Logger LOG = Logger.getLogger("AccessWidenerAgent");
-
-    private Utils() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    public static List<AccessWidenerEntry> findAndParseAccessWideners(Path jarPath) throws IOException {
-        List<AccessWidenerEntry> results = new ArrayList<>();
-
-        try (ZipFile zip = new ZipFile(jarPath.toFile())) {
-            Enumeration<? extends ZipEntry> entries = zip.entries();
-            while (entries.hasMoreElements()) {
-                ZipEntry entry = entries.nextElement();
-                if (entry.isDirectory() || !entry.getName().endsWith(".accesswidener")) continue;
-
-                try (InputStream in = zip.getInputStream(entry)) {
-                    results.addAll(AccessWidenerParser.parse(in));
-                } catch (IOException e) {
-                    LOG.warning("[AccessWidener] Failed to parse " + entry.getName()
-                            + " in " + jarPath.getFileName() + ": " + e.getMessage());
-                }
-            }
-        }
-
-        return results;
-    }
-}

AccessWidener/src/main/java/de/steamwar/WideningTransformer.java

@@ -1,44 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.security.ProtectionDomain;
-import java.util.List;
-
-/**
- * Transforms class bytecode to apply access widening rules.
- * <p>
- * Also monitors for new plugin ClassLoaders appearing (when plugins load after
- * the agent attaches) and automatically picks up their .accesswidener files.
- */
-public class WideningTransformer implements ClassFileTransformer {
-
-    private final ClassPatcher patcher;
-
-    public WideningTransformer(List<AccessWidenerEntry> entries) {
-        patcher = new ClassPatcher(entries);
-    }
-
-    @Override
-    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
-        return patcher.patch(className, classfileBuffer);
-    }
-}

BauSystem/BauSystem_Main/build.gradle.kts

@@ -19,7 +19,6 @@
 
 plugins {
     steamwar.java
-    widener
 }
 
 tasks.compileJava {
@@ -35,7 +34,6 @@ dependencies {
     compileOnly(libs.classindex)
     annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":KotlinCore", "default"))
 
     compileOnly(libs.axiom)
     compileOnly(libs.authlib)
@@ -47,9 +45,5 @@ dependencies {
     compileOnly(libs.netty)
 
     implementation(libs.luaj)
-    // implementation(files("$projectDir/../libs/YAPION-SNAPSHOT.jar"))
+    implementation(files("$projectDir/../libs/YAPION-SNAPSHOT.jar"))
-}
-
-widener {
-    fromCatalog(libs.nms)
 }

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -834,10 +834,6 @@ SKIN_NO_REGION = §7You are not in a region with a changealbe skin
 SKIN_ALREADY_EXISTS = §cThis skin already exists like this
 SKIN_MESSAGE = §7Skin created
 SKIN_MESSAGE_HOVER = §eClick to copy for YoyoNow and send
-# Blast Resistance
-BLASTRESISTANCE_HELP = §8/§eblastresistance §8-§7 Calculate min/max and average blast resistance of current clipboard
-BLASTRESISTANCE_NO_CLIPBOARD = §cYou currently do not have a clipboard to be used.
-BLASTRESISTANCE_RESULT = §7BlastResistance §8>>§7 Min§8: §e{0}§7   Max§8: §e{1}§7   Avg§8: §e{2}
 # Panzern
 PANZERN_HELP = §8/§epanzern §8[§7Block§8] §8[§7Slab§8] §8- §7Armor your WorldEdit selection
 PANZERN_PREPARE1 = §71. Check, if barrels reach until border of armor.

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -772,10 +772,6 @@ SKIN_NO_REGION = §7Du steht in keiner Region, welche mit einem Skin versehen we
 SKIN_ALREADY_EXISTS = §cDieser Skin existiert in der Form bereits
 SKIN_MESSAGE = §7Skin erstellt
 SKIN_MESSAGE_HOVER = §eKlicken zum kopieren für YoyoNow und an diesen senden
-# Blast Resistance
-BLASTRESISTANCE_HELP = §8/§eblastresistance §8-§7 Minimal-, Maximal- und durchschnittliche Sprengfestigkeit des aktuellen Inhalts der Zwischenablage berechnen
-BLASTRESISTANCE_NO_CLIPBOARD = §cDerzeit steht Ihnen keine Zwischenablage zur Verfügung.
-BLASTRESISTANCE_RESULT = §7BlastResistance §8>>§7 Min§8: §e{0}§7   Max§8: §e{1}§7   Avg§8: §e{2}
 # Panzern
 PANZERN_HELP = §8/§epanzern §8[§7Block§8] §8[§7Slab§8] §8- §7Panzer deine WorldEdit Auswahl
 PANZERN_PREPARE1 = §71. Gucke nochmal nach, ob Läufe auch bis zur Panzergrenze führen.

BauSystem/BauSystem_Main/src/bausystem.accesswidener

@@ -1,13 +0,0 @@
-accessWidener v2 named
-
-# For NoClipCommand
-accessible field net/minecraft/server/level/ServerPlayerGameMode gameModeForPlayer Lnet/minecraft/world/level/GameType;
-
-# For PlaceItemUtils
-accessible field org/bukkit/craftbukkit/block/CraftBlockState position Lnet/minecraft/core/BlockPos;
-mutable field org/bukkit/craftbukkit/block/CraftBlockState position Lnet/minecraft/core/BlockPos;
-accessible field org/bukkit/craftbukkit/block/CraftBlockState world Lorg/bukkit/craftbukkit/CraftWorld;
-mutable field org/bukkit/craftbukkit/block/CraftBlockState world Lorg/bukkit/craftbukkit/CraftWorld;
-
-# For TickManager
-accessible field net/minecraft/server/ServerTickRateManager remainingSprintTicks J

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

@@ -20,7 +20,8 @@
 package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.config.ConfigStore;
+import de.steamwar.bausystem.configplayer.Config;
+import de.steamwar.bausystem.configplayer.ConfigConverter;
 import de.steamwar.bausystem.features.gui.BauGUI;
 import de.steamwar.bausystem.features.script.lua.SteamWarLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.LuaLib;
@@ -31,17 +32,16 @@ import de.steamwar.bausystem.features.tracer.TraceManager;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.features.world.BauScoreboard;
 import de.steamwar.bausystem.linkage.BauGuiItem;
-import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickManager;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
 import de.steamwar.core.Core;
+import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.core.WorldIdentifier;
-import de.steamwar.core.worldedit.SteamEdit;
-import de.steamwar.core.worldedit.WorldEditRendererCUIEditor;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
@@ -49,7 +49,6 @@ import de.steamwar.providers.BauServerInfo;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
-import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -110,6 +109,9 @@ public class BauSystem extends JavaPlugin implements Listener {
                 if (any instanceof PanzernAlgorithm) {
                     Panzern.add((PanzernAlgorithm) any);
                 }
+                if (any instanceof ConfigConverter) {
+                    Config.addConfigConverter((ConfigConverter) any);
+                }
                 if (any instanceof BoundingBoxLoader) {
                     ((BoundingBoxLoader) any).load();
                 }
@@ -127,19 +129,7 @@ public class BauSystem extends JavaPlugin implements Listener {
         TraceManager.instance.init();
         TraceRecorder.instance.init();
 
-        SteamEdit.init();
+        new WorldEditRendererCUIEditor();
-        SteamEdit.ADJACENT_FILTERS = location -> {
-            Region region = Region.getRegion(location);
-            Region.Area area;
-            if (region.getBuildArea().inRegion(location, true)) {
-                area = region.getBuildArea();
-            } else if (region.getTestblockArea().inRegion(location, true)) {
-                area = region.getTestblockArea();
-            } else {
-                return SteamEdit.AdjacentFilter.ALWAYS;
-            }
-            return (x, y, z) -> area.inRegion(new Location(null, x, y, z), true);
-        };
 
         Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
 
@@ -155,8 +145,9 @@ public class BauSystem extends JavaPlugin implements Listener {
     @Override
     public void onDisable() {
         linker.unlink();
+        WorldData.write();
         RegionSystem.INSTANCE.save();
-        ConfigStore.saveAll();
+        Config.getInstance().saveAll();
     }
 
     private <T extends CommandSender> AbstractValidator<T, ?> validator(Permission permission) {

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

@@ -1,47 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config;
-
-/**
- * Converts a config of one version into the next version, e.g. ConfigV1 to
- * ConfigV2. The converter for the second newest version converts into the
- * current version. Converters are registered in the {@link ConfigStore}
- * of the config.
- *
- * @param <F> the config version to convert from
- * @param <T> the config version to convert to
- */
-public interface ConfigConverter<F extends VersionedConfig, T extends VersionedConfig> {
-
-    /**
-     * @return the version this converter converts from
-     */
-    int version();
-
-    /**
-     * Converts the config to the next version. If anything goes wrong do not
-     * silently exit this method, throw an Exception. The {@link ConfigStore}
-     * will deal with it.
-     *
-     * @param config the config to convert
-     * @return the converted config
-     */
-    T convert(F config);
-}

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

@@ -1,364 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import de.steamwar.sql.UserConfig;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-
-/**
- * Loads, converts and saves a versioned config stored as JSON. Older versions
- * are converted with the registered {@link ConfigConverter}s, legacy formats
- * that are not JSON can be read with {@link #legacy(Predicate, Function)}.
- * <p>
- * A store can be bound to where the config is stored:
- * <ul>
- *     <li>{@link #userConfig(String)}: one config per player in the {@link UserConfig}, use {@link #get(Player)}</li>
- *     <li>{@link #file(File)}: one config in a file, use {@link #get()}</li>
- *     <li>unbound: use {@link #load(File)} and {@link #save(File, VersionedConfig)}</li>
- * </ul>
- *
- * @param <T> the current config version
- */
-public class ConfigStore<T extends VersionedConfig> {
-
-    private static final List<ConfigStore<?>> STORES = new ArrayList<>();
-
-    private final Class<T> type;
-    private final int version;
-    private final Supplier<T> defaultConfig;
-
-    private final Map<Integer, Class<? extends VersionedConfig>> jsonVersions = new HashMap<>();
-    private final Map<Integer, ConfigConverter<?, ?>> converters = new HashMap<>();
-    private final List<LegacyFormat> legacyFormats = new ArrayList<>();
-    private Gson gson = new Gson();
-    private Integer unversionedVersion = null;
-
-    private String userConfigKey = null;
-    private Predicate<T> removeIf = config -> false;
-    private final Map<UUID, T> playerConfigs = new ConcurrentHashMap<>();
-
-    private File file = null;
-    private File legacyFile = null;
-    private Function<String, ? extends VersionedConfig> legacyFileReader = null;
-    private T fileConfig = null;
-
-    private record LegacyFormat(Predicate<String> matches, Function<String, ? extends VersionedConfig> reader) {
-    }
-
-    public ConfigStore(Class<T> type, int version, Supplier<T> defaultConfig) {
-        this.type = type;
-        this.version = version;
-        this.defaultConfig = defaultConfig;
-        jsonVersions.put(version, type);
-        STORES.add(this);
-    }
-
-    public ConfigStore<T> gson(Gson gson) {
-        this.gson = gson;
-        return this;
-    }
-
-    /**
-     * Registers an older config version that is stored as JSON.
-     */
-    public ConfigStore<T> jsonVersion(int version, Class<? extends VersionedConfig> type) {
-        jsonVersions.put(version, type);
-        return this;
-    }
-
-    public ConfigStore<T> converter(ConfigConverter<?, ?> converter) {
-        if (converters.putIfAbsent(converter.version(), converter) != null) {
-            throw new IllegalStateException("Duplicate converter for version " + converter.version() + " of " + type.getSimpleName());
-        }
-        return this;
-    }
-
-    /**
-     * Registers a legacy format that is not JSON, stored strings matching the predicate are read by the reader.
-     */
-    public ConfigStore<T> legacy(Predicate<String> matches, Function<String, ? extends VersionedConfig> reader) {
-        legacyFormats.add(new LegacyFormat(matches, reader));
-        return this;
-    }
-
-    /**
-     * The version of stored JSON without a version field.
-     */
-    public ConfigStore<T> unversioned(int version) {
-        this.unversionedVersion = version;
-        return this;
-    }
-
-    /**
-     * Binds this store to the {@link UserConfig} with the given key, one config per player.
-     */
-    public ConfigStore<T> userConfig(String key) {
-        this.userConfigKey = key;
-        return this;
-    }
-
-    /**
-     * Removes the config from the {@link UserConfig} instead of saving it, if the predicate matches.
-     */
-    public ConfigStore<T> removeIf(Predicate<T> removeIf) {
-        this.removeIf = removeIf;
-        return this;
-    }
-
-    /**
-     * Binds this store to a single file.
-     */
-    public ConfigStore<T> file(File file) {
-        this.file = file;
-        return this;
-    }
-
-    /**
-     * Legacy file to read, if the file of this store does not exist yet.
-     */
-    public ConfigStore<T> legacyFile(File legacyFile, Function<String, ? extends VersionedConfig> reader) {
-        this.legacyFile = legacyFile;
-        this.legacyFileReader = reader;
-        return this;
-    }
-
-    /**
-     * Reads a stored config and converts it to the current version.
-     *
-     * @throws RuntimeException if the config could not be read or converted
-     */
-    public T read(String stored) {
-        for (LegacyFormat legacyFormat : legacyFormats) {
-            if (legacyFormat.matches().test(stored)) {
-                return update(legacyFormat.reader().apply(stored));
-            }
-        }
-
-        JsonObject json = JsonParser.parseString(stored).getAsJsonObject();
-        int storedVersion;
-        if (json.has("version")) {
-            storedVersion = json.get("version").getAsInt();
-        } else if (unversionedVersion != null) {
-            storedVersion = unversionedVersion;
-            json.addProperty("version", storedVersion);
-        } else {
-            throw new IllegalStateException("Missing version of " + type.getSimpleName());
-        }
-        Class<? extends VersionedConfig> storedType = jsonVersions.get(storedVersion);
-        if (storedType == null) {
-            throw new IllegalStateException("Unknown version " + storedVersion + " of " + type.getSimpleName());
-        }
-        return update(gson.fromJson(json, storedType));
-    }
-
-    public String write(T config) {
-        return gson.toJson(config);
-    }
-
-    /**
-     * Converts a config to the current version.
-     */
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public T update(VersionedConfig config) {
-        while (config.getVersion() < version) {
-            ConfigConverter converter = converters.get(config.getVersion());
-            if (converter == null) {
-                throw new IllegalStateException("No converter found for version " + config.getVersion() + " of " + type.getSimpleName());
-            }
-            VersionedConfig converted = converter.convert(config);
-            if (converted.getVersion() <= config.getVersion()) {
-                throw new IllegalStateException("Version did not increase after conversion of version " + config.getVersion() + " of " + type.getSimpleName());
-            }
-            config = converted;
-        }
-        if (!type.isInstance(config)) {
-            throw new IllegalStateException("Version " + config.getVersion() + " is not the current version of " + type.getSimpleName());
-        }
-        return type.cast(config);
-    }
-
-    /**
-     * @return the config stored in the file, or the default config if the file is missing or empty
-     * @throws RuntimeException if the config could not be read or converted
-     */
-    public T load(File file) throws IOException {
-        if (file.length() == 0) {
-            return defaultConfig.get();
-        }
-        return read(Files.readString(file.toPath(), StandardCharsets.UTF_8));
-    }
-
-    public void save(File file, T config) throws IOException {
-        Files.writeString(file.toPath(), write(config), StandardCharsets.UTF_8);
-    }
-
-    /**
-     * Get the config of a player, loads it from the {@link UserConfig} and converts it if necessary.
-     */
-    public T get(Player player) {
-        requireUserConfig();
-        return playerConfigs.computeIfAbsent(player.getUniqueId(), this::loadPlayer);
-    }
-
-    /**
-     * Save the config of a player, this does not unload the config.
-     */
-    public void save(Player player) {
-        requireUserConfig();
-        T config = playerConfigs.get(player.getUniqueId());
-        if (config != null) {
-            savePlayer(player.getUniqueId(), config);
-        }
-    }
-
-    /**
-     * Save and unload the config of a player.
-     */
-    public void unload(Player player) {
-        if (userConfigKey == null) return;
-        T config = playerConfigs.remove(player.getUniqueId());
-        if (config != null) {
-            savePlayer(player.getUniqueId(), config);
-        }
-    }
-
-    private T loadPlayer(UUID uuid) {
-        String stored = UserConfig.getConfig(uuid, userConfigKey);
-        if (stored == null) {
-            return defaultConfig.get();
-        }
-        try {
-            return read(stored);
-        } catch (Exception e) {
-            Bukkit.getLogger().log(Level.SEVERE, "Could not load " + type.getSimpleName() + " of " + uuid, e);
-            return defaultConfig.get();
-        }
-    }
-
-    private void savePlayer(UUID uuid, T config) {
-        if (removeIf.test(config)) {
-            UserConfig.removePlayerConfig(uuid, userConfigKey);
-        } else {
-            UserConfig.updatePlayerConfig(uuid, userConfigKey, write(config));
-        }
-    }
-
-    private void requireUserConfig() {
-        if (userConfigKey == null) {
-            throw new IllegalStateException(type.getSimpleName() + " is not stored in the UserConfig");
-        }
-    }
-
-    /**
-     * Get the config of the file of this store, loads it and converts it if necessary.
-     */
-    public T get() {
-        requireFile();
-        if (fileConfig == null) {
-            fileConfig = loadFile();
-            save();
-        }
-        return fileConfig;
-    }
-
-    /**
-     * Save the config to the file of this store, if it was loaded.
-     */
-    public void save() {
-        requireFile();
-        if (fileConfig == null) return;
-        try {
-            save(file, fileConfig);
-        } catch (IOException e) {
-            Bukkit.getLogger().log(Level.SEVERE, "Could not write " + file, e);
-        }
-    }
-
-    private T loadFile() {
-        try {
-            if (file.length() != 0) {
-                return load(file);
-            }
-            if (legacyFile != null && legacyFile.length() != 0) {
-                return update(legacyFileReader.apply(Files.readString(legacyFile.toPath(), StandardCharsets.UTF_8)));
-            }
-            return defaultConfig.get();
-        } catch (Exception e) {
-            Bukkit.getLogger().log(Level.SEVERE, "Could not load " + file + ", using default " + type.getSimpleName(), e);
-            backupBrokenFile();
-            return defaultConfig.get();
-        }
-    }
-
-    private void backupBrokenFile() {
-        if (file.length() == 0) return;
-        try {
-            Files.copy(file.toPath(), new File(file.getParentFile(), file.getName() + ".broken").toPath(), StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            Bukkit.getLogger().log(Level.SEVERE, "Could not backup broken " + file, e);
-        }
-    }
-
-    private void requireFile() {
-        if (file == null) {
-            throw new IllegalStateException(type.getSimpleName() + " is not bound to a file");
-        }
-    }
-
-    static void unloadAll(Player player) {
-        STORES.forEach(store -> store.unload(player));
-    }
-
-    /**
-     * Saves every loaded config and unloads the configs of the players.
-     */
-    public static void saveAll() {
-        for (ConfigStore<?> store : STORES) {
-            if (store.userConfigKey != null) {
-                store.playerConfigs.forEach((uuid, config) -> saveUnchecked(store, uuid, config));
-                store.playerConfigs.clear();
-            }
-            if (store.file != null) {
-                store.save();
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T extends VersionedConfig> void saveUnchecked(ConfigStore<T> store, UUID uuid, Object config) {
-        store.savePlayer(uuid, (T) config);
-    }
-}

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

@@ -1,45 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config;
-
-import de.steamwar.core.CRIUSleepEvent;
-import de.steamwar.linkage.Linked;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-/**
- * Saves and unloads the configs of the {@link ConfigStore}s bound to the UserConfig
- * when a player quits, configs are loaded on first use.
- */
-@Linked
-public class ConfigStoreListener implements Listener {
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        ConfigStore.unloadAll(event.getPlayer());
-    }
-
-    @EventHandler
-    public void onCRIUSleep(CRIUSleepEvent event) {
-        ConfigStore.saveAll();
-    }
-}

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

@@ -1,29 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config;
-
-/**
- * Common interface of every version of a config stored by a {@link ConfigStore},
- * the current version (e.g. Config) and every older version (ConfigV1, ConfigV2, ...).
- */
-public interface VersionedConfig {
-
-    int getVersion();
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/legacy/YapionItemDeserializer.java

@@ -1,95 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config.legacy;
-
-import lombok.experimental.UtilityClass;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Deserializes {@link ItemStack}s that were serialized by YAPION, read with {@link YapionReader}.
- */
-@UtilityClass
-@Deprecated
-public class YapionItemDeserializer {
-
-    private static final String TYPE_IDENTIFIER = "@type";
-
-    public ItemStack deserializeItem(Object yapion) {
-        if (yapion == null) return null;
-        Object result = deserialize(yapion);
-        if (result instanceof ItemStack itemStack) return itemStack;
-        throw new IllegalArgumentException("Not an ItemStack: " + result);
-    }
-
-    private Object deserialize(Object yapion) {
-        if (yapion instanceof List<?> list) {
-            List<Object> result = new ArrayList<>();
-            list.forEach(o -> result.add(deserialize(o)));
-            return result;
-        }
-        if (yapion instanceof YapionReader.YapionMap map) {
-            Map<Object, Object> result = new LinkedHashMap<>();
-            map.entries().forEach((key, value) -> result.put(deserialize(key), deserialize(value)));
-            return result;
-        }
-        if (yapion instanceof Map<?, ?> object) {
-            return deserializeObject(object);
-        }
-        return yapion;
-    }
-
-    private Object deserializeObject(Map<?, ?> object) {
-        Map<String, Object> data = new LinkedHashMap<>();
-        object.forEach((key, value) -> {
-            if (!TYPE_IDENTIFIER.equals(key)) data.put((String) key, deserialize(value));
-        });
-
-        if (!(object.get(TYPE_IDENTIFIER) instanceof String type)) {
-            return data;
-        }
-
-        Class<?> javaType = javaUtilClass(type);
-        if (javaType != null && Collection.class.isAssignableFrom(javaType)) {
-            return data.getOrDefault("values", new ArrayList<>());
-        }
-        if (javaType != null && Map.class.isAssignableFrom(javaType)) {
-            return data.containsKey("values") ? data.get("values") : data;
-        }
-
-        data.put(ConfigurationSerialization.SERIALIZED_TYPE_KEY, type.equals("org.bukkit.inventory.meta.ItemMeta") ? "ItemMeta" : type);
-        return ConfigurationSerialization.deserializeObject(data);
-    }
-
-    private Class<?> javaUtilClass(String type) {
-        if (!type.startsWith("java.util.")) return null;
-        try {
-            return Class.forName(type);
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/legacy/YapionReader.java

@@ -1,323 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config.legacy;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * Minimal reader for the legacy YAPION format, only used to migrate old data.
- * <p>
- * The result is built from plain java objects:
- * <ul>
- *     <li>YAPION objects {@code {key(value)}} become a {@link LinkedHashMap} of String to value</li>
- *     <li>YAPION arrays {@code [a,b]} become a {@link List}</li>
- *     <li>YAPION maps {@code <(a):(b)>} become a {@link YapionMap}</li>
- *     <li>YAPION values {@code (value)} become null, Boolean, Number or String</li>
- * </ul>
- */
-@Deprecated
-public class YapionReader {
-
-    private static final Pattern INTEGER = Pattern.compile("[-+]?\\d+");
-    private static final Pattern DECIMAL = Pattern.compile("[-+]?(\\d+\\.\\d*|\\.\\d+|\\d+)([eE][-+]?\\d+)?");
-
-    public record YapionMap(Map<Object, Object> entries) {
-    }
-
-    public static Map<String, Object> parse(String yapion) {
-        YapionReader reader = new YapionReader(yapion);
-        reader.skipWhitespace();
-        Map<String, Object> result = reader.readObject();
-        reader.skipWhitespace();
-        if (reader.index != yapion.length()) {
-            throw reader.error("Unexpected trailing content");
-        }
-        return result;
-    }
-
-    public static double getDouble(Map<?, ?> object, String key, double defaultValue) {
-        return object.get(key) instanceof Number value ? value.doubleValue() : defaultValue;
-    }
-
-    public static int getInt(Map<?, ?> object, String key, int defaultValue) {
-        return object.get(key) instanceof Number value ? value.intValue() : defaultValue;
-    }
-
-    public static boolean getBoolean(Map<?, ?> object, String key, boolean defaultValue) {
-        return object.get(key) instanceof Boolean value ? value : defaultValue;
-    }
-
-    public static String getString(Map<?, ?> object, String key, String defaultValue) {
-        return object.get(key) instanceof String value ? value : defaultValue;
-    }
-
-    /**
-     * @return the entries of the array that are YAPION objects
-     */
-    public static List<Map<?, ?>> getObjects(Map<?, ?> object, String key) {
-        List<Map<?, ?>> objects = new ArrayList<>();
-        if (object.get(key) instanceof List<?> array) {
-            array.forEach(o -> {
-                if (o instanceof Map<?, ?> map) objects.add(map);
-            });
-        }
-        return objects;
-    }
-
-    private final String input;
-    private int index = 0;
-
-    private YapionReader(String input) {
-        this.input = input;
-    }
-
-    private Object readAny() {
-        return switch (peek()) {
-            case '{' -> readObject();
-            case '[' -> readArray();
-            case '<' -> readMap();
-            case '(' -> readValue();
-            default -> throw error("Expected '{', '[', '<' or '('");
-        };
-    }
-
-    private Map<String, Object> readObject() {
-        expect('{');
-        Map<String, Object> object = new LinkedHashMap<>();
-        while (true) {
-            skipWhitespace();
-            if (peek() == '}') {
-                index++;
-                return object;
-            }
-            StringBuilder key = new StringBuilder();
-            while (true) {
-                char c = peek();
-                if (c == '(' || c == '{' || c == '[' || c == '<') break;
-                if (c == '}') throw error("Key without value");
-                key.append(readChar());
-            }
-            object.put(key.toString(), readAny());
-        }
-    }
-
-    private List<Object> readArray() {
-        expect('[');
-        List<Object> array = new ArrayList<>();
-        skipWhitespace();
-        if (peek() == ']') {
-            index++;
-            return array;
-        }
-        while (true) {
-            int start = index;
-            skipWhitespace();
-            char c = peek();
-            if (c == '{' || c == '[' || c == '<' || c == '(') {
-                array.add(readAny());
-                skipWhitespace();
-            } else {
-                // Whitespace is part of plain values
-                index = start;
-                StringBuilder value = new StringBuilder();
-                while (peek() != ',' && peek() != ']') {
-                    value.append(readChar());
-                }
-                array.add(typed(value.toString()));
-            }
-            char separator = input.charAt(index++);
-            if (separator == ']') return array;
-            if (separator != ',') throw error("Expected ',' or ']'");
-        }
-    }
-
-    private YapionMap readMap() {
-        expect('<');
-        Map<Object, Object> map = new LinkedHashMap<>();
-        while (true) {
-            skipWhitespace();
-            if (peek() == '>') {
-                index++;
-                return new YapionMap(map);
-            }
-            Object key = readAny();
-            skipWhitespace();
-            expect(':');
-            skipWhitespace();
-            map.put(key, readAny());
-        }
-    }
-
-    /**
-     * YAPION does not escape parentheses in values, balanced parentheses are part of the value.
-     * A backslash only escapes a backslash, a unicode sequence or a control character, otherwise it is kept.
-     */
-    private Object readValue() {
-        expect('(');
-        StringBuilder value = new StringBuilder();
-        int depth = 0;
-        while (true) {
-            char c = peek();
-            if (c == '\\') {
-                value.append(readValueEscape());
-                continue;
-            }
-            index++;
-            if (c == '(') {
-                depth++;
-            } else if (c == ')') {
-                if (depth == 0) break;
-                depth--;
-            }
-            value.append(c);
-        }
-        return typed(value.toString());
-    }
-
-    private String readValueEscape() {
-        index++;
-        if (index >= input.length()) return "\\";
-        char escaped = input.charAt(index);
-        switch (escaped) {
-            case '\\', '(', ')':
-                index++;
-                return String.valueOf(escaped);
-            case 'n':
-                index++;
-                return "\n";
-            case 't':
-                index++;
-                return "\t";
-            case 'r':
-                index++;
-                return "\r";
-            case 'u':
-                if (index + 5 <= input.length() && input.substring(index + 1, index + 5).matches("[0-9a-fA-F]{4}")) {
-                    char unicode = (char) Integer.parseInt(input.substring(index + 1, index + 5), 16);
-                    index += 5;
-                    return String.valueOf(unicode);
-                }
-                return "\\";
-            default:
-                return "\\";
-        }
-    }
-
-    /**
-     * Reads one character of a key or plain array value, resolving backslash escapes.
-     * A backslash that does not escape anything is kept, as the old player config
-     * collapsed escaped backslashes into a single one.
-     */
-    private char readChar() {
-        char c = input.charAt(index++);
-        if (c != '\\') return c;
-        if (index >= input.length()) throw error("Unterminated escape");
-        char escaped = input.charAt(index);
-        switch (escaped) {
-            case 'n':
-                index++;
-                return '\n';
-            case 't':
-                index++;
-                return '\t';
-            case 'r':
-                index++;
-                return '\r';
-            case 'u':
-                if (index + 5 <= input.length() && input.substring(index + 1, index + 5).matches("[0-9a-fA-F]{4}")) {
-                    char unicode = (char) Integer.parseInt(input.substring(index + 1, index + 5), 16);
-                    index += 5;
-                    return unicode;
-                }
-                return '\\';
-            case '\\', ',', ' ', '(', ')', '{', '}', '[', ']', '<', '>', '"', ':', '@':
-                index++;
-                return escaped;
-            default:
-                return '\\';
-        }
-    }
-
-    private static Object typed(String value) {
-        if (value.equals("null")) return null;
-        if (value.equals("true")) return true;
-        if (value.equals("false")) return false;
-        if (value.length() >= 2 && value.startsWith("\"") && value.endsWith("\"")) {
-            return value.substring(1, value.length() - 1);
-        }
-        try {
-            if (INTEGER.matcher(value).matches()) {
-                long l = Long.parseLong(value);
-                if (l >= Integer.MIN_VALUE && l <= Integer.MAX_VALUE) return (int) l;
-                return l;
-            }
-            if (value.length() > 1) {
-                String number = value.substring(0, value.length() - 1);
-                switch (value.charAt(value.length() - 1)) {
-                    case 'L':
-                        if (INTEGER.matcher(number).matches()) return Long.parseLong(number);
-                        break;
-                    case 'S':
-                        if (INTEGER.matcher(number).matches()) return Short.parseShort(number);
-                        break;
-                    case 'B':
-                        if (INTEGER.matcher(number).matches()) return Byte.parseByte(number);
-                        break;
-                    case 'F':
-                        if (DECIMAL.matcher(number).matches()) return Float.parseFloat(number);
-                        break;
-                    case 'D':
-                        if (DECIMAL.matcher(number).matches()) return Double.parseDouble(number);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            if (DECIMAL.matcher(value).matches()) return Double.parseDouble(value);
-        } catch (NumberFormatException e) {
-            // Not a number, fall through to String
-        }
-        return value;
-    }
-
-    private void skipWhitespace() {
-        while (index < input.length() && Character.isWhitespace(input.charAt(index))) {
-            index++;
-        }
-    }
-
-    private char peek() {
-        if (index >= input.length()) throw error("Unexpected end of input");
-        return input.charAt(index);
-    }
-
-    private void expect(char c) {
-        if (peek() != c) throw error("Expected '" + c + "'");
-        index++;
-    }
-
-    private IllegalArgumentException error(String message) {
-        return new IllegalArgumentException(message + " at index " + index);
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/serializer/ItemStackTypeAdapter.java

@@ -1,63 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.config.serializer;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-import org.bukkit.Bukkit;
-import org.bukkit.inventory.ItemStack;
-
-import java.io.IOException;
-import java.util.Base64;
-import java.util.logging.Level;
-
-/**
- * Stores an {@link ItemStack} as Base64 of {@link ItemStack#serializeAsBytes()}, which
- * contains the data version and gets upgraded on newer Minecraft versions.
- * Empty items are stored as null, items that can't be read are deserialized as null.
- */
-public class ItemStackTypeAdapter extends TypeAdapter<ItemStack> {
-
-    @Override
-    public void write(JsonWriter out, ItemStack itemStack) throws IOException {
-        if (itemStack == null || itemStack.isEmpty()) {
-            out.nullValue();
-            return;
-        }
-        out.value(Base64.getEncoder().encodeToString(itemStack.serializeAsBytes()));
-    }
-
-    @Override
-    public ItemStack read(JsonReader in) throws IOException {
-        if (in.peek() == JsonToken.NULL) {
-            in.nextNull();
-            return null;
-        }
-        String value = in.nextString();
-        try {
-            return ItemStack.deserializeBytes(Base64.getDecoder().decode(value));
-        } catch (Exception e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not deserialize ItemStack", e);
-            return null;
-        }
-    }
-}

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

@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU Affero General Public License as published by
@@ -19,77 +19,129 @@
 
 package de.steamwar.bausystem.configplayer;
 
-import com.google.gson.GsonBuilder;
+import de.steamwar.bausystem.configplayer.serializer.ConfigurationSerializableSerializer;
-import de.steamwar.bausystem.config.ConfigConverter;
+import de.steamwar.linkage.Linked;
-import de.steamwar.bausystem.config.ConfigStore;
+import de.steamwar.sql.UserConfig;
-import de.steamwar.bausystem.config.VersionedConfig;
-import de.steamwar.bausystem.config.serializer.ItemStackTypeAdapter;
-import de.steamwar.bausystem.configplayer.converter.ConfigV1ToV2Converter;
-import de.steamwar.bausystem.features.hotbar.DefaultHotbar;
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.Setter;
+import org.bukkit.Bukkit;
-import org.bukkit.inventory.ItemStack;
+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
- * The current player config. It is stored as JSON, fields missing in the
+public class Config implements Listener {
- * stored JSON keep the default value of their initializer, so adding a new
- * field does not need a new version.
- * <p>
- * When a field gets removed, renamed or its meaning changes, copy this class
- * to ConfigV{@link #VERSION} (without the {@link #STORE}), increase {@link #VERSION},
- * write a {@link ConfigConverter} from the copy to this class and register it in the {@link #STORE}.
- */
-@Getter
-@Setter
-public class Config implements VersionedConfig {
 
-    public static final int VERSION = 2;
+    static {
+        SerializeManager.add(new ConfigurationSerializableSerializer());
+    }
 
-    public static final ConfigStore<Config> STORE = new ConfigStore<>(Config.class, VERSION, Config::new)
+    @Getter
-            .gson(new GsonBuilder().registerTypeHierarchyAdapter(ItemStack.class, new ItemStackTypeAdapter()).create())
+    private static Config instance;
-            .legacy(s -> s.startsWith("{@version(1)"), ConfigV1::parse)
-            .converter(new ConfigV1ToV2Converter())
-            .userConfig("bausystem");
 
-    @Setter(AccessLevel.NONE)
+    {
-    protected int version = VERSION;
+        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());
+    }
 
     /**
-     * BauGui item id to inventory slot
+     * 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
      */
-    protected Map<Integer, Integer> bauGui = defaultBauGui();
+    public YAPIONObject get(Player player) {
-    protected int bauGuiSize = 45;
+        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();
+    }
 
     /**
-     * Slots 0-8 are the hotbar, slots 9-12 the armor contents
+     * Save a PlayerConfig, this does not remove the key value mapping from the map.
+     *
+     * @param player the player to save the config.
      */
-    protected ItemStack[] hotbar = DefaultHotbar.defaultHotbar();
+    public void save(Player player) {
+        UUID uuid = player.getUniqueId();
+        if (playerConfigurations.containsKey(uuid)) {
+            YAPIONObject yapionObject = playerConfigurations.get(uuid);
+            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\\\+", "\\\\");
+            UserConfig.updatePlayerConfig(uuid, "bausystem", string);
+        }
+    }
 
-    protected boolean nightVision = false;
+    private YAPIONObject update(YAPIONObject yapionObject) {
-    protected boolean tntClickDetails = true;
+        int version = yapionObject.getPlainValue("@version");
-    protected boolean detonatorAutostart = false;
+        while (version < ConfigCreator.currentVersion) {
-    protected boolean inventoryFill = false;
+            ConfigConverter configConverter = CONFIG_CONVERTER_MAP.getOrDefault(version, null);
-    protected boolean rayVisualizer = false;
+            if (configConverter == null) {
-    protected boolean smartPlace = false;
+                Bukkit.getLogger().log(Level.SEVERE, "No updater found for version " + version);
-    protected boolean blockCounter = false;
+                return ConfigCreator.createDefaultConfig();
-    protected boolean depthMessage = true;
+            }
-
+            try {
-    public static Map<Integer, Integer> defaultBauGui() {
+                configConverter.update(yapionObject);
-        //  0:  ? |  1:  ? |  2: 10 |  3:  3 |  4:  7 |  5: 17 |  6: 15 |  7:  ? |  8:  ?
+            } catch (Exception e) {
-        //  9:  5 | 10:  ? | 11:  ? | 12:  ? | 13:  ? | 14:  ? | 15:  ? | 16:  ? | 17: 16
+                Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-        // 18:  4 | 19:  ? | 20: 19 | 21: 21 | 22:  9 | 23:  0 | 24:  1 | 25:  ? | 26: 11
+                return ConfigCreator.createDefaultConfig();
-        // 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:  ?
+            int newVersion = yapionObject.getPlainValue("@version");
-        Map<Integer, Integer> bauGui = new HashMap<>();
+            if (version == newVersion) {
-        bauGui.put(10, 2); bauGui.put(3, 3); bauGui.put(7, 4); bauGui.put(17, 5); bauGui.put(15, 6);
+                Bukkit.getLogger().log(Level.SEVERE, "Version Tag was the same after conversion");
-        bauGui.put(5, 9); bauGui.put(4, 18); bauGui.put(6, 27);
+                return ConfigCreator.createDefaultConfig();
-        bauGui.put(16, 17); bauGui.put(11, 26); bauGui.put(18, 35);
+            }
-        bauGui.put(19, 20); bauGui.put(21, 21); bauGui.put(9, 22); bauGui.put(0, 23); bauGui.put(1, 24);
+            if (newVersion < version) {
-        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);
+                Bukkit.getLogger().log(Level.SEVERE, "Version Tag was earlier after conversion");
-        return bauGui;
+                return ConfigCreator.createDefaultConfig();
+            }
+            version = newVersion;
+        }
+        return yapionObject;
     }
 }

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

@@ -0,0 +1,56 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.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/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigCreator.java

@@ -0,0 +1,61 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.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/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigV1.java

@@ -1,104 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.configplayer;
-
-import de.steamwar.bausystem.config.VersionedConfig;
-import de.steamwar.bausystem.config.legacy.YapionReader;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The legacy config that was stored in the YAPION format.
- */
-@Getter
-@Setter
-public class ConfigV1 implements VersionedConfig {
-
-    public static final int VERSION = 1;
-
-    @Setter(AccessLevel.NONE)
-    protected int version = VERSION;
-
-    /**
-     * BauGui item id to inventory slot
-     */
-    protected Map<Integer, Integer> bauGui = new HashMap<>();
-    protected int bauGuiSize = 45;
-
-    /**
-     * Minecraft version to the hotbar serialized by YAPION, read with {@link YapionReader}.
-     * Use {@link de.steamwar.bausystem.config.legacy.YapionItemDeserializer} to get the items.
-     */
-    protected Map<Integer, List<?>> hotbars = new HashMap<>();
-
-    protected boolean nightVision = false;
-    protected boolean tntClickDetails = true;
-    protected boolean detonatorAutostart = false;
-    protected boolean inventoryFill = false;
-    protected boolean rayVisualizer = false;
-    protected boolean smartPlace = false;
-    protected boolean blockCounter = false;
-    protected boolean depthMessage = true;
-
-    public static ConfigV1 parse(String yapion) {
-        Map<String, Object> object = YapionReader.parse(yapion);
-        ConfigV1 config = new ConfigV1();
-        config.version = (Integer) object.get("@version");
-
-        if (object.get("baugui") instanceof Map<?, ?> bauGui) {
-            bauGui.forEach((key, value) -> {
-                if (key.equals("size")) {
-                    config.bauGuiSize = (Integer) value;
-                } else {
-                    config.bauGui.put(Integer.parseInt((String) key), (Integer) value);
-                }
-            });
-        }
-
-        object.forEach((key, value) -> {
-            if (!(value instanceof List<?> hotbar)) return;
-            if (key.equals("hotbar")) {
-                // Hotbars were stored without version prior to 1.19
-                config.hotbars.putIfAbsent(19, hotbar);
-            } else if (key.startsWith("hotbar-")) {
-                config.hotbars.put(Integer.parseInt(key.substring("hotbar-".length())), hotbar);
-            }
-        });
-
-        config.nightVision = getBoolean(object, "nightvision", config.nightVision);
-        config.tntClickDetails = getBoolean(object, "tnt_click_details", config.tntClickDetails);
-        config.detonatorAutostart = getBoolean(object, "detonator-autostart", config.detonatorAutostart);
-        config.inventoryFill = getBoolean(object, "inventoryfill", config.inventoryFill);
-        config.rayVisualizer = getBoolean(object, "rayvisualizer", config.rayVisualizer);
-        config.smartPlace = getBoolean(object, "smartPlace", config.smartPlace);
-        config.blockCounter = getBoolean(object, "blockCounter", config.blockCounter);
-        config.depthMessage = getBoolean(object, "depth_message", config.depthMessage);
-        return config;
-    }
-
-    private static boolean getBoolean(Map<String, Object> object, String key, boolean defaultValue) {
-        return object.get(key) instanceof Boolean value ? value : defaultValue;
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/converter/ConfigV1ToV2Converter.java

@@ -1,75 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.configplayer.converter;
-
-import de.steamwar.bausystem.config.ConfigConverter;
-import de.steamwar.bausystem.config.legacy.YapionItemDeserializer;
-import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.configplayer.ConfigV1;
-import de.steamwar.core.Core;
-import org.bukkit.Bukkit;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Level;
-
-@Deprecated
-public class ConfigV1ToV2Converter implements ConfigConverter<ConfigV1, Config> {
-
-    @Override
-    public int version() {
-        return ConfigV1.VERSION;
-    }
-
-    @Override
-    public Config convert(ConfigV1 old) {
-        Config config = new Config();
-        config.setBauGui(new HashMap<>(old.getBauGui()));
-        config.setBauGuiSize(old.getBauGuiSize());
-
-        List<?> hotbar = old.getHotbars().get(Core.getVersion());
-        if (hotbar != null) {
-            config.setHotbar(convertHotbar(hotbar));
-        }
-
-        config.setNightVision(old.isNightVision());
-        config.setTntClickDetails(old.isTntClickDetails());
-        config.setDetonatorAutostart(old.isDetonatorAutostart());
-        config.setInventoryFill(old.isInventoryFill());
-        config.setRayVisualizer(old.isRayVisualizer());
-        config.setSmartPlace(old.isSmartPlace());
-        config.setBlockCounter(old.isBlockCounter());
-        config.setDepthMessage(old.isDepthMessage());
-        return config;
-    }
-
-    private ItemStack[] convertHotbar(List<?> hotbar) {
-        ItemStack[] items = new ItemStack[13];
-        for (int i = 0; i < Math.min(hotbar.size(), items.length); i++) {
-            try {
-                items[i] = YapionItemDeserializer.deserializeItem(hotbar.get(i));
-            } catch (Exception e) {
-                Bukkit.getLogger().log(Level.WARNING, "Could not convert hotbar item " + i, e);
-            }
-        }
-        return items;
-    }
-}

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

@@ -0,0 +1,90 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.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/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java

@@ -64,7 +64,7 @@ public class Depth {
         dimensions.setZ(Math.abs(dimensions.getZ()));
 
         RegionUtils.message(region, player -> {
-            if (Config.STORE.get(player).isDepthMessage()) {
+            if (Config.getInstance().get(player).getPlainValueOrDefault("depth_message", true)) {
                 player.spigot().sendMessage(getMessage(player, dimensions.getBlockX() + 1, dimensions.getBlockY() + 1, dimensions.getBlockZ() + 1, tntCount));
             }
         });

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

@@ -34,11 +34,11 @@ public class DepthCommand extends SWCommand {
 
     @Register
     public void toggle(Player player) {
-        if (Config.STORE.get(player).isDepthMessage()) {
+        if (Config.getInstance().get(player).getPlainValueOrDefault("depth_message", true)) {
-            Config.STORE.get(player).setDepthMessage(false);
+            Config.getInstance().get(player).put("depth_message", false);
             BauSystem.MESSAGE.send("DEPTH_COUNTER_DISABLE", player);
         } else {
-            Config.STORE.get(player).setDepthMessage(true);
+            Config.getInstance().get(player).put("depth_message", true);
             BauSystem.MESSAGE.send("DEPTH_COUNTER_ENABLE", player);
         }
     }

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

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

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

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

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/experimental/ExperimentalCommand.java

@@ -1,31 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.experimental;
-
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-
-@Linked
-public class ExperimentalCommand extends SWCommand {
-
-    public ExperimentalCommand() {
-        super("experimental", "experiment");
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/experimental/redstone_engine/RedstoneEngine.java

@@ -1,135 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.experimental.redstone_engine;
-
-import de.steamwar.bausystem.features.experimental.ExperimentalCommand;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.ScoreboardElement;
-import de.steamwar.command.AbstractSWCommand;
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import io.papermc.paper.configuration.WorldConfiguration;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.title.TitlePart;
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-import java.util.Collection;
-import java.util.List;
-
-@AbstractSWCommand.PartOf(ExperimentalCommand.class)
-@Linked
-public class RedstoneEngine extends SWCommand implements Listener, ScoreboardElement {
-
-    public RedstoneEngine() {
-        super("");
-    }
-
-    private WorldConfiguration.Misc getConfig() {
-        return ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle().paperConfig().misc;
-    }
-
-    @Register("redstone")
-    @Register("redstoneengine")
-    public void setRedstoneEngine(Player player, @StaticValue("alternate_current") String __, WorldConfiguration.Misc.AlternateCurrentUpdateOrder updateOrder) {
-        WorldConfiguration.Misc misc = getConfig();
-        misc.redstoneImplementation = WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT;
-        misc.alternateCurrentUpdateOrder = updateOrder;
-        broadcastTitle(Bukkit.getOnlinePlayers());
-    }
-
-    @Register("redstone")
-    @Register("redstoneengine")
-    public void setRedstoneEngine(Player player, WorldConfiguration.Misc.RedstoneImplementation implementation) {
-        getConfig().redstoneImplementation = implementation;
-        broadcastTitle(Bukkit.getOnlinePlayers());
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        WorldConfiguration.Misc misc = getConfig();
-        if (misc.redstoneImplementation != WorldConfiguration.Misc.RedstoneImplementation.EIGENCRAFT) {
-            broadcastTitle(List.of(event.getPlayer()));
-        }
-    }
-
-    private void broadcastTitle(Collection<? extends Player> players) {
-        WorldConfiguration.Misc misc = getConfig();
-        Component title = switch (misc.redstoneImplementation) {
-            case VANILLA -> Component.text("⚠").color(NamedTextColor.RED).append(Component.text(" Redstone: Vanilla ").color(NamedTextColor.WHITE)).append(Component.text("⚠").color(NamedTextColor.RED));
-            case EIGENCRAFT -> Component.text("Redstone: Eigencraft");
-            case ALTERNATE_CURRENT -> Component.text("⚠").color(NamedTextColor.RED).append(Component.text(" Redstone: AC ").color(NamedTextColor.WHITE)).append(Component.text("⚠").color(NamedTextColor.RED));
-        };
-        Component subtitle;
-        if (misc.redstoneImplementation != WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) {
-            subtitle = Component.text().build();
-        } else {
-            subtitle = switch (misc.alternateCurrentUpdateOrder) {
-                case VERTICAL_FIRST_INWARD -> Component.text("Y first inwards"); // Y before XZ
-                case VERTICAL_FIRST_OUTWARD -> Component.text("Y first outwards"); // XZ before Y
-                case HORIZONTAL_FIRST_INWARD -> Component.text("XZ first inwards"); // Y before XZ
-                case HORIZONTAL_FIRST_OUTWARD -> Component.text("XZ first outwards"); // XZ before Y
-            };
-        }
-        players.forEach(player -> {
-            player.sendTitlePart(TitlePart.TITLE, title);
-            player.sendTitlePart(TitlePart.SUBTITLE, subtitle);
-        });
-    }
-
-    @Override
-    public ScoreboardGroup getGroup() {
-        return ScoreboardGroup.FOOTER;
-    }
-
-    @Override
-    public int order() {
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    public String get(Region region, Player p) {
-        WorldConfiguration.Misc misc = getConfig();
-        switch (misc.redstoneImplementation) {
-            case ALTERNATE_CURRENT:
-                switch (misc.alternateCurrentUpdateOrder) {
-                    case VERTICAL_FIRST_INWARD:
-                        return "§eRedstone§8: §cAC §8(§7Y in§8)";
-                    case VERTICAL_FIRST_OUTWARD:
-                        return "§eRedstone§8: §cAC §8(§7Y out§8)";
-                    case HORIZONTAL_FIRST_INWARD:
-                        return "§eRedstone§8: §cAC §8(§7XZ in§8)";
-                    case HORIZONTAL_FIRST_OUTWARD:
-                        return "§eRedstone§8: §cAC §8(§7XZ out§8)";
-                }
-                return "§eRedstone§8: §cAC";
-            case EIGENCRAFT:
-                return null;
-            case VANILLA:
-            default:
-                return "§eRedstone§8: §cVanilla";
-        }
-    }
-}

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

@@ -28,6 +28,7 @@ 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.*;
 
@@ -51,15 +52,15 @@ public class BauGuiMapping {
     }
 
     @Getter
-    private final Config config;
+    private final YAPIONObject object;
     @Getter
     private final Player owner;
     @Getter
     @Setter
     private boolean saved;
 
-    protected BauGuiMapping(Config config, Player p) {
+    protected BauGuiMapping(YAPIONObject object, Player p) {
-        this.config = config;
+        this.object = object;
         this.owner = p;
         fromUUID.put(p.getUniqueId(), this);
         mappings.add(this);
@@ -69,18 +70,19 @@ public class BauGuiMapping {
         BauGuiMapping mapping = fromUUID.get(p.getUniqueId());
 
         if (mapping == null) {
-            mapping = new BauGuiMapping(Config.STORE.get(p), p);
+            YAPIONObject yapionObject = Config.getInstance().get(p);
+            mapping = new BauGuiMapping(yapionObject.getObject("baugui"), p);
         }
 
         return mapping;
     }
 
     public boolean isShown(int id) {
-        return config.getBauGui().getOrDefault(id, -1) >= 0;
+        return object.getPlainValueOrDefault(Integer.toString(id), -1) >= 0;
     }
 
     public int getSlot(int id) {
-        return config.getBauGui().get(id);
+        return object.getPlainValue(Integer.toString(id));
     }
 
     public Map<Integer, Integer> getMapping() {
@@ -92,7 +94,7 @@ public class BauGuiMapping {
     }
 
     public int getSize() {
-        return config.getBauGuiSize();
+        return object.getPlainValueOrDefault("size", 45);
     }
 
     public void setSize(int size) {
@@ -100,7 +102,7 @@ public class BauGuiMapping {
             return;
         }
 
-        config.setBauGuiSize(size);
+        object.add("size", size);
     }
 
     private void tick() {
@@ -109,17 +111,16 @@ public class BauGuiMapping {
 
     public void save() {
         if (saved) return;
-        Config current = Config.STORE.get(owner);
+        YAPIONObject config = Config.getInstance().get(owner);
-        current.setBauGui(config.getBauGui());
+        config.add("baugui", object);
-        current.setBauGuiSize(config.getBauGuiSize());
+        Config.getInstance().save(owner);
-        Config.STORE.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 = config.getBauGui().getOrDefault(e.getKey(), -1);
+            Integer value = object.getPlainValueOrDefault(e.getKey().toString(), -1);
             if (value == -1) continue;
             map.put(e.getKey(), value);
         }
@@ -128,10 +129,10 @@ public class BauGuiMapping {
 
     private void internalWriteMap(Map<Integer, Integer> map) {
         for (Map.Entry<Integer, BauGuiItem> e : BauGUI.getITEMS().entrySet()) {
-            config.getBauGui().remove(e.getKey());
+            object.remove(e.getKey().toString());
             Integer value = map.getOrDefault(e.getKey(), -1);
             if (value == -1) continue;
-            config.getBauGui().put(e.getKey(), value);
+            object.add(e.getKey().toString(), value);
         }
     }
 }

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

@@ -20,23 +20,39 @@
 package de.steamwar.bausystem.features.hotbar;
 
 import de.steamwar.bausystem.configplayer.Config;
+import de.steamwar.core.Core;
 import lombok.experimental.UtilityClass;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
+import yapion.hierarchy.types.YAPIONArray;
+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.List;
+import java.util.HashSet;
+import java.util.Set;
 
 @UtilityClass
 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 void updateHotbar(Player p) {
         ItemStack[] hotbar = new ItemStack[13];
         System.arraycopy(p.getInventory().getContents(), 0, hotbar, 0, 9);
         System.arraycopy(p.getInventory().getArmorContents(), 0, hotbar, 9, 4);
-        Config.STORE.get(p).setHotbar(copy(hotbar));
+        YAPIONArray yapionArray = new YAPIONArray();
-        Config.STORE.save(p);
+        for (ItemStack itemStack : hotbar) {
+            if (itemStack != null) {
+                yapionArray.add(YAPIONSerializer.serialize(itemStack));
+            } else {
+                yapionArray.add(new YAPIONValue<>(null));
+            }
+        }
+        Config.getInstance().get(p).add("hotbar-" + Core.getVersion(), yapionArray);
+        Config.getInstance().save(p);
     }
 
     public void setHotbar(Player p) {
@@ -50,34 +66,28 @@ public class DefaultHotbar {
     }
 
     public ItemStack[] getItems(Player p) {
-        return copy(Config.STORE.get(p).getHotbar());
+        Config.getInstance().get(p).remap("hotbar", "hotbar-19");
-    }
+        YAPIONArray yapionArray = Config.getInstance().get(p).getYAPIONArrayOrSetDefault("hotbar-" + Core.getVersion(), defaultHotbar());
-
-    public ItemStack[] defaultHotbar() {
         ItemStack[] hotbar = new ItemStack[13];
-        hotbar[0] = item(Material.WOODEN_AXE, "WorldEdit Wand", "Left click: select pos #1", "Right click: select pos #2");
+        Set<Integer> invalid = new HashSet<>();
-        hotbar[1] = item(Material.COMPASS, "Navigation Wand", "Left click: jump to location", "Right click: pass through walls");
+        yapionArray.forEach((integer, yapionAnyType) -> {
-        hotbar[8] = item(Material.NETHER_STAR, "§eBau GUI");
+            if (yapionAnyType instanceof YAPIONValue) {
-        hotbar[11] = new ItemStack(Material.ELYTRA);
+                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;
     }
 
-    private ItemStack item(Material material, String name, String... lore) {
+    public YAPIONArray defaultHotbar() {
-        ItemStack itemStack = new ItemStack(material);
+        return DEFAULT_HOTBAR;
-        ItemMeta meta = itemStack.getItemMeta();
-        meta.setDisplayName(name);
-        if (lore.length > 0) {
-            meta.setLore(List.of(lore));
-        }
-        itemStack.setItemMeta(meta);
-        return itemStack;
-    }
-
-    private ItemStack[] copy(ItemStack[] hotbar) {
-        ItemStack[] copy = new ItemStack[13];
-        for (int i = 0; i < Math.min(hotbar.length, copy.length); i++) {
-            copy[i] = hotbar[i] == null ? null : hotbar[i].clone();
-        }
-        return copy;
     }
 }

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

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

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

@@ -40,7 +40,7 @@ public class InventoryFiller implements Listener {
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Config.STORE.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;
@@ -62,7 +62,7 @@ public class InventoryFiller implements Listener {
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Config.STORE.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/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java

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

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

@@ -290,7 +290,7 @@ public class KillcheckerVisualizer {
                 }
                 rEntities.get(point).die();
             }
-            RBlockDisplay entity = new RBlockDisplay(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0, 0, 0));
+            RBlockDisplay entity = new RBlockDisplay(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0.5, 0, 0.5));
             entity.setBlock(MATERIALS[Math.min(count - 1, MATERIALS.length) - 1].createBlockData());
             rEntities.put(point, entity);
             if (outlinePoints.contains(point)) outlinePointsCache.add(point);

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

@@ -46,7 +46,7 @@ public class ObserverTracerListener implements Listener {
     public ObserverTracerListener() {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (pair.getSwPlayer().getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
                 pair.getComponent().show();
             });
         }, 15L, 15L);

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

@@ -167,7 +167,7 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        boolean rayvisualizer = Config.STORE.get(event.getPlayer()).isRayVisualizer();
+        boolean rayvisualizer = Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("rayvisualizer", false);
         if (rayvisualizer) server.addPlayer(event.getPlayer());
     }
 
@@ -181,7 +181,7 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             for (Player player : Bukkit.getOnlinePlayers()) {
                 if (Permission.BUILD.hasPermission(player)) {
-                    boolean rayvisualizer = Config.STORE.get(player).isRayVisualizer();
+                    boolean rayvisualizer = Config.getInstance().get(player).getPlainValueOrDefault("rayvisualizer", false);
                     if (rayvisualizer) server.addPlayer(player);
                 } else {
                     server.removePlayer(player);
@@ -192,8 +192,8 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
 
     @Register
     public void toggle(@Validator Player player) {
-        boolean rayvisualizer = Config.STORE.get(player).isRayVisualizer();
+        boolean rayvisualizer = Config.getInstance().get(player).getPlainValueOrDefault("rayvisualizer", false);
-        Config.STORE.get(player).setRayVisualizer(!rayvisualizer);
+        Config.getInstance().get(player).put("rayvisualizer", !rayvisualizer);
         if (!rayvisualizer) {
             SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("RAY_VISUALIZER_ENABLE", player));
             server.addPlayer(player);

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

@@ -185,16 +185,17 @@ public class TestblockCommand extends SWCommand {
         return new TypeMapper<SchematicNode>() {
             @Override
             public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                List<String> stringList = new ArrayList<>();
+                List<String> stringList = new ArrayList<>(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
                 stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.byId(0), s));
-                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
                 return stringList;
             }
 
             @Override
             public SchematicNode map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
+                SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
-                if (node == null) node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
+                if (node == null) {
+                    node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
+                }
                 return node;
             }
         };

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

@@ -38,7 +38,7 @@ import java.util.Collection;
 public class SimulatorCommand extends SWCommand {
 
     @LinkedInstance
-    public SimulatorCursor simulatorCursor;
+    public SimulatorCursorManager simulatorCursorManager;
 
     public SimulatorCommand() {
         super("sim", "simulator");
@@ -47,12 +47,12 @@ public class SimulatorCommand extends SWCommand {
     @Register(description = "SIMULATOR_HELP")
     public void genericCommand(@Validator Player p) {
         SWUtils.giveItemToPlayer(p, SimulatorStorage.getWand(p));
-        simulatorCursor.calcCursor(p);
+        simulatorCursorManager.calcCursor(p);
     }
 
     @Register(value = "change", description = "SIMULATOR_CHANGE_HELP")
     public void change(@Validator Player p) {
-        if (!SimulatorCursor.isSimulatorItem(p.getInventory().getItemInMainHand()) && !SimulatorCursor.isSimulatorItem(p.getInventory().getItemInOffHand())) {
+        if (!SimulatorCursorManager.isSimulatorItem(p.getInventory().getItemInMainHand()) && !SimulatorCursorManager.isSimulatorItem(p.getInventory().getItemInOffHand())) {
             BauSystem.MESSAGE.send("SIMULATOR_NO_SIM_IN_HAND", p);
             return;
         }

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

@@ -1,364 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator;
-
-import com.destroystokyo.paper.event.server.ServerTickEndEvent;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
-import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
-import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
-import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
-import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
-import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
-import de.steamwar.bausystem.utils.ItemUtils;
-import de.steamwar.core.SWPlayer;
-import de.steamwar.cursor.Cursor;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.inventory.SWAnvilInv;
-import de.steamwar.linkage.Linked;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.player.*;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-@Linked
-public class SimulatorCursor implements Listener {
-
-    private static final Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
-    private static final Map<Player, REntityServer> emptyTargetServers = Collections.synchronizedMap(new HashMap<>());
-
-    public static boolean isSimulatorItem(ItemStack itemStack) {
-        return ItemUtils.isItem(itemStack, "simulator");
-    }
-
-    private static boolean hasSimulatorItem(Player player) {
-        return isSimulatorItem(player.getInventory().getItemInMainHand()) || isSimulatorItem(player.getInventory().getItemInOffHand());
-    }
-
-    private static Set<Player> scheduledUpdates = new HashSet<>();
-
-    private static void scheduleCursorUpdate(Player player) {
-        scheduledUpdates.add(player);
-    }
-
-    @EventHandler
-    public void onServerTickEnd(ServerTickEndEvent event) {
-        scheduledUpdates.forEach(SimulatorCursor::calcCursor);
-        scheduledUpdates.clear();
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        scheduleCursorUpdate(event.getPlayer());
-    }
-
-    @EventHandler
-    public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        scheduleCursorUpdate(event.getPlayer());
-    }
-
-    @EventHandler
-    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        scheduleCursorUpdate(event.getPlayer());
-    }
-
-    @EventHandler
-    public void onInventoryClick(InventoryClickEvent event) {
-        if (!(event.getWhoClicked() instanceof Player player)) return;
-        if (!Permission.BUILD.hasPermission(player)) return;
-        scheduleCursorUpdate(player);
-    }
-
-    @EventHandler
-    public void onInventoryDrag(InventoryDragEvent event) {
-        if (!(event.getWhoClicked() instanceof Player player)) return;
-        if (!Permission.BUILD.hasPermission(player)) return;
-        scheduleCursorUpdate(player);
-    }
-
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getChanged().forEach(SimulatorCursor::calcCursor);
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        cursorType.remove(event.getPlayer());
-        removeCursor(event.getPlayer());
-        scheduledUpdates.remove(event.getPlayer());
-    }
-
-    private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
-
-    static {
-        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-            long millis = System.currentTimeMillis();
-            LAST_SNEAKS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
-        }, 1, 1);
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
-        if (!event.isSneaking()) return;
-        Player player = event.getPlayer();
-        if (!hasSimulatorItem(player)) {
-            return;
-        }
-        if (LAST_SNEAKS.containsKey(player)) {
-            CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
-            if (currentType == CursorType.TNT) {
-                cursorType.put(player, CursorType.REDSTONE_BLOCK);
-            } else {
-                cursorType.put(player, CursorType.TNT);
-            }
-            calcCursor(player);
-        } else {
-            LAST_SNEAKS.put(player, System.currentTimeMillis());
-        }
-    }
-
-    public static CursorType getCursorType(Player player) {
-        return cursorType.getOrDefault(player, CursorType.TNT);
-    }
-
-    public static void setCursorType(Player player, CursorType cursorType) {
-        SimulatorCursor.cursorType.put(player, cursorType);
-        calcCursor(player);
-    }
-
-    public static void calcCursor(Player player) {
-        if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
-            if (removeCursor(player) | SimulatorWatcher.show(null, player)) {
-                SWUtils.sendToActionbar(player, "");
-            }
-            return;
-        }
-
-        Simulator simulator = SimulatorStorage.getSimulator(player);
-        if (simulator != null && simulator.getStabGenerator() != null) {
-            removeCursor(player);
-            SimulatorWatcher.show(null, player);
-            SWUtils.sendToActionbar(player, "§cGenerating Stab");
-            return;
-        }
-
-        SimulatorWatcher.show(simulator, player);
-        Cursor cursor = getOrCreateCursor(player, simulator, cursorType.getOrDefault(player, CursorType.TNT));
-        cursor.renderDeduplicated();
-    }
-
-    private static Cursor getOrCreateCursor(Player player, Simulator simulator, CursorType type) {
-        REntityServer targetServer = simulator == null ? emptyTargetServers.computeIfAbsent(player, __ -> new REntityServer()) : SimulatorWatcher.getEntityServerOfSimulator(simulator);
-        SWPlayer swPlayer = SWPlayer.of(player);
-        Optional<Cursor> activeCursor = swPlayer.getComponent(Cursor.class);
-
-        Cursor cursor = activeCursor.orElse(null);
-        if (cursor == null || cursor.getTargetServer() != targetServer) {
-            swPlayer.removeComponent(Cursor.class);
-            cursor = new Cursor(
-                    targetServer,
-                    player,
-                    Material.GLASS,
-                    type.material,
-                    type.cursorModes,
-                    (location, hitEntity, action) -> handlePlayerClick(player, location, hitEntity, action),
-                    (location, hitEntity) -> sendCursorActionbar(player, SimulatorStorage.getSimulator(player), location != null, hitEntity.isPresent())
-            );
-        } else {
-            cursor.setCursorMaterial(type.material);
-            cursor.setAllowedCursorModes(type.cursorModes);
-        }
-
-        return cursor;
-    }
-
-    private static synchronized boolean removeCursor(Player player) {
-        Optional<Cursor> cursor = SWPlayer.of(player).getComponent(Cursor.class);
-        cursor.ifPresent(__ -> SWPlayer.of(player).removeComponent(Cursor.class));
-        REntityServer emptyTargetServer = emptyTargetServers.remove(player);
-        if (emptyTargetServer != null) {
-            emptyTargetServer.close();
-        }
-        return cursor.isPresent();
-    }
-
-    private static void sendCursorActionbar(Player player, Simulator simulator, boolean hasCursorLocation, boolean hasHitEntity) {
-        if (!hasCursorLocation) {
-            SWUtils.sendToActionbar(player, simulator == null ? "§eSelect Simulator" : "§eOpen Simulator");
-        } else if (simulator == null) {
-            SWUtils.sendToActionbar(player, "§eCreate new Simulator");
-        } else if (hasHitEntity) {
-            SWUtils.sendToActionbar(player, "§eEdit Position");
-        } else {
-            SWUtils.sendToActionbar(player, "§eAdd new " + cursorType.getOrDefault(player, CursorType.TNT).name);
-        }
-    }
-
-    @Getter
-    @AllArgsConstructor
-    public enum CursorType {
-        TNT(Material.TNT, Material.GUNPOWDER, List.of(Cursor.CursorMode.FREE, Cursor.CursorMode.SURFACE_ALIGNED), "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, Material.QUARTZ, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
-        ;
-
-        public final Material material;
-        public final Material nonSelectedMaterial;
-        public final List<Cursor.CursorMode> cursorModes;
-        public final String name;
-        public final Function<Vector, SimulatorElement<?>> elementFunction;
-    }
-
-    private static void handlePlayerClick(Player player, Location cursorLocation, Optional<REntity> hitEntity, Action action) {
-        if (!Permission.BUILD.hasPermission(player)) return;
-        if (!hasSimulatorItem(player)) {
-            return;
-        }
-
-        Simulator simulator = SimulatorStorage.getSimulator(player);
-
-        if (action == Action.LEFT_CLICK_BLOCK || action == Action.LEFT_CLICK_AIR) {
-            if (simulator == null) {
-                return;
-            }
-            SimulatorExecutor.run(player, simulator, null);
-            return;
-        }
-
-        if (action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) {
-            return;
-        }
-
-        if (simulator == null) {
-            if (cursorLocation == null) {
-                SimulatorStorage.openSimulatorSelector(player);
-            } else {
-                SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
-                anvilInv.setCallback(s -> {
-                    Simulator sim = SimulatorStorage.getSimulator(s);
-                    if (sim != null) {
-                        BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", player);
-                        return;
-                    }
-                    if (!s.matches("[a-zA-Z_0-9-]+")) {
-                        BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", player);
-                        return;
-                    }
-                    sim = new Simulator(s);
-                    SimulatorStorage.addSimulator(s, sim);
-                    createElement(player, cursorLocation, sim);
-                    SimulatorStorage.setSimulator(player, sim);
-                });
-                anvilInv.open();
-            }
-            return;
-        }
-
-        if (cursorLocation == null) {
-            new SimulatorGui(player, simulator).open();
-            return;
-        }
-
-        if (hitEntity.isPresent()) {
-            openElement(player, simulator, hitEntity.get());
-            return;
-        }
-
-        createElement(player, cursorLocation, simulator);
-    }
-
-    private static void openElement(Player player, Simulator simulator, REntity hitEntity) {
-        Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
-        List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
-            return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
-        }).collect(Collectors.toList());
-
-        switch (elements.size()) {
-            case 0:
-                return;
-            case 1:
-                SimulatorElement<?> element = elements.get(0);
-                SimulatorGroup group1 = element.getGroup(simulator);
-                SimulatorBaseGui back = new SimulatorGui(player, simulator);
-                if (group1.getElements().size() > 1) {
-                    back = new SimulatorGroupGui(player, simulator, group1, back);
-                }
-                element.open(player, simulator, group1, back);
-                break;
-            default:
-                List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
-                if (parents.size() == 1) {
-                    SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                    new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
-                } else {
-                    SimulatorGroup group2 = new SimulatorGroup();
-                    group2.setMaterial(null);
-                    group2.getElements().addAll(elements);
-                    SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                    new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
-                }
-                break;
-        }
-    }
-
-    private static void createElement(Player player, Location cursorLocation, Simulator simulator) {
-        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
-        Vector vector = cursorLocation.toVector();
-        if (type == CursorType.REDSTONE_BLOCK) {
-            vector.subtract(new Vector(0.5, 0, 0.5));
-        }
-        SimulatorElement<?> element = type.elementFunction.apply(vector);
-        SimulatorGroup group = new SimulatorGroup().add(element);
-        simulator.getGroups().add(group);
-        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-        element.open(player, simulator, group, simulatorGui);
-        SimulatorWatcher.update(simulator);
-        calcCursor(player);
-    }
-}

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

@@ -0,0 +1,440 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.simulator;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.bausystem.SWUtils;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
+import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
+import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
+import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
+import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
+import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
+import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.core.SWPlayer;
+import de.steamwar.cursor.Cursor;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.inventory.SWAnvilInv;
+import de.steamwar.linkage.Linked;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Linked
+public class SimulatorCursorManager implements Listener {
+
+    private static class SimulatorCursorComponent implements SWPlayer.Component {
+        private Player player;
+        private Cursor cursor;
+        private CursorType cursorType = CursorType.TNT;
+        private REntityServer emptyTargetServer;
+        private REntityServer currentTargetServer;
+        private long lastSneakMillis;
+
+        private SimulatorCursorComponent() {
+        }
+
+        private SimulatorCursorComponent(CursorType cursorType) {
+            this.cursorType = cursorType;
+        }
+
+        private REntityServer getOrCreateEmptyTargetServer() {
+            if (emptyTargetServer == null) {
+                emptyTargetServer = new REntityServer();
+            }
+            return emptyTargetServer;
+        }
+
+        private boolean handleSneak(long now) {
+            boolean doubleSneak = now - lastSneakMillis <= 200;
+            lastSneakMillis = doubleSneak ? 0 : now;
+            return doubleSneak;
+        }
+
+        private CursorType getCursorType() {
+            return cursorType;
+        }
+
+        private void setCursorType(CursorType cursorType) {
+            this.cursorType = cursorType;
+            refresh();
+        }
+
+        private void switchCursorMode() {
+            cursorType = cursorType == CursorType.TNT ? CursorType.REDSTONE_BLOCK : CursorType.TNT;
+            refresh();
+        }
+
+        private void refresh() {
+            if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
+                deactivateCursor(player);
+                return;
+            }
+
+            Simulator simulator = SimulatorStorage.getSimulator(player);
+            if (simulator != null && simulator.getStabGenerator() != null) {
+                removeGenericCursor();
+                boolean watcherRemoved = SimulatorWatcher.show(null, player);
+                if (watcherRemoved) {
+                    SWUtils.sendToActionbar(player, "");
+                }
+                SWUtils.sendToActionbar(player, "§cGenerating Stab");
+                return;
+            }
+
+            SimulatorWatcher.show(simulator, player);
+            REntityServer targetServer = simulator == null ? getOrCreateEmptyTargetServer() : SimulatorWatcher.getEntityServerOfSimulator(simulator);
+            if (cursor == null || currentTargetServer != targetServer) {
+                removeGenericCursor();
+                currentTargetServer = targetServer;
+                cursor = new Cursor(
+                        targetServer,
+                        player,
+                        Material.GLASS,
+                        cursorType.material,
+                        cursorType.cursorModes,
+                        this::handlePlayerClick,
+                        (location, hitEntity) -> sendCursorActionbar(simulator, location != null, hitEntity.isPresent())
+                );
+            } else {
+                cursor.setCursorMaterial(cursorType.material);
+                cursor.setAllowedCursorModes(cursorType.cursorModes);
+            }
+            cursor.renderDeduplicated();
+        }
+
+        private void removeGenericCursor() {
+            if (cursor == null && !SWPlayer.of(player).hasComponent(Cursor.class)) {
+                currentTargetServer = null;
+                return;
+            }
+
+            SWPlayer.of(player).removeComponent(Cursor.class);
+            cursor = null;
+            currentTargetServer = null;
+        }
+
+        private void closeEmptyTargetServer() {
+            if (emptyTargetServer == null) {
+                return;
+            }
+
+            emptyTargetServer.close();
+            emptyTargetServer = null;
+        }
+
+        private void sendCursorActionbar(Simulator simulator, boolean hasCursorLocation, boolean hasHitEntity) {
+            if (!hasCursorLocation) {
+                SWUtils.sendToActionbar(player, simulator == null ? "§eSelect Simulator" : "§eOpen Simulator");
+            } else if (simulator == null) {
+                SWUtils.sendToActionbar(player, "§eCreate new Simulator");
+            } else if (hasHitEntity) {
+                SWUtils.sendToActionbar(player, "§eEdit Position");
+            } else {
+                SWUtils.sendToActionbar(player, "§eAdd new " + cursorType.name);
+            }
+        }
+
+        private void handlePlayerClick(Location cursorLocation, Optional<REntity> hitEntity, Action action) {
+            if (!Permission.BUILD.hasPermission(player)) return;
+            if (!hasSimulatorItem(player)) {
+                return;
+            }
+
+            Simulator simulator = SimulatorStorage.getSimulator(player);
+
+            if (action == Action.LEFT_CLICK_BLOCK || action == Action.LEFT_CLICK_AIR) {
+                if (simulator == null) {
+                    return;
+                }
+                SimulatorExecutor.run(player, simulator, null);
+                return;
+            }
+
+            if (action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) {
+                return;
+            }
+
+            if (simulator == null) {
+                if (cursorLocation == null) {
+                    SimulatorStorage.openSimulatorSelector(player);
+                } else {
+                    SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
+                    anvilInv.setCallback(s -> {
+                        Simulator sim = SimulatorStorage.getSimulator(s);
+                        if (sim != null) {
+                            BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", player);
+                            return;
+                        }
+                        if (!s.matches("[a-zA-Z_0-9-]+")) {
+                            BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", player);
+                            return;
+                        }
+                        sim = new Simulator(s);
+                        SimulatorStorage.addSimulator(s, sim);
+                        createElement(player, cursorLocation, sim);
+                        SimulatorStorage.setSimulator(player, sim);
+                    });
+                    anvilInv.open();
+                }
+                return;
+            }
+
+            if (cursorLocation == null) {
+                new SimulatorGui(player, simulator).open();
+                return;
+            }
+
+            if (hitEntity.isPresent()) {
+                openElement(player, simulator, hitEntity.get());
+                return;
+            }
+
+            createElement(player, cursorLocation, simulator);
+        }
+
+        @Override
+        public void onMount(SWPlayer player) {
+            this.player = player.getPlayer();
+            refresh();
+        }
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            boolean hadCursor = cursor != null || player.hasComponent(Cursor.class);
+            removeGenericCursor();
+            closeEmptyTargetServer();
+            boolean watcherRemoved = SimulatorWatcher.show(null, this.player);
+            if (hadCursor || watcherRemoved) {
+                SWUtils.sendToActionbar(this.player, "");
+            }
+        }
+    }
+
+    public static boolean isSimulatorItem(ItemStack itemStack) {
+        return ItemUtils.isItem(itemStack, "simulator");
+    }
+
+    private static boolean hasSimulatorItem(Player player) {
+        return isSimulatorItem(player.getInventory().getItemInMainHand()) || isSimulatorItem(player.getInventory().getItemInOffHand());
+    }
+
+    @EventHandler
+    public void onPlayerDropItem(PlayerDropItemEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        calcCursor(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
+        Player player = event.getPlayer();
+        if (!Permission.BUILD.hasPermission(player)) return;
+
+        boolean hasSimulatorInNewMainHand = isSimulatorItem(player.getInventory().getItem(event.getNewSlot()));
+        boolean hasSimulatorInOffHand = isSimulatorItem(player.getInventory().getItemInOffHand());
+        if (!hasSimulatorInNewMainHand && !hasSimulatorInOffHand) {
+            boolean cursorRemoved = deactivateCursor(player);
+            boolean watcherRemoved = SimulatorWatcher.show(null, player);
+            if (cursorRemoved || watcherRemoved) {
+                SWUtils.sendToActionbar(player, "");
+            }
+            return;
+        }
+
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> calcCursor(player), 1);
+    }
+
+    @EventHandler
+    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        event.getChanged().forEach(SimulatorCursorManager::calcCursor);
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        deactivateCursor(event.getPlayer());
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
+        if (!event.isSneaking()) return;
+        Player player = event.getPlayer();
+        if (!hasSimulatorItem(player)) {
+            return;
+        }
+        SimulatorCursorComponent component = activateOrRefresh(player);
+        if (component == null) {
+            return;
+        }
+        boolean shouldSwitch = component.handleSneak(System.currentTimeMillis());
+        if (shouldSwitch) {
+            component.switchCursorMode();
+        }
+    }
+
+    public static CursorType getCursorType(Player player) {
+        return SWPlayer.of(player).getComponent(SimulatorCursorComponent.class)
+                .map(SimulatorCursorComponent::getCursorType)
+                .orElse(CursorType.TNT);
+    }
+
+    public static void setCursorType(Player player, CursorType cursorType) {
+        Optional<SimulatorCursorComponent> component = SWPlayer.of(player).getComponent(SimulatorCursorComponent.class);
+        if (component.isPresent()) {
+            component.get().setCursorType(cursorType);
+            return;
+        }
+
+        if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
+            return;
+        }
+        SWPlayer.of(player).setComponent(new SimulatorCursorComponent(cursorType));
+    }
+
+    public static void calcCursor(Player player) {
+        activateOrRefresh(player);
+    }
+
+    private static SimulatorCursorComponent activateOrRefresh(Player player) {
+        if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
+            boolean cursorRemoved = deactivateCursor(player);
+            boolean watcherRemoved = SimulatorWatcher.show(null, player);
+            if (cursorRemoved || watcherRemoved) {
+                SWUtils.sendToActionbar(player, "");
+            }
+            return null;
+        }
+
+        SWPlayer swPlayer = SWPlayer.of(player);
+        Optional<SimulatorCursorComponent> existingComponent = swPlayer.getComponent(SimulatorCursorComponent.class);
+        if (existingComponent.isPresent()) {
+            SimulatorCursorComponent component = existingComponent.get();
+            component.refresh();
+            return component;
+        }
+
+        SimulatorCursorComponent component = new SimulatorCursorComponent();
+        swPlayer.setComponent(component);
+        return component;
+    }
+
+    private static synchronized boolean deactivateCursor(Player player) {
+        SWPlayer swPlayer = SWPlayer.of(player);
+        boolean hadSimulatorCursor = swPlayer.hasComponent(SimulatorCursorComponent.class);
+        boolean hadCursor = swPlayer.hasComponent(Cursor.class);
+        swPlayer.removeComponent(SimulatorCursorComponent.class);
+        if (!hadSimulatorCursor) {
+            swPlayer.removeComponent(Cursor.class);
+        }
+        return hadSimulatorCursor || hadCursor;
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum CursorType {
+        TNT(Material.TNT, Material.GUNPOWDER, List.of(Cursor.CursorMode.SURFACE_ALIGNED, Cursor.CursorMode.FREE), "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
+        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
+        OBSERVER(Material.OBSERVER, Material.QUARTZ, List.of(Cursor.CursorMode.BLOCK_ALIGNED), "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
+        ;
+
+        public final Material material;
+        public final Material nonSelectedMaterial;
+        public final List<Cursor.CursorMode> cursorModes;
+        public final String name;
+        public final Function<Vector, SimulatorElement<?>> elementFunction;
+    }
+
+    private static void openElement(Player player, Simulator simulator, REntity hitEntity) {
+        Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
+        List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
+            return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
+        }).collect(Collectors.toList());
+
+        switch (elements.size()) {
+            case 0:
+                return;
+            case 1:
+                SimulatorElement<?> element = elements.get(0);
+                SimulatorGroup group1 = element.getGroup(simulator);
+                SimulatorBaseGui back = new SimulatorGui(player, simulator);
+                if (group1.getElements().size() > 1) {
+                    back = new SimulatorGroupGui(player, simulator, group1, back);
+                }
+                element.open(player, simulator, group1, back);
+                break;
+            default:
+                List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
+                if (parents.size() == 1) {
+                    SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                    new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
+                } else {
+                    SimulatorGroup group2 = new SimulatorGroup();
+                    group2.setMaterial(null);
+                    group2.getElements().addAll(elements);
+                    SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                    new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
+                }
+                break;
+        }
+    }
+
+    private static void createElement(Player player, Location cursorLocation, Simulator simulator) {
+        CursorType type = getCursorType(player);
+        Vector vector = cursorLocation.toVector();
+        if (type == CursorType.REDSTONE_BLOCK) {
+            vector.subtract(new Vector(0.5, 0, 0.5));
+        }
+        SimulatorElement<?> element = type.elementFunction.apply(vector);
+        SimulatorGroup group = new SimulatorGroup().add(element);
+        simulator.getGroups().add(group);
+        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+        element.open(player, simulator, group, simulatorGui);
+        SimulatorWatcher.update(simulator);
+        calcCursor(player);
+    }
+}

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

@@ -59,7 +59,7 @@ public class SimulatorStorage implements Enable {
     }
 
     public static Simulator getSimulator(ItemStack itemStack) {
-        if (!SimulatorCursor.isSimulatorItem(itemStack)) {
+        if (!SimulatorCursorManager.isSimulatorItem(itemStack)) {
             return null;
         }
         String selection = ItemUtils.getTag(itemStack, simulatorSelection);
@@ -181,9 +181,9 @@ public class SimulatorStorage implements Enable {
         ItemStack mainHand = player.getInventory().getItemInMainHand();
         ItemStack offHand = player.getInventory().getItemInOffHand();
         ItemStack itemStack;
-        if (SimulatorCursor.isSimulatorItem(mainHand)) {
+        if (SimulatorCursorManager.isSimulatorItem(mainHand)) {
             itemStack = mainHand;
-        } else if (SimulatorCursor.isSimulatorItem(offHand)) {
+        } else if (SimulatorCursorManager.isSimulatorItem(offHand)) {
             itemStack = offHand;
         } else {
             itemStack = null;

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

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.simulator.data;
 
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorConfig;
 import de.steamwar.inventory.InvCallback;
 import de.steamwar.inventory.SWItem;
 import lombok.Getter;
@@ -29,6 +28,7 @@ import lombok.Setter;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -121,9 +121,9 @@ public abstract class SimulatorElement<T extends SimulatorPhase> {
 
     public abstract String getType();
 
-    public void saveExtra(SimulatorConfig.Element element) {
+    public void saveExtra(YAPIONObject elementObject) {
     }
 
-    public void loadExtra(SimulatorConfig.Element element) {
+    public void loadExtra(YAPIONObject elementObject) {
     }
 }

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

@@ -20,10 +20,10 @@
 package de.steamwar.bausystem.features.simulator.data;
 
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorConfig;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.util.Vector;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.function.BiConsumer;
 
@@ -38,9 +38,9 @@ public abstract class SimulatorPhase {
 
     public abstract void toSimulatorActions(Vector position, BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd);
 
-    public void saveExtra(SimulatorConfig.Phase phase) {
+    public void saveExtra(YAPIONObject phaseObject) {
     }
 
-    public void loadExtra(SimulatorConfig.Phase phase) {
+    public void loadExtra(YAPIONObject phaseObject) {
     }
 }

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

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.simulator.data.observer;
 
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorConfig;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -32,6 +31,7 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.type.Observer;
 import org.bukkit.util.Vector;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.function.BiConsumer;
 
@@ -70,12 +70,12 @@ public final class ObserverPhase extends SimulatorPhase {
     }
 
     @Override
-    public void saveExtra(SimulatorConfig.Phase phase) {
+    public void saveExtra(YAPIONObject phaseObject) {
-        phase.setOrientation(orientation);
+        phaseObject.add("orientation", orientation.name());
     }
 
     @Override
-    public void loadExtra(SimulatorConfig.Phase phase) {
+    public void loadExtra(YAPIONObject phaseObject) {
-        if (phase.getOrientation() != null) orientation = phase.getOrientation();
+        orientation = BlockFace.valueOf(phaseObject.getPlainValue("orientation"));
     }
 }

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

@@ -24,13 +24,13 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.gui.SimulatorTNTGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorConfig;
 import de.steamwar.inventory.InvCallback;
 import de.steamwar.inventory.SWItem;
 import lombok.Getter;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
+import yapion.hierarchy.types.YAPIONObject;
 
 public final class TNTElement extends SimulatorElement<TNTPhase> {
 
@@ -100,14 +100,14 @@ public final class TNTElement extends SimulatorElement<TNTPhase> {
     }
 
     @Override
-    public void saveExtra(SimulatorConfig.Element element) {
+    public void saveExtra(YAPIONObject elementObject) {
-        element.setAlignmentX(alignment.getX());
+        elementObject.add("alignmentX", alignment.getX());
-        element.setAlignmentZ(alignment.getZ());
+        elementObject.add("alignmentZ", alignment.getZ());
     }
 
     @Override
-    public void loadExtra(SimulatorConfig.Element element) {
+    public void loadExtra(YAPIONObject elementObject) {
-        alignment.setX(element.getAlignmentX() != null ? element.getAlignmentX() : 0);
+        alignment.setX(elementObject.getDoubleOrSetDefault("alignmentX", 0));
-        alignment.setZ(element.getAlignmentZ() != null ? element.getAlignmentZ() : 0);
+        alignment.setZ(elementObject.getDoubleOrSetDefault("alignmentZ", 0));
     }
 }

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

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.simulator.data.tnt;
 
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorConfig;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.FreezeMode;
@@ -32,6 +31,7 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.function.BiConsumer;
 
@@ -83,18 +83,18 @@ public final class TNTPhase extends SimulatorPhase {
     }
 
     @Override
-    public void saveExtra(SimulatorConfig.Phase phase) {
+    public void saveExtra(YAPIONObject phaseObject) {
-        phase.setCount(count);
+        phaseObject.add("count", count);
-        phase.setXJump(xJump);
+        phaseObject.add("xJump", xJump);
-        phase.setYJump(yJump);
+        phaseObject.add("yJump", yJump);
-        phase.setZJump(zJump);
+        phaseObject.add("zJump", zJump);
     }
 
     @Override
-    public void loadExtra(SimulatorConfig.Phase phase) {
+    public void loadExtra(YAPIONObject phaseObject) {
-        if (phase.getCount() != null) count = phase.getCount();
+        count = phaseObject.getPlainValue("count");
-        if (phase.getXJump() != null) xJump = phase.getXJump();
+        xJump = phaseObject.getPlainValue("xJump");
-        if (phase.getYJump() != null) yJump = phase.getYJump();
+        yJump = phaseObject.getPlainValue("yJump");
-        if (phase.getZJump() != null) zJump = phase.getZJump();
+        zJump = phaseObject.getPlainValue("zJump");
     }
 }

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorCursor;
+import de.steamwar.bausystem.features.simulator.SimulatorCursorManager;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
@@ -50,14 +50,14 @@ public class SimulatorCursorSwitcherGui extends SimulatorBaseGui {
         }).setCustomModelData(CMDs.BACK));
 
         int slot = 2;
-        SimulatorCursor.CursorType currentType = SimulatorCursor.getCursorType(player);
+        SimulatorCursorManager.CursorType currentType = SimulatorCursorManager.getCursorType(player);
-        for (SimulatorCursor.CursorType type : SimulatorCursor.CursorType.values()) {
+        for (SimulatorCursorManager.CursorType type : SimulatorCursorManager.CursorType.values()) {
             boolean selected = type == currentType;
             SWItem swItem = new SWItem(selected ? type.material : type.nonSelectedMaterial, "§e" + type.name)
                     .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE)
                     .setLore(Collections.singletonList("§eClick to select"))
                     .setCallback(click -> {
-                        SimulatorCursor.setCursorType(player, type);
+                        SimulatorCursorManager.setCursorType(player, type);
                         player.closeInventory();
                     });
             inventory.setItem(slot, swItem);

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorCursor;
+import de.steamwar.bausystem.features.simulator.SimulatorCursorManager;
 import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
@@ -50,7 +50,7 @@ public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
         inventory.setItem(4, simulator.toItem(player, clickType -> {
             new SimulatorMaterialGui(player, simulator, simulator::getMaterial, simulator::setMaterial, this).open();
         }));
-        SimulatorCursor.CursorType cursorType = SimulatorCursor.getCursorType(player);
+        SimulatorCursorManager.CursorType cursorType = SimulatorCursorManager.getCursorType(player);
         inventory.setItem(48, new SWItem(cursorType.material, "§7Placing §8-§e " + cursorType.name, clickType -> {
             new SimulatorCursorSwitcherGui(player, simulator, this).open();
         }));

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

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.features.simulator.storage;
 
-import com.google.gson.JsonParseException;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
@@ -30,7 +29,12 @@ import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import org.bukkit.Material;
 import org.bukkit.util.Vector;
+import yapion.exceptions.YAPIONException;
+import yapion.hierarchy.types.YAPIONArray;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.parser.YAPIONParser;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,41 +51,44 @@ public class SimFormatSimulatorLoader implements SimulatorLoader {
             return Optional.empty();
         }
 
-        SimulatorConfig config;
+        YAPIONObject yapionObject;
         try {
-            config = SimulatorConfig.STORE.load(file);
+            yapionObject = YAPIONParser.parse(file);
-        } catch (JsonParseException | IllegalStateException | IOException e) {
+        } catch (YAPIONException | IOException e) {
             return Optional.empty();
         }
 
         String name = file.getName().substring(0, file.getName().length() - ".sim".length());
 
         Simulator simulator = new Simulator(name);
-        loadSimulator(config, simulator);
+        loadSimulator(yapionObject, simulator);
         return Optional.of(Collections.singletonList(simulator));
     }
 
-    private void loadSimulator(SimulatorConfig config, Simulator simulator) {
+    private void loadSimulator(YAPIONObject simulatorObject, Simulator simulator) {
-        if (config.getMaterial() != null) simulator.setMaterial(config.getMaterial());
+        simulator.setMaterial(Material.valueOf(simulatorObject.getPlainValue("material")));
-        simulator.setAutoTrace(config.isAutoTrace());
+        simulator.setAutoTrace(simulatorObject.getPlainValue("autoTrace"));
-        simulator.setAutoTestblock(config.isAutoTestblock());
+        simulator.setAutoTestblock(simulatorObject.getPlainValueOrDefault("autoTestblock", false));
 
-        config.getGroups().forEach(groupConfig -> {
+        YAPIONArray groups = simulatorObject.getArray("groups");
+        groups.streamObject().forEach(groupObject -> {
             SimulatorGroup simulatorGroup = new SimulatorGroup();
-            loadGroup(groupConfig, simulatorGroup);
+            loadGroup(groupObject, simulatorGroup);
             simulator.add(simulatorGroup);
         });
     }
 
-    private void loadGroup(SimulatorConfig.Group groupConfig, SimulatorGroup group) {
+    private void loadGroup(YAPIONObject groupObject, SimulatorGroup group) {
-        if (groupConfig.getMaterial() != null) group.setMaterial(groupConfig.getMaterial());
+        group.setMaterial(Material.valueOf(groupObject.getPlainValue("material")));
-        group.setDisabled(groupConfig.isDisabled());
+        group.setDisabled(groupObject.getPlainValue("disabled"));
 
-        groupConfig.getElements().forEach(elementConfig -> {
+        YAPIONArray elements = groupObject.getArray("elements");
+        elements.streamObject().forEach(elementObject -> {
             SimulatorElement<?> element;
             Supplier<SimulatorPhase> phaseConstructor;
-            Vector position = new Vector(elementConfig.getX(), elementConfig.getY(), elementConfig.getZ());
+            Vector position = new Vector(elementObject.getDouble("x"), elementObject.getDouble("y"), elementObject.getDouble("z"));
-            switch (String.valueOf(elementConfig.getType())) {
+            String type = elementObject.getPlainValue("type");
+            switch (type) {
                 case "TNT":
                     element = new TNTElement(position);
                     phaseConstructor = TNTPhase::new;
@@ -102,27 +109,28 @@ public class SimFormatSimulatorLoader implements SimulatorLoader {
             if (element == null) {
                 return;
             }
-            loadElement(elementConfig, element, phaseConstructor);
+            loadElement(elementObject, element, phaseConstructor);
             group.add(element);
         });
     }
 
-    private void loadElement(SimulatorConfig.Element elementConfig, SimulatorElement<?> element, Supplier<SimulatorPhase> phaseConstructor) {
+    private void loadElement(YAPIONObject elementObject, SimulatorElement<?> element, Supplier<SimulatorPhase> phaseConstructor) {
-        if (elementConfig.getMaterial() != null) element.setMaterial(elementConfig.getMaterial());
+        element.setMaterial(Material.valueOf(elementObject.getPlainValue("material")));
-        element.setDisabled(elementConfig.isDisabled());
+        element.setDisabled(elementObject.getPlainValue("disabled"));
-        element.loadExtra(elementConfig);
+        element.loadExtra(elementObject);
 
-        elementConfig.getPhases().forEach(phaseConfig -> {
+        YAPIONArray phases = elementObject.getArray("phases");
+        phases.streamObject().forEach(phaseObject -> {
             SimulatorPhase phase = phaseConstructor.get();
-            loadPhase(phaseConfig, phase);
+            loadPhase(phaseObject, phase);
             ((SimulatorElement) element).add(phase);
         });
     }
 
-    private void loadPhase(SimulatorConfig.Phase phaseConfig, SimulatorPhase phase) {
+    private void loadPhase(YAPIONObject phaseObject, SimulatorPhase phase) {
-        phase.setTickOffset(phaseConfig.getTickOffset());
+        phase.setTickOffset(phaseObject.getPlainValue("tickOffset"));
-        phase.setLifetime(phaseConfig.getLifetime());
+        phase.setLifetime(phaseObject.getPlainValue("lifetime"));
-        phase.setOrder(phaseConfig.getOrder());
+        phase.setOrder(phaseObject.getPlainValue("order"));
-        phase.loadExtra(phaseConfig);
+        phase.loadExtra(phaseObject);
     }
 }

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

@@ -1,117 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator.storage;
-
-import de.steamwar.bausystem.config.ConfigStore;
-import de.steamwar.bausystem.config.VersionedConfig;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The current stored form of a simulator, saved as JSON in a .sim file. Files
- * saved before the version was stored have no version and are version 1.
- * Fields missing in the stored JSON keep the default value of their initializer,
- * so adding a new field does not need a new version.
- * <p>
- * When a field gets removed, renamed or its meaning changes, copy this class
- * to SimulatorConfigV{@link #VERSION} (without the {@link #STORE}), increase {@link #VERSION}, write a
- * {@link de.steamwar.bausystem.config.ConfigConverter} from the copy to
- * this class and register it in the {@link #STORE}.
- */
-@Getter
-@Setter
-public class SimulatorConfig implements VersionedConfig {
-
-    public static final int VERSION = 1;
-
-    /**
-     * Files saved before the version was stored are version 1
-     */
-    public static final ConfigStore<SimulatorConfig> STORE = new ConfigStore<>(SimulatorConfig.class, VERSION, SimulatorConfig::new)
-            .unversioned(1);
-
-    @Setter(AccessLevel.NONE)
-    protected int version = VERSION;
-
-    protected Material material = Material.BARREL;
-    protected boolean autoTrace = false;
-    protected boolean autoTestblock = false;
-    protected List<Group> groups = new ArrayList<>();
-
-    @Getter
-    @Setter
-    public static class Group {
-
-        protected Material material = Material.CHEST;
-        protected boolean disabled = false;
-        protected List<Element> elements = new ArrayList<>();
-    }
-
-    @Getter
-    @Setter
-    public static class Element {
-
-        /**
-         * One of "TNT", "Redstone" or "Observer"
-         */
-        protected String type;
-        protected Material material;
-        protected boolean disabled = false;
-        protected double x;
-        protected double y;
-        protected double z;
-
-        /**
-         * Only used by TNT
-         */
-        protected Double alignmentX;
-        protected Double alignmentZ;
-
-        protected List<Phase> phases = new ArrayList<>();
-    }
-
-    @Getter
-    @Setter
-    public static class Phase {
-
-        protected int tickOffset;
-        protected int lifetime;
-        protected int order;
-
-        /**
-         * Only used by TNT
-         */
-        protected Integer count;
-        protected Boolean xJump;
-        protected Boolean yJump;
-        protected Boolean zJump;
-
-        /**
-         * Only used by Observer
-         */
-        protected BlockFace orientation;
-    }
-}

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

@@ -19,30 +19,24 @@
 
 package de.steamwar.bausystem.features.simulator.storage;
 
-import de.steamwar.bausystem.config.legacy.YapionReader;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import org.bukkit.Material;
 import org.bukkit.util.Vector;
+import yapion.exceptions.YAPIONException;
+import yapion.hierarchy.types.YAPIONArray;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.parser.YAPIONParser;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
-import static de.steamwar.bausystem.config.legacy.YapionReader.*;
-
-/**
- * Loads the legacy .simulator files stored as YAPION, they are deleted after loading
- * and saved in the current format by the {@link SimulatorSaver}.
- */
-@Deprecated
 public class SimulatorFormatSimulatorLoader implements SimulatorLoader {
 
     @Override
@@ -51,19 +45,20 @@ public class SimulatorFormatSimulatorLoader implements SimulatorLoader {
             return Optional.empty();
         }
 
-        Map<String, Object> yapionObject;
+        YAPIONObject yapionObject;
         try {
-            yapionObject = YapionReader.parse(Files.readString(file.toPath(), StandardCharsets.UTF_8));
+            yapionObject = YAPIONParser.parse(file);
-        } catch (IllegalArgumentException | IOException e) {
+        } catch (YAPIONException | IOException e) {
             return Optional.empty();
         }
 
         String name = file.getName().substring(0, file.getName().length() - ".simulator".length());
 
         Simulator simulator = new Simulator(name);
-        simulator.setMaterial(Material.valueOf(getString(yapionObject, "material", "BARREL")));
+        simulator.setMaterial(Material.valueOf(yapionObject.getStringOrDefault("material", "BARREL")));
 
-        for (Map<?, ?> element : getObjects(yapionObject, "tntElements")) {
+        YAPIONArray tntElements = yapionObject.getArrayOrDefault("tntElements", new YAPIONArray());
+        for (YAPIONObject element : tntElements.streamObject().collect(Collectors.toList())) {
             if (element.containsKey("elements")) {
                 simulator.add(loadGroup(element));
             } else {
@@ -75,26 +70,27 @@ public class SimulatorFormatSimulatorLoader implements SimulatorLoader {
         return Optional.of(Collections.singletonList(simulator));
     }
 
-    private SimulatorGroup loadGroup(Map<?, ?> element) {
+    private SimulatorGroup loadGroup(YAPIONObject element) {
-        double x = getDouble(element, "x", 0);
+        double x = element.getDoubleOrDefault("x", 0);
-        double y = getDouble(element, "y", 0);
+        double y = element.getDoubleOrDefault("y", 0);
-        double z = getDouble(element, "z", 0);
+        double z = element.getDoubleOrDefault("z", 0);
-        int tickOffset = getInt(element, "tickOffset", 0);
+        int tickOffset = element.getIntOrDefault("tickOffset", 0);
 
         SimulatorGroup simulatorGroup = new SimulatorGroup();
-        simulatorGroup.setDisabled(getBoolean(element, "disabled", false));
+        simulatorGroup.setDisabled(element.getBooleanOrDefault("disabled", false));
 
-        for (Map<?, ?> e : getObjects(element, "elements")) {
+        YAPIONArray elements = element.getArrayOrDefault("elements", new YAPIONArray());
+        for (YAPIONObject e : elements.streamObject().collect(Collectors.toList())) {
             simulatorGroup.add(loadElement(e, x, y, z, tickOffset));
         }
 
         return simulatorGroup;
     }
 
-    private TNTElement loadElement(Map<?, ?> element, double dx, double dy, double dz, int dTickOffset) {
+    private TNTElement loadElement(YAPIONObject element, double dx, double dy, double dz, int dTickOffset) {
-        TNTElement tntElement = new TNTElement(new Vector(requireDouble(element, "x") + dx, requireDouble(element, "y") + dy, requireDouble(element, "z") + dz));
+        TNTElement tntElement = new TNTElement(new Vector(element.getDouble("x") + dx, element.getDouble("y") + dy, element.getDouble("z") + dz));
-        tntElement.setDisabled(getBoolean(element, "disabled", false));
+        tntElement.setDisabled(element.getBooleanOrDefault("disabled", false));
-        tntElement.setMaterial(Material.valueOf(getString(element, "material", "TNT")));
+        tntElement.setMaterial(Material.valueOf(element.getStringOrDefault("material", "TNT")));
 
         TNTPhase tntPhase = loadPhase(element);
         tntPhase.setTickOffset(tntPhase.getTickOffset() + dTickOffset);
@@ -103,12 +99,12 @@ public class SimulatorFormatSimulatorLoader implements SimulatorLoader {
         return tntElement;
     }
 
-    private SimulatorGroup loadElement(Map<?, ?> element) {
+    private SimulatorGroup loadElement(YAPIONObject element) {
         SimulatorGroup simulatorGroup = new SimulatorGroup();
 
-        TNTElement tntElement = new TNTElement(new Vector(requireDouble(element, "x"), requireDouble(element, "y"), requireDouble(element, "z")));
+        TNTElement tntElement = new TNTElement(new Vector(element.getDouble("x"), element.getDouble("y"), element.getDouble("z")));
-        tntElement.setDisabled(getBoolean(element, "disabled", false));
+        tntElement.setDisabled(element.getBooleanOrDefault("disabled", false));
-        tntElement.setMaterial(Material.valueOf(getString(element, "material", "TNT")));
+        tntElement.setMaterial(Material.valueOf(element.getStringOrDefault("material", "TNT")));
         simulatorGroup.add(tntElement);
 
         tntElement.add(loadPhase(element));
@@ -116,15 +112,15 @@ public class SimulatorFormatSimulatorLoader implements SimulatorLoader {
         return simulatorGroup;
     }
 
-    private TNTPhase loadPhase(Map<?, ?> element) {
+    private TNTPhase loadPhase(YAPIONObject element) {
         TNTPhase tntPhase = new TNTPhase();
-        tntPhase.setLifetime(getInt(element, "fuseTicks", 80));
+        tntPhase.setLifetime(element.getIntOrDefault("fuseTicks", 80));
-        tntPhase.setCount(getInt(element, "count", 1));
+        tntPhase.setCount(element.getIntOrDefault("count", 1));
-        tntPhase.setTickOffset(getInt(element, "tickOffset", 0));
+        tntPhase.setTickOffset(element.getIntOrDefault("tickOffset", 0));
-        tntPhase.setXJump(getBoolean(element, "xVelocity", false));
+        tntPhase.setXJump(element.getBooleanOrDefault("xVelocity", false));
-        tntPhase.setYJump(getBoolean(element, "yVelocity", false));
+        tntPhase.setYJump(element.getBooleanOrDefault("yVelocity", false));
-        tntPhase.setZJump(getBoolean(element, "zVelocity", false));
+        tntPhase.setZJump(element.getBooleanOrDefault("zVelocity", false));
-        switch (getString(element, "order", "REPEATER")) {
+        switch (element.getStringOrDefault("order", "REPEATER")) {
             case "REPEATER":
                 tntPhase.setOrder(0);
                 break;
@@ -137,8 +133,4 @@ public class SimulatorFormatSimulatorLoader implements SimulatorLoader {
         }
         return tntPhase;
     }
-
-    private double requireDouble(Map<?, ?> element, String key) {
-        return ((Number) element.get(key)).doubleValue();
-    }
 }

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

@@ -21,6 +21,9 @@ package de.steamwar.bausystem.features.simulator.storage;
 
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import lombok.experimental.UtilityClass;
+import yapion.hierarchy.output.FileOutput;
+import yapion.hierarchy.types.YAPIONArray;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,42 +36,48 @@ public class SimulatorSaver {
             directory.mkdirs();
         }
 
-        SimulatorConfig config = new SimulatorConfig();
+        YAPIONObject simulatorObject = new YAPIONObject();
-        config.setMaterial(simulator.getMaterial());
+        simulatorObject.add("material", simulator.getMaterial().name());
-        config.setAutoTrace(simulator.isAutoTrace());
+        simulatorObject.add("autoTrace", simulator.isAutoTrace());
-        config.setAutoTestblock(simulator.isAutoTestblock());
+        simulatorObject.add("autoTestblock", simulator.isAutoTestblock());
 
+        YAPIONArray groups = new YAPIONArray();
         simulator.getGroups().forEach(group -> {
-            SimulatorConfig.Group groupConfig = new SimulatorConfig.Group();
+            YAPIONObject groupObject = new YAPIONObject();
-            groupConfig.setMaterial(group.getMaterial());
+            groupObject.add("material", group.getMaterial().name());
-            groupConfig.setDisabled(group.isDisabled());
+            groupObject.add("disabled", group.isDisabled());
 
+            YAPIONArray elements = new YAPIONArray();
             group.getElements().forEach(element -> {
-                SimulatorConfig.Element elementConfig = new SimulatorConfig.Element();
+                YAPIONObject elementObject = new YAPIONObject();
-                elementConfig.setType(element.getType());
+                elementObject.add("type", element.getType());
-                elementConfig.setMaterial(element.getMaterial());
+                elementObject.add("material", element.getMaterial().name());
-                elementConfig.setDisabled(element.isDisabled());
+                elementObject.add("disabled", element.isDisabled());
-                elementConfig.setX(element.getPosition().getX());
+                elementObject.add("x", element.getPosition().getX());
-                elementConfig.setY(element.getPosition().getY());
+                elementObject.add("y", element.getPosition().getY());
-                elementConfig.setZ(element.getPosition().getZ());
+                elementObject.add("z", element.getPosition().getZ());
-                element.saveExtra(elementConfig);
+                element.saveExtra(elementObject);
 
+                YAPIONArray phases = new YAPIONArray();
                 element.getPhases().forEach(phase -> {
-                    SimulatorConfig.Phase phaseConfig = new SimulatorConfig.Phase();
+                    YAPIONObject phaseObject = new YAPIONObject();
-                    phaseConfig.setTickOffset(phase.getTickOffset());
+                    phaseObject.add("tickOffset", phase.getTickOffset());
-                    phaseConfig.setLifetime(phase.getLifetime());
+                    phaseObject.add("lifetime", phase.getLifetime());
-                    phaseConfig.setOrder(phase.getOrder());
+                    phaseObject.add("order", phase.getOrder());
-                    phase.saveExtra(phaseConfig);
+                    phase.saveExtra(phaseObject);
-                    elementConfig.getPhases().add(phaseConfig);
+                    phases.add(phaseObject);
                 });
-                groupConfig.getElements().add(elementConfig);
+                elementObject.add("phases", phases);
+                elements.add(elementObject);
             });
-            config.getGroups().add(groupConfig);
+            groupObject.add("elements", elements);
+            groups.add(groupObject);
         });
+        simulatorObject.add("groups", groups);
 
         File file = new File(directory, simulator.getName() + ".sim");
         try {
-            SimulatorConfig.STORE.save(file, config);
+            simulatorObject.toJSONLossy(new FileOutput(file)).close();
         } catch (IOException e) {
             // Ignore
         }

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

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.features.simulator.storage;
 
-import de.steamwar.bausystem.config.legacy.YapionReader;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
@@ -27,23 +26,18 @@ import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Material;
 import org.bukkit.util.Vector;
+import yapion.exceptions.YAPIONException;
+import yapion.hierarchy.types.YAPIONArray;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.parser.YAPIONParser;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
-import static de.steamwar.bausystem.config.legacy.YapionReader.*;
-
-/**
- * Loads the legacy per player .yapion files containing multiple simulators, they are
- * deleted after loading and saved in the current format by the {@link SimulatorSaver}.
- */
-@Deprecated
 public class YAPIONFormatSimulatorLoader implements SimulatorLoader {
 
     @Override
@@ -52,10 +46,10 @@ public class YAPIONFormatSimulatorLoader implements SimulatorLoader {
             return Optional.empty();
         }
 
-        Map<String, Object> yapionObject;
+        YAPIONObject yapionObject;
         try {
-            yapionObject = YapionReader.parse(Files.readString(file.toPath(), StandardCharsets.UTF_8));
+            yapionObject = YAPIONParser.parse(file);
-        } catch (IllegalArgumentException | IOException e) {
+        } catch (YAPIONException | IOException e) {
             return Optional.empty();
         }
 
@@ -63,28 +57,28 @@ public class YAPIONFormatSimulatorLoader implements SimulatorLoader {
         SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(name));
 
         List<Simulator> simulators = new ArrayList<>();
-        for (String s : yapionObject.keySet()) {
+        for (String s : yapionObject.getKeys()) {
             String newName = steamwarUser.getUserName() + (s.isEmpty() ? "" : "_" + s);
-            List<Map<?, ?>> content = getObjects(yapionObject, s);
+            YAPIONArray content = yapionObject.getArray(s);
             if (content.isEmpty()) continue;
             Simulator simulator = new Simulator(newName);
-            for (Map<?, ?> element : content) {
+            for (YAPIONObject element : content.streamObject().collect(Collectors.toList())) {
                 SimulatorGroup simulatorGroup = new SimulatorGroup();
                 simulator.add(simulatorGroup);
 
-                TNTElement tntElement = new TNTElement(new Vector(requireDouble(element, "positionX"), requireDouble(element, "positionY"), requireDouble(element, "positionZ")));
+                TNTElement tntElement = new TNTElement(new Vector(element.getDouble("positionX"), element.getDouble("positionY"), element.getDouble("positionZ")));
-                tntElement.setDisabled(getBoolean(element, "disabled", false)); // IDK if this existed back then?
+                tntElement.setDisabled(element.getBooleanOrDefault("disabled", false)); // IDK if this existed back then?
-                tntElement.setMaterial(Material.valueOf(getString(element, "material", "TNT")));
+                tntElement.setMaterial(Material.valueOf(element.getStringOrDefault("material", "TNT")));
                 simulatorGroup.add(tntElement);
 
                 TNTPhase tntPhase = new TNTPhase();
-                tntPhase.setLifetime(getInt(element, "fuseTicks", 80));
+                tntPhase.setLifetime(element.getIntOrDefault("fuseTicks", 80));
-                tntPhase.setCount(getInt(element, "count", 1));
+                tntPhase.setCount(element.getIntOrDefault("count", 1));
-                tntPhase.setTickOffset(getInt(element, "tickOffset", 0));
+                tntPhase.setTickOffset(element.getIntOrDefault("tickOffset", 0));
-                tntPhase.setXJump(getBoolean(element, "xVelocity", false));
+                tntPhase.setXJump(element.getBooleanOrDefault("xVelocity", false));
-                tntPhase.setYJump(getBoolean(element, "yVelocity", false));
+                tntPhase.setYJump(element.getBooleanOrDefault("yVelocity", false));
-                tntPhase.setZJump(getBoolean(element, "zVelocity", false));
+                tntPhase.setZJump(element.getBooleanOrDefault("zVelocity", false));
-                tntPhase.setOrder(getBoolean(element, "comparator", false) ? 2 : 0);
+                tntPhase.setOrder(element.getBooleanOrDefault("comparator", false) ? 2 : 0);
                 tntElement.add(tntPhase);
             }
             simulators.add(simulator);
@@ -93,8 +87,4 @@ public class YAPIONFormatSimulatorLoader implements SimulatorLoader {
         file.delete();
         return Optional.of(simulators);
     }
-
-    private double requireDouble(Map<?, ?> element, String key) {
-        return ((Number) element.get(key)).doubleValue();
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/blastresistance/BlastResistanceCommand.java

@@ -1,72 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.slaves.blastresistance;
-
-import com.google.common.util.concurrent.AtomicDouble;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.world.block.BlockState;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Linked
-public class BlastResistanceCommand extends SWCommand {
-
-    public BlastResistanceCommand() {
-        super("blastresistance");
-    }
-
-    @Register(description = "BLASTRESISTANCE_HELP")
-    public void command(@Validator Player player) {
-        LocalSession localSession = WorldEdit.getInstance().getSessionManager().get(BukkitAdapter.adapt(player));
-        Clipboard clipboard;
-        try {
-            clipboard = localSession.getClipboard().getClipboards().getFirst();
-        } catch (WorldEditException e) {
-            BauSystem.MESSAGE.send("BLASTRESISTANCE_NO_CLIPBOARD", player);
-            return;
-        }
-
-        AtomicDouble min = new AtomicDouble(0);
-        AtomicDouble max = new AtomicDouble(0);
-        AtomicDouble sum = new AtomicDouble(0);
-        AtomicInteger count = new AtomicInteger(0);
-        clipboard.forEach(blockVector3 -> {
-            BlockState blockState = clipboard.getBlock(blockVector3);
-            Material material = BukkitAdapter.adapt(blockState).getMaterial();
-            if (material == Material.WATER || material == Material.LAVA) return;
-            double blastResistance = BukkitAdapter.adapt(blockState).getMaterial().getBlastResistance();
-            min.set(Math.min(min.get(), blastResistance));
-            max.set(Math.max(max.get(), blastResistance));
-            sum.addAndGet(blastResistance);
-            count.getAndIncrement();
-        });
-
-        BauSystem.MESSAGE.send("BLASTRESISTANCE_RESULT", player, min.get(), max.get(), sum.get() / count.get());
-    }
-}

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

@@ -1,64 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.slaves.laufbau;
-
-import de.steamwar.bausystem.config.ConfigStore;
-import de.steamwar.bausystem.config.VersionedConfig;
-import de.steamwar.bausystem.features.slaves.laufbau.converter.LaufbauConfigV1ToV2Converter;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * The current laufbau config of a player. It is stored as JSON, fields missing
- * in the stored JSON keep the default value of their initializer, so adding a
- * new field does not need a new version.
- * <p>
- * When a field gets removed, renamed or its meaning changes, copy this class
- * to LaufbauConfigV{@link #VERSION} (without the {@link #STORE}), increase {@link #VERSION}, write a
- * {@link de.steamwar.bausystem.config.ConfigConverter} from the copy to
- * this class and register it in the {@link #STORE}.
- */
-@Getter
-@Setter
-public class LaufbauConfig implements VersionedConfig {
-
-    public static final int VERSION = 2;
-
-    /**
-     * LaufbauConfigV1 is stored as Base64 of gzipped YAPION, the current version as JSON
-     */
-    public static final ConfigStore<LaufbauConfig> STORE = new ConfigStore<>(LaufbauConfig.class, VERSION, LaufbauConfig::new)
-            .legacy(s -> !s.startsWith("{"), LaufbauConfigV1::parse)
-            .converter(new LaufbauConfigV1ToV2Converter())
-            .userConfig("bausystem-laufbau")
-            .removeIf(config -> config.getDeactivated().isEmpty());
-
-    @Setter(AccessLevel.NONE)
-    protected int version = VERSION;
-
-    /**
-     * Identifiers of the deactivated {@link BlockBoundingBox}es, see {@link LaufbauUtils#identifier(BlockBoundingBox)}
-     */
-    protected Set<String> deactivated = new HashSet<>();
-}

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

@@ -1,65 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.slaves.laufbau;
-
-import de.steamwar.bausystem.config.VersionedConfig;
-import de.steamwar.bausystem.config.legacy.YapionReader;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.zip.GZIPInputStream;
-
-/**
- * The legacy laufbau config that was stored as Base64 of the gzipped YAPION,
- * an object with the deactivated identifiers as keys.
- */
-@Getter
-@Setter
-@Deprecated
-public class LaufbauConfigV1 implements VersionedConfig {
-
-    public static final int VERSION = 1;
-
-    @Setter(AccessLevel.NONE)
-    protected int version = VERSION;
-
-    protected Set<String> deactivated = new HashSet<>();
-
-    public static LaufbauConfigV1 parse(String base64) {
-        String yapion;
-        try (InputStream inputStream = new GZIPInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(base64)))) {
-            yapion = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-        LaufbauConfigV1 config = new LaufbauConfigV1();
-        config.deactivated.addAll(YapionReader.parse(yapion).keySet());
-        return config;
-    }
-}

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

@@ -20,22 +20,63 @@
 package de.steamwar.bausystem.features.slaves.laufbau;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.sql.UserConfig;
+import lombok.Cleanup;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.meta.ItemMeta;
+import yapion.hierarchy.output.StreamOutput;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.parser.YAPIONParser;
+import yapion.parser.options.StreamOptions;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 @UtilityClass
 public class LaufbauUtils {
 
+    public static class LaufbauComponent implements SWPlayer.Component {
+
+        private YAPIONObject yapionObject = new YAPIONObject();
+
+        @Override
+        @SneakyThrows
+        public void onMount(SWPlayer player) {
+            String config = UserConfig.getConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
+            if (config == null) {
+                return;
+            }
+            byte[] bytes = Base64.getDecoder().decode(config);
+            @Cleanup GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(bytes));
+            yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
+        }
+
+        @Override
+        @SneakyThrows
+        public void onUnmount(SWPlayer player) {
+            if (yapionObject.isEmpty()) {
+                UserConfig.removePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
+                return;
+            }
+            @Cleanup ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            @Cleanup GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
+            yapionObject.toYAPION(new StreamOutput(gzipOutputStream)).close();
+            UserConfig.updatePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau", Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()));
+        }
+    }
+
     public static Cuboid pixelCuboid(double pixelX, double pixelY, double pixelZ, double pixelDX, double pixelDY, double pixelDZ) {
         return new Cuboid(pixelToBlock(pixelX), pixelToBlock(pixelY), pixelToBlock(pixelZ), pixelToBlock(pixelDX), pixelToBlock(pixelDY), pixelToBlock(pixelDZ));
     }
@@ -82,7 +123,7 @@ public class LaufbauUtils {
             return false;
         }
         String identifier = identifier(bb);
-        return LaufbauConfig.STORE.get(p).getDeactivated().contains(identifier);
+        return SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject.containsKey(identifier);
     }
 
     @SneakyThrows
@@ -91,9 +132,11 @@ public class LaufbauUtils {
             return;
         }
         String identifier = identifier(bb);
-        Set<String> deactivated = LaufbauConfig.STORE.get(p).getDeactivated();
+        YAPIONObject yapionObject = SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject;
-        if (!deactivated.remove(identifier)) {
+        if (yapionObject.containsKey(identifier)) {
-            deactivated.add(identifier);
+            yapionObject.remove(identifier);
+        } else {
+            yapionObject.put(identifier, new YAPIONObject());
         }
     }
 }

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

@@ -1,40 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.slaves.laufbau.converter;
-
-import de.steamwar.bausystem.config.ConfigConverter;
-import de.steamwar.bausystem.features.slaves.laufbau.LaufbauConfig;
-import de.steamwar.bausystem.features.slaves.laufbau.LaufbauConfigV1;
-
-@Deprecated
-public class LaufbauConfigV1ToV2Converter implements ConfigConverter<LaufbauConfigV1, LaufbauConfig> {
-
-    @Override
-    public int version() {
-        return LaufbauConfigV1.VERSION;
-    }
-
-    @Override
-    public LaufbauConfig convert(LaufbauConfigV1 old) {
-        LaufbauConfig config = new LaufbauConfig();
-        config.getDeactivated().addAll(old.getDeactivated());
-        return config;
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceCommand.java

@@ -35,8 +35,8 @@ public class SmartPlaceCommand extends SWCommand {
 
     @Register(description = {"SMART_PLACE_HELP", "SMART_PLACE_INFO"})
     public void genericToggle(Player p) {
-        boolean smartPlace = Config.STORE.get(p).isSmartPlace();
+        boolean smartPlace = Config.getInstance().get(p).getPlainValueOrDefault("smartPlace", false);
-        Config.STORE.get(p).setSmartPlace(!smartPlace);
+        Config.getInstance().get(p).put("smartPlace", !smartPlace);
         if (!smartPlace) {
             SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("SMART_PLACE_ENABLE", p));
             BauSystem.MESSAGE.send("SMART_PLACE_INFO", p);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java

@@ -19,10 +19,12 @@
 
 package de.steamwar.bausystem.features.smartplace;
 
+import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.linkage.Linked;
+import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -32,98 +34,104 @@ import org.bukkit.block.data.*;
 import org.bukkit.block.data.type.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.RayTraceResult;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Linked
 public class SmartPlaceListener implements Listener {
 
-    private static final Set<Material> IGNORED = Set.of(Material.TNT, Material.REDSTONE_ORE, Material.BEEHIVE, Material.SEA_PICKLE);
+    private static final Set<Material> CONTAINERS = new HashSet<>();
+    private static final Set<Material> IGNORED = new HashSet<>();
 
-    private static final Set<UUID> FAKED_SNEAK = new HashSet<>();
+    static {
-
+        World world = Bukkit.getWorlds().get(0);
-    private static boolean isContainer(Block block) {
+        Block block = world.getBlockAt(0, 0, 0);
-        if (block.getType() == Material.COMPARATOR) return false;
+        block.setType(Material.AIR);
-        if (block.getType() == Material.GRINDSTONE) return true;
+        BlockState state = block.getState();
-        return block.getState() instanceof TileState || block.getBlockData() instanceof Stairs;
+        for (Material material : Material.values()) {
-    }
+            if (material.isLegacy()) continue;
-
+            if (!material.isInteractable() && !material.isBlock()) continue;
-    private static boolean isReallySneaking(Player player) {
+            BlockData blockData = material.createBlockData();
-        return player.isSneaking() && !FAKED_SNEAK.contains(player.getUniqueId());
+            block.setBlockData(blockData);
-    }
+            if (block.getState() instanceof TileState) {
-
+                CONTAINERS.add(material);
-    private static boolean shouldSmartPlace(Block block, BlockFace blockFace, Material heldType) {
+            } else if (blockData instanceof Stairs) {
-        boolean smartPlace = false;
+                CONTAINERS.add(material);
-        if (block.getType().isInteractable() || block.getType() == Material.NOTE_BLOCK) {
+            }
-            smartPlace = true;
+            state.update(true, false);
         }
-        if (isContainer(block)) {
+        CONTAINERS.add(Material.GRINDSTONE);
-            if (heldType == Material.TNT) {
+        CONTAINERS.remove(Material.COMPARATOR);
-                if (block.getType() == Material.CHEST || block.getType() == Material.BARREL || block.getType().name().endsWith("SHULKER_BOX")) {
+        state.update(true, false);
-                    smartPlace = false;
+
+        IGNORED.add(Material.TNT);
+        IGNORED.add(Material.REDSTONE_ORE);
+        IGNORED.add(Material.BEEHIVE);
+        IGNORED.add(Material.SEA_PICKLE);
+        IGNORED.remove(Material.STONE);
+        IGNORED.remove(Material.BARRIER);
+    }
+
+    private static final Set<Player> SMART_PLACING = new HashSet<>();
+    private static final Set<Player> WAS_EXECUTED = new HashSet<>();
+
+    public SmartPlaceListener() {
+        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, (player, packet) -> {
+            if (!Permission.BUILD.hasPermission(player)) return packet;
+            if (!Config.getInstance().get(player).getPlainValueOrDefault("smartPlace", false)) return packet;
+            RayTraceResult rayTraceResult = player.rayTraceBlocks(6);
+            Block block = rayTraceResult != null ? rayTraceResult.getHitBlock() : null;
+            BlockFace blockFace = rayTraceResult != null ? rayTraceResult.getHitBlockFace() : null;
+            boolean shouldSneak = false;
+            if (block != null) {
+                ItemStack itemStack = player.getInventory().getItemInMainHand();
+                if (block.getType().isInteractable() || block.getType() == Material.NOTE_BLOCK) {
+                    shouldSneak = true;
+                }
+                if (CONTAINERS.contains(block.getType())) {
+                    if (itemStack.getType() == Material.TNT) {
+                        if (block.getType() == Material.CHEST || block.getType() == Material.BARREL || block.getType().name().endsWith("SHULKER_BOX")) {
+                            shouldSneak = false;
+                        }
+                    }
+                } else {
+                    shouldSneak = false;
+                }
+                if (IGNORED.contains(block.getType())) {
+                    shouldSneak = false;
+                }
+                if (blockFace == BlockFace.DOWN && (block.getType() == Material.REPEATER || block.getType() == Material.COMPARATOR) && itemStack.getType().isSolid()) {
+                    shouldSneak = true;
                 }
             }
-        } else {
+            boolean sneaking = player.isSneaking();
-            smartPlace = false;
+            if (sneaking) SMART_PLACING.add(player);
-        }
+            player.setSneaking(shouldSneak || sneaking);
-        if (IGNORED.contains(block.getType())) {
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            smartPlace = false;
+                SMART_PLACING.remove(player);
-        }
+                player.setSneaking(sneaking);
-        if (blockFace == BlockFace.DOWN && (block.getType() == Material.REPEATER || block.getType() == Material.COMPARATOR) && heldType.isSolid()) {
+            }, 0);
-            smartPlace = true;
+            return packet;
-        }
-        return smartPlace;
-    }
-
-    private static boolean smartPlaceEnabled(Player player) {
-        return Config.STORE.get(player).isSmartPlace();
-    }
-
-    @EventHandler(priority = EventPriority.LOW)
-    public void onSmartPlace(PlayerInteractEvent event) {
-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.SPECTATOR) return;
-        if (!Permission.BUILD.hasPermission(player)) return;
-        if (!smartPlaceEnabled(player)) return;
-        if (player.isSneaking()) return;
-
-        ItemStack itemStack = event.getItem();
-        if (itemStack == null || itemStack.getType().isAir()) return;
-        if (!shouldSmartPlace(event.getClickedBlock(), event.getBlockFace(), itemStack.getType())) return;
-
-        player.setSneaking(true);
-        FAKED_SNEAK.add(player.getUniqueId());
-        Bukkit.getScheduler().runTask(BauSystem.getInstance(), () -> {
-            if (FAKED_SNEAK.remove(player.getUniqueId())) {
-                player.setSneaking(false);
-            }
         });
     }
 
-    @EventHandler
-    public void onQuit(PlayerQuitEvent event) {
-        FAKED_SNEAK.remove(event.getPlayer().getUniqueId());
-    }
-
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!smartPlaceEnabled(event.getPlayer())) return;
+        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
+        WAS_EXECUTED.add(event.getPlayer());
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
         if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) return;
-        if (!isReallySneaking(event.getPlayer())) return;
+        if (!event.getPlayer().isSneaking()) return;
         if (event.getClickedBlock().getType() != Material.REPEATER) return;
         if ((event.getItem() == null || event.getItem().getType() == Material.REPEATER)) {
             Repeater repeater = (Repeater) event.getClickedBlock().getBlockData();
@@ -138,9 +146,9 @@ public class SmartPlaceListener implements Listener {
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!smartPlaceEnabled(event.getPlayer())) return;
+        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
-        if (!isReallySneaking(event.getPlayer())) {
+        if (!SMART_PLACING.contains(event.getPlayer())) {
-            if (isContainer(event.getBlockAgainst())) {
+            if (CONTAINERS.contains(event.getBlockAgainst().getType())) {
                 SoundGroup soundGroup = event.getBlockPlaced().getBlockData().getSoundGroup();
                 event.getPlayer().playSound(event.getBlockPlaced().getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F);
             }

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

@@ -31,7 +31,6 @@ import de.steamwar.command.TypeMapper;
 import de.steamwar.core.CraftbukkitWrapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.techhider.legacy.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -39,6 +38,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
+import de.steamwar.techhider.legacy.TechHider;
 
 import java.util.*;
 import java.util.stream.Collectors;

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

@@ -35,15 +35,18 @@ public class BlockCounter {
     public final Map<Region, BlockCount> blockCountMap = new HashMap<>();
 
     public boolean isActive(final Player p) {
-        return Config.STORE.get(p).isBlockCounter();
+        if (!Config.getInstance().get(p).containsKey("blockCounter")) {
+            return false;
+        }
+        return Config.getInstance().get(p).getPlainValue("blockCounter");
     }
 
     public void enable(final Player p) {
-        Config.STORE.get(p).setBlockCounter(true);
+        Config.getInstance().get(p).put("blockCounter", true);
     }
 
     public void disable(final Player p) {
-        Config.STORE.get(p).setBlockCounter(false);
+        Config.getInstance().get(p).put("blockCounter", false);
     }
 
     public String getMessage(Player player, int count, int tntCount, long tick, long lastTick) {

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

@@ -165,7 +165,6 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "default", description = "TPSLIMIT_DEFAULT_HELP")
-        @Register(value = "rate")
         public void reset(@Validator Player player) {
             TickManager.impl.setTickRate(20.0F);
             sendTickRateChange();
@@ -188,18 +187,15 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = {"rate", "0"}, description = "TICK_FREEZE_HELP")
-        public void rate(@Validator Player player) {
+        @Register(value = "freeze", description = "TICK_FREEZE_HELP_2")
+        public void freeze(@Validator Player player) {
             TickManager.impl.setFreeze(true);
             sendTickRateChange();
         }
 
-        @Register(value = "freeze", description = "TICK_FREEZE_HELP_2")
+        @Register(value = "unfreeze", description = "TICK_UNFREEZE_HELP")
-        public void freezeToggle(@Validator Player player) {
+        public void unfreeze(@Validator Player player) {
-            if (TickManager.impl.isFrozen()) {
+            TickManager.impl.setTickRate(20.0F);
-                TickManager.impl.setTickRate(20.0F);
-            } else {
-                TickManager.impl.setFreeze(true);
-            }
             sendTickRateChange();
         }
     }

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

@@ -25,6 +25,7 @@ import de.steamwar.bausystem.features.tracer.rendering.TraceEntity;
 import de.steamwar.bausystem.features.tracer.rendering.ViewFlag;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityAction;
 import de.steamwar.entity.REntityServer;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -153,11 +153,7 @@ public class TraceCommand extends SWCommand {
 
     @Register(value = "isolate", description = "TRACE_COMMAND_HELP_ISOLATE")
     public void isolate(@Validator Player player, Trace trace, @ErrorMessage("TRACE_RECORD_ID_INVALID") TNTPoint... records) {
-        if (records.length == 0) {
+        TraceManager.instance.isolate(player, records);
-            TraceManager.instance.isolate(player, trace, trace.getRecords().toArray(TNTPoint[]::new));
-        } else {
-            TraceManager.instance.isolate(player, trace, records);
-        }
         BauSystem.MESSAGE.send("TRACE_MESSAGE_ISOLATE", player);
     }
 

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

@@ -347,10 +347,9 @@ public class TraceManager implements Listener {
      * Toggles the isolated render for the given records and player
      *
      * @param player  the player the trace is shown to
-     * @param ptrace  the trace for whitch isolation is toggled
+     * @param records the record for which isolation is toggled
-     * @param records the records of the trace for which isolation is toggled
      */
-    public void isolate(Player player, Trace ptrace, TNTPoint... records) {
+    public void isolate(Player player, TNTPoint... records) {
         unfollow(player);
 
         Region region = Region.getRegion(player.getLocation());
@@ -375,20 +374,12 @@ public class TraceManager implements Listener {
             isolateFlag.toggleId(record.getTntId());
         }
 
-        if (isolateFlag.isEmpty() && playerTraceShowData.hasViewFlagOnly(IsolateFlag.class) && records.length != 0) {
-            playerTraceShowData.removeViewFlag(IsolateFlag.class);
-        }
-
         PlayerTraceShowData finalPlayerTraceShowData = playerTraceShowData;
         tracesByRegion.getOrDefault(region, Collections.emptyMap()).forEach((integer, trace) -> {
-            if (trace.getUuid() == ptrace.getUuid() || finalPlayerTraceShowData.hasNoViewFlags()) {
+            trace.render(player, finalPlayerTraceShowData);
-                trace.render(player, finalPlayerTraceShowData);
+            followerMap.getOrDefault(player, Collections.emptySet()).forEach(follower -> {
-                followerMap.getOrDefault(player, Collections.emptySet()).forEach(follower -> {
+                trace.render(follower, finalPlayerTraceShowData);
-                    trace.render(follower, finalPlayerTraceShowData);
+            });
-                });
-            } else {
-                trace.hide(player);
-            }
         });
     }
 

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

@@ -135,13 +135,6 @@ public class TraceRecorder implements Listener {
             Iterator<TNTPrimed> iter = trackedTNT.getOrDefault(region, Collections.emptyList()).iterator();
             while (iter.hasNext()) {
                 TNTPrimed tnt = iter.next();
-                if (tnt.isDead()) {
-                    iter.remove();
-                    tntSpawnRegion.remove(tnt);
-                    historyMap.remove(tnt);
-                    tntSpawnRegion.remove(tnt);
-                    continue;
-                }
                 if (tnt.getFuseTicks() == 80) continue;
                 TNTPoint record = record(tnt, wrappedTrace, Collections.emptyList());
                 if (record == null) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/PlayerTraceShowData.java

@@ -95,8 +95,4 @@ public class PlayerTraceShowData {
     public void addViewFlag(ViewFlag viewFlag) {
         viewFlags.put(viewFlag.getClass(), viewFlag);
     }
-
-    public <T extends ViewFlag> void removeViewFlag(Class<T> clazz) {
-        viewFlags.remove(clazz);
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/TraceEntity.java

@@ -36,18 +36,21 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Transformation;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
+import yapion.hierarchy.types.YAPIONValue;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static de.steamwar.bausystem.features.util.TNTClickListener.TNT_CLICK_DETAILS;
+
 /**
  * Wrapper for the rendering of a record bundle
  */
 public class TraceEntity extends RBlockDisplay {
 
-    public static final float TNT_VISUAL_SCALE = 0.98F;
+    private static final float TNT_VISUAL_SCALE = 0.98F;
-    public static final float TNT_VISUAL_OFFSET = -TNT_VISUAL_SCALE / 2.0F;
+    private static final float TNT_VISUAL_OFFSET = -TNT_VISUAL_SCALE / 2.0F;
-    public static final Transformation TNT_VISUAL_TRANSFORM = new Transformation(
+    private static final Transformation TNT_VISUAL_TRANSFORM = new Transformation(
             new Vector3f(TNT_VISUAL_OFFSET, 0.0F, TNT_VISUAL_OFFSET),
             new Quaternionf(0, 0, 0, 1),
             new Vector3f(TNT_VISUAL_SCALE, TNT_VISUAL_SCALE, TNT_VISUAL_SCALE),
@@ -99,7 +102,7 @@ public class TraceEntity extends RBlockDisplay {
      * @param player the player the message should be printed for
      */
     public void printIntoChat(Player player) {
-        if (!Config.STORE.get(player).isTntClickDetails()) {
+        if (!Config.getInstance().get(player).getOrSetDefault(TNT_CLICK_DETAILS, new YAPIONValue<>(true)).asBoolean().orElse(true)) {
             return;
         }
         TNTPoint representative = records.get(0);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java

@@ -131,7 +131,6 @@ public abstract class ViewFlag {
                 if (yLocation.distanceSquared(representative.getLocation()) >= 1.0 / 256.0 && yLocation.distanceSquared(previous.getLocation()) >= 1.0 / 256.0) {
                     RBlockDisplay y = new RBlockDisplay(server, yLocation);
                     y.setBlock(Material.WHITE_STAINED_GLASS.createBlockData());
-                    y.setTransform(TraceEntity.TNT_VISUAL_TRANSFORM);
                 }
 
                 Location secoundLocation;
@@ -144,7 +143,6 @@ public abstract class ViewFlag {
                 if (secoundLocation.distanceSquared(representative.getLocation()) >= 1.0 / 256.0 && secoundLocation.distanceSquared(previous.getLocation()) >= 1.0 / 256.0) {
                     RBlockDisplay second = new RBlockDisplay(server, secoundLocation);
                     second.setBlock(Material.WHITE_STAINED_GLASS.createBlockData());
-                    second.setTransform(TraceEntity.TNT_VISUAL_TRANSFORM);
                 }
             }
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/IsolateFlag.java

@@ -51,10 +51,6 @@ public class IsolateFlag extends ViewFlag {
         }
     }
 
-    public boolean isEmpty() {
-        return tntToIsolate.isEmpty();
-    }
-
     @Override
     public Stream<TNTPoint> filter(Stream<TNTPoint> records) {
         if (tntToIsolate.isEmpty()) return records;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java

@@ -38,7 +38,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -48,6 +47,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -73,7 +73,19 @@ public class BindCommand extends SWCommand implements Listener {
         }
     }
 
-    private static final CommandMap commandMap = ((CraftServer) Bukkit.getServer()).getCommandMap();
+    private static final CommandMap commandMap;
+
+    static {
+        Field knownCommandsField;
+        try {
+            knownCommandsField = Bukkit.getServer().getClass().getDeclaredField("commandMap");
+            knownCommandsField.setAccessible(true);
+            commandMap = (CommandMap) knownCommandsField.get(Bukkit.getServer());
+        } catch (IllegalAccessException | NoSuchFieldException var2) {
+            Bukkit.shutdown();
+            throw new SecurityException("Oh shit. Commands cannot be registered.", var2);
+        }
+    }
 
     private static final NamespacedKey KEY = SWUtils.getNamespaceKey("command");
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java

@@ -30,6 +30,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
+import yapion.hierarchy.types.YAPIONObject;
 
 @Linked
 public class NightVisionCommand extends SWCommand implements Listener {
@@ -40,15 +41,15 @@ public class NightVisionCommand extends SWCommand implements Listener {
 
     @Register(description = "NIGHT_VISION_HELP")
     public void genericCommand(Player p) {
-        Config config = Config.STORE.get(p);
+        YAPIONObject yapionObject = Config.getInstance().get(p);
-        boolean value = !config.isNightVision();
+        boolean value = !yapionObject.getBooleanOrDefault("nightvision", false);
-        config.setNightVision(value);
+        yapionObject.put("nightvision", value);
         setNightVision(p, value);
     }
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        setNightVision(event.getPlayer(), Config.STORE.get(event.getPlayer()).isNightVision());
+        setNightVision(event.getPlayer(), Config.getInstance().get(event.getPlayer()).getBooleanOrDefault("nightvision", false));
     }
 
     private void setNightVision(Player p, boolean value) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java

@@ -21,80 +21,134 @@ package de.steamwar.bausystem.features.util;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.ProtocolWrapper;
 import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
-import io.papermc.paper.event.player.PlayerFailMoveEvent;
+import net.minecraft.network.protocol.game.*;
-import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+import net.minecraft.server.level.ServerPlayerGameMode;
+import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.level.GameType;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockCanBuildEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 
+import java.util.function.BiFunction;
+
 @Linked
 public class NoClipCommand extends SWCommand implements Listener {
 
     public static class NoClipData implements SWPlayer.Component {
+        private long lastTick = -1;
+
         @Override
-        public void onUnmount(SWPlayer swPlayer) {
+        public void onUnmount(SWPlayer player) {
-            Player player = swPlayer.getPlayer();
+            player.setGameMode(GameMode.CREATIVE);
-            showClientGameMode(player, GameMode.CREATIVE, GameMode.CREATIVE);
         }
     }
 
     public NoClipCommand() {
         super("noclip", "nc");
+
+        BiFunction<Player, ServerboundMovePlayerPacket, Object> first = (player, o) -> {
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
+            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
+            setInternalGameMode(player, GameMode.SPECTATOR);
+            noClipData.lastTick = TPSUtils.currentTick.get();
+            return o;
+        };
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, first);
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, first);
+
+        BiFunction<Player, Object, Object> second = (player, o) -> {
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
+            setInternalGameMode(player, GameMode.CREATIVE);
+            noClipData.lastTick = TPSUtils.currentTick.get();
+            return o;
+        };
+        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, second);
+        TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, second);
+        TinyProtocol.instance.addFilter(ServerboundContainerClickPacket.class, second);
+
+        BiFunction<Player, ServerboundSetCreativeModeSlotPacket, Object> third = (player, o) -> {
+            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
+                int index = o.slotNum();
+                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(o.itemStack()));
+                if (index < 9) player.getInventory().setHeldItemSlot(index);
+                player.updateInventory();
+            }
+            return o;
+        };
+        TinyProtocol.instance.addFilter(ServerboundSetCreativeModeSlotPacket.class, third);
     }
 
-    @Register
+    private static final Reflection.Field<GameType> playerGameMode = Reflection.getField(ServerPlayerGameMode.class, GameType.class, 0);
+
+    private void setInternalGameMode(Player player, GameMode gameMode) {
+        playerGameMode.set(((CraftPlayer) player).getHandle().gameMode, GameType.byId(gameMode.getValue()));
+    }
+
+    @Register(help = true)
     public void genericCommand(@Validator Player player) {
         SWPlayer swPlayer = SWPlayer.of(player);
         if (swPlayer.hasComponent(NoClipData.class)) {
             swPlayer.removeComponent(NoClipData.class);
         } else {
-            player.setGameMode(GameMode.CREATIVE);
+            player.setGameMode(GameMode.SPECTATOR);
-            player.setAllowFlight(true);
+            Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
-            player.setFlying(true);
+            abilities.mayBuild = true;
+            abilities.mayfly = true;
+
             swPlayer.setComponent(new NoClipData());
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
-            showClientGameMode(player, GameMode.CREATIVE, GameMode.SPECTATOR);
+            TinyProtocol.instance.sendPacket(player, new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, 1F));
+            pseudoGameMode(player, GameMode.SPECTATOR);
         }
     }
 
-    @EventHandler
-    public void onPlayerFailMove(PlayerFailMoveEvent event) {
-        if (event.getFailReason() != PlayerFailMoveEvent.FailReason.CLIPPED_INTO_BLOCK) return;
-        if (!SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) return;
-        event.setAllowed(true);
-    }
-
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(player -> SWPlayer.of(player).removeComponent(NoClipData.class));
+        event.getNewSpectator().forEach(player -> {
+            SWPlayer.of(player).removeComponent(NoClipData.class);
+        });
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
         }
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
-        if (event.getPlayer() == null) return;
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setBuildable(true);
         }
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
@@ -102,13 +156,20 @@ public class NoClipCommand extends SWCommand implements Listener {
         }
     }
 
-    /**
+    @EventHandler(ignoreCancelled = true)
-     * @param player player
+    public void onPlayerTeleport(PlayerTeleportEvent event) {
-     * @param localMode GameMode for breaking and placing
+        if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
-     * @param listedMode GameMode for noPhysics
+            return;
-     */
+        }
-    private static void showClientGameMode(Player player, GameMode localMode, GameMode listedMode) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
-        TinyProtocol.instance.sendPacket(player, new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, localMode.getValue()));
+            event.setCancelled(true);
-        TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), listedMode));
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                event.getPlayer().setSpectatorTarget(null);
+            }, 1L);
+        }
     }
-}
+
+    private static void pseudoGameMode(Player player, GameMode gameMode) {
+        TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), gameMode));
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java

@@ -32,22 +32,26 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.inventory.EquipmentSlot;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.hierarchy.types.YAPIONValue;
 
 @Linked
 public class TNTClickListener extends SWCommand implements Listener {
 
+    public static final String TNT_CLICK_DETAILS = "tnt_click_details";
+
     public TNTClickListener() {
         super("tntdetails");
     }
 
     @Register(description = "TNT_DETAILS_COMMAND")
     public void toggle(Player player) {
-        Config config = Config.STORE.get(player);
+        YAPIONObject yapionObject = Config.getInstance().get(player);
-        if (config.isTntClickDetails()) {
+        if (yapionObject.getOrSetDefault(TNT_CLICK_DETAILS, new YAPIONValue<>(true)).asBoolean().orElse(true)) {
-            config.setTntClickDetails(false);
+            yapionObject.put(TNT_CLICK_DETAILS, false);
             BauSystem.MESSAGE.send("TNT_DETAILS_OFF", player);
         } else {
-            config.setTntClickDetails(true);
+            yapionObject.put(TNT_CLICK_DETAILS, true);
             BauSystem.MESSAGE.send("TNT_DETAILS_ON", player);
         }
     }
@@ -56,7 +60,7 @@ public class TNTClickListener extends SWCommand implements Listener {
     public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (event.getHand() != EquipmentSlot.HAND) return;
-        if (!Config.STORE.get(event.getPlayer()).isTntClickDetails()) {
+        if (!Config.getInstance().get(event.getPlayer()).getOrSetDefault(TNT_CLICK_DETAILS, new YAPIONValue<>(true)).asBoolean().orElse(true)) {
             return;
         }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java

@@ -25,6 +25,7 @@ import lombok.Getter;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.*;
 
@@ -55,22 +56,27 @@ public class Warp {
         warpMap.put(name, this);
     }
 
-    public Warp(String name, WorldData.WarpEntry warp) {
+    public Warp(String name, YAPIONObject object) {
         this.name = name;
-        location = new Location(Bukkit.getWorlds().get(0), warp.getX(), warp.getY(), warp.getZ(), warp.getYaw(), warp.getPitch());
+        double x = object.getPlainValue("x");
-        mat = Material.getMaterial(warp.getMaterial());
+        double y = object.getPlainValue("y");
+        double z = object.getPlainValue("z");
+        float yaw = object.getPlainValue("yaw");
+        float pitch = object.getPlainValue("pitch");
+        location = new Location(Bukkit.getWorlds().get(0), x, y, z, yaw, pitch);
+        mat = Material.getMaterial(object.getPlainValue("material"));
         warpMap.put(name, this);
     }
 
-    public WorldData.WarpEntry output() {
+    public YAPIONObject output() {
-        WorldData.WarpEntry warp = new WorldData.WarpEntry();
+        YAPIONObject yapionObject = new YAPIONObject();
-        warp.setX(location.getX());
+        yapionObject.add("x", location.getX());
-        warp.setY(location.getY());
+        yapionObject.add("y", location.getY());
-        warp.setZ(location.getZ());
+        yapionObject.add("z", location.getZ());
-        warp.setYaw(location.getYaw());
+        yapionObject.add("yaw", location.getYaw());
-        warp.setPitch(location.getPitch());
+        yapionObject.add("pitch", location.getPitch());
-        warp.setMaterial(mat.toString());
+        yapionObject.add("material", mat.toString());
-        return warp;
+        return yapionObject;
     }
 
     public static Set<String> getWarpNames() {
@@ -95,7 +101,7 @@ public class Warp {
 
     public void delete() {
         warpMap.remove(name);
-        WorldData.STORE.get().getWarps().remove(name);
+        WorldData.getWarpData().remove(name);
     }
 
     public void teleport(Player player) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java

@@ -34,9 +34,9 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.ArrayList;
-import java.util.Map;
 
 @Linked
 public class WarpCommand extends SWCommand implements Disable, Enable {
@@ -135,15 +135,17 @@ public class WarpCommand extends SWCommand implements Disable, Enable {
 
     @Override
     public void enable() {
-        WorldData.STORE.get().getWarps().forEach(Warp::new);
+        WorldData.getWarpData().forEach((name, yapionAnyType) -> {
+            new Warp(name, (YAPIONObject) yapionAnyType);
+        });
         Warp.enable();
     }
 
     @Override
     public void disable() {
-        Map<String, WorldData.WarpEntry> warps = WorldData.STORE.get().getWarps();
+        YAPIONObject yapionObject = WorldData.getWarpData();
         for (Warp warp : Warp.getWarps()) {
-            warps.put(warp.getName(), warp.output());
+            yapionObject.add(warp.getName(), warp.output());
         }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiPlayerCollision.java

@@ -1,41 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.world;
-
-import de.steamwar.linkage.Linked;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.scoreboard.Scoreboard;
-import org.bukkit.scoreboard.Team;
-
-@Linked
-public class AntiPlayerCollision implements Listener {
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Scoreboard board = event.getPlayer().getScoreboard();
-        Team team = board.getTeam("players");
-        if (team == null) team = board.registerNewTeam("players");
-        team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER);
-        team.addPlayer(event.getPlayer());
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java

@@ -36,6 +36,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java

@@ -131,7 +131,6 @@ public class BauScoreboard implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        SWScoreboard.impl.removeScoreboard(event.getPlayer());
         ADDITIONAL_SCOREBOARD_LINES.remove(event.getPlayer());
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java

@@ -25,7 +25,6 @@ import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.BauweltMember;
-import de.steamwar.techhider.legacy.TechHider;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -40,6 +39,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.util.Vector;
+import de.steamwar.techhider.legacy.TechHider;
 
 import java.util.HashSet;
 import java.util.Set;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java

@@ -57,7 +57,7 @@ public class WorldEditListener implements Listener {
 
     private static final Set<String> commands = new HashSet<>();
     private static final Set<String> commandExclusions = new HashSet<>();
-    private static final String[] shortcutCommands = {"//1", "//2", "//90", "//-90", "//180", "//p", "//c", "//flopy", "//floppy", "//flopyp", "//floppyp", "//u", "//r", "//download", "/download"};
+    private static final String[] shortcutCommands = {"//1", "//2", "//90", "//-90", "//180", "//p", "//c", "//flopy", "//floppy", "//flopyp", "//floppyp", "//u", "//r"};
 
     public static boolean isWorldEditCommand(String command) {
         for (String shortcut : shortcutCommands) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java

@@ -28,7 +28,6 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.core.CraftbukkitWrapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.techhider.legacy.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.server.level.ServerPlayer;
@@ -41,6 +40,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import de.steamwar.techhider.legacy.TechHider;
 
 import java.util.*;
 import java.util.function.BiFunction;

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

@@ -20,39 +20,78 @@
 package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.sql.SchematicNode;
 import lombok.NonNull;
+import yapion.hierarchy.types.YAPIONObject;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 public abstract class RegionData {
 
-    protected final WorldData.RegionEntry data;
+    private final List<Property<?, ?>> properties = new ArrayList<>();
-    protected final Map<String, String> flagData;
+
+    protected final YAPIONObject data;
+    protected final YAPIONObject flagData;
     protected final Runnable onChange;
     protected final Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
 
-    private SchematicNode testblockSchematic;
+    private final class Property<T, K> {
+        private final String field;
+        private final Function<K, T> loader;
+        private final Function<T, K> writer;
 
-    protected RegionData(WorldData.RegionEntry data, Runnable onChange) {
+        private T value;
+
+        public Property(String field, Function<K, T> loader, Function<T, K> writer) {
+            this.field = field;
+            this.loader = loader;
+            this.writer = writer;
+            properties.add(this);
+        }
+
+        public void load() {
+            if (flagData.containsKey(field)) {
+                value = loader.apply(flagData.getPlainValue(field));
+            } else {
+                value = null;
+            }
+        }
+
+        public T get() {
+            return value;
+        }
+
+        public void set(T value) {
+            this.value = value;
+            if (value == null) {
+                flagData.remove(field);
+            } else {
+                flagData.put(field, writer.apply(value));
+            }
+        }
+    }
+
+    private Property<SchematicNode, Integer> testblockSchematic = new Property<>("testblockSchematic", SchematicNode::byId, SchematicNode::getId);
+
+    protected RegionData(YAPIONObject data, Runnable onChange) {
         this.data = data;
-        this.flagData = data.getFlags();
+        this.flagData = data.getObjectOrSetDefault("flagStorage", new YAPIONObject());
         this.onChange = onChange;
         initialize();
         for (final Flag flag : Flag.getFlags()) {
             if (!has(flag).isWritable()) continue;
             try {
-                String s = flagData.get(flag.name());
+                String s = flagData.getPlainValue(flag.name());
                 flagMap.put(flag, flag.valueOfValue(s));
             } catch (Exception e) {
                 flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
             }
         }
-        if (data.getTestblockSchematic() != null) {
+        properties.forEach(Property::load);
-            testblockSchematic = SchematicNode.byId(data.getTestblockSchematic());
-        }
     }
 
     protected void initialize() {
@@ -87,8 +126,7 @@ public abstract class RegionData {
                 flagData.remove(flag.name());
             }
         }
-        testblockSchematic = null;
+        properties.forEach(property -> property.set(null));
-        data.setTestblockSchematic(null);
         onChange.run();
     }
 
@@ -97,12 +135,11 @@ public abstract class RegionData {
     }
 
     public SchematicNode getTestblockSchematic() {
-        return testblockSchematic;
+        return testblockSchematic.get();
     }
 
     public void setTestblockSchematic(SchematicNode schematic) {
-        testblockSchematic = schematic;
+        testblockSchematic.set(schematic);
-        data.setTestblockSchematic(schematic == null ? null : schematic.getId());
         onChange.run();
     }
 

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

@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.utils;
 
+import de.steamwar.Reflection;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
@@ -85,6 +86,9 @@ public class PlaceItemUtils {
                 .collect(Collectors.toSet());
     }
 
+    private static final Reflection.Field<?> positionAccessor = Reflection.getField(CraftBlockState.class, BlockPos.class, 0);
+    private static final Reflection.Field<?> worldAccessor = Reflection.getField(CraftBlockState.class, CraftWorld.class, 0);
+
     /**
      * Attempt to place an {@link ItemStack} the {@link Player} is holding against a {@link Block} inside the World.
      * This can be easily used inside the {@link org.bukkit.event.player.PlayerInteractEvent} to mimik placing a
@@ -284,9 +288,8 @@ public class PlaceItemUtils {
         } else {
             // If a BlockState is present set the Position and World to the Block you want to place
             Location blockLocation = block.getLocation();
-            CraftBlockState craftBlockState = (CraftBlockState) blockState;
+            positionAccessor.set(blockState, new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ()));
-            craftBlockState.position = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());
+            worldAccessor.set(blockState, blockLocation.getWorld());
-            craftBlockState.world = (CraftWorld) blockLocation.getWorld();
         }
 
         if (blockData.getMaterial().isSolid()) {

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

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.utils;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
 import net.minecraft.server.MinecraftServer;
@@ -32,6 +33,7 @@ public class TickManager implements Listener {
     public static final TickManager impl = new TickManager();
 
     private static final ServerTickRateManager manager = MinecraftServer.getServer().tickRateManager();
+    private static final Reflection.Field<Long> remainingSprintTicks = Reflection.getField(ServerTickRateManager.class, long.class, 0);
 
     private boolean blockTpsPacket = true;
     private int totalSteps;
@@ -119,7 +121,7 @@ public class TickManager implements Listener {
 
     public long getRemainingTicks() {
         if (isSprinting()) {
-            return manager.remainingSprintTicks;
+            return remainingSprintTicks.get(manager);
         } else {
             return manager.frozenTicksToRun();
         }

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

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.fastasyncworldedit.core.regions.selector.PolyhedralRegionSelector;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
@@ -33,19 +32,16 @@ import com.sk89q.worldedit.internal.registry.InputParser;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionSelector;
-import com.sk89q.worldedit.regions.selector.*;
 import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
-import com.sk89q.worldedit.world.World;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.shared.Pair;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @UtilityClass
@@ -95,36 +91,17 @@ public class WorldEditUtils {
                 .getRegionSelector(BukkitAdapter.adapt(player.getWorld()));
         return new Pair<>(regionSelector.getClass(), regionSelector.getVertices()
                 .stream()
-                .map(blockVector3 -> {
+                .map(blockVector3 -> blockVector3 == null ? null : adapt(player.getWorld(), blockVector3))
-                    if (blockVector3 == null) {
-                        return null;
-                    } else {
-                        return BukkitAdapter.adapt(player.getWorld(), blockVector3);
-                    }
-                })
                 .collect(Collectors.toList()));
     }
 
-    private static final Map<Class<? extends RegionSelector>, Function<World, RegionSelector>> constructors = new HashMap<>();
-    static {
-        constructors.put(CuboidRegionSelector.class, CuboidRegionSelector::new);
-        constructors.put(ExtendingCuboidRegionSelector.class, ExtendingCuboidRegionSelector::new);
-        constructors.put(Polygonal2DRegionSelector.class, Polygonal2DRegionSelector::new);
-        constructors.put(EllipsoidRegionSelector.class, EllipsoidRegionSelector::new);
-        constructors.put(SphereRegionSelector.class, SphereRegionSelector::new);
-        constructors.put(CylinderRegionSelector.class, CylinderRegionSelector::new);
-        constructors.put(ConvexPolyhedralRegionSelector.class, ConvexPolyhedralRegionSelector::new);
-        constructors.put(PolyhedralRegionSelector.class, PolyhedralRegionSelector::new);
-    }
-
     public void setVertices(Player player, Class<? extends RegionSelector> clazz, List<Location> vertices) {
         LocalSession localSession = WorldEdit.getInstance()
                 .getSessionManager()
                 .get(BukkitAdapter.adapt(player));
 
-        Function<World, RegionSelector> constructor = constructors.get(clazz);
+        Reflection.Constructor constructorInvoker = Reflection.getConstructor(clazz, com.sk89q.worldedit.world.World.class);
-        if (constructor == null) return;
+        RegionSelector regionSelector = (RegionSelector) constructorInvoker.invoke(BukkitAdapter.adapt(player.getWorld()));
-        RegionSelector regionSelector = constructor.apply(BukkitAdapter.adapt(player.getWorld()));
         localSession.setRegionSelector(BukkitAdapter.adapt(player.getWorld()), regionSelector);
 
         if (vertices.isEmpty()) return;
@@ -150,9 +127,13 @@ public class WorldEditUtils {
         try {
             BlockVector3 min = regionSelector.getRegion().getMinimumPoint();
             BlockVector3 max = regionSelector.getRegion().getMaximumPoint();
-            return new Pair<>(BukkitAdapter.adapt(player.getWorld(), min), BukkitAdapter.adapt(player.getWorld(), max));
+            return new Pair<>(adapt(player.getWorld(), min), adapt(player.getWorld(), max));
         } catch (IncompleteRegionException e) {
             return null;
         }
     }
+
+    private Location adapt(World world, BlockVector3 blockVector3) {
+        return new Location(world, blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
+    }
 }

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

@@ -0,0 +1,101 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.worlddata;
+
+import de.steamwar.sql.SteamwarUser;
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import yapion.hierarchy.output.FileOutput;
+import yapion.hierarchy.types.YAPIONArray;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.parser.InputStreamCharsets;
+import yapion.parser.YAPIONParser;
+import yapion.parser.options.FileOptions;
+
+import java.io.File;
+import java.util.List;
+
+@UtilityClass
+public class SimulatorData {
+
+    private final File simulatorsDir = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "simulators");
+
+    static {
+        simulatorsDir.mkdirs();
+    }
+
+    @SneakyThrows
+    public YAPIONObject getSimulator(Player player) {
+        File file = getFile(player);
+        if (!file.exists()) {
+            return new YAPIONObject();
+        }
+        return YAPIONParser.parse(file, new FileOptions().charset(InputStreamCharsets.UTF_8));
+    }
+
+    @SneakyThrows
+    private void internalSaveSimulator(Player player, YAPIONObject yapionObject) {
+        File file = getFile(player);
+        yapionObject.toYAPION(new FileOutput(file)).close();
+    }
+
+    @SneakyThrows
+    void saveSimulator(SteamwarUser steamwarUser, YAPIONObject yapionObject) {
+        File file = new File(simulatorsDir, steamwarUser.getId() + ".yapion");
+        yapionObject.toYAPION(new FileOutput(file)).close();
+    }
+
+    public List<String> listSimulator(Player player) {
+        List<String> strings = getSimulator(player).getKeys();
+        strings.remove("");
+        return strings;
+    }
+
+    public void saveSimulator(Player player, String name) {
+        YAPIONObject yapionObject = getSimulator(player);
+        yapionObject.put(name, yapionObject.getArray("").copy());
+        internalSaveSimulator(player, yapionObject);
+    }
+
+    public void saveSimulator(Player player, YAPIONArray simulator) {
+        YAPIONObject yapionObject = getSimulator(player);
+        yapionObject.put("", simulator);
+        internalSaveSimulator(player, yapionObject);
+    }
+
+    public void loadSimulator(Player player, String name) {
+        YAPIONObject yapionObject = getSimulator(player);
+        yapionObject.put("", yapionObject.getArray(name).copy());
+        internalSaveSimulator(player, yapionObject);
+    }
+
+    public void removeSimulator(Player player, String name) {
+        YAPIONObject yapionObject = getSimulator(player);
+        yapionObject.remove(name);
+        internalSaveSimulator(player, yapionObject);
+    }
+
+    private File getFile(Player player) {
+        SteamwarUser steamwarUser = SteamwarUser.get(player.getUniqueId());
+        return new File(simulatorsDir, steamwarUser.getId() + ".yapion");
+    }
+}

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

@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU Affero General Public License as published by
@@ -19,83 +19,58 @@
 
 package de.steamwar.bausystem.worlddata;
 
-import com.google.gson.GsonBuilder;
+import lombok.experimental.UtilityClass;
-import de.steamwar.bausystem.config.ConfigStore;
-import de.steamwar.bausystem.config.VersionedConfig;
-import de.steamwar.bausystem.worlddata.converter.WorldDataV1ToV2Converter;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
 import org.bukkit.Bukkit;
+import yapion.hierarchy.output.FileOutput;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.parser.InputStreamCharsets;
+import yapion.parser.YAPIONParser;
+import yapion.parser.options.StreamOptions;
 
+import java.io.BufferedInputStream;
 import java.io.File;
-import java.util.HashMap;
+import java.io.FileInputStream;
-import java.util.Map;
+import java.io.IOException;
 
-/**
+@UtilityClass
- * The current world data. It is stored as JSON, fields missing in the
+public class WorldData {
- * stored JSON keep the default value of their initializer, so adding a new
- * field does not need a new version.
- * <p>
- * When a field gets removed, renamed or its meaning changes, copy this class
- * to WorldDataV{@link #VERSION} (without the {@link #STORE}), increase {@link #VERSION}, write a
- * {@link de.steamwar.bausystem.config.ConfigConverter} from the copy to this class and register it in the {@link #STORE}.
- */
-@Getter
-@Setter
-public class WorldData implements VersionedConfig {
 
-    public static final int VERSION = 2;
+    private final File optionsFile = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "options.yapion");
+    private YAPIONObject worldData;
 
-    public static final ConfigStore<WorldData> STORE = new ConfigStore<>(WorldData.class, VERSION, WorldData::new)
+    public YAPIONObject getWorldData() {
-            .gson(new GsonBuilder().setPrettyPrinting().create())
+        if (worldData == null) {
-            .converter(new WorldDataV1ToV2Converter())
+            read();
-            .file(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "options.json"))
+        }
-            .legacyFile(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "options.yapion"), WorldDataV1::parse);
+        return worldData;
-
-    @Setter(AccessLevel.NONE)
-    protected int version = VERSION;
-
-    /**
-     * Region name to the data of the region
-     */
-    protected Map<String, RegionEntry> regions = new HashMap<>();
-    protected RegionEntry globalRegion = new RegionEntry();
-
-    /**
-     * Warp name to warp
-     */
-    protected Map<String, WarpEntry> warps = new HashMap<>();
-
-    @Getter
-    @Setter
-    public static class RegionEntry {
-
-        /**
-         * Overrides the prototype of the region config, null if not overridden
-         */
-        protected String prototype = null;
-
-        /**
-         * Flag name to flag value name
-         */
-        protected Map<String, String> flags = new HashMap<>();
-
-        /**
-         * Id of the testblock SchematicNode, null if the default testblock is used
-         */
-        protected Integer testblockSchematic = null;
     }
 
-    @Getter
+    public YAPIONObject getRegionsData() {
-    @Setter
+        return getWorldData().getYAPIONObjectOrSetDefault("regions", new YAPIONObject());
-    public static class WarpEntry {
+    }
 
-        protected double x;
+    public YAPIONObject getWarpData() {
-        protected double y;
+        return getWorldData().getYAPIONObjectOrSetDefault("warps", new YAPIONObject());
-        protected double z;
+    }
-        protected float yaw;
+
-        protected float pitch;
+    private void read() {
-        protected String material;
+        worldData = new YAPIONObject();
+        if (optionsFile.length() != 0) {
+            try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(optionsFile))) {
+                worldData = YAPIONParser.parse(bufferedInputStream, new StreamOptions().charset(InputStreamCharsets.UTF_8));
+            } catch (IOException e) {
+                // Ignored
+            }
+        } else {
+            write();
+        }
+    }
+
+    public void write() {
+        try {
+            worldData.toYAPION(new FileOutput(optionsFile)).close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 }

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

@@ -1,111 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.worlddata;
-
-import de.steamwar.bausystem.config.VersionedConfig;
-import de.steamwar.bausystem.config.legacy.YapionReader;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The legacy world data that was stored in the YAPION format in options.yapion.
- */
-@Getter
-@Setter
-@Deprecated
-public class WorldDataV1 implements VersionedConfig {
-
-    public static final int VERSION = 1;
-
-    @Setter(AccessLevel.NONE)
-    protected int version = VERSION;
-
-    /**
-     * Region name to the data of the region, the global region is stored with the name "global"
-     */
-    protected Map<String, RegionEntry> regions = new HashMap<>();
-
-    /**
-     * Warp name to warp
-     */
-    protected Map<String, WarpEntry> warps = new HashMap<>();
-
-    @Getter
-    @Setter
-    public static class RegionEntry {
-
-        protected String prototype = null;
-
-        /**
-         * Flag name to flag value name and "testblockSchematic" to the SchematicNode id
-         */
-        protected Map<String, Object> flagStorage = new HashMap<>();
-    }
-
-    @Getter
-    @Setter
-    public static class WarpEntry {
-
-        protected double x;
-        protected double y;
-        protected double z;
-        protected float yaw;
-        protected float pitch;
-        protected String material;
-    }
-
-    public static WorldDataV1 parse(String yapion) {
-        Map<String, Object> object = YapionReader.parse(yapion);
-        WorldDataV1 worldData = new WorldDataV1();
-
-        if (object.get("regions") instanceof Map<?, ?> regions) {
-            regions.forEach((name, value) -> {
-                if (!(value instanceof Map<?, ?> region)) return;
-                RegionEntry entry = new RegionEntry();
-                if (region.get("prototype") instanceof String prototype) {
-                    entry.prototype = prototype;
-                }
-                if (region.get("flagStorage") instanceof Map<?, ?> flagStorage) {
-                    flagStorage.forEach((key, flag) -> entry.flagStorage.put((String) key, flag));
-                }
-                worldData.regions.put((String) name, entry);
-            });
-        }
-
-        if (object.get("warps") instanceof Map<?, ?> warps) {
-            warps.forEach((name, value) -> {
-                if (!(value instanceof Map<?, ?> warp)) return;
-                WarpEntry entry = new WarpEntry();
-                entry.x = ((Number) warp.get("x")).doubleValue();
-                entry.y = ((Number) warp.get("y")).doubleValue();
-                entry.z = ((Number) warp.get("z")).doubleValue();
-                entry.yaw = ((Number) warp.get("yaw")).floatValue();
-                entry.pitch = ((Number) warp.get("pitch")).floatValue();
-                entry.material = (String) warp.get("material");
-                worldData.warps.put((String) name, entry);
-            });
-        }
-        return worldData;
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/converter/WorldDataV1ToV2Converter.java

@@ -1,75 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.worlddata.converter;
-
-import de.steamwar.bausystem.config.ConfigConverter;
-import de.steamwar.bausystem.worlddata.WorldData;
-import de.steamwar.bausystem.worlddata.WorldDataV1;
-
-@Deprecated
-public class WorldDataV1ToV2Converter implements ConfigConverter<WorldDataV1, WorldData> {
-
-    private static final String GLOBAL_REGION = "global";
-    private static final String TESTBLOCK_SCHEMATIC = "testblockSchematic";
-
-    @Override
-    public int version() {
-        return WorldDataV1.VERSION;
-    }
-
-    @Override
-    public WorldData convert(WorldDataV1 old) {
-        WorldData worldData = new WorldData();
-        old.getRegions().forEach((name, region) -> {
-            if (name.equals(GLOBAL_REGION)) {
-                worldData.setGlobalRegion(convert(region));
-            } else {
-                worldData.getRegions().put(name, convert(region));
-            }
-        });
-        old.getWarps().forEach((name, warp) -> worldData.getWarps().put(name, convert(warp)));
-        return worldData;
-    }
-
-    private WorldData.RegionEntry convert(WorldDataV1.RegionEntry old) {
-        WorldData.RegionEntry region = new WorldData.RegionEntry();
-        region.setPrototype(old.getPrototype());
-        old.getFlagStorage().forEach((key, value) -> {
-            if (value == null) return;
-            if (key.equals(TESTBLOCK_SCHEMATIC)) {
-                region.setTestblockSchematic(((Number) value).intValue());
-            } else {
-                region.getFlags().put(key, value.toString());
-            }
-        });
-        return region;
-    }
-
-    private WorldData.WarpEntry convert(WorldDataV1.WarpEntry old) {
-        WorldData.WarpEntry warp = new WorldData.WarpEntry();
-        warp.setX(old.getX());
-        warp.setY(old.getY());
-        warp.setZ(old.getZ());
-        warp.setYaw(old.getYaw());
-        warp.setPitch(old.getPitch());
-        warp.setMaterial(old.getMaterial());
-        return warp;
-    }
-}

BauSystem/BauSystem_Main/src/plugin.yml

@@ -4,7 +4,7 @@ version: "2.0"
 depend: [ WorldEdit, SpigotCore ]
 load: POSTWORLD
 main: de.steamwar.bausystem.BauSystem
-api-version: "1.21"
+api-version: "1.13"
 website: "https://steamwar.de"
 description: "So unseriös wie wir sind: BauSystem nur besser."