Code cleanup and new version in anticipation for update.

JavidPack · Aug 26, 2017 · 8542903 · 8542903
1 parent f83c062
commit 8542903
Show file tree

Hide file tree

Showing 38 changed files with 128 additions and 122 deletions.
diff --git a/HEROsMod.cs b/HEROsMod.cs
@@ -34,9 +34,20 @@ public override void Load()
 			{
 				instance = this;
 				//	AddGlobalItem("HEROsModGlobalItem", new HEROsModGlobalItem());
-				AddPlayer("HEROsModModPlayer", new HEROsModModPlayer());
+				// AddPlayer("HEROsModModPlayer", new HEROsModModPlayer());
 				//if (ModUtils.NetworkMode != NetworkMode.Server)
 
+				UIKit.UIButton.buttonBackground = HEROsMod.instance.GetTexture("Images/UIKit/buttonEdge");
+				UIKit.UIView.closeTexture = HEROsMod.instance.GetTexture("Images/closeButton");
+				UIKit.UITextbox.textboxBackground = HEROsMod.instance.GetTexture("Images/UIKit/textboxEdge");
+				UIKit.UISlider.barTexture = HEROsMod.instance.GetTexture("Images/UIKit/barEdge");
+				UIKit.UIScrollView.ScrollbgTexture = GetTexture("Images/UIKit/scrollbgEdge");
+				UIKit.UIScrollBar.ScrollbarTexture = HEROsMod.instance.GetTexture("Images/UIKit/scrollbarEdge");
+				UIKit.UIDropdown.capUp = HEROsMod.instance.GetTexture("Images/UIKit/dropdownCapUp");
+				UIKit.UIDropdown.capDown = HEROsMod.instance.GetTexture("Images/UIKit/dropdownCapDown");
+				UIKit.UICheckbox.checkboxTexture = HEROsMod.instance.GetTexture("Images/UIKit/checkBox");
+				UIKit.UICheckbox.checkmarkTexture = HEROsMod.instance.GetTexture("Images/UIKit/checkMark");
+
 				Init();
 			}
 			catch (Exception e)
