Cloud Command System Migration (#279)

Co-authored-by: Alexander Brandes <mc.cache@web.de>
IntellectualSites · Oct 15, 2023 · efa25e4 · efa25e4
1 parent 2ec75f3
commit efa25e4
Show file tree

Hide file tree

Showing 185 changed files with 7,246 additions and 5,052 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,6 +36,12 @@ dependencies {
     compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit")
     compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
 
+    // Cloud command system
+    implementation(libs.cloudcore)
+    implementation(libs.cloudannotations)
+    implementation(libs.cloudbukkit)
+    implementation(libs.cloudpaper)
+
     // Third party
     implementation("dev.notmyfault.serverlib:ServerLib")
     implementation("org.bstats:bstats-base")
@@ -97,6 +103,8 @@ tasks {
         this.archiveClassifier.set(null as String?)
         this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
         this.destinationDirectory.set(rootProject.tasks.shadowJar.get().destinationDirectory.get())
+        relocate("cloud.commandframework", "com.thevoxelbox.voxelsniper.cloud")
+        relocate("io.leangen.geantyref", "com.thevoxelbox.geantyref")
         relocate("org.incendo.serverlib", "com.thevoxelbox.voxelsniper.serverlib")
         relocate("org.bstats", "com.thevoxelbox.voxelsniper.metrics")
         relocate("io.papermc.lib", "com.thevoxelbox.voxelsniper.paperlib")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,6 +2,9 @@
 # Annotations
 annotations = "24.0.1"
 
+# Cloud command system
+cloud = "1.8.4"
+
 # Gradle plugins
 shadow = "8.1.1"
 pluginyml = "0.6.0"
@@ -14,6 +17,12 @@ hangar = "0.1.0"
 # Annotations
 annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
 
+# Cloud command system
+cloudcore = { group = "cloud.commandframework", name = "cloud-core", version.ref = "cloud" }
+cloudannotations = { group = "cloud.commandframework", name = "cloud-annotations", version.ref = "cloud" }
+cloudbukkit = { group = "cloud.commandframework", name = "cloud-bukkit", version.ref = "cloud" }
+cloudpaper = { group = "cloud.commandframework", name = "cloud-paper", version.ref = "cloud" }
+
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 pluginyml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }

diff --git a/src/main/java/com/thevoxelbox/voxelsniper/BrushRegistrar.java b/src/main/java/com/thevoxelbox/voxelsniper/BrushRegistrar.java
@@ -277,8 +277,8 @@ private void registerBlockResetBrush() {
         BrushProperties properties = BrushProperties.builder()
                 .name("Block Reset")
                 .permission("voxelsniper.brush.blockreset")
-                .alias("brb")
-                .alias("blockresetbrush")
+                .alias("br")
+                .alias("blockreset")
                 .alias("block_reset")
                 .brushPatternType(BrushPatternType.ANY)
                 .creator(BlockResetBrush::new)
@@ -290,8 +290,8 @@ private void registerBlockResetSurfaceBrush() {
         BrushProperties properties = BrushProperties.builder()
                 .name("Block Reset Surface")
                 .permission("voxelsniper.brush.blockresetsurface")
-                .alias("brbs")
-                .alias("blockresetbrushsurface")
+                .alias("brs")
+                .alias("blockresetsurface")
                 .alias("block_reset_surface")
                 .brushPatternType(BrushPatternType.ANY)
                 .creator(BlockResetSurfaceBrush::new)
@@ -429,8 +429,8 @@ private void registerDomeBrush() {
         BrushProperties properties = BrushProperties.builder()
                 .name("Dome")
                 .permission("voxelsniper.brush.dome")
+                .alias("do")
                 .alias("dome")
-                .alias("domebrush")
                 .brushPatternType(BrushPatternType.PATTERN)
                 .creator(DomeBrush::new)
                 .build();
@@ -441,6 +441,7 @@ private void registerDrainBrush() {
         BrushProperties properties = BrushProperties.builder()
                 .name("Drain")
                 .permission("voxelsniper.brush.drain")
+                .alias("dr")
                 .alias("drain")
                 .brushPatternType(BrushPatternType.ANY)
                 .creator(DrainBrush::new)
@@ -515,7 +516,9 @@ private void registerErodeBlendBrush() {
                 .permission("voxelsniper.brush.erodeblend")
                 .alias("eb")
                 .alias("erodeblend")
+                .alias("erode_blend")
                 .alias("erodeblendball")
+                .alias("erode_blend_ball")
                 .brushPatternType(BrushPatternType.ANY)
                 .creator(ErodeBlendBrush::new)
                 .build();
@@ -604,6 +607,7 @@ private void registerJaggedLineBrush() {
                 .permission("voxelsniper.brush.jaggedline")
                 .alias("j")
                 .alias("jagged")
+                .alias("jaggedline")
                 .alias("jagged_line")
                 .brushPatternType(BrushPatternType.PATTERN)
                 .creator(JaggedLineBrush::new)
@@ -723,7 +727,7 @@ private void registerRandomErodeBrush() {
                 .permission("voxelsniper.brush.randomerode")
                 .alias("re")
                 .alias("randomerode")
-                .alias("randome_rode")
+                .alias("random_erode")
                 .brushPatternType(BrushPatternType.ANY)
                 .creator(RandomErodeBrush::new)
                 .build();
@@ -734,8 +738,8 @@ private void registerRegenerateChunkBrush() {
         BrushProperties properties = BrushProperties.builder()
                 .name("Regenerate Chunk")
                 .permission("voxelsniper.brush.regeneratechunk")
-                .alias("gc")
-                .alias("generatechunk")
+                .alias("rc")
+                .alias("regeneratechunk")
                 .alias("regenerate_chunk")
                 .brushPatternType(BrushPatternType.ANY)
                 .creator(RegenerateChunkBrush::new)
@@ -760,6 +764,7 @@ private void registerRotation2DBrush() {
                 .name("Rotation 2D")
                 .permission("voxelsniper.brush.rot2d")
                 .alias("rot2")
+                .alias("rot2d")
                 .alias("rotation2d")
                 .alias("rotation_2d")
                 .brushPatternType(BrushPatternType.ANY)
@@ -773,6 +778,7 @@ private void registerRotation2DVerticalBrush() {
                 .name("Rotation 2D Vertical")
                 .permission("voxelsniper.brush.rot2dvert")
                 .alias("rot2v")
+                .alias("rot2dv")
                 .alias("rotation2dvertical")
                 .alias("rotation_2d_vertical")
                 .brushPatternType(BrushPatternType.ANY)
@@ -786,6 +792,7 @@ private void registerRotation3DBrush() {
                 .name("Rotation 3D")
                 .permission("voxelsniper.brush.rot3d")
                 .alias("rot3")
+                .alias("rot3d")
                 .alias("rotation3d")
                 .alias("rotation_3d")
                 .brushPatternType(BrushPatternType.ANY)
@@ -942,7 +949,7 @@ private void registerSplatterBallBrush() {
                 .name("Splatter Ball")
                 .permission("voxelsniper.brush.splatterball")
                 .alias("sb")
-                .alias("splatball")
+                .alias("splatterball")
                 .alias("splatter_ball")
                 .brushPatternType(BrushPatternType.PATTERN)
                 .creator(SplatterBallBrush::new)
@@ -955,7 +962,7 @@ private void registerSplatterDiscBrush() {
                 .name("Splatter Disc")
                 .permission("voxelsniper.brush.splatterdisc")
                 .alias("sd")
-                .alias("splatdisc")
+                .alias("splatterdisc")
                 .alias("splatter_disc")
                 .brushPatternType(BrushPatternType.PATTERN)
                 .creator(SplatterDiscBrush::new)
@@ -994,7 +1001,7 @@ private void registerSplatterVoxelDiscBrush() {
                 .name("Splatter Voxel Disc")
                 .permission("voxelsniper.brush.splattervoxeldisc")
                 .alias("svd")
-                .alias("splatvoxeldisc")
+                .alias("splattervoxeldisc")
                 .alias("splatter_voxel_disc")
                 .brushPatternType(BrushPatternType.PATTERN)
                 .creator(SplatterVoxelDiscBrush::new)