fix: allow all characters in plot-title flag

Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java

@@ -174,9 +174,8 @@ public class HybridPlotManager extends ClassicPlotManager {
                     for (int y = 0; y < blocks.length; y++) {
                         if (blocks[y] != null) {
                             queue.setBlock(x, minY + y, z, blocks[y]);
-                        } else if (!isRoad) {
+                        } else {
                             // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear
-                            //  Do not set air for road as this may cause cavernous roads when debugroadregen is used
                             queue.setBlock(x, minY + y, z, airBlock);
                         }
                     }

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -21,6 +21,7 @@ package com.plotsquared.core.generator;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.intellectualsites.annotations.DoNotUse;
+import com.intellectualsites.annotations.NotPublic;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.Settings;
@@ -74,9 +75,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public short PATH_WIDTH_UPPER;
     public HashMap<Integer, BaseBlock[]> G_SCH;
     public HashMap<Integer, BiomeType> G_SCH_B;
-    /**
-     * The Y level at which schematic generation will start, lowest of either road or plot schematic generation.
-     */
     public int SCHEM_Y;
     private Location SIGN_LOCATION;
     private File root = null;
@@ -269,64 +267,34 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int oddshift = (this.ROAD_WIDTH & 1);
 
         SCHEM_Y = schematicStartHeight();
-
-        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other without causing AIOOB
-        //  exceptions when attempting either to set blocks to, or get block from G_SCH
-        // Default plot schematic start height, normalized to the minimum height schematics are pasted from.
         int plotY = PLOT_HEIGHT - SCHEM_Y;
         int minRoadWall = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? Math.min(ROAD_HEIGHT, WALL_HEIGHT) : ROAD_HEIGHT;
-        // Default road schematic start height, normalized to the minimum height schematics are pasted from.
         int roadY = minRoadWall - SCHEM_Y;
 
-        int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
-
-        int maxSchematicHeight = 0;
-        int plotSchemHeight = 0;
+        int worldHeight = getMaxGenHeight() - getMinGenHeight() + 1;
 
         // SCHEM_Y should be normalised to the plot "start" height
         if (schematic3 != null) {
-            plotSchemHeight = maxSchematicHeight = schematic3.getClipboard().getDimensions().getY();
-            if (maxSchematicHeight == worldGenHeight) {
-                SCHEM_Y = getMinGenHeight();
-                plotY = 0;
+            if (schematic3.getClipboard().getDimensions().getY() == worldHeight) {
+                SCHEM_Y = plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
-                SCHEM_Y = getMinBuildHeight();
-                plotY = 0;
+                SCHEM_Y = plotY = getMinBuildHeight() - getMinGenHeight();
             }
         }
 
-        int roadSchemHeight;
-
         if (schematic1 != null) {
-            roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
-            maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
-            if (maxSchematicHeight == worldGenHeight) {
-                SCHEM_Y = getMinGenHeight();
-                roadY = 0; // Road is the lowest schematic
-                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
-                    // Road is the lowest schematic. Normalize plotY to it.
-                    if (Settings.Schematics.PASTE_ON_TOP) {
-                        plotY = PLOT_HEIGHT - getMinGenHeight();
-                    } else {
-                        plotY = getMinBuildHeight() - getMinGenHeight();
-                    }
+            if (schematic1.getClipboard().getDimensions().getY() == worldHeight) {
+                SCHEM_Y = roadY = getMinGenHeight();
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
+                        && !Settings.Schematics.PASTE_ON_TOP) {
+                    plotY = PLOT_HEIGHT;
                 }
             } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
-                if (SCHEM_Y == getMinGenHeight()) { // Only possible if plot schematic is enabled
-                    // Plot is still the lowest schematic, normalize roadY to it
-                    roadY = getMinBuildHeight() - getMinGenHeight();
-                } else if (schematic3 != null) {
-                    SCHEM_Y = getMinBuildHeight();
-                    roadY = 0;// Road is the lowest schematic
-                    if (Settings.Schematics.PASTE_ON_TOP) {
-                        // Road is the lowest schematic. Normalize plotY to it.
-                        plotY = PLOT_HEIGHT - getMinBuildHeight();
-                    }
-                    maxSchematicHeight = Math.max(maxSchematicHeight, plotY + plotSchemHeight);
+                SCHEM_Y = roadY = getMinBuildHeight();
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
+                        && !Settings.Schematics.PASTE_ON_TOP) {
+                    plotY = PLOT_HEIGHT;
                 }
-            } else {
-                roadY = minRoadWall - SCHEM_Y;
-                maxSchematicHeight = Math.max(maxSchematicHeight, roadY + roadSchemHeight);
             }
         }
 
@@ -363,15 +331,17 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                                 y + min.getBlockY(),
                                 z + min.getBlockZ()
                         ));