@@ -48,6 +59,18 @@ public override void Load()
 		// Clear EVERYthing, mod is unloaded.
 		public override void Unload()
 		{
+			UIKit.UIComponents.ItemBrowser.Filters = null;
+			UIKit.UIComponents.ItemBrowser.DefaultSorts = null;
+			UIKit.UIButton.buttonBackground = null;
+			UIKit.UIView.closeTexture = null;
+			UIKit.UITextbox.textboxBackground = null;
+			UIKit.UISlider.barTexture = null;
+			UIKit.UIScrollView.ScrollbgTexture = null;
+			UIKit.UIScrollBar.ScrollbarTexture = null;
+			UIKit.UIDropdown.capUp = null;
+			UIKit.UIDropdown.capDown = null;
+			UIKit.UICheckbox.checkboxTexture = null;
+			UIKit.UICheckbox.checkmarkTexture = null;
 			try
 			{
 				KeybindController.bindings.Clear();
@@ -71,6 +94,12 @@ public override void Unload()
 			{
 				ModUtils.DebugText("Unload:\n" + e.Message + "\n" + e.StackTrace + "\n");
 			}
+			extensionMenuService = null;
+			miscOptions = null;
+			_hotbar = null;
+			ServiceController = null;
+			TimeWeatherControlHotbar.Unload();
+			instance = null;
 		}
 
 		public override void PostSetupContent()
@@ -168,15 +197,9 @@ public override bool HijackGetData(ref byte messageType, ref BinaryReader reader
 		// Holds all the loaded services.
 		public static ServiceController ServiceController;
 
-		/// <summary>
-		/// A reference to teh instance of the Graphics Device.
-		/// </summary>
-		public static GraphicsDevice GraphicsDeviceReference;
-
 		public static RenderTarget2D RenderTarget { get; set; }
 
 		private static ServiceHotbar _hotbar;
-
 		public static ServiceHotbar ServiceHotbar
 		{
 			get { return _hotbar; }

diff --git a/HEROsModModPlayer.cs b/HEROsModModPlayer.cs
@@ -17,6 +17,8 @@ namespace HEROsMod
 {
 	public class HEROsModModPlayer : ModPlayer
 	{
+		public override bool Autoload(ref string name) => true;
+
 		public override void SetControls()
 		{
 			if (FlyCam.Enabled)

diff --git a/HEROsModServices/BuffService.cs b/HEROsModServices/BuffService.cs
@@ -24,7 +24,7 @@ internal class BuffService : HEROsModService
 
 		public BuffService()
 		{
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/buffs")/*Main.buffTexture[2]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/buffs")/*Main.buffTexture[2]*/);
 			this.HotbarIcon.Tooltip = "Open Buff Window";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 

diff --git a/HEROsModServices/CheckTileModificationTool.cs b/HEROsModServices/CheckTileModificationTool.cs
@@ -14,7 +14,7 @@ internal class CheckTileModificationTool : HEROsModService
 		public CheckTileModificationTool()
 		{
 			MultiplayerOnly = true;
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/tileModification")/*Main.itemTexture[1999]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/tileModification")/*Main.itemTexture[1999]*/);
 			this.HotbarIcon.Tooltip = "Check Tile for last modification";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 			this.HasPermissionToUse = true;

diff --git a/HEROsModServices/EnemyToggler.cs b/HEROsModServices/EnemyToggler.cs
@@ -15,7 +15,7 @@ internal class EnemyToggler : HEROsModService
 		public EnemyToggler()
 		{
 			this._name = "Enemy Toggler";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/npcIcon"));
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/npcIcon"));
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Disable Enemy Spawns";
 			this._hotbarIcon.Opacity = 1f;

diff --git a/HEROsModServices/ExtensionMenuService.cs b/HEROsModServices/ExtensionMenuService.cs
@@ -19,7 +19,7 @@ public ExtensionMenuService()
 
 			IsHotbar = true;
 
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/extensions"));
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/extensions"));
 			this.HotbarIcon.Tooltip = "Extension Tools";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 

diff --git a/HEROsModServices/GenericExtensionService.cs b/HEROsModServices/GenericExtensionService.cs
@@ -18,7 +18,7 @@ internal class GenericExtensionService : HEROsModService
 		//	_name = "Undefined";
 		//	IsInHotbar = true;
 		//	HotbarParent = hotbar;
-		//	_hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/spawn")/*Main.itemTexture[69]*/);
+		//	_hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/spawn")/*Main.itemTexture[69]*/);
 		//	_hotbarIcon.Tooltip = "Set Spawn Point";
 		//	HotbarIcon.onLeftClick += new EventHandler(button_onLeftClick);
 		//	HotbarIcon.onHover += new EventHandler(button_onHover);

diff --git a/HEROsModServices/GodModeService.cs b/HEROsModServices/GodModeService.cs
@@ -27,7 +27,7 @@ public static bool Enabled
 
 		public GodModeService()
 		{
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/godMode")/*Main.itemTexture[1990]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/godMode")/*Main.itemTexture[1990]*/);
 			this.HotbarIcon.Tooltip = "Toggle God Mode";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 			GodModeToggled += GodModeService_GodModeToggled;

diff --git a/HEROsModServices/GroupInspector.cs b/HEROsModServices/GroupInspector.cs
@@ -18,7 +18,7 @@ public GroupInspector(UIHotbar hotbar)
 			HotbarParent = hotbar;
 			MultiplayerOnly = true;
 			this._name = "Group Inspector";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/manageGroups"));
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/manageGroups"));
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Open Group Management";
 			HEROsModNetwork.LoginService.GroupChanged += LoginService_GroupChanged;

diff --git a/HEROsModServices/InfiniteReach.cs b/HEROsModServices/InfiniteReach.cs
@@ -28,7 +28,7 @@ public InfiniteReach()
 		{
 			Enabled = false;
 			this._name = "Infinite Reach";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/infiniteReach")/*Main.itemTexture[407]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/infiniteReach")/*Main.itemTexture[407]*/);
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Enable Infinite Reach";
 			Disable();

diff --git a/HEROsModServices/InvasionService.cs b/HEROsModServices/InvasionService.cs
@@ -16,7 +16,7 @@ internal class InvasionService : HEROsModService
 
 		public InvasionService()
 		{
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/event")/*Main.itemTexture[14]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/event")/*Main.itemTexture[14]*/);
 			this._hotbarIcon.Tooltip = "Open Event Starter";
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 

diff --git a/HEROsModServices/ItemBanner.cs b/HEROsModServices/ItemBanner.cs
@@ -31,7 +31,7 @@ public ItemBanner(UIHotbar hotbar)
 			HotbarParent = hotbar;
 			MultiplayerOnly = true;
 			this._name = "Item Banner";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/explosives")/*Main.itemTexture[888]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/explosives")/*Main.itemTexture[888]*/);
 			this._hotbarIcon.Tooltip = "Ban Destructive Explosives";
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			HEROsModNetwork.GeneralMessages.ItemBannerToggleByServer += GeneralMessages_BannedItemsToggleByServer;

