Update to 21w19a, fix recipe exporting

4 files changed, 13 insertions, 9 deletions

diff --git a/build.gradle b/build.gradle
index 43374d259..d8e0fb21f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id("architectury-plugin") version("3.1-SNAPSHOT")
-    id("forgified-fabric-loom") version("0.6-SNAPSHOT") apply false
+    id("architectury-plugin") version("3.2-SNAPSHOT")
+    id("dev.architectury.loom") version("0.7.2-SNAPSHOT") apply false
     id("org.cadixdev.licenser") version("0.5.0")
     id("com.matthewprenger.cursegradle") version("1.4.0")
     id("java")
@@ -18,7 +18,7 @@ group = "me.shedaniel"
 
 subprojects {
     apply plugin: "com.matthewprenger.cursegradle"
-    apply plugin: "forgified-fabric-loom"
+    apply plugin: "dev.architectury.loom"
 
     loom {
         silentMojangMappingsLicense()
diff --git a/gradle.properties b/gradle.properties
index 4eecb57c3..25ff411b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx3G
 base_version=6.0.0
 unstable=true
-supported_version=21w17a
-minecraft_version=21w17a
+supported_version=21w19a
+minecraft_version=21w19a
 forgeEnabled=false
 forge_version=36.0.43
 fabricloader_version=0.11.3
 cloth_config_version=5.0.23
 modmenu_version=2.0.0-beta.4
-fabric_api=0.34.0+1.17
-architectury_version=2.0.147
+fabric_api=0.34.4+1.17
+architectury_version=2.0.154
 api_exculde=
 #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric-
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 18cd7f0cc..ac23e27ba 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java
index ba246bc90..532555360 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.impl.client.gui;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
+import com.mojang.blaze3d.pipeline.TextureTarget;
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.platform.Window;
@@ -74,12 +75,13 @@ public final class RecipeDisplayExporter extends Widget {
     private void exportRecipe(Rectangle rectangle, List<Widget> widgets) {
         Minecraft client = Minecraft.getInstance();
         Window window = client.getWindow();
-        RenderTarget renderTarget = new RenderTarget(window.getWidth(), window.getHeight(), true, false);
+        RenderTarget renderTarget = new TextureTarget(window.getWidth(), window.getHeight(), true, false);
         renderTarget.bindWrite(true);
         RenderSystem.clear(256, Minecraft.ON_OSX);
         Matrix4f matrix4f = Matrix4f.orthographic(0.0F, (float) ((double) window.getWidth() / window.getGuiScale()), 0.0F, (float) ((double) window.getHeight() / window.getGuiScale()), 1000.0F, 3000.0F);
         RenderSystem.setProjectionMatrix(matrix4f);
         PoseStack poseStack = RenderSystem.getModelViewStack();
+        poseStack.pushPose();
         poseStack.setIdentity();
         poseStack.translate(0.0D, 0.0D, -2000.0D);
         RenderSystem.applyModelViewMatrix();
@@ -117,6 +119,8 @@ public final class RecipeDisplayExporter extends Widget {
         renderTarget.destroyBuffers();
         Minecraft.getInstance().levelRenderer.graphicsChanged();
         Minecraft.getInstance().getMainRenderTarget().bindWrite(true);
+        poseStack.popPose();
+        RenderSystem.applyModelViewMatrix();
     }
     
     @Override