Fixes #53 (#58)

blushiemagic · Aug 11, 2018 · 2f46840 · 2f46840
1 parent bcd3499
commit 2f46840
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/CraftingGUI.cs b/CraftingGUI.cs
@@ -36,17 +36,17 @@ public static bool MouseClicked
 			}
 		}
 
-		private static UIPanel basePanel = new UIPanel();
+		private static UIPanel basePanel;
 		private static float panelTop;
 		private static float panelLeft;
 		private static float panelWidth;
 		private static float panelHeight;
 
-		private static UIElement topBar = new UIElement();
+		private static UIElement topBar;
 		internal static UISearchBar searchBar;
 		private static UIButtonChoice sortButtons;
 		private static UIButtonChoice recipeButtons;
-		private static UIElement topBar2 = new UIElement();
+		private static UIElement topBar2;
 		private static UIButtonChoice filterButtons;
 		internal static UISearchBar searchBar2;
 
@@ -80,7 +80,7 @@ public static bool MouseClicked
 		private static UIElement bottomBar = new UIElement();
 		private static UIText capacityText;
 
-		private static UIPanel recipePanel = new UIPanel();
+		private static UIPanel recipePanel;
 		private static float recipeTop;
 		private static float recipeLeft;
 		private static float recipeWidth;
@@ -141,6 +141,7 @@ public static void Initialize()
 
 			panelTop = Main.instance.invBottom + 60;
 			panelLeft = 20f;
+			basePanel = new UIPanel();
 			float innerPanelLeft = panelLeft + basePanel.PaddingLeft;
 			float innerPanelWidth = numColumns * (itemSlotWidth + padding) + 20f + padding;
 			panelWidth = basePanel.PaddingLeft + innerPanelWidth + basePanel.PaddingRight;
@@ -151,6 +152,7 @@ public static void Initialize()
 			basePanel.Height.Set(panelHeight, 0f);
 			basePanel.Recalculate();
 
+			recipePanel = new UIPanel();
 			recipeTop = panelTop;
 			recipeLeft = panelLeft + panelWidth;
 			recipeWidth = numColumns2 * (smallSlotWidth + padding) + 20f + padding;
@@ -162,6 +164,7 @@ public static void Initialize()
 			recipePanel.Height.Set(recipeHeight, 0f);
 			recipePanel.Recalculate();
 
+			topBar = new UIElement();
 			topBar.Width.Set(0f, 1f);
 			topBar.Height.Set(32f, 0f);
 			basePanel.Append(topBar);
@@ -180,6 +183,7 @@ public static void Initialize()
 			searchBar.Height.Set(0f, 1f);
 			topBar.Append(searchBar);
 
+			topBar2 = new UIElement();
 			topBar2.Width.Set(0f, 1f);
 			topBar2.Height.Set(32f, 0f);
 			topBar2.Top.Set(36f, 0f);
@@ -347,6 +351,13 @@ private static void InitLangStuff()
 			}
 		}
 
+		internal static void Unload()
+		{
+			sortButtons = null;
+			filterButtons = null;
+			recipeButtons = null;
+		}
+
 		private static void InitSortButtons()
 		{
 			if (sortButtons == null)

diff --git a/MagicStorage.cs b/MagicStorage.cs
@@ -36,6 +36,8 @@ public override void Unload()
 			Instance = null;
 			bluemagicMod = null;
 			legendMod = null;
+			StorageGUI.Unload();
+			CraftingGUI.Unload();
 		}
 
 		private void AddTranslations()

diff --git a/StorageGUI.cs b/StorageGUI.cs
@@ -30,17 +30,17 @@ public static bool MouseClicked
 			}
 		}
 
-		private static UIPanel basePanel = new UIPanel();
+		private static UIPanel basePanel;
 		private static float panelTop;
 		private static float panelLeft;
 		private static float panelWidth;
 		private static float panelHeight;
 
-		private static UIElement topBar = new UIElement();
+		private static UIElement topBar;
 		internal static UISearchBar searchBar;
 		private static UIButtonChoice sortButtons;
 		internal static UITextPanel<LocalizedText> depositButton;
-		private static UIElement topBar2 = new UIElement();
+		private static UIElement topBar2;
 		private static UIButtonChoice filterButtons;
 		internal static UISearchBar searchBar2;
 
@@ -73,6 +73,7 @@ public static void Initialize()
 
 			panelTop = Main.instance.invBottom + 60;
 			panelLeft = 20f;
+			basePanel = new UIPanel();
 			float innerPanelLeft = panelLeft + basePanel.PaddingLeft;
 			float innerPanelWidth = numColumns * (itemSlotWidth + padding) + 20f + padding;
 			panelWidth = basePanel.PaddingLeft + innerPanelWidth + basePanel.PaddingRight;
@@ -83,6 +84,7 @@ public static void Initialize()
 			basePanel.Height.Set(panelHeight, 0f);
 			basePanel.Recalculate();
 
+			topBar = new UIElement();
 			topBar.Width.Set(0f, 1f);
 			topBar.Height.Set(32f, 0f);
 			basePanel.Append(topBar);
@@ -103,6 +105,7 @@ public static void Initialize()
 			searchBar.Height.Set(0f, 1f);
 			topBar.Append(searchBar);
 
+			topBar2 = new UIElement();
 			topBar2.Width.Set(0f, 1f);
 			topBar2.Height.Set(32f, 0f);
 			topBar2.Top.Set(36f, 0f);
@@ -180,6 +183,12 @@ private static void InitLangStuff()
 			}
 		}
 
+		internal static void Unload()
+		{
+			sortButtons = null;
+			filterButtons = null;
+		}
+
 		private static void InitSortButtons()
 		{
 			if (sortButtons == null)