v0.2.5, fix #33

Author: JavidPack

HEROsMod.cs

@@ -116,6 +116,7 @@ public override void Unload()
 			}
 			extensionMenuService = null;
 			miscOptions = null;
+			prefixEditor = null;
 			_hotbar = null;
 			ServiceController = null;
 			TimeWeatherControlHotbar.Unload();
@@ -371,6 +372,7 @@ public void RegisterPermission(string permissionName, string permissionDisplayNa
 		}
 
 		private MiscOptions miscOptions;
+		internal PrefixEditor prefixEditor;
 		private ExtensionMenuService extensionMenuService;
 
 		// TODO, is this ok to do on load rather than on enter?
@@ -404,7 +406,8 @@ public static void LoadAddServices()
 			ServiceController.AddService(new MobSpawner());
 			ServiceController.AddService(new BuffService());
 			ServiceController.AddService(new GodModeService());
-			ServiceController.AddService(new PrefixEditor());
+			instance.prefixEditor = new PrefixEditor();
+			ServiceController.AddService(instance.prefixEditor);
 			//		ServiceController.AddService(new InvasionService());
 			ServiceController.AddService(new Teleporter());
 			ServiceController.AddService(new RegionService());
@@ -563,6 +566,11 @@ public static void GameLeft()
 			ServiceController.MyGroupChanged();
 		}
 
+		public override void PreSaveAndQuit()
+		{
+			instance.prefixEditor.PreSaveAndQuit();
+		}
+
 		//public static void SaveSettings()
 		//{
 		//	InventoryManager.Save();

HEROsMod.csproj

@@ -56,6 +56,10 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Terraria, Version=1.3.5.1, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Terraria\Terraria.exe</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Commands\AdminInstructionsCommand.cs" />
@@ -146,15 +150,9 @@
     <Content Include="build.txt" />
     <Content Include="description.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Modding\tModLoader\src\tModLoader\Terraria.csproj">
-      <Project>{3996d5fa-6e59-4fe4-9f2b-40eeef9645d5}</Project>
-      <Name>Terraria</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>"C:\Program Files (x86)\Steam\steamapps\common\terraria\tModLoaderServerDebug.exe" -build "$(ProjectDir)\" -eac "$(TargetPath)"</PostBuildEvent>
+    <PostBuildEvent>"C:\Program Files (x86)\Steam\steamapps\common\terraria\tModLoaderServer.exe" -build "$(ProjectDir)\" -eac "$(TargetPath)"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

HEROsModServices/PrefixEditor.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Terraria;
+using Terraria.ModLoader;
 
 namespace HEROsMod.HEROsModServices
 {
@@ -39,12 +40,21 @@ public override void MyGroupUpdated()
 		{
 			this.HasPermissionToUse = HEROsModNetwork.LoginService.MyGroup.HasPermission("PrefixEditor");
 			//base.MyGroupUpdated();
+			if (!HasPermissionToUse)
+			{
+				_prefixWindow.bClose_onLeftClick(null, null);
+			}
+		}
+
+		internal void PreSaveAndQuit()
+		{
+			_prefixWindow.bClose_onLeftClick(null, null);
 		}
 	}
 
 	internal class PrefixWindow : UIWindow
 	{
-		private Slot itemSlot;
+		internal Slot itemSlot;
 		private UIScrollView prefixList;
 		private int[] prefixes;
 		private List<Particle> particles;
@@ -89,7 +99,7 @@ public PrefixWindow()
 			UIImage bClsoe = new UIImage(closeTexture);
 			bClsoe.X = Width - bClsoe.Width - LargeSpacing;
 			bClsoe.Y = LargeSpacing;
-			bClsoe.onLeftClick += bClsoe_onLeftClick;
+			bClsoe.onLeftClick += bClose_onLeftClick;
 
 			AddChild(itemSlot);
 			AddChild(prefixList);
@@ -126,12 +136,41 @@ public override void Draw(SpriteBatch spriteBatch)
 			}
 		}
 
-		private void bClsoe_onLeftClick(object sender, EventArgs e)
+		internal void bClose_onLeftClick(object sender, EventArgs e)
 		{
 			this.Visible = false;
+			ClearOutItemSlots();
+		}
+
+		internal void ClearOutItemSlots()
+		{
+			if (!itemSlot.item.IsAir)
+			{
+				Item item = itemSlot.item.Clone();
+
+				Player player = Main.LocalPlayer;
+				item.position = player.Center;
+				Item item2 = player.GetItem(player.whoAmI, item, false, true);
+				if (item2.stack > 0)
+				{
+					int num = Item.NewItem((int)player.position.X, (int)player.position.Y, player.width, player.height, item2.type, item2.stack, false, (int)item.prefix, true, false);
+					Main.item[num].newAndShiny = false;
+					if (Main.netMode == 1)
+					{
+						NetMessage.SendData(21, -1, -1, null, num, 1f, 0f, 0f, 0, 0, 0);
+					}
+					else
+					{
+						ErrorLogger.Log("HerosMod: You left an item in the prefix editor with a full inventory and have lost the item: " + item2.Name);
+					}
+
+				}
+				itemSlot.item.TurnToAir();
+				itemSlot_ItemChanged(null, null);
+			}
 		}
 
-		private void itemSlot_ItemChanged(object sender, EventArgs e)
+		internal void itemSlot_ItemChanged(object sender, EventArgs e)
 		{
 			prefixes = new int[83];
 			for (int i = 0; i < 83; i++)

build.txt

@@ -1,5 +1,6 @@
 author = HERO, jopojelly, Matt Thompson, Everni
-version = 0.2.4
+version = 0.2.5
+versionScheme = ?.?.Fix.Quickfix
 displayName = HERO's Mod
 homepage = http://forums.terraria.org/index.php?threads/heros-mod-creative-mode-server-management-and-over-25-tools-1-3-1-1-compatible.44650/
 buildIgnore = .vs\*, Properties\*, *.csproj, *.user, obj\*, bin\*, *.config, tmod\*, ignore\*, ZVidBuild\*, Images\Old*, Images\AllIcons.psd, .git\*, LICENSE, .gitignore