From 517557d9f3b7cf320246e869951d50de987533cf Mon Sep 17 00:00:00 2001 From: rotgruengelb Date: Sat, 4 Nov 2023 14:05:32 +0100 Subject: [PATCH 1/4] dependency changes --- build.gradle | 2 +- gradle.properties | 3 +-- src/main/resources/fabric.mod.json | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2d0997e..f1b2077 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ allprojects { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}" - include(modImplementation("net.fabricmc.fabric-api:fabric-command-api-v2:${project.fabric_command_api_version}")) + include(modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version))) } processResources { diff --git a/gradle.properties b/gradle.properties index 6ad5867..27c5cc4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,4 @@ maven_group=net.rotgruengelb archives_base_name=quirl # Dependencies -# fabric_version=0.83.0+1.20 -fabric_command_api_version=2.2.9+fb8d95da7d +fabric_version=0.83.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c2757ed..63eea9b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,6 +24,7 @@ "depends": { "fabricloader": ">=0.14.22", "minecraft": "1.20.X", - "java": ">=17" + "java": ">=17", + "fabric-command-api-v2": "*" } } From d4d701349e94438b7f0c3dbd02bcc7281ed4a504 Mon Sep 17 00:00:00 2001 From: rotgruengelb Date: Sat, 4 Nov 2023 14:19:49 +0100 Subject: [PATCH 2/4] dependency changes --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index f1b2077..7bf678a 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ allprojects { mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}" include(modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version))) + include(modImplementation(fabricApi.module("fabric-api-base", project.fabric_version))) } processResources { From 6641531de5ccc3a82e2cec4ec755be7a4d209b19 Mon Sep 17 00:00:00 2001 From: rotgruengelb Date: Sat, 4 Nov 2023 19:45:41 +0100 Subject: [PATCH 3/4] Velocity Command Permssions; is now 1.20.2 only; Version now 2.0.2+1.20.2 --- build.gradle | 8 ++++++-- gradle.properties | 14 +++++++------- .../quirl/internal/command/CommandNodes.java | 3 ++- src/main/resources/fabric.mod.json | 5 ++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 7bf678a..2fedd36 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { def ENV = System.getenv() def publishType = System.getenv("PUBLISH_TYPE") - version = "${project.mod_version}+${rootProject.mod_minecraft_base_version}" + version = "${project.mod_version}+${project.mod_minecraft_base_version}" if (publishType == "SNAPSHOT") { version = "${project.mod_version}+${rootProject.mod_minecraft_base_version}-SNAPSHOT" @@ -27,12 +27,16 @@ allprojects { options.compilerArgs << "-Xlint:unchecked" } + repositories { + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + } + dependencies { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}" include(modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version))) - include(modImplementation(fabricApi.module("fabric-api-base", project.fabric_version))) + include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) } processResources { diff --git a/gradle.properties b/gradle.properties index 27c5cc4..6b2553b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,20 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx4G org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20 -yarn_mappings=1.20+build.1 -loader_version=0.14.22 +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.4 +loader_version=0.14.24 # Mod Properties -mod_version=2.0.1 -mod_minecraft_base_version=1.20.X +mod_version=2.0.2 +mod_minecraft_base_version=1.20.2 # Maven/Publishing maven_group=net.rotgruengelb archives_base_name=quirl # Dependencies -fabric_version=0.83.0+1.20 +fabric_version=0.90.7+1.20.2 diff --git a/src/main/java/net/rotgruengelb/quirl/internal/command/CommandNodes.java b/src/main/java/net/rotgruengelb/quirl/internal/command/CommandNodes.java index 5f0c41b..8598633 100644 --- a/src/main/java/net/rotgruengelb/quirl/internal/command/CommandNodes.java +++ b/src/main/java/net/rotgruengelb/quirl/internal/command/CommandNodes.java @@ -1,6 +1,7 @@ package net.rotgruengelb.quirl.internal.command; import com.mojang.brigadier.arguments.FloatArgumentType; +import me.lucko.fabric.api.permissions.v0.Permissions; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.server.command.CommandManager; @@ -12,7 +13,7 @@ public static void registerModCommandNodes() { var floatArgType = FloatArgumentType.floatArg(); - var velocityNode = CommandManager.literal("velocity").build(); + var velocityNode = CommandManager.literal("velocity").requires(Permissions.require("quirl.command.velocity", 2)).build(); var targetsArg = CommandManager.argument("targets", EntityArgumentType.entities()).build(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 63eea9b..55385ab 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,7 @@ ], "depends": { "fabricloader": ">=0.14.22", - "minecraft": "1.20.X", - "java": ">=17", - "fabric-command-api-v2": "*" + "minecraft": "1.20.2", + "java": ">=17" } } From c0d76f9cdea7cfa28b27f2692da9b8031f88fd78 Mon Sep 17 00:00:00 2001 From: rotgruengelb Date: Sat, 4 Nov 2023 19:58:33 +0100 Subject: [PATCH 4/4] commit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 2fedd36..94d764c 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,7 @@ allprojects { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}" + include(modImplementation(fabricApi.module("fabric-api-base", project.fabric_version))) include(modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version))) include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) }