feat: add a permission requirement to /plot merge all

Bukkit/build.gradle.kts

@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    api(projects.plotsquaredCore)
+    api(projects.plotSquaredCore)
 
     // Metrics
     implementation("org.bstats:bstats-bukkit")
@@ -62,7 +62,7 @@ tasks.processResources {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
-    dependsOn(":plotsquared-core:shadowJar")
+    dependsOn(":PlotSquared-Core:shadowJar")
     dependencies {
         exclude(dependency("org.checkerframework:"))
     }

Core/src/main/java/com/plotsquared/core/command/Merge.java

@@ -109,7 +109,7 @@ public class Merge extends SubCommand {
                 }
             }
             if (direction == null && (args[0].equalsIgnoreCase("all") || args[0]
-                    .equalsIgnoreCase("auto"))) {
+                    .equalsIgnoreCase("auto")) && player.hasPermission(Permission.PERMISSION_MERGE_ALL)) {
                 direction = Direction.ALL;
             }
         }

Core/src/main/java/com/plotsquared/core/permissions/Permission.java

@@ -45,6 +45,7 @@ public enum Permission implements ComponentLike {
     PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield"),
     PERMISSION_ADMIN_COMMANDS_CHATSPY("plots.admin.command.chatspy"),
     PERMISSION_MERGE("plots.merge"),
+    PERMISSION_MERGE_ALL("plots.merge.all"),
     PERMISSION_MERGE_OTHER("plots.merge.other"),
     PERMISSION_MERGE_KEEP_ROAD("plots.merge.keeproad"),
     PERMISSION_ADMIN_CAPS_OTHER("plots.admin.caps.other"),

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
     id("xyz.jpenilla.run-paper") version "2.1.0"
 }
 
-group = "com.intellectualsites.plotsquared"
+group = "com.plotsquared"
 version = "7.0.0-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
@@ -210,7 +210,7 @@ subprojects {
 }
 
 nexusPublishing {
-    this.repositories {
+    repositories {
         sonatype {
             nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
             snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
@@ -227,7 +227,7 @@ tasks {
     supportedVersions.forEach {
         register<RunServer>("runServer-$it") {
             minecraftVersion(it)
-            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
+            pluginJars(*project(":PlotSquared-Bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
                     .toTypedArray())
             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
             group = "run paper"

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "PlotSquared"
 
 include("Core", "Bukkit")
 
-project(":Core").name = "plotsquared-core"
-project(":Bukkit").name = "plotsquared-bukkit"
+project(":Core").name = "PlotSquared-Core"
+project(":Bukkit").name = "PlotSquared-Bukkit"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")