Merge pull request #218 from SubnauticaModding/dev

SMLHelper 2.9.7
SubnauticaModding · May 22, 2021 · 5712bdc · 5712bdc
2 parents 4b59b09 + e509152
commit 5712bdc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/Example mod/Properties/AssemblyInfo.cs b/Example mod/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("2.9.6.0")]
-[assembly: AssemblyFileVersion("2.9.6.0")]
+[assembly: AssemblyVersion("2.9.7.0")]
+[assembly: AssemblyFileVersion("2.9.7.0")]
diff --git a/Example mod/mod.json b/Example mod/mod.json
@@ -2,10 +2,10 @@
   "Id": "SMLHelperExampleMod",
   "DisplayName": "Example Mod For SMLHelper",
   "Author": "The SMLHelper Dev Team",
-  "Version": "2.9.6",
+  "Version": "2.9.7",
   "Enable": true,
   "AssemblyName": "Example mod.dll",
   "VersionDependencies": {
-    "SMLHelper": "2.9.6"
+    "SMLHelper": "2.9.7"
   }
 }
diff --git a/SMLHelper/Assets/Spawnable.cs b/SMLHelper/Assets/Spawnable.cs
@@ -212,8 +212,6 @@ internal virtual void PatchTechType()
         /// <returns>Returns the <see cref="Sprite"/> that will be used in the <see cref="SpriteHandler.RegisterSprite(TechType, Sprite)"/> call.</returns>
         protected virtual Sprite GetItemSprite()
         {
-            if(HasSprite)
-            {
                 // This is for backwards compatibility with mods that were using the "ModName/Assets" format
                 string path = this.AssetsFolder != modFolderLocation
                 ? IOUtilities.Combine(".", "QMods", this.AssetsFolder.Trim('/'), this.IconFileName)
@@ -224,8 +222,9 @@ protected virtual Sprite GetItemSprite()
                     return ImageUtils.LoadSpriteFromFile(path);
                 }
 
+            if(HasSprite)
                 Logger.Error($"Sprite for '{this.PrefabFileName}'{Environment.NewLine}Did not find an image file at '{path}'");
-            }
+
             return SpriteManager.defaultSprite;
         }
     }

diff --git a/SMLHelper/Options/SliderModOption.cs b/SMLHelper/Options/SliderModOption.cs
@@ -180,6 +180,9 @@ internal override void AddToPanel(uGUI_TabbedControlsPanel panel, int tabIndex)
             // if we using custom value format, we need to replace vanilla uGUI_SliderWithLabel with our component
             if (ValueFormat != null)
                 OptionGameObject.transform.Find("Slider").gameObject.AddComponent<SliderValue>().ValueFormat = ValueFormat;
+
+            // fixing tooltip for slider
+            OptionGameObject.transform.Find("Slider/Caption").GetComponent<Text>().raycastTarget = true;
 #else
             // if we using custom value format or step, we need to replace vanilla uGUI_SliderWithLabel with our component
             if (ValueFormat != null || Step >= Mathf.Epsilon)

diff --git a/SMLHelper/Properties/AssemblyInfo.cs b/SMLHelper/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // 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("2.9.6.0")]
-[assembly: AssemblyFileVersion("2.9.6.0")]
+[assembly: AssemblyVersion("2.9.7.0")]
+[assembly: AssemblyFileVersion("2.9.7.0")]
 [assembly: InternalsVisibleTo("SMLHelper.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
diff --git a/SMLHelper/mod_BelowZero.json b/SMLHelper/mod_BelowZero.json
@@ -2,7 +2,7 @@
     "Id": "SMLHelper",
     "DisplayName": "SMLHelper",
     "Author": "The SMLHelper Dev Team",
-    "Version": "2.9.6",
+    "Version": "2.9.7",
     "Enable": true,
     "Game": "BelowZero",
     "AssemblyName": "SMLHelper.dll",

diff --git a/SMLHelper/mod_Subnautica.json b/SMLHelper/mod_Subnautica.json
@@ -2,7 +2,7 @@
     "Id": "SMLHelper",
     "DisplayName": "SMLHelper",
     "Author": "The SMLHelper Dev Team",
-    "Version": "2.9.6",
+    "Version": "2.9.7",
     "Enable": true,
     "Game": "Subnautica",
     "AssemblyName": "SMLHelper.dll",