Fix SmartPlaceListener

Reviewed-on: #257
Reviewed-by: YoyoNow <jwsteam@nidido.de>

.gitignore

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

BauSystem_15/build.gradle

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

BauSystem_15/src/de/steamwar/bausystem/entities/DetonatorEntity15.java

@@ -1,82 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.detonator.AbstractDetonatorEntity;
-import net.minecraft.server.v1_15_R1.*;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class DetonatorEntity15 extends EntityFallingBlock implements AbstractDetonatorEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-    private final Vector position;
-    private int references = 0;
-
-    public DetonatorEntity15(World world, Vector position) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ(), Blocks.RED_STAINED_GLASS.getBlockData());
-        this.position = position;
-
-        this.h(true);
-        this.setNoGravity(true);
-        this.ticksLived = -12000;
-    }
-
-    @Override
-    public void display(Player player) {
-        if (references++ > 0)
-            return;
-
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(getId(), getUniqueID(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.FALLING_BLOCK, Block.getCombinedId(Blocks.RED_STAINED_GLASS.getBlockData()), ZERO);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
-        playerConnection.sendPacket(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), datawatcher, true);
-        playerConnection.sendPacket(packetPlayOutEntityMetadata);
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!force && --references > 0)
-            return false;
-
-        sendDestroy(player);
-        die();
-        return true;
-    }
-
-    private void sendDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(getId());
-        ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packetPlayOutEntityDestroy);
-    }
-
-    @Override
-    public void sendEntity(Player player) {
-        display(player);
-    }
-
-    @Override
-    public void sendEntityDestroy(Player player) {
-        hide(player, false);
-    }
-}

BauSystem_15/src/de/steamwar/bausystem/entities/SimulatorEntity15.java

@@ -1,64 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.simulator.AbstractSimulatorEntity;
-import de.steamwar.bausystem.shared.BaseEntity15;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class SimulatorEntity15 extends BaseEntity15 implements AbstractSimulatorEntity {
-
-    private boolean printed = false;
-
-    public SimulatorEntity15(World world, Vector position, boolean highlight) {
-        super(world, position, highlight ? Material.WHITE_STAINED_GLASS : Material.TNT);
-
-        this.setNoGravity(true);
-        this.ticksLived = -12000;
-    }
-
-    @Override
-    public void display(Player player) {
-        if (printed) return;
-        printed = true;
-
-        sendEntity(player);
-    }
-
-    @Override
-    public void setPosition(Vector position) {
-        this.position = position;
-        setPosition(position.getX(), position.getY(), position.getZ());
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!printed) return false;
-        printed = false;
-
-
-        sendEntityDestroy(player);
-        die();
-        return true;
-    }
-}

BauSystem_15/src/de/steamwar/bausystem/entities/TraceEntity15.java

@@ -1,73 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.tracer.AbstractTraceEntity;
-import de.steamwar.bausystem.shared.BaseEntity15;
-import de.steamwar.bausystem.shared.ReferenceCounter;
-import net.minecraft.server.v1_15_R1.ChatComponentText;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class TraceEntity15 extends BaseEntity15 implements AbstractTraceEntity {
-
-    private boolean exploded = false;
-    private ReferenceCounter referenceCounter = new ReferenceCounter();
-
-    public TraceEntity15(World world, Vector position, boolean tnt) {
-        super(world, position, tnt ? Material.TNT : Material.WHITE_STAINED_GLASS);
-
-        this.setNoGravity(true);
-        this.ticksLived = -12000;
-    }
-
-    @Override
-    public void display(Player player, boolean exploded, int ticks) {
-        if (ticks != -1) {
-            this.setCustomNameVisible(true);
-            this.setCustomName(new ChatComponentText(ticks + ""));
-        }
-        if (!this.exploded && exploded) {
-            this.setCustomNameVisible(true);
-            this.setCustomName(new ChatComponentText("Bumm"));
-            this.exploded = true;
-            if (referenceCounter.increment() > 0) {
-                sendEntityDestroy(player);
-            }
-        } else if (referenceCounter.increment() > 0) {
-            return;
-        }
-
-        sendEntity(player);
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!force && referenceCounter.decrement() > 0) {
-            return false;
-        }
-
-        sendEntityDestroy(player);
-        die();
-        return true;
-    }
-}

BauSystem_15/src/de/steamwar/bausystem/entities/WarpEntity15.java

@@ -1,80 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.warp.AbstractWarpEntity;
-import de.steamwar.bausystem.shared.BaseArmorStand15;
-import net.minecraft.server.v1_15_R1.ChatComponentText;
-import net.minecraft.server.v1_15_R1.PacketPlayOutEntityMetadata;
-import net.minecraft.server.v1_15_R1.PacketPlayOutEntityTeleport;
-import net.minecraft.server.v1_15_R1.PlayerConnection;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class WarpEntity15 extends BaseArmorStand15 implements AbstractWarpEntity {
-
-    public WarpEntity15(World world, Vector position, String name) {
-        super(world, position);
-        setInvisible(true);
-        setSmall(true);
-        setName(name);
-        this.setNoGravity(true);
-        this.ticksLived = -12000;
-    }
-
-    @Override
-    public void display(Player player) {
-        sendEntity(player);
-    }
-
-    @Override
-    public void setName(String name) {
-        this.setCustomNameVisible(true);
-        this.setCustomName(new ChatComponentText(name));
-    }
-
-    @Override
-    public boolean hide(Player player) {
-        sendEntityDestroy(player);
-        die();
-        return true;
-    }
-
-    @Override
-    public void sendMetaData(Player player) {
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), datawatcher, true);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
-        playerConnection.sendPacket(packetPlayOutEntityMetadata);
-    }
-
-    @Override
-    public void teleport(Player player, Vector position) {
-        setPositionRaw(position.getX(), position.getY(), position.getZ());
-        PacketPlayOutEntityTeleport packetPlayOutEntityTeleport = new PacketPlayOutEntityTeleport(this);
-        ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packetPlayOutEntityTeleport);
-    }
-
-    @Override
-    public Vector getPosition() {
-        return new Vector(locX(), locY(), locZ());
-    }
-}

BauSystem_15/src/de/steamwar/bausystem/shared/BaseArmorStand15.java

@@ -1,56 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.shared;
-
-import net.minecraft.server.v1_15_R1.*;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class BaseArmorStand15 extends EntityArmorStand implements AbstractEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-
-    protected Vector position;
-
-    public BaseArmorStand15(World world, Vector position) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ());
-
-        this.position = position;
-        setNoGravity(true);
-        ticksLived = -12000;
-    }
-
-    public void sendEntity(Player player) {
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(getId(), getUniqueID(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.ARMOR_STAND, 0, ZERO);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
-        playerConnection.sendPacket(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), datawatcher, true);
-        playerConnection.sendPacket(packetPlayOutEntityMetadata);
-    }
-
-    public void sendEntityDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(getId());
-        ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packetPlayOutEntityDestroy);
-    }
-}

BauSystem_15/src/de/steamwar/bausystem/shared/BaseEntity15.java

@@ -1,60 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.shared;
-
-import net.minecraft.server.v1_15_R1.*;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_15_R1.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class BaseEntity15 extends EntityFallingBlock implements AbstractEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-
-    private final IBlockData iBlockData;
-    protected Vector position;
-
-    public BaseEntity15(World world, Vector position, Material blockType) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ(), ((CraftBlockData) blockType.createBlockData()).getState());
-        this.iBlockData = ((CraftBlockData) blockType.createBlockData()).getState();
-        this.position = position;
-
-        this.setNoGravity(true);
-        this.ticksLived = -12000;
-    }
-
-    public void sendEntity(Player player) {
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(getId(), getUniqueID(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.FALLING_BLOCK, Block.getCombinedId(iBlockData), ZERO);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
-        playerConnection.sendPacket(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), datawatcher, true);
-        playerConnection.sendPacket(packetPlayOutEntityMetadata);
-    }
-
-    public void sendEntityDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(getId());
-        ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packetPlayOutEntityDestroy);
-    }
-}

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

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

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

@@ -20,20 +20,11 @@
 package de.steamwar.bausystem.utils;
 
 import com.comphenix.tinyprotocol.Reflection;
-import de.steamwar.bausystem.entities.DetonatorEntity15;
-import de.steamwar.bausystem.entities.SimulatorEntity15;
-import de.steamwar.bausystem.entities.TraceEntity15;
-import de.steamwar.bausystem.features.detonator.AbstractDetonatorEntity;
 import de.steamwar.bausystem.features.util.NoClipCommand;
-import de.steamwar.bausystem.features.simulator.AbstractSimulatorEntity;
-import de.steamwar.bausystem.features.tracer.AbstractTraceEntity;
-import de.steamwar.bausystem.features.warp.AbstractWarpEntity;
-import de.steamwar.bausystem.entities.WarpEntity15;
 import net.minecraft.server.v1_15_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.Particle;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
@@ -41,7 +32,6 @@ import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -73,38 +63,6 @@ public class NMSWrapper15 implements NMSWrapper {
         player.updateInventory();
     }
 
-    @Override
-    public void init(LongSupplier longSupplier) {
-        SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong();
-    }
-
-    private static final List<Packet<?>> packets = new ArrayList<>();
-    private static final Vec3D noMotion = new Vec3D(0, 0, 0);
-
-    @Override
-    public void createTickCache(World world) {
-        packets.clear();
-        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
-            packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
-            packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
-
-            if (entity instanceof TNTPrimed) {
-                net.minecraft.server.v1_15_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
-                packets.add(new PacketPlayOutEntityMetadata(serverEntity.getId(), serverEntity.getDataWatcher(), true));
-            }
-        });
-    }
-
-    @Override
-    public void sendTickPackets() {
-        Bukkit.getOnlinePlayers().forEach(player -> {
-            PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection;
-            for (Packet<?> p : packets) {
-                connection.sendPacket(p);
-            }
-        });
-    }
-
     private static final Reflection.FieldAccessor<Integer> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, int.class, 0);
 
     @Override
@@ -118,11 +76,6 @@ public class NMSWrapper15 implements NMSWrapper {
         ((CraftPlayer) player).getHandle().abilities.canInstantlyBuild = true;
     }
 
-    @Override
-    public Particle tntPositionParticle() {
-        return Particle.BARRIER;
-    }
-
     @Override
     public Material pathMaterial() {
         return Material.GRASS_PATH;
@@ -167,26 +120,6 @@ public class NMSWrapper15 implements NMSWrapper {
         return invalid;
     }
 
-    @Override
-    public AbstractWarpEntity createWarp(World world, Vector position, String name) {
-        return new WarpEntity15(world, position, name);
-    }
-
-    @Override
-    public AbstractSimulatorEntity createSimulator(World world, Vector tntPosition, boolean highlight) {
-        return new SimulatorEntity15(world, tntPosition, highlight);
-    }
-
-    @Override
-    public AbstractDetonatorEntity constructDetonator(World world, Vector position) {
-        return new DetonatorEntity15(world, position);
-    }
-
-    @Override
-    public AbstractTraceEntity createTrace(World world, Vector tntPosition, boolean tnt) {
-        return new TraceEntity15(world, tntPosition, tnt);
-    }
-
     private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
     private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
     private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);

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

@@ -0,0 +1,43 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import org.bukkit.Material;
+
+public class PlaceItemWrapper15 implements PlaceItemWrapper {
+
+    public PlaceItemWrapper15() {
+        for (Material material : Material.values()) {
+            if (!material.isBlock()) continue;
+            if (material.isLegacy()) continue;
+
+            String nonWall = material.name().replace("_WALL_", "").replace("WALL_", "").replace("_WALL", "");
+            try {
+                Material nonWallMaterial = Material.valueOf(nonWall);
+                if (nonWallMaterial != material && nonWallMaterial.isItem() && !nonWallMaterial.isBlock()) {
+                    BLOCK_MATERIAL_TO_WALL_BLOCK_MATERIAL.put(nonWallMaterial, material);
+                }
+            } catch (Exception e) {
+                // Ignore
+            }
+        }
+        ITEM_MATERIAL_TO_BLOCK_MATERIAL.put(Material.REDSTONE, Material.REDSTONE_WIRE);
+    }
+}

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

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

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

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

BauSystem_18/build.gradle

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

BauSystem_18/src/de/steamwar/bausystem/entities/DetonatorEntity18.java

@@ -1,95 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.detonator.AbstractDetonatorEntity;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.server.network.PlayerConnection;
-import net.minecraft.world.entity.EntityTypes;
-import net.minecraft.world.entity.item.EntityFallingBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class DetonatorEntity18 extends EntityFallingBlock implements AbstractDetonatorEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-    private final Vector position;
-    private int references = 0;
-
-    public DetonatorEntity18(World world, Vector position) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ(), Blocks.du.n());
-        this.position = position;
-
-        this.h(true);
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public int getId() {
-        return ae();
-    }
-
-    @Override
-    public void display(Player player) {
-        if (references++ > 0)
-            return;
-
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(getId(), cm(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.C, Block.i(Blocks.du.n()), ZERO);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), Y, true);
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!force && --references > 0)
-            return false;
-
-        sendDestroy(player);
-        ag();
-        return true;
-    }
-
-    private void sendDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(getId());
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityDestroy);
-    }
-
-    @Override
-    public void sendEntity(Player player) {
-        display(player);
-    }
-
-    @Override
-    public void sendEntityDestroy(Player player) {
-        hide(player, false);
-    }
-}

BauSystem_18/src/de/steamwar/bausystem/entities/SimulatorEntity18.java

@@ -1,68 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.simulator.AbstractSimulatorEntity;
-import de.steamwar.bausystem.shared.BaseEntity18;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class SimulatorEntity18 extends BaseEntity18 implements AbstractSimulatorEntity {
-
-    private boolean printed = false;
-
-    public SimulatorEntity18(World world, Vector position, boolean highlight) {
-        super(world, position, highlight ? Material.WHITE_STAINED_GLASS : Material.TNT);
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public int getId() {
-        return ae();
-    }
-
-    @Override
-    public void display(Player player) {
-        if (printed) return;
-        printed = true;
-
-        sendEntity(player);
-    }
-
-    @Override
-    public void setPosition(Vector position) {
-        this.position = position;
-        e(position.getX(), position.getY(), position.getZ());
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!printed) return false;
-        printed = false;
-
-        sendEntityDestroy(player);
-        ag();
-        return true;
-    }
-}

BauSystem_18/src/de/steamwar/bausystem/entities/TraceEntity18.java

@@ -1,73 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.tracer.AbstractTraceEntity;
-import de.steamwar.bausystem.shared.BaseEntity18;
-import de.steamwar.bausystem.shared.ReferenceCounter;
-import net.minecraft.network.chat.ChatComponentText;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class TraceEntity18 extends BaseEntity18 implements AbstractTraceEntity {
-
-    private boolean exploded = false;
-    private ReferenceCounter referenceCounter = new ReferenceCounter();
-
-    public TraceEntity18(World world, Vector position, boolean tnt) {
-        super(world, position, tnt ? Material.TNT : Material.WHITE_STAINED_GLASS);
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public void display(Player player, boolean exploded, int ticks) {
-        if (ticks != -1) {
-            this.n(true);
-            this.a(new ChatComponentText(ticks + ""));
-        }
-        if (!this.exploded && exploded) {
-            this.n(true);
-            this.a(new ChatComponentText("Bumm"));
-            this.exploded = true;
-            if (referenceCounter.increment() > 0) {
-                sendEntityDestroy(player);
-            }
-        } else if (referenceCounter.increment() > 0) {
-            return;
-        }
-
-        sendEntity(player);
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!force && referenceCounter.decrement() > 0) {
-            return false;
-        }
-
-        sendEntityDestroy(player);
-        ag();
-        return true;
-    }
-}

BauSystem_18/src/de/steamwar/bausystem/entities/WarpEntity18.java

@@ -1,80 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.warp.AbstractWarpEntity;
-import de.steamwar.bausystem.shared.BaseArmorStand18;
-import net.minecraft.network.chat.ChatComponentText;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport;
-import net.minecraft.server.network.PlayerConnection;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class WarpEntity18 extends BaseArmorStand18 implements AbstractWarpEntity {
-
-    public WarpEntity18(World world, Vector position, String name) {
-        super(world, position);
-        this.j(true);
-        this.a(true);
-        setName(name);
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public void display(Player player) {
-        sendEntity(player);
-    }
-
-    @Override
-    public void setName(String name) {
-        this.n(true);
-        this.a(new ChatComponentText(name));
-    }
-
-    @Override
-    public boolean hide(Player player) {
-        sendEntityDestroy(player);
-        ag();
-        return true;
-    }
-
-    @Override
-    public void sendMetaData(Player player) {
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(ae(), Y, true);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    @Override
-    public void teleport(Player player, Vector position) {
-        setPosRaw(position.getX(), position.getY(), position.getZ(), false);
-        PacketPlayOutEntityTeleport packetPlayOutEntityTeleport = new PacketPlayOutEntityTeleport(this);
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityTeleport);
-    }
-
-    @Override
-    public Vector getPosition() {
-        return new Vector(dc(), de(), di());
-    }
-}

BauSystem_18/src/de/steamwar/bausystem/shared/BaseArmorStand18.java

@@ -1,62 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.shared;
-
-import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.server.network.PlayerConnection;
-import net.minecraft.world.entity.EntityTypes;
-import net.minecraft.world.entity.decoration.EntityArmorStand;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class BaseArmorStand18 extends EntityArmorStand implements AbstractEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-
-    protected Vector position;
-
-    public BaseArmorStand18(World world, Vector position) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ());
-
-        this.position = position;
-        e(true);
-        S = -12000;
-    }
-
-    public void sendEntity(Player player) {
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), cm(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.c, 0, ZERO);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(ae(), Y, true);
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    public void sendEntityDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(ae());
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityDestroy);
-    }
-}

BauSystem_18/src/de/steamwar/bausystem/shared/BaseEntity18.java

