diff --git a/build.gradle b/build.gradle index 2bbff83a..79272749 100644 --- a/build.gradle +++ b/build.gradle @@ -265,7 +265,7 @@ dependencies { 11904: '1.19.4', 12001: '1.20.1', 12002: '1.20.2', - 12003: '1.20.3-rc1', + 12004: '1.20.4', ][mcVersion] mappings 'net.fabricmc:yarn:' + [ 11404: '1.14.4+build.16', @@ -284,9 +284,9 @@ dependencies { 11904: '1.19.4+build.1:v2', 12001: '1.20.1+build.2:v2', 12002: '1.20.2+build.4:v2', - 12003: '1.20.3-rc1+build.2:v2', + 12004: '1.20.4+build.1:v2', ][mcVersion] - modImplementation 'net.fabricmc:fabric-loader:0.14.11' + modImplementation 'net.fabricmc:fabric-loader:0.15.1' def fabricApiVersion = [ 11404: '0.4.3+build.247-1.14', 11502: '0.5.1+build.294-1.15', @@ -304,7 +304,7 @@ dependencies { 11904: '0.76.0+1.19.4', 12001: '0.83.1+1.20.1', 12002: '0.90.7+1.20.2', - 12003: '0.91.1+1.20.3', + 12004: '0.91.2+1.20.4', ][mcVersion] def fabricApiModules = [ "api-base", @@ -385,7 +385,7 @@ dependencies { shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' - shadow "com.github.ReplayMod:ReplayStudio:5052121", shadeExclusions + shadow "com.github.ReplayMod:ReplayStudio:6cd39b0", 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 b4a618ae..83f71ae3 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit b4a618aef9f4a9260e8bb75368d75d95b6a72e0c +Subproject commit 83f71ae3e20f5d8a93f81ce7f30f7547262d3c22 diff --git a/root.gradle.kts b/root.gradle.kts index cef238dd..72cfd411 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -193,7 +193,7 @@ val doRelease by tasks.registering { defaultTasks("bundleJar") preprocess { - val mc12003 = createNode("1.20.3", 12003, "yarn") + val mc12004 = createNode("1.20.4", 12004, "yarn") val mc12002 = createNode("1.20.2", 12002, "yarn") val mc12001 = createNode("1.20.1", 12001, "yarn") val mc11904 = createNode("1.19.4", 11904, "yarn") @@ -220,7 +220,7 @@ preprocess { val mc10800 = createNode("1.8", 10800, "srg") val mc10710 = createNode("1.7.10", 10710, "srg") - mc12003.link(mc12002, file("versions/mapping-fabric-1.20.3-1.20.2.txt")) + mc12004.link(mc12002, file("versions/mapping-fabric-1.20.4-1.20.2.txt")) mc12002.link(mc12001) mc12001.link(mc11904) mc11904.link(mc11903) diff --git a/settings.gradle.kts b/settings.gradle.kts index 3ab38e6b..bb1dd6e4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -39,7 +39,7 @@ val jGuiVersions = listOf( "1.19.4", "1.20.1", "1.20.2", - "1.20.3", + "1.20.4", ) val replayModVersions = listOf( // "1.7.10", @@ -67,7 +67,7 @@ val replayModVersions = listOf( "1.19.4", "1.20.1", "1.20.2", - "1.20.3", + "1.20.4", ) rootProject.buildFileName = "root.gradle.kts" diff --git a/versions/1.20.3/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java b/versions/1.20.4/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java similarity index 100% rename from versions/1.20.3/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java rename to versions/1.20.4/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java diff --git a/versions/mapping-fabric-1.20.3-1.20.2.txt b/versions/mapping-fabric-1.20.4-1.20.2.txt similarity index 100% rename from versions/mapping-fabric-1.20.3-1.20.2.txt rename to versions/mapping-fabric-1.20.4-1.20.2.txt