make ModTek compatible, suss apart some bits into their own classes, add logging, add setting the color from mod.json istead of hardcoding

Author: janxious

BTMLColorLOSMod/BTMLColorLOSMod.cs

@@ -1,284 +1,29 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using Harmony;
-using BattleTech;
-using BattleTech.UI;
-using UnityEngine;
+using Newtonsoft.Json;
 
 namespace BTMLColorLOSMod
 {
-    [HarmonyPatch(typeof(BattleTech.UI.WeaponRangeIndicators), "DrawLine")]
-    public static class WeaponRangeIndicators_DrawLine_Patch
+    public static class BTMLColorLOSMod
     {
-        static bool Prefix(
-            ref Vector3 position,
-            ref Quaternion rotation,
-            ref bool isPositionLocked,
-            ref AbstractActor selectedActor,
-            ref ICombatant target,
-            ref bool usingMultifire,
-            ref bool isLocked,
-            ref bool isMelee,
-            WeaponRangeIndicators __instance)
+        internal static Settings ModSettings = new Settings();
+        internal static string ModDirectory;
+        public static void Init(string directory, string settingsJSON)
         {
-            CombatHUD HUD = (CombatHUD) ReflectionHelper.GetPrivateProperty(__instance, "HUD");
-            if (__instance.DEBUG_showLOSLines)
-            {
-                DEBUG_LOSLineDrawer debugDrawer =
-                    (DEBUG_LOSLineDrawer) ReflectionHelper.InvokePrivateMethode(__instance, "GetDebugDrawer",
-                        new object[] { });
-                debugDrawer.DrawLines(selectedActor, HUD.SelectionHandler.ActiveState, target);
-            }
+            var harmony = HarmonyInstance.Create("com.joelmeador.BTMLColorLOSMod");
+            harmony.PatchAll(Assembly.GetExecutingAssembly());
 
-            LineRenderer line =
-                (LineRenderer) ReflectionHelper.InvokePrivateMethode(__instance, "getLine", new object[] { });
-            Vector3 vector = Vector3.Lerp(position, position + selectedActor.HighestLOSPosition,
-                __instance.sourceLaserDestRatio);
-            Vector3 vector2 = Vector3.Lerp(target.CurrentPosition, target.TargetPosition,
-                __instance.targetLaserDestRatio);
-            AbstractActor abstractActor = target as AbstractActor;
-            // melee
-            if (isMelee)
+            ModDirectory = directory;
+            try
             {
-                line.startWidth = __instance.LOSWidthBegin;
-                line.endWidth = __instance.LOSWidthEnd;
-                line.material = __instance.MaterialInRange;
-                line.startColor = __instance.LOSLockedTarget;
-                line.endColor = __instance.LOSLockedTarget;
-                line.positionCount = 2;
-                line.SetPosition(0, vector);
-                Vector3 vector3 = vector - vector2;
-                vector3.Normalize();
-                vector3 *= __instance.LineEndOffset;
-                vector2 += vector3;
-                line.SetPosition(1, vector2);
-                ReflectionHelper.InvokePrivateMethode(__instance, "SetEnemyTargetable", new object[] {target, true});
-                List<AbstractActor> allActors = selectedActor.Combat.AllActors;
-                allActors.Remove(selectedActor);
-                allActors.Remove(abstractActor);
-                PathNode pathNode = default(PathNode);
-                Vector3 attackPosition = default(Vector3);
-                float num = default(float);
-                selectedActor.Pathing.GetMeleeDestination(abstractActor, allActors, out pathNode, out attackPosition,
-                    out num);
-                HUD.InWorldMgr.ShowAttackDirection(HUD.SelectedActor, abstractActor,
-                    HUD.Combat.HitLocation.GetAttackDirection(attackPosition, target), vector2.y,
-                    MeleeAttackType.Punch, 0);
+                ModSettings = JsonConvert.DeserializeObject<Settings>(settingsJSON);
             }
-            // not melee
-            else
+            catch (Exception ex)
             {
-                FiringPreviewManager.PreviewInfo previewInfo =
-                    HUD.SelectionHandler.ActiveState.FiringPreview.GetPreviewInfo(target);
-                if (previewInfo.availability == FiringPreviewManager.TargetAvailability.NotSet)
-                {
-                    Debug.LogError("Error - trying to draw line with no FiringPreviewManager availability!");
-                }
-                // why is the bad case first. just dump out of the fucking method, doug
-                else
-                {
-                    bool flag = HUD.SelectionHandler.ActiveState.SelectionType != SelectionType.Sprint ||
-                                HUD.SelectedActor.CanShootAfterSprinting;
-                    bool flag2 = !isPositionLocked &&
-                                 previewInfo.availability != FiringPreviewManager.TargetAvailability.BeyondMaxRange &&
-                                 previewInfo.availability != FiringPreviewManager.TargetAvailability.BeyondRotation;
-                    if (flag && (previewInfo.IsCurrentlyAvailable || flag2))
-                    {
-                        // multiple targets, even if only one selected
-                        if (usingMultifire)
-                        {
-                            if (target == HUD.SelectedTarget)
-                            {
-                                LineRenderer lineRenderer = line;
-                                Color color2 = lineRenderer.startColor =
-                                    (line.endColor = __instance.LOSMultiTargetKBSelection);
-                            }
-                            else if (isLocked)
-                            {
-                                LineRenderer lineRenderer2 = line;
-                                Color color2 =
-                                    lineRenderer2.startColor = (line.endColor = __instance.LOSLockedTarget);
-                            }
-                            else
-                            {
-                                LineRenderer lineRenderer3 = line;
-                                Color color2 =
-                                    lineRenderer3.startColor = (line.endColor = __instance.LOSUnlockedTarget);
-                            }
-                        }
-                        // normal shot
-                        else
-                        {
-                            float shotQuality = (float) ReflectionHelper.InvokePrivateMethode(__instance,
-                                "GetShotQuality", new object[] {selectedActor, position, rotation, target});
-                            Color color5 = Color.Lerp(Color.clear, __instance.LOSInRange, shotQuality);
-                            LineRenderer lineRenderer4 = line;
-                            Color color2 = lineRenderer4.startColor = (line.endColor = color5);
-                        }
-
-                        line.material = __instance.MaterialInRange;
-                        // straight line shot
-                        if (previewInfo.HasLOF)
-                        {
-                            line.positionCount = 2;
-                            line.SetPosition(0, vector);
-                            Vector3 vector4 = vector - vector2;
-                            vector4.Normalize();
-                            vector4 *= __instance.LineEndOffset;
-                            vector2 += vector4;
-                            if (previewInfo.LOFLevel == LineOfFireLevel.LOFClear)
-                            {
-                                if (target == HUD.SelectionHandler.ActiveState.FacingEnemy)
-                                {
-                                    line.startWidth =
-                                        __instance.LOSWidthBegin * __instance.LOSWidthFacingTargetMultiplier;
-                                    line.endWidth = __instance.LOSWidthEnd * __instance.LOSWidthFacingTargetMultiplier;
-                                }
-                                else
-                                {
-                                    line.startWidth = __instance.LOSWidthBegin;
-                                    line.endWidth = __instance.LOSWidthEnd;
-                                }
-
-                                line.SetPosition(1, vector2);
-                            }
-                            else
-                            {
-                                if (target == HUD.SelectionHandler.ActiveState.FacingEnemy)
-                                {
-                                    line.startWidth =
-                                        __instance.LOSWidthBegin * __instance.LOSWidthFacingTargetMultiplier;
-                                    line.endWidth =
-                                        __instance.LOSWidthBegin * __instance.LOSWidthFacingTargetMultiplier;
-                                }
-                                else
-                                {
-                                    line.startWidth = __instance.LOSWidthBegin;
-                                    line.endWidth = __instance.LOSWidthBegin;
-                                }
-
-                                Vector3 collisionPoint = previewInfo.collisionPoint;
-                                collisionPoint = Vector3.Project(collisionPoint - vector, vector2 - vector) + vector;
-                                line.SetPosition(1, collisionPoint);
-                                LineRenderer line2 =
-                                    (LineRenderer) ReflectionHelper.InvokePrivateMethode(__instance, "getLine",
-                                        new object[] { });
-                                line2.positionCount = 2;
-                                line2.startWidth = __instance.LOSWidthBlocked;
-                                line2.endWidth = __instance.LOSWidthBlocked;
-                                line2.material = __instance.MaterialInRange;
-                                LineRenderer lineRenderer5 = line2;
-                                Color color2 = lineRenderer5.startColor = (line2.endColor = __instance.LOSBlocked);
-                                line2.SetPosition(0, collisionPoint);
-                                line2.SetPosition(1, vector2);
-                                GameObject coverIcon =
-                                    (GameObject) ReflectionHelper.InvokePrivateMethode(__instance, "getCoverIcon",
-                                        new object[] { });
-                                if (!coverIcon.activeSelf)
-                                {
-                                    coverIcon.SetActive(true);
-                                }
-
-                                coverIcon.transform.position = collisionPoint;
-                            }
-                        }
-                        // arc shot
-                        else
-                        {
-                            // other than formatting this is the only thing that changed from the decompiled code
-                            Vector3[] pointsForArc = WeaponRangeIndicators.GetPointsForArc(18, 30f, vector, vector2);
-                            float shotQuality = (float) ReflectionHelper.InvokePrivateMethode(__instance,
-                                "GetShotQuality", new object[] {selectedActor, position, rotation, target});
-                            // currently this doesn't actually show up cyan, because there is a shader on 
-                            // these lines that seems to strip out all color data except the red, so this just makes
-                            // a black line
-                            Color color6 = Color.Lerp(Color.clear, Color.cyan, shotQuality);
-                            line.endColor = line.startColor = color6;
-                            line.positionCount = 18;
-                            line.SetPositions(pointsForArc);
-                        }
-
-                        ReflectionHelper.InvokePrivateMethode(__instance, "SetEnemyTargetable",
-                            new object[] {target, true});
-                        if (abstractActor != null)
-                        {
-                            HUD.InWorldMgr.ShowAttackDirection(HUD.SelectedActor, abstractActor,
-                                HUD.Combat.HitLocation.GetAttackDirection(position, target), vector2.y,
-                                MeleeAttackType.NotSet, HUD.InWorldMgr.NumWeaponsTargeting(target));
-                        }
-                    }
-                    // sprinted and can't shoot or out of rotation/weapon range
-                    else
-                    {
-                        line.positionCount = 2;
-                        line.SetPosition(0, vector);
-                        line.SetPosition(1, vector2);
-                        LineRenderer lineRenderer6 = line;
-                        Color color2 = lineRenderer6.startColor = (line.endColor = __instance.LOSOutOfRange);
-                        line.material = __instance.MaterialOutOfRange;
-                        ReflectionHelper.InvokePrivateMethode(__instance, "SetEnemyTargetable",
-                            new object[] {target, false});
-                    }
-                }
+                Logger.LogError(ex);
+                ModSettings = new Settings();
             }
-
-            return false;
-        }
-    }
-
-    public static class ColorLOSMod
-    {
-        public static void Init()
-        {
-            var harmony = HarmonyInstance.Create("com.joelmeador.ColorLOS");
-            harmony.PatchAll(Assembly.GetExecutingAssembly());
-        }
-    }
-
-    public static class ReflectionHelper
-    {
-        public static object InvokePrivateMethode(object instance, string methodname, object[] parameters)
-        {
-            Type type = instance.GetType();
-            MethodInfo methodInfo = type.GetMethod(methodname, BindingFlags.NonPublic | BindingFlags.Instance);
-            return methodInfo.Invoke(instance, parameters);
-        }
-
-        public static object InvokePrivateMethode(object instance, string methodname, object[] parameters, Type[] types)
-        {
-            Type type = instance.GetType();
-            MethodInfo methodInfo = type.GetMethod(methodname, BindingFlags.NonPublic | BindingFlags.Instance, null,
-                types, null);
-            return methodInfo.Invoke(instance, parameters);
-        }
-
-        public static void SetPrivateProperty(object instance, string propertyname, object value)
-        {
-            Type type = instance.GetType();
-            PropertyInfo property = type.GetProperty(propertyname, BindingFlags.NonPublic | BindingFlags.Instance);
-            property.SetValue(instance, value, null);
-        }
-
-        public static object GetPrivateProperty(object instance, string propertyname)
-        {
-            Type type = instance.GetType();
-            PropertyInfo property = type.GetProperty(propertyname, BindingFlags.NonPublic | BindingFlags.Instance);
-            return property.GetValue(instance, new object[] { });
-        }
-
-        public static void SetPrivateField(object instance, string fieldname, object value)
-        {
-            Type type = instance.GetType();
-            FieldInfo field = type.GetField(fieldname, BindingFlags.NonPublic | BindingFlags.Instance);
-            field.SetValue(instance, value);
-        }
-
-        public static object GetPrivateField(object instance, string fieldname)
-        {
-            Type type = instance.GetType();
-            FieldInfo field = type.GetField(fieldname, BindingFlags.NonPublic | BindingFlags.Instance);
-            return field.GetValue(instance);
         }
     }
 }

