Merge remote-tracking branch 'origin/breaking' into breaking

.github/ISSUE_TEMPLATE/bug-issue-report-for-plotsquared.md

@@ -2,37 +2,89 @@
 name: Bug/Issue report for PlotSquared
 about: Bug / Issue report about this plugin
 title: ''
-labels: ''
+labels: "[?] Testing Required"
 assignees: ''
 
 ---
 
-__*NOTICE: Bukkit/Spigot versions 1.7.10 to 1.12.2 are considered legacy and will receive limited support. Please consider upgrading to 1.13 for future support. Plugins exist for 1.13+ that bring back old behaviors found in 1.8*__
-# Bug report template 
-<!--- In order to create a valid issue report you have to follow this template. -->
-<!--- Incomplete reports might be marked as invalid. -->
-<!--  Feature requests and enhancements may be suggested at https://github.com/IntellectualSites/PlotSquaredSuggestions. -->
+<!--- READ THIS BEFORE SUBMITTING AN ISSUE REPORT!!! -->
 
-**Debug paste link:** 
-<!--- Enter /plot debugpaste in game or in your console and copy the output here -->
-**[REQUIRED] Spigot/Paper Version Number:** 
-<!--- Run /version ingame or on console -->
+<!--- ##### DO NOT REMOVE THIS TEMPLATE!  YOUR ISSUE *WILL* FIT IN IT! ##### -->
 
-**[REQUIRED] Minecraft Version Number:** 
+# NOTICE: 
+```diff
+! PlotSquared for Minecraft Java Edition versions between 1.7 through to 1.12.2 are considered
+! legacy, and will receive limited to no support. Please consider upgrading to 1.13+ for
+! future support.  Plugins exist for 1.13+ which bring back behaviors found in 1.8.8
+! All versions of PlotSquared for Sponge and Nukkit(X) will recieve limited to no support
+! due to lack of developer interest and time. Additionally, NukkitX has not had feature
+! updates since the Better Together, which prevents some PlotSquared features from ever
+! functioning.  Contributions are always welcome however!
+```
 
