Merge pull request 'Modular BauSystem Regions' (#26) from BauSystem/RegionSystem into main

Reviewed-on: SteamWar/SteamWar#26
Reviewed-by: D4rkr34lm <dark@steamwar.de>

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

@@ -8,7 +8,6 @@ import com.sk89q.worldedit.extension.platform.Actor;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.features.script.ScriptCommand;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.utils.WorldEditUtils;
@@ -28,10 +27,12 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
-import org.luaj.vm2.LuaValue;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 

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

@@ -20,9 +20,7 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

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

@@ -21,12 +21,8 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.region.GlobalRegion;
 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.RegionSelectionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
@@ -53,7 +49,7 @@ public class KillAllCommand extends SWCommand {
     public void genericCommand(@Validator Player player, RegionSelectionType regionSelectionType) {
         Region region = Region.getRegion(player.getLocation());
         AtomicLong count = new AtomicLong(0);
-        if (regionSelectionType == RegionSelectionType.GLOBAL || GlobalRegion.getInstance() == region) {
+        if (regionSelectionType == RegionSelectionType.GLOBAL || region.getType().isGlobal()) {
             WORLD.getEntities()
                     .stream()
                     .filter(e -> !(e instanceof Player))
@@ -66,7 +62,7 @@ public class KillAllCommand extends SWCommand {
             WORLD.getEntities()
                     .stream()
                     .filter(e -> !(e instanceof Player))
-                    .filter(e -> region.inRegion(e.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
+                    .filter(e -> region.getArea().inRegion(e.getLocation(), false))
                     .forEach(entity -> {
                         entity.remove();
                         count.incrementAndGet();
@@ -74,5 +70,4 @@ public class KillAllCommand extends SWCommand {
             RegionUtils.actionBar(region, "OTHER_KILLALL_REGION", count.get());
         }
     }
-
 }

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

@@ -0,0 +1,7 @@
+package de.steamwar.bausystem.features.util;
+
+public enum RegionSelectionType {
+    LOCAL,
+    GLOBAL,
+    ;
+}

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

@@ -1,14 +1,12 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -23,19 +21,15 @@ public class SelectCommand extends SWCommand {
     public void baurahmenCommand(@Validator Player p, RegionType regionType, @OptionalValue("NORMAL") RegionExtensionType regionExtensionType) {
         Region region = Region.getRegion(p.getLocation());
 
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SELECT_GLOBAL_REGION", p);
             return;
         }
 
-        if (!region.hasType(regionType)) {
+        if (!regionType.getHasType().test(region)) {
             BauSystem.MESSAGE.send("SELECT_NO_TYPE", p, BauSystem.MESSAGE.parse(regionType.getChatValue(), p));
             return;
         }
-        if (regionExtensionType == RegionExtensionType.EXTENSION && !region.hasExtensionType(regionType)) {
-            BauSystem.MESSAGE.send("SELECT_NO_EXTENSION", p);
-            return;
-        }
 
         setSelection(regionType, regionExtensionType, region, p);
     }
@@ -46,8 +40,8 @@ public class SelectCommand extends SWCommand {
     }
 
     private void setSelection(RegionType regionType, RegionExtensionType regionExtensionType, Region region, Player p) {
-        Point minPoint = region.getMinPoint(regionType, regionExtensionType);
-        Point maxPoint = region.getMaxPoint(regionType, regionExtensionType);
+        Point minPoint = regionType.getToMinPoint().apply(region, regionExtensionType.isExtension());
+        Point maxPoint = regionType.getToMaxPoint().apply(region, regionExtensionType.isExtension());
 
         FlatteningWrapper.impl.setSelection(p, minPoint, maxPoint);
         BauSystem.MESSAGE.send("SELECT_MESSAGE", p, minPoint.getX(), minPoint.getY(), minPoint.getZ(), maxPoint.getX(), maxPoint.getY(), maxPoint.getZ());

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

@@ -20,8 +20,9 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.command.*;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.SWCommandUtils;
+import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java

@@ -23,7 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.KillAllCommand;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.utils.RegionSelectionType;
+import de.steamwar.bausystem.features.util.RegionSelectionType;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;