From b372ab8376f7bc663787782f75d76c78912279cc Mon Sep 17 00:00:00 2001 From: JavidPack Date: Tue, 20 Feb 2018 17:33:17 -0700 Subject: [PATCH] 0.2 release, Some code cleanup. --- HEROsMod.cs | 5 ++++- HEROsModServices/PrefixEditor.cs | 2 +- Localization/en-US.lang | 4 ++-- ModUtils.cs | 18 +++++++++--------- UIKit/MasterView.cs | 2 +- UIKit/UIComponents/ItemView.cs | 2 +- UIKit/UIComponents/Slot.cs | 2 +- UIKit/UIView.cs | 2 +- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/HEROsMod.cs b/HEROsMod.cs index 375dbda..7734845 100644 --- a/HEROsMod.cs +++ b/HEROsMod.cs @@ -78,9 +78,10 @@ internal static string HeroText(string key) // Clear EVERYthing, mod is unloaded. public override void Unload() { - translations = null; UIKit.UIComponents.ItemBrowser.Filters = null; UIKit.UIComponents.ItemBrowser.DefaultSorts = null; + UIKit.UIComponents.ItemBrowser.Categories = null; + UIKit.UIComponents.ItemBrowser.CategoriesLoaded = false; UIKit.UIButton.buttonBackground = null; UIKit.UIView.closeTexture = null; UIKit.UITextbox.textboxBackground = null; @@ -121,6 +122,8 @@ public override void Unload() _hotbar = null; ServiceController = null; TimeWeatherControlHotbar.Unload(); + ModUtils.previousInventoryItems = null; + translations = null; instance = null; } diff --git a/HEROsModServices/PrefixEditor.cs b/HEROsModServices/PrefixEditor.cs index 34d2bbe..c816ee0 100644 --- a/HEROsModServices/PrefixEditor.cs +++ b/HEROsModServices/PrefixEditor.cs @@ -192,7 +192,7 @@ private void label_onHover(object sender, EventArgs e) UILabel label = (UILabel)sender; Item item = (Item)label.Tag; HoverText = item.Name; - HoverItem = item.Clone(); + //HoverItem = item.Clone(); } private void label_onLeftClick(object sender, EventArgs e) diff --git a/Localization/en-US.lang b/Localization/en-US.lang index d55ae90..0ab7914 100644 --- a/Localization/en-US.lang +++ b/Localization/en-US.lang @@ -25,8 +25,8 @@ PauseTime=Pause Time ForceEnchantedSundial=Force Enchanted Sundial RainHasBeenTurnedOff=Rain has been turned off RainHasBeenTurnedOn=Rain has been turned on -SandstormHasBeenTurnedOff=Rain has been turned off -SandstormHasBeenTurnedOn=Rain has been turned on +SandstormHasBeenTurnedOff=Sandstorm has been turned off +SandstormHasBeenTurnedOn=Sandstorm has been turned on TimeHasBeenPaused=Time has been paused TimeHasResumed=Time has resumed RegionsVisible=Regions Visible diff --git a/ModUtils.cs b/ModUtils.cs index 826b6b2..fb01668 100644 --- a/ModUtils.cs +++ b/ModUtils.cs @@ -44,7 +44,7 @@ internal static class ModUtils private static Texture2D _logoTexture2; private static Texture2D _testTubeTexture; - private static Item[] previosInvenotryItems; + internal static Item[] previousInventoryItems; public static event EventHandler InventoryChanged; @@ -115,11 +115,11 @@ public static Texture2D HueTexture } } - public static Item HoverItem - { - get { return Main.HoverItem; }// (Item)_hoverItem.GetValue(null); } - set { Main.HoverItem = value; }// _hoverItem.SetValue(null, value); } - } + //public static Item HoverItem + //{ + // get { return Main.HoverItem; }// (Item)_hoverItem.GetValue(null); } + // set { Main.HoverItem = value; }// _hoverItem.SetValue(null, value); } + //} /// /// Gets or Sets if the game camera is free to move from the players position @@ -160,7 +160,7 @@ public static void Init() //_testTubeTexture = HEROsMod.instance.GetTexture("Images/testTubeSpritesheet"); //ItemTooltip = new UIKit.UIComponents.ItemTooltip(); //UIKit.MasterView.gameScreen.AddChild(ItemTooltip); - previosInvenotryItems = new Item[Main.player[Main.myPlayer].inventory.Length]; + previousInventoryItems = new Item[Main.player[Main.myPlayer].inventory.Length]; SetPreviousInventory(); Matrix projection = Matrix.CreateOrthographicOffCenter(0, Main.screenWidth, Main.screenHeight, 0, -10000, 10000); //Effect effect = HEROsMod.Content.Load("effects"); @@ -221,7 +221,7 @@ private static bool ItemChanged() Player player = Main.player[Main.myPlayer]; for (int i = 0; i < player.inventory.Length - 1; i++) { - if (player.inventory[i].IsNotTheSameAs(previosInvenotryItems[i])) + if (player.inventory[i].IsNotTheSameAs(previousInventoryItems[i])) { return true; } @@ -234,7 +234,7 @@ private static void SetPreviousInventory() Player player = Main.player[Main.myPlayer]; for (int i = 0; i < player.inventory.Length; i++) { - previosInvenotryItems[i] = player.inventory[i].Clone(); + previousInventoryItems[i] = player.inventory[i].Clone(); } } diff --git a/UIKit/MasterView.cs b/UIKit/MasterView.cs index 6378fc6..e985f24 100644 --- a/UIKit/MasterView.cs +++ b/UIKit/MasterView.cs @@ -84,7 +84,7 @@ public static void UpdateMaster() UIView.ScrollAmount = PlayerInput.ScrollWheelDeltaForUI; // UIView.ScrollAmount = (mouseState.ScrollWheelValue - previousMouseState.ScrollWheelValue) / 2; previousMouseState = mouseState; - HoverItem = EmptyItem; + //HoverItem = EmptyItem; HoverText = ""; GameMouseOverwritten = false; masterView.Update(); diff --git a/UIKit/UIComponents/ItemView.cs b/UIKit/UIComponents/ItemView.cs index cb91926..f63302c 100644 --- a/UIKit/UIComponents/ItemView.cs +++ b/UIKit/UIComponents/ItemView.cs @@ -35,7 +35,7 @@ public ItemView(Item item) private void Slot2_onHover(object sender, EventArgs e) { HoverText = item.Name; - HoverItem = item.Clone(); + //HoverItem = item.Clone(); } public override void Draw(SpriteBatch spriteBatch) diff --git a/UIKit/UIComponents/Slot.cs b/UIKit/UIComponents/Slot.cs index 0d8add8..a5b5731 100644 --- a/UIKit/UIComponents/Slot.cs +++ b/UIKit/UIComponents/Slot.cs @@ -56,7 +56,7 @@ protected override float GetHeight() private void Slot2_onHover(object sender, EventArgs e) { HoverText = item.Name; - HoverItem = item.Clone(); + //HoverItem = item.Clone(); } private void Slot2_onLeftClick(object sender, EventArgs e) diff --git a/UIKit/UIView.cs b/UIKit/UIView.cs index feb55ac..85c62c6 100644 --- a/UIKit/UIView.cs +++ b/UIKit/UIView.cs @@ -36,7 +36,7 @@ internal class UIView public static int ScrollAmount = 0; public static string HoverText = ""; - public static Item HoverItem = new Item(); + //public static Item HoverItem = new Item(); protected static readonly Item EmptyItem = new Item(); public static bool HoverOverridden = false;