refactor: Fully replace old InfoCustom

EverestAPI · Oct 28, 2024 · e64358f · e64358f
1 parent 68c9073
commit e64358f
Show file tree

Hide file tree

Showing 17 changed files with 271 additions and 783 deletions.
diff --git a/CelesteTAS-EverestInterop/Source/Communication/CommunicationAdapterCeleste.cs b/CelesteTAS-EverestInterop/Source/Communication/CommunicationAdapterCeleste.cs
@@ -82,7 +82,6 @@ protected override void HandleMessage(MessageID messageId, BinaryReader reader)
                 object? arg = gameDataType switch {
                     GameDataType.ConsoleCommand => reader.ReadBoolean(),
                     GameDataType.SettingValue => reader.ReadString(),
-                    GameDataType.RawInfo => reader.ReadObject<(string, bool)>(),
                     GameDataType.CommandHash => reader.ReadObject<(string, string[], string, int)>(),
                     _ => null,
                 };
@@ -114,9 +113,6 @@ protected override void HandleMessage(MessageID messageId, BinaryReader reader)
                             case GameDataType.CustomInfoTemplate:
                                 gameData = !string.IsNullOrWhiteSpace(TasSettings.InfoCustomTemplate) ? TasSettings.InfoCustomTemplate : string.Empty;
                                 break;
-                            case GameDataType.RawInfo:
-                                gameData = InfoCustom.GetRawInfo(((string, bool))arg!);
-                                break;
                             case GameDataType.GameState:
                                 gameData = GameData.GetGameState();
                                 break;
@@ -158,10 +154,6 @@ protected override void HandleMessage(MessageID messageId, BinaryReader reader)
                                     writer.Write((string?)gameData ?? string.Empty);
                                     break;
 
-                                case GameDataType.RawInfo:
-                                    writer.WriteObject(gameData);
-                                    break;
-
                                 case GameDataType.GameState:
                                     writer.WriteObject((GameState?)gameData);
                                     break;

diff --git a/CelesteTAS-EverestInterop/Source/EverestInterop/InfoHUD/InfoCustom.cs b/CelesteTAS-EverestInterop/Source/EverestInterop/InfoHUD/InfoCustom.cs
diff --git a/CelesteTAS-EverestInterop/Source/EverestInterop/InfoHUD/InfoWatchEntity.cs b/CelesteTAS-EverestInterop/Source/EverestInterop/InfoHUD/InfoWatchEntity.cs
@@ -217,7 +217,7 @@ public static string GetInfo(string separator = "\n", bool alwaysUpdate = false,
     }
 
     private static void PrintAllSimpleValues(Entity entity) {
-        ("Info of Clicked Entity:\n" + GetEntityValues(entity, WatchEntityType.All)).Log(true);
+        ("Info of Clicked Entity:\n" + GetEntityValues(entity, WatchEntityType.All)).Log(string.Empty, true);
     }
 
     private static string GetEntityValues(Entity entity, WatchEntityType watchEntityType, string separator = "\n", int decimals = 2) {

diff --git a/CelesteTAS-EverestInterop/Source/EverestInterop/Lua/EvalLuaCommand.cs b/CelesteTAS-EverestInterop/Source/EverestInterop/Lua/EvalLuaCommand.cs
@@ -22,7 +22,8 @@ private class Meta : ITasCommandMeta {
         public bool HasArguments => true;
     }
 
-    private static bool consoleCommandRunning;
+    internal static bool ConsoleCommandRunning;
+
     private const string CommandName = "EvalLua";
     private static readonly Regex commandAndSeparatorRegex = new(@$"^{CommandName}[ |,]+", RegexOptions.Compiled | RegexOptions.IgnoreCase);
     private static readonly FieldInfo DebugRClogFieldInfo = typeof(Commands).GetFieldInfo("debugRClog");
@@ -76,7 +77,7 @@ private static string ReadContent(string assetPath) {
     }
 
     public static void Log(object message) {
-        if (consoleCommandRunning) {
+        if (ConsoleCommandRunning) {
             Engine.Commands.Log(message);
         }
 
@@ -91,9 +92,9 @@ private static void EvalLua(string code) {
             code = commandAndSeparatorRegex.Replace(firstHistory, "");
         }
 
-        consoleCommandRunning = true;
+        ConsoleCommandRunning = true;
         object[] result = EvalLuaImpl(code);
-        consoleCommandRunning = false;
+        ConsoleCommandRunning = false;
         LogResult(result);
     }