Cleanup and more fixes

Author: michu97736

Item.cs

@@ -11,7 +11,6 @@ public class Item : MonoBehaviour
         private void Start()
         {
             gameObject.transform.Find("Text").GetComponent<Text>().text = Text;
-            ThumbnailGenerator.instance.GenerateImage(item,gameObject.transform.Find("ItemImage").GetComponent<RawImage>());
         }
         void Update()
         {

MSCSpawnMenu.cs

@@ -5,7 +5,6 @@
 using HutongGames.PlayMaker;
 using MSCLoader;
 using UnityEngine;
-using UnityEngine.SocialPlatforms;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
 using Resources = MSCSpawnMenu.Properties.Resources;
@@ -24,11 +23,10 @@ public enum Categories
 
         public static Dictionary<Dictionary<string, GameObject>, Categories> List;
         public static Dictionary<string, GameObject> MscCharacters;
-
         public static Dictionary<string, GameObject> MscFurniture;
-
         //public string path = Path.GetFullPath("CustomSpawnMenuItems");
         public static Dictionary<string, GameObject> MscItems;
+        public static Dictionary<string, Image> Icons;
         public static GameObject IconGen;
         public string[] Blacklist = { "Use", "Chop" };
         public GameObject Grid;
@@ -60,26 +58,23 @@ public override void ModSetup()
 
         private void Mod_OnMenuLoad()
         {
-            if (ModLoader.IsModPresent("AchievementCore"))
+            if (!ModLoader.IsModPresent("AchievementCore"))
+            {
+                return;
+            }
+            else
             {
                 Achievement.CreateAchievement("MSCSpawnMenu_FirstSpawn", ID, "Achievement Get!",
                     "You spawned your first item!", null, false);
+                Achievement.CreateAchievement("MSCSpawnMenu_150Ragdolls", ID, "Achievement Get!",
+                    "You spawned 150 ragdolls!", null, false);
+                Achievement.CreateAchievement("MSCSpawnMenu_500Ragdolls", ID, "Achievement Get!",
+                    "You (somehow) spawned 500 ragdolls!", null, false);
+                Achievement.CreateAchievement("MSCSpawnMenu_150Items", ID, "Achievement Get!", "You spawned 150 items!",
+                    null, false);
+                Achievement.CreateAchievement("MSCSpawnMenu_500Items", ID, "Achievement Get!",
+                    "You (somehow)spawned 500 items!", null, false);
             }
-
-            Achievement.CreateAchievement("MSCSpawnMenu_150Ragdolls", ID, "Achievement Get!",
-                "You spawned 150 ragdolls!", null, false);
-            Achievement.CreateAchievement("MSCSpawnMenu_500Ragdolls", ID, "Achievement Get!",
-                "You (somehow) spawned 500 ragdolls!", null, false);
-            Achievement.CreateAchievement("MSCSpawnMenu_150Items", ID, "Achievement Get!", "You spawned 150 items!",
-                null, false);
-            Achievement.CreateAchievement("MSCSpawnMenu_500Items", ID, "Achievement Get!",
-                "You (somehow)spawned 500 items!", null, false);
-            ;
-        }
-
-        private void AlignGrid()
-        {
-            //gridTransform.position = new Vector3(gridTransform.position.x, gridTransform.rect.height / -2f, 0.0f);
         }
 
         private void Search(string phrase)
@@ -129,6 +124,7 @@ private void Mod_OnLoad()
                     ChangeCategory((Categories)int.Parse(transform1.name));
                 });
             }
+            //IconSetup();
             Ui.transform.Find("Header/InputField").GetComponent<InputField>().onValueChange.AddListener(Search);
             Ui.SetActive(false);
             ItemsSpawned = SaveLoad.ReadValue<int>(this, "ItemsSpawned");
@@ -197,10 +193,10 @@ private void SpawnItem(KeyValuePair<string, GameObject> pair)
                 RagdollsSpawned++;
                 switch (RagdollsSpawned)
                 {
-                    case 150:
+                    case int n when (n >= 150):
                         Achievement.TriggerAchievement("MSCSpawnMenu_150Ragdolls");
                         break;
-                    case 500:
+                    case int n when (n >= 500):
                         Achievement.TriggerAchievement("MSCSpawnMenu_500Ragdolls");
                         break;
                 }
