Quellcode durchsuchen

[2.0.4.2] Deactivate when dedicated server

Zariteis vor 4 Jahren
Ursprung
Commit
5bff13c7fa
3 geänderte Dateien mit 82 neuen und 69 gelöschten Zeilen
  1. 4 0
      Core.cs
  2. 72 68
      ItemStore.cs
  3. 6 1
      VanitySlots.cs

+ 4 - 0
Core.cs

@@ -1,5 +1,7 @@
 using GadgetCore;
 using GadgetCore.API;
+using System;
+using System.Linq;
 
 namespace VanitySlots
 {
@@ -13,6 +15,8 @@ namespace VanitySlots
     public static ItemStore itemStore = new ItemStore(3);
     public static bool IsSoftcore()
     {
+      if (Environment.GetCommandLineArgs().Any((string x) => x == "-batchmode"))
+        return true;
       foreach (var gadget in Gadgets.ListAllEnabledGadgets())
         if (gadget.Info?.ModName == "Softcore")
           return true;

+ 72 - 68
ItemStore.cs

@@ -1,5 +1,6 @@
 using GadgetCore.API;
 using System;
+using System.Linq;
 using System.Reflection;
 using UnityEngine;
 
@@ -24,20 +25,21 @@ namespace VanitySlots
 
     public void Save()
     {
-      for (int i = 0; i < m_Items.Length; i++)
-      {
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "id", m_Items[i].id);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "q", m_Items[i].q);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "exp", m_Items[i].exp);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "tier", m_Items[i].tier);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "corrupted", m_Items[i].corrupted);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "a0", m_Items[i].aspect[0]);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "a1", m_Items[i].aspect[1]);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "a2", m_Items[i].aspect[2]);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL0", m_Items[i].aspectLvl[0]);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL1", m_Items[i].aspectLvl[1]);
-        PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL2", m_Items[i].aspectLvl[2]);
-      }
+      if (!Environment.GetCommandLineArgs().Any((string x) => x == "-batchmode"))
+        for (int i = 0; i < m_Items.Length; i++)
+        {
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "id", m_Items[i].id);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "q", m_Items[i].q);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "exp", m_Items[i].exp);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "tier", m_Items[i].tier);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "corrupted", m_Items[i].corrupted);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "a0", m_Items[i].aspect[0]);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "a1", m_Items[i].aspect[1]);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "a2", m_Items[i].aspect[2]);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL0", m_Items[i].aspectLvl[0]);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL1", m_Items[i].aspectLvl[1]);
+          PreviewLabs.PlayerPrefs.SetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL2", m_Items[i].aspectLvl[2]);
+        }
     }
     public bool CanUse(Item holdingItem, int slot)
     {
@@ -55,20 +57,21 @@ namespace VanitySlots
 
     public void Load()
     {
-      for (int i = 0; i < m_Items.Length; i++)
-      {
-        m_Items[i].id = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "id");
-        m_Items[i].q = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "q");
-        m_Items[i].exp = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "exp");
-        m_Items[i].tier = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "tier");
-        m_Items[i].corrupted = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "corrupted");
-        m_Items[i].aspect[0] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "a0");
-        m_Items[i].aspect[1] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "a1");
-        m_Items[i].aspect[2] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "a2");
-        m_Items[i].aspectLvl[0] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL0");
-        m_Items[i].aspectLvl[1] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL1");
-        m_Items[i].aspectLvl[2] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL2");
-      }
+      if (!Environment.GetCommandLineArgs().Any((string x) => x == "-batchmode"))
+        for (int i = 0; i < m_Items.Length; i++)
+        {
+          m_Items[i].id = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "id");
+          m_Items[i].q = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "q");
+          m_Items[i].exp = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "exp");
+          m_Items[i].tier = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "tier");
+          m_Items[i].corrupted = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "corrupted");
+          m_Items[i].aspect[0] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "a0");
+          m_Items[i].aspect[1] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "a1");
+          m_Items[i].aspect[2] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "a2");
+          m_Items[i].aspectLvl[0] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL0");
+          m_Items[i].aspectLvl[1] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL1");
+          m_Items[i].aspectLvl[2] = PreviewLabs.PlayerPrefs.GetInt("c" + Menuu.curChar + "vanitySlot" + i + "aL2");
+        }
       Core.itemStore.UpdateUI();
     }
 
