From ff58d80b93834f4cd251b7a14592789c3221f3b4 Mon Sep 17 00:00:00 2001 From: jamesx0416 Date: Tue, 7 Oct 2025 16:57:28 +1100 Subject: [PATCH 1/2] change: Update to 1.21.9 --- build.gradle | 29 +++++++++---------- gradle.properties | 8 ++--- .../command/impl/FunctionProcessor.java | 8 ++--- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index bb4666a..40b139f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id 'fabric-loom' version '1.11-SNAPSHOT' id 'maven-publish' - id 'io.github.juuxel.loom-quiltflower' version '1.10.0' } java { @@ -45,33 +44,33 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // Permissions API - include(modImplementation("me.lucko:fabric-permissions-api:0.4.0")) + include(modImplementation("me.lucko:fabric-permissions-api:0.5.0")) + + // Placeholders API + modImplementation include("eu.pb4:placeholder-api:2.8.0+1.21.9") // LevelDB include(implementation("org.iq80.leveldb:leveldb:0.12")) include(implementation("org.iq80.leveldb:leveldb-api:0.12")) // MySQL - include(implementation("mysql:mysql-connector-java:8.0.33")) + include(implementation("com.mysql:mysql-connector-j:9.4.0")) // Redis - include(implementation("redis.clients:jedis:5.1.2")) - include(implementation("org.apache.commons:commons-pool2:2.12.0")) + include(implementation("redis.clients:jedis:6.2.0")) + //include(implementation("org.apache.commons:commons-pool2:2.12.1")) // Parsing Libraries - include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.17.1")) - include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1")) - include(implementation("org.yaml:snakeyaml:2.2")) - include(implementation("com.fasterxml.jackson.core:jackson-core:2.17.1")) - include(implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")) - include(implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.1")) + include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.20.0")) + include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")) + //include(implementation("org.yaml:snakeyaml:2.5")) + include(implementation("com.fasterxml.jackson.core:jackson-core:2.20.0")) + include(implementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")) + include(implementation("com.fasterxml.jackson.core:jackson-annotations:3.0-rc5")) // Math Evaluator include(implementation("com.fathzer:javaluator:3.0.6")) - // Placeholders API - modImplementation include("eu.pb4:placeholder-api:2.7.2+1.21.8") - //modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" //modRuntimeOnly "maven.modrinth:sodium:mc1.19-0.4.2" //modRuntimeOnly "maven.modrinth:lithium:mc1.19-0.8.0" @@ -143,4 +142,4 @@ static def getVersionMetadata() { // No tracking information could be found about the build return "unknown" -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 89bcd1b..d578bda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.21.8 - yarn_mappings=1.21.8+build.1 + minecraft_version=1.21.9 + yarn_mappings=1.21.9+build.1 loader_version=0.17.2 # Mod Properties - mod_version = 1.0.2 + mod_version = 1.0.3 maven_group = me.flashyreese.mods archives_base_name = commandaliases # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.133.4+1.21.8 + fabric_version=0.134.0+1.21.9 diff --git a/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java b/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java index 1cd4038..920a6b0 100644 --- a/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java +++ b/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java @@ -94,13 +94,13 @@ public void registerFunctions() { Optional optionalPlayer = serverCommandSource.getWorld().getPlayers().stream() .filter(serverPlayerEntity -> serverPlayerEntity.getNameForScoreboard().equals(input)).findFirst(); if (optionalPlayer.isPresent()) { - return optionalPlayer.get().getWorld().getRegistryKey().getValue().toString(); + return optionalPlayer.get().getEntityWorld().getRegistryKey().getValue().toString(); } } else if (commandSource instanceof FabricClientCommandSource clientCommandSource) { Optional optionalPlayer = clientCommandSource.getWorld().getPlayers().stream() .filter(clientPlayerEntity -> clientPlayerEntity.getNameForScoreboard().equals(input)).findFirst(); if (optionalPlayer.isPresent()) { - return optionalPlayer.get().getWorld().getRegistryKey().getValue().toString(); + return clientCommandSource.getWorld().getRegistryKey().getValue().toString(); } } return null; @@ -110,13 +110,13 @@ public void registerFunctions() { Optional optionalPlayer = serverCommandSource.getWorld().getPlayers().stream() .filter(serverPlayerEntity -> serverPlayerEntity.getNameForScoreboard().equals(input)).findFirst(); if (optionalPlayer.isPresent()) { - return optionalPlayer.get().getWorld().getDimension().effects().toString(); + return optionalPlayer.get().getEntityWorld().getDimension().effects().toString(); } } else if (commandSource instanceof FabricClientCommandSource clientCommandSource) { Optional optionalPlayer = clientCommandSource.getWorld().getPlayers().stream() .filter(clientPlayerEntity -> clientPlayerEntity.getNameForScoreboard().equals(input)).findFirst(); if (optionalPlayer.isPresent()) { - return optionalPlayer.get().getWorld().getDimension().effects().toString(); + return clientCommandSource.getWorld().getDimension().effects().toString(); } } return null; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 766eb39..e28dd53 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -46,6 +46,6 @@ "depends": { "fabricloader": ">=0.17.2", "fabric": "*", - "minecraft": ">=1.21.8" + "minecraft": ">=1.21.9" } } From c6b030eb4bd5c147ffcde12b300e6a700d402c08 Mon Sep 17 00:00:00 2001 From: jamesx0416 Date: Tue, 7 Oct 2025 20:20:21 +1100 Subject: [PATCH 2/2] Fix player world dimension lookup --- .../mods/commandaliases/command/impl/FunctionProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java b/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java index 920a6b0..87e3321 100644 --- a/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java +++ b/src/main/java/me/flashyreese/mods/commandaliases/command/impl/FunctionProcessor.java @@ -100,7 +100,7 @@ public void registerFunctions() { Optional optionalPlayer = clientCommandSource.getWorld().getPlayers().stream() .filter(clientPlayerEntity -> clientPlayerEntity.getNameForScoreboard().equals(input)).findFirst(); if (optionalPlayer.isPresent()) { - return clientCommandSource.getWorld().getRegistryKey().getValue().toString(); + return optionalPlayer.get().getEntityWorld().getRegistryKey().getValue().toString(); } } return null;