@@ -1,68 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.shared;
-
-import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.server.network.PlayerConnection;
-import net.minecraft.world.entity.EntityTypes;
-import net.minecraft.world.entity.item.EntityFallingBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class BaseEntity18 extends EntityFallingBlock implements AbstractEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-
-    private final IBlockData iBlockData;
-    protected Vector position;
-
-    public BaseEntity18(World world, Vector position, Material blockType) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ(), ((CraftBlockData) blockType.createBlockData()).getState());
-        this.iBlockData = ((CraftBlockData) blockType.createBlockData()).getState();
-        this.position = position;
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    public void sendEntity(Player player) {
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), cm(), position.getX(), position.getY(), position.getZ(), 0, 0,  EntityTypes.C, Block.i(iBlockData), ZERO);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(ae(), Y, true);
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    public void sendEntityDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(ae());
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityDestroy);
-    }
-}

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

@@ -21,15 +21,7 @@ package de.steamwar.bausystem.utils;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.bausystem.entities.DetonatorEntity18;
-import de.steamwar.bausystem.entities.SimulatorEntity18;
-import de.steamwar.bausystem.entities.TraceEntity18;
-import de.steamwar.bausystem.entities.WarpEntity18;
-import de.steamwar.bausystem.features.detonator.AbstractDetonatorEntity;
-import de.steamwar.bausystem.features.simulator.AbstractSimulatorEntity;
-import de.steamwar.bausystem.features.tracer.AbstractTraceEntity;
 import de.steamwar.bausystem.features.util.NoClipCommand;
-import de.steamwar.bausystem.features.warp.AbstractWarpEntity;
 import net.minecraft.SystemUtils;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
@@ -39,14 +31,16 @@ import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.level.PlayerInteractManager;
 import net.minecraft.world.level.EnumGamemode;
 import net.minecraft.world.phys.Vec3D;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -79,37 +73,6 @@ public class NMSWrapper18 implements NMSWrapper {
         player.updateInventory();
     }
 
-    @Override
-    public void init(LongSupplier longSupplier) {
-        SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong();
-    }
-
-    private static final List<Packet<?>> packets = new ArrayList<>();
-    private static final Vec3D noMotion = new Vec3D(0, 0, 0);
-
-    @Override
-    public void createTickCache(World world) {
-        packets.clear();
-        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
-            packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
-            packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
-
-            if (entity instanceof TNTPrimed) {
-                net.minecraft.world.entity.Entity serverEntity = ((CraftEntity) entity).getHandle();
-                packets.add(new PacketPlayOutEntityMetadata(serverEntity.ae(), serverEntity.ai(), true));
-            }
-        });
-    }
-
-    @Override
-    public void sendTickPackets() {
-        Bukkit.getOnlinePlayers().forEach(player -> {
-            for (Packet<?> p : packets) {
-                TinyProtocol.instance.sendPacket(player, p);
-            }
-        });
-    }
-
     private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override
@@ -123,11 +86,6 @@ public class NMSWrapper18 implements NMSWrapper {
         ((CraftPlayer) player).getHandle().fs().e = true;
     }
 
-    @Override
-    public Particle tntPositionParticle() {
-        return Particle.BLOCK_MARKER;
-    }
-
     @Override
     public Material pathMaterial() {
         return Material.DIRT_PATH;
@@ -172,26 +130,6 @@ public class NMSWrapper18 implements NMSWrapper {
         return invalid;
     }
 
-    @Override
-    public AbstractWarpEntity createWarp(World world, Vector position, String name) {
-        return new WarpEntity18(world, position, name);
-    }
-
-    @Override
-    public AbstractSimulatorEntity createSimulator(World world, Vector tntPosition, boolean highlight) {
-        return new SimulatorEntity18(world, tntPosition, highlight);
-    }
-
-    @Override
-    public AbstractDetonatorEntity constructDetonator(World world, Vector position) {
-        return new DetonatorEntity18(world, position);
-    }
-
-    @Override
-    public AbstractTraceEntity createTrace(World world, Vector tntPosition, boolean tnt) {
-        return new TraceEntity18(world, tntPosition, tnt);
-    }
-
     private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
     private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
     private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);

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

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

BauSystem_19/build.gradle

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

BauSystem_19/src/de/steamwar/bausystem/entities/DetonatorEntity19.java

