From 6f67cbdea4beeff4300ec864fe2a8d4288ac888c Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sat, 3 Feb 2024 22:53:22 +0100 Subject: [PATCH 1/5] Merge dev into main --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fd27349..bd61470 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication loader_version=0.15.6 -viaver_version=4.10.0-24w05b-SNAPSHOT +viaver_version=4.9.3-SNAPSHOT yaml_version=2.2 publish_mc_versions=1.20.4, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9 From 266ab672531a6edeb16ea57860eff2efad46c7ac Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Sat, 3 Feb 2024 22:55:55 +0100 Subject: [PATCH 2/5] Final dependency, ViaFabric 0.4.13. --- build.gradle | 6 +++--- viafabric-mc18/build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8bae2a6..f7b75ac 100644 --- a/build.gradle +++ b/build.gradle @@ -13,14 +13,14 @@ plugins { id "com.matthewprenger.cursegradle" version "1.4.0" id "com.modrinth.minotaur" version "2.8.7" id "fabric-loom" version "1.5-SNAPSHOT" apply false - id "com.github.ben-manes.versions" version "0.50.0" + id "com.github.ben-manes.versions" version "0.51.0" } def ENV = System.getenv() group = "com.viaversion.fabric" description = "Client-side and server-side ViaVersion implementation for Fabric" -version = "0.4.12+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch() +version = "0.4.13+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch() logger.lifecycle("Building ViaFabric: $version") def getBranch() { @@ -166,7 +166,7 @@ processResources { List mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(",")) .map({ it -> it.trim() }) .collect(Collectors.toList()) -List javaVersions = IntStream.rangeClosed(8, 18) +List javaVersions = IntStream.rangeClosed(8, 17) .mapToObj { n -> (String) "Java $n" } .collect(Collectors.toList()) String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits" diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts index f1ccd66..c8e462f 100644 --- a/viafabric-mc18/build.gradle.kts +++ b/viafabric-mc18/build.gradle.kts @@ -1,6 +1,6 @@ dependencies { minecraft("com.mojang:minecraft:1.8.9") - mappings("net.legacyfabric:yarn:1.8.9+build.532:v2") + mappings("net.legacyfabric:yarn:1.8.9+build.535:v2") modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.1+1.8.9") modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") { From 1429bebf80f42ddf709afbaa4d17c62d33f2d5ac Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:07:57 +0100 Subject: [PATCH 3/5] Only apply mixin on the client --- .../src/main/resources/mixins.viafabric112.pipeline.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/viafabric-mc112/src/main/resources/mixins.viafabric112.pipeline.json b/viafabric-mc112/src/main/resources/mixins.viafabric112.pipeline.json index bd26c36..9b5f149 100644 --- a/viafabric-mc112/src/main/resources/mixins.viafabric112.pipeline.json +++ b/viafabric-mc112/src/main/resources/mixins.viafabric112.pipeline.json @@ -4,12 +4,12 @@ "package": "com.viaversion.fabric.mc112.mixin.pipeline", "mixins": [ "MixinClientConnection", - "MixinServerNetworkIoChInit", - "client.MixinHandshakeC2SPacket" + "MixinServerNetworkIoChInit" ], "client": [ "client.MixinClientConnection", - "client.MixinClientConnectionChInit" + "client.MixinClientConnectionChInit", + "client.MixinHandshakeC2SPacket" ], "injectors": { "defaultRequire": 1 From 2ab66b0d2199efde4495845d72619164cbb81766 Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:17:25 +0100 Subject: [PATCH 4/5] Fix 1.12.2 not being recognized as supported version. (#308) --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9a5fe45..2a7fe5d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -13,7 +13,7 @@ }, "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.3"], + "minecraft": ["1.8.9", "1.12.2", "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": { From 6c8e0c5a8915908fd3ac06c574d446248695f28d Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:23:44 +0100 Subject: [PATCH 5/5] Fixed publishing --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bd61470..19fd817 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ loader_version=0.15.6 viaver_version=4.9.3-SNAPSHOT yaml_version=2.2 -publish_mc_versions=1.20.4, 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.4, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.12.2, 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