Build 99.7 compatibility

Mapify/AssetCopiers/AssetCopier.cs

@@ -18,10 +18,26 @@ public abstract class AssetCopier
 
         public static GameObject Instantiate(VanillaAsset asset, bool active = true, bool originShift = true)
         {
-            Mapify.LogDebug(() => "Instantiating asset: " + asset);
-            var gameObject = GameObject.Instantiate(prefabs[asset], originShift ? WorldMover.OriginShiftParent : null);
-            gameObject.SetActive(active);
-            return gameObject;
+            Mapify.LogDebug($"Instantiating asset: {asset}");
+
+            if(prefabs.TryGetValue(asset, out var prefab))
+            {
+                var parent = originShift ? WorldMover.OriginShiftParent : null;
+                if (active)
+                {
+                    var instantiated = GameObject.Instantiate(prefab, parent);
+                    instantiated.SetActive(true);
+                    return instantiated;
+                }
+
+                // instantiate disabled so Awake, Start etc. don't run
+                return UnityUtils.InstantiateDisabled(prefab, parent);
+            }
+
+            Mapify.LogError($"Failed to instantiate asset {asset}");
+            var nothing = new GameObject();
+            nothing.SetActive(false);
+            return nothing;
         }
 
         public static void Cleanup()

Mapify/AssetCopiers/GameContentCopier.cs

@@ -114,8 +114,7 @@ public class GameContentCopier : AssetCopier
             foreach (var module in shop.GetComponentsInChildren<ScanItemCashRegisterModule>())
                 Object.Destroy(module.gameObject);
 
-            Object.Destroy(shop.transform.FindChildByName("Stopwatch"));
-            Object.Destroy(shop.transform.FindChildByName("PosterAnchor"));
+            Object.Destroy(shop.gameObject.FindChildByName("PosterAnchor"));
 
             yield return (VanillaAsset.StoreObject, shop.gameObject);
 

Mapify/Components/ForceActive.cs

@@ -0,0 +1,18 @@
+using UnityEngine;
+
+namespace Mapify.Components
+{
+    /// <summary>
+    /// Force the target Gameobject to stay active
+    /// </summary>
+    public class ForceActive: MonoBehaviour
+    {
+        public GameObject target;
+
+        private void Update()
+        {
+            if(target.activeSelf) return;
+            target.SetActive(true);
+        }
+    }
+}

Mapify/Mapify.cs

@@ -57,12 +57,22 @@ private static void Patch()
 
         #region Logging
 
+        public static void LogDebugExtreme(object msg)
+        {
+            LogDebugExtreme(() => msg);
+        }
+
         public static void LogDebugExtreme(Func<object> resolver)
         {
             if (Settings.ExtremelyVerboseLogging)
                 LogDebug(resolver);
         }
 