-**[REQUIRED] Description of the problem:** 
+**Feature requests & Suggestions are to be submitted at the [PlotSquared Suggestions tracker](https://github.com/IntellectualSites/PlotSquaredSuggestions)**
 
-**Any relevant console output or screenshots:**
+**Code contributions are to be done through [PRs](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request), tagging the specific issue ticket(s) if applicable.**
 
-**Plugins being used on the server:**
-<!--- Optional but recommended --->
+**[DISCORD INVITE LINK](https://discord.gg/cSMxtGn)** and please, for the love of the little sanity we have left, use the correct channels!
 
-**[REQUIRED] How to replicate:** 
+# BUG REPORT TEMPLATE:
+<!--- Incomplete reports will most likely be marked as invalid, and closed, with few exceptions.-->
+## Required Information section:
+> ALL FIELDS  IN THIS SECTION ARE REQUIRED, and must contain appropriate information
+### Server config info (Debug/file paste links):
+<!--- Issue /plot debugpaste in game or in your console and copy the supplied URL here -->
+<!--- If you cannot perform the above, we require logs/latest.log; settings.yml; worlds.yml and possibly PlotSquared.use_THIS.yml -->
+<!--- If you are unwilling to supply the information we need, we reserve the right to not assist you. Redact IP addresses if you need to. -->
+
+
+### Server type:
+**select one**
+<!-- Select the type you are reporting the issue for (put an "X" between of brackets): -->
+- [ ] Spigot / Paper *(CraftBukkit should not be used, re-test with Spigot first!)*
+- [ ] Sponge *- NOTE: NOT ACTIVELY MAINTAINED*
+- [ ] NukkitX *- NOTE: NOT ACTIVELY MAINTAINED*
+
+### Minecraft Version:
+**select one**
+<!-- Select the type you are reporting the issue for (put an "X" between of brackets): -->
+- [ ] Minecraft 1.14.4 ***This is the ONLY actively maintained target for PlotSquared***
+- [ ] Minecraft 1.13.2
+- [ ] Minecraft Java Edition *other versions, please specify*:
+- [ ] Minecraft Bedrock Edition *speicify version*:
+
+### Server build info: 
+<!--- Run /version in-game or in console & paste the full output here: -->
+``` paste here, between the tick marks, replacing this text ```
+
+### WorldEdit/FAWE versions:
+<!--- Specify which plugin you are using, and add its version -->
+- [ ] FAWE *version*:
+- [ ] WorldEdit *version*: 
+
+### Description of the problem:
+<!--- Be as specific as possible.  Don't lie, redact information, or use false names/situations. -->
+<!--- Who, What, When, Where, Why, How, Expected behavior, Resultant behavior, etc -->
+
+### How to replicate:
 <!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
 
-**[REQUIRED] Checklist**:
+## Additional Information:
+> The information here is optional for you to provide, however it may help us to more readily diagnose any compatibility and bug issues.
+
+### Other plugins being used on the server:
+<!--- Optional but recommended - issue "/plugins" in-game or in console and copy/paste the list -->
+
+### Relevant console output, log lines, and/or screenshots:
+<!--- Please use in-line code insertion ( ```like this``` ) for short (20 lines or less) text blobs, or a paste service for large blobs -->
+
+### Additional relevant comments/remarks:
+<!--- Use this space to give us any additional information which may be relevant to this issue, such as: if you are using a Minecraft hosting provider; unusual installation environment; etc -->
+
+# AFFIRMATION OF COMPLETION:
 <!-- Make sure you have completed the following steps (put an "X" between of brackets): -->
-- [] I included all information required in the sections above
-- [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/PlotSquared/issues?utf8=%E2%9C%93&q=is%3Aissue)
-- [] I made sure I am using an up-to-date version of PlotSquared
-- [] I made sure the bug/error is not caused by any other plugin
+- [ ] I included all information required in the sections above
+- [ ] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/PlotSquared/issues?utf8=%E2%9C%93&q=is%3Aissue)
+- [ ] I made sure I am using an up-to-date version of PlotSquared
+- [ ] I made sure the bug/error is not caused by any other plugin
+- [x] I didn't read but checked everything above.

Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java

@@ -698,11 +698,11 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             }
         }
         if (Settings.UUID.OFFLINE) {
-            PlotSquared.log(Captions.PREFIX + " &6" + getPluginName()
+            PlotSquared.log(Captions.PREFIX + "&6" + getPluginName()
                 + " is using Offline Mode UUIDs either because of user preference, or because you are using an old version of "
                 + "Bukkit");
         } else {
-            PlotSquared.log(Captions.PREFIX + "" + getPluginName() + " is using online UUIDs");
+            PlotSquared.log(Captions.PREFIX + "&6" + getPluginName() + " is using online UUIDs");
         }
         if (Settings.UUID.USE_SQLUUIDHANDLER) {
             return new SQLUUIDHandler(wrapper);

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java

@@ -548,7 +548,21 @@ public enum Captions {
     FLAG_CATEGORY_BOOLEAN("Boolean Flags", "Flags"),
     FLAG_CATEGORY_MIXED("Mixed Value Flags", "Flags"),
     //</editor-fold>
-
+    //<editor-fold desc="Flag category errors">
+    FLAG_ERROR_BOOLEAN("Flag value must be a boolean (true|false)", "Flags"),
+    FLAG_ERROR_ENUM("Must be one of: %s", "Flags"),
+    FLAG_ERROR_GAMEMODE("Flag value must be a gamemode: 'survival', 'creative', 'adventure' or 'spectator.", "Flags"),
+    FLAG_ERROR_INTEGER("Flag value must be a whole number", "Flags"),
+    FLAG_ERROR_INTEGER_LIST("Flag value must be an integer list", "Flags"),
+    FLAG_ERROR_INTERVAL("Value(s) must be numeric. /plot set flag <flag> <interval> [amount]", "Flags"),
+    FLAG_ERROR_KEEP("Flag value must be a timestamp or a boolean", "Flags"),
+    FLAG_ERROR_LONG("Flag value must be a whole number (large numbers allowed)", "Flags"),
+    FLAG_ERROR_PLOTBLOCKLIST("Flag value must be a block list", "Flags"),
+    FLAG_ERROR_PRICE("Flag value must be a positive number.", "Flags"),
+    FLAG_ERROR_STRING("Flag value must be alphanumeric. Some special characters are allowed.", "Flags"),
+    FLAG_ERROR_STRINGLIST("Flag value must be a string list", "Flags"),
+    FLAG_ERROR_WEATHER("Flag must be a weather: 'rain' or 'sun'", "Flags"),
+    //</editor-fold>
     //<editor-fold desc="Trusted">
     TRUSTED_ADDED("$4You successfully trusted a user to the plot", "Trusted"),
     WAS_NOT_ADDED("$2That player was not trusted on this plot", "Trusted"),

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java

@@ -31,7 +31,7 @@ public class BooleanFlag extends Flag<Boolean> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a boolean (true|false)";
+        return Captions.FLAG_ERROR_BOOLEAN.getTranslated();
     }
 
     public boolean isTrue(Plot plot) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java

@@ -22,6 +22,6 @@ public class DoubleFlag extends Flag<Double> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a number.";
+        return Captions.FLAG_ERROR_BOOLEAN.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java

@@ -28,6 +28,6 @@ public class EnumFlag extends Flag<String> {
     }
 
     @Override public String getValueDescription() {
-        return "Must be one of: " + StringMan.getString(values);
+        return Captions.FLAG_ERROR_ENUM.getTranslated() + StringMan.getString(values);
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java

@@ -40,7 +40,7 @@ public final class Flags {
         }
 
         @Override public String getValueDescription() {
-            return "Flag value must be a positive number.";
+            return Captions.FLAG_ERROR_PRICE.getTranslated();
         }
     };
     public static final BooleanFlag EXPLOSION = new BooleanFlag("explosion");
@@ -114,7 +114,7 @@ public final class Flags {
         }
 
         @Override public String getValueDescription() {
-            return "Flag value must be a timestamp or a boolean";
+            return Captions.FLAG_ERROR_KEEP.getTranslated();
         }
     };
     public static final TeleportDenyFlag DENY_TELEPORT = new TeleportDenyFlag("deny-teleport");

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java

@@ -37,6 +37,6 @@ public class GameModeFlag extends Flag<PlotGameMode> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a gamemode: 'survival', 'creative', 'adventure' or 'spectator'";
+        return Captions.FLAG_ERROR_GAMEMODE.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java

@@ -10,7 +10,7 @@ public class IntegerFlag extends Flag<Integer> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a whole number";
+        return Captions.FLAG_ERROR_INTEGER.getTranslated();
     }
 
     @Override public String valueToString(Object value) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java

