Merge pull request #6 from ImUrX/dev

update to 1.19
ImUrX · Jun 14, 2022 · 4511fce · 4511fce
2 parents 374f28d + dd479ce
commit 4511fce
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ subprojects {
         // The following line declares the mojmap mappings, you may use other mappings as well
         // mappings loom.officialMojangMappings()
         // The following line declares the yarn mappings you may select this one as well.
-        mappings "net.fabricmc:yarn:1.18.2+build.3:v2"
+        mappings "net.fabricmc:yarn:1.19+build.1"
 
         implementation "io.github.imurx:arboard:${rootProject.arboard_version}"
     }

diff --git a/common/src/main/java/io/github/imurx/screenshotcopy/ScreenshotCopy.java b/common/src/main/java/io/github/imurx/screenshotcopy/ScreenshotCopy.java
@@ -15,7 +15,10 @@ public class ScreenshotCopy {
     private static final Logger LOGGER = LoggerFactory.getLogger("Screencopy");
     private static Clipboard clipboard;
     public static void init() {
-        if(clipboard != null) LOGGER.warn("Someone tried to init me again", new IllegalStateException("Clipboard is already defined, can't init it again"));
+        if(clipboard != null) {
+            LOGGER.warn("Someone tried to init me again", new IllegalStateException("Clipboard is already defined, can't init it again"));
+            return;
+        }
         clipboard = new Clipboard();
     }
 

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
@@ -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/...c/src/main/java/io/github/imurx/screenshotcopy/fabric/mixins/MixinScreenshotRecorder.java b/...c/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
@@ -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
@@ -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
@@ -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"
diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,21 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.18.2
-enabled_platforms=quilt,fabric,forge
+minecraft_version=1.19
+enabled_platforms=fabric,forge
 
 archives_base_name=screenshotcopy
-mod_version=1.1.0
+mod_version=1.2.0
 maven_group=io.github.imurx
 
-cloth_config_version=6.2.62
+cloth_config_version=7.0.72
 arboard_version=1.1.0
 
 fabric_loader_version=0.14.6
-fabric_api_version=0.53.0+1.18.2
-mod_menu_version=3.2.2
-fabrishot_version=1.7.0
+fabric_api_version=0.55.1+1.19
+mod_menu_version=4.0.0
+fabrishot_version=1.8.0
 
-forge_version=1.18.2-40.1.19
+forge_version=1.19-41.0.22
 
-quilt_loader_version=0.16.0
+quilt_loader_version=0.17.0-beta.2
 quilt_fabric_api_version=1.0.0-beta.13+0.51.1-1.18.2
diff --git a/settings.gradle b/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
 include("common")
 include("fabric-like")
 include("fabric")
-include("quilt")
+//include("quilt")
 include("forge")
 
 rootProject.name = "screenshotcopy"