From 9675ea402094570d2c498bd02a757ef811aa6094 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 29 Jun 2016 14:47:27 -0700 Subject: [PATCH 01/23] UIUtil first draft Function in my tests with my Freight cart stations. --- Utilities/UIUtil.cs | 139 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 Utilities/UIUtil.cs diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs new file mode 100644 index 0000000..6e6573e --- /dev/null +++ b/Utilities/UIUtil.cs @@ -0,0 +1,139 @@ +using System; +using System.Reflection; +using UnityEngine; + +namespace FortressCraft.Community.Utilities +{ + public class UIUtil + { + /// + /// Timer to delay dissociation of UI panel to overcome race condition + /// + public static int UIdelay; + /// + /// Lock to prevent running the dissociation when it isn't needed + /// + public static bool UILock; + + /// + /// Call this in GetPopupText to handle your UI Window + /// + /// Pass the current machine + /// The mod window inherited from BaseMachineWindow + /// + public static bool HandleThisMachineWindow(SegmentEntity theMachine, BaseMachineWindow theWindow) + { + try + { + //GenericMachineManager manager = GenericMachinePanelScript.instance.manager; // not yet + GenericMachineManager manager = typeof(GenericMachinePanelScript).GetField("manager", BindingFlags.NonPublic | + BindingFlags.Instance).GetValue(GenericMachinePanelScript.instance) as GenericMachineManager; + + // this will replace with the current machine's window, which is OK as long as each Mod uses this technique + manager.windows[eSegmentEntity.Mod] = theWindow; + theWindow.manager = manager; + } + catch (Exception ex) + { + //this.error = "Window Registration failed : " + ex.Message; + UnityEngine.Debug.LogError("Window Registration failed : " + ex.Message + " : " + ex.StackTrace); + } + GenericMachinePanelScript panel = GenericMachinePanelScript.instance; + + try + { + // player looking at this machine + if (WorldScript.instance.localPlayerInstance.mPlayerBlockPicker.selectedEntity == theMachine) + { + if (panel.Background_Panel.activeSelf == true) // window is open + { + panel.gameObject.SetActive(true); // undoes the default handler hiding the window + } + + // player interacts with machine + if (Input.GetButtonDown("Interact")) // "E" by default + { + // UIManager.UpdateGenericMachineWindow() -> GenericMachinePanelScript.TryShow() + // default handler will try and fail as intended because our window is not in its dictionary, this is fine + // similarly, the Hide() should not occur because the selectedEntity is this machine (panel.targetEntity) + //Debug.Log("Interacted"); + if (panel.Background_Panel.activeSelf == true) // window is not already opened + { + // Do nothing + } + else // window IS already opened, we pressed to interact again (meaning to close it) + { + Hide(panel); // hide window, since we are not focused on this machine anymore + DragAndDropManager.instance.CancelDrag(); + DragAndDropManager.instance.DisableDragBackground(); + } + } + else if (Input.GetKeyDown(KeyCode.Escape)) // escape should close window also + { + if (panel.isActiveAndEnabled) + UIManager.instance.UnpauseGame(); + Hide(panel); // hide window + DragAndDropManager.instance.CancelDrag(); + DragAndDropManager.instance.DisableDragBackground(); + } + } + else // we are not the selected machine, or no machine is selected; but not due to user input (probably) + { + if (panel.targetEntity == theMachine) // this machine WAS focused with window open a moment ago, so it should handle closing its own window + { + Hide(panel); // hide window, since we are not focused on this machine anymore + DragAndDropManager.instance.CancelDrag(); + DragAndDropManager.instance.DisableDragBackground(); + } + } + } + catch (Exception ex) + { + return false; + } + + return (panel.targetEntity == theMachine); // true if machine window is currently open, false otherwise (such as if Hide() called) + } + + /// + /// Internal sub function for hiding the panel + /// + /// The working panel + public static void Hide(GenericMachinePanelScript panel) + { + UIManager.RemoveUIRules("Machine"); + panel.currentWindow.OnClose(panel.targetEntity); + panel.Scroll_Bar.GetComponent().scrollValue = 0f; + panel.targetEntity = null; + panel.currentWindow = null; + + GenericMachineManager manager = typeof(GenericMachinePanelScript).GetField("manager", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(panel) as GenericMachineManager; + manager.ClearWindow(); + + panel.gameObject.SetActive(false); + panel.Background_Panel.SetActive(false); + } + + /// + /// Insert in machine UnityUpdate to disconnect the UI when finished. + /// + public static void DisconnectUI() + { + if (UIdelay > 30 && UILock) + { + GenericMachinePanelScript panel = GenericMachinePanelScript.instance; + panel.gameObject.SetActive(false); + panel.Background_Panel.SetActive(false); + panel.currentWindow = null; + panel.targetEntity = null; + GenericMachineManager manager2 = typeof(GenericMachinePanelScript).GetField("manager", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(GenericMachinePanelScript.instance) as GenericMachineManager; + manager2.windows.Remove(eSegmentEntity.Mod); + UIManager.RemoveUIRules("Machine"); + DragAndDropManager.instance.CancelDrag(); + DragAndDropManager.instance.DisableDragBackground(); + UILock = false; + } + UIdelay++; + } + } +} From 330b291105c05b53964164f98582a188a650daec Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 29 Jun 2016 14:49:14 -0700 Subject: [PATCH 02/23] Create temp --- Utilities/UIExample/temp | 1 + 1 file changed, 1 insertion(+) create mode 100644 Utilities/UIExample/temp diff --git a/Utilities/UIExample/temp b/Utilities/UIExample/temp new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Utilities/UIExample/temp @@ -0,0 +1 @@ + From 05b82d4328e7b30b30b0c7044277726f695f65c2 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 29 Jun 2016 14:49:40 -0700 Subject: [PATCH 03/23] Example of UIUtil in use --- Utilities/UIExample/FreightCartWindow.cs | 268 +++++++++++++++++++++++ 1 file changed, 268 insertions(+) create mode 100644 Utilities/UIExample/FreightCartWindow.cs diff --git a/Utilities/UIExample/FreightCartWindow.cs b/Utilities/UIExample/FreightCartWindow.cs new file mode 100644 index 0000000..8237cf5 --- /dev/null +++ b/Utilities/UIExample/FreightCartWindow.cs @@ -0,0 +1,268 @@ +using UnityEngine; +using System.Collections.Generic; +using FortressCraft.Community.Utilities; + +public class FreightCartWindow : BaseMachineWindow +{ + public const string InterfaceName = "FreightCartStation"; + + private bool dirty; + private bool ChooseLowStock = false; + + public override void SpawnWindow(SegmentEntity targetEntity) + { + FreightCartStation station = targetEntity as FreightCartStation; + Debug.Log("Before close?"); + //Catch for when the window is called on an inappropriate machine + if (station == null) + { + GenericMachinePanelScript.instance.Hide(); + UIManager.RemoveUIRules("Machine"); + return; + } + //station.UIdelay = 0; + //station.UILock = true; + UIUtil.UIdelay = 0; + UIUtil.UILock = true; + Debug.Log("After close?"); + + this.manager.SetTitle("Freight Cart Station - Register Freight"); + + this.manager.AddButton("switchlowstock", "Edit Low Stock", 25, 0); + this.manager.AddButton("switchhighstock", "Edit High Stock", 175, 0); + + int spacing = 175; + int count = 0; + int offset = 50; + if (station.massStorageCrate != null) + count = FreightCartManager.instance.GetFreightEntries(station.massStorageCrate).Count; + for (int n = 0; n < count + 1; n++) + { + int suffix = n; + if (n == count) + suffix = -1; + this.manager.AddIcon("registry" + suffix, "empty", Color.white, 0, offset + (spacing * n)); + this.manager.AddBigLabel("registrytitle" + n, "Add New Freight", Color.white, 60, offset + (spacing * n)); + if (suffix != -1) + { + this.manager.AddLabel(GenericMachineManager.LabelType.OneLineHalfWidth, "lowstocktitle" + n, "Low Stock Limit", this.ChooseLowStock == true ? Color.white : Color.gray, false, 0, offset + (spacing * n + 40)); + this.manager.AddLabel(GenericMachineManager.LabelType.OneLineHalfWidth, "highstocktitle" + n, "High Stock Limit", this.ChooseLowStock == false ? Color.white : Color.gray, false, 150, offset + (spacing * n + 40)); + this.manager.AddLabel(GenericMachineManager.LabelType.OneLineHalfWidth, "lowstock" + n, "Low Stock Limit", this.ChooseLowStock == true ? Color.white : Color.gray, false, 0, offset + (spacing * n + 60)); + this.manager.AddLabel(GenericMachineManager.LabelType.OneLineHalfWidth, "highstock" + n, "High Stock Limit", this.ChooseLowStock == false ? Color.white : Color.gray, false, 150, offset + (spacing * n + 60)); + this.manager.AddButton("decreasestock" + n, "Decrease Stock", 25, offset + (spacing * n + 100)); + this.manager.AddButton("increasestock" + n, "Increase Stock", 175, offset + (spacing * n + 100)); + } + } + this.dirty = true; + } + + public override void UpdateMachine(SegmentEntity targetEntity) + { + FreightCartStation station = targetEntity as FreightCartStation; + //Catch for when the window is called on an inappropriate machine + if (station == null) + { + GenericMachinePanelScript.instance.Hide(); + UIManager.RemoveUIRules("Machine"); + return; + } + //station.UIdelay = 0; + UIUtil.UIdelay = 0; + List registries = new List(); + if (station.massStorageCrate != null) + registries = FreightCartManager.instance.GetFreightEntries(station.massStorageCrate); + else + return; + + for (int index = 0; index < registries.Count; index++) + { + ItemBase item = registries[index].FreightItem; + int lowstock = registries[index].LowStock; + int highstock = registries[index].HighStock; + + string itemname = ItemManager.GetItemName(item); + string iconname = ItemManager.GetItemIcon(item); + + this.manager.UpdateIcon("registry" + index, iconname, Color.white); + this.manager.UpdateLabel("registrytitle" + index, itemname, Color.white); + this.manager.UpdateLabel("lowstock" + index, registries[index].LowStock.ToString(), this.ChooseLowStock == true ? Color.white : Color.gray); + this.manager.UpdateLabel("highstock" + index, registries[index].HighStock.ToString(), this.ChooseLowStock == false ? Color.white : Color.gray); + this.manager.UpdateLabel("lowstocktitle" + index, "Low Stock Limit", this.ChooseLowStock == true ? Color.white : Color.gray); + this.manager.UpdateLabel("highstocktitle" + index, "High Stock Limit", this.ChooseLowStock == false ? Color.white : Color.gray); + } + if (this.dirty == true) + { + this.UpdateState(station); + this.dirty = false; + } + } + + private void UpdateState(FreightCartStation machine) + { + return; + } + + public override bool ButtonClicked(string name, SegmentEntity targetEntity) + { + FreightCartStation station = targetEntity as FreightCartStation; + + if (name.Contains("registry")) // drag drop to a slot + { + int slotNum = -1; + int.TryParse(name.Replace("registry", ""), out slotNum); //Get slot name as number + List registries = FreightCartManager.instance.GetFreightEntries(station.massStorageCrate); + + if (slotNum > -1) // valid slot + { + //clear registry + FreightCartManager.instance.RemoveRegistry(station.massStorageCrate, registries[slotNum].FreightItem); + this.manager.RedrawWindow(); + } + + return true; + } + else if (name.Contains("switchlowstock")) + { + this.ChooseLowStock = true; + this.manager.RedrawWindow(); + } + else if (name.Contains("switchhighstock")) + { + this.ChooseLowStock = false; + this.manager.RedrawWindow(); + } + else if (name.Contains("decreasestock")) + { + int slotNum = -1; + int.TryParse(name.Replace("decreasestock", ""), out slotNum); //Get slot name as number + List registries = FreightCartManager.instance.GetFreightEntries(station.massStorageCrate); + + if (slotNum > -1) // valid slot + { + int amount = 100; + if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)) + amount = 10; + if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl)) + amount = 1; + if (Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt)) + amount = 1000; + + int stock; + if (this.ChooseLowStock) + { + stock = registries[slotNum].LowStock - amount; + if (stock < 0) + stock = 0; + FreightCartManager.instance.UpdateRegistry(station.massStorageCrate, registries[slotNum].FreightItem, stock, registries[slotNum].HighStock); + this.manager.UpdateLabel("lowstock" + slotNum, stock.ToString(), Color.white); + } + else + { + stock = registries[slotNum].HighStock - amount; + if (stock < 0) + stock = 0; + FreightCartManager.instance.UpdateRegistry(station.massStorageCrate, registries[slotNum].FreightItem, registries[slotNum].LowStock, stock); + this.manager.UpdateLabel("highstock" + slotNum, stock.ToString(), Color.white); + } + } + } + else if (name.Contains("increasestock")) + { + int slotNum = -1; + int.TryParse(name.Replace("increasestock", ""), out slotNum); //Get slot name as number + List registries = FreightCartManager.instance.GetFreightEntries(station.massStorageCrate); + + if (slotNum > -1) // valid slot + { + int amount = 100; + if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)) + amount = 10; + if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl)) + amount = 1; + if (Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt)) + amount = 1000; + + int stock; + if (this.ChooseLowStock) + { + stock = registries[slotNum].LowStock + amount; + FreightCartManager.instance.UpdateRegistry(station.massStorageCrate, registries[slotNum].FreightItem, stock, registries[slotNum].HighStock); + this.manager.UpdateLabel("lowstock" + slotNum, stock.ToString(), Color.white); + } + else + { + stock = registries[slotNum].HighStock + amount; + FreightCartManager.instance.UpdateRegistry(station.massStorageCrate, registries[slotNum].FreightItem, registries[slotNum].LowStock, stock); + this.manager.UpdateLabel("highstock" + slotNum, stock.ToString(), Color.white); + } + } + } + + return false; + } + + public override ItemBase GetDragItem(string name, SegmentEntity targetEntity) + { + FreightCartStation machine = targetEntity as FreightCartStation; + + return null; + } + + public override bool RemoveItem(string name, ItemBase originalItem, ItemBase swapitem, SegmentEntity targetEntity) + { + FreightCartStation machine = targetEntity as FreightCartStation; + + return false; + } + + public override void HandleItemDrag(string name, ItemBase draggedItem, DragAndDropManager.DragRemoveItem dragDelegate, SegmentEntity targetEntity) + { + FreightCartStation station = targetEntity as FreightCartStation; + if (station.massStorageCrate == null) + return; + + if (name.Contains("registry")) // drag drop to a slot + { + int slotNum = -1; + int.TryParse(name.Replace("registry", ""), out slotNum); //Get slot name as number + + if (slotNum == -1) // valid slot + { + if (this.manager.mWindowLookup[name + "_icon"].GetComponent().spriteName == "empty") + { + FreightCartManager.instance.AddRegistry(station.massStorageCrate, draggedItem, 0, 0); + this.manager.RedrawWindow(); + } + //machine.filterCubeId[slotNum] = cubeId; + //machine.filterCubeValue[slotNum] = cubeValue; + //machine.filterItem[slotNum] = draggedItem.mnItemID; + //UnityEngine.Debug.LogError("SET: " + cubeId + " : " + cubeValue + " : " + draggedItem.mnItemID + " : " + draggedItem.mType); + + //UnityEngine.Debug.LogError("item set"); + } + } + + return; + } + + public static NetworkInterfaceResponse HandleNetworkCommand(Player player, NetworkInterfaceCommand nic) + { + FreightCartStation station = nic.target as FreightCartStation; + + string command = nic.command; + if (command != null) + { + if (command == "test") + { + // do whatever + } + } + + return new NetworkInterfaceResponse + { + entity = station, + inventory = player.mInventory + }; + } +} + From 4cac007a0ab9bdd25b0ca67dd5fd430c7aa4b6ff Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 29 Jun 2016 14:50:01 -0700 Subject: [PATCH 04/23] No longer needed --- Utilities/UIExample/temp | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Utilities/UIExample/temp diff --git a/Utilities/UIExample/temp b/Utilities/UIExample/temp deleted file mode 100644 index 8b13789..0000000 --- a/Utilities/UIExample/temp +++ /dev/null @@ -1 +0,0 @@ - From c2fc1ce0eac062498566ce0ca2647a51ed00d6e5 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 29 Jun 2016 14:58:55 -0700 Subject: [PATCH 05/23] Update for credits --- Utilities/UIUtil.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index 6e6573e..e30b8d1 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -4,6 +4,9 @@ namespace FortressCraft.Community.Utilities { + /// + /// Simple cross-mod compatible UI support. Original code by BinaryAlgorithm, updated by steveman0 + /// public class UIUtil { /// From 13b2af18ba1d791a7ae52019b18a0524c2e71589 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Tue, 5 Jul 2016 13:49:44 -0700 Subject: [PATCH 06/23] Fixed bug with Compare Properly compares cube values with itembase type. --- Utilities/ItemBaseUtil.cs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Utilities/ItemBaseUtil.cs b/Utilities/ItemBaseUtil.cs index 4b6f2bb..e6797d7 100644 --- a/Utilities/ItemBaseUtil.cs +++ b/Utilities/ItemBaseUtil.cs @@ -33,7 +33,17 @@ public static Boolean CompareDeep(this ItemBase original, ItemBase comparer) /// True if ItemID and Type of both Items match, otherwise false public static bool Compare(this ItemBase original, ItemBase comparer) { - return original.mnItemID == comparer.mnItemID && original.mType == comparer.mType; + if (original == null || comparer == null) + return false; + if (original.mType == comparer.mType) + { + if (original.mType == ItemType.ItemCubeStack && comparer.mType == ItemType.ItemCubeStack) + return (original as ItemCubeStack).CompareCubes(comparer as ItemCubeStack); + else + return original.mnItemID == comparer.mnItemID && original.mType == comparer.mType; + } + else + return false; } /// @@ -43,10 +53,10 @@ public static bool Compare(this ItemBase original, ItemBase comparer) /// Original Item /// Item to Compare Against /// True if ItemID, Type, CubeType, CubeValue of both Items match, otherwise false - public static bool Compare(this ItemCubeStack original, ItemCubeStack comparer) + public static bool CompareCubes(this ItemCubeStack original, ItemCubeStack comparer) { // We'll ignore the original stacks for now. May revisit in the future - return original != null && comparer != null && original.Compare(comparer.As()) && + return original != null && comparer != null && original.mCubeType == comparer.mCubeType && original.mCubeValue == comparer.mCubeValue; // && original.mnAmount == comparer.mnAmount; } @@ -183,14 +193,15 @@ public static void DecrementStack(this ItemBase item, Int32 amount = 1) /// /// The Item Stack /// The amount of Items - public static void SetAmount(this ItemBase item, Int32 amount) + public static ItemBase SetAmount(this ItemBase item, Int32 amount) { if (!item.IsStack()) - return; + return item; if (item.mType == ItemType.ItemCubeStack) item.As().mnAmount = amount; if (item.mType == ItemType.ItemStack) item.As().mnAmount = amount; + return item; } /// From 336ca6c64dca61563942dfe06978d4bf854ab245 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 6 Jul 2016 16:25:11 -0700 Subject: [PATCH 07/23] temp --- bin/temp | 1 + 1 file changed, 1 insertion(+) create mode 100644 bin/temp diff --git a/bin/temp b/bin/temp new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/bin/temp @@ -0,0 +1 @@ + From 261a02fe4715cfcf6cc81b37ab2f2430dc4716e8 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 6 Jul 2016 16:26:04 -0700 Subject: [PATCH 08/23] Latest compile --- bin/FCECommunityTools.dll | Bin 0 -> 25088 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 bin/FCECommunityTools.dll diff --git a/bin/FCECommunityTools.dll b/bin/FCECommunityTools.dll new file mode 100644 index 0000000000000000000000000000000000000000..f34ae144edffb4a6f55f0e57890e614c35b853e4 GIT binary patch literal 25088 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 x6G!93v1pez9k34f=g@m6Ea8ioH) Date: Wed, 6 Jul 2016 16:26:22 -0700 Subject: [PATCH 09/23] not needed --- bin/temp | 1 - 1 file changed, 1 deletion(-) delete mode 100644 bin/temp diff --git a/bin/temp b/bin/temp deleted file mode 100644 index 8b13789..0000000 --- a/bin/temp +++ /dev/null @@ -1 +0,0 @@ - From f97d1cf1b6761e2cfc2c1f62c183cc4802b3e2b3 Mon Sep 17 00:00:00 2001 From: steveman0 Date: Wed, 6 Jul 2016 16:26:43 -0700 Subject: [PATCH 10/23] Help comments --- bin/FCECommunityTools.XML | 639 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 639 insertions(+) create mode 100644 bin/FCECommunityTools.XML diff --git a/bin/FCECommunityTools.XML b/bin/FCECommunityTools.XML new file mode 100644 index 0000000..c7a7600 --- /dev/null +++ b/bin/FCECommunityTools.XML @@ -0,0 +1,639 @@ + + + + FCECommunityTools + + + +

+ A community interface to allow cross-mod communication for item storage + + + + + Checks to see if a Storage Medium has any items + + True if the storage medium has any item, false otherwise + + + + Checks to see if a Storage Medium has the specified item + + Checks for Ore/Item/Cube + + The Item to Check For + True if the storage medium has the specified item, false otherwise + + + + Checks to see if a Storage Medium has the specified item + + Checks for Ore/Item/Cube + + The Item to Check For + Stores the amount of the items available + True if the storage medium has the specified item, false otherwise + + + + Checks to see if a Storage Medium has amount capcity free + + The amount of capcity to check for + True if the storage medium has amount capacity free, otherwise false + + + + Get the free capcity of the entity + + The free capcity of the entity + + + + Attempts to give the Item to a Storage Medium + + The Item to give to a Storage Medium + True if the Storage Medium accepted the item, otherwise false + + + + Attempts to take an Item from a Storage Medium + + The Item to Retrieve + An ItemBase if the requested Item was found, otherwise null + + + + Attempts to take any item from a Storage Medium + + An ItemBase if there's something to return, or null if empty + + + + Extension Methods and Helpers for the ItemBase Class + + + Extension Methods and Helpers for the ItemBase Class + + + + + Gets the amount of items and cubes in any type of Enumerable ItemBase + + The list of items to get the total count from + The amount of Items and Cubes + + + + Gets the amount of items in any type of Enumerable ItemBase + + The list of items to get the total count from + The unique id of the item to count + The amount of Items + + + + Gets the amount of cubes in any type of Enumerable ItemBase + + + + + The amount of Cubes + + + + Gets the amount of cubes OR items from any Enumerable ItemBase, based off of an ItemBase + + The list of items to get the total count from + The ItemBase which to restrain the Count to + The amount of Cubes or Items + + + + Adds an ItemBase to a list, consolidating stacks - obeys list storage capacity by returning excess items + + The item to add to the list + The list to transfer it to + If true returns partial stack when insufficient stack size found + The list's storage capacity + The remaining items that do not fit in the list + + + + Deduct an item from an item list by example + + The example item to attempt to remove from the list + The list to take the item from + If true returns partial stack when insufficient stack size found + The ItemBase object or null if unavailable + + + + Moves specified amount of any items from one list to another obeying target storage capacity. + + Source list of items + Target list of items + Quantity of items to move + Storage capacity of target item list + Moves only the first item found + A list of items to server as a whitelist or blacklist for transferring + True if whitelist otherwise treat as a blacklist + + + + Moves specified amount of any items from one list to another obeying target storage capacity. + + Source item to move + Target list of items + Quantity of items to move (for stacks) + Storage capacity of target item list + Moves only the first item found + A list of items to server as a whitelist or blacklist for transferring + True if whitelist otherwise treat as a blacklist + + + + Compares all possible + + The original ItemBase + The ItemBase to Compare Against + True if all major properties match + + + + Compare the ItemID and Type values of ItemBase + + Original Item + Item to Compare Against + True if ItemID and Type of both Items match, otherwise false + + + + Compares the ItemID, Type, CubeType, and CubeValue values of ItemCubeStack + Does not compare the Amounts + + Original Item + Item to Compare Against + True if ItemID, Type, CubeType, CubeValue of both Items match, otherwise false + + + + Compares the ItemID, Type, CurrentDurability, and MaxDurability values of ItemDurability + + Original Item + Item to Compare Against + True if ItemID, Type, CurrentDurability, and MaxDurability of both Items match, otherwise false + + + + Compares the ItemID and Type values of ItemStack + + Original Item + Item to Compare Against + True if ItemID and Type of both Items match, otherwise false + + + + Compares ItemID and Type values of ItemSingle + + Original Item + Item to Compare Against + True if ItemID and Type of both Items match, otherwise false + + + + Compares ItemID, Type, and ChargeLevel of ItemCharge + + Original Item + Item to Compare Against + True if ItemID, Type and ChargeLevel of both Items match, otherwise false + + + + Compares ItemID, Type, LocationX, LocationY, LocationZ, LookVectorX, LookVectorY amd LookVectoryZ of ItemLocation + + Original Item + Item to Compare Against + + True if ItemID, Type, LocationX, LocationY, LocationZ, LookVectorX, LookVectorY amd LookVectoryZ of both Items + match, otherwise false + + + + + Is the Item original Stack Type + + The Item + True if Item is original Stack, otherwise False + + + + Compares two Items to check if they are both stacks and identical + + The original Item + The item to compare against + True if both Items are stacks and the same + + + + Increases the Stack Size by the specified amount + + The Item Stack + The amount to increment by (Default: 1) + + + + Decrement the Stack Size by the specified amount + + The Item Stack + The amount to increment by (Default: 1) + + + + Set the amount of items in original Item Stack + + The Item Stack + The amount of Items + + + + Creates original new instance of the ItemBase type + + The original to create original new instance of + The new original, or null if unknown type + + + + Gets the amount of items in an ItemBase, while being Stack friendly + + The original + The amount of items + + + + Convert a ItemBase into a class that inherits ItemBase + + Class that Inherits ItemBase + The entity to convert + The entity as + + + + A Float Equals method with tolerance. + Based off of: https://msdn.microsoft.com/en-us/library/ya2zha7s.aspx + + + + + Checks the N/E/S/W/Up/Down directions of the Center block for any SegmentEntitys of T; + Will report whether there was a failure because a segment wasn't loaded. + + The SegmentEntity class to search for. + The MachineEntity to Search Around + Whether or not a Null Segment was Encountered + + + + + Extension Methods and Helpers for the GameObject class + + + + + Stores all of the GameObjects from the Games Resources into a cached object + + + + + Gets a GameObject from the Resources + Originally created by binaryalgorithm & steveman0 + + The Name of the GameObject to retrieve + The named GameObject, or null + + + + Generic machine inventory class with list inventory support + + Origianl code by steveman0 + + + + For associating the machine owner of the inventory + + + + + For associating the mob owner of the inventory + + + + + The total item capacity of the storage + + + + + The list of items in the inventory + + + + + Generic machine inventory class with list inventory support + + For associating the owner machine + The storage capacity of the inventory + + + + Generic machine inventory class with list inventory support + + For associating the owner mob + The storage capacity of the inventory + + + + Add a single item type to the inventory + + The item to add + Amount of items added if given a stack + Returns the remainder that doesn't fit or null if successful + + + + Add items from a source inventory or item list + + The source inventory or list of items + The number of items to transfer + + + + Transfers items to machine inventory if they are on the provided whitelist + + Source inventory or list of items + List of items types allowed in the transfer + Number of items to add + + + + Transfers items to machine inventory if they are on the provided whitelist + + Source inventory or list of items + Item type allowed in the transfer + Number of items to add + + + + Transfers items to machine inventory if they are not on the provided blacklist + + Source inventory or list of items + List of items forbidden from transfer + Number of items to add + + + + Transfers items to machine inventory if they are not on the provided blacklist + + Source inventory or list of items + Item forbidden from transfer + Number of items to add + + + + Fills the inventory to capacity with source items + + Source items to fill the inventory + + + + Fills the inventory to capacity with source items + + Source items to fill the inventory + Item type allowed in the transfer + + + + Fills the inventory to capacity with source items + + Source items to fill the inventory + Item type allowed in the transfer + + + + Fills the inventory to capacity with source items + + Source items to fill the inventory + Item forbidden from transfer + + + + Fills the inventory to capacity with source items + + Source items to fill the inventory + Item forbidden from transfer + + + + Empty the inventory of items + + Target inventory or list + Maximum number of items to take + + + + Return item from inventory by example (obeys stack size) + + Example item to find in inventory + Returns the item or null if unavailable or insufficient stack size + + + + Return item from inventory by example including partial item stack + + Example item to find in inventory + Returns the item or partial stack (null if item not found) + + + + Remove any single item type from the inventory + + Amount to remove (for stacks) + The ItemBase removed from inventory + + + + Remove items from inventory if items are on the whitelist + + The target inventory or list to store the items + The list of items allowed to transfer + Storage capacity of target inventory + Amount of items to move in this transfer + + + + Remove items from inventory if items are on the whitelist + + The target inventory or list to store the items + Item allowed to transfer + Storage capacity of target inventory + Amount of items to move in this transfer + + + + Remove items from inventory if items are not on the blacklist + + The target inventory or list to store the items + The list of items forbidden from transfer + Storage capacity of target inventory + Amount of items to move in this transfer + + + + Remove items from inventory if items are not on the blacklist + + The target inventory or list to store the items + Item forbidden from transfer + Storage capacity of target inventory + Amount of items to move in this transfer + + + + Returns the spare capacity of the inventory + + The spare capacity of the inventory + + + + Returns the current number of items in the inventory + + Current number of items in inventory + + + + Helper logic for checking if the inventory has space + + + + + + Helper logic for checking if the inventory is empty + + + + + + Helper logic for checking if the inventory is full + + + + + + Item drop code for emptying the inventory on the ground on machine delete + + + + + Item drop code for emptying the inventory on the ground on mob delete + + + + + Generic serialization function for writing the inventory to disk + + + + + + Generic serialization function for reading the inventory from disk + + + + + + Extension Methods and Helpers for the SegmentEntity class + + + + + Convert a SegmentEntity into a class that inherit SegmentEntity + + Class that Inherits SegmentEntity + The entity to convert + The entity as TSegmentEntity + + + + Simple cross-mod compatible UI support. Original code by BinaryAlgorithm, updated by steveman0 + + + + + Timer to delay dissociation of UI panel to overcome race condition + + + + + Lock to prevent running the dissociation when it isn't needed + + + + + Call this in GetPopupText to handle your UI Window + + Pass the current machine + The mod window inherited from BaseMachineWindow + + + + + Internal sub function for hiding the panel + + The working panel + + + + Insert in machine UnityUpdate to disconnect the UI when finished. + + + + + A class that provides Interopability between Storage and Machines for Pre-StorageInterface mods + + + + + Checks to see if the entity has any items + + A SegmentEntity + True if the entity has any items, false otherwise + + + + + + + + + + + + Will attempt to return the requested item from the entity + + The entity to try and get the item from + The ItemBase with details of what to retrrieve + + + + + Will return any item from the entity + + The entity to get a item from + A item, or NULL + + + + This interface needs to mimic CommunityItemInterface's methods, + but take a SegmentEntity as the first param. + + + + From 22b61aa4678bf10c379bb2e64d135e5126050922 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 19 Jul 2016 14:58:57 -0700 Subject: [PATCH 11/23] Missing machine inventory --- Utilities/MachineInventory.cs | 409 ++++++++++++++++++++++++++++++++++ 1 file changed, 409 insertions(+) create mode 100644 Utilities/MachineInventory.cs diff --git a/Utilities/MachineInventory.cs b/Utilities/MachineInventory.cs new file mode 100644 index 0000000..7d106ca --- /dev/null +++ b/Utilities/MachineInventory.cs @@ -0,0 +1,409 @@ +using System.Collections.Generic; +using System.IO; +using UnityEngine; + +namespace FortressCraft.Community.Utilities +{ + /// + /// Generic machine inventory class with list inventory support + /// + /// Origianl code by steveman0 + public class MachineInventory + { + /// + /// For associating the machine owner of the inventory + /// + public MachineEntity Machine; + + /// + /// For associating the mob owner of the inventory + /// + public MobEntity Mob; + + /// + /// The total item capacity of the storage + /// + public int StorageCapacity; + + /// + /// The list of items in the inventory + /// + public List Inventory; + + /// + /// Generic machine inventory class with list inventory support + /// + /// For associating the owner machine + /// The storage capacity of the inventory + public MachineInventory(MachineEntity machineentity, int storagecapacity) + { + this.Machine = machineentity; + this.StorageCapacity = storagecapacity; + this.Inventory = new List(); + } + + /// + /// Generic machine inventory class with list inventory support + /// + /// For associating the owner mob + /// The storage capacity of the inventory + public MachineInventory(MobEntity mobentity, int storagecapacity) + { + this.Mob = mobentity; + this.StorageCapacity = storagecapacity; + this.Inventory = new List(); + } + + /// + /// Add a single item type to the inventory + /// + /// The item to add + /// Amount of items added if given a stack + /// Returns the remainder that doesn't fit or null if successful + public ItemBase AddItem(ItemBase item, int amount = 1) + { + return ItemBaseUtil.AddListItem(item, ref this.Inventory, true, this.StorageCapacity); + } + + /// + /// Add items from a source inventory or item list + /// + /// The source inventory or list of items + /// The number of items to transfer + public void AddItem(ref List items, int amount = 1) + { + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, amount, this.StorageCapacity, false); + } + + /// + /// Transfers items to machine inventory if they are on the provided whitelist + /// + /// Source inventory or list of items + /// List of items types allowed in the transfer + /// Number of items to add + public void AddWhiteList(ref List items, IEnumerable whitelist, int amount = 1) + { + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, amount, this.StorageCapacity, false, whitelist, true); + } + + /// + /// Transfers items to machine inventory if they are on the provided whitelist + /// + /// Source inventory or list of items + /// Item type allowed in the transfer + /// Number of items to add + public void AddWhiteList(ref List items, ItemBase whitelist, int amount = 1) + { + ItemBase[] WhiteList = new[] { whitelist }; + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, amount, this.StorageCapacity, false, WhiteList, true); + } + + /// + /// Transfers items to machine inventory if they are not on the provided blacklist + /// + /// Source inventory or list of items + /// List of items forbidden from transfer + /// Number of items to add + public void AddBlackList(ref List items, IEnumerable blacklist, int amount = 1) + { + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, amount, this.StorageCapacity, false, blacklist, false); + } + + + + /// + /// Transfers items to machine inventory if they are not on the provided blacklist + /// + /// Source inventory or list of items + /// Item forbidden from transfer + /// Number of items to add + public void AddBlackList(ref List items, ItemBase blacklist, int amount = 1) + { + ItemBase[] BlackList = new[] { blacklist }; + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, amount, this.StorageCapacity, false, BlackList, false); + } + + /// + /// Fills the inventory to capacity with source items + /// + /// Source items to fill the inventory + public void Fill(ref List items) + { + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, this.SpareCapacity(), this.StorageCapacity); + } + + /// + /// Fills the inventory to capacity with source items + /// + /// Source items to fill the inventory + /// Item type allowed in the transfer + public void FillWhiteList(ref List items, IEnumerable whitelist) + { + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, this.SpareCapacity(), this.StorageCapacity, false, whitelist, true); + } + + /// + /// Fills the inventory to capacity with source items + /// + /// Source items to fill the inventory + /// Item type allowed in the transfer + public void FillWhiteList(ref List items, ItemBase whitelist) + { + ItemBase[] WhiteList = new[] { whitelist }; + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, this.SpareCapacity(), this.StorageCapacity, false, WhiteList, true); + } + + /// + /// Fills the inventory to capacity with source items + /// + /// Source items to fill the inventory + /// Item forbidden from transfer + public void FillBlackList(ref List items, IEnumerable blacklist) + { + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, this.SpareCapacity(), this.StorageCapacity, false, blacklist, false); + } + + /// + /// Fills the inventory to capacity with source items + /// + /// Source items to fill the inventory + /// Item forbidden from transfer + public void FillBlackList(ref List items, ItemBase blacklist) + { + ItemBase[] BlackList = new[] { blacklist }; + ItemBaseUtil.MoveItems(ref items, ref this.Inventory, this.SpareCapacity(), this.StorageCapacity, false, BlackList, false); + } + + /// + /// Empty the inventory of items + /// + /// Target inventory or list + /// Maximum number of items to take + public void Empty(ref List items, int amount) + { + ItemBaseUtil.MoveItems(ref this.Inventory, ref items, amount); + } + + /// + /// Return item from inventory by example (obeys stack size) + /// + /// Example item to find in inventory + /// Returns the item or null if unavailable or insufficient stack size + public ItemBase RemoveItem(ItemBase item) + { + return ItemBaseUtil.RemoveListItem(item, ref this.Inventory, false); + } + + /// + /// Return item from inventory by example including partial item stack + /// + /// Example item to find in inventory + /// Returns the item or partial stack (null if item not found) + public ItemBase RemovePartialStack(ItemBase item) + { + return ItemBaseUtil.RemoveListItem(item, ref this.Inventory, true); + } + + /// + /// Remove any single item type from the inventory + /// + /// Amount to remove (for stacks) + /// The ItemBase removed from inventory + public ItemBase RemoveAnySingle(int amount = 1) + { + List output = new List(); + ItemBaseUtil.MoveItems(ref this.Inventory, ref output, amount, amount, true); + if (output.Count == 0) + return null; + return output[0]; + } + + /// + /// Remove items from inventory if items are on the whitelist + /// + /// The target inventory or list to store the items + /// The list of items allowed to transfer + /// Storage capacity of target inventory + /// Amount of items to move in this transfer + public void RemoveWhiteList(ref List items, IEnumerable whitelist, int storagecapacity = int.MaxValue, int amount = 1) + { + ItemBaseUtil.MoveItems(ref this.Inventory, ref items, amount, storagecapacity, false, whitelist, true); + } + + /// + /// Remove items from inventory if items are on the whitelist + /// + /// The target inventory or list to store the items + /// Item allowed to transfer + /// Storage capacity of target inventory + /// Amount of items to move in this transfer + public void RemoveWhiteList(ref List items, ItemBase whitelist, int storagecapacity = int.MaxValue, int amount = 1) + { + ItemBase[] WhiteList = new [] { whitelist }; + ItemBaseUtil.MoveItems(ref this.Inventory, ref items, amount, storagecapacity, false, WhiteList, true); + } + + /// + /// Remove items from inventory if items are not on the blacklist + /// + /// The target inventory or list to store the items + /// The list of items forbidden from transfer + /// Storage capacity of target inventory + /// Amount of items to move in this transfer + public void RemoveBlackList(ref List items, IEnumerable blacklist, int storagecapacity = int.MaxValue, int amount = 1) + { + ItemBaseUtil.MoveItems(ref this.Inventory, ref items, amount, storagecapacity, false, blacklist, false); + } + + /// + /// Remove items from inventory if items are not on the blacklist + /// + /// The target inventory or list to store the items + /// Item forbidden from transfer + /// Storage capacity of target inventory + /// Amount of items to move in this transfer + public void RemoveBlackList(ref List items, ItemBase blacklist, int storagecapacity = int.MaxValue, int amount = 1) + { + ItemBase[] BlackList = new[] { blacklist }; + ItemBaseUtil.MoveItems(ref this.Inventory, ref items, amount, storagecapacity, false, BlackList, false); + } + + /// + /// Returns the spare capacity of the inventory + /// + /// The spare capacity of the inventory + public int SpareCapacity() + { + return this.StorageCapacity - this.Inventory.GetItemCount(); + } + + /// + /// Returns the current number of items in the inventory + /// + /// Current number of items in inventory + public int ItemCount() + { + return this.Inventory.GetItemCount(); + } + + /// + /// Helper logic for checking if the inventory has space + /// + /// + public bool HasSpareCapcity() + { + return this.SpareCapacity() > 0; + } + + /// + /// Helper logic for checking if the inventory is empty + /// + /// + public bool IsEmpty() + { + return this.ItemCount() == 0; + } + + /// + /// Helper logic for checking if the inventory is full + /// + /// + public bool IsFull() + { + return this.ItemCount() >= this.StorageCapacity; + } + + /// + /// Item drop code for emptying the inventory on the ground on machine delete + /// + public void DropOnDelete() + { + if (this.Machine == null) + { + Debug.LogWarning("Tried to drop machine inventory when not associated with a machine!"); + return; + } + if (!WorldScript.mbIsServer) + return; + System.Random random = new System.Random(); + for (int index = 0; index < this.Inventory.Count; ++index) + { + if (this.Inventory[index] != null) + { + Vector3 velocity = new Vector3((float)random.NextDouble() - 0.5f, (float)random.NextDouble() - 0.5f, (float)random.NextDouble() - 0.5f); + ItemManager.instance.DropItem(this.Inventory[index], this.Machine.mnX, this.Machine.mnY, this.Machine.mnZ, velocity); + } + } + this.Inventory = null; + } + + /// + /// Item drop code for emptying the inventory on the ground on mob delete + /// + public void DropOnMobDelete() + { + if (this.Mob == null) + { + Debug.LogWarning("Tried to drop mob inventory when not associated with a mob!"); + return; + } + if (!WorldScript.mbIsServer) + return; + System.Random random = new System.Random(); + for (int index = 0; index < this.Inventory.Count; ++index) + { + if (this.Inventory[index] != null) + { + Vector3 velocity = new Vector3((float)random.NextDouble() - 0.5f, (float)random.NextDouble() - 0.5f, (float)random.NextDouble() - 0.5f); + ItemManager.instance.DropItem(this.Inventory[index], this.Mob.mnX, this.Mob.mnY, this.Mob.mnZ, velocity); + } + } + this.Inventory = null; + } + + /// + /// Generic serialization function for writing the inventory to disk + /// + /// + public void WriteInventory(BinaryWriter writer) + { + int listcount = this.Inventory.Count; + int version = 0; + + writer.Write(version); + writer.Write(listcount); + for (int index = 0; index < listcount; ++index) + { + ItemFile.SerialiseItem(this.Inventory[index], writer); + } + } + + /// + /// Generic serialization function for reading the inventory from disk + /// + /// + public void ReadInventory(BinaryReader reader) + { + int listcount; + int version = reader.ReadInt32(); + + switch (version) + { + case 0: + listcount = reader.ReadInt32(); + for (int index = 0; index < listcount; ++index) + { + ItemBase item = ItemFile.DeserialiseItem(reader); + if (item != null) + this.Inventory.Add(item); + else + Debug.LogError("Machine inventory tried to read in a null item! Corrupt save?"); + } + break; + default: + Debug.LogError("Attempted to read Machine inventory version that does not exist!"); + break; + } + } + } +} From bbd30ce4a728a36fa96b097f963c5190aff23dd6 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 19 Jul 2016 23:47:27 -0700 Subject: [PATCH 12/23] Added EscapeUI function --- Utilities/UIUtil.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index e30b8d1..785bcf8 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -122,7 +122,7 @@ public static void Hide(GenericMachinePanelScript panel) /// public static void DisconnectUI() { - if (UIdelay > 30 && UILock) + if (UIdelay > 50 && UILock) { GenericMachinePanelScript panel = GenericMachinePanelScript.instance; panel.gameObject.SetActive(false); @@ -138,5 +138,22 @@ public static void DisconnectUI() } UIdelay++; } + + /// + /// An emergency escape function when looking at the wrong machine + /// + public static void EscapeUI() + { + GenericMachinePanelScript panel = GenericMachinePanelScript.instance; + panel.gameObject.SetActive(false); + panel.Background_Panel.SetActive(false); + panel.currentWindow = null; + panel.targetEntity = null; + GenericMachineManager manager2 = typeof(GenericMachinePanelScript).GetField("manager", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(GenericMachinePanelScript.instance) as GenericMachineManager; + manager2.windows.Remove(eSegmentEntity.Mod); + UIManager.RemoveUIRules("Machine"); + DragAndDropManager.instance.CancelDrag(); + DragAndDropManager.instance.DisableDragBackground(); + } } } From 595e7652e6a2a7fc45b2b252e5939b23d3251630 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 19 Jul 2016 23:47:58 -0700 Subject: [PATCH 13/23] Latest bin --- bin/FCECommunityTools.XML | 5 +++++ bin/FCECommunityTools.dll | Bin 25088 -> 25088 bytes 2 files changed, 5 insertions(+) diff --git a/bin/FCECommunityTools.XML b/bin/FCECommunityTools.XML index c7a7600..9eca64d 100644 --- a/bin/FCECommunityTools.XML +++ b/bin/FCECommunityTools.XML @@ -594,6 +594,11 @@ Insert in machine UnityUpdate to disconnect the UI when finished. + + + An emergency escape function when looking at the wrong machine + + A class that provides Interopability between Storage and Machines for Pre-StorageInterface mods diff --git a/bin/FCECommunityTools.dll b/bin/FCECommunityTools.dll index f34ae144edffb4a6f55f0e57890e614c35b853e4..e93662ebe138791ae19b30badcbd2d58c0d44403 100644 GIT binary patch delta 5778 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 SveSliMmDF;`jc2U)cz+krTeb{ delta 5695 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 C>G$FQ From e1e36d775e914831f766e8278d3199210c267e15 Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 31 Jul 2016 22:51:23 -0700 Subject: [PATCH 14/23] Fixed cross-mod compatibility! No longer requires the EscapeUI() function. Mods using UI now no longer lock up other mod machines that don't use the UIUtil. --- Utilities/UIUtil.cs | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index 785bcf8..77b36a8 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -18,6 +18,11 @@ public class UIUtil /// public static bool UILock; + /// + /// Associates the machine so that it, and only it, can handle releasing the UI + /// + public static SegmentEntity TargetMachine; + /// /// Call this in GetPopupText to handle your UI Window /// @@ -34,7 +39,10 @@ public static bool HandleThisMachineWindow(SegmentEntity theMachine, BaseMachine // this will replace with the current machine's window, which is OK as long as each Mod uses this technique manager.windows[eSegmentEntity.Mod] = theWindow; + UIUtil.TargetMachine = theMachine; theWindow.manager = manager; + UIUtil.UIdelay = 0; + UIUtil.UILock = true; } catch (Exception ex) { @@ -120,27 +128,35 @@ public static void Hide(GenericMachinePanelScript panel) /// /// Insert in machine UnityUpdate to disconnect the UI when finished. /// - public static void DisconnectUI() + public static void DisconnectUI(SegmentEntity theCaller) { - if (UIdelay > 50 && UILock) + if (UIdelay > 5 && UILock && UIUtil.TargetMachine != null && UIUtil.TargetMachine == theCaller) { + Debug.LogWarning("Disconnecting UI"); GenericMachinePanelScript panel = GenericMachinePanelScript.instance; panel.gameObject.SetActive(false); panel.Background_Panel.SetActive(false); panel.currentWindow = null; panel.targetEntity = null; - GenericMachineManager manager2 = typeof(GenericMachinePanelScript).GetField("manager", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(GenericMachinePanelScript.instance) as GenericMachineManager; - manager2.windows.Remove(eSegmentEntity.Mod); UIManager.RemoveUIRules("Machine"); DragAndDropManager.instance.CancelDrag(); DragAndDropManager.instance.DisableDragBackground(); + GenericMachineManager manager2 = typeof(GenericMachinePanelScript).GetField("manager", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(GenericMachinePanelScript.instance) as GenericMachineManager; + manager2.windows.Remove(eSegmentEntity.Mod); + if (manager2.windows.ContainsKey(eSegmentEntity.Mod)) + { + Debug.LogWarning("DisconnectUI was not able to remove the window entry!"); + return; + } + UIUtil.TargetMachine = null; UILock = false; } - UIdelay++; + else if (UIUtil.TargetMachine != null && UIUtil.TargetMachine == theCaller) + UIdelay++; } /// - /// An emergency escape function when looking at the wrong machine + /// An emergency escape function when looking at the wrong machine (no longer necessary!) /// public static void EscapeUI() { From ae390c1fe7c72333f29a63a39d7f1f26de7549db Mon Sep 17 00:00:00 2001 From: Steve Date: Mon, 1 Aug 2016 23:07:54 -0700 Subject: [PATCH 15/23] Remove log spam --- Utilities/UIUtil.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index 77b36a8..490c4e6 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -132,7 +132,6 @@ public static void DisconnectUI(SegmentEntity theCaller) { if (UIdelay > 5 && UILock && UIUtil.TargetMachine != null && UIUtil.TargetMachine == theCaller) { - Debug.LogWarning("Disconnecting UI"); GenericMachinePanelScript panel = GenericMachinePanelScript.instance; panel.gameObject.SetActive(false); panel.Background_Panel.SetActive(false); From c9fcdd9109409b660c1e57fd4a2c0591584fb944 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 2 Aug 2016 16:10:06 -0700 Subject: [PATCH 16/23] Fixed network support for Machine Inventory --- Utilities/MachineInventory.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Utilities/MachineInventory.cs b/Utilities/MachineInventory.cs index 7d106ca..1507cd8 100644 --- a/Utilities/MachineInventory.cs +++ b/Utilities/MachineInventory.cs @@ -367,6 +367,11 @@ public void DropOnMobDelete() /// public void WriteInventory(BinaryWriter writer) { + if (this.Inventory == null) + { + Debug.LogWarning("Trying to write Machine Inventory but inventory is null?"); + return; + } int listcount = this.Inventory.Count; int version = 0; @@ -386,6 +391,7 @@ public void ReadInventory(BinaryReader reader) { int listcount; int version = reader.ReadInt32(); + this.Inventory = new List(); switch (version) { From c089d5f981c47d40ccd9de76d4ccc9abb8a813e8 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 3 Aug 2016 11:11:20 -0700 Subject: [PATCH 17/23] Updated for latest patches --- bin/FCECommunityTools.XML | 9 +++++++-- bin/FCECommunityTools.dll | Bin 25088 -> 25600 bytes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/FCECommunityTools.XML b/bin/FCECommunityTools.XML index 9eca64d..87cee83 100644 --- a/bin/FCECommunityTools.XML +++ b/bin/FCECommunityTools.XML @@ -575,6 +575,11 @@ Lock to prevent running the dissociation when it isn't needed + + + Associates the machine so that it, and only it, can handle releasing the UI + + Call this in GetPopupText to handle your UI Window @@ -589,14 +594,14 @@ The working panel - + Insert in machine UnityUpdate to disconnect the UI when finished. - An emergency escape function when looking at the wrong machine + An emergency escape function when looking at the wrong machine (no longer necessary!) diff --git a/bin/FCECommunityTools.dll b/bin/FCECommunityTools.dll index e93662ebe138791ae19b30badcbd2d58c0d44403..0b46e1fb2ba9aee93a146a3679bc0ac7e4594132 100644 GIT binary patch delta 6601 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 delta 6209 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 From f10295c3a7fdaa1b4bb3671a4c9098b49d9425c8 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 16 Aug 2016 19:15:09 -0700 Subject: [PATCH 18/23] Added UI scaling helper functions UNTESTED!!! --- Utilities/UIUtil.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index 490c4e6..d28ce3d 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -23,6 +23,16 @@ public class UIUtil /// public static SegmentEntity TargetMachine; + /// + /// Vector for recording default window position for scaled UI + /// + private Vector3 StartPos; + + /// + /// Used to prevent rescaling the UI after it's already been done + /// + private bool firstopen; + /// /// Call this in GetPopupText to handle your UI Window /// @@ -170,5 +180,54 @@ public static void EscapeUI() DragAndDropManager.instance.CancelDrag(); DragAndDropManager.instance.DisableDragBackground(); } + + + /// + /// Helper class for scaling UI window elements + /// + /// Multiplying factor for the window width + /// Allows manual overriding of the window content offset if required + public void ScaleUIWindow(float scalingfactorx, float xoffsetoverride = 0) + { + if (!firstopen) + { + float xoffset = 0; + if (scalingfactorx > 0) + xoffset = -140 * scalingfactorx; + if (xoffsetoverride != 0) + xoffset = xoffsetoverride; + this.StartPos = GenericMachinePanelScript.instance.gameObject.transform.localPosition; + GenericMachinePanelScript.instance.gameObject.transform.localScale = new Vector3(scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.gameObject.transform.localPosition = this.StartPos + new Vector3(-xoffset, 0f, 0f); + GenericMachinePanelScript.instance.Background_Panel.transform.localScale = new Vector3(scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Label_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Icon_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Content_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Content_Icon_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Scroll_Bar.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Source_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Generic_Machine_Title_Label.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); + + firstopen = true; + } + } + + /// + /// Used in UI window OnClose method to restore default window settings + /// + public void RestoreUIScale() + { + GenericMachinePanelScript.instance.gameObject.transform.localPosition = this.StartPos; + GenericMachinePanelScript.instance.gameObject.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Background_Panel.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Label_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Icon_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Content_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Content_Icon_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Scroll_Bar.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Source_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + GenericMachinePanelScript.instance.Generic_Machine_Title_Label.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + this.firstopen = false; + } } } From cba2639b94716b16872ac33cbf3fc95133702a74 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 16 Aug 2016 19:15:52 -0700 Subject: [PATCH 19/23] Added Window scaling helper functions --- bin/FCECommunityTools.XML | 22 ++++++++++++++++++++++ bin/FCECommunityTools.dll | Bin 25600 -> 27136 bytes 2 files changed, 22 insertions(+) diff --git a/bin/FCECommunityTools.XML b/bin/FCECommunityTools.XML index 87cee83..076b80b 100644 --- a/bin/FCECommunityTools.XML +++ b/bin/FCECommunityTools.XML @@ -580,6 +580,16 @@ Associates the machine so that it, and only it, can handle releasing the UI + + + Vector for recording default window position for scaled UI + + + + + Used to prevent rescaling the UI after it's already been done + + Call this in GetPopupText to handle your UI Window @@ -604,6 +614,18 @@ An emergency escape function when looking at the wrong machine (no longer necessary!) + + + Helper class for scaling UI window elements + + Multiplying factor for the window width + Allows manual overriding of the window content offset if required + + + + Used in UI window OnClose method to restore default window settings + + A class that provides Interopability between Storage and Machines for Pre-StorageInterface mods diff --git a/bin/FCECommunityTools.dll b/bin/FCECommunityTools.dll index 0b46e1fb2ba9aee93a146a3679bc0ac7e4594132..f07565f50773640c6053c338dc4d68c5c31e3cd5 100644 GIT binary patch delta 7427 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 delta 6052 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 Date: Wed, 17 Aug 2016 10:49:58 -0700 Subject: [PATCH 20/23] Made new scaling functions static --- Utilities/UIUtil.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index d28ce3d..ee0486c 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -26,12 +26,12 @@ public class UIUtil /// /// Vector for recording default window position for scaled UI /// - private Vector3 StartPos; + private static Vector3 StartPos; /// /// Used to prevent rescaling the UI after it's already been done /// - private bool firstopen; + private static bool firstopen; /// /// Call this in GetPopupText to handle your UI Window @@ -187,7 +187,7 @@ public static void EscapeUI() /// /// Multiplying factor for the window width /// Allows manual overriding of the window content offset if required - public void ScaleUIWindow(float scalingfactorx, float xoffsetoverride = 0) + public static void ScaleUIWindow(float scalingfactorx, float xoffsetoverride = 0) { if (!firstopen) { @@ -196,9 +196,9 @@ public void ScaleUIWindow(float scalingfactorx, float xoffsetoverride = 0) xoffset = -140 * scalingfactorx; if (xoffsetoverride != 0) xoffset = xoffsetoverride; - this.StartPos = GenericMachinePanelScript.instance.gameObject.transform.localPosition; + StartPos = GenericMachinePanelScript.instance.gameObject.transform.localPosition; GenericMachinePanelScript.instance.gameObject.transform.localScale = new Vector3(scalingfactorx, 1.0f, 1.0f); - GenericMachinePanelScript.instance.gameObject.transform.localPosition = this.StartPos + new Vector3(-xoffset, 0f, 0f); + GenericMachinePanelScript.instance.gameObject.transform.localPosition = StartPos + new Vector3(-xoffset, 0f, 0f); GenericMachinePanelScript.instance.Background_Panel.transform.localScale = new Vector3(scalingfactorx, 1.0f, 1.0f); GenericMachinePanelScript.instance.Label_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); GenericMachinePanelScript.instance.Icon_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); @@ -215,9 +215,9 @@ public void ScaleUIWindow(float scalingfactorx, float xoffsetoverride = 0) /// /// Used in UI window OnClose method to restore default window settings /// - public void RestoreUIScale() + public static void RestoreUIScale() { - GenericMachinePanelScript.instance.gameObject.transform.localPosition = this.StartPos; + GenericMachinePanelScript.instance.gameObject.transform.localPosition = StartPos; GenericMachinePanelScript.instance.gameObject.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); GenericMachinePanelScript.instance.Background_Panel.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); GenericMachinePanelScript.instance.Label_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); @@ -227,7 +227,7 @@ public void RestoreUIScale() GenericMachinePanelScript.instance.Scroll_Bar.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); GenericMachinePanelScript.instance.Source_Holder.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); GenericMachinePanelScript.instance.Generic_Machine_Title_Label.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - this.firstopen = false; + firstopen = false; } } } From 691cae22bed353ab1faa6602bb4336f0d9f6c9e1 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 17 Aug 2016 10:50:37 -0700 Subject: [PATCH 21/23] Made new scaling functions static --- bin/FCECommunityTools.dll | Bin 27136 -> 27136 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/FCECommunityTools.dll b/bin/FCECommunityTools.dll index f07565f50773640c6053c338dc4d68c5c31e3cd5..608286f89c2165f2acf103cef2bb4496bf0fca5d 100644 GIT binary patch delta 596 zcmZp;!q{+yaY6@k`r<7UyJZ>qCaw%;+%uVxQJuA=j)6gDvLchtKVYm14uG4urjc07G%1wlFP!xz+l0^AjnY1&A`AS_K%T^&GIuNP>m8uH8&HO`p3k> zp~C@W@*HN0;%0`3F#;9ya_TTKbJvwHFmUBJfrx1!Vmgp$-~t+lCc!j0QA3Iwp|Eap ztGYfTNK|_A1$90k>!F6&WCabj$-j|!BFN&J$f{~Ika@mZFkXQcRFA571ISklTEYe_ z43j~=0s%Bv)oqs3tY%~qYnVJoOKbB9EhZLrK?XJ6%}j!uFX|Pt#ZF^*!NA&wIaFkUK`SJ;)ee15?C;~Zge=;8C7hRokzw+q_;otKm<|V7 z#011LK<_L7#`A&%28N(um*6dTqPFdS*YCJUwNd6>f5g(wdlEPpg`PlT9i;0Yh^;VD hQH=4!=C_H8OcM<_HuI(YVrCLB*esawo^hf9I{=?;ma_l= delta 608 zcmZp;!q{+yaY6@k(}~R!yJZ>0Caw%;JTjS)QJuA?j)6gDvLchtKVYm14uG4urly$7G%1wQqRG}z+l0^AjrT}&CS5TBKD7wi_P*IBT$hNNI5q%nEJ=W z!=b|gWbzzlj^bv4h%o{c^K$Aiv2Zihl`t@Hh8-tdx0Sm*_$&8xfOib0AB{i!VnVH0DCr{JTVr1C7UyGTAosmI}cQX^?=97Ab zY^rSxFZg&kjxjK}gF>Q>L7bV9;RJ)3I+!PMksHKYI62-_I&>{4P#KyTxEO>uPB6fD zsX*RIIIkJVJB6bAG{aV?K2HV@#?vTrXBbXwK5zO~QQ*;^lTRmKuyMv%y`c@(SRKQ3?z{O From 7cbf1eb2a4bb5f4d582934e0c49752c24581bab7 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 17 Aug 2016 15:57:01 -0700 Subject: [PATCH 22/23] Corrected window offset --- Utilities/UIUtil.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/UIUtil.cs b/Utilities/UIUtil.cs index ee0486c..30f345a 100644 --- a/Utilities/UIUtil.cs +++ b/Utilities/UIUtil.cs @@ -198,7 +198,7 @@ public static void ScaleUIWindow(float scalingfactorx, float xoffsetoverride = 0 xoffset = xoffsetoverride; StartPos = GenericMachinePanelScript.instance.gameObject.transform.localPosition; GenericMachinePanelScript.instance.gameObject.transform.localScale = new Vector3(scalingfactorx, 1.0f, 1.0f); - GenericMachinePanelScript.instance.gameObject.transform.localPosition = StartPos + new Vector3(-xoffset, 0f, 0f); + GenericMachinePanelScript.instance.gameObject.transform.localPosition = StartPos + new Vector3(xoffset, 0f, 0f); GenericMachinePanelScript.instance.Background_Panel.transform.localScale = new Vector3(scalingfactorx, 1.0f, 1.0f); GenericMachinePanelScript.instance.Label_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); GenericMachinePanelScript.instance.Icon_Holder.transform.localScale = new Vector3(1f / scalingfactorx, 1.0f, 1.0f); From 792c4aeb6209de9dea16d3943abd9eb73cdc5fbf Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 17 Aug 2016 15:57:26 -0700 Subject: [PATCH 23/23] Corrected window offset --- bin/FCECommunityTools.dll | Bin 27136 -> 27136 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/FCECommunityTools.dll b/bin/FCECommunityTools.dll index 608286f89c2165f2acf103cef2bb4496bf0fca5d..3471490c0107b2f6736e0765e9c5ec0f3d3185f9 100644 GIT binary patch delta 90 zcmV-g0Hyzc)B%9h0g#9Si|et9W+njxlkp}K0rHatCxWwxCv*V;0JHokz%CGk#HC6c w8_PtCd5Imq5;nH8%vZb!0*mXDieMTLG_D5EKE3Zqh)W~VYwS}Uv$SAL37$nI)Bpeg delta 90 zcmV-g0Hyzc)B%9h0g#9SXQQ!-W+njylkp}K0rQguCxQWGvxg^i0kixlz%CH>m7CHv wO?yC&LI>|(v{a(A%vZb!0%xO>ieMTLwA@;@zwVDgq9uVG?vGfdv$SAL3DF5C1^@s6