@@ -1,124 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.detonator.AbstractDetonatorEntity;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.server.network.PlayerConnection;
-import net.minecraft.world.entity.EntityTypes;
-import net.minecraft.world.entity.item.EntityFallingBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-import java.lang.reflect.Field;
-
-public class DetonatorEntity19 extends EntityFallingBlock implements AbstractDetonatorEntity {
-
-    private static final Field ao;
-
-    static {
-        try {
-            ao = EntityFallingBlock.class.getDeclaredField("ao");
-            ao.setAccessible(true);
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-    private final Vector position;
-    private int references = 0;
-    private IBlockData iBlockData;
-
-    public DetonatorEntity19(World world, Vector position) {
-        super(EntityTypes.E, ((CraftWorld) world).getHandle());
-        try {
-            ao.set(this, ((CraftBlockData) Material.RED_STAINED_GLASS.createBlockData()).getState());
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        this.q = true;
-        e(position.getX(), position.getY(), position.getZ());
-        f(Vec3D.b);
-        t = position.getX();
-        u = position.getY();
-        v = position.getZ();
-        a(this.db());
-
-        this.iBlockData = ((CraftBlockData) Material.RED_STAINED_GLASS.createBlockData()).getState();
-        this.position = position;
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public int getId() {
-        return ae();
-    }
-
-    @Override
-    public void display(Player player) {
-        if (references++ > 0)
-            return;
-
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), co(), position.getX(), position.getY(), position.getZ(), 0, 0,  EntityTypes.E, Block.i(iBlockData), ZERO, 0.0);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), Y, true);
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!force && --references > 0)
-            return false;
-
-        sendDestroy(player);
-        ag();
-        return true;
-    }
-
-    private void sendDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(getId());
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityDestroy);
-    }
-
-    @Override
-    public void sendEntity(Player player) {
-        display(player);
-    }
-
-    @Override
-    public void sendEntityDestroy(Player player) {
-        hide(player, false);
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/entities/SimulatorEntity19.java

@@ -1,68 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.simulator.AbstractSimulatorEntity;
-import de.steamwar.bausystem.shared.BaseEntity19;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class SimulatorEntity19 extends BaseEntity19 implements AbstractSimulatorEntity {
-
-    private boolean printed = false;
-
-    public SimulatorEntity19(World world, Vector position, boolean highlight) {
-        super(world, position, highlight ? Material.WHITE_STAINED_GLASS : Material.TNT);
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public int getId() {
-        return ae();
-    }
-
-    @Override
-    public void display(Player player) {
-        if (printed) return;
-        printed = true;
-
-        sendEntity(player);
-    }
-
-    @Override
-    public void setPosition(Vector position) {
-        this.position = position;
-        e(position.getX(), position.getY(), position.getZ());
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!printed) return false;
-        printed = false;
-
-        sendEntityDestroy(player);
-        ag();
-        return true;
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/entities/TraceEntity19.java

@@ -1,74 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.tracer.AbstractTraceEntity;
-import de.steamwar.bausystem.shared.BaseEntity19;
-import de.steamwar.bausystem.shared.ReferenceCounter;
-import net.minecraft.network.chat.IChatMutableComponent;
-import net.minecraft.network.chat.contents.LiteralContents;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class TraceEntity19 extends BaseEntity19 implements AbstractTraceEntity {
-
-    private boolean exploded = false;
-    private ReferenceCounter referenceCounter = new ReferenceCounter();
-
-    public TraceEntity19(World world, Vector position, boolean tnt) {
-        super(world, position, tnt ? Material.TNT : Material.WHITE_STAINED_GLASS);
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public void display(Player player, boolean exploded, int ticks) {
-        if (ticks != -1) {
-            this.n(true);
-            this.a(IChatMutableComponent.a(new LiteralContents(ticks + "")));
-        }
-        if (!this.exploded && exploded) {
-            this.n(true);
-            this.a(IChatMutableComponent.a(new LiteralContents("Bumm")));
-            this.exploded = true;
-            if (referenceCounter.increment() > 0) {
-                sendEntityDestroy(player);
-            }
-        } else if (referenceCounter.increment() > 0) {
-            return;
-        }
-
-        sendEntity(player);
-    }
-
-    @Override
-    public boolean hide(Player player, boolean force) {
-        if (!force && referenceCounter.decrement() > 0) {
-            return false;
-        }
-
-        sendEntityDestroy(player);
-        ag();
-        return true;
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/entities/WarpEntity19.java

@@ -1,81 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.entities;
-
-import de.steamwar.bausystem.features.warp.AbstractWarpEntity;
-import de.steamwar.bausystem.shared.BaseArmorStand19;
-import net.minecraft.network.chat.IChatMutableComponent;
-import net.minecraft.network.chat.contents.LiteralContents;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport;
-import net.minecraft.server.network.PlayerConnection;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class WarpEntity19 extends BaseArmorStand19 implements AbstractWarpEntity {
-
-    public WarpEntity19(World world, Vector position, String name) {
-        super(world, position);
-        this.j(true);
-        this.a(true);
-        setName(name);
-        this.e(true);
-        this.S = -12000;
-    }
-
-    @Override
-    public void display(Player player) {
-        sendEntity(player);
-    }
-
-    @Override
-    public void setName(String name) {
-        this.n(true);
-        this.b(IChatMutableComponent.a(new LiteralContents(name)));
-    }
-
-    @Override
-    public boolean hide(Player player) {
-        sendEntityDestroy(player);
-        ag();
-        return true;
-    }
-
-    @Override
-    public void sendMetaData(Player player) {
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(ae(), Y, true);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    @Override
-    public void teleport(Player player, Vector position) {
-        setPosRaw(position.getX(), position.getY(), position.getZ(), false);
-        PacketPlayOutEntityTeleport packetPlayOutEntityTeleport = new PacketPlayOutEntityTeleport(this);
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityTeleport);
-    }
-
-    @Override
-    public Vector getPosition() {
-        return new Vector(df(), dh(), dj());
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/features/simulator/FakeExplosion19.java

@@ -1,165 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator;
-
-import com.google.common.collect.Maps;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import net.minecraft.core.BlockPosition;
-import net.minecraft.util.RandomSource;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.EntityHuman;
-import net.minecraft.world.level.Explosion;
-import net.minecraft.world.level.ExplosionDamageCalculator;
-import net.minecraft.world.level.World;
-import net.minecraft.world.level.gameevent.GameEvent;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.craftbukkit.v1_19_R1.event.CraftEventFactory;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
-public class FakeExplosion19 extends Explosion {
-
-    private List<FakeTNT19> fakeTNT19s;
-    private boolean c;
-    private Explosion.Effect d;
-    private RandomSource e;
-    private World f;
-    private double g;
-    private double h;
-    private double i;
-    @Nullable
-    public Entity j;
-    private float k;
-    private DamageSource l;
-    private ExplosionDamageCalculator m;
-    private ObjectArrayList<BlockPosition> n;
-    private Map<EntityHuman, Vec3D> o;
-    public boolean wasCanceled;
-
-    public FakeExplosion19(List<FakeTNT19> fakeTNT19s, World world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.Effect destructionType) {
-        super(world, entity, damageSource, behavior, x, y, z, power, createFire, destructionType);
-        this.fakeTNT19s = fakeTNT19s;
-        this.wasCanceled = false;
-        this.e = RandomSource.a();
-        this.n = new ObjectArrayList();
-        this.o = Maps.newHashMap();
-        this.f = world;
-        this.j = entity;
-        this.k = (float) Math.max((double) power, 0.0D);
-        this.g = x;
-        this.h = y;
-        this.i = z;
-        this.c = createFire;
-        this.d = destructionType;
-        this.l = damageSource == null ? DamageSource.a(this) : damageSource;
-        this.m = new ExplosionDamageCalculator();
-
-    }
-
-    private float getBlockDensity(Vec3D vec3d, Entity entity) {
-        return a(vec3d, entity);
-    }
-
-
-    @Override
-    public void a() {
-        if ((this.k) >= 0.1F) {
-            this.f.a(this.j, GameEvent.w, new Vec3D(this.g, this.h, this.i));
-            /*
-            Set<BlockPosition> set = Sets.newHashSet();
-
-            int i;
-            int j;
-            for (int k = 0; k < 16; ++k) {
-                for (i = 0; i < 16; ++i) {
-                    for (j = 0; j < 16; ++j) {
-                        if (k == 0 || k == 15 || i == 0 || i == 15 || j == 0 || j == 15) {
-                            double d0 = (double) ((float) k / 15.0F * 2.0F - 1.0F);
-                            double d1 = (double) ((float) i / 15.0F * 2.0F - 1.0F);
-                            double d2 = (double) ((float) j / 15.0F * 2.0F - 1.0F);
-                            double d3 = Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2);
-                            d0 /= d3;
-                            d1 /= d3;
-                            d2 /= d3;
-                            float f = this.k * (0.7F + this.f.w.i() * 0.6F);
-                            double d4 = this.g;
-                            double d5 = this.h;
-                            double d6 = this.i;
-
-                            for (float var21 = 0.3F; f > 0.0F; f -= 0.22500001F) {
-                                BlockPosition blockposition = new BlockPosition(d4, d5, d6);
-                                IBlockData iblockdata = this.f.a_(blockposition);
-                                Fluid fluid = iblockdata.p();
-                                if (!this.f.j(blockposition)) {
-                                    break;
-                                }
-
-                                Optional<Float> optional = this.m.a(this, this.f, blockposition, iblockdata, fluid);
-                                if (optional.isPresent()) {
-                                    f -= ((Float) optional.get() + 0.3F) * 0.3F;
-                                }
-
-                                if (f > 0.0F && this.m.a(this, this.f, blockposition, iblockdata, f)) {
-                                    set.add(blockposition);
-                                }
-
-                                d4 += d0 * 0.30000001192092896D;
-                                d5 += d1 * 0.30000001192092896D;
-                                d6 += d2 * 0.30000001192092896D;
-                            }
-                        }
-                    }
-                }
-            }
-
-            this.n.addAll(set);
-             */
-
-            float f2 = this.k * 2.0F;
-            Vec3D vec3d = new Vec3D(this.g, this.h, this.i);
-            for (int l1 = 0; l1 < fakeTNT19s.size(); ++l1) {
-                Entity entity = (Entity) fakeTNT19s.get(l1);
-                if (!entity.cF()) {
-                    double d7 = Math.sqrt(entity.e(vec3d)) / (double) f2;
-                    if (d7 <= 1.0D) {
-                        double d8 = entity.df() - this.g;
-                        double d9 = entity.dh() - this.h;
-                        double d10 = entity.dl() - this.i;
-                        double d11 = Math.sqrt(d8 * d8 + d9 * d9 + d10 * d10);
-                        if (d11 != 0.0D) {
-                            d8 /= d11;
-                            d9 /= d11;
-                            d10 /= d11;
-                            double d12 = (double) this.getBlockDensity(vec3d, entity);
-
-                            double d13 = (1.0D - d7) * d12;
-                            entity.lastDamageCancelled = false;
-                            CraftEventFactory.entityDamage = null;
-                            entity.f(entity.dd().b(d8 * d13, d9 * d13, d10 * d13));
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/features/simulator/FakeTNT19.java

@@ -1,257 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator;
-
-import net.minecraft.core.BlockPosition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.network.syncher.DataWatcher;
-import net.minecraft.network.syncher.DataWatcherObject;
-import net.minecraft.network.syncher.DataWatcherRegistry;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.*;
-import net.minecraft.world.entity.item.EntityTNTPrimed;
-import net.minecraft.world.level.Explosion;
-import net.minecraft.world.level.ExplosionDamageCalculator;
-import net.minecraft.world.level.World;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.phys.AxisAlignedBB;
-import net.minecraft.world.phys.Vec3D;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.bukkit.entity.Explosive;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class FakeTNT19 extends EntityTNTPrimed {
-    private static final DataWatcherObject<Integer> b;
-    private static final int c = 80;
-    private List<FakeTNT19> fakeTNT19s;
-    private List<FakeTNT19> spawnList = new ArrayList<>();
-    private int count;
-    @Nullable
-    public EntityLiving d;
-    public float yield;
-    public boolean isIncendiary;
-
-    public FakeTNT19(List<FakeTNT19> fakeTNT19s, EntityTypes<? extends EntityTNTPrimed> type, World world) {
-        super(type, world);
-        this.fakeTNT19s = fakeTNT19s;
-        this.yield = 4.0F;
-        this.isIncendiary = false;
-        super.q = true;
-    }
-
-    public FakeTNT19(List<FakeTNT19> fakeTNT19s, World world, double x, double y, double z, int fuse, int count) {
-        this(fakeTNT19s, EntityTypes.av, world);
-        this.e(x, y, z);
-        double d3 = world.w.j() * 6.2831854820251465D;
-        this.n(-Math.sin(d3) * 0.02D, 0.20000000298023224D, -Math.cos(d3) * 0.02D);
-        this.a(fuse);
-        super.t = x;
-        super.u = y;
-        super.v = z;
-        this.d = null;
-        this.count = count;
-    }
-
-    protected void a_() {
-        super.Y.a(b, 80);
-    }
-
-    protected MovementEmission aO() {
-        return MovementEmission.a;
-    }
-
-    public boolean bl() {
-        return !this.dt();
-    }
-
-    private Vec3D g(Vec3D vec3d) {
-        AxisAlignedBB axisalignedbb = this.cz();
-        List<VoxelShape> list = this.s.b(this, axisalignedbb.b(vec3d));
-        Vec3D vec3d1 = vec3d.g() == 0.0 ? vec3d : a(this, vec3d, axisalignedbb, this.s, list);
-        boolean flag = vec3d.c != vec3d1.c;
-        boolean flag1 = vec3d.d != vec3d1.d;
-        boolean flag2 = vec3d.e != vec3d1.e;
-        boolean flag3 = this.y || flag1 && vec3d.d < 0.0;
-        if (this.P > 0.0F && flag3 && (flag || flag2)) {
-            Vec3D vec3d2 = a(this, new Vec3D(vec3d.c, (double)this.P, vec3d.e), axisalignedbb, this.s, list);
-            Vec3D vec3d3 = a(this, new Vec3D(0.0, (double)this.P, 0.0), axisalignedbb.b(vec3d.c, 0.0, vec3d.e), this.s, list);
-            if (vec3d3.d < (double)this.P) {
-                Vec3D vec3d4 = a(this, new Vec3D(vec3d.c, 0.0, vec3d.e), axisalignedbb.c(vec3d3), this.s, list).e(vec3d3);
-                if (vec3d4.i() > vec3d2.i()) {
-                    vec3d2 = vec3d4;
-                }
-            }
-
-            if (vec3d2.i() > vec3d1.i()) {
-                return vec3d2.e(a(this, new Vec3D(0.0, -vec3d2.d + vec3d.d, 0.0), axisalignedbb.c(vec3d2), this.s, list));
-            }
-        }
-
-        return vec3d1;
-    }
-
-    @Override
-    public void a(EnumMoveType enummovetype, Vec3D vec3d) {
-        if (this.E.g() > 1.0E-7) {
-            vec3d = vec3d.h(this.E);
-            this.E = Vec3D.b;
-            this.f(Vec3D.b);
-        }
-
-        Vec3D vec3d1 = this.g(vec3d);
-        double d0 = vec3d1.g();
-        if (d0 > 1.0E-7) {
-            this.e(this.df() + vec3d1.c, this.dg() + vec3d1.d, this.dl() + vec3d1.e);
-        }
-
-        boolean flag = !MathHelper.b(vec3d.c, vec3d1.c);
-        boolean flag1 = !MathHelper.b(vec3d.e, vec3d1.e);
-        this.z = flag || flag1;
-        this.A = vec3d.d != vec3d1.d;
-        this.B = this.A && vec3d.d < 0.0;
-        if (this.z) {
-            this.C = this.b(vec3d1);
-        } else {
-            this.C = false;
-        }
-
-        this.y = this.A && vec3d.d < 0.0;
-        BlockPosition blockposition = this.aA();
-        IBlockData iblockdata = this.s.a_(blockposition);
-        // this.a(vec3d1.d, this.y, iblockdata, blockposition);
-        if (!this.dt()) {
-            if (this.z) {
-                Vec3D vec3d2 = this.dd();
-                this.n(flag ? 0.0 : vec3d2.c, vec3d2.d, flag1 ? 0.0 : vec3d2.e);
-            }
-
-            net.minecraft.world.level.block.Block block = iblockdata.b();
-            if (vec3d.d != vec3d1.d) {
-                block.a(this.s, this);
-            }
-
-            if (this.y) {
-                block.a(this.s, blockposition, iblockdata, this);
-            }
-
-            this.ax();
-            float f2 = this.aD();
-            this.f(this.dd().d((double)f2, 1.0, (double)f2));
-        }
-    }
-
-    public void k(List<FakeTNT19> spawnList) {
-        if (!this.aN()) {
-            this.f(this.dd().b(0.0D, -0.04D, 0.0D));
-        }
-
-        this.a(EnumMoveType.a, this.dd());
-        this.f(this.dd().a(0.98D));
-        if (super.y) {
-            this.f(this.dd().d(0.7D, -0.5D, 0.7D));
-        }
-
-        int i = this.i() - 1;
-        this.a(i);
-        if (i <= 0) {
-            if (!super.s.y) {
-                this.j1();
-            }
-
-            this.ah();
-        } else {
-            this.aY();
-        }
-
-        if (i == 1 && count > 1) {
-            for (int c = 0; c < count - 1; c++) {
-                FakeTNT19 fakeTNT19 = new FakeTNT19(fakeTNT19s, this.s, this.df(), this.dh(), this.dl(), i, 1);
-                fakeTNT19.y = this.y;
-                fakeTNT19.f(new Vec3D(this.dd().c, this.dd().d, this.dd().e));
-                spawnList.add(fakeTNT19);
-            }
-            count = 1;
-        }
-    }
-
-    private void j1() {
-        ExplosionPrimeEvent event = new ExplosionPrimeEvent((Explosive) this.getBukkitEntity());
-        super.s.getCraftServer().getPluginManager().callEvent(event);
-        if (!event.isCancelled()) {
-            this.a(this, this.df(), this.e(0.0625D), this.dl(), event.getRadius(), event.getFire(), Explosion.Effect.b);
-        }
-    }
-
-    public FakeExplosion19 a(@Nullable Entity entity, double x, double y, double z, float power, boolean createFire, Explosion.Effect destructionType) {
-        return this.a(entity, (DamageSource) null, (ExplosionDamageCalculator) null, x, y, z, power, createFire, destructionType);
-    }
-
-    public FakeExplosion19 a(@Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.Effect destructionType) {
-        FakeExplosion19 explosion = new FakeExplosion19(fakeTNT19s, SimulatorPreview19.WORLD, entity, damageSource, behavior, x, y, z, power, createFire, destructionType);
-        explosion.a();
-        //   explosion.a(true);
-        return explosion;
-    }
-
-
-    protected void b(NBTTagCompound nbt) {
-        nbt.a("Fuse", (short) this.i());
-    }
-
-    protected void a(NBTTagCompound nbt) {
-        this.a(nbt.g("Fuse"));
-    }
-
-    @Nullable
-    public EntityLiving h() {
-        return this.d;
-    }
-
-    protected float a(EntityPose pose, EntitySize dimensions) {
-        return 0.15F;
-    }
-
-    public void a(int fuse) {
-        super.Y.b(b, fuse);
-    }
-
-    public int i() {
-        return (Integer) super.Y.a(b);
-    }
-
-    public Packet<?> S() {
-        return new PacketPlayOutSpawnEntity(this);
-    }
-
-    public boolean cr() {
-        return super.cr();
-    }
-
-    static {
-        b = DataWatcher.a(EntityTNTPrimed.class, DataWatcherRegistry.b);
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/features/simulator/SimulatorPreview19.java

@@ -1,136 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.simulator;
-
-import de.steamwar.bausystem.features.simulator.tnt.SimulatorElement;
-import de.steamwar.bausystem.features.tracer.show.Record;
-import de.steamwar.bausystem.shared.Pair;
-import net.minecraft.world.level.World;
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
-import org.bukkit.entity.TNTPrimed;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-public class SimulatorPreview19 implements SimulatorPreview {
-
-    public static final World WORLD = ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle();
-
-    @Override
-    public Record simulate(TNTSimulator tntSimulator) {
-        if (true) {
-            return new Record(false);
-        }
-
-        Map<Integer, Map<Integer, Set<Pair<SimulatorPreview.SimulatorPreviewTNTData, Integer>>>> result = new HashMap<>();
-        for (SimulatorElement element : tntSimulator.getTntElementList()) {
-            element.locations(result);
-        }
-
-        AtomicInteger maxTick = new AtomicInteger(0);
-        Map<Integer, List<List<Pair<SimulatorPreview.SimulatorPreviewTNTData, Integer>>>> toSpawn = new HashMap<>();
-        AtomicInteger tntCount = new AtomicInteger(0);
-        result.forEach((integer, integerSetMap) -> {
-            List<Pair<Integer, Set<Pair<SimulatorPreview.SimulatorPreviewTNTData, Integer>>>> internal = new ArrayList<>();
-            integerSetMap.forEach((integer1, pairs) -> {
-                internal.add(new Pair<>(integer1, pairs));
-            });
-            internal.sort(Comparator.comparingInt(Pair::getKey));
-
-            toSpawn.put(integer, internal.stream().map(Pair::getValue).peek(pairs -> {
-                tntCount.addAndGet(pairs.stream().mapToInt(Pair::getValue).sum());
-            }).map(ArrayList::new).peek(Collections::shuffle).collect(Collectors.toList()));
-
-            if (maxTick.get() < integer) {
-                maxTick.set(integer);
-            }
-        });
-        if (tntCount.get() > 500) {
-            return new Record(false);
-        }
-
-        List<FakeTNT19> fakeTNT19s = new ArrayList<>();
-        Record record = new Record(false);
-        Map<FakeTNT19, Record.TNTRecord> tntRecords = new HashMap<>();
-
-        int maxTickToCalc = maxTick.get() + 160;
-        for (int tick = 0; tick < maxTickToCalc; tick++) {
-            List<List<Pair<SimulatorPreview.SimulatorPreviewTNTData, Integer>>> toSpawnInTick = toSpawn.get(tick);
-            try {
-                if (toSpawnInTick == null) continue;
-                toSpawnInTick.forEach(pairs -> {
-                    AtomicBoolean hasSomeLeft = new AtomicBoolean(true);
-                    while(hasSomeLeft.get()) {
-                        hasSomeLeft.set(false);
-                        pairs.forEach(pair -> {
-                            SimulatorPreview.SimulatorPreviewTNTData previewTNTData = pair.getKey();
-                            if (!previewTNTData.isXVelocity() && !previewTNTData.isZVelocity()) {
-                                FakeTNT19 fakeTNT19 = new FakeTNT19(fakeTNT19s, WORLD, previewTNTData.getX(), previewTNTData.getY(), previewTNTData.getZ(), previewTNTData.getFuseTicks(), pair.getValue());
-                                TNTPrimed tntPrimed = (TNTPrimed) fakeTNT19.getBukkitEntity();
-                                if (!previewTNTData.isXVelocity()) tntPrimed.setVelocity(tntPrimed.getVelocity().setX(0));
-                                if (!previewTNTData.isYVelocity()) tntPrimed.setVelocity(tntPrimed.getVelocity().setY(0));
-                                if (!previewTNTData.isZVelocity()) tntPrimed.setVelocity(tntPrimed.getVelocity().setZ(0));
-                                fakeTNT19s.add(fakeTNT19);
-                                pair.setValue(0);
-                            } else if (pair.getValue() > 0) {
-                                hasSomeLeft.set(true);
-                                FakeTNT19 fakeTNT19 = new FakeTNT19(fakeTNT19s, WORLD, previewTNTData.getX(), previewTNTData.getY(), previewTNTData.getZ(), previewTNTData.getFuseTicks(), 1);
-                                TNTPrimed tntPrimed = (TNTPrimed) fakeTNT19.getBukkitEntity();
-                                if (!previewTNTData.isXVelocity()) tntPrimed.setVelocity(tntPrimed.getVelocity().setX(0));
-                                if (!previewTNTData.isYVelocity()) tntPrimed.setVelocity(tntPrimed.getVelocity().setY(0));
-                                if (!previewTNTData.isZVelocity()) tntPrimed.setVelocity(tntPrimed.getVelocity().setZ(0));
-                                fakeTNT19s.add(fakeTNT19);
-                                pair.setValue(pair.getValue() - 1);
-                            }
-                        });
-                    }
-                });
-            } finally {
-                calculateTick(fakeTNT19s, record, tntRecords);
-            }
-        }
-        return record;
-    }
-
-    private void calculateTick(List<FakeTNT19> fakeTNT19s, Record record, Map<FakeTNT19, Record.TNTRecord> tntRecords) {
-        int i = 0;
-        while (i < fakeTNT19s.size()) {
-            List<FakeTNT19> spawnList = new ArrayList<>();
-            FakeTNT19 fakeTNT19 = fakeTNT19s.get(i);
-            fakeTNT19.k(spawnList);
-            TNTPrimed tntPrimed = ((TNTPrimed) (fakeTNT19.getBukkitEntity()));
-            if (tntPrimed.getFuseTicks() <= 0) {
-                tntRecords.computeIfAbsent(fakeTNT19, ignore -> record.spawn()).explode(tntPrimed);
-                fakeTNT19s.remove(i);
-                i--;
-            } else {
-                tntRecords.computeIfAbsent(fakeTNT19, ignore -> record.spawn()).explode(tntPrimed);
-            }
-            if (!spawnList.isEmpty()) {
-                fakeTNT19s.addAll(i, spawnList);
-                i += spawnList.size();
-            }
-            i++;
-        }
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/shared/BaseArmorStand19.java

@@ -1,62 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.shared;
-
-import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.server.network.PlayerConnection;
-import net.minecraft.world.entity.EntityTypes;
-import net.minecraft.world.entity.decoration.EntityArmorStand;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class BaseArmorStand19 extends EntityArmorStand implements AbstractEntity {
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-
-    protected Vector position;
-
-    public BaseArmorStand19(World world, Vector position) {
-        super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ());
-
-        this.position = position;
-        e(true);
-        S = -12000;
-    }
-
-    public void sendEntity(Player player) {
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), co(), position.getX(), position.getY(), position.getZ(), 0, 0, EntityTypes.d, 0, ZERO, 0.0);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(ae(), Y, true);
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    public void sendEntityDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(ae());
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityDestroy);
-    }
-}

BauSystem_19/src/de/steamwar/bausystem/shared/BaseEntity19.java

@@ -1,94 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.shared;
-
-import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
-import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
-import net.minecraft.server.network.PlayerConnection;
-import net.minecraft.world.entity.EntityTypes;
-import net.minecraft.world.entity.item.EntityFallingBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.IBlockData;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-import java.lang.reflect.Field;
-
-public class BaseEntity19 extends EntityFallingBlock implements AbstractEntity {
-
-    private static final Field ao;
-
-    static {
-        try {
-            ao = EntityFallingBlock.class.getDeclaredField("ao");
-            ao.setAccessible(true);
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static final Vec3D ZERO = new Vec3D(0, 0, 0);
-
-    private final IBlockData iBlockData;
-    protected Vector position;
-
-    public BaseEntity19(World world, Vector position, Material blockType) {
-        super(EntityTypes.E, ((CraftWorld) world).getHandle());
-        try {
-            ao.set(this, ((CraftBlockData) blockType.createBlockData()).getState());
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        this.q = true;
-        e(position.getX(), position.getY(), position.getZ());
-        f(Vec3D.b);
-        t = position.getX();
-        u = position.getY();
-        v = position.getZ();
-        a(this.db());
-
-        this.iBlockData = ((CraftBlockData) blockType.createBlockData()).getState();
-        this.position = position;
-
-        this.e(true);
-        this.S = -12000;
-    }
-
-    public void sendEntity(Player player) {
-        PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(ae(), co(), position.getX(), position.getY(), position.getZ(), 0, 0,  EntityTypes.E, Block.i(iBlockData), ZERO, 0.0);
-        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().b;
-        playerConnection.a(packetPlayOutSpawnEntity);
-
-        PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(ae(), Y, true);
-        playerConnection.a(packetPlayOutEntityMetadata);
-    }
-
-    public void sendEntityDestroy(Player player) {
-        PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(ae());
-        ((CraftPlayer) player).getHandle().b.a(packetPlayOutEntityDestroy);
-    }
-}

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

@@ -21,32 +21,27 @@ package de.steamwar.bausystem.utils;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.bausystem.entities.DetonatorEntity19;
-import de.steamwar.bausystem.entities.SimulatorEntity19;
-import de.steamwar.bausystem.entities.TraceEntity19;
-import de.steamwar.bausystem.entities.WarpEntity19;
-import de.steamwar.bausystem.features.detonator.AbstractDetonatorEntity;
-import de.steamwar.bausystem.features.simulator.AbstractSimulatorEntity;
-import de.steamwar.bausystem.features.tracer.AbstractTraceEntity;
 import de.steamwar.bausystem.features.util.NoClipCommand;
-import de.steamwar.bausystem.features.warp.AbstractWarpEntity;
 import net.minecraft.SystemUtils;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
+import net.minecraft.network.syncher.DataWatcher;
 import net.minecraft.server.level.PlayerInteractManager;
 import net.minecraft.world.level.EnumGamemode;
 import net.minecraft.world.phys.Vec3D;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
+import org.bukkit.GameMode;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +55,6 @@ public class NMSWrapper19 implements NMSWrapper {
     @SuppressWarnings("deprecation")
     public void setInternalGameMode(Player player, GameMode gameMode) {
         playerGameMode.set(((CraftPlayer) player).getHandle().d, EnumGamemode.a(gameMode.getValue()));
-
     }
 
     @Override
@@ -79,37 +73,6 @@ public class NMSWrapper19 implements NMSWrapper {
         player.updateInventory();
     }
 
-    @Override
-    public void init(LongSupplier longSupplier) {
-        SystemUtils.a = () -> System.nanoTime() + longSupplier.getAsLong();
-    }
-
-    private static final List<Packet<?>> packets = new ArrayList<>();
-    private static final Vec3D noMotion = new Vec3D(0, 0, 0);
-
-    @Override
-    public void createTickCache(World world) {
-        packets.clear();
-        world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
-            packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), noMotion));
-            packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
-
-            if (entity instanceof TNTPrimed) {
-                net.minecraft.world.entity.Entity serverEntity = ((CraftEntity) entity).getHandle();
-                packets.add(new PacketPlayOutEntityMetadata(serverEntity.ae(), serverEntity.ai(), true));
-            }
-        });
-    }
-
-    @Override
-    public void sendTickPackets() {
-        Bukkit.getOnlinePlayers().forEach(player -> {
-            for (Packet<?> p : packets) {
-                TinyProtocol.instance.sendPacket(player, p);
-            }
-        });
-    }
-
     private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override
@@ -119,13 +82,8 @@ public class NMSWrapper19 implements NMSWrapper {
 
     @Override
     public void setPlayerBuildAbilities(Player player) {
-        ((CraftPlayer) player).getHandle().fB().d = true;
+        ((CraftPlayer) player).getHandle().fF().d = true;
-        ((CraftPlayer) player).getHandle().fB().e = true;
+        ((CraftPlayer) player).getHandle().fF().e = true;
-    }
-
-    @Override
-    public Particle tntPositionParticle() {
-        return Particle.BLOCK_MARKER;
     }
 
     @Override
@@ -172,26 +130,6 @@ public class NMSWrapper19 implements NMSWrapper {
         return invalid;
     }
 
-    @Override
-    public AbstractWarpEntity createWarp(World world, Vector position, String name) {
-        return new WarpEntity19(world, position, name);
-    }
-
-    @Override
-    public AbstractSimulatorEntity createSimulator(World world, Vector tntPosition, boolean highlight) {
-        return new SimulatorEntity19(world, tntPosition, highlight);
-    }
-
-    @Override
-    public AbstractDetonatorEntity constructDetonator(World world, Vector position) {
-        return new DetonatorEntity19(world, position);
-    }
-
-    @Override
-    public AbstractTraceEntity createTrace(World world, Vector tntPosition, boolean tnt) {
-        return new TraceEntity19(world, tntPosition, tnt);
-    }
-
     private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
     private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
     private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);

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

@@ -19,12 +19,17 @@
 
 package de.steamwar.bausystem.utils;
 
-import de.steamwar.bausystem.utils.PlayerMovementWrapper;
+import com.comphenix.tinyprotocol.Reflection;
 import net.minecraft.network.protocol.game.PacketPlayInFlying;
 import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 public class PlayerMovementWrapper19 implements PlayerMovementWrapper {
 
     @Override
@@ -37,4 +42,20 @@ public class PlayerMovementWrapper19 implements PlayerMovementWrapper {
             entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
         }
     }
+
+    @Override
+    public Object convertToOut(Player player, Object object) {
+        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        Object packet = Reflection.newInstance(teleportPacket);
+        teleportEntity.set(packet, player.getEntityId());
+        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        if (packetPlayInFlying.h) {
+            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
+            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
+        } else {
+            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
+            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
+        }
+        return packet;
+    }
 }

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

@@ -1,33 +0,0 @@
-/*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  SteamWar.de-Serverteam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.utils;
-
-import com.comphenix.tinyprotocol.Reflection;
-import com.mojang.authlib.GameProfile;
-import de.steamwar.bausystem.features.util.NoClipCommand;
-
-public class ProtocolWrapper19 implements ProtocolWrapper {
-
-    private static final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(NoClipCommand.playerInfoDataClass, GameProfile.class, int.class, NoClipCommand.enumGamemode, NoClipCommand.iChatBaseComponent, Reflection.getClass("net.minecraft.world.entity.player.ProfilePublicKey$a"));
-    @Override
-    public Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode) {
-        return playerInfoDataConstructor.invoke(profile, 0, mode, null, null);
-    }
-}

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

@@ -0,0 +1,51 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import com.destroystokyo.paper.event.server.ServerTickEndEvent;
+import com.destroystokyo.paper.event.server.ServerTickStartEvent;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class TickListener19 implements TickListener, Listener {
+
+    private boolean tickStartRan = false;
+
+    public TickListener19() {
+        Bukkit.getPluginManager().registerEvents(this, BauSystem.getInstance());
+    }
+
+    @EventHandler
+    public void onServerTickStart(ServerTickStartEvent event) {
+        if (TPSFreezeUtils.isFrozen()) return;
+        Bukkit.getPluginManager().callEvent(new TickStartEvent());
+        tickStartRan = true;
+    }
+
+    @EventHandler
+    public void onServerTickEnd(ServerTickEndEvent event) {
+        if (!tickStartRan) return;
+        Bukkit.getPluginManager().callEvent(new TickEndEvent());
+        tickStartRan = false;
+    }
+}

BauSystem_20/build.gradle

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

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

@@ -0,0 +1,136 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.bausystem.features.util.NoClipCommand;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.protocol.game.PacketPlayInSetCreativeSlot;
+import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
+import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
+import net.minecraft.server.level.PlayerInteractManager;
+import net.minecraft.world.level.EnumGamemode;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+
+public class NMSWrapper20 implements NMSWrapper {
+
+    private static final Reflection.FieldAccessor<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void setInternalGameMode(Player player, GameMode gameMode) {
+        playerGameMode.set(((CraftPlayer) player).getHandle().e, EnumGamemode.a(gameMode.getValue()));
+    }
+
+    @Override
+    public void setSlotToItemStack(Player player, Object o) {
+        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
+        int index = packetPlayInSetCreativeSlot.a();
+        if (index >= 36 && index <= 44) {
+            index -= 36;
+        } else if (index > 44) {
+            index -= 5;
+        } else if (index <= 8) {
+            index = index - 8 + 36;
+        }
+        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.c()));
+        if (index < 9) player.getInventory().setHeldItemSlot(index);
+        player.updateInventory();
+    }
+
+    private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
+
+    @Override
+    public void setGameStateChangeReason(Object packet) {
+        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
+    }
+
+    @Override
+    public void setPlayerBuildAbilities(Player player) {
+        ((CraftPlayer) player).getHandle().fO().d = true;
+        ((CraftPlayer) player).getHandle().fO().e = true;
+    }
+
+    @Override
+    public Material pathMaterial() {
+        return Material.DIRT_PATH;
+    }
+
+    private static final int threshold = 2048;
+
+    @Override
+    public boolean checkItemStack(ItemStack item) {
+        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
+        NBTTagCompound tag = nmsItem.v();
+        if (tag != null && tag.e("BlockEntityTag")) {
+            NBTTagCompound blockTag = tag.p("BlockEntityTag");
+            if (blockTag.e("Items")) {
+                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
+            }
+        }
+
+        return false;
+    }
+
+    private int drillDown(NBTTagList items, int layer, int start) {
+        if (layer > 2) return start + threshold;
+        int invalid = start;
+        for (NBTBase nbtBase : items) {
+            if (!(nbtBase instanceof NBTTagCompound))
+                continue;
+            NBTTagCompound slot = (NBTTagCompound) nbtBase;
+            if (slot.e("tag")) {
+                invalid += slot.f("Count");
+                NBTTagCompound iTag = slot.p("tag");
+                if (iTag.e("BlockEntityTag")) {
+                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
+                    if (blockTag.e("Items")) {
+                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
+                    }
+                }
+            }
+            if (invalid > threshold)
+                break;
+        }
+        return invalid;
+    }
+
+    private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
+    private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
+    private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);
+    private final Reflection.FieldAccessor<Double> c = Reflection.getField(explosionPacket, double.class, 2);
+    private final Reflection.FieldAccessor<Float> d = Reflection.getField(explosionPacket, float.class, 0);
+    private final Reflection.FieldAccessor<List> e = Reflection.getField(explosionPacket, List.class, 0);
+
+    @Override
+    public Object resetExplosionKnockback(Object packet) {
+        PacketPlayOutExplosion packetPlayOutExplosion = (PacketPlayOutExplosion) packet;
+        return new PacketPlayOutExplosion(a.get(packetPlayOutExplosion), b.get(packetPlayOutExplosion), c.get(packetPlayOutExplosion), d.get(packetPlayOutExplosion), e.get(packetPlayOutExplosion), null);
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+
+public class PlaceItemWrapper20 implements PlaceItemWrapper {
+
+    public PlaceItemWrapper20() {
+        for (Material material : Material.values()) {
+            if (!material.isBlock()) continue;
+            if (material.isLegacy()) continue;
+            BlockData blockData = material.createBlockData();
+            Material placementMaterial = blockData.getPlacementMaterial();
+            if (material == placementMaterial) continue;
+            if (placementMaterial == Material.AIR) continue;
+            if (placementMaterial.isItem() && !placementMaterial.isBlock()) {
+                ITEM_MATERIAL_TO_BLOCK_MATERIAL.put(placementMaterial, material);
+            }
+            if (material.name().contains("WALL")) {
+                BLOCK_MATERIAL_TO_WALL_BLOCK_MATERIAL.put(placementMaterial, material);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import com.comphenix.tinyprotocol.Reflection;
+import net.minecraft.network.protocol.game.PacketPlayInFlying;
+import net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport;
+import net.minecraft.server.level.EntityPlayer;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class PlayerMovementWrapper20 implements PlayerMovementWrapper {
+
+    @Override
+    public void setPosition(Player player, Object object) {
+        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
+        if (packetPlayInFlying.h) {
+            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
+        } else {
+            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        }
+    }
+
+    @Override
+    public Object convertToOut(Player player, Object object) {
+        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        Object packet = Reflection.newInstance(teleportPacket);
+        teleportEntity.set(packet, player.getEntityId());
+        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        if (packetPlayInFlying.h) {
+            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
+            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
+        } else {
+            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
+            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
+        }
+        return packet;
+    }
+}

BauSystem_Linkage/build.gradle

@@ -27,8 +27,8 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
-targetCompatibility = 1.8
+targetCompatibility = 17
 
 sourceSets {
     main {
@@ -43,27 +43,5 @@ sourceSets {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.22'
+    compileOnly swdep('SpigotCore')
-    testCompileOnly 'org.projectlombok:lombok:1.18.22'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
-
-    implementation 'org.atteo.classindex:classindex:3.11'
-    testImplementation 'org.atteo.classindex:classindex:3.11'
-    annotationProcessor 'org.atteo.classindex:classindex:3.11'
-    testAnnotationProcessor 'org.atteo.classindex:classindex:3.11'
 }
-
-task buildResources {
-    doLast {
-        File from = new File("${buildDir}/classes/java/main/META-INF/annotations/de.steamwar.bausystem.linkage.ProcessorImplementation")
-        File to = new File("${buildDir}/classes/java/main/META-INF/services/javax.annotation.processing.Processor")
-        to.delete()
-        to.parentFile.mkdirs()
-        to.createNewFile()
-        for (String s : from.readLines()) {
-            to.append(s + "\n")
-        }
-    }
-}
-classes.finalizedBy(buildResources)

BauSystem_Linkage/src/de/steamwar/bausystem/linkage/LinkageProcessor.java

@@ -1,265 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.linkage;
-
-import lombok.SneakyThrows;
-
-import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.*;
-import javax.lang.model.type.DeclaredType;
-import javax.tools.Diagnostic;
-import java.io.Writer;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@ProcessorImplementation
-@SupportedAnnotationTypes("de.steamwar.bausystem.linkage.Linked")
-public class LinkageProcessor extends AbstractProcessor {
-
-    private Messager messager;
-    private Writer writer;
-    private boolean processed = false;
-
-    @Override
-    public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.latestSupported();
-    }
-
-    @SneakyThrows
-    @Override
-    public synchronized void init(ProcessingEnvironment processingEnv) {
-        super.init(processingEnv);
-        writer = processingEnv.getFiler().createSourceFile("de.steamwar.bausystem.linkage.LinkageUtils").openWriter();
-        messager = processingEnv.getMessager();
-    }
-
-    @SneakyThrows
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        if (processed) return false;
-        processed = true;
-        List<String> fields = new ArrayList<>();
-        Map<LinkageType, List<String>> linkLines = new HashMap<>();
-        List<String> staticLines = new ArrayList<>();
-
-        Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(Linked.class);
-        elements.addAll((Set)roundEnv.getElementsAnnotatedWith(Linked.Linkages.class));
-
-        Map<String, TypeElement> neededFields = new HashMap<>();
-        for (Element element : elements) {
-            if (element.getKind() != ElementKind.CLASS) {
-                continue;
-            }
-            TypeElement typeElement = (TypeElement) element;
-            Linked[] linkeds = element.getAnnotationsByType(Linked.class);
-            if (linkeds.length == 0) {
-                continue;
-            }
-
-            if (linkeds.length > 1) {
-                neededFields.put(typeElement.getQualifiedName().toString(), typeElement);
-            }
-
-            List<VariableElement> variableElements = typeElement.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.FIELD).map(VariableElement.class::cast).filter(e -> {
-                return e.getAnnotation(LinkedInstance.class) != null;
-            }).collect(Collectors.toList());
-            if (variableElements.isEmpty()) {
-                continue;
-            }
-
-            for (VariableElement variableElement : variableElements) {
-                if (!variableElement.getModifiers().contains(Modifier.PUBLIC)) {
-                    messager.printMessage(Diagnostic.Kind.ERROR, "Field " + variableElement.getSimpleName() + " must be public", variableElement);
-                    continue;
-                }
-                if (variableElement.getModifiers().contains(Modifier.STATIC)) {
-                    messager.printMessage(Diagnostic.Kind.ERROR, "Field " + variableElement.getSimpleName() + " must be non static", variableElement);
-                    continue;
-                }
-                if (variableElement.getModifiers().contains(Modifier.FINAL)) {
-                    messager.printMessage(Diagnostic.Kind.ERROR, "Field " + variableElement.getSimpleName() + " must be non final", variableElement);
-                    continue;
-                }
-                neededFields.put(typeElement.getQualifiedName().toString(), typeElement);
-                TypeElement fieldType = (TypeElement) ((DeclaredType) variableElement.asType()).asElement();
-                neededFields.put(fieldType.getQualifiedName().toString(), fieldType);
-
-                System.out.println(getElement(typeElement, neededFields) + "." + variableElement.getSimpleName().toString() + " = " + getElement((TypeElement) ((DeclaredType) variableElement.asType()).asElement(), neededFields));
-                staticLines.add(getElement(typeElement, neededFields) + "." + variableElement.getSimpleName().toString() + " = " + getElement((TypeElement) ((DeclaredType) variableElement.asType()).asElement(), neededFields));
-            }
-        }
-        neededFields.forEach((s, typeElement) -> {
-            fields.add(typeElement.getQualifiedName().toString() + " " + typeElement.getSimpleName().toString());
-        });
-
-        Map<String, TypeElement> eventClasses = new HashMap<>();
-        Map<TypeElement, Map<TypeElement, ExecutableElement>> eventMethods = new HashMap<>();
-        for (Element element : elements) {
-            if (element.getKind() != ElementKind.CLASS) {
-                continue;
-            }
-            TypeElement typeElement = (TypeElement) element;
-
-            typeElement.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.METHOD).map(ExecutableElement.class::cast).filter(e -> {
-                return e.getAnnotationMirrors().stream().anyMatch(annotationMirror -> {
-                    return annotationMirror.getAnnotationType().asElement().getSimpleName().toString().equals("EventHandler");
-                });
-            }).forEach(e -> {
-                TypeElement current = ((TypeElement)((DeclaredType) e.getParameters().get(0).asType()).asElement());
-                eventClasses.put(current.getQualifiedName().toString(), current);
-                eventMethods.computeIfAbsent(typeElement, k -> new HashMap<>()).put(current, e);
-            });
-        }
-        if (!eventMethods.isEmpty()) {
-            List<String> eventLines = new ArrayList<>();
-            linkLines.put(LinkageType.LISTENER, eventLines);
-            eventClasses.forEach((s, typeElement) -> {
-                eventLines.add("handlerList" + typeElement.getSimpleName().toString() + " = " + typeElement.getQualifiedName().toString() + ".getHandlerList()");
-            });
-            eventLines.add("");
-            eventMethods.forEach((typeElement, map) -> {
-                String instance = "local" + typeElement.getSimpleName().toString();
-                eventLines.add(typeElement.getQualifiedName().toString() + " " + instance + " = " + getElement(typeElement, neededFields));
-                map.forEach((typeElement1, executableElement) -> {
-                    AnnotationMirror eventHandler = executableElement.getAnnotationMirrors().stream().filter(annotationMirror -> annotationMirror.getAnnotationType().asElement().getSimpleName().toString().equals("EventHandler")).findFirst().orElse(null);
-                    if (eventHandler == null) {
-                        return;
-                    }
-                    String priority = "NORMAL";
-                    String ignoreCancelled = "false";
-                    for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : eventHandler.getElementValues().entrySet()) {
-                        if (entry.getKey().getSimpleName().toString().equals("priority")) {
-                            priority = entry.getValue().getValue().toString();
-                        } else if (entry.getKey().getSimpleName().toString().equals("ignoreCancelled")) {
-                            ignoreCancelled = entry.getValue().getValue().toString();
-                        }
-                    }
-                    eventLines.add(typeElement1.getSimpleName().toString() + "(" + instance + ", " + instance + "::" + executableElement.getSimpleName().toString() + ", org.bukkit.event.EventPriority." + priority + ", " + ignoreCancelled + ")");
-                });
-            });
-        }
-
-        for (Element element : elements) {
-            if (element.getKind() != ElementKind.CLASS) {
-                continue;
-            }
-            TypeElement typeElement = (TypeElement) element;
-            Linked[] linkeds = element.getAnnotationsByType(Linked.class);
-            if (linkeds.length == 0) {
-                continue;
-            }
-            MinVersion minVersion = element.getAnnotation(MinVersion.class);
-
-            System.out.println("Found element: " + typeElement.getQualifiedName().toString());
-
-            Arrays.stream(linkeds).map(Linked::value).forEach(linkageType -> {
-                if (linkageType.toRun == null) return;
-                if (linkageType.className != null) {
-                    if (!typeElement.getSuperclass().toString().equals(linkageType.className)) {
-                        return;
-                    }
-                }
-                if (linkageType.interfaceName != null) {
-                    if (typeElement.getInterfaces().stream().noneMatch(i -> i.toString().equals(linkageType.interfaceName))) {
-                        return;
-                    }
-                }
-                List<String> strings = linkLines.computeIfAbsent(linkageType, ignore -> new ArrayList<>());
-                if (minVersion != null) {
-                    strings.add("if (de.steamwar.core.Core.getVersion() >= " + minVersion.value() + ") {");
-                    strings.add("    " + linkageType.toRun.replace("$", getElement(typeElement, neededFields)));
-                    strings.add("}");
-                } else {
-                    strings.add(linkageType.toRun.replace("$", getElement(typeElement, neededFields)));
-                }
-            });
-        }
-
-        writer.write("package de.steamwar.bausystem.linkage;\n\n");
-        writer.write("public class LinkageUtils {\n");
-        for (String s : fields) {
-            writer.write("    private static " + s + ";\n");
-        }
-        writer.write("\n");
-        for (Map.Entry<String, TypeElement> entry : neededFields.entrySet()) {
-            String field = entry.getValue().getSimpleName().toString();
-            writer.write("    public static " + entry.getValue().getQualifiedName().toString() + " " + field + "() {\n");
-            writer.write("        if (" + field + " == null) {\n");
-            writer.write("            " + field + " = new " + entry.getValue().getQualifiedName().toString() + "();\n");
-            writer.write("        }\n");
-            writer.write("        return " + field + ";\n");
-            writer.write("    }\n");
-            writer.write("\n");
-        }
-        writer.write("    private static final java.util.Set<de.steamwar.bausystem.linkage.LinkageType> LINKED = new java.util.HashSet<>();\n");
-        writer.write("\n");
-        writer.write("    static {\n");
-        for (String s : staticLines) {
-            writer.write("        " + s + ";\n");
-        }
-        writer.write("    }\n");
-        writer.write("\n");
-        writer.write("    public static void run(de.steamwar.bausystem.linkage.LinkageType link) {\n");
-        writer.write("        if (!LINKED.add(link)) return;\n");
-        writer.write("        switch (link) {\n");
-        for (LinkageType type : linkLines.keySet()) {
-            writer.write("            case " + type.name() + ":\n");
-            writer.write("                " + type + "();\n");
-            writer.write("                break;\n");
-        }
-        writer.write("            default:\n");
-        writer.write("                break;\n");
-        writer.write("        }\n");
-        writer.write("    }\n");
-        writer.write("\n");
-        for (Map.Entry<LinkageType, List<String>> entry : linkLines.entrySet()) {
-            writer.write("    private static void " + entry.getKey() + "() {\n");
-            for (String s : entry.getValue()) {
-                writer.write("        " + s + ";\n");
-            }
-            writer.write("    }\n");
-            writer.write("\n");
-        }
-        for (Map.Entry<String, TypeElement> entry : eventClasses.entrySet()) {
-            writer.write("    private static org.bukkit.event.HandlerList handlerList" + entry.getValue().getSimpleName().toString() + ";\n");
-            writer.write("    private static void " + entry.getValue().getSimpleName().toString() + "(org.bukkit.event.Listener listener, java.util.function.Consumer<" + entry.getKey() + "> consumer, org.bukkit.event.EventPriority eventPriority, boolean ignoreCancelled) {\n");
-            writer.write("        org.bukkit.plugin.EventExecutor eventExecutor = (l, event) -> {\n");
-            writer.write("            if (event instanceof " + entry.getKey() + ") {\n");
-            writer.write("                consumer.accept((" + entry.getKey() + ") event);\n");
-            writer.write("            }\n");
-            writer.write("        };\n");
-            writer.write("        handlerList" + entry.getValue().getSimpleName() + ".register(new org.bukkit.plugin.RegisteredListener(listener, eventExecutor, eventPriority, de.steamwar.bausystem.BauSystem.getInstance(), ignoreCancelled));\n");
-            writer.write("    }\n");
-            writer.write("\n");
-        }
-        writer.write("}\n");
-        writer.flush();
-        writer.close();
-        return true;
-    }
-
-    private String getElement(TypeElement typeElement, Map<String, TypeElement> neededFields) {
-        if (neededFields.containsKey(typeElement.getQualifiedName().toString())) {
-            return typeElement.getSimpleName().toString() + "()";
-        }
-        return "new " + typeElement.getQualifiedName().toString() + "()";
-    }
-}

BauSystem_Linkage/src/de/steamwar/bausystem/linkage/LinkageType.java

@@ -1,57 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.linkage;
-
-public enum LinkageType {
-
-    // NORMAL
-    COMMAND("$.setMessage(de.steamwar.bausystem.BauSystem.MESSAGE)", "de.steamwar.command.SWCommand"),
-    ENABLE_LINK("$.enable()", null, "de.steamwar.bausystem.linkage.Enable"),
-    DISABLE_LINK("$.disable()", null, "de.steamwar.bausystem.linkage.Disable"),
-    PLAIN("$", null),
-    LISTENER(), // Is handled internally from LinkageProcessor
-    UNLINK_LISTENER("org.bukkit.event.HandlerList.unregisterAll($)", null, "org.bukkit.event.Listener"),
-
-    // SPECIFIC
-    BAU_GUI_ITEM("de.steamwar.bausystem.features.gui.BauGUI.addItem($)", "de.steamwar.bausystem.linkage.specific.BauGuiItem"),
-    SCRIPT_COMMAND("de.steamwar.bausystem.features.script.ScriptExecutor.SPECIAL_COMMANDS.add($)", null, "de.steamwar.bausystem.features.script.SpecialCommand"),
-    CONFIG_CONVERTER("de.steamwar.bausystem.configplayer.Config.addConfigConverter($)", null, "de.steamwar.bausystem.configplayer.ConfigConverter"),
-    SCOREBOARD(null, null, "de.steamwar.bausystem.linkage.specific.ScoreboardItem"),
-    PANZERN("de.steamwar.bausystem.features.slaves.panzern.Panzern.add($)", null, "de.steamwar.bausystem.features.slaves.panzern.PanzernAlgorithm"),
-    SMART_PLACE("de.steamwar.bausystem.features.smartplace.SmartPlaceListener.add($)", null, "de.steamwar.bausystem.features.smartplace.SmartPlaceBehaviour");
-
-    String toRun = null;
-    String className = null;
-    String interfaceName = null;
-
-    LinkageType() {
-    }
-
-    LinkageType(String toRun, String className) {
-        this.toRun = toRun;
-        this.className = className;
-    }
-
-    LinkageType(String toRun, String className, String interfaceName) {
-        this.toRun = toRun;
-        this.className = className;
-        this.interfaceName = interfaceName;
-    }
-}

BauSystem_Linkage/src/de/steamwar/bausystem/linkage/Linked.java

@@ -1,38 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.linkage;
-
-import org.atteo.classindex.IndexAnnotated;
-
-import java.lang.annotation.*;
-
-@IndexAnnotated
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-@Repeatable(Linked.Linkages.class)
-public @interface Linked {
-    LinkageType value();
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.TYPE})
-    @interface Linkages {
-        @SuppressWarnings("unused") Linked[] value() default {};
-    }
-}

BauSystem_Linkage/src/de/steamwar/bausystem/linkage/LinkedInstance.java

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

BauSystem_Linkage/src/de/steamwar/bausystem/linkage/MinVersion.java

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

BauSystem_Linkage/src/de/steamwar/bausystem/linkage/ProcessorImplementation.java

@@ -1,27 +0,0 @@
-/*
- * Copyright 2019,2020,2021 yoyosource
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.steamwar.bausystem.linkage;
-
-import org.atteo.classindex.IndexAnnotated;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@IndexAnnotated
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.TYPE})
-public @interface ProcessorImplementation {
-}

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

@@ -17,26 +17,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.simulator.show;
+package de.steamwar.linkage.types;
 
-import de.steamwar.bausystem.features.tracer.TNTPosition;
+import de.steamwar.linkage.LinkageType;
-import de.steamwar.bausystem.features.tracer.show.ShowModeParameter;
+import de.steamwar.linkage.plan.BuildPlan;
-import de.steamwar.bausystem.features.tracer.show.mode.FactoredEntityShowMode;
+import de.steamwar.linkage.plan.MethodBuilder;
-import org.bukkit.entity.Player;
 
-public class PreviewEntityShowMode extends FactoredEntityShowMode {
+import javax.lang.model.element.TypeElement;
 
-    public PreviewEntityShowMode(Player player, ShowModeParameter showModeParameter) {
+public class BauGuiItem_GENERIC implements LinkageType {
-        super(player, showModeParameter, 10);
+
+    @Override
+    public String method() {
+        return "linkGUIItems";
     }
 
     @Override
-    public void show(TNTPosition position) {
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
-        super.show(position);
+        buildPlan.addImport("de.steamwar.bausystem.features.gui.BauGUI");
-    }
+        methodBuilder.addLine("BauGUI.addItem(" + s + ");");
-
-    @Override
-    public void hide() {
-        super.hide();
     }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.linkage.types;
+
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.plan.BuildPlan;
+import de.steamwar.linkage.plan.MethodBuilder;
+
+import javax.lang.model.element.TypeElement;
+
+public class BoundingBoxLoader_GENERIC implements LinkageType {
+
+    @Override
+    public String method() {
+        return "linkBoundingBox";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder method, String instance, TypeElement typeElement) {
+        method.addLine(instance + ".load();");
+    }
+}

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

@@ -17,23 +17,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.simulator.gui;
+package de.steamwar.linkage.types;
 
-import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.LinkageType;
-import lombok.experimental.UtilityClass;
+import de.steamwar.linkage.plan.BuildPlan;
-import org.bukkit.NamespacedKey;
+import de.steamwar.linkage.plan.MethodBuilder;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataType;
 
-import java.util.UUID;
+import javax.lang.model.element.TypeElement;
 
-@UtilityClass
+public class ConfigConverter_GENERIC implements LinkageType {
-public class ItemUtils {
 
-    public static SWItem unique(SWItem swItem) {
+    @Override
-        ItemMeta itemMeta = swItem.getItemMeta();
+    public String method() {
-        itemMeta.getPersistentDataContainer().set(NamespacedKey.minecraft(UUID.randomUUID().toString()), PersistentDataType.INTEGER, 0);
+        return "link";
-        swItem.setItemMeta(itemMeta);
+    }
-        return swItem;
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        buildPlan.addImport("de.steamwar.bausystem.configplayer.Config");
+        methodBuilder.addLine("Config.addConfigConverter(" + s + ");");
     }
 }

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

@@ -17,17 +17,25 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.utils;
+package de.steamwar.linkage.types;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.linkage.LinkageType;
-import com.mojang.authlib.GameProfile;
+import de.steamwar.linkage.plan.BuildPlan;
-import de.steamwar.bausystem.features.util.NoClipCommand;
+import de.steamwar.linkage.plan.MethodBuilder;
 
-public class ProtocolWrapper15 implements ProtocolWrapper {
+import javax.lang.model.element.TypeElement;
+
+public class FAWEMaskParser_GENERIC implements LinkageType {
 
-    private static final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(NoClipCommand.playerInfoDataClass, NoClipCommand.playerInfoPacket, GameProfile.class, int.class, NoClipCommand.enumGamemode, NoClipCommand.iChatBaseComponent);
     @Override
-    public Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode) {
+    public String method() {
-        return playerInfoDataConstructor.invoke(packet, profile, 0, mode, null);
+        return "link";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        methodBuilder.addLine("if (org.bukkit.Bukkit.getPluginManager().getPlugin(\"FastAsyncWorldEdit\") != null) {");
+        methodBuilder.addLine("    " + s + ";");
+        methodBuilder.addLine("}");
     }
 }

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

@@ -0,0 +1,41 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.linkage.types;
+
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.plan.BuildPlan;
+import de.steamwar.linkage.plan.MethodBuilder;
+
+import javax.lang.model.element.TypeElement;
+
+public class FAWEPatternParser_GENERIC implements LinkageType {
+
+    @Override
+    public String method() {
+        return "link";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        methodBuilder.addLine("if (org.bukkit.Bukkit.getPluginManager().getPlugin(\"FastAsyncWorldEdit\") != null) {");
+        methodBuilder.addLine("    " + s + ";");
+        methodBuilder.addLine("}");
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.linkage.types;
+
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.plan.BuildPlan;
+import de.steamwar.linkage.plan.MethodBuilder;
+
+import javax.lang.model.element.TypeElement;
+
+public class LuaLib_GENERIC implements LinkageType {
+
+    @Override
+    public String method() {
+        return "link";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        buildPlan.addImport("de.steamwar.bausystem.features.script.lua.SteamWarLuaPlugin");
+        methodBuilder.addLine("SteamWarLuaPlugin.add(" + s + ");");
+    }
+}

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

@@ -17,17 +17,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.utils;
+package de.steamwar.linkage.types;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.linkage.LinkageType;
-import com.mojang.authlib.GameProfile;
+import de.steamwar.linkage.plan.BuildPlan;
-import de.steamwar.bausystem.features.util.NoClipCommand;
+import de.steamwar.linkage.plan.MethodBuilder;
 
-public class ProtocolWrapper18 implements ProtocolWrapper {
+import javax.lang.model.element.TypeElement;
+
+public class PanzernAlgorithm_GENERIC implements LinkageType {
 
-    private static final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(NoClipCommand.playerInfoDataClass, GameProfile.class, int.class, NoClipCommand.enumGamemode, NoClipCommand.iChatBaseComponent);
     @Override
-    public Object playerInfoDataConstructor(Object packet, GameProfile profile, Object mode) {
+    public String method() {
-        return playerInfoDataConstructor.invoke(profile, 0, mode, null);
+        return "linkPanzern";
+    }
+
+    @Override
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
+        buildPlan.addImport("de.steamwar.bausystem.features.slaves.panzern.Panzern");
+        methodBuilder.addLine("Panzern.add(" + s + ");");
     }
 }

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2023  SteamWar.de-Serverteam
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,26 +17,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.bau;
+package de.steamwar.linkage.types;
 
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.plan.BuildPlan;
-import de.steamwar.bausystem.linkage.LinkedInstance;
+import de.steamwar.linkage.plan.MethodBuilder;
-import de.steamwar.command.SWCommand;
-import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+import javax.lang.model.element.TypeElement;
-public class BauCommand extends SWCommand {
 
-    @LinkedInstance
+public class ScoreboardElement_GENERIC implements LinkageType {
-    public InfoCommand infoCommand;
 
-    public BauCommand() {
+    @Override
-        super("bau", "b", "gs");
+    public String method() {
+        return "link";
     }
 
-    @Register(value = "info", description = "BAU_COMMAND_HELP_INFO")
+    @Override
-    public void infoCommand(Player p) {
+    public void generateCode(BuildPlan buildPlan, MethodBuilder methodBuilder, String s, TypeElement typeElement) {
-        infoCommand.sendBauInfo(p);
+        buildPlan.addImport("de.steamwar.bausystem.features.world.BauScoreboard");
+        methodBuilder.addLine("BauScoreboard.addElement(" + s + ");");
     }
 }

BauSystem_Main/build.gradle

@@ -27,13 +27,13 @@ version '1.0'
 
 compileJava.options.encoding = 'UTF-8'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
-targetCompatibility = 1.8
+targetCompatibility = 17
 
 sourceSets {
     main {
         java {
-            srcDirs = ['src/']
+            srcDirs = ['src/', 'build/generated/sources/annotationProcessor/java/main/']
         }
         resources {
             srcDirs = ['src/']
@@ -51,19 +51,19 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
 
-    implementation 'org.atteo.classindex:classindex:3.11'
-    testImplementation 'org.atteo.classindex:classindex:3.11'
-    annotationProcessor 'org.atteo.classindex:classindex:3.11'
-    testAnnotationProcessor 'org.atteo.classindex:classindex:3.11'
-
     implementation project(":BauSystem_Linkage")
     annotationProcessor project(":BauSystem_Linkage")
 
-    compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
     compileOnly 'com.mojang:authlib:1.5.25'
     compileOnly 'io.netty:netty-all:4.1.68.Final'
 
-    compileOnly swdep('Spigot-1.19')
+    compileOnly swdep('Spigot-1.20')
-    compileOnly swdep('WorldEdit-1.15')
     compileOnly swdep('SpigotCore')
-}
+    annotationProcessor swdep('SpigotCore')
+
+    compileOnly swdep('FastAsyncWorldEdit-1.18')
+    compileOnly swdep('AxiomPaper')
+
+    implementation 'org.luaj:luaj-jse:3.0.1'
+}

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

@@ -21,38 +21,44 @@ package de.steamwar.bausystem;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
 import de.steamwar.bausystem.linkage.LinkageUtils;
 import de.steamwar.bausystem.region.loader.PrototypeLoader;
 import de.steamwar.bausystem.region.loader.RegionLoader;
 import de.steamwar.bausystem.region.loader.Updater;
+import de.steamwar.bausystem.utils.TickListener;
 import de.steamwar.bausystem.worlddata.WorldData;
+import de.steamwar.command.AbstractValidator;
+import de.steamwar.command.SWCommandUtils;
 import de.steamwar.message.Message;
 import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 
 public class BauSystem extends JavaPlugin implements Listener {
 
     // This should be treated as final!
     public static Message MESSAGE;
+    public static final boolean DEV_SERVER = !System.getProperty("user.home").endsWith("minecraft");
 
     @Getter
     private static BauSystem instance;
 
-    private World world;
-
     @Override
     public void onEnable() {
-        world = Bukkit.getWorlds().get(0);
-
         // LOGGER
         fixLogging();
 
@@ -67,41 +73,45 @@ public class BauSystem extends JavaPlugin implements Listener {
         } catch (SecurityException e) {
             Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
             Bukkit.shutdown();
+            System.exit(1);
             return;
         }
 
         new Updater(PrototypeLoader.file, PrototypeLoader::load);
         new Updater(RegionLoader.file, RegionLoader::load);
 
-        LinkageUtils.run(LinkageType.PLAIN);
+        SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
-        LinkageUtils.run(LinkageType.COMMAND);
+        SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
-        LinkageUtils.run(LinkageType.ENABLE_LINK);
+        SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
-        LinkageUtils.run(LinkageType.LISTENER);
+        SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
-        LinkageUtils.run(LinkageType.CONFIG_CONVERTER);
-        LinkageUtils.run(LinkageType.SCOREBOARD);
 
-        // This could disable any watchdog stuff. We need to investigate if this is a problem.
+        try {
-        /*
+            LinkageUtils.link();
-        Thread thread = new Thread(() -> {
+        } catch (Exception e) {
-            while (true) {
+            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-                WatchdogThread.tick();
+            Bukkit.shutdown();
-                try {
+            System.exit(1);
-                    Thread.sleep(1000);
+            return;
-                } catch (InterruptedException e) {
+        }
-                    Thread.currentThread().interrupt();
+        TickListener.impl.init();
+    }
+
+    private <T extends CommandSender> AbstractValidator<T, ?> validator(Permission permission) {
+        return (commandSender, object, messageSender) -> {
+            if (commandSender instanceof Player) {
+                if (permission.hasPermission((Player) commandSender)) {
+                    return true;
                 }
+                messageSender.send("NO_PERMISSION");
+                return false;
             }
-        });
+            return true;
-        thread.setName("WatchdogThread ticker");
+        };
-        thread.setDaemon(true);
-        thread.start();
-         */
     }
 
     @Override
     public void onDisable() {
-        LinkageUtils.run(LinkageType.DISABLE_LINK);
+        LinkageUtils.unlink();
-        LinkageUtils.run(LinkageType.UNLINK_LISTENER);
 
         WorldData.write();
         Config.getInstance().saveAll();
@@ -129,18 +139,44 @@ public class BauSystem extends JavaPlugin implements Listener {
         }));
     }
 
-    private void createLink(String source, String destination) {
+    public static BukkitTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
-        try {
+        return new BukkitRunnable() {
-            Bukkit.getLogger().log(Level.INFO, "Executing: ln -s /home/minecraft/server/Bau15/{0} {1}", new String[]{source, destination});
+            private int counter = 1;
-            ProcessBuilder processBuilder = new ProcessBuilder("ln", "-s", "/home/minecraft/server/Bau15/" + source, destination);
-            processBuilder.directory(world.getWorldFolder());
-            processBuilder.inheritIO();
 
-            Process process = processBuilder.start();
+            @Override
-            process.waitFor();
+            public void run() {
-        } catch (IOException | InterruptedException e) {
+                if (TPSFreezeUtils.isFrozen()) return;
-            Thread.currentThread().interrupt();
+                if (counter >= delay) {
-            Bukkit.shutdown();
+                    runnable.run();
-        }
+                    cancel();
+                    return;
+                }
+                counter++;
+            }
+        }.runTaskTimer(plugin, 0, 1);
+    }
+
+    public static BukkitTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        return new BukkitRunnable() {
+            private int counter = 1;
+            private boolean first = true;
+
+            @Override
+            public void run() {
+                if (TPSFreezeUtils.isFrozen()) return;
+                if (counter >= (first ? delay : period)) {
+                    first = false;
+                    runnable.run();
+                    counter = 1;
+                    return;
+                }
+                counter++;
+            }
+        }.runTaskTimer(plugin, 0, 1);
+    }
+
+    public static void runTaskTimer(Plugin plugin, Consumer<BukkitTask> consumer, long delay, long period) {
+        AtomicReference<BukkitTask> task = new AtomicReference<>();
+        task.set(runTaskTimer(plugin, () -> consumer.accept(task.get()), delay, period));
     }
 }

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

@@ -20,54 +20,77 @@
 package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.config.BauServer;
+import de.steamwar.bausystem.features.world.BauMemberUpdate;
+import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Predicate;
 
 @AllArgsConstructor
 public enum Permission {
 
-    WORLD(BauweltMember::isWorld),
+    OWNER(bauweltMember -> false),
-    WORLDEDIT(BauweltMember::isWorldEdit),
+    SUPERVISOR(bauweltMember -> {
-    MEMBER(bauweltMember -> true),
+        return bauweltMember.isSupervisor();
-    OWNER(bauweltMember -> false);
+    }),
+    BUILD(bauweltMember -> {
+        if (isTempOnlySpectator(bauweltMember)) return false;
+        return bauweltMember.isBuild() || SUPERVISOR.permissionPredicate.test(bauweltMember);
+    }),
+    /**
+     * Only used for {@link BauMemberUpdate}
+     */
+    REAL_SPECTATOR(bauweltMember -> {
+        return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
+    }),
+    /**
+     * Primarily used for {@link de.steamwar.bausystem.linkage.specific.GuiItem}
+     */
+    MEMBER(bauweltMember -> {
+        return true;
+    });
+
+    private static final Set<Integer> TEMP_ONLY_SPECTATOR = new HashSet<>();
+
+    private static boolean isTempOnlySpectator(BauweltMember bauweltMember) {
+        return TEMP_ONLY_SPECTATOR.contains(bauweltMember.getMemberID());
+    }
+    
+    public static boolean isTempOnlySpectator(Player player) {
+        return TEMP_ONLY_SPECTATOR.contains(SteamwarUser.get(player.getUniqueId()).getId());
+    }
+
+    public static void forceOnlySpectator(Player player) {
+        TEMP_ONLY_SPECTATOR.add(SteamwarUser.get(player.getUniqueId()).getId());
+        BauMemberUpdate.baumemberUpdate();
+    }
+
+    /**
+     * Only used by {@link BauMemberUpdate}
+     */
+    public static void removeForceOnlySpectator(Player player) {
+        TEMP_ONLY_SPECTATOR.remove(SteamwarUser.get(player.getUniqueId()).getId());
+    }
 
     private final Predicate<BauweltMember> permissionPredicate;
 
+    public boolean hasPermission(BauweltMember bauweltMember) {
+        if (bauweltMember == null) return false;
+        return permissionPredicate.test(bauweltMember);
+    }
+
     public boolean hasPermission(Player member) {
-        if (member.getUniqueId().equals(BauServer.getInstance().getOwner())) {
+        if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
-            return true;
+            return this != REAL_SPECTATOR;
-        }
-
-        BauweltMember bauMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauMember == null) {
-            return false;
-        }
-
-        return permissionPredicate.test(bauMember);
-    }
-
-    public static boolean hasPermission(Player member, Permission permission) {
-        return permission.hasPermission(member);
-    }
-
-    private static void sendMessages(Player player, boolean ableTo, BauweltMember target, String what) {
-        Player targetPlayer = Bukkit.getPlayer(SteamwarUser.get(target.getMemberID()).getUUID());
-        if (targetPlayer != null) {
-            if (ableTo) {
-                BauSystem.MESSAGE.send("PERMISSION_CHANGE_OTHER_ENABLE", targetPlayer, player.getName(), BauSystem.MESSAGE.parse(what, targetPlayer));
-            } else {
-                BauSystem.MESSAGE.send("PERMISSION_CHANGE_OTHER_DISABLE", targetPlayer, player.getName(), BauSystem.MESSAGE.parse(what, targetPlayer));
-            }
-        }
-        if (ableTo) {
-            BauSystem.MESSAGE.send("PERMISSION_CHANGE_YOU_ENABLE", player, BauSystem.MESSAGE.parse(what, player));
-        } else {
-            BauSystem.MESSAGE.send("PERMISSION_CHANGE_YOU_DISABLE", player, BauSystem.MESSAGE.parse(what, player));
         }
+        BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
+        if (bauweltMember == null) return this == REAL_SPECTATOR;
+        return permissionPredicate.test(bauweltMember);
     }
 }

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

@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem;
 
+import de.steamwar.inventory.SWItem;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.UtilityClass;
@@ -29,6 +30,7 @@ import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 
 import java.util.function.Function;
@@ -59,6 +61,13 @@ public class SWUtils {
         }
     }
 
+    public static SWItem setCustomModelData(SWItem item, int customModelData) {
+        ItemMeta itemMeta = item.getItemMeta();
+        itemMeta.setCustomModelData(customModelData);
+        item.setItemMeta(itemMeta);
+        return item;
+    }
+
     public static void sendToActionbar(Player p, String message) {
         p.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message));
     }

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

@@ -19,15 +19,14 @@
 
 package de.steamwar.bausystem.config;
 
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.linkage.Linked;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.providers.BauServerInfo;
 import de.steamwar.sql.SteamwarUser;
 import lombok.Getter;
 
 import java.util.UUID;
 
-@Linked(LinkageType.PLAIN)
+@Linked
 public class BauServer {
 
     @Getter

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

@@ -20,8 +20,7 @@
 package de.steamwar.bausystem.configplayer;
 
 import de.steamwar.bausystem.configplayer.serializer.ConfigurationSerializableSerializer;
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.linkage.Linked;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.sql.UserConfig;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -40,7 +39,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Level;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class Config implements Listener {
 
     static {
@@ -98,7 +97,7 @@ public class Config implements Listener {
 
     public void saveAll() {
         playerConfigurations.forEach((uuid, yapionObject) -> {
-            String string = yapionObject.toYAPION(new StringOutput()).getResult();
+            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\+", "\\");
             UserConfig.updatePlayerConfig(uuid, "bausystem", string);
         });
         playerConfigurations.clear();
@@ -113,7 +112,7 @@ public class Config implements Listener {
         UUID uuid = player.getUniqueId();
         if (playerConfigurations.containsKey(uuid)) {
             YAPIONObject yapionObject = playerConfigurations.get(uuid);
-            String string = yapionObject.toYAPION(new StringOutput()).getResult();
+            String string = yapionObject.toYAPION(new StringOutput()).getResult().replaceAll("\\\\+", "\\\\");
             UserConfig.updatePlayerConfig(uuid, "bausystem", string);
         }
     }

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

@@ -0,0 +1,112 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.attributescopy;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.command.PreviousArguments;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Linked
+public class AttributeRemoveCommand extends SWCommand {
+
+    public AttributeRemoveCommand() {
+        super("removeattribute", "attributesremove");
+    }
+
+    @Register({"all"})
+    @Register({"*"})
+    public void genericCommand(@Validator Player player) {
+        ItemStack itemStack = player.getInventory().getItemInMainHand();
+        ItemMeta itemMeta = itemStack.getItemMeta();
+        itemMeta.setLore(new ArrayList<>());
+        itemStack.setItemMeta(itemMeta);
+        BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_ALL", player);
+    }
+
+    @Register(description = "ATTRIBUTE_REMOVE_COMMAND_HELP")
+    public void genericCommand(@Validator Player player, @Mapper("attribute") String attribute) {
+        ItemStack itemStack = player.getInventory().getItemInMainHand();
+        ItemMeta itemMeta = itemStack.getItemMeta();
+        if (itemMeta == null) {
+            BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_NOT_FOUND", player);
+            return;
+        }
+        List<String> lore = itemMeta.getLore();
+        if (lore == null) {
+            BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_NOT_FOUND", player);
+            return;
+        }
+        if (lore.isEmpty()) {
+            BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_NOT_FOUND", player);
+            return;
+        }
+        if (!lore.get(0).equals("§eAttributes§8:")) {
+            BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_NOT_FOUND", player);
+            return;
+        }
+        lore.removeIf(s -> s.startsWith("§8-§7 " + attribute + "§8:"));
+        if (lore.size() == 1) {
+            itemStack.setItemMeta(null);
+        } else {
+            itemMeta.setLore(lore);
+            itemStack.setItemMeta(itemMeta);
+        }
+        BauSystem.MESSAGE.send("ATTRIBUTE_REMOVE_SINGLE", player, attribute);
+    }
+
+    @Mapper(value = "attribute", local = true)
+    public TypeMapper<String> attribute() {
+        return new TypeMapper<String>() {
+            @Override
+            public Collection<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
+                Player player = (Player) commandSender;
+                ItemStack itemStack = player.getInventory().getItemInMainHand();
+                ItemMeta itemMeta = itemStack.getItemMeta();
+                if (itemMeta == null) return null;
+                List<String> lore = itemMeta.getLore();
+                if (lore == null) return null;
+                if (lore.isEmpty()) return null;
+                if (!lore.get(0).equals("§eAttributes§8:")) return null;
+                return lore.stream()
+                        .skip(1)
+                        .map(s1 -> s1.substring(6))
+                        .map(s1 -> s1.substring(0, s1.indexOf("§8:")))
+                        .collect(Collectors.toList());
+            }
+
+            @Override
+            public String map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
+                return s;
+            }
+        };
+    }
+}

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

@@ -0,0 +1,128 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.attributescopy;
+
+import lombok.experimental.UtilityClass;
+import org.bukkit.block.data.BlockData;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@UtilityClass
+public class AttributeUtils {
+
+    private Map<Method, String> names = new HashMap<>();
+    private Map<Class<?>, List<Method>> getters = new HashMap<>();
+    private Map<Class<?>, Map<String, Method>> setters = new HashMap<>();
+
+    private void generate(BlockData blockData) {
+        Class<? extends BlockData> clazz = blockData.getClass();
+        if (getters.containsKey(clazz) && setters.containsKey(clazz)) return;
+
+        Map<String, List<Method>> methods = new HashMap<>();
+        for (Method declaredMethod : clazz.getMethods()) {
+            String s = declaredMethod.getName();
+            if (s.startsWith("get") && declaredMethod.getParameterCount() == 0) {
+                methods.computeIfAbsent(s.substring(3), aClass -> new ArrayList<>()).add(declaredMethod);
+            } else if (s.startsWith("is") && declaredMethod.getParameterCount() == 0) {
+                methods.computeIfAbsent(s.substring(2), aClass -> new ArrayList<>()).add(declaredMethod);
+            } else if (s.startsWith("set") && declaredMethod.getParameterCount() == 1) {
+                methods.computeIfAbsent(s.substring(3), aClass -> new ArrayList<>()).add(declaredMethod);
+            }
+        }
+        for (Map.Entry<String, List<Method>> entry : methods.entrySet()) {
+            if (entry.getValue().size() != 2) continue;
+            for (Method method : entry.getValue()) {
+                names.put(method, entry.getKey());
+                if (method.getName().startsWith("is") || method.getName().startsWith("get")) {
+                    getters.computeIfAbsent(clazz, aClass -> new ArrayList<>()).add(method);
+                } else {
+                    setters.computeIfAbsent(clazz, aClass -> new HashMap<>()).put(entry.getKey(), method);
+                }
+            }
+        }
+    }
+
+    public void copy(BlockData blockData, List<String> attributes) {
+        generate(blockData);
+
+        getters.getOrDefault(blockData.getClass(), new ArrayList<>()).forEach(method -> {
+            try {
+                Object invoke = method.invoke(blockData);
+                if (invoke != null) {
+                    attributes.add("§8-§7 " + names.get(method) + "§8:§7 " + convert(invoke));
+                }
+            } catch (Exception e) {
+                // ignore
+            }
+        });
+    }
+
+    public void paste(BlockData blockData, List<String> attributes) {
+        generate(blockData);
+
+        for (String attribute : attributes) {
+            String[] split = attribute.split("§8:§7 ");
+            if (split.length != 2) continue;
+            String name = split[0].substring(6);
+            String value = split[1];
+            Method method = setters.getOrDefault(blockData.getClass(), new HashMap<>()).get(name);
+            if (method == null) continue;
+            try {
+                method.invoke(blockData, convert(value, method.getParameterTypes()[0]));
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+
+    private String convert(Object o) {
+        if (o.getClass().isEnum()) {
+            return ((Enum<?>) o).name();
+        } else {
+            return o.toString();
+        }
+    }
+
+    private Object convert(String s, Class<?> type) {
+        if (type.isEnum()) {
+            return Enum.valueOf((Class<? extends Enum>) type, s);
+        } else if (type == int.class || type == Integer.class) {
+            return Integer.parseInt(s);
+        } else if (type == double.class || type == Double.class) {
+            return Double.parseDouble(s);
+        } else if (type == float.class || type == Float.class) {
+            return Float.parseFloat(s);
+        } else if (type == long.class || type == Long.class) {
+            return Long.parseLong(s);
+        } else if (type == short.class || type == Short.class) {
+            return Short.parseShort(s);
+        } else if (type == byte.class || type == Byte.class) {
+            return Byte.parseByte(s);
+        } else if (type == boolean.class || type == Boolean.class) {
+            return Boolean.parseBoolean(s);
+        } else {
+            return s;
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.attributescopy;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.FluidCollisionMode;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Linked
+public class AttributesCopyCommand extends SWCommand {
+
+    public AttributesCopyCommand() {
+        super("copyattributes", "attributescopy", "ac");
+    }
+
+    @Register
+    public void genericCommand(@Validator Player player) {
+        Block block = player.getTargetBlockExact(8, FluidCollisionMode.ALWAYS);
+        if (block == null) return;
+        ItemStack mainHand = player.getInventory().getItemInMainHand();
+
+        if (!(block.getType().isItem() && block.getType() == mainHand.getType() || isSame(block, mainHand))) {
+            BauSystem.MESSAGE.send("ATTRIBUTES_CANT_COPY", player);
+            return;
+        }
+
+        BlockData blockData = block.getBlockData();
+        List<String> attributesToCopy = new ArrayList<>();
+        if (block.getType() != mainHand.getType()) {
+            attributesToCopy.add("§8-§7 Material§8:§7 " + block.getType().name());
+        }
+        AttributeUtils.copy(blockData, attributesToCopy);
+        if (attributesToCopy.isEmpty()) {
+            BauSystem.MESSAGE.send("ATTRIBUTES_NO_COPY", player);
+            return;
+        }
+        ItemMeta itemMeta = mainHand.getItemMeta();
+        List<String> lore = new ArrayList<>(attributesToCopy);
+        lore.add(0, "§eAttributes§8:");
+        itemMeta.setLore(lore);
+        mainHand.setItemMeta(itemMeta);
+        player.getInventory().setItemInMainHand(mainHand);
+        BauSystem.MESSAGE.send("ATTRIBUTES_COPIED", player);
+    }
+
+    private boolean isSame(Block block, ItemStack itemStack) {
+        if (itemStack.getType() == Material.REDSTONE && block.getType() == Material.REDSTONE_WIRE) return true;
+        if (itemStack.getType() == Material.PLAYER_HEAD && block.getType() == Material.PLAYER_WALL_HEAD) return true;
+        if (itemStack.getType() == Material.ZOMBIE_HEAD && block.getType() == Material.ZOMBIE_WALL_HEAD) return true;
+        if (itemStack.getType() == Material.CREEPER_HEAD && block.getType() == Material.CREEPER_WALL_HEAD) return true;
+        if (itemStack.getType() == Material.DRAGON_HEAD && block.getType() == Material.DRAGON_WALL_HEAD) return true;
+        if (itemStack.getType() == Material.SKELETON_SKULL && block.getType() == Material.SKELETON_WALL_SKULL) return true;
+        if (itemStack.getType() == Material.WITHER_SKELETON_SKULL && block.getType() == Material.WITHER_SKELETON_WALL_SKULL) return true;
+        if (itemStack.getType() == Material.TORCH && block.getType() == Material.WALL_TORCH) return true;
+        if (itemStack.getType() == Material.SOUL_TORCH && block.getType() == Material.SOUL_WALL_TORCH) return true;
+        if (itemStack.getType() == Material.REDSTONE_TORCH && block.getType() == Material.REDSTONE_WALL_TORCH) return true;
+        if (itemStack.getType() == Material.WHEAT_SEEDS && block.getType() == Material.WHEAT) return true;
+        if (itemStack.getType().name().contains("_BANNER") && block.getType().name().contains("_WALL_BANNER")) return true;
+        return false;
+    }
+}

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

@@ -0,0 +1,88 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.attributescopy;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.block.Block;
+import org.bukkit.block.Skull;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.List;
+
+@Linked
+public class AttributesPlaceListener implements Listener {
+
+    @EventHandler
+    public void onBlockPlace(BlockPlaceEvent event) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ItemStack itemStack = event.getItemInHand();
+        ItemMeta itemMeta = itemStack.getItemMeta();
+        if (itemMeta == null) return;
+        List<String> strings = itemMeta.getLore();
+        if (strings == null) return;
+        if (strings.isEmpty()) return;
+        if (!strings.get(0).equals("§eAttributes§8:")) return;
+        Material type = event.getBlock().getType();
+        OfflinePlayer offlinePlayer = null;
+        if (event.getBlock().getState() instanceof Skull) {
+            Skull skull = (Skull) event.getBlock().getState();
+            offlinePlayer = skull.getOwningPlayer();
+        }
+        OfflinePlayer finalPlayerProfile = offlinePlayer;
+        event.setCancelled(true);
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            Material material = strings.stream()
+                    .filter(s -> s.startsWith("§8-§7 Material§8:§7 "))
+                    .map(s -> s.replace("§8-§7 Material§8:§7 ", ""))
+                    .map(String::toUpperCase)
+                    .map(s -> {
+                        try {
+                            return Material.valueOf(s);
+                        } catch (Exception e) {
+                            return null;
+                        }
+                    })
+                    .findFirst()
+                    .orElse(type);
+            event.getBlock().setType(material, false);
+            Block block = event.getBlock();
+            BlockData blockData = block.getBlockData();
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                if (block.getState() instanceof Skull && finalPlayerProfile != null) {
+                    Skull skull = (Skull) block.getState();
+                    skull.setOwningPlayer(finalPlayerProfile);
+                    skull.update(true, false);
+                }
+            }, 1);
+            AttributeUtils.paste(blockData, strings);
+            block.setBlockData(blockData, false);
+        }, 1);
+    }
+}

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

@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class AutoStartCommand extends SWCommand {
 
     public AutoStartCommand() {
@@ -33,7 +32,7 @@ public class AutoStartCommand extends SWCommand {
     }
 
     @Register(description = "AUTOSTART_COMMAND_HELP")
-    public void genericCommand(Player p) {
+    public void genericCommand(@Validator Player p) {
         SWUtils.giveItemToPlayer(p, AutostartListener.getWandItem(p));
     }
 }

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

@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class AutoStartGuiItem extends BauGuiItem {
 
     public AutoStartGuiItem() {
@@ -51,6 +50,6 @@ public class AutoStartGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.MEMBER;
+        return Permission.BUILD;
     }
 }

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

@@ -20,31 +20,34 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
+import java.io.File;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class AutostartListener implements Listener {
 
     @Getter
@@ -65,15 +68,42 @@ public class AutostartListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!ItemUtils.isItem(event.getItem(), "autostart")) {
             return;
         }
         if (event.getClickedBlock() == null) {
             return;
         }
+        if (event.getClickedBlock().getBlockData() instanceof Chest) {
+            return;
+        }
+        if (event.getClickedBlock().getType() == Material.BEDROCK) {
+            event.getClickedBlock().setType(Material.SLIME_BLOCK);
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                event.getClickedBlock().setType(Material.BEDROCK, false);
+            }, 1);
+        }
         activate(event.getPlayer());
     }
 
+    @EventHandler
+    public void onInventoryClose(InventoryCloseEvent event) {
+        if (!(event.getPlayer() instanceof Player)) {
+            return;
+        }
+        if(!Permission.BUILD.hasPermission((Player) event.getPlayer())) return;
+        if (!ItemUtils.isItem(event.getPlayer().getInventory().getItemInMainHand(), "autostart")) {
+            return;
+        }
+        if (event.getInventory().getLocation() == null) {
+            return;
+        }
+        if (event.getInventory().getLocation().getBlock().getBlockData() instanceof Chest) {
+            activate((Player) event.getPlayer());
+        }
+    }
+
     public void activate(Player player) {
         Region region = Region.getRegion(player.getLocation());
         if (region.isGlobal()) {
@@ -89,7 +119,7 @@ public class AutostartListener implements Listener {
         } else {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_START", player);
         }
-        regionStartTime.put(region, TPSUtils.currentTick.get());
+        regionStartTime.put(region, TPSUtils.currentRealTick.get());
     }
 
     @EventHandler
@@ -97,17 +127,24 @@ public class AutostartListener implements Listener {
         if (regionStartTime.isEmpty()) {
             return;
         }
+
         event.blockList().forEach(block -> {
             Region region = Region.getRegion(block.getLocation());
             if (!regionStartTime.containsKey(region)) return;
             if (!region.hasType(RegionType.TESTBLOCK)) return;
             if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
-            long tickDiff = TPSUtils.currentTick.get() - regionStartTime.remove(region);
+            long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            RegionUtils.message(region, player -> {
+            long preFightDurationInSeconds = getPreFightDurationInSeconds(region);
-                return BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_RESULT1", player, new SimpleDateFormat(BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_DATE_PATTERN", player)).format(new Date(tickDiff * 50)));
+            RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
-            });
+            RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", preFightDurationInSeconds, ((preFightDurationInSeconds * 20) - tickDiff));
-            RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", 30, (600 - tickDiff));
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
         });
     }
+
+    private int getPreFightDurationInSeconds(Region region) {
+        File file = region.gameModeConfig();
+        if (file == null) return 30;
+        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
+        return config.getInt("Times.PreFightDuration", 30);
+    }
 }

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

@@ -19,18 +19,22 @@
 
 package de.steamwar.bausystem.features.backup;
 
+import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.bausystem.region.Color;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -42,7 +46,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class BackupCommand extends SWCommand {
 
     public BackupCommand() {
@@ -58,7 +62,7 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "create", description = "BACKUP_HELP_CREATE")
-    public void backupCreate(@Validator Player p) {
+    public void backupCreate(@Validator("owner") Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
@@ -75,7 +79,7 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "BACKUP_HELP_LOAD")
-    public void backupLoad(@Validator Player p, @Mapper("backupName") String backupName) {
+    public void backupLoad(@Validator("owner") Player p, @Mapper("backupName") String backupName) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
@@ -86,7 +90,13 @@ public class BackupCommand extends SWCommand {
             BauSystem.MESSAGE.send("BACKUP_LOAD_FAILURE", p);
             return;
         }
-        region.reset(backupFile);
+        EditSession editSession = new PasteBuilder(new PasteBuilder.FileProvider(backupFile))
+                .pastePoint(region.getMinPoint().add(region.getPrototype().getSizeX() / 2, 0, region.getPrototype().getSizeZ() / 2))
+                .minPoint(region.getMinPoint())
+                .maxPoint(region.getMaxPoint())
+                .waterLevel(region.getWaterLevel())
+                .run();
+        region.remember(editSession);
         BauSystem.MESSAGE.send("BACKUP_LOAD", p);
     }
 
@@ -120,7 +130,7 @@ public class BackupCommand extends SWCommand {
         }
         SWListInv<String> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
             p.getOpenInventory().close();
-            backupLoad(p, s);
+            p.performCommand("backup load " + s);
         });
         swListInv.open();
     }
@@ -130,13 +140,6 @@ public class BackupCommand extends SWCommand {
         return SWCommandUtils.createMapper(s -> s, (commandSender, s) -> listBackup((Player) commandSender));
     }
 
-    @ClassValidator(value = Player.class, local = true)
-    public TypeValidator<Player> backupValidator() {
-        return (commandSender, player, messageSender) -> {
-            return !messageSender.send(!Permission.hasPermission(player, Permission.WORLDEDIT), "BACKUP_NO_PERMS");
-        };
-    }
-
     private List<String> listBackup(Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {

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

@@ -22,12 +22,12 @@ package de.steamwar.bausystem.features.bau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.core.Core;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -37,7 +37,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.ArrayList;
 import java.util.List;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class BauInfoBauGuiItem extends BauGuiItem {
 
     public BauInfoBauGuiItem() {
@@ -59,6 +59,9 @@ public class BauInfoBauGuiItem extends BauGuiItem {
             if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
                 continue;
             }
+            if (flag == Flag.ITEMS && Core.getVersion() < 19) {
+                continue;
+            }
             Flag.Value<?> value = region.get(flag);
             if (value != null) {
                 stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getChatValue(), player)));

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

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

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

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

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

@@ -0,0 +1,96 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.cannon;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.cannon.depth.Depth;
+import de.steamwar.bausystem.features.cannon.depth.DepthManager;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Linked
+public class CannonDetector implements Listener {
+
+    private Map<TNTPrimed, Vector> velocities = new HashMap<>();
+    private Map<TNTPrimed, Set<UUID>> propulsionOfProjectile = new HashMap<>();
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) {
+            return;
+        }
+
+        TNTPrimed tnt = (TNTPrimed) event.getEntity();
+        propulsionOfProjectile.remove(tnt);
+
+        DepthManager.update(tnt, event.blockList());
+
+        List<TNTPrimed> tnts = Bukkit.getWorlds().get(0).getEntitiesByClass(TNTPrimed.class)
+                .stream()
+                .filter(entity -> entity != tnt)
+                .filter(entity -> entity.getFuseTicks() > 1)
+                .filter(entity -> entity.getLocation().distance(event.getLocation()) <= 8)
+                .collect(Collectors.toList());
+
+        if (tnts.isEmpty()) {
+            return;
+        }
+
+        boolean isEmpty = velocities.isEmpty();
+        tnts.forEach(tntPrimed -> {
+            velocities.put(tntPrimed, tntPrimed.getVelocity().clone());
+            propulsionOfProjectile.computeIfAbsent(tntPrimed, __ -> new HashSet<>()).add(tnt.getUniqueId());
+        });
+
+        if (!isEmpty) {
+            return;
+        }
+
+        BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
+            Map<CannonKey, List<TNTPrimed>> grouped = new HashMap<>();
+            velocities.forEach((tntPrimed, vector) -> {
+                boolean xBiggest = Math.abs(vector.getX()) > Math.abs(vector.getZ());
+                boolean zBiggest = Math.abs(vector.getZ()) > Math.abs(vector.getX());
+                Vector vec = new Vector(xBiggest ? Math.signum(vector.getX()) : 0, Math.round(vector.getY() * 100), zBiggest ? Math.signum(vector.getZ()) : 0);
+                grouped.computeIfAbsent(new CannonKey(propulsionOfProjectile.get(tntPrimed), vec), ignored -> new ArrayList<>()).add(tntPrimed);
+            });
+            grouped.forEach((cannonKey, tntPrimeds) -> {
+                if (tntPrimeds.size() <= 5) return;
+                Region region = Region.getRegion(tntPrimeds.get(0).getLocation());
+                if (region.isGlobal()) return;
+                if (!region.hasType(RegionType.TESTBLOCK)) return;
+                Depth depth = new Depth(region);
+                DepthManager.init(tntPrimeds, depth);
+            });
+            velocities.clear();
+        }, 1);
+    }
+}

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

@@ -0,0 +1,37 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.cannon;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.util.Vector;
+
+import java.util.Set;
+import java.util.UUID;
+
+@AllArgsConstructor
+@EqualsAndHashCode
+@Getter
+public final class CannonKey {
+    private Set<UUID> propulsions;
+    private Vector velocityVector;
+}

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

@@ -0,0 +1,109 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.cannon.depth;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.utils.RegionExtensionType;
+import de.steamwar.bausystem.region.utils.RegionType;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class Depth {
+
+    private Region region;
+    private Vector minVector = null;
+    private Vector maxVector = null;
+    private int tntCount = 0;
+
+    public Depth(Region region) {
+        this.region = region;
+    }
+
+    public void update(List<Block> blocks) {
+        List<Block> blocksList = blocks.stream()
+                .filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
+                .collect(Collectors.toList());
+        tntCount++;
+        for (Block block : blocksList) {
+            internalUpdate(block);
+        }
+    }
+
+    public void finish() {
+        if (maxVector == null || minVector == null) return;
+        Vector dimensions = maxVector.subtract(minVector);
+        dimensions.setX(Math.abs(dimensions.getX()));
+        dimensions.setY(Math.abs(dimensions.getY()));
+        dimensions.setZ(Math.abs(dimensions.getZ()));
+
+        RegionUtils.message(region, player -> {
+            player.spigot().sendMessage(getMessage(player, dimensions.getBlockX() + 1, dimensions.getBlockY() + 1, dimensions.getBlockZ() + 1, tntCount));
+        });
+    }
+
+    private void internalUpdate(Block block) {
+        if (minVector == null) {
+            minVector = block.getLocation().toVector();
+        }
+        minVector.setX(Math.min(minVector.getX(), block.getX()));
+        minVector.setY(Math.min(minVector.getY(), block.getY()));
+        minVector.setZ(Math.min(minVector.getZ(), block.getZ()));
+
+        if (maxVector == null) {
+            maxVector = block.getLocation().toVector();
+        }
+        maxVector.setX(Math.max(maxVector.getX(), block.getX()));
+        maxVector.setY(Math.max(maxVector.getY(), block.getY()));
+        maxVector.setZ(Math.max(maxVector.getZ(), block.getZ()));
+    }
+
+    private static BaseComponent[] getMessage(Player player, int x, int y, int z, int tntCount) {
+        final Set<Integer> dimensions = new HashSet<>();
+        dimensions.add(x);
+        dimensions.add(y);
+        dimensions.add(z);
+
+        int max = getMax(dimensions);
+
+        TextComponent headerComponent = new TextComponent(BauSystem.MESSAGE.parse("DEPTH_COUNTER_MESSAGE", player));
+
+        TextComponent depthComponent = new TextComponent(BauSystem.MESSAGE.parse("DEPTH_COUNTER_COUNT", player, x == max ? "§e" : "§7", x, y == max ? "§e" : "§7", y, z == max ? "§e" : "§7", z));
+        depthComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[]{new TextComponent(BauSystem.MESSAGE.parse("DEPTH_COUNTER_HOVER", player))}));
+
+        TextComponent tntComponent = new TextComponent(BauSystem.MESSAGE.parse("DEPTH_COUNTER_TNT", player, tntCount));
+
+        return new BaseComponent[]{headerComponent, depthComponent, tntComponent};
+    }
+
+    private static int getMax(Set<Integer> values) {
+        return values.stream().max(Integer::compare).orElse(0);
+    }
+}

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

