From 400ec6bda58480c26f08aada7232e7017ba4e3a9 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 31 Jul 2022 10:37:22 +0200 Subject: [PATCH] Port to MC 1.19.1 --- build.gradle | 5 ++++- jGui | 2 +- root.gradle.kts | 2 ++ settings.gradle.kts | 2 ++ src/main/java/com/replaymod/replay/handler/GuiHandler.java | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 40ad0f52..76afaae9 100644 --- a/build.gradle +++ b/build.gradle @@ -249,6 +249,7 @@ dependencies { 11801: '1.18.1', 11802: '1.18.2', 11900: '1.19', + 11901: '1.19.1', ][mcVersion] mappings 'net.fabricmc:yarn:' + [ 11404: '1.14.4+build.16', @@ -262,6 +263,7 @@ dependencies { 11801: '1.18.1+build.1:v2', 11802: '1.18.2+build.1:v2', 11900: '1.19+build.2:v2', + 11901: '1.19.1+build.5:v2', ][mcVersion] modImplementation 'net.fabricmc:fabric-loader:0.14.6' def fabricApiVersion = [ @@ -276,6 +278,7 @@ dependencies { 11801: '0.43.1+1.18', 11802: '0.47.9+1.18.2', 11900: '0.55.3+1.19', + 11901: '0.58.5+1.19.1', ][mcVersion] def fabricApiModules = [ "api-base", @@ -348,7 +351,7 @@ dependencies { shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' - shadow "com.github.ReplayMod:ReplayStudio:74d8465", shadeExclusions + shadow "com.github.ReplayMod:ReplayStudio:b2c999d", shadeExclusions // FIXME this should be pulled in by ReplayStudio, and IntelliJ sees it, but javac for some reason does not implementation 'com.github.viaversion:opennbt:0a02214' // 2.0-SNAPSHOT (ViaVersion Edition) diff --git a/jGui b/jGui index c1e43fc9..aa031212 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit c1e43fc9f0550bf6a6ab8685c1008e754e042772 +Subproject commit aa031212c7019c475abb3a83d67fb7ade3d3455c diff --git a/root.gradle.kts b/root.gradle.kts index 276002e6..cba0c385 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -189,6 +189,7 @@ val doRelease by tasks.registering { defaultTasks("bundleJar") preprocess { + val mc11901 = createNode("1.19.1", 11901, "yarn") val mc11900 = createNode("1.19", 11900, "yarn") val mc11802 = createNode("1.18.2", 11802, "yarn") val mc11801 = createNode("1.18.1", 11801, "yarn") @@ -210,6 +211,7 @@ preprocess { val mc10800 = createNode("1.8", 10800, "srg") val mc10710 = createNode("1.7.10", 10710, "srg") + mc11901.link(mc11900) mc11900.link(mc11802, file("versions/mapping-fabric-1.19-1.18.2.txt")) mc11802.link(mc11801) mc11801.link(mc11701, file("versions/mapping-fabric-1.18.1-1.17.1.txt")) diff --git a/settings.gradle.kts b/settings.gradle.kts index b3289dad..2907c38f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -34,6 +34,7 @@ val jGuiVersions = listOf( "1.18.1", "1.18.2", "1.19", + "1.19.1", ) val replayModVersions = listOf( // "1.7.10", @@ -56,6 +57,7 @@ val replayModVersions = listOf( "1.18.1", "1.18.2", "1.19", + "1.19.1", ) rootProject.buildFileName = "root.gradle.kts" diff --git a/src/main/java/com/replaymod/replay/handler/GuiHandler.java b/src/main/java/com/replaymod/replay/handler/GuiHandler.java index 00bb3d9f..f70f7d95 100644 --- a/src/main/java/com/replaymod/replay/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/replay/handler/GuiHandler.java @@ -138,7 +138,7 @@ public class GuiHandler extends EventRegistrations { //#if MC<11400 //$$ openToLan = b; //#endif - //#if MC>=11400 + //#if MC>=11400 && MC<11901 } else if (id.equals(BUTTON_OPTIONS)) { //#if MC>=11400 b.setWidth(204);