From 2415a886e290892c8c8a606c54790b3a972860b1 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Sat, 24 Jul 2021 11:05:39 +0200
Subject: [PATCH] Update to 1.17.1

---
 build.gradle                                            | 5 ++++-
 jGui                                                    | 2 +-
 root.gradle.kts                                         | 2 ++
 settings.gradle.kts                                     | 2 ++
 src/main/java/com/replaymod/render/blend/Util.java      | 2 +-
 src/main/java/com/replaymod/replay/NoGuiScreenshot.java | 7 ++++++-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47ae0818..a59dedb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -239,6 +239,7 @@ dependencies {
                 11603: '1.16.3',
                 11604: '1.16.4',
                 11700: '1.17',
+                11701: '1.17.1',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
@@ -247,6 +248,7 @@ dependencies {
                 11603: '1.16.3+build.1:v2',
                 11604: '1.16.4+build.6:v2',
                 11700: '1.17+build.13:v2',
+                11701: '1.17.1+build.29:v2',
         ][mcVersion]
         modImplementation 'net.fabricmc:fabric-loader:0.11.6'
         def fabricApiVersion = [
@@ -256,6 +258,7 @@ dependencies {
                 11603: '0.17.1+build.394-1.16',
                 11604: '0.25.1+build.416-1.16',
                 11700: '0.36.0+1.17',
+                11701: '0.37.1+1.17',
         ][mcVersion]
         def fabricApiModules = [
                 "api-base",
@@ -326,7 +329,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:0e72e36", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:a67fb11", shadeExclusions
 
     implementation(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those
diff --git a/jGui b/jGui
index 9b5e0192..943ddc84 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit 9b5e0192ab2cb90f200005ab53f9e1a85ce29393
+Subproject commit 943ddc84bc2657990ac5eb1500270464194ddcdf
diff --git a/root.gradle.kts b/root.gradle.kts
index d72ef4f5..de90b92f 100755
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -176,6 +176,7 @@ val doRelease by tasks.registering {
 defaultTasks("bundleJar")
 
 preprocess {
+    val mc11701 = createNode("1.17.1", 11701, "yarn")
     val mc11700 = createNode("1.17", 11700, "yarn")
     val mc11604 = createNode("1.16.4", 11604, "yarn")
     val mc11601 = createNode("1.16.1", 11601, "yarn")
@@ -193,6 +194,7 @@ preprocess {
     val mc10800 = createNode("1.8", 10800, "srg")
     val mc10710 = createNode("1.7.10", 10710, "srg")
 
+    mc11701.link(mc11700)
     mc11700.link(mc11604, file("versions/mapping-fabric-1.17-1.16.4.txt"))
     mc11604.link(mc11601)
     mc11601.link(mc11502)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ef8c7df..02c25403 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,6 +30,7 @@ val jGuiVersions = listOf(
         "1.16.1",
         "1.16.4",
         "1.17",
+        "1.17.1",
 )
 val replayModVersions = listOf(
         // "1.7.10",
@@ -48,6 +49,7 @@ val replayModVersions = listOf(
         "1.16.1",
         "1.16.4",
         "1.17",
+        "1.17.1",
 )
 
 rootProject.buildFileName = "root.gradle.kts"
diff --git a/src/main/java/com/replaymod/render/blend/Util.java b/src/main/java/com/replaymod/render/blend/Util.java
index d47092e7..c43e695a 100644
--- a/src/main/java/com/replaymod/render/blend/Util.java
+++ b/src/main/java/com/replaymod/render/blend/Util.java
@@ -39,7 +39,7 @@ public class Util {
         }
     }
 
-    private static FloatBuffer floatBuffer = GlAllocationUtils.allocateFloatBuffer(16);
+    private static FloatBuffer floatBuffer = GlAllocationUtils.allocateByteBuffer(16 * 4).asFloatBuffer();
     public static Matrix4f getGlMatrix(int matrix) {
         floatBuffer.clear();
         //#if MC>=11400
diff --git a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java
index 0cd7ed44..a3cd6d56 100644
--- a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java
+++ b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java
@@ -103,7 +103,12 @@ public class NoGuiScreenshot {
                 // Read it, create the screenshot and finish the future
                 try {
                     //#if MC>=11400
-                    Image image = new Image(ScreenshotUtils.takeScreenshot(frameWidth, frameHeight, mc.getFramebuffer()));
+                    Image image = new Image(ScreenshotUtils.takeScreenshot(
+                            //#if MC<11701
+                            frameWidth, frameHeight,
+                            //#endif
+                            mc.getFramebuffer()
+                    ));
                     //#else
                     //$$ // We're using Minecraft's ScreenShotHelper even though it writes the screenshot to
                     //$$ // disk for better maintainability