fix: allow ISE in team prefix command for improved flexibility

.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"

.idea/runConfigurations/Remote_JVM_Debugger.xml

@@ -1,15 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Remote JVM Debugger" type="Remote">
-    <option name="USE_SOCKET_TRANSPORT" value="true" />
-    <option name="SERVER_MODE" value="false" />
-    <option name="SHMEM_ADDRESS" />
-    <option name="HOST" value="localhost" />
-    <option name="PORT" value="5005" />
-    <option name="AUTO_RESTART" value="false" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5005" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
-    <method v="2" />
-  </configuration>
-</component>

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 {
@@ -48,7 +47,3 @@ dependencies {
     implementation(libs.luaj)
     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/features/design/endstone/DesignEndStone.java

@@ -21,7 +21,9 @@ package de.steamwar.bausystem.features.design.endstone;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.entity.*;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -57,15 +59,15 @@ public class DesignEndStone {
                 .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
                 .collect(Collectors.toSet());
         calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
-    }
 
-    private void interact(Player player, RInteraction entity, REntityAction action) {
-        if (action != REntityAction.ATTACK) return;
-        Location location = new Location(WORLD, entity.getX(), entity.getY(), entity.getZ());
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            location.getBlock().breakNaturally();
-            calc();
-        }, 1);
+        entityServer.setCallback((player, rEntity, entityAction) -> {
+            if (entityAction != REntityServer.EntityAction.ATTACK) return;
+            Location location = new Location(WORLD, rEntity.getX(), rEntity.getY(), rEntity.getZ());
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                location.getBlock().breakNaturally();
+                calc();
+            }, 1);
+        });
     }
 
     public void calc() {
@@ -108,15 +110,12 @@ public class DesignEndStone {
                         Material material = WORLD.getBlockAt(cx, cy, cz).getType();
 
                         if (material != Material.WATER && material != Material.LAVA && limited.contains(material)) {
-                            Location location = new Location(WORLD, cx, cy, cz);
+                            Location location = new Location(WORLD, cx + 0.5, cy, cz + 0.5);
                             if (!locations.add(location)) break;
-                            RBlockDisplay entity = new RBlockDisplay(entityServer, location);
-                            entity.setBlock(Material.RED_STAINED_GLASS.createBlockData());
+                            RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);
+                            entity.setNoGravity(true);
                             entity.setGlowing(true);
                             entities.add(entity);
-                            RInteraction interaction = new RInteraction(entityServer, location);
-                            interaction.setCallback(this::interact);
-                            entities.add(interaction);
                             break;
                         } else if (!material.isAir() && material != Material.WATER && material != Material.LAVA) {
                             break;

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

@@ -26,9 +26,8 @@ import de.steamwar.bausystem.features.autostart.AutostartListener;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
 import de.steamwar.core.SWPlayer;
-import de.steamwar.entity.RBlockDisplay;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RInteraction;
+import de.steamwar.entity.RFallingBlockEntity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.UtilityClass;
@@ -59,6 +58,10 @@ public class Detonator {
         @Override
         public void onMount(SWPlayer player) {
             entities.addPlayer(player.getPlayer());
+            entities.setCallback((player1, entity, action) -> {
+                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
+                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player1);
+            });
         }
 
         @Override
@@ -67,6 +70,8 @@ public class Detonator {
         }
     }
 
+    private static final Vector HALF = new Vector(0.5, 0, 0.5);
+
     public static boolean isDetonator(ItemStack itemStack) {
         return ItemStorage.isDetonator(itemStack);
     }
@@ -74,14 +79,8 @@ public class Detonator {
     public static void showDetonator(Player p, List<Location> locs) {
         DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
         locs.forEach(location -> {
-            RBlockDisplay blockDisplay = new RBlockDisplay(detonatorComponent.entities, location);
-            blockDisplay.setBlock(Material.RED_STAINED_GLASS.createBlockData());
-
-            RInteraction interaction = new RInteraction(detonatorComponent.entities, location);
-            interaction.setCallback((player, entity, action) -> {
-                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
-                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
-            });
+            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            entity.setNoGravity(true);
         });
     }
 

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/killchecker/KillcheckerVisualizer.java

@@ -24,9 +24,9 @@ import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
-import de.steamwar.entity.RBlockDisplay;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -290,8 +290,8 @@ public class KillcheckerVisualizer {
                 }
                 rEntities.get(point).die();
             }
-            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());
+            RFallingBlockEntity entity = new RFallingBlockEntity(outlinePoints.contains(point) ? outline : inner, point.toLocation(WORLD, 0.5, 0, 0.5), MATERIALS[Math.min(count - 1, MATERIALS.length) - 1]);
+            entity.setNoGravity(true);
             rEntities.put(point, entity);
             if (outlinePoints.contains(point)) outlinePointsCache.add(point);
             killCount.put(point, count);

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

@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.simulator;
 
+import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
@@ -37,80 +38,77 @@ 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.bausystem.utils.RayTraceUtils;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.linkage.Linked;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.BlockFace;
 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.BiFunction;
 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<>());
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+
+    private static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
+    private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
+    private static final Set<Player> calculating = new HashSet<>();
 
     public static boolean isSimulatorItem(ItemStack itemStack) {
         return ItemUtils.isItem(itemStack, "simulator");
     }
 
-    private static boolean hasSimulatorItem(Player player) {
-        return isSimulatorItem(player.getInventory().getItemInMainHand()) || isSimulatorItem(player.getInventory().getItemInOffHand());
-    }
-
-    private static void scheduleCursorUpdate(Player player) {
-        BauSystem.runTaskLater(BauSystem.getInstance(), () -> calcCursor(player), 1);
+    public SimulatorCursor() {
+        BiFunction<Player, Object, Object> function = (player, object) -> {
+            calcCursor(player);
+            return object;
+        };
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, function);
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, function);
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, function);
     }
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        scheduleCursorUpdate(event.getPlayer());
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            calcCursor(event.getPlayer());
+        }, 0);
     }
 
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        scheduleCursorUpdate(event.getPlayer());
+        calcCursor(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);
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            calcCursor(event.getPlayer());
+        }, 1);
     }
 
     @EventHandler
@@ -121,7 +119,10 @@ public class SimulatorCursor implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         cursorType.remove(event.getPlayer());
-        removeCursor(event.getPlayer());
+        cursors.remove(event.getPlayer());
+        synchronized (calculating) {
+            calculating.remove(event.getPlayer());
+        }
     }
 
     private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
@@ -137,7 +138,7 @@ public class SimulatorCursor implements Listener {
     public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
         if (!event.isSneaking()) return;
         Player player = event.getPlayer();
-        if (!hasSimulatorItem(player)) {
+        if (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand())) {
             return;
         }
         if (LAST_SNEAKS.containsKey(player)) {
@@ -163,10 +164,17 @@ public class SimulatorCursor implements Listener {
     }
 
     public static void calcCursor(Player player) {
-        if (!Permission.BUILD.hasPermission(player) || !hasSimulatorItem(player)) {
-            if (removeCursor(player) | SimulatorWatcher.show(null, player)) {
+        synchronized (calculating) {
+            if (calculating.contains(player)) return;
+            calculating.add(player);
+        }
+        if (!Permission.BUILD.hasPermission(player) || (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand()))) {
+            if (removeCursor(player) || SimulatorWatcher.show(null, player)) {
                 SWUtils.sendToActionbar(player, "");
             }
+            synchronized (calculating) {
+                calculating.remove(player);
+            }
             return;
         }
 
@@ -175,98 +183,203 @@ public class SimulatorCursor implements Listener {
             removeCursor(player);
             SimulatorWatcher.show(null, player);
             SWUtils.sendToActionbar(player, "§cGenerating Stab");
+            synchronized (calculating) {
+                calculating.remove(player);
+            }
             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);
+        List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
+        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
+        if (rayTraceResult == null) {
+            removeCursor(player);
+            if (simulator == null) {
+                SWUtils.sendToActionbar(player, "§eSelect Simulator");
+            } else {
+                SWUtils.sendToActionbar(player, "§eOpen Simulator");
+            }
+            synchronized (calculating) {
+                calculating.remove(player);
+            }
+            return;
         }
 
-        return cursor;
+        showCursor(player, rayTraceResult, simulator != null);
+        synchronized (calculating) {
+            calculating.remove(player);
+        }
     }
 
     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();
+        REntityServer entityServer = cursors.get(player);
+        boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
+        if (entityServer != null) {
+            entityServer.getEntities().forEach(REntity::die);
         }
-        return cursor.isPresent();
+        return hadCursor;
     }
 
-    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);
+    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
+        REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
+            REntityServer rEntityServer = new REntityServer();
+            rEntityServer.addPlayer(player);
+            return rEntityServer;
+        });
+
+        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
+        REntity hitEntity = rayTraceResult.getHitEntity();
+        Location location = hitEntity != null ? new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD) :
+                type.position.apply(player, rayTraceResult).toLocation(WORLD);
+
+        Material material = hitEntity != null ? Material.GLASS : type.getMaterial();
+        List<RFallingBlockEntity> entities = entityServer.getEntitiesByType(RFallingBlockEntity.class);
+        entities.removeIf(rFallingBlockEntity -> {
+            if (rFallingBlockEntity.getMaterial() != material) {
+                rFallingBlockEntity.die();
+                return true;
+            }
+            rFallingBlockEntity.move(location);
+            return false;
+        });
+        if (entities.isEmpty()) {
+            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(entityServer, location, material);
+            rFallingBlockEntity.setNoGravity(true);
+            if (material == Material.GLASS) {
+                rFallingBlockEntity.setGlowing(true);
+            }
         }
+
+        if (hasSimulatorSelected) {
+            if (hitEntity != null) {
+                SWUtils.sendToActionbar(player, "§eEdit Position");
+            } else {
+                SWUtils.sendToActionbar(player, "§eAdd new " + type.name);
+            }
+        } else {
+            SWUtils.sendToActionbar(player, "§eCreate new Simulator");
+        }
+    }
+
+    public static Vector getPosFree(Player player, RayTraceUtils.RRayTraceResult result) {
+        Vector pos = result.getHitPosition();
+
+        BlockFace face = result.getHitBlockFace();
+        if (face != null) {
+            switch (face) {
+                case DOWN:
+                    pos.setY(pos.getY() - 0.98);
+                    break;
+                case EAST:
+                    pos.setX(pos.getX() + 0.49);
+                    break;
+                case WEST:
+                    pos.setX(pos.getX() - 0.49);
+                    break;
+                case NORTH:
+                    pos.setZ(pos.getZ() - 0.49);
+                    break;
+                case SOUTH:
+                    pos.setZ(pos.getZ() + 0.49);
+                    break;
+                default:
+                    break;
+            }
+
+            if (face.getModY() == 0 && player.isSneaking()) {
+                pos.setY(pos.getY() - 0.49);
+            }
+        }
+
+        if (!player.isSneaking()) {
+            pos.setX(pos.getBlockX() + 0.5);
+            if (face == null || face.getModY() == 0) {
+                pos.setY(pos.getBlockY() + 0.0);
+            }
+            pos.setZ(pos.getBlockZ() + 0.5);
+        }
+
+        return pos;
+    }
+
+    private static Vector getPosBlockAligned(Player player, RayTraceUtils.RRayTraceResult result) {
+        Vector pos = result.getHitPosition();
+
+        BlockFace face = result.getHitBlockFace();
+        if (face != null) {
+            switch (face) {
+                case DOWN:
+                    pos.setY(pos.getY() - 0.98);
+                    break;
+                case EAST:
+                    pos.setX(pos.getX() + 0.49);
+                    break;
+                case WEST:
+                    pos.setX(pos.getX() - 0.49);
+                    break;
+                case NORTH:
+                    pos.setZ(pos.getZ() - 0.49);
+                    break;
+                case SOUTH:
+                    pos.setZ(pos.getZ() + 0.49);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        pos.setX(pos.getBlockX() + 0.5);
+        if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
+            pos.setY(pos.getBlockY() + 1.0);
+        } else {
+            pos.setY(pos.getBlockY());
+        }
+        pos.setZ(pos.getBlockZ() + 0.5);
+        return pos;
     }
 
     @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())),
+        TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
+        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
+        OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
         ;
 
         public final Material material;
         public final Material nonSelectedMaterial;
-        public final List<Cursor.CursorMode> cursorModes;
+        public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
         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)) {
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!ItemUtils.isItem(event.getItem(), "simulator")) {
             return;
         }
 
+        event.setCancelled(true);
+        Player player = event.getPlayer();
         Simulator simulator = SimulatorStorage.getSimulator(player);
 