diff --git a/HEROsModServices/ItemBrowser.cs b/HEROsModServices/ItemBrowser.cs
@@ -12,7 +12,7 @@ internal class ItemBrowser : HEROsModService
 		public ItemBrowser()
 		{
 			this._name = "Item Browser";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/items")/*Main.itemTexture[10]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/items")/*Main.itemTexture[10]*/);
 			this.HotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Item Browser";
 

diff --git a/HEROsModServices/ItemClearer.cs b/HEROsModServices/ItemClearer.cs
@@ -12,7 +12,7 @@ internal class ItemClearer : HEROsModService
 		public ItemClearer()
 		{
 			this._name = "Item Clearer";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/canIcon"));
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/canIcon"));
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Clear Items on Ground";
 		}

diff --git a/HEROsModServices/Login.cs b/HEROsModServices/Login.cs
@@ -30,11 +30,11 @@ public Login()
 			MultiplayerOnly = true;
 			if (_loginTexture == null)
 			{
-				_loginTexture = UIView.GetEmbeddedTexture("Images/login");
+				_loginTexture = HEROsMod.instance.GetTexture("Images/login");
 			}
 			if (_logoutTexture == null)
 			{
-				_logoutTexture = UIView.GetEmbeddedTexture("Images/logout");
+				_logoutTexture = HEROsMod.instance.GetTexture("Images/logout");
 			}
 			this._name = "Login";
 			this._hotbarIcon = new UIImage(_loginTexture);

diff --git a/HEROsModServices/MapRevealer.cs b/HEROsModServices/MapRevealer.cs
@@ -19,7 +19,7 @@ public MapRevealer(UIHotbar hotbar)
 			IsInHotbar = true;
 			HotbarParent = hotbar;
 			this._name = "Map Revealer";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/map")/*ModUtils.RevealMapTexture*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/map")/*ModUtils.RevealMapTexture*/);
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Reveal Map";
 			instance = this;

diff --git a/HEROsModServices/MiscOptions.cs b/HEROsModServices/MiscOptions.cs
@@ -13,7 +13,7 @@ public MiscOptions()
 		{
 			IsHotbar = true;
 
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/settings")/*Main.buffTexture[BuffID.Confused]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/settings")/*Main.buffTexture[BuffID.Confused]*/);
 			this.HotbarIcon.Tooltip = "Misc. Options";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 

diff --git a/HEROsModServices/MobSpawner.cs b/HEROsModServices/MobSpawner.cs
@@ -20,7 +20,7 @@ internal class MobSpawner : HEROsModService
 
 		public MobSpawner()
 		{
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/npcs")/*Main.itemTexture[666]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/npcs")/*Main.itemTexture[666]*/);
 			this.HotbarIcon.Tooltip = "Open Mob Spawn Window";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 

diff --git a/HEROsModServices/PlayerList.cs b/HEROsModServices/PlayerList.cs
@@ -14,7 +14,7 @@ public PlayerList()
 		{
 			MultiplayerOnly = true;
 			this._name = "Player List";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/connectedPlayers"));
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/connectedPlayers"));
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "View Connected Players";
 		}

diff --git a/HEROsModServices/PrefixEditor.cs b/HEROsModServices/PrefixEditor.cs
@@ -15,7 +15,7 @@ internal class PrefixEditor : HEROsModService
 
 		public PrefixEditor()
 		{
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/reforge")/*Main.itemTexture[24]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/reforge")/*Main.itemTexture[24]*/);
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Prefix Editor";
 

diff --git a/HEROsModServices/RegionService.cs b/HEROsModServices/RegionService.cs
@@ -46,7 +46,7 @@ public RegionService()
 			canEdit = false;
 			canView = false;
 			this._name = "Region Service";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/region")/*Main.itemTexture[1337]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/region")/*Main.itemTexture[1337]*/);
 			this.HotbarIcon.Tooltip = "Open regions window";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 			this.HasPermissionToUse = true;

diff --git a/HEROsModServices/ServiceHotbar.cs b/HEROsModServices/ServiceHotbar.cs
@@ -137,9 +137,9 @@ private void InitUI()
 			_iconView.Height = this.Height;
 			this.AddChild(_iconView);
 
