From 91a0a1809d20d55d845b5f1b912e5536c3e18545 Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Tue, 5 Dec 2023 20:35:11 +0100 Subject: [PATCH] Update ViaFabric from 1.20.2->1.20.3 (#284) * Prepare to update to 1.20.3. (Hunt for errors first) * Correct report URL in value, Update Mod Menu. * Fixed compile errors --------- Co-authored-by: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- README.md | 4 ++-- build.gradle | 6 +++--- gradle.properties | 6 +++--- src/main/resources/fabric.mod.json | 4 ++-- viafabric-mc120/build.gradle.kts | 8 ++++---- .../fabric/mc120/commands/NMSCommandSender.java | 4 ++-- viafabric-mc120/src/main/resources/fabric.mod.json | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5a034f5..a544435 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -28,7 +28,7 @@ body: Please use Not Enough Crashes if possible, making the stacktrace easier to understand. value: | ``` - Put the paste.gg link or text here. + Put the mclo.gs link or text here. ``` placeholder: Please do not remove the grave accents; simply replace the line of text in the middle. validations: diff --git a/README.md b/README.md index fe6fff2..59b33af 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Allows the connection to/from different Minecraft versions on your Minecraft client/server (LAN worlds too) -This mod can be installed on 1.8.9, 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.2 with Fabric Loader. +This mod can be installed on 1.8.9, 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.3 with Fabric Loader. ## Dependencies @@ -53,7 +53,7 @@ registry synchronization (fabric-registry-sync mod). | 1.17.1 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ⟲ | ⟲ | ⟲ | | 1.18.2 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ⟲ | ⟲ | | 1.19.4 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ⟲ | -| 1.20.2 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| 1.20.3 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ = [ViaVersion](https://viaversion.com) ⟲ = [ViaBackwards](https://viaversion.com/backwards) ⏪ = [ViaRewind](https://viaversion.com/rewind) diff --git a/build.gradle b/build.gradle index d968ce0..a61bbc3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,11 +9,11 @@ import java.util.stream.IntStream plugins { id "java" id "maven-publish" - id "org.ajoberstar.grgit" version "5.2.0" + id "org.ajoberstar.grgit" version "5.2.1" id "com.matthewprenger.cursegradle" version "1.4.0" - id "com.modrinth.minotaur" version "2.8.4" + id "com.modrinth.minotaur" version "2.8.7" id "fabric-loom" version "1.4-SNAPSHOT" apply false - id "com.github.ben-manes.versions" version "0.48.0" + id "com.github.ben-manes.versions" version "0.50.0" } def ENV = System.getenv() diff --git a/gradle.properties b/gradle.properties index 616c32c..0c75cfa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ # suppress inspection "UnusedProperty" for whole file org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication -loader_version=0.14.24 -viaver_version=4.9.0-1.20.3-rc1-SNAPSHOT +loader_version=0.14.25 +viaver_version=4.9.1 yaml_version=2.2 -publish_mc_versions=1.20.2, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9 +publish_mc_versions=1.20.3, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9 # example: 1.19.1-rc1. Can be a blank value modrinth_mc_snapshot= # example: 1.19-Snapshot. Can be a blank value diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fdd1373..ed6aea0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -13,8 +13,8 @@ }, "depends": { "fabricloader": ">=0.14.0", - "minecraft": ["1.8.9", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", ">=1.20.2"], - "viaversion": ">=4.8.1" + "minecraft": ["1.8.9", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", ">=1.20.3"], + "viaversion": ">=4.9.1" }, "breaks": { "viafabricplus": "*" diff --git a/viafabric-mc120/build.gradle.kts b/viafabric-mc120/build.gradle.kts index fc68692..6982380 100644 --- a/viafabric-mc120/build.gradle.kts +++ b/viafabric-mc120/build.gradle.kts @@ -1,9 +1,9 @@ dependencies { - minecraft("com.mojang:minecraft:1.20.2") - mappings("net.fabricmc:yarn:1.20.2+build.2:v2") + minecraft("com.mojang:minecraft:1.20.3") + mappings("net.fabricmc:yarn:1.20.3+build.1:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.89.3+1.20.2") - modImplementation("com.terraformersmc:modmenu:8.0.0") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.91.1+1.20.3") + modImplementation("com.terraformersmc:modmenu:9.0.0-pre.1") } tasks.compileJava { diff --git a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java index 1dc48f1..11ccf35 100644 --- a/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java +++ b/viafabric-mc120/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java @@ -26,7 +26,7 @@ public class NMSCommandSender implements ViaCommandSender { } public static MutableText fromLegacy(String legacy) { - return Text.Serializer.fromJson(RemappingUtil.legacyToJson(legacy)); + return Text.Serialization.fromJson(RemappingUtil.legacyToJson(legacy)); } @Override @@ -54,7 +54,7 @@ public class NMSCommandSender implements ViaCommandSender { if (source instanceof ServerCommandSource) { return ((ServerCommandSource) source).getName(); } else if (source instanceof FabricClientCommandSource) { - return ((FabricClientCommandSource) source).getPlayer().getEntityName(); + return ((FabricClientCommandSource) source).getPlayer().getName().getString(); } return "?"; } diff --git a/viafabric-mc120/src/main/resources/fabric.mod.json b/viafabric-mc120/src/main/resources/fabric.mod.json index d4967af..18c3003 100644 --- a/viafabric-mc120/src/main/resources/fabric.mod.json +++ b/viafabric-mc120/src/main/resources/fabric.mod.json @@ -40,7 +40,7 @@ }, "depends": { "fabric-resource-loader-v0": "*", - "minecraft": [">=1.20.2"], + "minecraft": [">=1.20.3"], "viafabric": "*" }, "recommends": {