i need to fix expand sometime

Author: UntouchedOdin0

compat/src/main/java/me/untouchedodin0/privatemines/compat/WorldEditAdapter.java

@@ -3,6 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import redempt.redlib.region.CuboidRegion;
+import redempt.redlib.region.Region;
 
 import java.nio.file.Path;
 import java.util.EnumMap;

plugin/src/main/java/me/untouchedodin0/plugin/mines/Mine.java

@@ -39,6 +39,7 @@ of this software and associated documentation files (the "Software"), to deal
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
+import org.codemc.worldguardwrapper.WorldGuardWrapper;
 import org.codemc.worldguardwrapper.region.IWrappedRegion;
 import redempt.redlib.config.annotations.ConfigName;
 import redempt.redlib.misc.Task;
@@ -301,31 +302,25 @@ public void expand(final int amount) {
         Gson gson = gsonBuilder.create();
         String fileName = getMineOwner() + ".json";
         Path jsonFile = minesDirectory.resolve(fileName);
-
+        IWrappedRegion miningRegion = getIWrappedMiningRegion();
+        String regionName = miningRegion.getId();
 
         if (!canExpand) {
             privateMines.getLogger().info("The private mine can't expand anymore!");
         } else {
-//            final Map<Material, Double> materials = getMineTypes();
-//            if (materials.isEmpty()) {
-//                throw new IllegalStateException("Mine type " + mineData.getMineType() +
-//                                                " has no materials!");
-//            }
 
             final CuboidRegion mine = getMiningRegion().clone();
             final CuboidRegion walls = getMiningRegion().clone();
 
             expandXAndZ(mine, amount);
             expandXAndZ(walls, amount);
 
-//            privateMines.getWorldEditAdapter()
-//                    .fillRegion(mine, materials);
             privateMines.getWorldEditAdapter()
                     .fillRegion(walls, Material.BEDROCK);
+
             // TODO make this configurable
 
             expandXAndZ(mine, -1);
-            mineData.setMiningRegion(mine);
 
             mineData.setSpawnX(spawnLocation.getBlockX());
             mineData.setSpawnY(spawnLocation.getBlockY());
@@ -337,12 +332,19 @@ public void expand(final int amount) {
                 e.printStackTrace();
             }
 
-            setMiningRegion(mine);
+            Optional<IWrappedRegion> iWrappedRegion =
+                    WorldGuardWrapper.getInstance().getRegion(world, regionName);
+            WorldGuardWrapper.getInstance().removeRegion(world, regionName);
+
+            Player player = Bukkit.getOfflinePlayer(getMineOwner()).getPlayer();
+            IWrappedRegion expandedMiningRegion = utils.createWorldGuardRegion(player, mine);
+            mineData.setMiningRegion(mine);
+            setIWrappedMiningRegion(expandedMiningRegion);
             setMineData(mineData);
             privateMines.getMineStorage().replaceMine(getMineOwner(), this);
+            utils.setMineFlags(this);
+            reset();
         }
-        mineStorage.replaceMine(getMineOwner(), this);
-//        reset();
     }
 
     public double getPercentage() {

plugin/src/main/java/me/untouchedodin0/plugin/util/Utils.java

@@ -68,9 +68,9 @@ public IWrappedRegion createWorldGuardRegion(Player player, CuboidRegion cuboidR
         ).orElseThrow(() -> new RuntimeException("Could not create worldguard region named " + regionName));
     }
 
-    public void setMineFlags(Mine worldEditMine) {
+    public void setMineFlags(Mine mine) {
         final WorldGuardWrapper worldGuardWrapper = WorldGuardWrapper.getInstance();
-        IWrappedRegion iWrappedRegion = worldEditMine.getIWrappedMiningRegion();
+        IWrappedRegion iWrappedRegion = mine.getIWrappedMiningRegion();
 
         Stream.of(
                         worldGuardWrapper.getFlag("block-place", WrappedState.class),

we_6/src/main/java/me/untouchedodin0/privatemines/we_6/worldedit/WE6Adapter.java

@@ -12,6 +12,7 @@
 import com.sk89q.worldedit.function.pattern.Patterns;
 import com.sk89q.worldedit.function.pattern.RandomPattern;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.regions.RegionIntersection;
 import com.sk89q.worldedit.regions.RegionOperationException;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;

we_7/src/main/java/me/untouchedodin0/privatemines/we_7/worldedit/WE7Adapter.java

@@ -16,6 +16,7 @@
 import com.sk89q.worldedit.function.pattern.RandomPattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.regions.RegionIntersection;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import me.untouchedodin0.privatemines.compat.WorldEditAdapter;
@@ -137,4 +138,44 @@ public List<BlockVector3> findCornerPoints(Region region, Material cornerMateria
         });
         return corners;
     }
+
+    public static Region walls(com.sk89q.worldedit.regions.CuboidRegion region) {
+        BlockVector3 pos1 = region.getPos1();
+        BlockVector3 pos2 = region.getPos2();
+
+        BlockVector3 min = region.getMinimumPoint();
+        BlockVector3 max = region.getMaximumPoint();
+
+        return new RegionIntersection(
+                // Project to Z-Y plane
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withX(min.getX()), pos2.withX(min.getX())),
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withX(max.getX()), pos2.withX(max.getX())),
+
+                // Project to X-Y plane
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withZ(min.getZ()), pos2.withZ(min.getZ())),
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withZ(max.getZ()), pos2.withZ(max.getZ())),
+
+                // Project to the X-Z plane
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withY(min.getY()), pos2.withY(min.getY())));
+    }
+
+    public static Region walls(CuboidRegion region) {
+        BlockVector3 pos1 = BlockVector3.at(region.getStart().getBlockX(), region.getStart().getBlockY(), region.getStart().getBlockZ());
+        BlockVector3 pos2 = BlockVector3.at(region.getEnd().getBlockX(), region.getEnd().getBlockY(), region.getEnd().getBlockZ());
+
+        BlockVector3 min = BlockVector3.at(region.getStart().getBlockX(), region.getStart().getBlockY(), region.getStart().getBlockZ());
+        BlockVector3 max = BlockVector3.at(region.getEnd().getBlockX(), region.getEnd().getBlockY(), region.getEnd().getBlockZ());
+
+        return new RegionIntersection(
+                // Project to Z-Y plane
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withX(min.getX()), pos2.withX(min.getX())),
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withX(max.getX()), pos2.withX(max.getX())),
+
+                // Project to X-Y plane
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withZ(min.getZ()), pos2.withZ(min.getZ())),
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withZ(max.getZ()), pos2.withZ(max.getZ())),
+
+                // Project to the X-Z plane
+                new com.sk89q.worldedit.regions.CuboidRegion(pos1.withY(min.getY()), pos2.withY(min.getY())));
+    }
 }