-                        schem3PopulationNeeded |= id.hasNbtData();
-                        addOverlayBlock(
-                                (short) (x + shift + oddshift + centerShiftX),
-                                (short) (y + plotY),
-                                (short) (z + shift + oddshift + centerShiftZ),
-                                id,
-                                false,
-                                maxSchematicHeight
-                        );
+                        if (!id.getBlockType().getMaterial().isAir()) {
+                            schem3PopulationNeeded |= id.hasNbtData();
+                            addOverlayBlock(
+                                    (short) (x + shift + oddshift + centerShiftX),
+                                    (short) (y + plotY),
+                                    (short) (z + shift + oddshift + centerShiftZ),
+                                    id,
+                                    false,
+                                    h3
+                            );
+                        }
                     }
                     if (blockArrayClipboard3.hasBiomes()) {
                         BiomeType biome = blockArrayClipboard3.getBiome(BlockVector2.at(
@@ -421,23 +391,18 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                             y + min.getBlockY(),
                             z + min.getBlockZ()
                     ));
-                    schem1PopulationNeeded |= id.hasNbtData();
-                    addOverlayBlock(
-                            (short) (x - shift),
-                            (short) (y + roadY),
-                            (short) (z + shift + oddshift),
-                            id,
-                            false,
-                            maxSchematicHeight
-                    );
-                    addOverlayBlock(
-                            (short) (z + shift + oddshift),
-                            (short) (y + roadY),
-                            (short) (shift - x + (oddshift - 1)),
-                            id,
-                            true,
-                            maxSchematicHeight
-                    );
+                    if (!id.getBlockType().getMaterial().isAir()) {
+                        schem1PopulationNeeded |= id.hasNbtData();
+                        addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z + shift + oddshift), id, false, h1);
+                        addOverlayBlock(
+                                (short) (z + shift + oddshift),
+                                (short) (y + roadY),
+                                (short) (shift - x + (oddshift - 1)),
+                                id,
+                                true,
+                                h1
+                        );
+                    }
                 }
                 if (blockArrayClipboard1.hasBiomes()) {
                     BiomeType biome = blockArrayClipboard1.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
@@ -465,15 +430,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                             y + min.getBlockY(),
                             z + min.getBlockZ()
                     ));
-                    schem2PopulationNeeded |= id.hasNbtData();
-                    addOverlayBlock(
-                            (short) (x - shift),
-                            (short) (y + roadY),
-                            (short) (z - shift),
-                            id,
-                            false,
-                            maxSchematicHeight
-                    );
+                    if (!id.getBlockType().getMaterial().isAir()) {
+                        schem2PopulationNeeded |= id.hasNbtData();
+                        addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z - shift), id, false, h2);
+                    }
                 }
                 if (blockArrayClipboard2.hasBiomes()) {
                     BiomeType biome = blockArrayClipboard2.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
@@ -483,10 +443,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
     }
 
-    /**
-     * @deprecated This method should not be available for public API usage and will be made private.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
             z += this.SIZE;
@@ -506,22 +462,13 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         if (y >= height) {
             if (y > lastOverlayHeightError) {
                 lastOverlayHeightError = y;
-                LOGGER.error(
-                        "Error adding overlay block in world {}. `y > height`. y={}, height={}",
-                        getWorldName(),
-                        y,
-                        height
-                );
+                LOGGER.error(String.format("Error adding overlay block. `y > height`. y=%s, height=%s", y, height));
             }
             return;
         }
         existing[y] = id;
     }
 
-    /**
-     * @deprecated This method should not be available for public API usage and will be made private.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBiome(short x, short z, BiomeType id) {
         if (z < 0) {
             z += this.SIZE;

Core/src/main/java/com/plotsquared/core/util/StringMan.java

@@ -36,7 +36,8 @@ import java.util.regex.Pattern;
 
 public class StringMan {
 
-    private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("(?<quoted>\"[\\w ]+\")|(?<single>\\w+)");
+    // Stolen from https://stackoverflow.com/a/366532/12620913 | Debug: https://regex101.com/r/DudJLb/1
+    private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("[^\\s\"]+|\"([^\"]*)\"");
 
     public static String replaceFromMap(String string, Map<String, String> replacements) {
         StringBuilder sb = new StringBuilder(string);
@@ -355,7 +356,7 @@ public class StringMan {
         var matcher = StringMan.STRING_SPLIT_PATTERN.matcher(message);
         List<String> splitMessages = new ArrayList<>();
         while (matcher.find()) {
-            splitMessages.add(matcher.group(0).replaceAll("\"", ""));
+            splitMessages.add(matcher.group(matcher.groupCount() - 1).replaceAll("\"", ""));
         }
         return splitMessages;
     }

Core/src/test/java/com/plotsquared/core/plot/FlagTest.java

@@ -101,7 +101,7 @@ public class FlagTest {
     public void shouldSuccessfullyParseTitleFlagWithTitleEmptyAndSubTitleSingleWord() {
         Assertions.assertDoesNotThrow(() -> {
             var title = PlotTitleFlag.TITLE_FLAG_DEFAULT.parse("\"\" \"single\"").getValue();
-            Assertions.assertEquals(" ", title.title());
+            Assertions.assertEquals("", title.title());
             Assertions.assertEquals("single", title.subtitle());
         }, "Should not throw a FlagParseException");
     }

Core/src/test/java/com/plotsquared/core/util/StringManTest.java

@@ -32,7 +32,9 @@ public class StringManTest {
                 new Message("title", List.of("title")),
                 new Message("title \"sub title\"", List.of("title", "sub title")),
                 new Message("\"a title\" subtitle", List.of("a title", "subtitle")),
-                new Message("\"title\" \"subtitle\"", List.of("title", "subtitle"))
+                new Message("\"title\" \"subtitle\"", List.of("title", "subtitle")),
+                new Message("\"How <bold>bold</bold> of you\" \"to assume I like <rainbow>rainbows</rainbow>\"",
+                        List.of("How <bold>bold</bold> of you", "to assume I like <rainbow>rainbows</rainbow>"))
         );
 
         for (Message message : messages) {