From e8ea70aabcedd561e63f22e029e9fecc4055ecdd Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Tue, 6 Dec 2022 17:54:05 +0100
Subject: [PATCH] Port to MC 1.19.2 (fixes #801)

---
 build.gradle                                                 | 5 ++++-
 jGui                                                         | 2 +-
 root.gradle.kts                                              | 2 ++
 settings.gradle.kts                                          | 2 ++
 versions/1.19.2/.gitkeep                                     | 0
 .../replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java | 4 ++++
 6 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 versions/1.19.2/.gitkeep

diff --git a/build.gradle b/build.gradle
index 9d1db1cf..ee00b0cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -250,6 +250,7 @@ dependencies {
                 11802: '1.18.2',
                 11900: '1.19',
                 11901: '1.19.1',
+                11902: '1.19.2',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
@@ -264,8 +265,9 @@ dependencies {
                 11802: '1.18.2+build.1:v2',
                 11900: '1.19+build.2:v2',
                 11901: '1.19.1+build.5:v2',
+                11902: '1.19.2+build.28:v2',
         ][mcVersion]
-        modImplementation 'net.fabricmc:fabric-loader:0.14.6'
+        modImplementation 'net.fabricmc:fabric-loader:0.14.11'
         def fabricApiVersion = [
                 11404: '0.4.3+build.247-1.14',
                 11502: '0.5.1+build.294-1.15',
@@ -279,6 +281,7 @@ dependencies {
                 11802: '0.47.9+1.18.2',
                 11900: '0.55.3+1.19',
                 11901: '0.58.5+1.19.1',
+                11902: '0.68.0+1.19.2',
         ][mcVersion]
         def fabricApiModules = [
                 "api-base",
diff --git a/jGui b/jGui
index aa031212..360b2541 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit aa031212c7019c475abb3a83d67fb7ade3d3455c
+Subproject commit 360b2541d2164822ff6a9bd924fceedd52a4c1cb
diff --git a/root.gradle.kts b/root.gradle.kts
index 88e8cc7e..950a859d 100755
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -193,6 +193,7 @@ val doRelease by tasks.registering {
 defaultTasks("bundleJar")
 
 preprocess {
+    val mc11902 = createNode("1.19.2", 11902, "yarn")
     val mc11901 = createNode("1.19.1", 11901, "yarn")
     val mc11900 = createNode("1.19", 11900, "yarn")
     val mc11802 = createNode("1.18.2", 11802, "yarn")
@@ -215,6 +216,7 @@ preprocess {
     val mc10800 = createNode("1.8", 10800, "srg")
     val mc10710 = createNode("1.7.10", 10710, "srg")
 
+    mc11902.link(mc11901)
     mc11901.link(mc11900)
     mc11900.link(mc11802, file("versions/mapping-fabric-1.19-1.18.2.txt"))
     mc11802.link(mc11801)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2907c38f..9aa97ab5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -35,6 +35,7 @@ val jGuiVersions = listOf(
         "1.18.2",
         "1.19",
         "1.19.1",
+        "1.19.2",
 )
 val replayModVersions = listOf(
         // "1.7.10",
@@ -58,6 +59,7 @@ val replayModVersions = listOf(
         "1.18.2",
         "1.19",
         "1.19.1",
+        "1.19.2",
 )
 
 rootProject.buildFileName = "root.gradle.kts"
diff --git a/versions/1.19.2/.gitkeep b/versions/1.19.2/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java b/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
index f64cbc08..2f2c711e 100644
--- a/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
+++ b/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
@@ -9,7 +9,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerPublicKey.PublicKeyData.class)
 public abstract class Mixin_AllowExpiredPlayerKeys {
+    //#if MC>=11902
+    //$$ @Inject(method = { "isExpired()Z", "isExpired(Ljava/time/Duration;)Z" }, at = @At("HEAD"), cancellable = true)
+    //#else
     @Inject(method = "isExpired", at = @At("HEAD"), cancellable = true)
+    //#endif
     private void neverExpireWhenInReplay(CallbackInfoReturnable<Boolean> ci) {
         if (ReplayModReplay.instance.getReplayHandler() != null) {
             ci.setReturnValue(false);