From b8f51c0ab9d88bb9943874887d1ed66925f0acb1 Mon Sep 17 00:00:00 2001
From: natanfudge <natan.lifsiz@gmail.com>
Date: Sat, 5 Aug 2023 22:56:13 +0300
Subject: [PATCH] 4.4.6

---
 changelog.md                                        | 13 ++++++++-----
 .../fudge/notenoughcrashes/NotEnoughCrashes.java    |  4 +++-
 .../fudge/notenoughcrashes/gui/InitErrorScreen.java |  3 ++-
 .../assets/notenoughcrashes/lang/en_us.json         |  2 +-
 gradle/libs.versions.toml                           |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/changelog.md b/changelog.md
index 0ec79c9..b9a667c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,13 @@
-## 4.4.5
-- Fixed a crash in Fabric with certain mods
-## 4.4.4
+### 4.4.6
+- Fixed quit button not have the correct text in some cases.
+- Crash initialization screen is now disabled when Sodium is installed.
+### 4.4.5
+- Fixed a crash in Fabric with certain mods.
+### 4.4.4
 - Cleaned up some more things when the game crashes. 
-## 4.4.3
+### 4.4.3
 - Updated Chinese translations
-## 4.4.1
+### 4.4.1
 - Fixed gibrish text sometimes showing in the crash screen. 
 - Added Ukrainian translations (thanks @PetroTornados!).
 - Fixed incorrect tab ordering in the config screen.
diff --git a/common/src/main/java/fudge/notenoughcrashes/NotEnoughCrashes.java b/common/src/main/java/fudge/notenoughcrashes/NotEnoughCrashes.java
index 7f9730f..3fb1274 100644
--- a/common/src/main/java/fudge/notenoughcrashes/NotEnoughCrashes.java
+++ b/common/src/main/java/fudge/notenoughcrashes/NotEnoughCrashes.java
@@ -34,7 +34,9 @@ public static boolean enableGameloopCatching() {
     }
 
     public static boolean enableEntrypointCatching() {
-        return NecConfig.getCurrent().catchInitializationCrashes() && !NecPlatform.instance().irisExists();
+        return NecConfig.getCurrent().catchInitializationCrashes() && !NecPlatform.instance().irisExists()
+                // Sodium insists on crashing when windows are used before it is initialized
+                && !NecPlatform.instance().isModLoaded("sodium");
     }
 
     public static CommonModMetadata getMetadata() {
diff --git a/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java b/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java
index 0e5d9a5..bb4be4c 100644
--- a/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java
+++ b/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java
@@ -5,6 +5,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.text.Text;
 import net.minecraft.util.crash.CrashReport;
 
 @Environment(EnvType.CLIENT)
@@ -25,7 +26,7 @@ public InitErrorScreen(CrashReport report) {
     public void init() {
         super.init();
 
-        ButtonWidget exitButton = ButtonWidget.builder(NecLocalization.translatedText("menu.quit"),
+        ButtonWidget exitButton = ButtonWidget.builder(Text.translatable("menu.quit"),
                 button -> {
                     System.exit(-1);
                 }).dimensions(width / 2 - 155, height / 4 + 120 + 12, 150, 20).build();
diff --git a/common/src/main/resources/assets/notenoughcrashes/lang/en_us.json b/common/src/main/resources/assets/notenoughcrashes/lang/en_us.json
index 4dc4c51..5dce748 100644
--- a/common/src/main/resources/assets/notenoughcrashes/lang/en_us.json
+++ b/common/src/main/resources/assets/notenoughcrashes/lang/en_us.json
@@ -30,7 +30,7 @@
   "notenoughcrashes.midnightconfig.disableReturnToMainMenu": "Disable Return To Main Menu",
   "notenoughcrashes.midnightconfig.catchInitializationCrashesComment1": "(Fabric Only) If false, the game will close normally when it fails to initialize,",
   "notenoughcrashes.midnightconfig.catchInitializationCrashesComment2": "and will not display a special crash screen.",
-  "notenoughcrashes.midnightconfig.catchInitializationCrashesComment3": "This will be always disabled (even if the config is set to true) when Iris is installed.",
+  "notenoughcrashes.midnightconfig.catchInitializationCrashesComment3": "This will be always disabled (even if true) when certain mods are installed.",
   "notenoughcrashes.midnightconfig.catchInitializationCrashes": "Catch Initialization Crashes",
   "notenoughcrashes.midnightconfig.debugModIdentificationComment": "If true, additional info will be logged for the mod developer.",
   "notenoughcrashes.midnightconfig.debugModIdentification": "Debug Mod Identification",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b5866b2..44dd508 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ task_tree = { id = "com.dorongold.task-tree", version.ref = "task_tree" }
 [versions]
 
 # This Mod Version
-mod_version = "4.4.5"
+mod_version = "4.4.6"
 
 # Gradle Plugins
 architectury_plugin = "3.4-SNAPSHOT"
@@ -30,7 +30,7 @@ minecraft = "1.20.1"
 # CurseForge & Modrinth MC overrides (or "mc" to use the main version)
 overrides_curseforge = "mc"
 overrides_modrinth = "mc"
-release_type = "beta"
+release_type = "release"
 
 # Mods & Libraries
 yarn_mappings = "1.20.1+build.2"