@@ -0,0 +1,48 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.cannon.depth;
+
+import lombok.experimental.UtilityClass;
+import org.bukkit.block.Block;
+import org.bukkit.entity.TNTPrimed;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@UtilityClass
+public class DepthManager {
+
+    private Map<TNTPrimed, Depth> depths = new HashMap<>();
+
+    public void init(List<TNTPrimed> list, Depth depth) {
+        for (TNTPrimed tnt : list) {
+            depths.putIfAbsent(tnt, depth);
+        }
+    }
+
+    public void update(TNTPrimed tnt, List<Block> blocks) {
+        Depth depth = depths.remove(tnt);
+        if (depth == null) return;
+        depth.update(blocks);
+        if (depths.containsValue(depth)) return;
+        depth.finish();
+    }
+}

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

@@ -20,13 +20,12 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class CountingwandCommand extends SWCommand {
 
 	public CountingwandCommand() {

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

@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class CountingwandGuiItem extends BauGuiItem {
 
 	public CountingwandGuiItem() {
@@ -49,6 +48,6 @@ public class CountingwandGuiItem extends BauGuiItem {
 
 	@Override
 	public Permission permission() {
-		return Permission.WORLDEDIT;
+		return Permission.MEMBER;
 	}
 }

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

@@ -19,9 +19,8 @@
 
 package de.steamwar.bausystem.features.countingwand;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Point;
+import de.steamwar.linkage.Linked;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,7 +33,7 @@ import org.bukkit.util.RayTraceResult;
 import java.util.Objects;
 
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class CountingwandListener implements Listener {
 
 	@EventHandler

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

@@ -0,0 +1,141 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.design.endstone;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+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;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class DesignEndStone {
+
+    private static final World WORLD = Bukkit.getWorlds().get(0);
+
+    private int minX, minY, minZ, maxX, maxY, maxZ;
+    private REntityServer entityServer = new REntityServer();
+    private List<REntity> entities = new ArrayList<>();
+    private Set<Location> locations = new HashSet<>();
+    private boolean wsOrAs;
+    private double maxBlastResistance;
+
+    public DesignEndStone(Region region) {
+        this.minX = region.getMinPointBuild().getX();
+        this.minY = region.getMinPointBuild().getY();
+        this.minZ = region.getMinPointBuild().getZ();
+        this.maxX = region.getMaxPointBuild().getX();
+        this.maxY = region.getMaxPointBuild().getY();
+        this.maxZ = region.getMaxPointBuild().getZ();
+        wsOrAs = region.getName().startsWith("ws") || region.getName().startsWith("as");
+        maxBlastResistance = wsOrAs ? 6.1 : 9.0;
+
+        entityServer.setCallback((player, rEntity, entityAction) -> {
+            if (entityAction != REntityServer.EntityAction.ATTACK) return;
+            Location location = new Location(WORLD, rEntity.getX(), rEntity.getY(), rEntity.getZ());
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                location.getBlock().breakNaturally();
+                calc();
+            }, 1);
+        });
+    }
+
+    public void calc() {
+        entities.forEach(REntity::die);
+        entities.clear();
+        locations.clear();
+
+        calc(minX, minY, minZ, maxX, maxY, minZ, 0, 0, 1, maxZ - minZ);
+        calc(minX, minY, maxZ, maxX, maxY, maxZ, 0, 0, -1, maxZ - minZ);
+        calc(minX, minY, minZ, minX, maxY, maxZ, 1, 0, 0, maxX - minX);
+        calc(maxX, minY, minZ, maxX, maxY, maxZ, -1, 0, 0, maxX - minX);
+        if (wsOrAs) {
+            calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
+        } else {
+            int airBlocks = 0;
+            double minAirBlocks = (maxX - minX) * (maxZ - minZ) * 0.1;
+            for (int x = minX; x < maxX; x++) {
+                for (int z = minZ; z < maxZ; z++) {
+                    if (WORLD.getBlockAt(x, minY, z).getType().isAir()) {
+                        airBlocks++;
+                        if (airBlocks > minAirBlocks) break;
+                    }
+                }
+            }
+            if (airBlocks > minAirBlocks) {
+                calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
+            }
+        }
+        calc(minX, maxY, minZ, maxX, maxY, maxZ, 0, -1, 0, maxY - minY + 1);
+    }
+
+    private void calc(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dirX, int dirY, int dirZ, int steps) {
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    for (int step = 0; step < steps; step++) {
+                        int cx = x + step * dirX;
+                        int cy = y + step * dirY;
+                        int cz = z + step * dirZ;
+                        Material material = WORLD.getBlockAt(cx, cy, cz).getType();
+
+                        if (material != Material.WATER && material != Material.LAVA && material.getBlastResistance() >= maxBlastResistance) {
+                            Location location = new Location(WORLD, cx + 0.5, cy, cz + 0.5);
+                            if (!locations.add(location)) break;
+                            RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);
+                            entity.setNoGravity(true);
+                            entity.setGlowing(true);
+                            entities.add(entity);
+                            break;
+                        } else if (!material.isAir() && material != Material.WATER && material != Material.LAVA) {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public void toggle(Player player) {
+        if (entityServer.getPlayers().contains(player)) {
+            entityServer.removePlayer(player);
+            BauSystem.MESSAGE.sendPrefixless("DESIGN_ENDSTONE_DISABLE", player, ChatMessageType.ACTION_BAR);
+        } else {
+            entityServer.addPlayer(player);
+            calc();
+            BauSystem.MESSAGE.sendPrefixless("DESIGN_ENDSTONE_ENABLE", player, ChatMessageType.ACTION_BAR);
+        }
+    }
+
+    public boolean removePlayer(Player player) {
+        entityServer.removePlayer(player);
+        return entityServer.getPlayers().isEmpty();
+    }
+}

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

@@ -0,0 +1,97 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2023  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.design.endstone;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+@Linked
+public class DesignEndStoneCommand extends SWCommand implements Listener {
+
+    public DesignEndStoneCommand() {
+        super("designendstone");
+    }
+
+    private Map<Region, DesignEndStone> designEndStoneMap = new HashMap<>();
+
+    @Register(description = "DESIGN_ENDSTONE_COMMAND_HELP")
+    public void genericCommand(@Validator Player player) {
+        Region region = Region.getRegion(player.getLocation());
+        if (!region.hasType(RegionType.BUILD)) {
+            BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
+            return;
+        }
+        designEndStoneMap.computeIfAbsent(region, DesignEndStone::new).toggle(player);
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        disableDesignEndStone(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        event.getNewSpectator().forEach(this::disableDesignEndStone);
+    }
+
+    private void disableDesignEndStone(Player player) {
+        new HashSet<>(designEndStoneMap.entrySet()).forEach(regionDesignEndStoneEntry -> {
+            if (regionDesignEndStoneEntry.getValue().removePlayer(player)) {
+                designEndStoneMap.remove(regionDesignEndStoneEntry.getKey());
+            }
+        });
+    }
+
+    @EventHandler
+    public void onBlockPlace(BlockPlaceEvent event) {
+        update(event.getBlock().getLocation());
+    }
+
+    @EventHandler
+    public void onBlockBreak(BlockBreakEvent event) {
+        BauSystem.runTaskLater(BauSystem.getInstance(), () -> {
+            update(event.getBlock().getLocation());
+        }, 1);
+    }
+
+    private void update(Location location) {
+        Region region = Region.getRegion(location);
+        DesignEndStone designEndStone = designEndStoneMap.get(region);
+        if (designEndStone == null) {
+            return;
+        }
+        designEndStone.calc();
+    }
+}

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

@@ -1,35 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.detonator;
-
-import de.steamwar.bausystem.shared.AbstractEntity;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-public interface AbstractDetonatorEntity extends AbstractEntity {
-
-    void display(Player player);
-
-    boolean hide(Player player, boolean always);
-
-    int getId();
-
-    Entity getBukkitEntity();
-}

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

@@ -25,7 +25,8 @@ import de.steamwar.bausystem.configplayer.Config;
 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.bausystem.utils.NMSWrapper;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -44,7 +45,7 @@ import java.util.*;
 @UtilityClass
 public class Detonator {
 
-    private static final Map<Player, List<AbstractDetonatorEntity>> ENTITIES_MAP = new HashMap<>();
+    private static final Map<Player, REntityServer> ENTITIES_MAP = new HashMap<>();
     private static final Vector HALF = new Vector(0.5, 0, 0.5);
 
     public static boolean isDetonator(ItemStack itemStack) {
@@ -52,18 +53,24 @@ public class Detonator {
     }
 
     public static void showDetonator(Player p, List<Location> locs) {
-        List<AbstractDetonatorEntity> entities = new LinkedList<>();
+        if (ENTITIES_MAP.containsKey(p)) return;
-        locs.stream().map(Location::toVector).forEach(vector -> entities.add(NMSWrapper.impl.constructDetonator(p.getWorld(), vector.add(HALF))));
+        REntityServer entities = new REntityServer();
-        entities.forEach(abstractDetonatorEntity -> abstractDetonatorEntity.display(p));
+        entities.setCallback((player, rEntity, entityAction) -> {
-        ENTITIES_MAP.putIfAbsent(p, entities);
+            Vector vector = new Vector(rEntity.getX(), rEntity.getY(), rEntity.getZ());
+            DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
+            DetonatorListener.HAS_UPDATED.add(player);
+        });
+        entities.addPlayer(p);
+        ENTITIES_MAP.put(p, entities);
+
+        locs.forEach(location -> {
+            RFallingBlockEntity entity = new RFallingBlockEntity(entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            entity.setNoGravity(true);
+        });
     }
 
     public static void hideDetonator(Player p) {
-        ENTITIES_MAP.remove(p).forEach(abstractDetonatorEntity -> abstractDetonatorEntity.hide(p, true));
+        ENTITIES_MAP.remove(p).close();
-    }
-
-    public static List<AbstractDetonatorEntity> getDetoEntities(Player p) {
-        return ENTITIES_MAP.getOrDefault(p, new ArrayList<>());
     }
 
     public static boolean hasActiveDetonatorShow(Player p) {

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

@@ -20,14 +20,13 @@
 package de.steamwar.bausystem.features.detonator;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class DetonatorBauGuiItem extends BauGuiItem {
 
     public DetonatorBauGuiItem() {
@@ -48,6 +47,6 @@ public class DetonatorBauGuiItem extends BauGuiItem {
 
     @Override
     public Permission permission() {
-        return Permission.MEMBER;
+        return Permission.BUILD;
     }
 }

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

@@ -24,10 +24,9 @@ import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -35,7 +34,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class DetonatorCommand extends SWCommand {
 
     public static ItemStack getWAND(Player player) {
@@ -59,12 +58,12 @@ public class DetonatorCommand extends SWCommand {
     }
 
     @Register(value = "wand", description = "DETONATOR_HELP_WAND")
-    public void giveWand(Player p) {
+    public void giveWand(@Validator Player p) {
         SWUtils.giveItemToPlayer(p, getWAND(p));
     }
 
     @Register(value = "click", description = "DETONATOR_HELP_CLICK")
-    public void clickDetonator(Player p) {
+    public void clickDetonator(@Validator Player p) {
         Detonator.activateDetonator(new ItemStorage(p));
     }
 

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

@@ -19,14 +19,12 @@
 
 package de.steamwar.bausystem.features.detonator;
 
-import com.comphenix.tinyprotocol.Reflection;
-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.linkage.Linked;
-import de.steamwar.bausystem.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -39,39 +37,14 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class DetonatorListener implements Listener {
 
-    public static final Class<?> useEntity = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseEntity");
+    static final Set<Player> HAS_UPDATED = new HashSet<>();
-    private static final Reflection.FieldAccessor<Integer> entityIdFieldAccessor = Reflection.getField(useEntity, int.class, 0);
 
-    private static final Set<Player> HAS_UPDATED = new HashSet<>();
+    static void addLocationToDetonator(Location location, Player p) {
-
-    public DetonatorListener() {
-        TinyProtocol.instance.addFilter(useEntity, (player, o) -> {
-            List<AbstractDetonatorEntity> entities = Detonator.getDetoEntities(player);
-            if (entities.isEmpty()) {
-                return o;
-            }
-
-            int entityId = entityIdFieldAccessor.get(o);
-            AbstractDetonatorEntity entity = entities.stream().filter(abstractDetonatorEntity -> abstractDetonatorEntity.getId() == entityId).findFirst().orElse(null);
-
-            if (entity == null) {
-                return o;
-            }
-
-            Location location = entity.getBukkitEntity().getLocation().getBlock().getLocation();
-            addLocationToDetonator(location, player);
-            HAS_UPDATED.add(player);
-            return null;
-        });
-    }
-
-    private static void addLocationToDetonator(Location location, Player p) {
         Detoblock detoblock = Detonator.getBlock(location.getBlock());
         if (detoblock == Detoblock.INVALID) {
             SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("DETONATOR_INVALID_BLOCK", p));
@@ -93,6 +66,7 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         Player p = event.getPlayer();
         if (Detonator.isDetonator(p.getInventory().getItemInMainHand())) {
             event.setCancelled(true);
@@ -103,6 +77,7 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (!Detonator.isDetonator(event.getItem())) {
             return;
         }
@@ -117,7 +92,7 @@ public class DetonatorListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent event) {
-        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer()) ||!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
             if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
                 Detonator.hideDetonator(event.getPlayer());
             }
@@ -138,6 +113,7 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
             HAS_UPDATED.add(event.getPlayer());
         }
@@ -145,6 +121,7 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
             HAS_UPDATED.add(event.getPlayer());
         }

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

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.gui.editor.BauGuiMapping;
-import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.LinkageUtils;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWInventory;
@@ -42,7 +41,7 @@ public class BauGUI {
     private static final Map<Integer, BauGuiItem> ITEMS = new HashMap<>();
 
     public static Map<Integer, BauGuiItem> getITEMS() {
-        LinkageUtils.run(LinkageType.BAU_GUI_ITEM);
+        if (ITEMS.isEmpty()) LinkageUtils.linkGUIItems();
         return ITEMS;
     }
 
@@ -82,7 +81,7 @@ public class BauGUI {
                     }
                 } else {
                     p.closeInventory();
-                    BauSystem.MESSAGE.send("GUI_NO_PERMISSION", p);
+                    BauSystem.MESSAGE.send("NO_PERMISSION", p);
                 }
             });
         });
@@ -109,26 +108,13 @@ public class BauGUI {
         if (!permission.hasPermission(p)) {
             List<String> lore = meta.getLore();
             if (lore == null) {
-                lore = Collections.singletonList(BauSystem.MESSAGE.parse(permissionString(permission), p));
+                lore = Collections.singletonList(BauSystem.MESSAGE.parse("NO_PERMISSION", p));
             } else {
-                lore.add(BauSystem.MESSAGE.parse(permissionString(permission), p));
+                lore.add(BauSystem.MESSAGE.parse("NO_PERMISSION", p));
             }
             meta.setLore(lore);
         }
         itemStack.setItemMeta(meta);
         return itemStack;
     }
-
-    private static String permissionString(Permission permission) {
-        switch (permission) {
-            case OWNER:
-                return "GUI_NO_OWNER";
-            case WORLD:
-                return "GUI_NO_WORLD";
-            case WORLDEDIT:
-                return "GUI_NO_WORLDEDIT";
-            default:
-                return "GUI_NO_MEMBER";
-        }
-    }
 }

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

@@ -20,13 +20,12 @@
 package de.steamwar.bausystem.features.gui;
 
 import de.steamwar.bausystem.features.gui.editor.BauGuiEditor;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class BauGUICommand extends SWCommand {
 
     public BauGUICommand() {

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

@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.gui;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -33,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class BauGuiBauGuiItem extends BauGuiItem {
 
     public BauGuiBauGuiItem() {

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

@@ -19,14 +19,13 @@
 
 package de.steamwar.bausystem.features.gui;
 
-import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.linkage.Linked;
-import de.steamwar.bausystem.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class BauGuiListener implements Listener {
 
     @EventHandler

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

@@ -21,11 +21,10 @@ package de.steamwar.bausystem.features.gui.editor;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -40,13 +39,14 @@ import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 
 import java.util.*;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class BauGuiEditor implements Listener {
 
     @Getter
@@ -73,6 +73,7 @@ public class BauGuiEditor implements Listener {
         inv.setItem(mapping.getSize() + 5, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH", p), Arrays.asList(BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH_LORE", p)), false, clickType -> {
         }).getItemStack());
         inv.setItem(mapping.getSize() + 6, new SWItem(Material.SCUTE, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
+        inv.setItem(mapping.getSize() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", p)).getItemStack());
 
         p.openInventory(inv);
         p.getOpenInventory().setCursor(cursor == null ? new SWItem().getItemStack() : cursor);
@@ -156,6 +157,10 @@ public class BauGuiEditor implements Listener {
                 });
                 inv.open();
                 break;
+            case 8:
+                saveMapping(p);
+                BauGUI.openBauGui(p);
+                break;
             default:
         }
     }
@@ -189,14 +194,17 @@ public class BauGuiEditor implements Listener {
     }
 
     private void saveMapping(Player p) {
-        BauGuiMapping mapping = BauGuiMapping.getGuiMapping(p);
+        saveMapping(p.getOpenInventory(), BauGuiMapping.getGuiMapping(p));
+    }
+
+    private void saveMapping(InventoryView view, BauGuiMapping mapping) {
         if (mapping.isSaved()) {
             return;
         }
         HashMap<Integer, Integer> newMapping = new HashMap<>();
 
-        for (int i = 0; i < p.getOpenInventory().getTopInventory().getContents().length; i++) {
+        for (int i = 0; i < view.getTopInventory().getContents().length; i++) {
-            ItemStack itemStack = p.getOpenInventory().getTopInventory().getContents()[i];
+            ItemStack itemStack = view.getTopInventory().getContents()[i];
             if (itemStack == null || itemStack.getType() == Material.AIR || i >= mapping.getSize()) continue;
             newMapping.put(getId(itemStack), i);
         }
@@ -219,7 +227,7 @@ public class BauGuiEditor implements Listener {
 
         Player p = (Player) event.getPlayer();
 
-        saveMapping(p);
+        saveMapping(event.getView(), BauGuiMapping.getGuiMapping(p));
         open_Edits.remove(p);
     }
 }

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

@@ -21,16 +21,15 @@ package de.steamwar.bausystem.features.gui.editor;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class BauGuiEditorGuiItem extends BauGuiItem {
 
     public BauGuiEditorGuiItem() {

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

@@ -31,6 +31,9 @@ import yapion.parser.YAPIONParser;
 import yapion.serializing.YAPIONDeserializer;
 import yapion.serializing.YAPIONSerializer;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @UtilityClass
 public class DefaultHotbar {
 
@@ -66,13 +69,21 @@ public class DefaultHotbar {
         Config.getInstance().get(p).remap("hotbar", "hotbar-19");
         YAPIONArray yapionArray = Config.getInstance().get(p).getYAPIONArrayOrSetDefault("hotbar-" + Core.getVersion(), defaultHotbar());
         ItemStack[] hotbar = new ItemStack[13];
+        Set<Integer> invalid = new HashSet<>();
         yapionArray.forEach((integer, yapionAnyType) -> {
             if (yapionAnyType instanceof YAPIONValue) {
                 hotbar[integer] = null;
             } else {
-                hotbar[integer] = (ItemStack) YAPIONDeserializer.deserialize((YAPIONObject) yapionAnyType);
+                try {
+                    hotbar[integer] = YAPIONDeserializer.deserialize((YAPIONObject) yapionAnyType);
+                } catch (Exception e) {
+                    invalid.add(integer);
+                    hotbar[integer] = null;
+                }
             }
         });
+        invalid.forEach(i -> yapionArray.set(i, new YAPIONValue<>(null)));
+        if (!invalid.isEmpty()) Config.getInstance().save(p);
         return hotbar;
     }
 

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

@@ -20,14 +20,13 @@
 package de.steamwar.bausystem.features.hotbar;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWInventory;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class HotbarCommand extends SWCommand {
 
     public HotbarCommand() {
@@ -36,7 +35,7 @@ public class HotbarCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "HOTBAR_HELP_LOAD")
-    public void loadHotbar(Player p) {
+    public void loadHotbar(@Validator Player p) {
         DefaultHotbar.setHotbar(p);
         BauSystem.MESSAGE.send("HOTBAR_LOADED", p);
     }

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

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

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

@@ -3,12 +3,10 @@ package de.steamwar.bausystem.features.inventoryfiller;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.features.inventoryfiller.InventoryFillerCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -16,7 +14,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Collections;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class InventoryFillBauGuiItem extends BauGuiItem {
     public InventoryFillBauGuiItem() {
         super(34);

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

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

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

@@ -3,12 +3,11 @@ package de.steamwar.bausystem.features.inventoryfiller;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class InventoryFillerCommand extends SWCommand {
 
     public InventoryFillerCommand() {