-			collapseButton = new UIImage(UIView.GetEmbeddedTexture("Images/CollapseBar/CollapseButtonHorizontal"));
+			collapseButton = new UIImage(HEROsMod.instance.GetTexture("Images/CollapseBar/CollapseButtonHorizontal"));
 			collapseButton.UpdateWhenOutOfBounds = true;
-			collapseArrow = new UIImage(UIView.GetEmbeddedTexture("Images/CollapseBar/CollapseArrowHorizontal"));
+			collapseArrow = new UIImage(HEROsMod.instance.GetTexture("Images/CollapseBar/CollapseArrowHorizontal"));
 			collapseArrow.UpdateWhenOutOfBounds = true;
 			collapseButton.Anchor = AnchorPosition.Top;
 			collapseArrow.Anchor = AnchorPosition.Top;

diff --git a/HEROsModServices/SpawnPointSetter.cs b/HEROsModServices/SpawnPointSetter.cs
@@ -12,7 +12,7 @@ public SpawnPointSetter(UIHotbar hotbar)
 			IsInHotbar = true;
 			HotbarParent = hotbar;
 			this._name = "Spawn Point Setter";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/spawn")/*Main.itemTexture[69]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/spawn")/*Main.itemTexture[69]*/);
 			this._hotbarIcon.Tooltip = "Set Spawn Point";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 		}

diff --git a/HEROsModServices/TimeWeatherChanger.cs b/HEROsModServices/TimeWeatherChanger.cs
@@ -27,7 +27,7 @@ public TimeWeatherChanger()
 
 			TimePaused = false;
 			this._name = "Time Weather Control";
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/timeRain"));
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/timeRain"));
 			this.HotbarIcon.Tooltip = "Change Time/Rain";
 			this.HotbarIcon.onLeftClick += HotbarIcon_onLeftClick;
 
@@ -124,15 +124,15 @@ internal class TimeWeatherControlHotbar : UIHotbar
 		//{
 		//	get
 		//	{
-		//		if (_rainTexture == null) _rainTexture = GetEmbeddedTexture("Images/rainIcon");
+		//		if (_rainTexture == null) _rainTexture = HEROsMod.instance.GetTexture("Images/rainIcon");
 		//		return _rainTexture;
 		//	}
 		//}
 		public static Texture2D playTexture
 		{
 			get
 			{
-				if (_playTexture == null) _playTexture = GetEmbeddedTexture("Images/speed1");
+				if (_playTexture == null) _playTexture = HEROsMod.instance.GetTexture("Images/speed1");
 				return _playTexture;
 			}
 		}
@@ -141,7 +141,7 @@ public static Texture2D pauseTexture
 		{
 			get
 			{
-				if (_pauseTexture == null) _pauseTexture = GetEmbeddedTexture("Images/speed0");
+				if (_pauseTexture == null) _pauseTexture = HEROsMod.instance.GetTexture("Images/speed0");
 				return _pauseTexture;
 			}
 		}
@@ -157,7 +157,7 @@ public TimeWeatherControlHotbar()
 			base.Anchor = AnchorPosition.Top;
 			this.AddChild(this.buttonView);
 
-			//UIImage bStopRain = new UIImage(GetEmbeddedTexture("Images/sunIcon"));
+			//UIImage bStopRain = new UIImage(HEROsMod.instance.GetTexture("Images/sunIcon"));
 			//UIImage bStartRain = new UIImage(rainTexture);
 			//bStartRain.Tooltip = "Start Rain";
 			//bStopRain.Tooltip = "Stop Rain";
@@ -166,10 +166,10 @@ public TimeWeatherControlHotbar()
 			//AddChild(bStopRain);
 			//AddChild(bStartRain);
 
-			//UIImage nightButton = new UIImage(GetEmbeddedTexture("Images/moonIcon"));
+			//UIImage nightButton = new UIImage(HEROsMod.instance.GetTexture("Images/moonIcon"));
 			//nightButton.Tooltip = "Night";
 			//nightButton.onLeftClick += nightButton_onLeftClick;
-			//UIImage noonButton = new UIImage(GetEmbeddedTexture("Images/sunIcon"));
+			//UIImage noonButton = new UIImage(HEROsMod.instance.GetTexture("Images/sunIcon"));
 			//noonButton.Tooltip = "Noon";
 			//noonButton.onLeftClick += noonButton_onLeftClick;
 			//bPause = new UIImage(pauseTexture);