BTMLColorLOSMod/BTMLColorLOSMod.csproj

@@ -33,6 +33,9 @@
     <Reference Include="0Harmony, Version=1.0.9.1, Culture=neutral, PublicKeyToken=null">
       <HintPath>bin\Debug\0Harmony.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\..\..\..\Library\Application Support\Steam\steamapps\common\BATTLETECH\BattleTech.app\Contents\Resources\Data\Managed\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -43,7 +46,7 @@
       <HintPath>..\..\..\..\Downloads\BattleTechModLoader-v0.2.0\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\Library\Application Support\Steam\steamapps\common\BATTLETECH\BattleTech.app\Contents\Resources\Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>../../../../Library/Application Support/Steam/steamapps/common/BATTLETECH/BattleTech.app/Contents/Resources/Data/Managed/Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\..\..\Library\Application Support\Steam\steamapps\common\BATTLETECH\BattleTech.app\Contents\Resources\Data\Managed\UnityEngine.dll</HintPath>
@@ -54,7 +57,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BTMLColorLOSMod.cs" />
+    <Compile Include="Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReflectionHelper.cs" />
+    <Compile Include="Settings.cs" />
+    <Compile Include="WeaponRangeIndicators_DrawLine_Patch.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="mod.json" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

BTMLColorLOSMod/Logger.cs

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+
+namespace BTMLColorLOSMod
+{
+    public class Logger
+    {
+        public static void LogError(Exception ex)
+        {
+            var filePath = $"{BTMLColorLOSMod.ModDirectory}/BTMLColorLOSMod.log";
+            using (var writer = new StreamWriter(filePath, true))
+            {
+                writer.WriteLine($"Message: {ex.Message}");
+                writer.WriteLine($"StackTrace: {ex.StackTrace}");
+                WriteLogFooter(writer);
+            }
+        }
+
+        public static void LogLine(String line)
+        {
+            var filePath = $"{BTMLColorLOSMod.ModDirectory}/BTMLColorLOSMod.log";
+            using (var writer = new StreamWriter(filePath, true))
+            {
+                writer.WriteLine(line);
+                WriteLogFooter(writer);
+            }
+        }
+
+        private static void WriteLogFooter(StreamWriter writer)
+        {
+            writer.WriteLine($"Date: {DateTime.Now}");
+            writer.WriteLine();
+            writer.WriteLine(new string(c: '-', count: 50));
+            writer.WriteLine();
+        }
+    }
+}