-        if (action == Action.LEFT_CLICK_BLOCK || action == Action.LEFT_CLICK_AIR) {
+        if (event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_AIR) {
             if (simulator == null) {
                 return;
             }
-            SimulatorExecutor.run(player, simulator, null);
+            SimulatorExecutor.run(event.getPlayer(), simulator, null);
             return;
         }
 
-        if (action != Action.RIGHT_CLICK_BLOCK && action != Action.RIGHT_CLICK_AIR) {
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
             return;
         }
 
+
+        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), SimulatorWatcher.getEntitiesOfSimulator(simulator));
         if (simulator == null) {
-            if (cursorLocation == null) {
+            if (rayTraceResult == null) {
                 SimulatorStorage.openSimulatorSelector(player);
             } else {
                 SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
@@ -282,7 +395,7 @@ public class SimulatorCursor implements Listener {
                     }
                     sim = new Simulator(s);
                     SimulatorStorage.addSimulator(s, sim);
-                    createElement(player, cursorLocation, sim);
+                    createElement(player, rayTraceResult, sim);
                     SimulatorStorage.setSimulator(player, sim);
                 });
                 anvilInv.open();
@@ -290,56 +403,57 @@ public class SimulatorCursor implements Listener {
             return;
         }
 
-        if (cursorLocation == null) {
+        if (rayTraceResult == null) {
             new SimulatorGui(player, simulator).open();
             return;
         }
 
-        if (hitEntity.isPresent()) {
-            openElement(player, simulator, hitEntity.get());
+        if (rayTraceResult.getHitEntity() != null) {
+            REntity hitEntity = rayTraceResult.getHitEntity();
+            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:
+                    // Open single element present in Simulator
+                    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) {
+                        // Open multi element present in Simulator in existing group
+                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
+                        new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
+                    } else {
+                        // Open multi element present in Simulator in implicit group
+                        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;
+            }
             return;
         }
 
-        createElement(player, cursorLocation, simulator);
+        // Add new Element to current simulator
+        createElement(player, rayTraceResult, 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) {
+    private void createElement(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, Simulator simulator) {
         CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
-        Vector vector = cursorLocation.toVector();
+        Vector vector = type.position.apply(player, rayTraceResult);
         if (type == CursorType.REDSTONE_BLOCK) {
             vector.subtract(new Vector(0.5, 0, 0.5));
         }

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

@@ -124,11 +124,4 @@ public class SimulatorWatcher {
         }
         return entityServer.getEntities();
     }
-
-    synchronized REntityServer getEntityServerOfSimulator(Simulator simulator) {
-        if (simulator == null) {
-            return null;
-        }
-        return entityServers.computeIfAbsent(simulator, __ -> createSim(new REntityServer(), simulator));
-    }
 }

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/BlockBoundingBox.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.slaves.laufbau;
 
 import com.sk89q.worldedit.blocks.SkullBlock;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.inventory.SWItem;
 import lombok.Getter;
 import lombok.ToString;
@@ -98,7 +99,7 @@ public class BlockBoundingBox {
         // addPixel(Material.COBWEB.createBlockData(), 0, 0, 0, 0, 0, 0, createItem("LAUFBAU_BLOCK_COBWEB", Material.COBWEB));
         addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);
 
-        addPixel(Material.DIRT_PATH.createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", Material.DIRT_PATH));
+        addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
         addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
 
         Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();

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

@@ -31,7 +31,7 @@ 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 de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;

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

@@ -19,13 +19,13 @@
 
 package de.steamwar.bausystem.features.tpslimit;
 
-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.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.bausystem.utils.TickEndEvent;
 import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
@@ -72,7 +72,7 @@ public class TPSSystem implements Listener {
     }
 
     @EventHandler
-    public void onTickEnd(ServerTickEndEvent event) {
+    public void onTickEnd(TickEndEvent event) {
         bossbar();
     }
 

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

@@ -143,6 +143,14 @@ public class Trace {
         } else {
             entityServer = new REntityServer();
             entityServer.addPlayer(player);
+            entityServer.setCallback((p, rEntity, entityAction) -> {
+                if (entityAction != REntityServer.EntityAction.INTERACT) {
+                    return;
+                }
+                if (rEntity instanceof TraceEntity) {
+                    ((TraceEntity) rEntity).printIntoChat(p);
+                }
+            });
             entityServerMap.put(player, entityServer);
         }
         render(getRecords(), entityServer, playerTraceShowData);
@@ -159,6 +167,14 @@ public class Trace {
         REntityServer entityServer = entityServerMap.computeIfAbsent(player, k -> {
             REntityServer newEntityServer = new REntityServer();
             newEntityServer.addPlayer(k);
+            newEntityServer.setCallback((p, rEntity, entityAction) -> {
+                if (entityAction != REntityServer.EntityAction.INTERACT) {
+                    return;
+                }
+                if (rEntity instanceof TraceEntity) {
+                    ((TraceEntity) rEntity).printIntoChat(p);
+                }
+            });
             return newEntityServer;
         });
 

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

@@ -24,18 +24,13 @@ import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.tracer.TNTPoint;
 import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceManager;
-import de.steamwar.entity.RBlockDisplay;
-import de.steamwar.entity.REntityAction;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RInteraction;
+import de.steamwar.entity.RFallingBlockEntity;
 import lombok.Getter;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Location;
 import org.bukkit.Material;
 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;
@@ -46,16 +41,7 @@ import static de.steamwar.bausystem.features.util.TNTClickListener.TNT_CLICK_DET
 /**
  * Wrapper for the rendering of a record bundle
  */
-public class TraceEntity extends RBlockDisplay {
-
-    private static final float TNT_VISUAL_SCALE = 0.98F;
-    private static final float TNT_VISUAL_OFFSET = -TNT_VISUAL_SCALE / 2.0F;
-    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),
-            new Quaternionf(0, 0, 0, 1)
-    );
+public class TraceEntity extends RFallingBlockEntity {
 
     /**
      * The records represented by this REntity
@@ -69,31 +55,13 @@ public class TraceEntity extends RBlockDisplay {
     private final String uniqueTntIdsString;
 
     private final Trace trace;
-    private final RInteraction hitbox;
 
     public TraceEntity(REntityServer server, Location location, boolean isExplosion, List<TNTPoint> records, Trace trace) {
-        super(server, location);
-        Material material = isExplosion ? Material.RED_STAINED_GLASS : Material.TNT;
+        super(server, location, isExplosion ? Material.RED_STAINED_GLASS : Material.TNT);
         this.records = records;
         this.trace = trace;
         uniqueTntIdsString = records.stream().map(TNTPoint::getTntId).distinct().map(Object::toString).collect(Collectors.joining(" "));
-        hitbox = new RInteraction(server, location);
-        hitbox.setInteractionHeight(TNT_VISUAL_SCALE);
-        hitbox.setInteractionWidth(TNT_VISUAL_SCALE);
-        hitbox.setCallback((player, action) -> {
-            if (action == REntityAction.INTERACT) {
-                printIntoChat(player);
-            }
-        });
-        setTransform(TNT_VISUAL_TRANSFORM);
-        setBlock(material.createBlockData());
-
-    }
-
-    @Override
-    public void die() {
-        hitbox.die();
-        super.die();
+        setNoGravity(true);
     }
 
     /**

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

@@ -20,8 +20,8 @@
 package de.steamwar.bausystem.features.tracer.rendering;
 
 import de.steamwar.bausystem.features.tracer.TNTPoint;
-import de.steamwar.entity.RBlockDisplay;
 import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.util.Vector;
@@ -129,8 +129,8 @@ public abstract class ViewFlag {
 
                 Location yLocation = previous.getLocation().clone().add(0, delta.getY(), 0);
                 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());
+                    RFallingBlockEntity y = new RFallingBlockEntity(server, yLocation, Material.WHITE_STAINED_GLASS);
+                    y.setNoGravity(true);
                 }
 
                 Location secoundLocation;
@@ -141,8 +141,8 @@ 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());
+                    RFallingBlockEntity second = new RFallingBlockEntity(server, secoundLocation, Material.WHITE_STAINED_GLASS);
+                    second.setNoGravity(true);
                 }
             }
         }

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/NoClipCommand.java

@@ -24,17 +24,14 @@ import com.mojang.authlib.GameProfile;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.ProtocolWrapper;
 import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import net.minecraft.network.protocol.game.*;
-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;
@@ -60,11 +57,11 @@ public class NoClipCommand extends SWCommand implements Listener {
     public NoClipCommand() {
         super("noclip", "nc");
 
-        BiFunction<Player, ServerboundMovePlayerPacket, Object> first = (player, o) -> {
+        BiFunction<Player, Object, 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);
+            NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
             noClipData.lastTick = TPSUtils.currentTick.get();
             return o;
         };
@@ -74,7 +71,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         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);
+            NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
             noClipData.lastTick = TPSUtils.currentTick.get();
             return o;
         };
@@ -82,29 +79,15 @@ public class NoClipCommand extends SWCommand implements Listener {
         TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, second);
         TinyProtocol.instance.addFilter(ServerboundContainerClickPacket.class, second);
 
-        BiFunction<Player, ServerboundSetCreativeModeSlotPacket, Object> third = (player, o) -> {
+        BiFunction<Player, Object, 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();
+                NMSWrapper.impl.setSlotToItemStack(player, o);
             }
             return o;
         };
         TinyProtocol.instance.addFilter(ServerboundSetCreativeModeSlotPacket.class, third);
     }
 
-    private void setInternalGameMode(Player player, GameMode gameMode) {
-        ((CraftPlayer) player).getHandle().gameMode.gameModeForPlayer = GameType.byId(gameMode.getValue());
-    }
-
     @Register(help = true)
     public void genericCommand(@Validator Player player) {
         SWPlayer swPlayer = SWPlayer.of(player);
@@ -112,9 +95,7 @@ public class NoClipCommand extends SWCommand implements Listener {
             swPlayer.removeComponent(NoClipData.class);
         } else {
             player.setGameMode(GameMode.SPECTATOR);
-            Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
-            abilities.mayBuild = true;
-            abilities.mayfly = true;
+            NMSWrapper.impl.setPlayerBuildAbilities(player);
 
             swPlayer.setComponent(new NoClipData());
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
@@ -139,7 +120,6 @@ public class NoClipCommand extends SWCommand implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
-        if (event.getPlayer() == null) return;
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setBuildable(true);
         }

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

@@ -28,7 +28,6 @@ import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.server.BaumemberUpdatePacket;
-import io.papermc.paper.event.player.PlayerPickBlockEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
@@ -128,11 +127,4 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
             }
         }, 1);
     }
-
-    @EventHandler
-    public void onPlayerClick(PlayerPickBlockEvent event) {
-        if(SPECTATORS.contains(event.getPlayer())) {
-            event.setCancelled(true);
-        }
-    }
 }

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

@@ -19,9 +19,8 @@
 
 package de.steamwar.bausystem.features.world;
 
+import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.linkage.Linked;
-import io.papermc.paper.datacomponent.DataComponentTypes;
-import io.papermc.paper.datacomponent.item.ItemContainerContents;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -33,8 +32,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.util.List;
-
 @Linked
 public class InventoryListener implements Listener {
 
@@ -60,7 +57,7 @@ public class InventoryListener implements Listener {
             }
             stack.setItemMeta(meta);
         }
-        if (checkItemStack(stack)) {
+        if (NMSWrapper.impl.checkItemStack(stack)) {
             e.setCurrentItem(null);
             e.setCancelled(true);
             return;
@@ -76,7 +73,7 @@ public class InventoryListener implements Listener {
         for (int i = 0; i < content.length; i++) {
             if (content[i] == null) continue;
             int finalI = i;
-            if (checkItemStack(content[finalI])) {
+            if (NMSWrapper.impl.checkItemStack(content[finalI])) {
                 p.getInventory().setItem(i, null);
             }
         }
@@ -85,44 +82,11 @@ public class InventoryListener implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
         Player p = event.getPlayer();
-        if (checkItemStack(event.getItemInHand())) {
+        if (NMSWrapper.impl.checkItemStack(event.getItemInHand())) {
             event.setCancelled(true);
             event.setBuild(false);
             p.getInventory().setItemInMainHand(null);
             p.getInventory().setItemInOffHand(null);
         }
     }
-
-    private static final int threshold = 2048;
-
-    private boolean checkItemStack(ItemStack item) {
-        ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
-        if (data == null) {
-            return false;
-        }
-
-        return drillDown(data.contents(), 0, 0) > threshold;
-    }
-
-    private int drillDown(List<ItemStack> items, int layer, int start) {
-        if (layer > 2) return start + threshold;
-        int invalid = start;
-        for (int i = start; i < items.size(); i++) {
-            ItemStack item = items.get(i);
-            if (item.isEmpty()) continue;
-
-            invalid += item.getAmount();
-
-            ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
-            if (data == null) {
-                continue;
-            }
-
-            List<ItemStack> subItems = data.contents();
-            if (subItems.size() > 1) {
-                invalid = drillDown(subItems, layer + 1, invalid);
-            }
-        }
-        return invalid;
-    }
 }

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

@@ -20,24 +20,18 @@
 package de.steamwar.bausystem.features.world;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.linkage.Linked;
 import net.minecraft.network.protocol.game.ClientboundExplodePacket;
 import org.bukkit.GameMode;
 
-import java.util.Optional;
-
 @Linked
 public class NoCreativeKnockback {
 
     public NoCreativeKnockback() {
         TinyProtocol.instance.addFilter(ClientboundExplodePacket.class, (player, o) -> {
             if (player.getGameMode() != GameMode.CREATIVE) return o;
-            return new ClientboundExplodePacket(
-                    o.center(),
-                    Optional.empty(),
-                    o.explosionParticle(),
-                    o.explosionSound()
-            );
+            return NMSWrapper.impl.resetExplosionKnockback(o);
         });
     }
 }

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

@@ -101,7 +101,7 @@ public class SignEdit implements Listener {
     }
 
     {
-        TinyProtocol.instance.addFilter(ServerboundSignUpdatePacket.class, (player, o) -> {
+        TinyProtocol.instance.addTypedFilter(ServerboundSignUpdatePacket.class, (player, o) -> {
             Bukkit.getScheduler().runTask(BauSystem.getInstance(), () -> {
                 ServerLevel serverLevel = ((CraftWorld) player.getWorld()).getHandle();
                 Block signLoc = CraftBlock.at(serverLevel, o.getPos());

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

@@ -25,7 +25,7 @@ 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 de.steamwar.techhider.TechHider;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;

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,7 @@ 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 de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.server.level.ServerPlayer;
@@ -115,8 +115,8 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
             return packet;
         };
 
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, positionSetter);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, positionSetter);
+        TinyProtocol.instance.addTypedFilter(ServerboundMovePlayerPacket.Pos.class, positionSetter);
+        TinyProtocol.instance.addTypedFilter(ServerboundMovePlayerPacket.PosRot.class, positionSetter);
     }
 
     @EventHandler

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

@@ -0,0 +1,117 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import de.steamwar.Reflection;
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import io.papermc.paper.datacomponent.item.ItemContainerContents;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.network.protocol.game.ClientboundExplodePacket;
+import net.minecraft.server.level.ServerPlayerGameMode;
+import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.level.GameType;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+import java.util.Optional;
+
+public class NMSWrapper {
+    public static final NMSWrapper impl = new NMSWrapper();
+
+    private static final Reflection.Field<GameType> playerGameMode = Reflection.getField(ServerPlayerGameMode.class, GameType.class, 0);
+
+    public void setInternalGameMode(Player player, GameMode gameMode) {
+        playerGameMode.set(((CraftPlayer) player).getHandle().gameMode, GameType.byId(gameMode.getValue()));
+    }
+
+    public void setSlotToItemStack(Player player, Object o) {
+        ClientboundContainerSetSlotPacket packetPlayInSetCreativeSlot = (ClientboundContainerSetSlotPacket) o;
+        int index = packetPlayInSetCreativeSlot.getSlot();
+        if (index >= 36 && index <= 44) {
+            index -= 36;
+        } else if (index > 44) {
+            index -= 5;
+        } else if (index <= 8) {
+            index = index - 8 + 36;
+        }
+        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.getItem()));
+        if (index < 9) player.getInventory().setHeldItemSlot(index);
+        player.updateInventory();
+    }
+
+    public void setPlayerBuildAbilities(Player player) {
+        Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
+        abilities.mayBuild = true;
+        abilities.mayfly = true;
+    }
+
+    public Material pathMaterial() {
+        return Material.DIRT_PATH;
+    }
+
+    private static final int threshold = 2048;
+
+    public boolean checkItemStack(ItemStack item) {
+        ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
+        if (data == null) {
+            return false;
+        }
+
+        return drillDown(data.contents(), 0, 0) > threshold;
+    }
+
+    private int drillDown(List<ItemStack> items, int layer, int start) {
+        if (layer > 2) return start + threshold;
+        int invalid = start;
+        for (int i = start; i < items.size(); i++) {
+            ItemStack item = items.get(i);
+            if (item.isEmpty()) continue;
+
+            invalid += item.getAmount();
+
+            ItemContainerContents data = item.getData(DataComponentTypes.CONTAINER);
+            if (data == null) {
+                continue;
+            }
+
+            List<ItemStack> subItems = data.contents();
+            if (subItems.size() > 1) {
+                invalid = drillDown(subItems, layer + 1, invalid);
+            }
+        }
+        return invalid;
+    }
+
+    public Object resetExplosionKnockback(Object packet) {
+        ClientboundExplodePacket explosion = (ClientboundExplodePacket) packet;
+
+        return new ClientboundExplodePacket(
+                explosion.center(),
+                Optional.empty(),
+                explosion.explosionParticle(),
+                explosion.explosionSound()
+        );
+    }
+}

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;
-            craftBlockState.position = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());
-            craftBlockState.world = (CraftWorld) blockLocation.getWorld();
+            positionAccessor.set(blockState, new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ()));
+            worldAccessor.set(blockState, blockLocation.getWorld());
         }
 
         if (blockData.getMaterial().isSolid()) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/RayTraceUtils.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
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.cursor;
+package de.steamwar.bausystem.utils;
 
 import de.steamwar.entity.REntity;
 import lombok.Data;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickEndEvent.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
@@ -17,15 +17,20 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.experimental;
+package de.steamwar.bausystem.utils;
 
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
 
-@Linked
-public class ExperimentalCommand extends SWCommand {
+public class TickEndEvent extends Event {
 
-    public ExperimentalCommand() {
-        super("experimental", "experiment");
+    private static final HandlerList handlers = new HandlerList();
+
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
     }
 }

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;
@@ -40,7 +42,7 @@ public class TickManager implements Listener {
         TinyProtocol.instance.addFilter(ClientboundTickingStatePacket.class, this::blockPacket);
     }
 
-    private Object blockPacket(Player player, ClientboundTickingStatePacket packet) {
+    private Object blockPacket(Player player, Object packet) {
         if (blockTpsPacket) {
             return new ClientboundTickingStatePacket(20, manager.isFrozen());
         } else {
@@ -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/TickStartEvent.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
@@ -17,10 +17,20 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.entity;
+package de.steamwar.bausystem.utils;
 
-import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
 
-public interface REntityActionListener<E extends REntity> {
-    void onAction(Player player, E entity, REntityAction action);
+public class TickStartEvent extends Event {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
 }

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 -> {
-                    if (blockVector3 == null) {
-                        return null;
-                    } else {
-                        return BukkitAdapter.adapt(player.getWorld(), blockVector3);
-                    }
-                })
+                .map(blockVector3 -> blockVector3 == null ? null : 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);
-        if (constructor == null) return;
-        RegionSelector regionSelector = constructor.apply(BukkitAdapter.adapt(player.getWorld()));
+        Reflection.Constructor constructorInvoker = Reflection.getConstructor(clazz, com.sk89q.worldedit.world.World.class);
+        RegionSelector regionSelector = (RegionSelector) constructorInvoker.invoke(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/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."
 

BauSystem/build.gradle.kts

@@ -31,6 +31,15 @@ dependencies {
     implementation(project(":BauSystem:BauSystem_Main"))
 }
 
+tasks.register<DevServer>("DevBau20") {
+    group = "run"
+    description = "Run a 1.20 Dev Bau"
+    dependsOn(":SpigotCore:shadowJar")
+    dependsOn(":BauSystem:shadowJar")
+    dependsOn(":SchematicSystem:shadowJar")
+    template = "Bau20"
+}
+
 tasks.register<DevServer>("DevBau21") {
     group = "run"
     description = "Run a 1.21 Dev Bau"

CLI/build.gradle.kts

@@ -18,7 +18,6 @@ dependencies {
     implementation("com.github.ajalt.clikt:clikt:5.0.3")
     implementation("com.github.ajalt.mordant:mordant:3.0.2")
     implementation(libs.logback)
-    implementation("org.yaml:snakeyaml:2.2")
     implementation("org.mariadb.jdbc:mariadb-java-client:3.3.1")
 
     implementation(libs.exposedCore)

CLI/src/commands/dev/DevCommand.kt

@@ -14,11 +14,9 @@ import com.github.ajalt.clikt.parameters.types.file
 import com.github.ajalt.clikt.parameters.types.long
 import com.github.ajalt.clikt.parameters.types.path
 import com.sun.security.auth.module.UnixSystem
-import org.yaml.snakeyaml.Yaml
 import java.io.File
 import kotlin.io.path.absolute
 import kotlin.io.path.absolutePathString
-import kotlin.random.Random
 
 const val LOG4J_CONFIG = """<?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN" packages="com.mojang.util">
@@ -71,42 +69,32 @@ class DevCommand : CliktCommand("dev") {
     override fun run() {
         val args = mutableListOf<String>()
 
-        var serverDir = resolveServerDirectory(server)
+        val serverDirectory = File(workingDir, server)
+        val serverDir =
+            if (serverDirectory.exists() && serverDirectory.isDirectory) serverDirectory else File(workingDir, server)
 
         if (isVelocity(server)) {
             runServer(
                 args, jvmArgs, listOf(
                     jar?.absolutePath
-                        ?: File("/jars/Velocity.jar").absolutePath
+                        ?: File("/jar/Velocity.jar").absolutePath
                 ), serverDir
             )
         } else {
             setLogConfig(args)
             val version = findVersion(server)
                 ?: throw CliktError("Unknown Server Version")
-            val gameModeTemplate = if (serverDir.isDirectory) null else loadGameModeTemplate(server)
-            if (gameModeTemplate != null) {
-                serverDir = gameModeTemplate.serverDir
-                args += "-Dconfig=$server.yml"
-            }
             val worldFile = world?.absolute()?.toFile()
-                ?: File(workingDir, "devtempworld")
-            var jarFile = jar?.absolutePath
+                ?: File(serverDir, "devtempworld")
+            val jarFile = jar?.absolutePath
                 ?: additionalVersions[server]?.let { supportedVersionJars[it] }
                 ?: supportedVersionJars[version]
                 ?: throw CliktError("Unknown Server Version")
-            if (gameModeTemplate != null) {
-                jarFile = if (gameModeTemplate.spigot) {
-                    jarFile.replace("paper", "spigot")
-                } else {
-                    jarFile.replace("spigot", "paper")
-                }
-            }
 
             if (!worldFile.exists()) {
-                val templateFile = gameModeTemplate?.worldTemplate ?: File(serverDir, "Bauwelt")
+                val templateFile = File(serverDir, "Bauwelt")
                 if (!templateFile.exists()) {
-                    throw CliktError("Could not find world template: ${templateFile.absolutePath}")
+                    throw CliktError("World Template not found!")
                 }
                 templateFile.copyRecursively(worldFile)
             }
@@ -135,12 +123,6 @@ class DevCommand : CliktCommand("dev") {
         }
     }
 
-    data class GameModeTemplate(
-        val serverDir: File,
-        val worldTemplate: File,
-        val spigot: Boolean
-    )
-
     val jvmDefaultParams = arrayOf(
         "-Xmx1G",
         "-Xgc:excessiveGCratio=80",
@@ -170,7 +152,8 @@ class DevCommand : CliktCommand("dev") {
     )
 
     val additionalVersions = mapOf(
-        "Lobby" to 21
+        "Tutorial" to 15,
+        "Lobby" to 20
     )
 
     fun findVersion(server: String): Int? =
@@ -183,41 +166,6 @@ class DevCommand : CliktCommand("dev") {
     fun isVelocity(server: String): Boolean =
         server.endsWith("Velocity")
 
-    fun resolveServerDirectory(server: String): File {
-        val localServer = File(workingDir, server)
-        if (localServer.isDirectory) {
-            return localServer
-        }
-        return File("/servers", server)
-    }
-
-    fun loadGameModeTemplate(server: String): GameModeTemplate? {
-        val configFile = File("/configs/GameModes/$server.yml")
-        if (!configFile.exists()) {
-            throw CliktError("Server/GameMode not found")
-        }
-
-        val document = configFile.reader().use { reader ->
-            Yaml().load<Map<String, Any?>>(reader)
-        } ?: throw CliktError("GameMode config is empty: ${configFile.absolutePath}")
-        val serverConfig = document["Server"] as? Map<*, *>
-            ?: throw CliktError("GameMode config is missing Server section: ${configFile.absolutePath}")
-        val folder = serverConfig["Folder"] as? String
-            ?: throw CliktError("GameMode config is missing Server.Folder: ${configFile.absolutePath}")
-        val maps = (serverConfig["Maps"] as? List<*>)
-            ?.filterIsInstance<String>()
-            ?.takeIf { it.isNotEmpty() }
-            ?: throw CliktError("GameMode config is missing Server.Maps: ${configFile.absolutePath}")
-
-        val serverDir = File("/servers", folder)
-        val worldTemplate = File(File(serverDir, "arenas"), maps[Random.nextInt(maps.size)])
-        return GameModeTemplate(
-            serverDir = serverDir,
-            worldTemplate = worldTemplate,
-            spigot = serverConfig["Spigot"] == true
-        )
-    }
-
     fun setLogConfig(args: MutableList<String>) {
         args += "-DlogPath=${workingDir.absolutePath}/logs"
         args += "-Dlog4j.configurationFile=${log4jConfig.absolutePath}"
@@ -243,4 +191,4 @@ class DevCommand : CliktCommand("dev") {
         Runtime.getRuntime().addShutdownHook(Thread { if (process.isAlive) process.destroyForcibly() })
         process.waitFor()
     }
-}
+}

CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt

@@ -86,24 +86,6 @@ class CheckedSchematic(id: EntityID<CompositeID>) : CompositeEntity(id) {
             useDb {
                 find { (CheckedSchematicTable.nodeOwner eq owner.id) and (CheckedSchematicTable.seen eq false) }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
             }
-
-        @JvmStatic
-        fun countAccepted(owner: SteamwarUser) =
-            useDb {
-                find { (CheckedSchematicTable.nodeOwner eq owner.id) and (CheckedSchematicTable.declineReason eq "freigegeben") }.count()
-            }
-
-        @JvmStatic
-        fun countAccepted(owner: SteamwarUser, type: String) =
-            useDb {
-                find { (CheckedSchematicTable.nodeOwner eq owner.id) and (CheckedSchematicTable.declineReason eq "freigegeben") and (CheckedSchematicTable.nodeType like "$type%") }.count()
-            }
-
-        @JvmStatic
-        fun countChecked(validator: SteamwarUser) =
-            useDb {
-                find { CheckedSchematicTable.validator eq validator.id }.count()
-            }
     }
 
     val node by CheckedSchematicTable.nodeId.transform({ it?.let { EntityID(it, SchematicNodeTable) } }, { it?.value })

CommonCore/SQL/src/de/steamwar/sql/EventFight.kt

@@ -130,43 +130,6 @@ class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
                     }
                 )
             }
-
-        @JvmStatic
-        fun countEventFights(fighter: SteamwarUser) =
-            useDb {
-                exec(
-                    "SELECT COUNT(DISTINCT F.FightID) AS FightCount FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID INNER JOIN EventFight EF on F.FightID = EF.Fight WHERE UserID = ?",
-                    args = listOf(IntegerColumnType() to fighter.id.value)
-                ) {
-                    if (it.next()) {
-                        it.getLong("FightCount")
-                    } else {
-                        0
-                    }
-                }
-                    ?: 0
-            }
-
-        @JvmStatic
-        fun countPlacement(fighter: SteamwarUser, placement: Int) =
-            useDb {
-                exec(
-                    """
-                        SELECT COUNT(DISTINCT EventFight.EventID) AS PlacementCount FROM TeamTeilnahme
-                            INNER JOIN EventFight ON EventFight.EventID = TeamTeilnahme.EventID
-                            INNER JOIN FightPlayer ON FightPlayer.FightID = EventFight.Fight
-                        WHERE (IF(FightPlayer.Team = 1, EventFight.TeamBlue, EventFight.TeamRed)) = TeamTeilnahme.TeamID AND UserID = ? AND Placement = ?
-                    """.trimIndent(),
-                    args = listOf(IntegerColumnType() to fighter.id.value, IntegerColumnType() to placement)
-                ) {
-                    if (it.next()) {
-                        it.getInt("PlacementCount")
-                    } else {
-                        0
-                    }
-                }
-                    ?: 0
-            }
     }
 
     val fightID by EventFightTable.id.transform({ EntityID(it, EventFightTable) }, { it.value })

CommonCore/SQL/src/de/steamwar/sql/FightPlayer.kt

@@ -20,12 +20,9 @@
 package de.steamwar.sql
 
 import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.IntegerColumnType
-import org.jetbrains.exposed.v1.core.VarCharColumnType
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
 import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.inList
 import org.jetbrains.exposed.v1.dao.CompositeEntity
 import org.jetbrains.exposed.v1.dao.CompositeEntityClass
@@ -72,28 +69,6 @@ class FightPlayer(id: EntityID<CompositeID>) : CompositeEntity(id) {
             useDb {
                 find { FightPlayerTable.fightId inList fightIds.toList() }.toList()
             }
-
-        @JvmStatic
-        fun countFights(userId: Int) =
-            useDb {
-                find { FightPlayerTable.userId eq userId }.count()
-            }
-
-        @JvmStatic
-        fun countFights(userId: Int, type: String) =
-            useDb {
-                exec(
-                    "SELECT COUNT(*) AS FightCount FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID WHERE UserID = ? AND GameMode LIKE ?",
-                    args = listOf(IntegerColumnType() to userId, VarCharColumnType() to "$type%")
-                ) {
-                    if (it.next()) {
-                        it.getInt("FightCount")
-                    } else {
-                        0
-                    }
-                }
-                    ?: 0
-            }
     }
 
     val fightID by FightPlayerTable.fightId.transform({ EntityID(it, FightTable) }, { it.value })

CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java

@@ -146,12 +146,12 @@ public final class GameModeConfig<M, W> {
     public final List<String> CheckQuestions;
 
     /**
-     * The allowed checkers to check this schematic type denoted by a list of SteamwarUser ids.
+     * The allowed checkers to check this schematic type denoted by a list of SteamWar ids.
      * The people need the {@link UserPerm#CHECK} to be able to check though.
      *
      * @implSpec {@code []} by default -> denoting every person with {@link UserPerm#CHECK} can check it
      */
-    public final Set<Integer> Checkers;
+    public final List<Integer> Checkers;
 
     /**
      * Bundle for countdowns during the fight
@@ -246,7 +246,7 @@ public final class GameModeConfig<M, W> {
         }
 
         CheckQuestions = loader.getStringList("CheckQuestions");
-        Checkers = loader.getIntSet("Checkers");
+        Checkers = loader.getIntList("Checkers");
         Times = new TimesConfig(loader.with("Times"));
         // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
         Schematic = new SchematicConfig<>(loader.with("Schematic"));

CommonCore/SQL/src/de/steamwar/sql/SchematicNode.kt

@@ -434,7 +434,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
     private var nodeItem by SchematicNodeTable.item
     var item: String
         get() = nodeItem.ifEmpty {
-            if (isDir()) "CHEST" else "CAULDRON"
+            if (isDir()) "CHEST" else "CAULDRON_ITEM"
         }
         set(value) = useDb {
             nodeItem = value

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -25,7 +25,6 @@ import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
 import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.core.neq
 import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.insert
@@ -137,12 +136,6 @@ class SteamwarUser(id: EntityID<Int>) : IntEntity(id) {
                     .select(SteamwarUserTable.fields).where { UserPermTable.perm eq perm }.map { wrapRow(it) }
             }
 
-        @JvmStatic
-        fun getUsersWithDiscordId() =
-            useDb {
-                find { SteamwarUserTable.discordId neq null }.toList()
-            }
-
         @JvmStatic
         fun getServerTeam() =
             useDb {

CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java

@@ -139,12 +139,6 @@ final class YMLWrapper<M, W> {
         return get(path, o -> (List<Integer>) o);
     }
 
-    public Set<Integer> getIntSet(String path) {
-        List<Integer> list = get(path, o -> (List<Integer>) o);
-        if (list.isEmpty()) return Collections.emptySet();
-        return Collections.unmodifiableSet(new HashSet<>(list));
-    }
-
     public List<SchematicType> getSchematicTypeList(String path) {
         List<String> list = getStringList(path);
         if (list.isEmpty()) {

FightSystem/FightSystem_Core/build.gradle.kts

@@ -37,5 +37,4 @@ dependencies {
     compileOnly(libs.authlib)
     compileOnly(libs.nms)
     compileOnly(libs.fawe)
-    compileOnly(libs.datafixer)
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java

@@ -32,10 +32,7 @@ import de.steamwar.fightsystem.record.GlobalRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.fightsystem.utils.FightUI;
-import de.steamwar.fightsystem.utils.HullHider;
-import de.steamwar.fightsystem.utils.SWSound;
-import de.steamwar.fightsystem.utils.TechHiderWrapper;
+import de.steamwar.fightsystem.utils.*;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
@@ -44,9 +41,6 @@ import de.steamwar.sql.SchematicNode;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerPickupArrowEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class FightSystem extends JavaPlugin {
@@ -101,20 +95,13 @@ public class FightSystem extends JavaPlugin {
             getMessage().broadcast("PISTON_PUSHED_OUTSIDE");
             shutdown();
         });
-        new StateDependentListener(ArenaMode.All, FightState.All, new Listener() {
-            @EventHandler
-            public void onArrowPickup(PlayerPickupArrowEvent e) {
-                if (Fight.fighting(e.getPlayer())) e.setCancelled(true);
-            }
-        });
+        new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
         new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
         new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
         Config.world.setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
 
+        techHider = new TechHiderWrapper();
         hullHider = new HullHider();
-        techHider = new TechHiderWrapper(hullHider);
-        FightSystem.getHullHider().getHullMap().values().forEach(hull -> hull.fill(true));
-
 
         FileSource.startReplay();
 
@@ -133,7 +120,7 @@ public class FightSystem extends JavaPlugin {
             Fight.getUnrotated().setSchem(SchematicNode.getSchematicNode(Config.PrepareSchemID));
         }
 
-        Config.world.setGameRule(GameRule.LOCATOR_BAR, false);
+        CraftbukkitWrapper.impl.setupGamerule();
     }
 
     @Override

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java

@@ -21,8 +21,8 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.fightsystem.utils.TpsWarper;
 import de.steamwar.linkage.Linked;
-import net.minecraft.server.MinecraftServer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -45,7 +45,8 @@ public class TPSWarpCommand implements CommandExecutor {
             return false;
         }
 
-        MinecraftServer.getServer().tickRateManager().setTickRate(tps);
+        TpsWarper warper = TpsWarper.impl;
+        warper.warp(tps);
 
         FightSystem.getMessage().broadcastActionbar("TPSWARP_SET", tps);
         return false;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java

@@ -27,9 +27,12 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.techhider.ProtocolUtils;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 
+import java.util.List;
+
 public class EnternCountdown extends Countdown {
 
     private static int calcTime(FightPlayer fp, Countdown countdown) {
@@ -44,6 +47,7 @@ public class EnternCountdown extends Countdown {
     }
 
     private final FightPlayer fightPlayer;
+    private List<ProtocolUtils.ChunkPos> chunkPos;
 
     public EnternCountdown(FightPlayer fp, Countdown countdown) {
         super(calcTime(fp, countdown), new Message("ENTERN_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java

@@ -24,7 +24,6 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.record.GlobalRecorder;
 import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.Registry;
 import org.bukkit.Sound;
 import org.bukkit.entity.LivingEntity;
 
@@ -89,7 +88,7 @@ public class Fight {
     }
 
     public static void playSound(Sound sound, float volume, float pitch) {
-        GlobalRecorder.getInstance().soundAtPlayer(Registry.SOUNDS.getKey(sound).getKey(), volume, pitch);
+        GlobalRecorder.getInstance().soundAtPlayer(sound.name(), volume, pitch);
         //volume: max. 100, pitch: max. 2
         Bukkit.getServer().getOnlinePlayers().forEach(player -> player.playSound(player, sound, volume, pitch));
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -158,8 +158,6 @@ public class FightSchematic extends StateDependent {
         FreezeWorld freezer = new FreezeWorld();
 
         team.teleportToSpawn();
-        // TODO: Implement hull generation based on clipboard content!
-        FightSystem.getHullHider().fill(team, false);
         Vector dims = WorldeditWrapper.impl.getDimensions(clipboard);
         WorldeditWrapper.impl.pasteClipboard(
                 clipboard,

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -35,9 +35,7 @@ import de.steamwar.fightsystem.listener.TeamArea;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependent;
-import de.steamwar.fightsystem.utils.FightUI;
-import de.steamwar.fightsystem.utils.ItemBuilder;
-import de.steamwar.fightsystem.utils.Region;
+import de.steamwar.fightsystem.utils.*;
 import de.steamwar.fightsystem.winconditions.Wincondition;
 import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.inventory.SWItem;
@@ -46,8 +44,6 @@ import de.steamwar.sql.SteamwarUser;
 import lombok.Getter;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.*;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.NameTagVisibility;
@@ -155,8 +151,8 @@ public class FightTeam {
         new TeamArea(this);
 
         team = FightScoreboard.getBukkitTeam(name);
-        team.setColor(color);
-        team.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
+        WorldOfColorWrapper.impl.setTeamColor(team, color);
+        BountifulWrapper.impl.setNametagVisibility(team);
         team.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
         if (!Config.GameModeConfig.WinConditions.contains(Winconditions.AMONG_US)) {
             team.setAllowFriendlyFire(false);
@@ -288,8 +284,7 @@ public class FightTeam {
         entity.teleport(spawn);
 
         fightPlayer.ifPlayer(player -> {
-            AttributeInstance attribute = player.getAttribute(Attribute.ATTACK_SPEED);
-            attribute.setBaseValue(16);
+            BountifulWrapper.impl.setAttackSpeed(player);
             player.setFoodLevel(20);
             player.getInventory().clear();
             FightSystem.getHullHider().updatePlayer(player);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java

@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.listener.Recording;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -63,18 +64,11 @@ public class FightWorld extends StateDependent {
     public static void forceLoad() {
         Config.ArenaRegion.forEachChunk((cX, cZ) -> {
             Config.world.loadChunk(cX, cZ);
-            Config.world.setChunkForceLoaded(cX, cZ, true);
+            FlatteningWrapper.impl.forceLoadChunk(Config.world, cX, cZ);
         });
     }
 
     public static void resetWorld() {
-        World backup = new WorldCreator(Config.world.getName() + "/backup").createWorld();
-        assert backup != null;
-        Config.ArenaRegion.forEachChunk((x, z) -> {
-            CraftbukkitWrapper.impl.resetChunk(Config.world, backup, x, z);
-        });
-        Bukkit.unloadWorld(backup, false);
-
         List<Entity> entities = new ArrayList<>();
         Recording.iterateOverEntities(Objects::nonNull, entity -> {
             if (entity.getType() != EntityType.PLAYER && (!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(entity.getLocation()))) {
@@ -84,12 +78,14 @@ public class FightWorld extends StateDependent {
         entities.forEach(Entity::remove);
         entities.clear();
 
-        FightSystem.getHullHider().getHullMap().values().forEach(hull -> hull.fill(true));
-
+        World backup = new WorldCreator(Config.world.getName() + "/backup").createWorld();
+        assert backup != null;
         Config.ArenaRegion.forEachChunk((x, z) -> {
+            CraftbukkitWrapper.impl.resetChunk(Config.world, backup, x, z);
             for (Player p : Bukkit.getOnlinePlayers()) {
                 de.steamwar.core.CraftbukkitWrapper.sendChunk(p, x, z);
             }
         });
+        Bukkit.unloadWorld(backup, false);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FreezeWorld.java

@@ -20,6 +20,7 @@
 package de.steamwar.fightsystem.fight;
 
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.fightsystem.utils.BountifulWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -29,16 +30,19 @@ import org.bukkit.event.block.*;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
 public class FreezeWorld implements Listener {
 
+    private final Listener denyHandSwap = BountifulWrapper.impl.newDenyHandSwapListener();
+
     public FreezeWorld() {
         Bukkit.getPluginManager().registerEvents(this, FightSystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(denyHandSwap, FightSystem.getPlugin());
     }
 
     public void disable() {
         HandlerList.unregisterAll(this);
+        HandlerList.unregisterAll(denyHandSwap);
     }
 
     @EventHandler
@@ -90,9 +94,4 @@ public class FreezeWorld implements Listener {
     public void handlePlayerInteract(PlayerInteractEvent event) {
         event.setCancelled(true);
     }
-
-    @EventHandler
-    public void onSwapItems(PlayerSwapHandItemsEvent event) {
-        if (Fight.fighting(event.getPlayer())) event.setCancelled(true);
-    }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java

@@ -24,12 +24,12 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.commands.Commands;
 import de.steamwar.fightsystem.commands.GUI;
 import de.steamwar.fightsystem.listener.PersonalKitCreator;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.fightsystem.utils.ReflectionWrapper;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.sql.PersonalKit;
 import de.steamwar.sql.SteamwarUser;
-import io.papermc.paper.datacomponent.DataComponentType;
-import io.papermc.paper.datacomponent.DataComponentTypes;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -39,7 +39,6 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.BlockDataMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffect;
 
@@ -194,13 +193,13 @@ public class Kit {
         if (Config.GameModeConfig.Kits.ForbiddenItems.contains(stack.getType())) return true;
 
         //Check for attribute modifiers
-        if (stack.hasItemMeta() && stack.getItemMeta() != null && stack.getItemMeta().hasAttributeModifiers()) {
+        if (FlatteningWrapper.impl.hasAttributeModifier(stack)) {
             return true;
         }
 
         if (stack.hasItemMeta()) {
             ItemMeta meta = stack.getItemMeta();
-            if (meta instanceof BlockDataMeta && ((BlockDataMeta) meta).hasBlockData()) return true; //Blocks always upwards slabs etc.
+            if (FlatteningWrapper.impl.containsBlockMeta(meta)) return true; //Blocks always upwards slabs etc.
             if (hasItems(stack)) return true; //Blocks prefilled inventories
         }
 
@@ -209,42 +208,8 @@ public class Kit {
         return !normal.isEnchantmentInKit(stack) && !stack.getEnchantments().isEmpty();
     }
 
-    private static final Set<DataComponentType> FORBIDDEN_TYPES = new HashSet<>();
-
-    static {
-        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_NAME);
-        FORBIDDEN_TYPES.add(DataComponentTypes.PROFILE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.UNBREAKABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCK_DATA);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
-
-        FORBIDDEN_TYPES.add(DataComponentTypes.ATTRIBUTE_MODIFIERS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.TOOL);
-        FORBIDDEN_TYPES.add(DataComponentTypes.WEAPON);
-        FORBIDDEN_TYPES.add(DataComponentTypes.FOOD);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CONSUMABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.POTION_CONTENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.STORED_ENCHANTMENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_BREAK);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_PLACE_ON);
-        FORBIDDEN_TYPES.add(DataComponentTypes.MAX_DAMAGE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.USE_REMAINDER);
-        FORBIDDEN_TYPES.add(DataComponentTypes.USE_COOLDOWN);
-        FORBIDDEN_TYPES.add(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CHARGED_PROJECTILES);
-        FORBIDDEN_TYPES.add(DataComponentTypes.INTANGIBLE_PROJECTILE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORKS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORK_EXPLOSION);
-        FORBIDDEN_TYPES.add(DataComponentTypes.EQUIPPABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.REPAIR_COST);
-        FORBIDDEN_TYPES.add(DataComponentTypes.ENCHANTABLE);
-    }
-
     public static boolean hasItems(ItemStack stack) {
-        FORBIDDEN_TYPES.forEach(stack::resetData);
-        return false;
+        return ReflectionWrapper.impl.hasItems(stack);
     }
 
     private boolean isEnchantmentInKit(ItemStack stack) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java

@@ -22,12 +22,12 @@ package de.steamwar.fightsystem.listener;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.fightsystem.utils.WorldOfColorWrapper;
 import de.steamwar.linkage.Linked;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.ProjectileSource;
@@ -46,7 +46,6 @@ public class ArrowStopper {
     private void run() {
         Recording.iterateOverEntities(AbstractArrow.class::isInstance, entity -> {
             Projectile arrow = (Projectile) entity;
-            if(!(arrow.getShooter() instanceof Player)) return;
             if (invalidEntity(arrow)) return;
 
             Location prevLocation = arrow.getLocation().toVector().subtract(arrow.getVelocity()).toLocation(arrow.getWorld());
@@ -94,12 +93,8 @@ public class ArrowStopper {
         boolean teamFrom = entity.getVelocity().getZ() > 0;
         boolean overMid = location.getZ() > Config.SpecSpawn.getZ();
         boolean otherSide = teamFrom == overMid;
-        if (otherSide || !Config.ArenaRegion.inRegion(location)) return true;
-        boolean result = false;
-        if (entity instanceof Arrow arrow) {
-            result = arrow.isInBlock();
-        }
-        return result ||
+        return otherSide || !Config.ArenaRegion.inRegion(location) ||
+                WorldOfColorWrapper.impl.isInBlock(entity) ||
                 entity.getVelocity().equals(NULL_VECTOR);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java

@@ -22,11 +22,11 @@ package de.steamwar.fightsystem.listener;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Pose;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
@@ -46,7 +46,7 @@ public class BlockPlaceCollision implements Listener {
         // Hitbox size: 0.6xz, 1.8y, 1.5y when sneaking
         Player player = event.getPlayer();
         Location min = player.getLocation().add(-0.3, 0, -0.3);
-        Location max = player.getLocation().add(0.3, player.getPose() == Pose.SWIMMING ? 0.6 : (player.isSneaking() ? 1.5 : 1.8), 0.3);
+        Location max = player.getLocation().add(0.3, FlatteningWrapper.impl.isCrouching(player) ? 0.6 : (player.isSneaking() ? 1.5 : 1.8), 0.3);
 
         Location blockmin = block.getLocation();
         Location blockmax = block.getLocation().add(1.0, 1.0, 1.0);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java

@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.Region;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
@@ -140,7 +141,7 @@ public class Border {
 
     private void sendChange(Player player, Block block, Material type) {
         if (block.getType() == Material.AIR) {
-            player.sendBlockChange(block.getLocation(), type.createBlockData());
+            FlatteningWrapper.impl.sendBlockChange(player, block, type);
         }
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java

@@ -24,7 +24,6 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
 import de.steamwar.linkage.Linked;
 import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
-import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
 import org.bukkit.entity.Player;
 
 import java.io.*;
@@ -43,7 +42,7 @@ public class ClickAnalyzer {
     }
 
     public ClickAnalyzer() {
-        TinyProtocol.instance.addFilter(ServerboundUseItemPacket.class, this::onBlockPlace);
+        TinyProtocol.instance.addFilter(Recording.blockPlacePacket, this::onBlockPlace);
         TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, this::onBlockPlace);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java

@@ -20,22 +20,24 @@
 package de.steamwar.fightsystem.listener;
 
 import de.steamwar.fightsystem.ArenaMode;
-import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.BountifulWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
 @Linked
 public class DenyInventoryMovement implements Listener {
 
     public DenyInventoryMovement() {
         new StateDependentListener(ArenaMode.AntiTest, FightState.AntiIngame, this);
+
+        Listener listener = BountifulWrapper.impl.newDenyHandSwapListener();
+        new StateDependentListener(ArenaMode.AntiTest, FightState.AntiIngame, listener);
     }
 
     @EventHandler
@@ -52,9 +54,4 @@ public class DenyInventoryMovement implements Listener {
     public void onItemPickup(PlayerPickupItemEvent event) {
         event.setCancelled(true);
     }
-
-    @EventHandler
-    public void onSwapItems(PlayerSwapHandItemsEvent event) {
-        if (Fight.fighting(event.getPlayer())) event.setCancelled(true);
-    }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java

@@ -24,7 +24,6 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.linkage.Linked;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -39,13 +38,11 @@ public class EntityDamage implements Listener {
 
     @EventHandler
     public void handleEntityDamage(EntityDamageEvent event) {
-        if (!(event.getEntity() instanceof Player)) return;
         if (Config.ArenaRegion.in2dRegion(event.getEntity().getLocation())) event.setCancelled(true);
     }
 
     @EventHandler
     public void handleEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        if (!(event.getEntity() instanceof Player)) return;
         if (Config.ArenaRegion.in2dRegion(event.getEntity().getLocation())) event.setCancelled(true);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -27,12 +27,13 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.BountifulWrapper;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.data.type.Dispenser;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
@@ -61,7 +62,7 @@ public class Permanent implements Listener {
     private static final Team spectatorTeam = FightScoreboard.getBukkitTeam("Spectator");
 
     static {
-        spectatorTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
+        BountifulWrapper.impl.setNametagVisibility(spectatorTeam);
         spectatorTeam.setNameTagVisibility(NameTagVisibility.NEVER);
     }
 
@@ -233,7 +234,7 @@ public class Permanent implements Listener {
             return;
         }
 
-        if (e.getItem().getType() == Material.TNT || block.getRelative(((Dispenser) block.getBlockData()).getFacing()).isLiquid()) {
+        if (e.getItem().getType() == Material.TNT || FlatteningWrapper.impl.isFacingWater(block)) {
             e.setCancelled(true);
         }
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PlayerJoinListener.java

@@ -0,0 +1,74 @@
+package de.steamwar.fightsystem.listener;
+
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
+import net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket;
+import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.LevelChunk;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+@Linked
+public class PlayerJoinListener implements Listener {
+
+    public PlayerJoinListener() {
+        new StateDependentListener(true, FightState.All, this);
+    }
+
+    @EventHandler()
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+
+        Location loc = player.getLocation();
+        int viewDistance = Bukkit.getViewDistance();
+
+        int chunkX = loc.getChunk().getX();
+        int chunkZ = loc.getChunk().getZ();
+
+        // Iterate through the chunks around the player and force a resend
+        for (int x = -viewDistance; x <= viewDistance; x++) {
+            for (int z = -viewDistance; z <= viewDistance; z++) {
+                Chunk chunk = world.getChunkAt(chunkX + x, chunkZ + z);
+                this.forceRefreshChunkForPlayer(player, chunk);
+            }
+        }
+    }
+
+    public void forceRefreshChunkForPlayer(Player player, Chunk bukkitChunk) {
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        CraftWorld craftWorld = (CraftWorld) bukkitChunk.getWorld();
+
+        int chunkX = bukkitChunk.getX();
+        int chunkZ = bukkitChunk.getZ();
+
+        LevelChunk nmsChunk = craftWorld.getHandle().getChunkSource().getChunk(chunkX, chunkZ, false);
+        if (nmsChunk == null) {
+            // Chunk isn't loaded in memory on the server side;
+            return;
+        }
+
+        ClientboundForgetLevelChunkPacket unloadPacket = new ClientboundForgetLevelChunkPacket(new ChunkPos(chunkX, chunkZ));
+        serverPlayer.connection.send(unloadPacket);
+
+        ClientboundLevelChunkWithLightPacket loadPacket = new ClientboundLevelChunkWithLightPacket(
+                nmsChunk,
+                craftWorld.getHandle().getLightEngine(),
+                null,
+                null,
+                true
+        );
+        serverPlayer.connection.send(loadPacket);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java

@@ -28,12 +28,12 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.utils.WorldeditWrapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -52,7 +52,7 @@ public class PrepareSchem implements Listener {
         new OneShotStateDependent(ArenaMode.Prepare, FightState.PostSchemSetup, () -> Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> {
             stationaryMovingPistons.clear();
             Fight.getUnrotated().getSchemRegion().forEach((x, y, z) -> {
-                if (Config.world.getBlockAt(x, y, z).getType() == Material.MOVING_PISTON) {
+                if (FlatteningWrapper.impl.checkPistonMoving(Config.world.getBlockAt(x, y, z))) {
                     stationaryMovingPistons.add(new Vector(x, y, z));
                 }
             });
@@ -76,7 +76,7 @@ public class PrepareSchem implements Listener {
 
                 try {
                     region.forEach((x, y, z) -> {
-                        if (Config.world.getBlockAt(x, y, z).getType() == Material.MOVING_PISTON && !stationaryMovingPistons.contains(new Vector(x, y, z))) {
+                        if (FlatteningWrapper.impl.checkPistonMoving(Config.world.getBlockAt(x, y, z)) && !stationaryMovingPistons.contains(new Vector(x, y, z))) {
                             FightSystem.getMessage().broadcast("PREPARE_ACTIVE_PISTON");
                             Bukkit.shutdown();
                             throw new IllegalStateException();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java

@@ -20,8 +20,8 @@
 package de.steamwar.fightsystem.listener;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.fightsystem.ArenaMode;
-import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.events.TeamDeathEvent;
 import de.steamwar.fightsystem.events.TeamLeaveEvent;
@@ -34,16 +34,17 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.fightsystem.utils.BountifulWrapper;
+import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.SWSound;
 import de.steamwar.linkage.Linked;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
 import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.item.PrimedTnt;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
@@ -62,7 +63,6 @@ import java.util.Random;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.stream.StreamSupport;
 
 @Linked
 public class Recording implements Listener {
@@ -83,22 +83,12 @@ public class Recording implements Listener {
     public static final Class<?> primedTnt = PrimedTnt.class;
 
     public static void iterateOverEntities(Predicate<Object> filter, Consumer<Entity> consumer) {
-        StreamSupport.stream(((CraftWorld) Config.world).getHandle().getEntities().getAll().spliterator(), false).filter(filter).map(net.minecraft.world.entity.Entity::getBukkitEntity).forEach(consumer);
+        CraftbukkitWrapper.impl.entityIterator().filter(filter).map(net.minecraft.world.entity.Entity::getBukkitEntity).forEach(consumer);
     }
 
     public Recording() {
         new StateDependentListener(ArenaMode.AntiReplay, FightState.All, this);
-        new StateDependentListener(ArenaMode.AntiReplay, FightState.All, new Listener() {
-            @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-            public void onItemSwap(PlayerSwapHandItemsEvent e) {
-                if (isNotSent(e.getPlayer()))
-                    return;
-
-                Player player = e.getPlayer();
-                GlobalRecorder.getInstance().item(player, disarmNull(e.getMainHandItem()), "MAINHAND");
-                GlobalRecorder.getInstance().item(player, disarmNull(e.getOffHandItem()), "OFFHAND");
-            }
-        });
+        new StateDependentListener(ArenaMode.AntiReplay, FightState.All, BountifulWrapper.impl.newHandSwapRecorder());
         new StateDependent(ArenaMode.AntiReplay, FightState.Ingame) {
             @Override
             public void enable() {
@@ -112,19 +102,19 @@ public class Recording implements Listener {
             }
         }.register();
         new StateDependent(ArenaMode.AntiReplay, FightState.Ingame) {
-            private final BiFunction<Player, ServerboundUseItemPacket, Object> place = Recording.this::blockPlace;
-            private final BiFunction<Player, ServerboundPlayerActionPacket, Object> dig = Recording.this::blockDig;
+            private final BiFunction<Player, Object, Object> place = Recording.this::blockPlace;
+            private final BiFunction<Player, Object, Object> dig = Recording.this::blockDig;
 
             @Override
             public void enable() {
-                TinyProtocol.instance.addFilter(ServerboundUseItemPacket.class, place);
-                TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, dig);
+                TinyProtocol.instance.addFilter(blockPlacePacket, place);
+                TinyProtocol.instance.addFilter(blockDigPacket, dig);
             }
 
             @Override
             public void disable() {
-                TinyProtocol.instance.removeFilter(ServerboundUseItemPacket.class, place);
-                TinyProtocol.instance.removeFilter(ServerboundPlayerActionPacket.class, dig);
+                TinyProtocol.instance.removeFilter(blockPlacePacket, place);
+                TinyProtocol.instance.removeFilter(blockDigPacket, dig);
             }
         }.register();
         new StateDependentTask(ArenaMode.AntiReplay, FightState.All, () -> {
@@ -141,16 +131,23 @@ public class Recording implements Listener {
         GlobalRecorder.getInstance().entitySpeed(entity);
     }
 
-    private Object blockDig(Player p, ServerboundPlayerActionPacket packet) {
-        if (!isNotSent(p) && packet.getAction() == ServerboundPlayerActionPacket.Action.RELEASE_USE_ITEM) {
+    private static final Class<?> blockDigPacket = ServerboundPlayerActionPacket.class;
+    private static final Class<?> playerDigType = blockDigPacket.getDeclaredClasses()[0];
+    private static final Reflection.Field<?> blockDigType = Reflection.getField(blockDigPacket, playerDigType, 0);
+    private static final Object releaseUseItem = playerDigType.getEnumConstants()[5];
+
+    private Object blockDig(Player p, Object packet) {
+        if (!isNotSent(p) && blockDigType.get(packet) == releaseUseItem) {
             GlobalRecorder.getInstance().bowSpan(p, false, false);
         }
         return packet;
     }
 
-    private Object blockPlace(Player p, ServerboundUseItemPacket packet) {
-        boolean mainHand = packet.getHand() == InteractionHand.MAIN_HAND;
-        if (!isNotSent(p) && (mainHand ? p.getInventory().getItemInMainHand() : p.getInventory().getItemInOffHand()).getType() == Material.BOW) {
+    public static final Class<?> blockPlacePacket = ServerboundUseItemPacket.class;
+
+    private Object blockPlace(Player p, Object packet) {
+        boolean mainHand = BountifulWrapper.impl.mainHand(packet);
+        if (!isNotSent(p) && BountifulWrapper.impl.bowInHand(mainHand, p)) {
             GlobalRecorder.getInstance().bowSpan(p, true, !mainHand);
         }
         return packet;
@@ -180,7 +177,7 @@ public class Recording implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockPhysics(BlockPhysicsEvent e) {
-        if (e.getBlock() == e.getSourceBlock() || e.getChangedType() == Material.AIR) {
+        if (FlatteningWrapper.impl.doRecord(e)) {
             GlobalRecorder.getInstance().blockChange(e.getBlock());
         }
     }
@@ -288,8 +285,7 @@ public class Recording implements Listener {
             if (!fp.isLiving()) continue;
 
             fp.ifPlayer(player -> {
-                GlobalRecorder.getInstance().item(player, disarmNull(player.getInventory().getItemInMainHand()), "MAINHAND");
-                GlobalRecorder.getInstance().item(player, disarmNull(player.getInventory().getItemInOffHand()), "OFFHAND");
+                BountifulWrapper.impl.recordHandItems(player);
                 GlobalRecorder.getInstance().item(player, disarmNull(player.getInventory().getHelmet()), "HEAD");
                 GlobalRecorder.getInstance().item(player, disarmNull(player.getInventory().getChestplate()), "CHEST");
                 GlobalRecorder.getInstance().item(player, disarmNull(player.getInventory().getLeggings()), "LEGS");

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java

@@ -25,13 +25,11 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.Waterlogged;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -103,25 +101,7 @@ public class WaterRemover implements Listener {
         if (!Config.BlueExtendRegion.inRegion(b) && !Config.RedExtendRegion.inRegion(b)) return;
 
         //checks for water and removes it, if present
-        boolean result = true;
-        Material type = b.getType();
-        if (type == Material.WATER || type == Material.LAVA) {
-            b.setType(Material.AIR);
-        } else {
-            BlockData data = b.getBlockData();
-            if (!(data instanceof Waterlogged)) {
-                result = false;
-            } else {
-                Waterlogged waterlogged = (Waterlogged) data;
-                if (waterlogged.isWaterlogged()) {
-                    b.setType(Material.AIR);
-                } else {
-                    result = false;
-                }
-            }
-        }
-
-        if (!result) return;
+        if (!FlatteningWrapper.impl.removeWater(b)) return;
 
         if (b.getY() < MIN_Y) return;
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -34,9 +34,7 @@ import de.steamwar.fightsystem.fight.FightWorld;
 import de.steamwar.fightsystem.fight.FreezeWorld;
 import de.steamwar.fightsystem.listener.FightScoreboard;
 import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.utils.FightUI;
-import de.steamwar.fightsystem.utils.Message;
-import de.steamwar.fightsystem.utils.TechHiderWrapper;
+import de.steamwar.fightsystem.utils.*;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
@@ -44,14 +42,11 @@ import de.steamwar.techhider.BlockIds;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Pose;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.*;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -77,7 +72,7 @@ public class PacketProcessor implements Listener {
     private static final org.bukkit.scoreboard.Team team = FightScoreboard.getBukkitTeam("Replay");
 
     static {
-        team.setOption(org.bukkit.scoreboard.Team.Option.NAME_TAG_VISIBILITY, org.bukkit.scoreboard.Team.OptionStatus.FOR_OWN_TEAM);
+        BountifulWrapper.impl.setNametagVisibility(team);
         team.setNameTagVisibility(NameTagVisibility.NEVER);
     }
 
@@ -465,15 +460,8 @@ public class PacketProcessor implements Listener {
         if (!Config.ArenaRegion.in2dRegion(x, z)) return; //Outside of the arena
 
         execSync(() -> {
-            int blockState1 = TechHiderWrapper.ENABLED && hiddenBlockIds.contains(blockState) ? obfuscateWith : blockState;
-            BlockState blockData = Block.stateById(blockState1);
-            ServerLevel level = ((CraftWorld) Config.world).getHandle();
-            BlockPos pos = new BlockPos(x, y, z);
-
-            level.removeBlockEntity(pos);
-            level.setBlock(pos, blockData, blockState1);
-            level.getChunkSource().blockChanged(pos);
-            FightSystem.getHullHider().blockUpdate(Config.world.getBlockAt(x, y, z), CraftMagicNumbers.getMaterial(Block.stateById(blockState)).getItemType());
+            BlockIdWrapper.impl.setBlock(Config.world, x, y, z, TechHiderWrapper.ENABLED && hiddenBlockIds.contains(blockState) ? obfuscateWith : blockState);
+            FightSystem.getHullHider().blockUpdate(Config.world.getBlockAt(x, y, z), BlockIdWrapper.impl.idToMaterial(blockState));
         });
     }
 
@@ -490,7 +478,7 @@ public class PacketProcessor implements Listener {
 
         double finalX = x;
         double finalZ = z;
-        execSync(() -> Config.world.spawnParticle(Particle.valueOf(particleName), finalX + Config.ArenaRegion.getMinX(), y + Config.BluePasteRegion.getMinY(), finalZ + Config.ArenaRegion.getMinZ(), 1));
+        execSync(() -> BountifulWrapper.impl.spawnParticle(Config.world, particleName, finalX + Config.ArenaRegion.getMinX(), y + Config.BluePasteRegion.getMinY(), finalZ + Config.ArenaRegion.getMinZ()));
     }
 
     private void sound() throws IOException {
@@ -512,14 +500,9 @@ public class PacketProcessor implements Listener {
         float volume = source.readFloat();
         float pitch = source.readFloat();
 
-        Sound sound = Registry.SOUNDS.get(NamespacedKey.minecraft(soundName));
-        if (sound == null) sound = Sound.valueOf(soundName); // TODO: Remove in 26.x because of no longer needed backwards compatibility
-        Sound finalSound = sound;
+        Sound sound = Sound.valueOf(soundName);
 
-        execSync(() -> {
-            Location location = new Location(Config.world, x, y, z);
-            location.getWorld().playSound(location, finalSound, SoundCategory.valueOf(soundCategory), volume, pitch);
-        });
+        execSync(() -> WorldOfColorWrapper.impl.playSound(new Location(Config.world, x, y, z), sound, soundCategory, volume, pitch));
     }
 
     private void soundAtPlayer() throws IOException {
@@ -528,11 +511,9 @@ public class PacketProcessor implements Listener {
         float volume = source.readFloat();
         float pitch = source.readFloat();
 
-        Sound sound = Registry.SOUNDS.get(NamespacedKey.minecraft(soundName));
-        if (sound == null) sound = Sound.valueOf(soundName); // TODO: Remove in 26.x because of no longer needed backwards compatibility
-        Sound finalSound = sound;
+        Sound sound = Sound.valueOf(soundName);
 
-        execSync(() -> Fight.playSound(finalSound, volume, pitch));
+        execSync(() -> Fight.playSound(sound, volume, pitch));
     }
 
     private void pasteSchem(FightTeam team) throws IOException {
@@ -622,7 +603,7 @@ public class PacketProcessor implements Listener {
 
         Bukkit.getOnlinePlayers().forEach(p -> {
             p.resetTitle();
-            p.sendTitle(title, subtitle, 5, 40, 5);
+            WorldOfColorWrapper.impl.sendTitle(p, title, subtitle, 5, 40, 5);
         });
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java

@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.utils.BlockIdWrapper;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
@@ -33,9 +34,7 @@ import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
- import org.bukkit.Registry;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.block.CraftBlockState;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -220,7 +219,7 @@ public interface Recorder {
     }
 
     default void blockChange(Block block) {
-        int blockState = net.minecraft.world.level.block.Block.getId(((CraftBlockState) block.getState()).getHandle());
+        int blockState = BlockIdWrapper.impl.blockToId(block);
 
         int shortX = block.getX() - Config.ArenaRegion.getMinX();
         int shortY = block.getY() - Config.BluePasteRegion.getMinY();
@@ -239,7 +238,7 @@ public interface Recorder {
     }
 
     default void sound(int x, int y, int z, SWSound soundType, String soundCategory, float volume, float pitch) {
-        write(0x32, x, y, z, Registry.SOUNDS.getKey(soundType.getSound()).getKey(), soundCategory, volume, pitch);
+        write(0x32, x, y, z, soundType.getSound().name(), soundCategory, volume, pitch);
     }
 
     default void soundAtPlayer(String soundType, float volume, float pitch) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java

@@ -0,0 +1,75 @@
+/*
+ *   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.fightsystem.utils;
+
+import com.comphenix.tinyprotocol.TinyProtocol;
+import com.mojang.authlib.GameProfile;
+import de.steamwar.core.ProtocolWrapper;
+import de.steamwar.fightsystem.FightSystem;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.block.CraftBlockState;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+public class BlockIdWrapper {
+    public static final BlockIdWrapper impl = new BlockIdWrapper();
+
+    public Material idToMaterial(int blockState) {
+        return CraftMagicNumbers.getMaterial(net.minecraft.world.level.block.Block.stateById(blockState)).getItemType();
+    }
+
+    public int blockToId(Block block) {
+        return net.minecraft.world.level.block.Block.getId(((CraftBlockState) block.getState()).getHandle());
+    }
+
+    public void setBlock(World world, int x, int y, int z, int blockState) {
+        BlockState blockData = net.minecraft.world.level.block.Block.stateById(blockState);
+        ServerLevel level = ((CraftWorld) world).getHandle();
+        BlockPos pos = new BlockPos(x, y, z);
+
+        level.removeBlockEntity(pos);
+        level.setBlock(pos, blockData, blockState);
+        level.getChunkSource().blockChanged(pos);
+    }
+
+    public void trackEntity(Player player, Entity entity) {
+        if (entity instanceof Player) {
+            TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
+        }
+
+        player.showEntity(FightSystem.getPlugin(), entity);
+    }
+
+    public void untrackEntity(Player player, Entity entity) {
+        player.hideEntity(FightSystem.getPlugin(), entity);
+
+        if (entity instanceof Player) {
+            TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
+        }
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java

@@ -0,0 +1,158 @@
+/*
+ *   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.fightsystem.utils;
+
+import de.steamwar.Reflection;
+import de.steamwar.fightsystem.fight.Fight;
+import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.listener.Recording;
+import de.steamwar.fightsystem.record.GlobalRecorder;
+import net.minecraft.world.InteractionHand;
+import org.bukkit.*;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.boss.BarColor;
+import org.bukkit.boss.BarStyle;
+import org.bukkit.boss.BossBar;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerPickupArrowEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+import org.bukkit.scoreboard.Team;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class BountifulWrapper {
+    public static final BountifulWrapper impl = new BountifulWrapper();
+
+    private static final Class<?> enumHand = InteractionHand.class;
+    private static final Object mainHand = enumHand.getEnumConstants()[0];
+    private static final Reflection.Field<?> blockPlaceHand = Reflection.getField(Recording.blockPlacePacket, enumHand, 0);
+
+    public boolean mainHand(Object packet) {
+        return blockPlaceHand.get(packet) == mainHand;
+    }
+
+    public boolean bowInHand(boolean mainHand, Player p) {
+        return (mainHand ? p.getInventory().getItemInMainHand() : p.getInventory().getItemInOffHand()).getType() == Material.BOW;
+    }
+
+    public void setAttackSpeed(Player player) {
+        AttributeInstance attribute = player.getAttribute(Attribute.ATTACK_SPEED);
+        attribute.setBaseValue(16);
+    }
+
+    public void setNametagVisibility(Team team) {
+        team.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
+    }
+
+    public Listener newDenyArrowPickupListener() {
+        return new Listener() {
+            @EventHandler
+            public void onArrowPickup(PlayerPickupArrowEvent e) {
+                if (Fight.fighting(e.getPlayer())) e.setCancelled(true);
+            }
+        };
+    }
+
+    public Listener newDenyHandSwapListener() {
+        return new Listener() {
+            @EventHandler
+            public void onSwapItems(PlayerSwapHandItemsEvent event) {
+                if (Fight.fighting(event.getPlayer())) event.setCancelled(true);
+            }
+        };
+    }
+
+    public void recordHandItems(Player player) {
+        GlobalRecorder.getInstance().item(player, Recording.disarmNull(player.getInventory().getItemInMainHand()), "MAINHAND");
+        GlobalRecorder.getInstance().item(player, Recording.disarmNull(player.getInventory().getItemInOffHand()), "OFFHAND");
+    }
+
+    public Listener newHandSwapRecorder() {
+        return new Listener() {
+            @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+            public void onItemSwap(PlayerSwapHandItemsEvent e) {
+                if (Recording.isNotSent(e.getPlayer()))
+                    return;
+
+                Player player = e.getPlayer();
+                GlobalRecorder.getInstance().item(player, Recording.disarmNull(e.getMainHandItem()), "MAINHAND");
+                GlobalRecorder.getInstance().item(player, Recording.disarmNull(e.getOffHandItem()), "OFFHAND");
+            }
+        };
+    }
+
+    public void spawnParticle(World world, String particleName, double x, double y, double z) {
+        world.spawnParticle(Particle.valueOf(particleName), x, y, z, 1);
+    }
+
+    private final Map<Player, BossBar> barMap = new HashMap<>();
+
+    public void sendBar(Player player, FightTeam team, double progress, String text) {
+        barMap.keySet().removeIf(p -> !p.isOnline());
+
+        if (!barMap.containsKey(player)) {
+            BossBar bar = Bukkit.createBossBar(player.getName(), BarColor.WHITE, BarStyle.SOLID);
+            barMap.put(player, bar);
+            bar.addPlayer(player);
+        }
+
+        BossBar bar = barMap.get(player);
+        BarColor color = chat2bar(team.getColor());
+        if (bar.getColor() != color) bar.setColor(color);
+
+        if (bar.getProgress() != progress) bar.setProgress(progress);
+
+        if (!bar.getTitle().equals(text)) bar.setTitle(text);
+    }
+
+    private BarColor chat2bar(ChatColor color) {
+        switch (color) {
+            case DARK_BLUE:
+            case DARK_AQUA:
+            case BLUE:
+            case AQUA:
+                return BarColor.BLUE;
+            case GREEN:
+            case DARK_GREEN:
+                return BarColor.GREEN;
+            case DARK_RED:
+            case RED:
+                return BarColor.RED;
+            case DARK_PURPLE:
+                return BarColor.PURPLE;
+            case GOLD:
+            case YELLOW:
+                return BarColor.YELLOW;
+            case LIGHT_PURPLE:
+                return BarColor.PINK;
+            case BLACK:
+            case WHITE:
+            case GRAY:
+            case DARK_GRAY:
+            default:
+                return BarColor.WHITE;
+        }
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java

@@ -19,9 +19,11 @@
 
 package de.steamwar.fightsystem.utils;
 
+import de.steamwar.fightsystem.Config;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
+import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.entity.CraftEntity;
@@ -29,12 +31,26 @@ import org.bukkit.entity.Entity;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 public class CraftbukkitWrapper {
     public static final CraftbukkitWrapper impl = new CraftbukkitWrapper();
 
+    protected net.minecraft.world.entity.Entity getEntity(Entity e) {
+        return ((CraftEntity) e).getHandle();
+    }
+
     public float headRotation(Entity e) {
-        return ((CraftEntity) e).getHandle().getYHeadRot();
+        return getEntity(e).getYHeadRot();
+    }
+
+    public Stream<net.minecraft.world.entity.Entity> entityIterator() {
+        return StreamSupport.stream(((CraftWorld) Config.world).getHandle().getEntities().getAll().spliterator(), false);
+    }
+
+    public void setupGamerule() {
+        Config.world.setGameRule(GameRule.LOCATOR_BAR, false);
     }
 
     private LevelChunk getChunk(World world, int x, int z) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java

@@ -34,12 +34,12 @@ import de.steamwar.fightsystem.winconditions.Wincondition;
 import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.boss.BarColor;
-import org.bukkit.boss.BarStyle;
-import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -142,7 +142,6 @@ public class FightUI {
         BossBarType.RED_LEFT.text = leftRedText;
     }
 
-    private final Map<Player, BossBar> barMap = new HashMap<>();
     private void sendToPlayers() {
         Bukkit.getOnlinePlayers().forEach(player -> {
             BossBarType bar = BossBarType.byAngle(CraftbukkitWrapper.impl.headRotation(player));
@@ -155,55 +154,7 @@ public class FightUI {
                 }
             }
 
-            String text = FightSystem.getMessage().parse(bar.text.getMsg(), player, params);
-            barMap.keySet().removeIf(p -> !p.isOnline());
-
-            if (!barMap.containsKey(player)) {
-                BossBar bar1 = Bukkit.createBossBar(player.getName(), BarColor.WHITE, BarStyle.SOLID);
-                barMap.put(player, bar1);
-                bar1.addPlayer(player);
-            }
-
-            BossBar bar1 = barMap.get(player);
-            BarColor color;
-            switch (bar.team.getColor()) {
-                case DARK_BLUE:
-                case DARK_AQUA:
-                case BLUE:
-                case AQUA:
-                    color = BarColor.BLUE;
-                    break;
-                case GREEN:
-                case DARK_GREEN:
-                    color = BarColor.GREEN;
-                    break;
-                case DARK_RED:
-                case RED:
-                    color = BarColor.RED;
-                    break;
-                case DARK_PURPLE:
-                    color = BarColor.PURPLE;
-                    break;
-                case GOLD:
-                case YELLOW:
-                    color = BarColor.YELLOW;
-                    break;
-                case LIGHT_PURPLE:
-                    color = BarColor.PINK;
-                    break;
-                case BLACK:
-                case WHITE:
-                case GRAY:
-                case DARK_GRAY:
-                default:
-                    color = BarColor.WHITE;
-                    break;
-            }
-            if (bar1.getColor() != color) bar1.setColor(color);
-
-            if (bar1.getProgress() != bar.progress) bar1.setProgress(bar.progress);
-
-            if (!bar1.getTitle().equals(text)) bar1.setTitle(text);
+            BountifulWrapper.impl.sendBar(player, bar.team, bar.progress, FightSystem.getMessage().parse(bar.text.getMsg(), player, params));
         });
     }
 
@@ -257,17 +208,9 @@ public class FightUI {
 
         Bukkit.getOnlinePlayers().forEach(Player::resetTitle);
         if (winner != null) {
-            Bukkit.getOnlinePlayers().forEach(p -> {
-                String title = FightSystem.getMessage().parse("UI_WIN", p, winner.getColor(), winner.getName());
-                String subtitle1 = FightSystem.getMessage().parse(subtitle, p, params);
-                p.sendTitle(title, subtitle1, 5, 40, 5);
-            });
+            Bukkit.getOnlinePlayers().forEach(p -> WorldOfColorWrapper.impl.sendTitle(p, FightSystem.getMessage().parse("UI_WIN", p, winner.getColor(), winner.getName()), FightSystem.getMessage().parse(subtitle, p, params), 5, 40, 5));
         } else {
-            Bukkit.getOnlinePlayers().forEach(p -> {
-                String title = FightSystem.getMessage().parse("UI_DRAW", p);
-                String subtitle1 = FightSystem.getMessage().parse(subtitle, p, params);
-                p.sendTitle(title, subtitle1, 5, 40, 5);
-            });
+            Bukkit.getOnlinePlayers().forEach(p -> WorldOfColorWrapper.impl.sendTitle(p, FightSystem.getMessage().parse("UI_DRAW", p), FightSystem.getMessage().parse(subtitle, p, params), 5, 40, 5));
         }
     }
 
@@ -289,10 +232,7 @@ public class FightUI {
         }
         Message message = queue.poll();
 
-        Bukkit.getOnlinePlayers().forEach(p -> {
-            String subtitle = FightSystem.getMessage().parse(message.getMsg(), p, message.getParams());
-            p.sendTitle(" ", subtitle, 5, 40, 5);
-        });
+        Bukkit.getOnlinePlayers().forEach(p -> WorldOfColorWrapper.impl.sendTitle(p, " ", FightSystem.getMessage().parse(message.getMsg(), p, message.getParams()), 5, 40, 5));
         Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), FightUI::printSubtitle, 50);
         subtitleScheduled = true;
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java

@@ -0,0 +1,97 @@
+/*
+ *   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.fightsystem.utils;
+
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Waterlogged;
+import org.bukkit.block.data.type.Dispenser;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Pose;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BlockDataMeta;
+import org.bukkit.inventory.meta.ItemMeta;
+
+public class FlatteningWrapper {
+    public static final FlatteningWrapper impl = new FlatteningWrapper();
+
+    public boolean isWater(Block block) {
+        if (block.getType() == Material.WATER) return true;
+
+        BlockData data = block.getBlockData();
+        if (!(data instanceof Waterlogged)) return false;
+
+        return ((Waterlogged) data).isWaterlogged();
+    }
+
+    public boolean removeWater(Block block) {
+        Material type = block.getType();
+        if (type == Material.WATER || type == Material.LAVA) {
+            block.setType(Material.AIR);
+            return true;
+        }
+
+        BlockData data = block.getBlockData();
+        if (!(data instanceof Waterlogged)) return false;
+
+        Waterlogged waterlogged = (Waterlogged) data;
+        if (waterlogged.isWaterlogged()) {
+            block.setType(Material.AIR);
+            return true;
+        }
+
+        return false;
+    }
+
+    public boolean containsBlockMeta(ItemMeta meta) {
+        return meta instanceof BlockDataMeta && ((BlockDataMeta) meta).hasBlockData();
+    }
+
+    public boolean hasAttributeModifier(ItemStack stack) {
+        return stack.hasItemMeta() && stack.getItemMeta() != null && stack.getItemMeta().hasAttributeModifiers();
+    }
+
+    public boolean doRecord(BlockPhysicsEvent e) {
+        return e.getBlock() == e.getSourceBlock() || e.getChangedType() == Material.AIR;
+    }
+
+    public void forceLoadChunk(World world, int cX, int cZ) {
+        world.setChunkForceLoaded(cX, cZ, true);
+    }
+
+    public boolean checkPistonMoving(Block block) {
+        return block.getType() == Material.MOVING_PISTON;
+    }
+
+    public boolean isFacingWater(Block dispenser) {
+        return dispenser.getRelative(((Dispenser) dispenser.getBlockData()).getFacing()).isLiquid();
+    }
+
+    public boolean isCrouching(Player player) {
+        return player.getPose() == Pose.SWIMMING;
+    }
+
+    public void sendBlockChange(Player player, Block block, Material type) {
+        player.sendBlockChange(block.getLocation(), type.createBlockData());
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java

@@ -20,25 +20,15 @@
 package de.steamwar.fightsystem.utils;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
-import com.mojang.authlib.GameProfile;
-import de.steamwar.core.ProtocolWrapper;
 import de.steamwar.entity.REntity;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.FightTeam;
-import it.unimi.dsi.fastutil.shorts.Short2ObjectArrayMap;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
-import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
-import net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.block.data.CraftBlockData;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
@@ -101,7 +91,7 @@ public class Hull {
     public void addPlayer(Player player) {
         if (players.add(player)) {
             for (Entity entity : entities) {
-                untrackEntity(player, entity);
+                BlockIdWrapper.impl.untrackEntity(player, entity);
             }
         }
     }
@@ -109,7 +99,7 @@ public class Hull {
     public void removePlayer(Player player, boolean activeRemoval) {
         if (players.remove(player) && activeRemoval) {
             for (Entity entity : entities) {
-                trackEntity(player, entity);
+                BlockIdWrapper.impl.trackEntity(player, entity);
             }
             // techhider triggers block change sending
         }
@@ -120,34 +110,18 @@ public class Hull {
         if (region.inRegion(location) && !visibility.get(new IntVector(location).toId(region))) {
             if (entities.add(entity)) {
                 for (Player player : players) {
-                    untrackEntity(player, entity);
+                    BlockIdWrapper.impl.untrackEntity(player, entity);
                 }
             }
         } else {
             if (entities.remove(entity)) {
                 for (Player player : players) {
-                    trackEntity(player, entity);
+                    BlockIdWrapper.impl.trackEntity(player, entity);
                 }
             }
         }
     }
 
-    public void trackEntity(Player player, Entity entity) {
-        if (entity instanceof Player) {
-            TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
-        }
-
-        player.showEntity(FightSystem.getPlugin(), entity);
-    }
-
-    public void untrackEntity(Player player, Entity entity) {
-        player.hideEntity(FightSystem.getPlugin(), entity);
-
-        if (entity instanceof Player) {
-            TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
-        }
-    }
-
     public void removeEntity(Entity entity) {
         entities.remove(entity);
     }
@@ -165,15 +139,6 @@ public class Hull {
         rentities.remove(entity);
     }
 
-    public void fill(boolean visible) {
-        visibility.set(0, visibility.size(), visible);
-        occluding.set(0, occluding.size(), !visible);
-        uncoveredSurface.clear();
-        for (BitSet directionalVisibility : visibilityDirections.values()) {
-            directionalVisibility.set(0, directionalVisibility.size(), visible);
-        }
-    }
-
     public void initialize() {
         visibility.clear();
         occluding.clear();
@@ -224,34 +189,7 @@ public class Hull {
         uncoveredSurface.clear();
 
         for (Map.Entry<IntVector, List<IntVector>> entry : sectionWise.entrySet()) {
-            Object result;
-            List<IntVector> changes = entry.getValue();
-            Object[] blockdata = new Object[changes.size()];
-            for (int i = 0; i < blockdata.length; i++) {
-                IntVector change = changes.get(i);
-                blockdata[i] = ((CraftBlockData) Config.world.getBlockData(change.getX(), change.getY(), change.getZ())).getState();
-            }
-
-            if (changes.size() > 1) {
-                IntVector section = changes.get(0);
-                section = new IntVector(section.getX() >> 4, section.getY() >> 4, section.getZ() >> 4);
-                int xOffset = 16 * section.getX();
-                int yOffset = 16 * section.getY();
-                int zOffset = 16 * section.getZ();
-
-                short[] pos = new short[changes.size()];
-                for (int i = 0; i < changes.size(); i++) {
-                    IntVector change = changes.get(i);
-
-                    pos[i] = (short) (((change.getX() - xOffset) << 8) + ((change.getZ() - zOffset) << 4) + (change.getY() - yOffset));
-                }
-
-                result = new ClientboundSectionBlocksUpdatePacket(SectionPos.of(section.getX(), section.getY(), section.getZ()), new Short2ObjectArrayMap<>(pos, blockdata, blockdata.length));
-            } else {
-                IntVector pos = changes.get(0);
-                result = new ClientboundBlockUpdatePacket(new BlockPos(pos.getX(), pos.getY(), pos.getZ()), (BlockState) blockdata[0]);
-            }
-            Object packet = result;
+            Object packet = HullHiderWrapper.impl.generateBlockChangePacket(entry.getValue());
             players.forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
         }
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java

@@ -19,6 +19,8 @@
 
 package de.steamwar.fightsystem.utils;
 
+import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.entity.REntity;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.fight.Fight;
@@ -26,9 +28,18 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.listener.Recording;
 import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.techhider.TechHider;
 import lombok.Getter;
+import net.minecraft.core.Vec3i;
+import net.minecraft.network.protocol.game.ClientboundExplodePacket;
+import net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
+import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
+import net.minecraft.network.protocol.game.ClientboundSoundPacket;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -44,12 +55,17 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
 public class HullHider implements Listener {
 
     @Getter
     private final Map<FightTeam, Hull> hullMap = new HashMap<>();
     private final Hull[] hulls;
+    private final Map<Class<?>, BiFunction<Player, Object, Object>> packetHiders = new HashMap<>();
+
+    private static final Class<?> packetPlayOutExplosion = ClientboundExplodePacket.class;
 
     public HullHider() {
         if (!TechHiderWrapper.ENABLED) {
@@ -60,20 +76,34 @@ public class HullHider implements Listener {
         Fight.teams().forEach(team -> hullMap.put(team, new Hull(team)));
         hulls = hullMap.values().toArray(new Hull[0]);
 
+        packetHiders.put(packetPlayOutWorldEvent, this::worldEventHider);
+        packetHiders.put(packetPlayOutExplosion, this::explosionHider);
+        posHiderGenerator(ClientboundLevelParticlesPacket.class, double.class, 1.0);
+        posHiderGenerator(ClientboundSoundPacket.class, int.class, 8.0);
 
         new StateDependentListener(TechHiderWrapper.ENABLED, FightState.Schem, this);
+        new StateDependent(TechHiderWrapper.ENABLED, FightState.Schem) {
+            @Override
+            public void enable() {
+                packetHiders.forEach(TinyProtocol.instance::addFilter);
+                Bukkit.getOnlinePlayers().forEach(HullHider.this::updatePlayer);
+            }
+
+            @Override
+            public void disable() {
+                Bukkit.getOnlinePlayers().forEach(player -> removePlayer(player, true));
+                packetHiders.forEach(TinyProtocol.instance::removeFilter);
+            }
+        }.register();
         new StateDependentTask(TechHiderWrapper.ENABLED, FightState.Schem, this::onTick, 0, 1);
     }
 
     public void initialize(FightTeam team) {
         if (!TechHiderWrapper.ENABLED) return;
+
         hullMap.get(team).initialize();
     }
 
-    public void fill(FightTeam team, boolean visible) {
-        if (!TechHiderWrapper.ENABLED) return;
-        hullMap.get(team).fill(visible);
-    }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onJoin(PlayerJoinEvent e) {
@@ -108,7 +138,7 @@ public class HullHider implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPhysic(BlockPhysicsEvent e) {
-        if (e.getBlock() == e.getSourceBlock() || e.getChangedType() == Material.AIR) {
+        if (FlatteningWrapper.impl.doRecord(e)) {
             blockUpdate(e.getBlock(), e.getChangedType());
         }
     }
@@ -131,6 +161,18 @@ public class HullHider implements Listener {
         return false;
     }
 
+    public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) {
+        if (!TechHiderWrapper.ENABLED) return false;
+
+        for (Hull hull : hulls) {
+            if (hull.blockPrecise(player, chunkX, chunkY, chunkZ)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onSpawn(EntitySpawnEvent e) {
         for (Hull hull : hulls) {
@@ -168,4 +210,39 @@ public class HullHider implements Listener {
             hull.removeREntity(e);
         }
     }
+
+
+    private static final Class<?> packetPlayOutWorldEvent = ClientboundLevelEventPacket.class;
+    private static final Reflection.Field<?> worldEventPosition = Reflection.getField(packetPlayOutWorldEvent, TechHider.blockPosition, 0);
+    public static final Reflection.Field<Integer> blockPositionY = Reflection.getField(Vec3i.class, int.class, 1);
+
+    private Object worldEventHider(Player player, Object packet) {
+        Object baseBlock = worldEventPosition.get(packet);
+        return packetHider(player, packet, new Location(Config.world, TechHider.blockPositionX.get(baseBlock), blockPositionY.get(baseBlock), TechHider.blockPositionZ.get(baseBlock)));
+    }
+
+    private Object explosionHider(Player player, Object packet) {
+        return ReflectionWrapper.impl.explosionHider(player, packet, this::packetHider);
+    }
+
+    private void posHiderGenerator(Class<?> type, Class<? extends Number> posType, double factor) {
+        Function<Object, Location> location = posPacketToLocation(type, posType, factor);
+        packetHiders.put(type, (player, packet) -> packetHider(player, packet, location.apply(packet)));
+    }
+
+    public static Function<Object, Location> posPacketToLocation(Class<?> type, Class<? extends Number> posType, double factor) {
+        Reflection.Field<? extends Number> x = Reflection.getField(type, posType, 0);
+        Reflection.Field<? extends Number> y = Reflection.getField(type, posType, 1);
+        Reflection.Field<? extends Number> z = Reflection.getField(type, posType, 2);
+
+        return packet -> new Location(Config.world, x.get(packet).doubleValue() / factor, y.get(packet).doubleValue() / factor, z.get(packet).doubleValue() / factor);
+    }
+
+    private Object packetHider(Player player, Object packet, Location location) {
+        for (Hull hull : hulls) {
+            if (hull.isLocationHidden(player, location)) return null;
+        }
+
+        return packet;
+    }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHiderWrapper.java

@@ -0,0 +1,71 @@
+/*
+ *   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.fightsystem.utils;
+
+import de.steamwar.fightsystem.Config;
+import it.unimi.dsi.fastutil.shorts.Short2ObjectArrayMap;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.SectionPos;
+import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
+
+import java.util.List;
+
+public class HullHiderWrapper {
+    public static final HullHiderWrapper impl = new HullHiderWrapper();
+
+    public Object generateBlockChangePacket(List<Hull.IntVector> changes) {
+        Object[] blockdata = new Object[changes.size()];
+        for (int i = 0; i < blockdata.length; i++) {
+            Hull.IntVector change = changes.get(i);
+            blockdata[i] = ((CraftBlockData) Config.world.getBlockData(change.getX(), change.getY(), change.getZ())).getState();
+        }
+
+        return generateBlockChangePacket(changes, blockdata);
+    }
+
+    private Object generateBlockChangePacket(List<Hull.IntVector> changes, Object[] blockdata) {
+        if (changes.size() > 1) {
+            Hull.IntVector section = changes.get(0);
+            section = new Hull.IntVector(section.getX() >> 4, section.getY() >> 4, section.getZ() >> 4);
+            int xOffset = 16 * section.getX();
+            int yOffset = 16 * section.getY();
+            int zOffset = 16 * section.getZ();
+
+            short[] pos = new short[changes.size()];
+            for (int i = 0; i < changes.size(); i++) {
+                Hull.IntVector change = changes.get(i);
+
+                pos[i] = (short) (((change.getX() - xOffset) << 8) + ((change.getZ() - zOffset) << 4) + (change.getY() - yOffset));
+            }
+
+            return constructMultiBlockChange(section, pos, blockdata);
+        } else {
+            Hull.IntVector pos = changes.get(0);
+            return new ClientboundBlockUpdatePacket(new BlockPos(pos.getX(), pos.getY(), pos.getZ()), (BlockState) blockdata[0]);
+        }
+    }
+
+    protected Object constructMultiBlockChange(Hull.IntVector section, short[] pos, Object[] blockdata) {
+        return new ClientboundSectionBlocksUpdatePacket(SectionPos.of(section.getX(), section.getY(), section.getZ()), new Short2ObjectArrayMap<>(pos, blockdata, blockdata.length));
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ReflectionWrapper.java

@@ -0,0 +1,79 @@
+/*
+ *   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.fightsystem.utils;
+
+import io.papermc.paper.datacomponent.DataComponentType;
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ReflectionWrapper {
+    public static final ReflectionWrapper impl = new ReflectionWrapper();
+
+    private static final Set<DataComponentType> FORBIDDEN_TYPES = new HashSet<>();
+
+    static {
+        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_NAME);
+        FORBIDDEN_TYPES.add(DataComponentTypes.PROFILE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.UNBREAKABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCK_DATA);
+        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
+
+        FORBIDDEN_TYPES.add(DataComponentTypes.ATTRIBUTE_MODIFIERS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.TOOL);
+        FORBIDDEN_TYPES.add(DataComponentTypes.WEAPON);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FOOD);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CONSUMABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.POTION_CONTENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.STORED_ENCHANTMENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_BREAK);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_PLACE_ON);
+        FORBIDDEN_TYPES.add(DataComponentTypes.MAX_DAMAGE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.USE_REMAINDER);
+        FORBIDDEN_TYPES.add(DataComponentTypes.USE_COOLDOWN);
+        FORBIDDEN_TYPES.add(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CHARGED_PROJECTILES);
+        FORBIDDEN_TYPES.add(DataComponentTypes.INTANGIBLE_PROJECTILE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORKS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORK_EXPLOSION);
+        FORBIDDEN_TYPES.add(DataComponentTypes.EQUIPPABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.REPAIR_COST);
+        FORBIDDEN_TYPES.add(DataComponentTypes.ENCHANTABLE);
+    }
+
+    public Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction) {
+        return packet;
+    }
+
+    public boolean hasItems(ItemStack stack) {
+        FORBIDDEN_TYPES.forEach(stack::resetData);
+        return false;
+    }
+
+    public interface PacketHiderFunction {
+        Object hide(Player player, Object packet, Location location);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java

@@ -21,6 +21,7 @@ package de.steamwar.fightsystem.utils;
 
 import de.steamwar.core.CraftbukkitWrapper;
 import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.events.BoardingEvent;
 import de.steamwar.fightsystem.events.TeamLeaveEvent;
 import de.steamwar.fightsystem.events.TeamSpawnEvent;
@@ -29,114 +30,56 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.techhider.AccessPrivilegeProvider;
+import de.steamwar.sql.SteamwarUser;
 import de.steamwar.techhider.TechHider;
 import lombok.Getter;
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Fluids;
 import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Set;
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-public class TechHiderWrapper extends StateDependent implements Listener {
+public class TechHiderWrapper extends StateDependent implements TechHider.LocationEvaluator, Listener {
 
     public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.GameModeConfig.Techhider.Active;
 
     @Getter
     private final ConcurrentHashMap<Player, Region> hiddenRegion = new ConcurrentHashMap<>();
-    private final HullHider hullHider;
+    private final ConcurrentHashMap<Player, Long> patterns = new ConcurrentHashMap<>();
+    private final TechHider techHider;
+    private final SecretKey key;
 
-    public TechHiderWrapper(HullHider hullHider) {
-        super(ENABLED, FightState.All);
+    public TechHiderWrapper() {
+        super(ENABLED, FightState.Schem);
+        techHider = new TechHider(this, Config.GameModeConfig.Techhider.ObfuscateWith, Config.GameModeConfig.Techhider.HiddenBlocks, Config.GameModeConfig.Techhider.HiddenBlockEntities);
 
-        this.hullHider = hullHider;
+        try {
+            key = new SecretKeySpec(Files.readAllBytes(new File(System.getProperty("user.home"), "hullhider.key").toPath()), "AES");
+        } catch (IOException e) {
+            throw new SecurityException(e);
+        }
 
-        new StateDependentListener(ENABLED, FightState.All, this);
+        new StateDependentListener(ENABLED, FightState.Schem, this);
         register();
     }
 
     @Override
     public void enable() {
-        Set<BlockState> blockStatesToObfuscate = getBlockStatesToHideFromMaterials(Config.GameModeConfig.Techhider.HiddenBlocks);
-
-        Set<Block> blocksToObfuscate = Config.GameModeConfig.Techhider.HiddenBlocks.stream()
-                .map(CraftMagicNumbers::getBlock)
-                .collect(Collectors.toUnmodifiableSet());
-
-        Set<BlockEntityType<?>> blockEntityTypeToObfuscate = Config.GameModeConfig.Techhider.HiddenBlockEntities.stream()
-                .map(id -> {
-                    ResourceLocation loc = ResourceLocation.parse(id);
-                    return BuiltInRegistries.BLOCK_ENTITY_TYPE.get(loc).orElse(null);
-                })
-                .filter(Objects::nonNull)
-                .map(Holder.Reference::value)
-                .collect(Collectors.toUnmodifiableSet());
-
-        new TechHider(CraftMagicNumbers.getBlock(Config.GameModeConfig.Techhider.ObfuscateWith), new AccessPrivilegeProvider() {
-            @Override
-            public boolean isEveryonePrivilegedToAccessAllDataWithinChunk(int chunkX, int chunkZ) {
-                return Fight.teams().stream().map(FightTeam::getExtendRegion).allMatch(region -> region.chunkOutside(chunkX, chunkZ));
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToAccessPosition(Player p, int blockX, int blockY, int blockZ) {
-                return !hullHider.isBlockHidden(p, blockX, blockY, blockZ);
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToAccessBlock(Player p, int blockX, int blockY, int blockZ, Block block) {
-                return !getHiddenRegion(p).inRegion(blockX, blockY, blockZ) || !blocksToObfuscate.contains(block);
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToAccessBlockState(Player p, int blockX, int blockY, int blockZ, BlockState blockState) {
-                return !getHiddenRegion(p).inRegion(blockX, blockY, blockZ) || !blockStatesToObfuscate.contains(blockState);
-            }
-
-            // TODO will require entity tracking on the netty thread to prevent future race conditions
-            @Override
-            public boolean isPlayerPrivilegedToAccessEntity(Player p, int entityId) {
-                net.minecraft.world.entity.Entity nmsEntity = ((CraftWorld) p.getWorld()).getHandle().moonrise$getEntityLookup().get(entityId);
-
-                if (nmsEntity != null) {
-                    return !hullHider.isBlockHidden(p, nmsEntity.getBlockX(), nmsEntity.getBlockY(), nmsEntity.getBlockZ());
-                } else {
-                    return true;
-                }
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToAccessBlockEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType<?> type) {
-                return !getHiddenRegion(p).inRegion(blockX, blockY, blockZ) || !blockEntityTypeToObfuscate.contains(type);
-            }
-
-            @Override
-            public boolean isPlayerPrivilegedToPerformAction(Player p) {
-                return p.getGameMode() != GameMode.SPECTATOR;
-            }
-        });
+        techHider.enable();
     }
 
     @Override
     public void disable() {
+        techHider.disable();
         hiddenRegion.clear();
     }
 
@@ -175,6 +118,72 @@ public class TechHiderWrapper extends StateDependent implements Listener {
         });
     }
 
+    @Override
+    public boolean suppressInteractions(Player player) {
+        return player.getGameMode() == GameMode.SPECTATOR;
+    }
+
+    @Override
+    public boolean skipChunk(Player player, int chunkX, int chunkZ) {
+        return getHiddenRegion(player).chunkOutside(chunkX, chunkZ);
+    }
+
+    @Override
+    public boolean skipChunkSection(Player player, int chunkX, int chunkY, int chunkZ) {
+        return getHiddenRegion(player).chunkSectionOutside(chunkX, chunkY, chunkZ);
+    }
+
+    @Override
+    public TechHider.State check(Player player, int x, int y, int z) {
+        if (hiddenRegion.computeIfAbsent(player, this::getHiddenRegion).inRegion(x, y, z)) {
+            if (FightSystem.getHullHider().isBlockHidden(player, x, y, z)) {
+                int id = ((y & 3) << 4) + ((z & 3) << 2) + (x & 3);
+                return (patterns.computeIfAbsent(player, this::getPattern) & (1L << id)) == 0 ? TechHider.State.HIDE_AIR : TechHider.State.HIDE;
+            } else {
+                return TechHider.State.CHECK;
+            }
+        } else {
+            return TechHider.State.SKIP;
+        }
+    }
+
+    public long getPattern(Player player) {
+        long pattern = SteamwarUser.get(player.getUniqueId()).getId();
+
+        byte[] bytes = new byte[]{
+                (byte) (pattern & 0xFF),
+                (byte) ((pattern >>> 8) & 0xFF),
+                (byte) ((pattern >>> 16) & 0xFF),
+                (byte) ((pattern >>> 24) & 0xFF)
+        };
+
+        try {
+            Cipher cipher = Cipher.getInstance("AES_256/CFB/NoPadding");
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+            bytes = cipher.doFinal(bytes);
+        } catch (IllegalBlockSizeException | BadPaddingException | NoSuchAlgorithmException | NoSuchPaddingException |
+                 InvalidKeyException e) {
+            throw new SecurityException(e);
+        }
+
+        pattern = bytes[0] & 0xFFL |
+                ((bytes[1] & 0xFFL) << 8) |
+                ((bytes[2] & 0xFFL) << 16) |
+                ((bytes[3] & 0xFFL) << 24);
+
+        /* XXXO   OOOX
+         *  XXXO   OOOX
+         *  XXOX   OOXO
+         *  OOXX   XXOO */
+        pattern |= 0b1110_1110_1101_0011___0001_0001_0010_1100___0000_0000_0000_0000___0000_0000_0000_0000L;
+        return pattern;
+    }
+
+    @Override
+    public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) {
+        return FightSystem.getHullHider().blockPrecise(player, chunkX, chunkY, chunkZ);
+    }
+
     private Region getHiddenRegion(Player player) {
         if (Config.isReferee(player)) return Region.EMPTY;
 
@@ -185,27 +194,4 @@ public class TechHiderWrapper extends StateDependent implements Listener {
 
         return Fight.getOpposite(team).getExtendRegion();
     }
-
-    private Stream<BlockState> getWaterloggedBlockStates() {
-        FluidState waterFluidState = Fluids.WATER.getSource(false);
-
-        return BuiltInRegistries.BLOCK.stream()
-                .map((block) -> block.getStateDefinition().getPossibleStates())
-                .flatMap(Collection::stream)
-                .filter((blockState -> blockState.getFluidState() == waterFluidState));
-    }
-
-    private Set<BlockState> getBlockStatesToHideFromMaterials(Set<Material> materials) {
-        Stream<BlockState> allStatesFromMaterials = materials.stream()
-                .map(CraftMagicNumbers::getBlock)
-                .map((block) -> block.getStateDefinition().getPossibleStates())
-                .flatMap(Collection::stream);
-
-        if(materials.contains(Material.WATER)) {
-            return Stream.concat(allStatesFromMaterials, getWaterloggedBlockStates()).collect(Collectors.toUnmodifiableSet());
-        }
-        else {
-            return allStatesFromMaterials.collect(Collectors.toUnmodifiableSet());
-        }
-    }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TpsWarper.java

@@ -0,0 +1,11 @@
+package de.steamwar.fightsystem.utils;
+
+import net.minecraft.server.MinecraftServer;
+
+public class TpsWarper {
+    public static final TpsWarper impl = new TpsWarper();
+
+    public void warp(float tps) {
+        MinecraftServer.getServer().tickRateManager().setTickRate(tps);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *   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.fightsystem.utils;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Sound;
+import org.bukkit.SoundCategory;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.scoreboard.Team;
+
+public class WorldOfColorWrapper {
+    public static final WorldOfColorWrapper impl = new WorldOfColorWrapper();
+
+    public void setTeamColor(Team team, ChatColor color) {
+        team.setColor(color);
+    }
+
+    public boolean isInBlock(Projectile e) {
+        if (e instanceof Arrow arrow) return arrow.isInBlock();
+        return false;
+    }
+
+    public void playSound(Location location, Sound sound, String soundCategory, float volume, float pitch) {
+        location.getWorld().playSound(location, sound, SoundCategory.valueOf(soundCategory), volume, pitch);
+    }
+
+    public void sendTitle(Player player, String title, String subtitle, int start, int hold, int stop) {
+        player.sendTitle(title, subtitle, start, hold, stop);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java

@@ -19,22 +19,13 @@
 
 package de.steamwar.fightsystem.winconditions;
 
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.Waterlogged;
 
 @Linked
 public class WinconditionWaterTechKO extends WinconditionBlocks {
 
     public WinconditionWaterTechKO() {
-        super(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", block -> {
-            if (block.getType() == Material.WATER) return true;
-
-            BlockData data = block.getBlockData();
-            if (!(data instanceof Waterlogged)) return false;
-
-            return ((Waterlogged) data).isWaterlogged();
-        });
+        super(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", FlatteningWrapper.impl::isWater);
     }
 }

FightSystem/build.gradle.kts

@@ -30,6 +30,16 @@ dependencies {
     implementation(project(":FightSystem:FightSystem_Core"))
 }
 
+tasks.register<FightServer>("WarGear20") {
+    group = "run"
+    description = "Run a WarGear 1.20 Fight Server"
+    dependsOn(":SpigotCore:shadowJar")
+    dependsOn(":FightSystem:shadowJar")
+    template = "WarGear20"
+    worldName = "arenas/Pentraki"
+    config = "WarGear20.yml"
+}
+
 tasks.register<FightServer>("HalloweenWS") {
     group = "run"
     description = "Run a Halloween 1.21 Fight Replay Server"
@@ -47,9 +57,28 @@ tasks.register<FightServer>("WarGear21") {
     description = "Run a WarGear 1.21 Fight Server"
     dependsOn(":SpigotCore:shadowJar")
     dependsOn(":FightSystem:shadowJar")
-    dependsOn(":KotlinCore:shadowJar")
     template = "WarGear21"
     worldName = "arenas/Pentraki"
-    config = "WarGear21.yml"
+    config = "WarGear20.yml"
     jar = "/jars/paper-1.21.6.jar"
 }
+
+tasks.register<FightServer>("SpaceCraftDev20") {
+    group = "run"
+    description = "Run a SpaceCraftDev 1.20 Fight Server"
+    dependsOn(":SpigotCore:shadowJar")
+    dependsOn(":FightSystem:shadowJar")
+    template = "SpaceCraft20"
+    worldName = "arenas/AS_Horizon"
+    config = "SpaceCraftDev20.yml"
+}
+
+tasks.register<FightServer>("QuickGear20") {
+    group = "run"
+    description = "Run a QuickGear 1.20 Fight Server"
+    dependsOn(":SpigotCore:shadowJar")
+    dependsOn(":FightSystem:shadowJar")
+    template = "QuickGear20"
+    worldName = "arenas/WarGearPark"
+    config = "QuickGear20.yml"
+}

LobbySystem/build.gradle.kts

@@ -19,7 +19,6 @@
 
 plugins {
     steamwar.java
-    widener
 }
 
 dependencies {
@@ -33,16 +32,11 @@ dependencies {
     compileOnly(libs.fawe)
 }
 
-widener {
-    fromCatalog(libs.nms)
-    fromCatalog(libs.paperapi)
-}
-
-tasks.register<DevServer>("DevLobby") {
+tasks.register<DevServer>("DevLobby20") {
     group = "run"
-    description = "Run a Dev Lobby"
+    description = "Run a 1.20 Dev Lobby"
     dependsOn(":SpigotCore:shadowJar")
     dependsOn(":LobbySystem:jar")
-    template = "Lobby21"
+    template = "Lobby20"
     worldName = "Lobby"
 }

LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java

@@ -20,9 +20,7 @@
 package de.steamwar.lobby.boatrace;
 
 import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityAction;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RInteraction;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.util.LeaderboardManager;
 import de.steamwar.sql.SteamwarUser;
@@ -60,12 +58,11 @@ public class BoatRace implements EventListener, Listener {
 
     static {
         boatNpcServer = new REntityServer();
-        new REntity(boatNpcServer, EntityType.VILLAGER, BoatRacePositions.NPC);
-        RInteraction interaction = new RInteraction(boatNpcServer, BoatRacePositions.NPC.clone().subtract(0.5, 0, 0.5));
-        interaction.setInteractionHeight(1.95f);
-        interaction.setCallback((player, entity, action) -> {
-            Bukkit.getWorlds().get(0).getEntities().stream().filter(e -> e.getType() == EntityType.END_CRYSTAL).forEach(Entity::remove);
-            if (action == REntityAction.INTERACT && !oneNotStarted) {
+        REntity starter = new REntity(boatNpcServer, EntityType.VILLAGER, BoatRacePositions.NPC);
+        boatNpcServer.setCallback((player, rEntity, entityAction) -> {
+            if (rEntity != starter) return;
+            Bukkit.getWorlds().get(0).getEntities().stream().filter(entity -> entity.getType() == EntityType.END_CRYSTAL).forEach(Entity::remove);
+            if (entityAction == REntityServer.EntityAction.INTERACT && !oneNotStarted) {
                 oneNotStarted = true;
                 new BoatRace(player);
             }

LobbySystem/src/de/steamwar/lobby/map/ColorInit.java

@@ -42,7 +42,7 @@ public class ColorInit {
         if (inputStream == null) {
             colors = new byte[256 * 256 * 256];
             for (int i = 0; i < colors.length; i++) {
-                colors[i] = matchColor(new Color(i));
+                colors[i] = MapPalette.matchColor(new Color(i));
             }
         } else {
             try {
@@ -57,26 +57,4 @@ public class ColorInit {
         }
         System.out.println("[ColorInit] Initialization took " + (System.currentTimeMillis() - time) + "ms");
     }
-
-    public static byte matchColor(Color color) {
-        if (color.getAlpha() < 128) return 0;
-
-        if (MapPalette.mapColorCache != null && MapPalette.mapColorCache.isCached()) {
-            return MapPalette.mapColorCache.matchColor(color);
-        }
-
-        int index = 0;
-        double best = -1;
-
-        for (int i = 4; i < MapPalette.colors.length; i++) {
-            double distance = MapPalette.getDistance(color, MapPalette.colors[i]);
-            if (distance < best || best == -1) {
-                best = distance;
-                index = i;
-            }
-        }
-
-        // Minecraft has 248 colors, some of which have negative byte representations
-        return (byte) (index < 128 ? index : -129 + (index - 127));
-    }
 }

LobbySystem/src/de/steamwar/lobby/map/CustomMap.java

@@ -42,10 +42,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 import java.io.File;
 import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.Month;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 
 public class CustomMap implements Listener {
 
@@ -59,7 +56,7 @@ public class CustomMap implements Listener {
             new Vector(2346, 45, 1297), new Vector(2345, 45, 1297), new Vector(2344, 45, 1297), new Vector(2343, 45, 1297), new Vector(2342, 45, 1297), new Vector(2341, 45, 1297), new Vector(2340, 45, 1297)
     );
 
-    private static final CustomMap RIGHT = new CustomMap(new File(System.getProperty("user.home") + "/lobbyBanner/right/"),
+    private static final CustomMap RIGHT = new CustomMap(new File(System.getProperty("user.home") + "/lobbyBanner/right.png"),
             new Vector(2330, 48, 1297), new Vector(2329, 48, 1297), new Vector(2328, 48, 1297), new Vector(2327, 48, 1297), new Vector(2326, 48, 1297), new Vector(2325, 48, 1297), new Vector(2324, 48, 1297),
             new Vector(2330, 47, 1297), new Vector(2329, 47, 1297), new Vector(2328, 47, 1297), new Vector(2327, 47, 1297), new Vector(2326, 47, 1297), new Vector(2325, 47, 1297), new Vector(2324, 47, 1297),
             new Vector(2330, 46, 1297), new Vector(2329, 46, 1297), new Vector(2328, 46, 1297), new Vector(2327, 46, 1297), new Vector(2326, 46, 1297), new Vector(2325, 46, 1297), new Vector(2324, 46, 1297),
@@ -69,49 +66,30 @@ public class CustomMap implements Listener {
     private File mapFile;
     private Map<Vector, Integer> itemFrameIndex = new HashMap<>();
     private ItemFrame[] itemFrames;
-    private boolean update = true;
+    private long lastModified = Long.MAX_VALUE;
 
-    public CustomMap(File mapFileOrDirectory, Vector... itemFrames) {
-        this.mapFile = mapFileOrDirectory;
+    public CustomMap(File mapFile, Vector... itemFrames) {
+        this.mapFile = mapFile;
         this.itemFrames = new ItemFrame[itemFrames.length];
         for (int i = 0; i < itemFrames.length; i++) {
             itemFrameIndex.put(itemFrames[i], i);
         }
 
-        if (mapFileOrDirectory.isDirectory()) {
-            AtomicReference<Month> lastMonth = new AtomicReference<>(LocalDateTime.now().getMonth());
-            Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
-                Month current = LocalDateTime.now().getMonth();
-                if (!current.equals(lastMonth.get()) || update) {
-                    lastMonth.set(current);
-                    update = false;
-                    this.mapFile = new File(mapFileOrDirectory, current.getValue() + ".png");
-                    update();
-                }
-            }, 200L, 1200L);
-        } else {
-            AtomicReference<Long> lastModified = new AtomicReference<>(Long.MAX_VALUE);
-            Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
-                long modified = mapFileOrDirectory.lastModified();
-                if (modified > lastModified.get() || update) {
-                    lastModified.set(modified);
-                    update = false;
-                    update();
-                }
-            }, 200L, 200L);
-        }
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
-    }
-
-    private void update() {
-        System.out.println("Updating Banner: " + mapFile.getName());
-        Bukkit.getScheduler().runTaskAsynchronously(LobbySystem.getInstance(), () -> {
-            try {
-                run();
-            } catch (IOException e) {
-                // Ignore
+        Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
+            long modified = mapFile.lastModified();
+            if (modified > lastModified) {
+                lastModified = modified;
+                System.out.println("Updating Banner: " + mapFile.getName());
+                Bukkit.getScheduler().runTaskAsynchronously(LobbySystem.getInstance(), () -> {
+                    try {
+                        run();
+                    } catch (IOException e) {
+                        // Ignore
+                    }
+                });
             }
-        });
+        }, 200L, 200L);
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
     }
 
     @EventHandler
@@ -123,7 +101,7 @@ public class CustomMap implements Listener {
             if (itemFrameIndex.containsKey(vector)) {
                 if (itemFrames[itemFrameIndex.get(vector)] != null) continue;
                 itemFrames[itemFrameIndex.get(vector)] = itemFrame;
-                update = true;
+                lastModified = 0;
 
                 ItemStack itemStack = new ItemStack(Material.FILLED_MAP, 1);
                 MapMeta mapMeta = (MapMeta) itemStack.getItemMeta();
@@ -276,8 +254,7 @@ public class CustomMap implements Listener {
                 int green = pixels[i2];
                 int i3 = (y * width + x) * numBands + 2;
                 int blue = pixels[i3];
-                int colorIndex = ColorInit.getColorByte(red, green, blue);
-                Color nearest = MapPalette.colors[colorIndex >= 0 ? colorIndex : colorIndex + 256];
+                Color nearest = MapPalette.getColor(ColorInit.getColorByte(red, green, blue));
 
                 pixels[(y * width + x) * numBands] = nearest.getRed();
                 pixels[i2] = nearest.getGreen();

LobbySystem/src/lobby.accesswidener

@@ -1,6 +0,0 @@
-accessWidener v2 named
-
-# For CustomMap and ColorInit
-accessible field org/bukkit/map/MapPalette colors [Ljava/awt/Color;
-accessible method org/bukkit/map/MapPalette getDistance (Ljava/awt/Color;Ljava/awt/Color;)D
-accessible field org/bukkit/map/MapPalette mapColorCache Lorg/bukkit/map/MapPalette$MapColorCache;

MissileWars/build.gradle.kts

@@ -29,15 +29,5 @@ dependencies {
     compileOnly(libs.paperapi)
 
     compileOnly(libs.nms)
-    compileOnly(libs.fawe)
-}
-
-tasks.register<FightServer>("MissileWars21") {
-    group = "run"
-    description = "Run a 1.21 Dev MissileWars"
-    dependsOn(":SpigotCore:shadowJar")
-    dependsOn(":MissileWars:jar")
-    template = "MissileWars"
-    worldName = "Great_Wall"
-    jar = "/jars/paper-1.21.6.jar"
+    compileOnly(libs.worldedit)
 }

MissileWars/src/de/steamwar/misslewars/items/Missile.java

@@ -30,8 +30,6 @@ import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.SideEffect;
-import com.sk89q.worldedit.util.SideEffectSet;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.misslewars.MissileWars;
@@ -111,17 +109,11 @@ public class Missile extends SpecialItem {
         v = aT.apply(v.toVector3()).toBlockPoint();
         v = v.add(location.getBlockX(), location.getBlockY(), location.getBlockZ());
 
-        EditSession e = WorldEdit.getInstance().getEditSessionFactory()
-                .getEditSession(world, -1);
-        e.setSideEffectApplier(SideEffectSet.defaults()
-                .with(SideEffect.NEIGHBORS, SideEffect.State.ON)
-                .with(SideEffect.LIGHTING, SideEffect.State.ON)
-                .with(SideEffect.UPDATE, SideEffect.State.ON));
+        EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1);
         ClipboardHolder ch = new ClipboardHolder(clipboard);
         ch.setTransform(aT);
         Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(true).build());
         e.flushSession();
-
         return true;
     }