Merge branch 'v6' into chore/v6/v7-removal-deprecations

.github/workflows/announce-release-on-discord.yml

@@ -11,7 +11,7 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           DISCORD_USERNAME: PlotSquared Release
           DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
-        uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2
+        uses: Ilshidur/action-discord@0c4b27844ba47cb1c7bee539c8eead5284ce9fa9 # ratchet:Ilshidur/action-discord@0.3.2
         with:
           args: |
             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java

@@ -71,7 +71,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Dispenser;
-import org.bukkit.block.data.type.Farmland;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -710,33 +709,20 @@ public class BlockEventListener implements Listener {
         Block block = event.getBlock();
         Location location = BukkitUtil.adapt(block.getLocation());
         PlotArea area = location.getPlotArea();
-
         if (area == null) {
             return;
         }
-
         Plot plot = area.getOwnedPlot(location);
-
         if (plot == null) {
             event.setCancelled(true);
             return;
         }
-
-        if (block.getBlockData() instanceof Farmland farmland && event.getNewState().getBlockData() instanceof Farmland newFarmland) {
-            int currentMoisture = farmland.getMoisture();
-            int newMoisture = newFarmland.getMoisture();
-
-            // farmland gets moisturizes
-            if (newMoisture > currentMoisture) {
-                return;
+        Material blockType = block.getType();
+        if (blockType == Material.FARMLAND) {
+            if (!plot.getFlag(SoilDryFlag.class)) {
+                plot.debug("Soil could not dry because soil-dry = false");
+                event.setCancelled(true);
             }
-
-            if (plot.getFlag(SoilDryFlag.class)) {
-                return;
-            }
-
-            plot.debug("Soil could not dry because soil-dry = false");
-            event.setCancelled(true);
         }
     }
 

Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java

@@ -74,30 +74,65 @@ public class ComponentPreset implements ConfigurationSerializable {
         );
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#component()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public ClassicPlotManagerComponent getComponent() {
         return this.component;
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#pattern()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public String getPattern() {
         return this.pattern;
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#cost()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public double getCost() {
         return this.cost;
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#permission()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public String getPermission() {
         return this.permission;
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#displayName()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public String getDisplayName() {
         return this.displayName;
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#description()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public List<String> getDescription() {
         return this.description;
     }
 
+    /**
+     * @deprecated {@link ComponentPreset} class will be replaced by a record in the next major update. This method will become
+     *         {@code ComponentPreset#icon()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public ItemType getIcon() {
         return this.icon;
     }

Core/src/main/java/com/plotsquared/core/configuration/Config.java

@@ -52,7 +52,7 @@ public class Config {
      * @return value
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     @SuppressWarnings("unchecked")
     public static <T> T get(String key, Class<?> root) {
         String[] split = key.split("\\.");
@@ -450,7 +450,7 @@ public class Config {
         /**
          * @deprecated Unused internally. Scheduled for removal in next major release.
          */
-        @Deprecated(forRemoval = true, since = "6.11.1")
+        @Deprecated(forRemoval = true, since = "TODO")
         public Collection<String> getSections() {
             return INSTANCES.keySet();
         }

Core/src/main/java/com/plotsquared/core/events/EntityEvent.java

@@ -22,7 +22,7 @@ import com.sk89q.worldedit.entity.Entity;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
- * @since 6.11.1
+ * @since TODO
  */
 public abstract class EntityEvent {
 

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

@@ -383,7 +383,7 @@ public class HybridUtils {
     /**
      * @deprecated Unused internally and poor implementation. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public int checkModified(QueueCoordinator queue, int x1, int x2, int y1, int y2, int z1, int z2, BlockState[] blocks) {
         int count = 0;
         for (int y = y1; y <= y2; y++) {

Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java

@@ -23,8 +23,25 @@ import com.plotsquared.core.util.StringMan;
 
 public class ChunkWrapper {
 
+    /**
+     * @deprecated {@link ChunkWrapper} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code ChunkWrapper#x()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final int x;
+
+    /**
+     * @deprecated {@link ChunkWrapper} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code ChunkWrapper#z()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final int z;
+
+    /**
+     * @deprecated {@link ChunkWrapper} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code ChunkWrapper#world()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final String world;
 
     public ChunkWrapper(String world, int x, int z) {

Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java

@@ -82,7 +82,7 @@ public class PlotSettings {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release. Use {@link PlotSettings#setMerged(Direction, boolean)}
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public boolean setMerged(int direction, boolean merged) {
         if (this.merged[direction] != merged) {
             this.merged[direction] = merged;

Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java

@@ -22,11 +22,45 @@ import com.plotsquared.core.plot.PlotId;
 
 public class PlotComment {
 
+    /**
+     * @deprecated {@link PlotComment} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code PlotComment#comment()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final String comment;
+
+    /**
+     * @deprecated {@link PlotComment} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code PlotComment#inbox()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final String inbox;
+
+    /**
+     * @deprecated {@link PlotComment} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code PlotComment#senderName()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final String senderName;
+
+    /**
+     * @deprecated {@link PlotComment} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code PlotComment#id()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final PlotId id;
+
+    /**
+     * @deprecated {@link PlotComment} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code PlotComment#world()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final String world;
+    /**
+     * @deprecated {@link PlotComment} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code PlotComment#timestamp()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final long timestamp;
 
     public PlotComment(

Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java

@@ -86,10 +86,20 @@ public abstract class TimedFlag<T, F extends PlotFlag<TimedFlag.Timed<T>, F>>
             this.value = value;
         }
 
+        /**
+         * @deprecated {@link Timed} class will be replaced by a record in the next major update. This method will become
+         *         {@code Timed#interval()}
+         */
+        @Deprecated(forRemoval = true, since = "TODO")
         public int getInterval() {
             return interval;
         }
 
+        /**
+         * @deprecated {@link Timed} class will be replaced by a record in the next major update. This method will become
+         *         {@code Timed#value()}
+         */
+        @Deprecated(forRemoval = true, since = "TODO")
         public T getValue() {
             return value;
         }

Core/src/main/java/com/plotsquared/core/setup/SettingsNodesWrapper.java

@@ -43,10 +43,20 @@ public class SettingsNodesWrapper {
         return this.settingsNodes.length == 0 ? this.afterwards : new SettingsNodeStep(this.settingsNodes[0], 0, this);
     }
 
+    /**
+     * @deprecated {@link SettingsNodesWrapper} class will be replaced by a record in the next major update. This method will become
+     *         {@code SettingsNodesWrapper#settingsNodes()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public ConfigurationNode[] getSettingsNodes() {
         return this.settingsNodes;
     }
 
+    /**
+     * @deprecated {@link SettingsNodesWrapper} class will be replaced by a record in the next major update. This method will become
+     *         {@code SettingsNodesWrapper#afterwards()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public SetupStep getAfterwards() {
         return this.afterwards;
     }

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

@@ -116,7 +116,7 @@ public final class BlockUtil {
      * @return Parsed block states
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static @NonNull BlockState[] parse(final @NonNull String commaDelimited) {
         final String[] split = commaDelimited.split(",(?![^\\(\\[]*[\\]\\)])");
         final BlockState[] result = new BlockState[split.length];
@@ -134,7 +134,7 @@ public final class BlockUtil {
      *         not a properly serialized block state
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
         if (map.containsKey("material")) {
             final Object object = map.get("material");

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

@@ -116,7 +116,7 @@ public class ChunkUtil {
      * @return {@code true} if the region pos1-pos2 contains the chunk
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isWholeChunk(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockVector2 chunk) {
         int x1 = pos1.getX();
         int z1 = pos1.getZ();

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

@@ -20,7 +20,18 @@ package com.plotsquared.core.util;
 
 public class FileBytes {
 
+    /**
+     * @deprecated {@link FileBytes} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code FileBytes#path()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final String path;
+
+    /**
+     * @deprecated {@link FileBytes} class will be replaced by a record in the next major update. This variable will be
+     *         accessible using {@code FileBytes#data()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final byte[] data;
 
     public FileBytes(String path, byte[] data) {

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

@@ -73,7 +73,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static long pairInt(int x, int y) {
         return (((long) x) << 32) | (y & 0xffffffffL);
     }
@@ -81,7 +81,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static int unpairIntX(long pair) {
         return (int) (pair >> 32);
     }
@@ -89,7 +89,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static int unpairIntY(long pair) {
         return (int) pair;
     }
@@ -97,7 +97,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static byte pair16(byte x, byte y) {
         return (byte) (x + (y << 4));
     }
@@ -105,7 +105,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static byte unpair16x(byte value) {
         return (byte) (value & 0xF);
     }
@@ -113,7 +113,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static byte unpair16y(byte value) {
         return (byte) ((value >> 4) & 0xF);
     }
@@ -121,7 +121,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static long inverseRound(double val) {
         long round = Math.round(val);
         return (long) (round + Math.signum(val - round));
@@ -130,7 +130,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static int sqrt(int x) {
         int xn;
 
@@ -210,7 +210,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static double getMean(double[] array) {
         double count = 0;
         for (double i : array) {
@@ -231,7 +231,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static short unpairX(int hash) {
         return (short) (hash >> 16);
     }
@@ -239,7 +239,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static short unpairY(int hash) {
         return (short) (hash & 0xFFFF);
     }
@@ -252,7 +252,7 @@ public class MathMan {
      * @return x, y, z unit vector
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static float[] getDirection(float yaw, float pitch) {
         double pitch_sin = Math.sin(pitch);
         return new float[]{(float) (pitch_sin * Math.cos(yaw)),
@@ -262,7 +262,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static int floorMod(int x, int y) {
         int i = x % y;
         if (i < 0) {
@@ -284,7 +284,7 @@ public class MathMan {
      * @return pitch and yaw of x,y,z from 0,0,0
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static float[] getPitchAndYaw(float x, float y, float z) {
         float distance = sqrtApprox((z * z) + (x * x));
         return new float[]{atan2(y, distance), atan2(x, z)};
@@ -293,7 +293,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static final float atan2(float y, float x) {
         float add;
         float mul;
@@ -332,7 +332,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static float sqrtApprox(float f) {
         return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
     }
@@ -341,7 +341,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static double sqrtApprox(double d) {
         return Double
                 .longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
@@ -350,7 +350,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static float invSqrt(float x) {
         float xhalf = 0.5f * x;
         int i = Float.floatToIntBits(x);
@@ -394,7 +394,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static double getSD(double[] array, double av) {
         double sd = 0;
         for (double element : array) {
@@ -414,7 +414,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static int mod(int x, int y) {
         if (isPowerOfTwo(y)) {
             return x & (y - 1);
@@ -425,7 +425,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static int unsignedmod(int x, int y) {
         if (isPowerOfTwo(y)) {
             return x & (y - 1);
@@ -436,7 +436,7 @@ public class MathMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isPowerOfTwo(int number) {
         return (number & (number - 1)) == 0;
     }

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

@@ -98,7 +98,7 @@ public class RegionUtil {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static @NonNull Rectangle2D toRectangle(final @NonNull CuboidRegion region) {
         final BlockVector2 min = region.getMinimumPoint().toBlockVector2();
         final BlockVector2 max = region.getMaximumPoint().toBlockVector2();

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

@@ -42,7 +42,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static String replaceFromMap(String string, Map<String, String> replacements) {
         StringBuilder sb = new StringBuilder(string);
         int size = string.length();
@@ -77,7 +77,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static String getString(Object obj) {
         if (obj == null) {
             return "null";
@@ -113,7 +113,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static String replaceFirst(char c, String s) {
         if (s == null) {
             return "";
@@ -143,7 +143,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static String replaceAll(String string, Object... pairs) {
         StringBuilder sb = new StringBuilder(string);
         for (int i = 0; i < pairs.length; i += 2) {
@@ -163,7 +163,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isAlphanumeric(String str) {
         for (int i = 0; i < str.length(); i++) {
             char c = str.charAt(i);
@@ -188,7 +188,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isAlpha(String str) {
         for (int i = 0; i < str.length(); i++) {
             char c = str.charAt(i);
@@ -212,7 +212,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static String join(Collection<?> collection, char delimiter) {
         return join(collection.toArray(), delimiter + "");
     }
@@ -220,7 +220,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isAsciiPrintable(char c) {
         return (c >= ' ') && (c < '');
     }
@@ -228,7 +228,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isAsciiPrintable(String s) {
         for (char c : s.toCharArray()) {
             if (!isAsciiPrintable(c)) {
@@ -288,7 +288,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static String join(int[] array, String delimiter) {
         Integer[] wrapped = new Integer[array.length];
         for (int i = 0; i < array.length; i++) {
@@ -300,7 +300,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isEqualToAny(String a, String... args) {
         for (String arg : args) {
             if (StringMan.isEqual(a, arg)) {
@@ -331,7 +331,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean isEqualIgnoreCase(String a, String b) {
         return a.equals(b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
                 .equalsIgnoreCase(b));
@@ -346,7 +346,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean contains(String name, char c) {
         for (char current : name.toCharArray()) {
             if (c == current) {
@@ -359,7 +359,7 @@ public class StringMan {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public <T> Collection<T> match(Collection<T> col, String startsWith) {
         if (col == null) {
             return null;

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

@@ -61,7 +61,7 @@ public class WEManager {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dy, double dz) {
         int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
         int y = Math.toIntExact(Math.round(dy - 0.5));
@@ -77,7 +77,7 @@ public class WEManager {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dz) {
         int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
         int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
@@ -127,7 +127,7 @@ public class WEManager {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean intersects(CuboidRegion region1, CuboidRegion region2) {
         return RegionUtil.intersects(region1, region2);
     }
@@ -135,7 +135,7 @@ public class WEManager {
     /**
      * @deprecated Unused internally. Scheduled for removal in next major release.
      */
-    @Deprecated(forRemoval = true, since = "6.11.1")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean regionContains(CuboidRegion selection, HashSet<CuboidRegion> mask) {
         for (CuboidRegion region : mask) {
             if (intersects(region, selection)) {

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -310,6 +310,11 @@ public final class PlaceholderRegistry {
             this.placeholder = placeholder;
         }
 
+        /**
+         * @deprecated {@link PlaceholderAddedEvent} class will be replaced by a record in the next major update. This method will become
+         *         {@code PlaceholderAddedEvent#placeholder()}
+         */
+        @Deprecated(forRemoval = true, since = "TODO")
         public Placeholder getPlaceholder() {
             return this.placeholder;
         }

Core/src/main/java/com/plotsquared/core/uuid/UUIDMapping.java

@@ -36,10 +36,20 @@ public class UUIDMapping {
         this.username = username;
     }
 
+    /**
+     * @deprecated {@link UUIDMapping} class will be replaced by a record in the next major update. This method will become
+     *         {@code UUIDMapping#username()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public @NonNull String getUsername() {
         return this.username;
     }
 
+    /**
+     * @deprecated {@link UUIDMapping} class will be replaced by a record in the next major update. This method will become
+     *         {@code UUIDMapping#uuid()}
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public @NonNull UUID getUuid() {
         return this.uuid;
     }

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.11.1"
+version = "6.11.1-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""

gradle/libs.versions.toml

@@ -14,7 +14,7 @@ mvdwapi = "3.1.1"
 prtree = "2.0.1"
 aopalliance = "1.0"
 cloud-services = "1.8.2"
-arkitektonika = "2.1.2"
+arkitektonika = "2.1.1"
 squirrelid = "0.3.1"
 http4j = "1.3"
 

renovate.json

@@ -4,7 +4,6 @@
     "config:base",
     ":semanticCommitsDisabled"
   ],
-  "labels": ["dependencies"],
-  "rebaseWhen": "conflicted",
-  "schedule": ["on the first day of the week"]
+  "labels": ["Renovate"],
+  "rebaseWhen": "conflicted"
 }