Initial CivGradle2

Author: AngrySoundTech

build.gradle.kts

@@ -1,59 +1,33 @@
-import net.civmc.civgradle.common.util.civRepo
+import net.civmc.civgradle.CivGradleExtension
 
 plugins {
-	`java-library`
-	`maven-publish`
-	id("net.civmc.civgradle.plugin") version "1.0.0-SNAPSHOT"
-}
-
-// Temporary hack:
-// Remove the root build directory
-gradle.buildFinished {
-	project.buildDir.deleteRecursively()
-}
-
-allprojects {
-	group = "net.civmc.citadel"
-	version = "5.0.0-SNAPSHOT"
-	description = "Citadel"
+	id("net.civmc.civgradle") version "2.+" apply false
 }
 
 subprojects {
-	apply(plugin = "net.civmc.civgradle.plugin")
 	apply(plugin = "java-library")
 	apply(plugin = "maven-publish")
+	apply(plugin = "net.civmc.civgradle")
 
-	java {
-		toolchain {
-			languageVersion.set(JavaLanguageVersion.of(17))
-		}
+	configure<CivGradleExtension> {
+		pluginName = project.property("pluginName") as String
 	}
 
 	repositories {
 		mavenCentral()
-
-		maven("https://papermc.io/repo/repository/maven-public/")
+		maven("https://repo.civmc.net/repository/maven-public")
+		maven("https://repo.aikar.co/content/groups/aikar/")
+		maven("https://libraries.minecraft.net")
 		maven("https://repo.codemc.io/repository/maven-public/")
-
-		civRepo("CivMC/CivModCore")
-		civRepo("CivMC/NameLayer")
-	}
-
-	publishing {
-		repositories {
-			maven {
-				name = "GitHubPackages"
-				url = uri("https://maven.pkg.github.com/CivMC/Citadel")
-				credentials {
-					username = System.getenv("GITHUB_ACTOR")
-					password = System.getenv("GITHUB_TOKEN")
-				}
-			}
-		}
-		publications {
-			register<MavenPublication>("gpr") {
-				from(components["java"])
+		maven {
+			name = "GitHubPackages"
+			url = uri("https://maven.pkg.github.com/CivMC/NameLayer")
+			credentials {
+				username = System.getenv("GITHUB_ACTOR")
+				password = System.getenv("GITHUB_TOKEN")
 			}
 		}
+
+		maven("https://jitpack.io")
 	}
 }

gradle.properties

@@ -0,0 +1,7 @@
+# Gradle properties
+group = net.civmc.citadel
+version = 2.0.0-SNAPSHOT
+description = Citadel
+
+# Custom Properties
+pluginName = Citadel

paper/build.gradle.kts

@@ -1,13 +1,6 @@
 plugins {
-	`java-library`
-	id("net.civmc.civgradle.plugin")
-	id("io.papermc.paperweight.userdev") version "1.3.1"
-}
-
-civGradle {
-	paper {
-		pluginName = "Citadel"
-	}
+	id("net.civmc.civgradle")
+	id("io.papermc.paperweight.userdev")
 }
 
 dependencies {

paper/src/main/java/vg/civcraft/mc/citadel/command/AreaReinforce.java

@@ -1,11 +1,7 @@
 package vg.civcraft.mc.citadel.command;
 
 import co.aikar.commands.BaseCommand;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.annotation.Syntax;
+import co.aikar.commands.annotation.*;
 import java.util.UUID;
 import org.bukkit.ChatColor;
 import org.bukkit.block.Block;
@@ -25,6 +21,7 @@ public class AreaReinforce extends BaseCommand {
 	@Syntax("<group> <lowX> <lowY> <lowZ> <highX> <highY> <highZ>")
 	@Description("Using the reinforcement item in your main hand, reinforces an area to your default or a target group.")
 	@CommandCompletion("@CT_Groups @nothing @nothing @nothing @nothing @nothing @nothing")
+	@CommandPermission("citadel.admin")
 	public void execute(Player p, @Optional String targetGroup, String minX, String minY, String minZ, String maxX, String maxY, String maxZ) {
 		UUID uuid = NameAPI.getUUID(p.getName());
 		ReinforcementType reinType = Citadel.getInstance().getReinforcementTypeManager()

settings.gradle.kts

@@ -1,17 +1,12 @@
-rootProject.name = "citadel"
-
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
+		maven("https://repo.civmc.net/repository/maven-public/")
 		maven("https://papermc.io/repo/repository/maven-public/")
-		maven {
-		  	url = uri("https://maven.pkg.github.com/CivMC/CivGradle")
-		  	credentials {
-			  	username = System.getenv("GITHUB_ACTOR")
-			  	password = System.getenv("GITHUB_TOKEN")
-		 	}
-	  	}
-  	}
+	}
 }
 
+rootProject.name = "citadel"
+
 include(":paper")
+project(":paper").name = rootProject.name + "-paper"