@@ -86,56 +89,57 @@ namespace VanitySlots
     private GameObject[] m_Slots;
     public void UpdateUI()
     {
-      try
-      {
-        for (int i = 0; i < m_Items.Length; i++)
+      if (!Environment.GetCommandLineArgs().Any((string x) => x == "-batchmode"))
+        try
         {
-          var obj = m_Slots[i];
-          if (obj != null)
+          for (int i = 0; i < m_Items.Length; i++)
           {
-            obj.GetComponent<Renderer>().material = (Material)Resources.Load("i/i" + (m_Items[i]?.id ?? 0));
-            var objBack = obj.transform.GetChild(1).gameObject;
-            AnimIcon animIcon = objBack.GetComponent<AnimIcon>();
-            if ((m_Items[i]?.id ?? 0) > 0 && ((m_Items[i].id >= 300 && m_Items[i].id < 2000) || (ItemRegistry.GetTypeByID(m_Items[i].id) & ItemType.LEVELING) == ItemType.LEVELING))
+            var obj = m_Slots[i];
+            if (obj != null)
             {
-              objBack.GetComponent<Renderer>().material = (Material)Resources.Load("iBack" + m_Items[i].tier);
-              if (m_Items[i].tier == 3)
-                animIcon.anim = 1;
+              obj.GetComponent<Renderer>().material = (Material)Resources.Load("i/i" + (m_Items[i]?.id ?? 0));
+              var objBack = obj.transform.GetChild(1).gameObject;
+              AnimIcon animIcon = objBack.GetComponent<AnimIcon>();
+              if ((m_Items[i]?.id ?? 0) > 0 && ((m_Items[i].id >= 300 && m_Items[i].id < 2000) || (ItemRegistry.GetTypeByID(m_Items[i].id) & ItemType.LEVELING) == ItemType.LEVELING))
+              {
+                objBack.GetComponent<Renderer>().material = (Material)Resources.Load("iBack" + m_Items[i].tier);
+                if (m_Items[i].tier == 3)
+                  animIcon.anim = 1;
+                else
+                  animIcon.anim = 0;
+                objBack.SetActive(true);
+              }
               else
+              {
                 animIcon.anim = 0;
-              objBack.SetActive(true);
-            }
-            else
-            {
-              animIcon.anim = 0;
-              objBack.SetActive(false);
-            }
-            TextMesh txtQ = obj.transform.GetChild(0).GetComponent<TextMesh>();
-            if (m_Items[i]?.q > 1 && (m_Items[i]?.id ?? 0) > 0)
-            {
-              txtQ.text = "" + m_Items[i].q;
-            }
-            else
-            {
-              txtQ.text = "";
+                objBack.SetActive(false);
+              }
+              TextMesh txtQ = obj.transform.GetChild(0).GetComponent<TextMesh>();
+              if (m_Items[i]?.q > 1 && (m_Items[i]?.id ?? 0) > 0)
+              {
+                txtQ.text = "" + m_Items[i].q;
+              }
+              else
+              {
+                txtQ.text = "";
+              }
             }
           }
+          if (MenuScript.playerAppearance != null)
+          {
+            var inventory = (Item[])inventoryField.GetValue(InstanceTracker.GameScript);
+            GameScript.equippedIDs[1] = inventory[37].id;
+            GameScript.equippedIDs[2] = inventory[38].id;
+            GameScript.equippedIDs[3] = inventory[39].id;
+            Network.RemoveRPCs(MenuScript.playerAppearance.GetComponent<NetworkView>().viewID);
+            MenuScript.playerAppearance.GetComponent<NetworkView>().RPC("UA", RPCMode.AllBuffered, new object[]
+            { GameScript.equippedIDs, 0, GameScript.dead });
+          }
         }
-        if (MenuScript.playerAppearance != null)
+        catch (Exception e)
         {
-          var inventory = (Item[])inventoryField.GetValue(InstanceTracker.GameScript);
-          GameScript.equippedIDs[1] = inventory[37].id;
-          GameScript.equippedIDs[2] = inventory[38].id;
-          GameScript.equippedIDs[3] = inventory[39].id;
-          Network.RemoveRPCs(MenuScript.playerAppearance.GetComponent<NetworkView>().viewID);
-          MenuScript.playerAppearance.GetComponent<NetworkView>().RPC("UA", RPCMode.AllBuffered, new object[]
-          { GameScript.equippedIDs, 0, GameScript.dead });
+          Core.logger.LogConsole(e.Message);
         }
-      }
-      catch (Exception e)
-      {
-        Core.logger.LogConsole(e.Message);
-      }
     }
   }
 }

+ 6 - 1
VanitySlots.cs

@@ -1,5 +1,7 @@
 using GadgetCore.API;
 using GadgetCore.API.ConfigMenu;
+using System;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -8,7 +10,7 @@ namespace VanitySlots
   [Gadget("VanitySlots", RequiredOnClients: false)]
   public class VanitySlots : Gadget<VanitySlots>
   {
-    public const string MOD_VERSION = "1.1"; // Set this to the version of your mod.
+    public const string MOD_VERSION = "1.2"; // Set this to the version of your mod.
     public const string CONFIG_VERSION = "1.0"; // Increment this whenever you change your mod's config file.
 
     public override IGadgetConfigMenu GetConfigMenu() { return null; }
@@ -23,6 +25,9 @@ namespace VanitySlots
       Logger.Log("Vanity Slots v" + Info.Mod.Version);
       Core.logger = Logger;
 
+      if (Environment.GetCommandLineArgs().Any((string x) => x == "-batchmode"))
+        Logger.Log("Starting on no ui server");
+
       SceneManager.sceneLoaded += OnSceneLoaded;
     }