@@ -198,28 +198,28 @@ public override void test()
 			Height = 54;
 			UpdateWhenOutOfBounds = true;
 
-			UIImage bStopRain = new UIImage(GetEmbeddedTexture("Images/rainStop"));
-			UIImage bStartRain = new UIImage(GetEmbeddedTexture("Images/rainIcon"));
+			UIImage bStopRain = new UIImage(HEROsMod.instance.GetTexture("Images/rainStop"));
+			UIImage bStartRain = new UIImage(HEROsMod.instance.GetTexture("Images/rainIcon"));
 			bStartRain.Tooltip = "Start Rain";
 			bStopRain.Tooltip = "Stop Rain";
 			bStartRain.onLeftClick += bStartRain_onLeftClick;
 			bStopRain.onLeftClick += bStopRain_onLeftClick;
 			buttonView.AddChild(bStopRain);
 			buttonView.AddChild(bStartRain);
 
-			UIImage bStopSandstorm = new UIImage(GetEmbeddedTexture("Images/rainStop"));
-			UIImage bStartSandstorm = new UIImage(GetEmbeddedTexture("Images/rainIcon"));
+			UIImage bStopSandstorm = new UIImage(HEROsMod.instance.GetTexture("Images/rainStop"));
+			UIImage bStartSandstorm = new UIImage(HEROsMod.instance.GetTexture("Images/rainIcon"));
 			bStartSandstorm.Tooltip = "Start Sandstorm";
 			bStopSandstorm.Tooltip = "Stop Sandstorm";
 			bStartSandstorm.onLeftClick += bStartSandstorm_onLeftClick;
 			bStopSandstorm.onLeftClick += bStopSandstorm_onLeftClick;
 			buttonView.AddChild(bStopSandstorm);
 			buttonView.AddChild(bStartSandstorm);
 
-			UIImage nightButton = new UIImage(GetEmbeddedTexture("Images/moonIcon"));
+			UIImage nightButton = new UIImage(HEROsMod.instance.GetTexture("Images/moonIcon"));
 			nightButton.Tooltip = "Night";
 			nightButton.onLeftClick += nightButton_onLeftClick;
-			UIImage noonButton = new UIImage(GetEmbeddedTexture("Images/sunIcon"));
+			UIImage noonButton = new UIImage(HEROsMod.instance.GetTexture("Images/sunIcon"));
 			noonButton.Tooltip = "Noon";
 			noonButton.onLeftClick += noonButton_onLeftClick;
 			bPause = new UIImage(TimeWeatherChanger.TimePaused ? playTexture : pauseTexture);
@@ -230,7 +230,7 @@ public override void test()
 			buttonView.AddChild(noonButton);
 			buttonView.AddChild(bPause);
 
-			UIImage sundialButton = new UIImage(GetEmbeddedTexture("Images/timeRain"));
+			UIImage sundialButton = new UIImage(HEROsMod.instance.GetTexture("Images/timeRain"));
 			sundialButton.Tooltip = "Force Enchanted Sundial";
 			sundialButton.onLeftClick += sundialButton_onLeftClick;
 			buttonView.AddChild(sundialButton);
@@ -430,6 +430,12 @@ private void TimeControlWindow_onLeftClick(object sender, EventArgs e)
 			}
 		}
 
+		internal static void Unload()
+		{
+			_playTexture = null;
+			_pauseTexture = null;
+		}
+
 		//public override void Update()
 		//{
 		//	if (this.Visible)

diff --git a/HEROsModServices/ToggleGravestones.cs b/HEROsModServices/ToggleGravestones.cs
@@ -30,7 +30,7 @@ public ToggleGravestones(UIHotbar hotbar)
 			//MultiplayerOnly = true;
 			this._name = "Gravestones Toggler";
 			ModUtils.LoadProjectile(43);
-			this._hotbarIcon = new UIImage(UIView.GetEmbeddedTexture("Images/gravestone")/*Main.projectileTexture[43]*/);
+			this._hotbarIcon = new UIImage(HEROsMod.instance.GetTexture("Images/gravestone")/*Main.projectileTexture[43]*/);
 			this._hotbarIcon.onLeftClick += _hotbarIcon_onLeftClick;
 			this.HotbarIcon.Tooltip = "Disable Gravestones";
 			this._hotbarIcon.Opacity = 1f;