From 380309b15e559d4bd1f81f416d871991fe6c1809 Mon Sep 17 00:00:00 2001 From: Voinea Radu Date: Mon, 9 Sep 2024 20:33:48 +0300 Subject: [PATCH] Update project to use subproject as dependencies --- build.gradle.kts | 6 +++++- settings.gradle.kts | 2 +- src/common/build.gradle.kts | 16 ++++++++++++++++ .../build.gradle.kts | 16 ++++++++++++++++ .../fabric/command/FabricCommand.java | 4 ++-- .../fabric/manager/FabricCommandManager.java | 0 .../manager/FabricMiniMessageManager.java | 0 .../resources/assets/command_manager/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 src/velocity/build.gradle.kts | 18 ++++++++++++++++++ 10 files changed, 58 insertions(+), 4 deletions(-) rename src/{fabric_1_19 => fabric_20}/build.gradle.kts (60%) rename src/{fabric_1_19 => fabric_20}/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java (98%) rename src/{fabric_1_19 => fabric_20}/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricCommandManager.java (100%) rename src/{fabric_1_19 => fabric_20}/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricMiniMessageManager.java (100%) rename src/{fabric_1_19 => fabric_20}/src/main/resources/assets/command_manager/icon.png (100%) rename src/{fabric_1_19 => fabric_20}/src/main/resources/fabric.mod.json (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 7528f8d..ba043fe 100644 --- 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 index b63fd16..49628f2 100644 --- 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 index 70e18b1..80d2029 100644 --- 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 b/src/fabric_20/build.gradle.kts similarity index 60% rename from src/fabric_1_19/build.gradle.kts rename to src/fabric_20/build.gradle.kts index c52ed24..5991fd7 100644 --- a/src/fabric_1_19/build.gradle.kts +++ b/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/src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java b/src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java similarity index 98% rename from src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java rename to src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java index ab49037..2da1253 100644 --- a/src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java +++ b/src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/command/FabricCommand.java @@ -114,7 +114,7 @@ public LiteralArgumentBuilder getCommandBuilder(@NotNull Str ArgumentBuilder 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 getCommandBuilder(@NotNull Str } } - then = arguments.get(0); + then = arguments.getFirst(); } else { command.executes(this::internalExecute); } diff --git a/src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricCommandManager.java b/src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricCommandManager.java similarity index 100% rename from src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricCommandManager.java rename to src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricCommandManager.java diff --git a/src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricMiniMessageManager.java b/src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricMiniMessageManager.java similarity index 100% rename from src/fabric_1_19/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricMiniMessageManager.java rename to src/fabric_20/src/main/java/com/voinearadu/commandmanager/fabric/manager/FabricMiniMessageManager.java diff --git a/src/fabric_1_19/src/main/resources/assets/command_manager/icon.png b/src/fabric_20/src/main/resources/assets/command_manager/icon.png similarity index 100% rename from src/fabric_1_19/src/main/resources/assets/command_manager/icon.png rename to src/fabric_20/src/main/resources/assets/command_manager/icon.png diff --git a/src/fabric_1_19/src/main/resources/fabric.mod.json b/src/fabric_20/src/main/resources/fabric.mod.json similarity index 100% rename from src/fabric_1_19/src/main/resources/fabric.mod.json rename to src/fabric_20/src/main/resources/fabric.mod.json diff --git a/src/velocity/build.gradle.kts b/src/velocity/build.gradle.kts index 7d3fb98..207abda 100644 --- 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) }