Backport to 1.18.2

dima-dencep · Jun 26, 2023 · 983aafb · 983aafb
1 parent d0e0848
commit 983aafb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/MinecraftClientMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/MinecraftClientMixin.java
@@ -5,6 +5,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Overlay;
 import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.client.toast.ToastManager;
 import org.spongepowered.asm.mixin.Mixin;
@@ -36,7 +37,7 @@ public void onResourceReloadFailure(Throwable exception, Text resourceName, Call
         if (!Rrls.config.resetResources) {
             Rrls.logger.error("Caught error loading resourcepacks!", exception);
 
-            this.reloadResources(true).thenRun(() -> SystemToast.show(getToastManager(), SystemToast.Type.PACK_LOAD_FAILURE, Text.translatable("resourcePack.load_fail"), resourceName));
+            this.reloadResources(true).thenRun(() -> SystemToast.show(getToastManager(), SystemToast.Type.PACK_LOAD_FAILURE, new TranslatableText("resourcePack.load_fail"), resourceName));
 
             ci.cancel();
         }

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -30,7 +30,7 @@
   "depends": {
     "fabric": "*",
     "fabric-api": "*",
-    "minecraft": "~1.19",
+    "minecraft": "~1.18",
     "cloth-config": "*"
   },
   "recommends": {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -23,7 +23,7 @@ side = "BOTH"
 [[dependencies.rrls]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19,)"
+versionRange = "[1.18,)"
 ordering = "NONE"
 side = "BOTH"
 

diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "RemoveReloadingScreen Resources",
-    "pack_format": 9
+    "pack_format": 8
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@
 org.gradle.jvmargs=-Xmx4G
 
 # Properties
-    minecraft_version = 1.19.3
-    yarn_mappings = 1.19.3+build.5
+    minecraft_version = 1.18.2
+    yarn_mappings = 1.18.2+build.4
     loader_version = 0.14.21
-    forge_version = 1.19.3-44.1.23
+    forge_version = 1.18.2-40.2.9
 
 # Mod Properties
     mod_version = 3.1.0
     maven_group = com.github.dima_dencep.mods
     archives_base_name = Rrls
 
 # Dependencies
-    modmenu_version = 5.1.0-beta.4
-    fabric_api_version = 0.76.1+1.19.3
-    cloth_config_version = 9.0.94
+    modmenu_version = 3.2.5
+    fabric_api_version = 0.76.0+1.18.2
+    cloth_config_version = 6.3.81