Port to MC 1.19.1

This commit is contained in:
Jonas Herzig
2022-07-31 10:37:22 +02:00
parent bdea84b9a2
commit 400ec6bda5
5 changed files with 10 additions and 3 deletions

View File

@@ -249,6 +249,7 @@ dependencies {
11801: '1.18.1', 11801: '1.18.1',
11802: '1.18.2', 11802: '1.18.2',
11900: '1.19', 11900: '1.19',
11901: '1.19.1',
][mcVersion] ][mcVersion]
mappings 'net.fabricmc:yarn:' + [ mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.16', 11404: '1.14.4+build.16',
@@ -262,6 +263,7 @@ dependencies {
11801: '1.18.1+build.1:v2', 11801: '1.18.1+build.1:v2',
11802: '1.18.2+build.1:v2', 11802: '1.18.2+build.1:v2',
11900: '1.19+build.2:v2', 11900: '1.19+build.2:v2',
11901: '1.19.1+build.5:v2',
][mcVersion] ][mcVersion]
modImplementation 'net.fabricmc:fabric-loader:0.14.6' modImplementation 'net.fabricmc:fabric-loader:0.14.6'
def fabricApiVersion = [ def fabricApiVersion = [
@@ -276,6 +278,7 @@ dependencies {
11801: '0.43.1+1.18', 11801: '0.43.1+1.18',
11802: '0.47.9+1.18.2', 11802: '0.47.9+1.18.2',
11900: '0.55.3+1.19', 11900: '0.55.3+1.19',
11901: '0.58.5+1.19.1',
][mcVersion] ][mcVersion]
def fabricApiModules = [ def fabricApiModules = [
"api-base", "api-base",
@@ -348,7 +351,7 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' 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 // 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) implementation 'com.github.viaversion:opennbt:0a02214' // 2.0-SNAPSHOT (ViaVersion Edition)

2
jGui

Submodule jGui updated: c1e43fc9f0...aa031212c7

View File

@@ -189,6 +189,7 @@ val doRelease by tasks.registering {
defaultTasks("bundleJar") defaultTasks("bundleJar")
preprocess { preprocess {
val mc11901 = createNode("1.19.1", 11901, "yarn")
val mc11900 = createNode("1.19", 11900, "yarn") val mc11900 = createNode("1.19", 11900, "yarn")
val mc11802 = createNode("1.18.2", 11802, "yarn") val mc11802 = createNode("1.18.2", 11802, "yarn")
val mc11801 = createNode("1.18.1", 11801, "yarn") val mc11801 = createNode("1.18.1", 11801, "yarn")
@@ -210,6 +211,7 @@ preprocess {
val mc10800 = createNode("1.8", 10800, "srg") val mc10800 = createNode("1.8", 10800, "srg")
val mc10710 = createNode("1.7.10", 10710, "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")) mc11900.link(mc11802, file("versions/mapping-fabric-1.19-1.18.2.txt"))
mc11802.link(mc11801) mc11802.link(mc11801)
mc11801.link(mc11701, file("versions/mapping-fabric-1.18.1-1.17.1.txt")) mc11801.link(mc11701, file("versions/mapping-fabric-1.18.1-1.17.1.txt"))

View File

@@ -34,6 +34,7 @@ val jGuiVersions = listOf(
"1.18.1", "1.18.1",
"1.18.2", "1.18.2",
"1.19", "1.19",
"1.19.1",
) )
val replayModVersions = listOf( val replayModVersions = listOf(
// "1.7.10", // "1.7.10",
@@ -56,6 +57,7 @@ val replayModVersions = listOf(
"1.18.1", "1.18.1",
"1.18.2", "1.18.2",
"1.19", "1.19",
"1.19.1",
) )
rootProject.buildFileName = "root.gradle.kts" rootProject.buildFileName = "root.gradle.kts"

View File

@@ -138,7 +138,7 @@ public class GuiHandler extends EventRegistrations {
//#if MC<11400 //#if MC<11400
//$$ openToLan = b; //$$ openToLan = b;
//#endif //#endif
//#if MC>=11400 //#if MC>=11400 && MC<11901
} else if (id.equals(BUTTON_OPTIONS)) { } else if (id.equals(BUTTON_OPTIONS)) {
//#if MC>=11400 //#if MC>=11400
b.setWidth(204); b.setWidth(204);