Fixed a slight oversight in remote splash handling

GlobalUsings.cs

@@ -6,6 +6,7 @@
 global using WeatherElectric.SplashText.Melon;
 global using BoneLib.BoneMenu;
 global using BoneLib.BoneMenu.Elements;
+global using SLZ.Marrow.Warehouse;
 global using UnityEngine;
 global using WeatherElectric.SplashText.Menu;
 global using WeatherElectric.SplashText.Scripts;

Main.cs

@@ -1,6 +1,5 @@
 using HarmonyLib;
 using SLZ.Marrow.SceneStreaming;
-using SLZ.Marrow.Warehouse;
 using SLZ.SaveData;
 
 namespace WeatherElectric.SplashText;
@@ -11,7 +10,7 @@ public class Main : MelonMod
     internal const string Description = "Adds splash text to Void G114's menu.";
     internal const string Author = "SoulWithMae";
     internal const string Company = "Weather Electric";
-    internal const string Version = "1.1.0";
+    internal const string Version = "1.1.1";
     internal const string DownloadLink = "https://bonelab.thunderstore.io/package/SoulWithMae/SplashText/";
 
     public static Save SaveData;

Scripts/Helpers/EntryHelper.cs

@@ -1,6 +1,4 @@
-using SLZ.Marrow.Warehouse;
-
-namespace WeatherElectric.SplashText.Scripts.Helpers;
+namespace WeatherElectric.SplashText.Scripts.Helpers;
 
 internal static class EntryHelper
 {

Scripts/Lists/BonelabSplashes.cs

@@ -1,7 +1,4 @@
 using System.Collections;
-using Newtonsoft.Json;
-using SLZ.Marrow.Warehouse;
-using SLZ.SaveData;
 using UnityEngine.Networking;
 
 namespace WeatherElectric.SplashText.Scripts.Lists;
@@ -80,9 +77,47 @@ private static IEnumerator FetchText(FetchTextCallback callback)
 
         if (request.result == UnityWebRequest.Result.Success)
         {
-            string randomText = request.downloadHandler.text;
-            ModConsole.Msg($"Text recieved: {randomText}", 1);
-            callback(randomText);
+            var rnd = new System.Random();
+            string randomSplash = request.downloadHandler.text;
+
+            ModConsole.Msg($"Text recieved: {randomSplash}", 1);
+
+            if (randomSplash.Contains("[PalletCount]"))
+            {
+                randomSplash = randomSplash.Replace("[PalletCount]", AssetWarehouse.Instance.GetPallets().Count.ToString());
+            }
+
+            if (randomSplash.Contains("[CurrentAvatar]"))
+            {
+                var crateRef = new AvatarCrateReference(Main.SaveData.PlayerSettings.CurrentAvatar);
+                randomSplash = randomSplash.Replace("[CurrentAvatar]", crateRef.Crate.Title);
+            }
+
+            if (randomSplash.Contains("[Height"))
+            {
+                var height = Main.SaveData.PlayerSettings.PlayerHeight;
+                int feet = (int)height;
+                float inches = height - feet;
+                randomSplash = randomSplash.Replace("[Height]", $"{feet}'{inches}\"");
+            }
+
+            // It's gonna say this has errors: it does not. it builds fine, il2cpp just sucks
+            if (randomSplash.Contains("[RandomFavoriteSpawnable]"))
+            {
+                var spawnable = Main.SaveData.PlayerSettings.FavoriteSpawnables[rnd.Next(Main.SaveData.PlayerSettings.FavoriteSpawnables.Count)];
+                var crateRef = new SpawnableCrateReference(spawnable);
+                randomSplash = randomSplash.Replace("[RandomFavoriteSpawnable]", crateRef.Crate.Title);
+            }
+
+            if (randomSplash.Contains("[RandomFavoriteAvatar]"))
+            {
+
+                var avatar = Main.SaveData.PlayerSettings.FavoriteAvatars[rnd.Next(Main.SaveData.PlayerSettings.FavoriteAvatars.Count)];
+                var crateRef = new AvatarCrateReference(avatar);
+                randomSplash = randomSplash.Replace("[RandomFavoriteAvatar]", crateRef.Crate.Title);
+            }
+
+            callback(randomSplash);
         }
         else
         {

Staging/CHANGELOG.md

@@ -1,3 +1,6 @@
+**v1.1.1**
+* Fixed oversight in remote splash text handling
+
 **v1.1.0**
 * Fixed templates not working
 * Added [Height], [RandomFavoriteAvatar] and [RandomFavoriteSpawnable] templates

Staging/manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "SplashText",
-    "version_number": "1.1.0",
+    "version_number": "1.1.1",
     "website_url": "https://github.com/WeatherElectric/SplashText",
     "description": "Adds splash text to Void G114's menu.",
     "dependencies": [