Hotfix CommandSelect for 1.12

BauSystem_12/pom.xml

@@ -52,5 +52,11 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

BauSystem_12/src/de/steamwar/bausystem/commands/CommandSelect_12.java

@@ -0,0 +1,44 @@
+/*
+ * 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.commands;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
+import com.sk89q.worldedit.world.World;
+import de.steamwar.bausystem.world.regions.Point;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+class CommandSelect_12 {
+
+    static final WorldEditPlugin WORLDEDIT_PLUGIN = ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
+    static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
+
+    static void setSelection(Player p, Point minPoint, Point maxPoint) {
+        WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, toVector(minPoint), toVector(maxPoint)));
+    }
+
+    private static Vector toVector(Point point) {
+        return Vector.toBlockPoint(point.getX(), point.getY(), point.getZ());
+    }
+
+}

BauSystem_15/pom.xml

@@ -58,5 +58,11 @@
             <scope>system</scope>
             <systemPath>${main.basedir}/lib/ProtocolLib.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

BauSystem_15/src/de/steamwar/bausystem/commands/CommandSelect_15.java

@@ -0,0 +1,44 @@
+/*
+ * 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.commands;
+
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
+import com.sk89q.worldedit.world.World;
+import de.steamwar.bausystem.world.regions.Point;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+class CommandSelect_15 {
+
+    static final WorldEditPlugin WORLDEDIT_PLUGIN = ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
+    static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
+
+    static void setSelection(Player p, Point minPoint, Point maxPoint) {
+        WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, toBlockVector3(minPoint), toBlockVector3(maxPoint)));
+    }
+
+    private static BlockVector3 toBlockVector3(Point point) {
+        return BlockVector3.at(point.getX(), point.getY(), point.getZ());
+    }
+
+}

BauSystem_API/pom.xml

@@ -39,5 +39,11 @@
             <scope>system</scope>
             <systemPath>${main.basedir}/lib/Spigot-1.12.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

BauSystem_API/src/de/steamwar/bausystem/world/regions/Point.java

@@ -19,19 +19,13 @@
 
 package de.steamwar.bausystem.world.regions;
 
-import com.sk89q.worldedit.math.BlockVector3;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public class Point {
-
     final int x;
     final int y;
     final int z;
-
-    public BlockVector3 toBlockVector3() {
-        return BlockVector3.at(this.x, this.y, this.z);
-    }
 }

BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSelect.java

@@ -1,16 +1,12 @@
 package de.steamwar.bausystem.commands;
 
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.world.World;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.world.Welt;
 import de.steamwar.bausystem.world.regions.*;
 import de.steamwar.command.SWCommand;
+import de.steamwar.core.VersionedRunnable;
 import lombok.Getter;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 
@@ -19,9 +15,6 @@ public class CommandSelect extends SWCommand {
     @Getter
     private static CommandSelect instance = null;
 
-    public static final WorldEditPlugin WORLDEDIT_PLUGIN = ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
-    public static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
-
     public CommandSelect() {
         super("select");
     }
@@ -125,7 +118,8 @@ public class CommandSelect extends SWCommand {
         Point minPoint = region.getMinPoint(regionType, regionExtensionType);
         Point maxPoint = region.getMaxPoint(regionType, regionExtensionType);
 
-        WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, minPoint.toBlockVector3(), maxPoint.toBlockVector3()));
+        VersionedRunnable.call(new VersionedRunnable(() -> CommandSelect_12.setSelection(p, minPoint, maxPoint), 12),
+                new VersionedRunnable(() -> CommandSelect_15.setSelection(p, minPoint, maxPoint), 15));
         p.sendMessage(BauSystem.PREFIX + "WorldEdit auswahl auf " + minPoint.getX() + ", " + minPoint.getY() + ", " + minPoint.getZ() + " und " + maxPoint.getX() + ", " + maxPoint.getY() + ", " + maxPoint.getZ() + " gesetzt");
     }
 }