@@ -210,10 +206,10 @@ private void SpawnItem(KeyValuePair<string, GameObject> pair)
                 ItemsSpawned++;
                 switch (ItemsSpawned)
                 {
-                    case 150:
+                    case int n when(n >=150):
                         Achievement.TriggerAchievement("MSCSpawnMenu_150Items");
                         break;
-                    case 500:
+                    case int n when (n >= 500):
                         Achievement.TriggerAchievement("MSCSpawnMenu_500Items");
                         break;
                 }
@@ -225,7 +221,7 @@ private void SpawnItem(KeyValuePair<string, GameObject> pair)
             }
         }
 
-        public void ChangeCategory(Categories cat = default, string search = "")
+        public void ChangeCategory(Categories cat = default)
         {
             ClearItems();
 
@@ -259,7 +255,7 @@ public void ClearItems()
 
         public void OpenMenu()
         {
-            if (Ui.activeSelf != true)
+            if (!Ui.activeSelf)
             {
                 Ui.SetActive(true);
                 PlayerInMenu.Value = true;
@@ -280,7 +276,7 @@ private void AddToView(Dictionary<string, GameObject> dict)
                     .AddListener(() => SpawnItem(item));
                 gameobjectitem.GetComponent<Item>().Text = item.Key.ToUpper();
                 gameobjectitem.GetComponent<Item>().item = item.Value;
-                //gameobjectitem.GetComponent<Item>().Texture
+                //gameobjectitem.transform.Find("ItemImage").GetComponent<Image>().sprite = Icons[item.Key].sprite;
                 gameobjectitem.transform.SetParent(Grid.transform);
                 gameobjectitem.transform.localScale = new Vector3(1, 1, 1);
             }
@@ -497,6 +493,18 @@ public void ItemInit()
             //}
         }
 
+        private void IconSetup()
+        {
+            foreach (var list in List)
+            {
+                foreach (var innerlist in list.Key)
+                {
+                    GameObject gameObject = innerlist.Value;
+                    Image image = IconGen.GetComponent<ThumbnailGenerator>().GenerateImage(gameObject);
+                    Icons.Add(innerlist.Key,image);
+                }
+            }
+        }
         private void Mod_Update()
         {
             if (Open.GetKeybindDown())

Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.0.10")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Resources/spawnmenu

@@ -11,7 +11,7 @@ public class ThumbnailGenerator : MonoBehaviour
         private static Camera captureCamera;
         private static GameObject GenPivot;
         private static RenderTexture genTexture = new RenderTexture(256, 256, 0);
-        public static RawImage iconComp;
+        public static Image iconComp;
         public static ThumbnailGenerator instance;
 
         private void Start()
@@ -22,48 +22,34 @@ private void Start()
             instance = this;
         }
 
-        public void GenerateImage(GameObject prefab, RawImage iconRawImage)
+        public Image GenerateImage(GameObject prefab)
         {
-            iconComp = iconRawImage;
-            // Activate the camera
+            iconComp = null;
             captureCamera.enabled = true;
 
-            // Set the camera's target texture to the Render Texture
             captureCamera.targetTexture = genTexture;
 
-            // Spawn and position the object you want to capture
             GameObject spawnedObject = Instantiate<GameObject>(prefab);
             spawnedObject.transform.SetParent(GenPivot.transform, false);
 
-            // Wait for a frame to ensure object is rendered
             StartCoroutine(CaptureImage());
-
-            // Deactivate the camera
+            
             captureCamera.targetTexture = null;
             captureCamera.enabled = false;
-
-            // Destroy the spawned object (if needed)
             Destroy(spawnedObject);
+            return iconComp;
         }
 
         private IEnumerator CaptureImage()
         {
-            // Wait for end of frame
             yield return new WaitForEndOfFrame();
 
-            // Capture the image from Render Texture
             RenderTexture.active = genTexture;
             Texture2D image = new Texture2D(genTexture.width, genTexture.height);
             image.ReadPixels(new Rect(0, 0, genTexture.width, genTexture.height), 0, 0);
             image.Apply();
 
-            // Assign the captured image to the UI Image
-            iconComp.texture = (Sprite.Create(image, new Rect(0, 0, genTexture.width, genTexture.height), Vector2.zero)).texture;
-        }
-
-        private void Update()
-        {
-
+            iconComp.sprite = Sprite.Create(image, new Rect(0, 0, genTexture.width, genTexture.height), Vector2.zero);
         }
     }
 }