Optimize plot merging

KCodeYT · KCodeYT · commit 988c8abe19d9 · 2022-03-09T19:56:25.000+01:00
diff --git a/src/main/java/de/kcodeyt/plotplugin/generator/PlotGenerator.java b/src/main/java/de/kcodeyt/plotplugin/generator/PlotGenerator.java
@@ -101,13 +101,13 @@ public void regenerateChunk(PlotManager plotManager, FullChunk fullChunk, boolea
         for(Entity entity : new ArrayList<>(fullChunk.getEntities().values())) {
             if(entity instanceof Player) continue;
 
-            if(!REGENERATE_ALLOWED.isAllowed(shapes[((entity.getFloorZ() & 15) << 4) | (entity.getFloorX() & 15)]))
+            if(REGENERATE_ALLOWED.isDisallowed(shapes[((entity.getFloorZ() & 15) << 4) | (entity.getFloorX() & 15)]))
                 continue;
             toClose0.add(entity);
         }
 
         for(BlockEntity blockEntity : new ArrayList<>(fullChunk.getBlockEntities().values())) {
-            if(!REGENERATE_ALLOWED.isAllowed(shapes[((blockEntity.getFloorZ() & 15) << 4) | (blockEntity.getFloorX() & 15)]))
+            if(REGENERATE_ALLOWED.isDisallowed(shapes[((blockEntity.getFloorZ() & 15) << 4) | (blockEntity.getFloorX() & 15)]))
                 continue;
             toClose1.add(blockEntity);
         }
@@ -143,7 +143,7 @@ private void preGenerateChunk(PlotManager plotManager, FullChunk fullChunk, Shap
         for(int xBlock = 0; xBlock < 16; ++xBlock) {
             for(int zBlock = 0; zBlock < 16; ++zBlock) {
                 final ShapeType shapeType = shapes[(zBlock << 4) | xBlock];
-                if(!allowedShapes.isAllowed(shapeType)) continue;
+                if(allowedShapes.isDisallowed(shapeType)) continue;
 
                 if(shapeType == ShapeType.PLOT) fullChunk.setBiomeId(xBlock, zBlock, levelSettings.getPlotBiome());
                 else fullChunk.setBiomeId(xBlock, zBlock, levelSettings.getRoadBiome());
diff --git a/src/main/java/de/kcodeyt/plotplugin/manager/PlotManager.java b/src/main/java/de/kcodeyt/plotplugin/manager/PlotManager.java
@@ -118,71 +118,22 @@ public Plot getMergedPlot(int x, int z) {
         Plot plot;
         if((plot = this.getPlot(x, z)) != null) return plot;
 
-        plot = this.getDiffPlot(x, z);
-
-        final Plot plotNearby = this.getPlotNN(x, z);
-        final int[] directions = this.getDirections(plot, plotNearby);
-
-        Plot current = plot;
-        boolean isMerged = true;
-        for(int direction : directions) {
-            if(!current.isMerged(direction)) {
-                isMerged = false;
-                break;
-            }
-
-            current = this.getPlotById(plot.getRelative(direction));
-        }
+        final int roadSize = this.levelSettings.getRoadSize();
+        if((plot = this.getPlot(x - roadSize, z)) != null && plot.isMerged(1)) return plot;
+        if((plot = this.getPlot(x, z - roadSize)) != null && plot.isMerged(2)) return plot;
+        if((plot = this.getPlot(x - roadSize, z - roadSize)) != null && plot.isMerged(5))
+            return plot;
 
-        if(isMerged) return plotNearby;
         return null;
     }
 
     public Plot getPlot(int x, int z) {
         final PlotVector plotVector = this.getPlotVectorByPos(x, z);
-        if(plotVector == null)
-            return null;
-        return this.getPlotById(plotVector.getX(), plotVector.getZ());
-    }
+        if(plotVector == null) return null;
 
-    private Plot getPlotNN(int x, int z) {
-        final PlotVector plotVector = this.getPlotVectorByPosNN(x, z);
         return this.getPlotById(plotVector.getX(), plotVector.getZ());
     }
 
-    private Plot getDiffPlot(int x, int z) {
-        final int plotSize = this.levelSettings.getPlotSize();
-        final int totalSize = plotSize + this.levelSettings.getRoadSize();
-        final int posX, posZ, difX, difZ;
-
-        if(x >= 0) {
-            posX = (int) Math.floor((float) x / totalSize);
-            difX = x % totalSize;
-        } else {
-            posX = (int) Math.ceil((float) (x - plotSize + 1) / totalSize);
-            difX = Math.abs((x - plotSize + 1) % totalSize);
-        }
-
-        if(z >= 0) {
-            posZ = (int) Math.floor((float) z / totalSize);
-            difZ = z % totalSize;
-        } else {
-            posZ = (int) Math.ceil((float) (z - plotSize + 1) / totalSize);
-            difZ = Math.abs((z - plotSize + 1) % totalSize);
-        }
-
-        final int addX = x >= 0 ? 1 : -1;
-        final int addZ = z >= 0 ? 1 : -1;
-
-        final Plot plot;
-        if(difX > plotSize - 1 && difZ > plotSize - 1) plot = this.getPlotByPlotPos(posX + addX, posZ + addZ);
-        else if(difX > plotSize - 1) plot = this.getPlotByPlotPos(posX + addX, posZ);
-        else if(difZ > plotSize - 1) plot = this.getPlotByPlotPos(posX, posZ + addZ);
-        else plot = this.getPlotByPlotPos(posX, posZ);
-
-        return plot;
-    }
-
     private PlotVector getPlotVectorByPos(int x, int z) {
         final int plotSize = this.levelSettings.getPlotSize();
         final int totalSize = plotSize + this.levelSettings.getRoadSize();
@@ -211,20 +162,6 @@ private PlotVector getPlotVectorByPos(int x, int z) {
         return new PlotVector(posX, posZ);
     }
 
-    private PlotVector getPlotVectorByPosNN(int x, int z) {
-        final int plotSize = this.levelSettings.getPlotSize();
-        final int totalSize = plotSize + this.levelSettings.getRoadSize();
-        final int posX, posZ;
-
-        if(x >= 0) posX = (int) Math.floor((float) x / totalSize);
-        else posX = (int) Math.ceil((float) (x - plotSize + 1) / totalSize);
-
-        if(z >= 0) posZ = (int) Math.floor((float) z / totalSize);
-        else posZ = (int) Math.ceil((float) (z - plotSize + 1) / totalSize);
-
-        return new PlotVector(posX, posZ);
-    }
-
     public Plot getPlotById(PlotVector plotVector) {
         return this.getPlotByPlotPos(plotVector.getX(), plotVector.getZ());
     }
@@ -314,74 +251,46 @@ public Set<Plot> getConnectedPlots(Plot plot) {
                 }
             }
         }
+
         return tmpSet;
     }
 
     public boolean startMerge(Plot plot, int dir) {
-        return this.startMerge(plot, dir, new HashSet<>());
-    }
-
-    public boolean startMerge(Plot plot, int dir, Set<PlotMerged> mergedSet) {
         if(!plot.hasOwner()) return false;
 
-        final PlotMerged plotMerged = new PlotMerged(plot, dir);
-        if(mergedSet.contains(plotMerged)) return false;
-        mergedSet.add(plotMerged);
+        final Plot relativePlot = this.getPlotById(plot.getRelative(dir));
 
-        final Set<Plot> visited = new HashSet<>();
-        final Set<PlotVector> merged = new HashSet<>();
-        final Set<Plot> connected = this.getConnectedPlots(plot);
-        for(Plot current : connected) merged.add(current.getPlotVector());
+        final List<Plot> plots = new ArrayList<>();
+        plots.addAll(this.getConnectedPlots(plot));
+        plots.addAll(this.getConnectedPlots(relativePlot));
 
-        final Queue<Plot> frontier = new ArrayDeque<>(connected);
-        Plot current;
         final WhenDone whenDone = new WhenDone(() -> {
-            this.finishPlotMerge(merged);
+            this.finishPlotMerge(plots);
             plot.recalculateOrigin();
 
-            for(PlotVector plotVector : merged)
-                if(!plotVector.equals(plot.getPlotVector()))
-                    this.mergePlotData(plot, this.getPlotById(plotVector));
+            for(Plot other : plots)
+                if(!other.equals(plot)) this.mergePlotData(plot, other);
 
             this.savePlots();
         });
 
-        boolean toReturn = false;
-        while((current = frontier.poll()) != null) {
-            if(!visited.add(current)) continue;
-
-            Set<Plot> nextPlots;
-            for(int iDir = 0; iDir < 4; iDir++) {
-                if((dir == -1 || dir == iDir) && !current.isMerged(iDir)) {
-                    final Plot other = this.getPlotById(current.getRelative(iDir));
-                    if(other.isOwner(plot.getOwner()) && (other.getBasePlot().equals(current.getBasePlot()) ||
-                            (nextPlots = this.getConnectedPlots(other)).size() > 0 && frontier.addAll(nextPlots))) {
-                        this.mergePlot(other, current, whenDone);
-                        merged.add(current.getPlotVector());
-                        merged.add(other.getPlotVector());
-                        toReturn = true;
-                    }
-                }
-            }
-        }
-
         int relativeDir;
-        for(Plot visitedPlot0 : visited) {
-            for(Plot visitedPlot1 : visited) {
-                if(!visitedPlot0.equals(visitedPlot1)) continue;
+        for(Plot toMerge0 : plots) {
+            for(Plot toMerge1 : plots) {
+                if(toMerge0.equals(toMerge1)) continue;
 
-                relativeDir = visitedPlot0.getRelativeDir(visitedPlot1.getPlotVector());
-                if(!visitedPlot0.isMerged(relativeDir))
-                    this.startMerge(visitedPlot0, relativeDir, mergedSet);
+                relativeDir = toMerge0.getRelativeDir(toMerge1.getPlotVector());
+                if(relativeDir != -1 && !toMerge0.isMerged(relativeDir))
+                    this.mergePlot(toMerge0, toMerge1, whenDone);
 
-                relativeDir = visitedPlot1.getRelativeDir(visitedPlot0.getPlotVector());
-                if(!visitedPlot1.isMerged(relativeDir))
-                    this.startMerge(visitedPlot1, relativeDir, mergedSet);
+                relativeDir = toMerge1.getRelativeDir(toMerge0.getPlotVector());
+                if(relativeDir != -1 && !toMerge1.isMerged(relativeDir))
+                    this.mergePlot(toMerge1, toMerge0, whenDone);
             }
         }
 
         whenDone.start();
-        return toReturn;
+        return true;
     }
 
     private void mergePlotData(Plot plotA, Plot plotB) {
@@ -409,13 +318,12 @@ private void mergePlotData(Plot plotA, Plot plotB) {
         }
     }
 
-    private void finishPlotMerge(Set<PlotVector> plots) {
+    private void finishPlotMerge(List<Plot> plots) {
         final BlockState claimBlock = this.levelSettings.getClaimPlotState();
         final BlockState wallBlock = this.levelSettings.getWallPlotState();
         final BlockState wallFillingBlock = this.levelSettings.getWallFillingState();
 
-        for(final PlotVector plotVector : plots) {
-            final Plot plot = this.getPlotById(plotVector);
+        for(Plot plot : plots) {
             this.changeBorder(plot, plot.hasOwner() ? claimBlock : wallBlock);
             this.changeWall(plot, wallFillingBlock);
         }
@@ -1012,23 +920,6 @@ else if(y == this.levelSettings.getGroundHeight())
         });
     }
 
-    private int[] getDirections(Plot plotA, Plot plotB) {
-        final int xA = plotA.getPlotVector().getX();
-        final int zA = plotA.getPlotVector().getZ();
-        final int xB = plotB.getPlotVector().getX();
-        final int zB = plotB.getPlotVector().getZ();
-
-        final List<Integer> directions = new ArrayList<>();
-        if(xA < xB) directions.add(1);
-        else if(xA > xB) directions.add(3);
-        if(zA < zB) directions.add(2);
-        else if(zA > zB) directions.add(0);
-
-        final int[] intArray = new int[directions.size()];
-        for(int i = 0; i < directions.size(); i++) intArray[i] = directions.get(i);
-        return intArray;
-    }
-
     public ShapeType[] getShapes(int x, int z) {
         final int totalSize = this.levelSettings.getTotalSize();
         final int plotSize = this.levelSettings.getPlotSize();
diff --git a/src/main/java/de/kcodeyt/plotplugin/schematic/Schematic.java b/src/main/java/de/kcodeyt/plotplugin/schematic/Schematic.java
@@ -36,8 +36,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
@@ -83,7 +81,7 @@ public void buildInChunk(TaskHelper taskHelper, Vector3 vector3, FullChunk fullC
                     final int bX = x & 15;
                     final int bZ = z & 15;
                     final ShapeType shapeType = shapes[(bZ << 4) | bX];
-                    if(!allowedShapes.isAllowed(shapeType)) continue;
+                    if(allowedShapes.isDisallowed(shapeType)) continue;
 
                     fullChunk.setBlockStateAtLayer(bX, y, bZ, 0, schematicBlock.getLayer0());
                     fullChunk.setBlockStateAtLayer(bX, y, bZ, 1, schematicBlock.getLayer1());
@@ -102,7 +100,7 @@ public void buildInChunk(TaskHelper taskHelper, Vector3 vector3, FullChunk fullC
                     final int bX = x & 15;
                     final int bZ = z & 15;
                     final ShapeType shapeType = shapes[(bZ << 4) | bX];
-                    if(!allowedShapes.isAllowed(shapeType)) continue;
+                    if(allowedShapes.isDisallowed(shapeType)) continue;
 
                     taskHelper.addSyncTask(() -> {
                         try {
diff --git a/src/main/java/de/kcodeyt/plotplugin/util/Allowed.java b/src/main/java/de/kcodeyt/plotplugin/util/Allowed.java
@@ -27,11 +27,11 @@ public Allowed(C... alloweds) {
         this.alloweds = alloweds;
     }
 
-    public boolean isAllowed(C c) {
-        for(final Object allowed : this.alloweds)
+    public boolean isDisallowed(C c) {
+        for(Object allowed : this.alloweds)
             if(Objects.equals(allowed, c))
-                return true;
-        return false;
+                return false;
+        return true;
     }
 
 }
diff --git a/src/main/java/de/kcodeyt/plotplugin/util/Plot.java b/src/main/java/de/kcodeyt/plotplugin/util/Plot.java
@@ -17,6 +17,7 @@
 package de.kcodeyt.plotplugin.util;
 
 import de.kcodeyt.plotplugin.manager.PlotManager;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -25,6 +26,7 @@
 
 @Setter
 @Getter
+@EqualsAndHashCode(exclude = {"plotManager", "origin"})
 public class Plot {
 
     public static Plot fromConfig(PlotManager plotManager, Map<String, Object> plotMap) {
@@ -165,8 +167,8 @@ public boolean isMerged(int direction) {
                 i = direction - 4;
                 i2 = direction - 3;
                 return this.isMerged(i2) && this.isMerged(i) && this.plotManager.getPlotById(this.getRelative(i)).isMerged(i2) && this.plotManager.getPlotById(this.getRelative(i2)).isMerged(i);
-
         }
+
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ public Allowed(C... alloweds) {`
`27`	`27`	`this.alloweds = alloweds;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public boolean isAllowed(C c) {`
`31`		`- for(final Object allowed : this.alloweds)`
	`30`	`+ public boolean isDisallowed(C c) {`
	`31`	`+ for(Object allowed : this.alloweds)`
`32`	`32`	`if(Objects.equals(allowed, c))`
`33`		`- return true;`
`34`		`- return false;`
	`33`	`+ return false;`
	`34`	`+ return true;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`}`