From dd479ce90c35b3ea3a34482b6bdd29abe9fd93a3 Mon Sep 17 00:00:00 2001
From: Uriel <urielfontan2002@gmail.com>
Date: Tue, 14 Jun 2022 14:25:04 -0300
Subject: [PATCH] lol, now it really works

---
 .../screenshotcopy/fabric/ScreenshotCopyFabric.java    | 10 +++++++++-
 .../fabric/mixins/MixinScreenshotRecorder.java         |  6 +++---
 fabric/src/main/resources/fabric.mod.json              |  4 ++--
 .../screenshotcopy/forge/ScreenshotEventHandler.java   |  6 +++---
 forge/src/main/resources/META-INF/mods.toml            |  8 ++++----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/ScreenshotCopyFabric.java b/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/ScreenshotCopyFabric.java
index a10ed0e..2a6f2fa 100644
--- a/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/ScreenshotCopyFabric.java
+++ b/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/ScreenshotCopyFabric.java
@@ -9,6 +9,8 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
 
 public class ScreenshotCopyFabric implements ClientModInitializer {
     @Override
@@ -33,7 +35,13 @@ private void initFabrishot() {
                 }
                 array[offset+i] = byteBuffer.get(i);
             }
-            ScreenshotCopy.copyScreenshot(dimension.width(), dimension.height(), array);
+            try {
+                ScreenshotCopy.copyScreenshot(dimension.width(), dimension.height(), array);
+                MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.translatable("text.screencopy.success"));
+            } catch(Exception ex) {
+                MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.translatable("text.screencopy.failure", ex.toString()));
+            }
+
         });
     }
 }
diff --git a/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/mixins/MixinScreenshotRecorder.java b/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/mixins/MixinScreenshotRecorder.java
index 60f0a7e..4d0c392 100644
--- a/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/mixins/MixinScreenshotRecorder.java
+++ b/fabric/src/main/java/io/github/imurx/screenshotcopy/fabric/mixins/MixinScreenshotRecorder.java
@@ -6,7 +6,6 @@
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,11 +21,12 @@ private static void onInnerScreenshot(NativeImage image, File _file, Consumer<Te
         try {
             ScreenshotCopy.copyScreenshot(image);
             if(!AutoConfig.getConfigHolder(ScreencopyConfig.class).getConfig().saveScreenshot) {
-                messageReceiver.accept(new TranslatableText("text.screencopy.success"));
+
+                messageReceiver.accept(Text.translatable("text.screencopy.success"));
                 ci.cancel();
             }
         } catch(Exception ex) {
-            messageReceiver.accept(new TranslatableText("text.screencopy.failure", ex.toString()));
+            messageReceiver.accept(Text.translatable("text.screencopy.failure", ex.toString()));
             if(!AutoConfig.getConfigHolder(ScreencopyConfig.class).getConfig().saveScreenshot) ci.cancel();
         }
     }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 770f615..495ca93 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -29,8 +29,8 @@
   },
   "mixins": ["screencopy.mixins.json"],
   "depends": {
-    "minecraft": ">=1.18.2",
-    "cloth-config": ">=6.2.62",
+    "minecraft": ">=1.19",
+    "cloth-config": ">=7.0.72",
     "fabric-lifecycle-events-v1": "*",
     "fabric-resource-loader-v0": "*"
   },
diff --git a/forge/src/main/java/io/github/imurx/screenshotcopy/forge/ScreenshotEventHandler.java b/forge/src/main/java/io/github/imurx/screenshotcopy/forge/ScreenshotEventHandler.java
index f0e58d6..8cca648 100644
--- a/forge/src/main/java/io/github/imurx/screenshotcopy/forge/ScreenshotEventHandler.java
+++ b/forge/src/main/java/io/github/imurx/screenshotcopy/forge/ScreenshotEventHandler.java
@@ -3,7 +3,7 @@
 import io.github.imurx.screenshotcopy.ScreencopyConfig;
 import io.github.imurx.screenshotcopy.ScreenshotCopy;
 import me.shedaniel.autoconfig.AutoConfig;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.text.Text;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ScreenshotEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
@@ -18,11 +18,11 @@ public static void onScreenshot(ScreenshotEvent ev) {
         try {
             ScreenshotCopy.copyScreenshot(ev.getImage());
             if(!AutoConfig.getConfigHolder(ScreencopyConfig.class).getConfig().saveScreenshot) {
-                ev.setResultMessage(new TranslatableText("text.screencopy.success"));
+                ev.setResultMessage(Text.translatable("text.screencopy.success"));
                 ev.setCanceled(true);
             }
         } catch(Exception ex) {
-            ev.setResultMessage(new TranslatableText("text.screencopy.failure", ex.toString()));
+            ev.setResultMessage(Text.translatable("text.screencopy.failure", ex.toString()));
             if(!AutoConfig.getConfigHolder(ScreencopyConfig.class).getConfig().saveScreenshot) ev.setCanceled(true);
         }
     }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 904524a..2f1d625 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[40,)"
+loaderVersion = "[41,)"
 issueTrackerURL = "https://github.com/ImUrX/screencopy/issues"
 license = "MIT OR Apache-2.0"
 
@@ -18,20 +18,20 @@ logoFile = "icon.png"
 [[dependencies.screencopy]]
 modId = "forge"
 mandatory = true
-versionRange = "[40,)"
+versionRange = "[41,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.screencopy]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.18.2,)"
+versionRange = "[1.19,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.screencopy]]
 modId = "cloth_config"
 mandatory = true
-versionRange = "[6.2.62,)"
+versionRange = "[7.0.72,)"
 ordering = "NONE"
 side = "CLIENT"