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

.github/CONTRIBUTING.md

@@ -1,2 +0,0 @@
-### Bugs
-Please provide a `/plot debugpaste` if you are reporting a bug.

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

@@ -0,0 +1,40 @@
+---
+name: Bug/Issue report for PlotSquared
+about: Bug / Issue report about this plugin
+title: ''
+labels: ''
+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. -->
+**[REQUIRED] PlotSquared Version Number:** <!--- Enter /plot version in game or in your console and copy the output here -->
+
+**[REQUIRED] Spigot/Paper Version Number:** 
+<!--- Run /version ingame or on console -->
+
+**[REQUIRED] Minecraft Version Number:** 
+
+**Links to worlds.yml file and settings.yml file:** 
+<!--- Copy and paste the information to the service of your choosing and provide the link here. -->
+
+**[REQUIRED] Description of the problem:** 
+
+**Any relevant console output or screenshots:**
+
+**Plugins being used on the server:**
+<!--- Optional but recommended --->
+
+**How to replicate:** 
+<!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
+
+**Checklist**:
+<!-- 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

Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java

@@ -63,7 +63,7 @@ import java.util.Map.Entry;
 
         if (args.length != 2 || !"-o".equals(args[1])) {
             MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
-                "/plot uuidconvert " + args[0] + " - o");
+                "/plot uuidconvert " + args[0] + " -o");
             MainUtil.sendMessage(player, "&cBe aware of the following!");
             MainUtil.sendMessage(player,
                 "&8 - &cUse the database command or another method to backup your plots beforehand");

Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java

@@ -1223,6 +1223,11 @@ import java.util.regex.Pattern;
                     event.setCancelled(true);
                 }
                 break;
+            case KELP:
+                if (Flags.KELP_GROW.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
         }
     }
 

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java

@@ -17,6 +17,8 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,11 +49,11 @@ import java.util.stream.Collectors;
                     "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
                         + "problem\n\n");
                 b.append("# Server Information\n");
-                b.append("server.version: ").append(PlotSquared.get().IMP.getServerImplementation())
+                b.append("Server Version: ").append(PlotSquared.get().IMP.getServerImplementation())
                     .append("\n");
                 b.append("online_mode: ").append(UUIDHandler.getUUIDWrapper()).append(';')
                     .append(!Settings.UUID.OFFLINE).append('\n');
-                b.append("plugins:");
+                b.append("Plugins:");
                 for (String id : PlotSquared.get().IMP.getPluginIds()) {
                     String[] split = id.split(":");
                     String[] split2 = split[0].split(";");
@@ -63,16 +65,15 @@ import java.util.stream.Collectors;
                 }
                 b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
                 Runtime runtime = Runtime.getRuntime();
-                b.append("memory.free: ").append(runtime.freeMemory()).append('\n');
-                b.append("memory.max: ").append(runtime.maxMemory()).append('\n');
-                b.append("java.specification.version: '")
-                    .append(System.getProperty("java.specification.version")).append("'\n");
-                b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n");
-                b.append("java.version: '").append(System.getProperty("java.version"))
-                    .append("'\n");
-                b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n");
-                b.append("os.name: '").append(System.getProperty("os.name")).append("'\n");
-                b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n");
+                RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
+                b.append("Free Memory: ").append(runtime.freeMemory() / 1024 / 1024 + " MB").append('\n');
+                b.append("Max Memory: ").append(runtime.maxMemory() / 1024 / 1024 + " MB").append('\n');
+                b.append("Java Name: ").append(rb.getVmName()).append('\n');
+                b.append("Java Version: '").append(System.getProperty("java.version")).append("'\n");
+                b.append("Java Vendor: '").append(System.getProperty("java.vendor")).append("'\n");
+                b.append("Operating System: '").append(System.getProperty("os.name")).append("'\n");
+                b.append("OS Version: ").append(System.getProperty("os.version")).append('\n');
+                b.append("OS Arch: ").append(System.getProperty("os.arch")).append('\n');
                 b.append("# Okay :D Great. You are now ready to create your bug report!");
                 b.append(
                     "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java

@@ -21,7 +21,7 @@ import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
                 MainUtil.sendMessage(player,
                     "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21");
                 MainUtil.sendMessage(player,
-                    "$2>> $1&lWiki$2: $1https://github.com/IntellectualCrafters/PlotSquared/wiki");
+                    "$2>> $1&lWiki$2: $1https://github.com/IntellectualSites/PlotSquared/wiki");
                 MainUtil.sendMessage(player,
                     "$2>> $1&lNewest Version$2: $1" + getNewestVersionString());
             }

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

@@ -46,6 +46,7 @@ public final class Flags {
     public static final BooleanFlag GRASS_GROW = new BooleanFlag("grass-grow");
     public static final BooleanFlag VINE_GROW = new BooleanFlag("vine-grow");
     public static final BooleanFlag MYCEL_GROW = new BooleanFlag("mycel-grow");
+    public static final BooleanFlag KELP_GROW = new BooleanFlag("kelp-grow");
     public static final BooleanFlag DISABLE_PHYSICS = new BooleanFlag("disable-physics");
     public static final BooleanFlag LIQUID_FLOW = new BooleanFlag("liquid-flow");
     public static final BooleanFlag SNOW_MELT = new BooleanFlag("snow-melt");

README.md

@@ -20,7 +20,7 @@ is to provide a lag-free and smooth experience.
 * [[Jenkins (Dev Builds)](https://ci.athion.net/job/PlotSquared-Breaking/)] [[Jenkins (Releases)](https://ci.athion.net/job/PlotSquared-Releases/)]
 * [Spigot Page](https://www.spigotmc.org/resources/plotsquared.1177/)
 * [Discord](https://discord.gg/ngZCzbU)
-* [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki)
+* [Wiki](https://github.com/IntellectualSites/PlotSquared/wiki)
 
 ### Developer Resources
 * [[JavaDoc](https://ci.athion.net/job/PlotSquared-Breaking/javadoc/)]

build.gradle

@@ -28,7 +28,7 @@ def revision = ""
 def buildNumber = ""
 def date = ""
 ext {
-    git = Grgit.open(dir: '.git')
+    git = Grgit.open(dir: new File(rootDir.toString()+'/.git'))
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
@@ -43,7 +43,6 @@ ext {
     }
 }
 
-// version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
 version = String.format("%s.%s", rootVersion, buildNumber)
 
 description = rootProject.name

pom.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.intellectualcrafters</groupId>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <artifactId>PlotSquared</artifactId>
-    <version>3.5.1-SNAPSHOT</version>
-    <name>PlotSquared</name>
-    <packaging>jar</packaging>
-    <build>
-        <finalName>PlotSquared-Bukkit-${project.version}</finalName>
-        <sourceDirectory>Bukkit/src</sourceDirectory>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-                <directory>Bukkit/src/main/resources/</directory>
-            </resource>
-            <resource>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-                <directory>Core/src/main/resources/</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/Sponge/src/main/**/*.*</exclude>
-                    </excludes>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>Core/src</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>http://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>sk80q</id>
-            <url>http://maven.sk89q.com/artifactory/repo/</url>
-        </repository>
-        <repository>
-            <id>vault</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases/</url>
-        </repository>
-        <repository>
-            <id>empcraft-repo</id>
-            <url>http://empcraft.com/maven2</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <version>6.0.0-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.5</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>