@@ -27,6 +27,6 @@ public class IntegerListFlag extends ListFlag<List<Integer>> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be an integer list";
+        return Captions.FLAG_ERROR_INTEGER_LIST.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java

@@ -40,7 +40,7 @@ public class IntervalFlag extends Flag<IntervalFlag.Interval> {
     }
 
     @Override public String getValueDescription() {
-        return "Value(s) must be numeric. /plot set flag <flag> <interval> [amount]";
+        return Captions.FLAG_ERROR_INTERVAL.getTranslated();
     }
 
     @EqualsAndHashCode @RequiredArgsConstructor @Getter public static final class Interval {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java

@@ -21,6 +21,6 @@ public class LongFlag extends Flag<Long> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a whole number (large numbers allowed)";
+        return Captions.FLAG_ERROR_LONG.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java

@@ -29,6 +29,6 @@ public class PlotBlockListFlag extends ListFlag<HashSet<PlotBlock>> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a block list";
+        return Captions.FLAG_ERROR_PLOTBLOCKLIST.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java

@@ -31,6 +31,6 @@ public class PlotWeatherFlag extends Flag<PlotWeather> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag must be a weather: 'rain' or 'sun'";
+        return Captions.FLAG_ERROR_WEATHER.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java

@@ -18,6 +18,6 @@ public class StringFlag extends Flag<String> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be alphanumeric. Some special characters are allowed.";
+        return Captions.FLAG_ERROR_STRING.getTranslated();
     }
 }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java

@@ -22,6 +22,6 @@ public class StringListFlag extends ListFlag<List<String>> {
     }
 
     @Override public String getValueDescription() {
-        return "Flag value must be a string list";
+        return Captions.FLAG_ERROR_STRINGLIST.getTranslated();
     }
 }