Merge pull request #104 from PokeNinjas/master

Update project to use subproject as dependencies
Radu-Voinea · Sep 9, 2024 · 1a5526b · 1a5526b
2 parents d834ab1 + 380309b
commit 1a5526b
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,11 @@ group = _group
 
 fun DependencyHandlerScope.applyDependencies() {
     // Dependencies
-    api(libs.voinearadu.utils)
+    if(project.properties["com.voinearadu.utils.local"] != null){
+        api(project(project.properties["com.voinearadu.utils.local"] as String))
+    }else{
+        api("com.voinearadu:utils:1.1.5")
+    }
 
     // Annotations
     compileOnly(libs.lombok)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,7 +18,7 @@ fun defineProject(module: String, path: String) {
 }
 
 defineProject(":command-manager-common", "src/common")
-defineProject(":command-manager-fabric-1-19", "src/fabric_1_19")
+defineProject(":command-manager-fabric-20", "src/fabric_20")
 defineProject(":command-manager-velocity", "src/velocity")
 // TODO: Spigot (Bukkit) Support
 // TODO: Force Support
diff --git a/src/common/build.gradle.kts b/src/common/build.gradle.kts
@@ -1,5 +1,21 @@
 dependencies {
     // Dependencies
+    if (project.properties["com.voinearadu.utils.local"] != null) {
+        api(project(project.properties["com.voinearadu.utils.local"] as String))
+    } else {
+        api("com.voinearadu:utils:1.1.5")
+    }
     api(libs.luckperms)
     api(libs.kyori.minimessage)
+
+    // Annotations
+    compileOnly(libs.lombok)
+    annotationProcessor(libs.lombok)
+    testCompileOnly(libs.lombok)
+    testAnnotationProcessor(libs.lombok)
+
+    compileOnly(libs.jetbrains.annotations)
+    annotationProcessor(libs.jetbrains.annotations)
+    testCompileOnly(libs.jetbrains.annotations)
+    testAnnotationProcessor(libs.jetbrains.annotations)
 }
diff --git a/src/fabric_1_19/build.gradle.kts → src/fabric_20/build.gradle.kts b/src/fabric_1_19/build.gradle.kts → src/fabric_20/build.gradle.kts
@@ -19,8 +19,24 @@ dependencies {
     api(project(":command-manager-common"))
 
     // Dependencies
+    if (project.properties["com.voinearadu.utils.local"] != null) {
+        api(project(project.properties["com.voinearadu.utils.local"] as String))
+    } else {
+        api("com.voinearadu:utils:1.1.5")
+    }
     api(libs.luckperms)
     modApi(libs.kyori.adventure.fabric)
+
+    // Annotations
+    compileOnly(libs.lombok)
+    annotationProcessor(libs.lombok)
+    testCompileOnly(libs.lombok)
+    testAnnotationProcessor(libs.lombok)
+
+    compileOnly(libs.jetbrains.annotations)
+    annotationProcessor(libs.jetbrains.annotations)
+    testCompileOnly(libs.jetbrains.annotations)
+    testAnnotationProcessor(libs.jetbrains.annotations)
 }
 
 tasks {

diff --git a/...manager/fabric/command/FabricCommand.java → ...manager/fabric/command/FabricCommand.java b/...manager/fabric/command/FabricCommand.java → ...manager/fabric/command/FabricCommand.java
@@ -114,7 +114,7 @@ public LiteralArgumentBuilder<CommandSourceStack> getCommandBuilder(@NotNull Str
         ArgumentBuilder<CommandSourceStack, ?> then = null;
 
         if (!arguments.isEmpty()) {
-            arguments.get(arguments.size() - 1).executes(this::internalExecute);
+            arguments.getLast().executes(this::internalExecute);
 
             if (arguments.size() != 1) {
                 for (int index = arguments.size() - 2; index >= 0; index--) {
@@ -126,7 +126,7 @@ public LiteralArgumentBuilder<CommandSourceStack> getCommandBuilder(@NotNull Str
                 }
             }
 
-            then = arguments.get(0);
+            then = arguments.getFirst();
         } else {
             command.executes(this::internalExecute);
         }

diff --git a/.../fabric/manager/FabricCommandManager.java → .../fabric/manager/FabricCommandManager.java b/.../fabric/manager/FabricCommandManager.java → .../fabric/manager/FabricCommandManager.java
diff --git a/...ric/manager/FabricMiniMessageManager.java → ...ric/manager/FabricMiniMessageManager.java b/...ric/manager/FabricMiniMessageManager.java → ...ric/manager/FabricMiniMessageManager.java
diff --git a/...resources/assets/command_manager/icon.png → ...resources/assets/command_manager/icon.png b/...resources/assets/command_manager/icon.png → ...resources/assets/command_manager/icon.png
diff --git a/...c_1_19/src/main/resources/fabric.mod.json → ...ric_20/src/main/resources/fabric.mod.json b/...c_1_19/src/main/resources/fabric.mod.json → ...ric_20/src/main/resources/fabric.mod.json
diff --git a/src/velocity/build.gradle.kts b/src/velocity/build.gradle.kts
@@ -7,5 +7,23 @@ dependencies {
 
     // Project
     api(project(":command-manager-common"))
+
+    // Dependencies
+    if (project.properties["com.voinearadu.utils.local"] != null) {
+        api(project(project.properties["com.voinearadu.utils.local"] as String))
+    } else {
+        api("com.voinearadu:utils:1.1.5")
+    }
+
+    // Annotations
+    compileOnly(libs.lombok)
+    annotationProcessor(libs.lombok)
+    testCompileOnly(libs.lombok)
+    testAnnotationProcessor(libs.lombok)
+
+    compileOnly(libs.jetbrains.annotations)
+    annotationProcessor(libs.jetbrains.annotations)
+    testCompileOnly(libs.jetbrains.annotations)
+    testAnnotationProcessor(libs.jetbrains.annotations)
 }