+        public static void LogDebug(object msg)
+        {
+            LogDebug(() => msg);
+        }
+
         public static void LogDebug(Func<object> resolver)
         {
             if (Settings.VerboseLogging)

Mapify/Patches/GlobalShopControllerPatch.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Linq;
+using DV.Shops;
+using HarmonyLib;
+
+namespace Mapify.Patches
+{
+    [HarmonyPatch(typeof(GlobalShopController), nameof(GlobalShopController.InitializeShopData))]
+    public class GlobalShopControllerPatch
+    {
+        private static void Postfix(GlobalShopController __instance)
+        {
+            VerifyItemTypeEnum(__instance);
+        }
+
+        /// <summary>
+        /// Verify that the ItemType enum is up to date.
+        /// </summary>
+        private static void VerifyItemTypeEnum(GlobalShopController __instance)
+        {
+            var inGameItems = __instance.shopItemsData.Select(dat => dat.item.itemPrefabName.ToLower().Replace("_", "")).ToArray();
+
+            var inModItems = Enum.GetValues(typeof(Editor.ItemType))
+                .Cast<Editor.ItemType>()
+                .Select(itemEnum => itemEnum.ToString().ToLower())
+                .ToArray();
+
+            bool verifiedSuccessfully = true;
+
+            foreach (var inModItem in inModItems)
+            {
+                if(inGameItems.Contains(inModItem)) continue;
+
+                Mapify.LogError($"{nameof(ItemType)} '{inModItem}' does not exist in-game");
+                verifiedSuccessfully = false;
+            }
+
+            foreach (var inGameItem in inGameItems)
+            {
+                if(inModItems.Contains(inGameItem)) continue;
+
+                // the keys are intentionally left out
+                if(inGameItem.StartsWith("key")) continue;
+
+                Mapify.LogWarning($"Item '{inGameItem}' does not exist in enum {nameof(ItemType)}");
+            }
+
+            if(verifiedSuccessfully) return;
+
+            Mapify.LogDebug("Items in game:");
+            foreach (var inGameItem in inGameItems)
+            {
+                Mapify.LogDebug(inGameItem);
+            }
+        }
+    }
+}

Mapify/Patches/ItemLocationForcerPatch.cs

@@ -0,0 +1,39 @@
+using DV;
+using DV.Shops;
+using HarmonyLib;
+using Mapify.Components;
+using Mapify.Map;
+using VLB;
+
+namespace Mapify.Patches
+{
+    /// <summary>
+    /// Something keeps setting the shop scanner inactive. This patch prevents that.
+    /// </summary>
+    [HarmonyPatch(typeof(ItemLocationForcer), nameof(ItemLocationForcer.Awake))]
+    public class ItemLocationForcer_Awake_Patch
+    {
+        private static void Postfix(ItemLocationForcer __instance)
+        {
+            if(__instance.itemGO == null || Maps.IsDefaultMap) return;
+            if(!__instance.itemGO.TryGetComponent<ShopScanner>(out var shopScanner)) return;
+
+            Mapify.LogDebug($"Forcing scanner at '{shopScanner.gameObject.GetPath()}' active");
+            var forceActive = __instance.gameObject.GetOrAddComponent<ForceActive>();
+            forceActive.enabled = true;
+            forceActive.target = shopScanner.gameObject;
+        }
+    }
+
+    [HarmonyPatch(typeof(ItemLocationForcer), nameof(ItemLocationForcer.OnDisable))]
+    public class ItemLocationForcer_OnDisable_Patch
+    {
+        private static void Postfix(ItemLocationForcer __instance)
+        {
+            if(__instance.itemGO == null || Maps.IsDefaultMap) return;
+            if(!__instance.itemGO.TryGetComponent<ForceActive>(out var forceActive)) return;
+            forceActive.enabled = false;
+        }
+    }
+
+}

Mapify/Patches/PlayerDistanceGameObjectsDisablerPatch.cs

@@ -1,4 +1,5 @@
-using HarmonyLib;
+using DV.Optimizers;
+using HarmonyLib;
 using UnityEngine;
 
 namespace Mapify.Patches

Mapify/Patches/RailwayMeshGeneratorPatch.cs

@@ -52,25 +52,12 @@ private static bool Prefix(RailwayMeshGenerator __instance, TrackChunk chunk, Li
     [HarmonyPatch(typeof(RailwayMeshGenerator), nameof(RailwayMeshGenerator.UpdateSleepersData))]
     public class RailwayMeshGenerator_UpdateSleepersData_Patch
     {
-        private static bool Prefix(TrackChunk chunk, ref JobHandle ___sleepersHandle, NativeList<Vector3> ___sleepersAnchorsPositions, NativeList<float> ___sleepersAnchorsTransformBufferData)
+        private static bool Prefix(TrackChunk chunk)
         {
-            if (Maps.IsDefaultMap)
-                return true;
+            if (Maps.IsDefaultMap) return true;
 
-            Track track = chunk.track.GetComponent<Track>();
-            if (!track.generateSleepers)
-                return false;
-
-            ___sleepersHandle = new PlaceSleepersAppendJob(
-                ___sleepersAnchorsTransformBufferData,
-                ___sleepersAnchorsPositions,
-                chunk.pointSet,
-                chunk.minIndex,
-                chunk.maxIndex,
-                chunk.track.baseType.randomizeAnchorDirection,
-                chunk.track.baseType.sleeperVerticalOffset
-            ).Schedule(___sleepersHandle);
-            return false;
+            var track = chunk.track.GetComponent<Track>();
+            return track.generateSleepers;
         }
     }
 }

Mapify/Patches/ShelfPlacerPatch.cs

@@ -0,0 +1,16 @@
+using DV.Shops;
+using HarmonyLib;
+using Mapify.Map;
+
+namespace Mapify.Patches
+{
+    [HarmonyPatch(typeof(ShelfPlacer), nameof(ShelfPlacer.TryPlaceOnAnyShelf))]
+    public class ShelfPlacer_TryPlaceOnAnyShelf_Patch
+    {
+        private static void Postfix(ShelfItem item, bool __result)
+        {
+            if(Maps.IsDefaultMap || !__result) return;
+            item.gameObject.SetActive(true);
+        }
+    }
+}

Mapify/SceneInitializers/GameContent/StoreSetup.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using DV.CashRegister;
+using DV.Optimizers;
 using DV.Printers;
 using DV.Shops;
 using DV.Utils;

Mapify/Utils/UnityUtils.cs

@@ -0,0 +1,111 @@
+using UnityEngine;
+
+namespace Mapify
+{
+    // source: https://discussions.unity.com/t/instantiate-inactive-object/39830/5
+    public static class UnityUtils
+    {
+        /// <summary>
+        /// Will instantiate an object disabled preventing it from calling Awake/OnEnable.
+        /// </summary>
+        public static T InstantiateDisabled<T>(T original, Transform parent = null, bool worldPositionStays = false) where T : Object
+        {
+            if (!GetActiveState(original))
+            {
+                return Object.Instantiate(original, parent, worldPositionStays);
+            }
+
+            (GameObject coreObject, Transform coreObjectTransform) = CreateDisabledCoreObject(parent);
+            T instance = Object.Instantiate(original, coreObjectTransform, worldPositionStays);
+            SetActiveState(instance, false);
+            SetParent(instance, parent, worldPositionStays);
+            Object.Destroy(coreObject);
+            return instance;
+        }
+
+        /// <summary>
+        /// Will instantiate an object disabled preventing it from calling Awake/OnEnable.
+        /// </summary>
+        public static T InstantiateDisabled<T>(T original, Vector3 position, Quaternion rotation, Transform parent = null) where T : Object
+        {
+            if (!GetActiveState(original))
+            {
+                return Object.Instantiate(original, position, rotation, parent);
+            }
+
+            (GameObject coreObject, Transform coreObjectTransform) = CreateDisabledCoreObject(parent);
+            T instance = Object.Instantiate(original, position, rotation, coreObjectTransform);
+            SetActiveState(instance, false);
+            SetParent(instance, parent, false);
+            Object.Destroy(coreObject);
+            return instance;
+        }
+
+        private static (GameObject coreObject, Transform coreObjectTransform) CreateDisabledCoreObject(Transform parent = null)
+        {
+            GameObject coreObject = new GameObject(string.Empty);
+            coreObject.SetActive(false);
+            Transform coreObjectTransform = coreObject.transform;
+            coreObjectTransform.SetParent(parent);
+
+            return (coreObject, coreObjectTransform);
+        }
+
+        private static bool GetActiveState<T>(T @object) where T : Object
+        {
+            switch (@object)
+            {
+                case GameObject gameObject:
+                {
+                    return gameObject.activeSelf;
+                }
+                case Component component:
+                {
+                    return component.gameObject.activeSelf;
+                }
+                default:
+                {
+                    return false;
+                }
+            }
+        }
+
+        private static void SetActiveState<T>(T @object, bool state) where T : Object
+        {
+            switch (@object)
+            {
+                case GameObject gameObject:
+                {
+                    gameObject.SetActive(state);
+
+                    break;
+                }
+                case Component component:
+                {
+                    component.gameObject.SetActive(state);
+
+                    break;
+                }
+            }
+        }
+
+        private static void SetParent<T>(T @object, Transform parent, bool worldPositionStays) where T : Object
+        {
+            switch (@object)
+            {
+                case GameObject gameObject:
+                {
+                    gameObject.transform.SetParent(parent, worldPositionStays);
+
+                    break;
+                }
+                case Component component:
+                {
+                    component.transform.SetParent(parent, worldPositionStays);
+
+                    break;
+                }
+            }
+        }
+    }
+}

MapifyEditor/Store/ItemType.cs

@@ -106,9 +106,6 @@ public enum ItemType
         PaintCan = 178,
         PaintCanMuseum = 179,
         PaintCanSand = 180,
-        Crate = 181,
-        CratePlastic = 182,
-        PaperBox = 183,
         BeaconAmber = 184,
         BeaconRed = 185,
         BeaconBlue = 186,
@@ -118,7 +115,7 @@ public enum ItemType
         SwitchSetter = 190,
         SwitchAlternating = 191,
 
-        //build 99.4
+        // build 99.4
         ItemContainerBriefcase = 192,
         ItemContainerFolder = 193,
         Nameplate = 194,
@@ -142,6 +139,9 @@ public enum ItemType
         ItemContainerFolderBlue = 212,
         ItemContainerFolderRed = 213,
         ItemContainerFolderYellow = 214,
-        ItemContainerRegistrator = 215
+        ItemContainerRegistrator = 215,
+
+        // build 99.7
+        GooglyEye = 216
     }
 }