v0.6.6.3, fix some reload/cancel issues

JavidPack · Apr 2, 2021 · 17e5a5d · 17e5a5d
1 parent 56cc3e8
commit 17e5a5d
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 9 deletions.
diff --git a/CheatSheet.cs b/CheatSheet.cs
@@ -105,6 +105,15 @@ public override void Load()
 			herosPermissions[NPCButcher_Permission] = true;
 			herosPermissions[CheatSheetExtensions_Permission] = true;
 			herosPermissions[QuickTeleport_Permission] = true;
+
+			GenericItemSlot.backgroundTexture = Main.inventoryBack9Texture;
+			NPCSlot.backgroundTexture = Main.inventoryBack9Texture;
+			NPCSlot.filteredBackgroundTexture = Main.inventoryBack5Texture;
+			RecipeQuerySlot.backgroundTexture = Main.inventoryBack9Texture;
+			RecipeQuerySlot.backgroundTextureFake = Main.inventoryBack8Texture;
+			RecipeSlot.backgroundTexture = Main.inventoryBack9Texture;
+			RecipeSlot.selectedBackgroundTexture = Main.inventoryBack15Texture;
+			Slot.backgroundTexture = Main.inventoryBack9Texture;
 		}
 
 		public override void Unload()
@@ -113,6 +122,14 @@ public override void Unload()
 			ButtonTexture.Clear();
 			ButtonTooltip.Clear();
 
+			GenericItemSlot.backgroundTexture = null;
+			NPCSlot.backgroundTexture = null;
+			NPCSlot.filteredBackgroundTexture = null;
+			RecipeQuerySlot.backgroundTexture = null;
+			RecipeQuerySlot.backgroundTextureFake = null;
+			RecipeSlot.backgroundTexture = null;
+			RecipeSlot.selectedBackgroundTexture = null;
+			Slot.backgroundTexture = null;
 			PaintToolsSlot.CurrentSelect = null;
 			AllItemsMenu.singleSlotArray = null;
 			UI.UICheckbox.checkboxTexture = null;
@@ -155,6 +172,8 @@ public override void Unload()
 
 		internal static string CSText(string category, string key)
 		{
+			if (translations == null)
+				return "";
 			return translations[$"Mods.CheatSheet.{category}.{key}"].GetTranslation(Language.ActiveCulture);
 			// This isn't good until after load....can revert after fixing static initializers for string[]
 			// return Language.GetTextValue($"Mods.CheatSheet.{category}.{key}");

diff --git a/Menus/GenericItemSlot.cs b/Menus/GenericItemSlot.cs
@@ -9,7 +9,7 @@ namespace CheatSheet.Menus
 {
 	internal class GenericItemSlot : UIView
 	{
-		public static Texture2D backgroundTexture = Main.inventoryBack9Texture;
+		public static Texture2D backgroundTexture;
 
 		public Item item = null;
 

diff --git a/Menus/ItemBrowser.cs b/Menus/ItemBrowser.cs
@@ -33,6 +33,7 @@ internal enum ItemBrowserCategories
 	internal class ItemBrowser : UISlideWindow
 	{
 		internal static string CSText(string key, string category = "ItemBrowser") => CheatSheet.CSText(category, key);
+		// TODO: static stuff like this is bad when unload/cancel happens before translations are ready.
 		private static string[] categNames = new string[]
 		{
 			CSText("AllItems"),

diff --git a/Menus/NPCSlot.cs b/Menus/NPCSlot.cs
@@ -22,8 +22,8 @@ internal class NPCSlot : UIView
 
 		public int index = 0;
 
-		public static Texture2D backgroundTexture = Main.inventoryBack9Texture;
-		public static Texture2D filteredBackgroundTexture = Main.inventoryBack5Texture;
+		public static Texture2D backgroundTexture;
+		public static Texture2D filteredBackgroundTexture;
 
 		public bool functionalSlot;
 		private bool rightClicking;

diff --git a/Menus/RecipeQuerySlot.cs b/Menus/RecipeQuerySlot.cs
@@ -9,8 +9,8 @@ namespace CheatSheet.Menus
 {
 	internal class RecipeQuerySlot : UIView
 	{
-		public static Texture2D backgroundTexture = Main.inventoryBack9Texture;
-		public static Texture2D backgroundTextureFake = Main.inventoryBack8Texture;
+		public static Texture2D backgroundTexture;
+		public static Texture2D backgroundTextureFake;
 
 		public Item item = new Item();
 		internal bool real = true;

diff --git a/Menus/RecipeSlot.cs b/Menus/RecipeSlot.cs
@@ -9,8 +9,8 @@ namespace CheatSheet.Menus
 {
 	internal class RecipeSlot : UIView
 	{
-		public static Texture2D backgroundTexture = Main.inventoryBack9Texture;
-		public static Texture2D selectedBackgroundTexture = Main.inventoryBack15Texture;
+		public static Texture2D backgroundTexture;
+		public static Texture2D selectedBackgroundTexture;
 
 		public int recipeIndex = -1;
 		public Recipe recipe;

diff --git a/Menus/Slot.cs b/Menus/Slot.cs
@@ -14,7 +14,7 @@ internal class Slot : UIView
 
 		public int index = -1;
 
-		public static Texture2D backgroundTexture = Main.inventoryBack9Texture;
+		public static Texture2D backgroundTexture;
 
 		public bool functionalSlot;
 		private bool rightClicking;

diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = jopojelly, jofairden, rrryutaro
-version = 0.6.6.2
+version = 0.6.6.3
 displayName = Cheat Sheet
 homepage = http://forums.terraria.org/index.php?threads/cheat-sheet.41407/
 buildIgnore = .vs\*, Properties\*, *.csproj, *.user, obj\*, bin\*, *.config, .git\*