Full subverter support

Marsey/MarseyPatcher.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Threading;
 using HarmonyLib;
+using Marsey.Subversion;
 
 namespace Marsey;
 
@@ -23,18 +24,20 @@ public class MarseyPatcher
     public static void Boot(Assembly? robClientAssembly)
     {
         if (robClientAssembly == null) throw new Exception("Robust.Client was null.");
-
+        
         Utility.SetupFlags();
 
         GameAssemblyManager.Init(new Harmony(MarseyVars.Identifier));
+
+        if (Subverse.InitSubverter()) Subverse.PatchSubverter();
 
         GameAssemblyManager.GetGameAssemblies(out var clientAss, out var robustSharedAss, out var clientSharedAss);
 
         PatchAssemblyManager.SetAssemblies(robClientAssembly, clientAss, robustSharedAss, clientSharedAss);
 
         FileHandler.LoadAssemblies(new []{"Marsey", "Enabled"});
 
-        PatchAssemblyManager.InitLogger();
+        PatchAssemblyManager.InitLogger(PatchAssemblyManager.GetPatchList());
 
         GameAssemblyManager.PatchProc(PatchAssemblyManager.GetPatchList());
     }

Marsey/PatchAssemblyManager.cs

@@ -81,9 +81,9 @@ public static void InitAssembly(Assembly assembly, bool subverter = false)
     /// Executed only by the loader.
     /// MarseyLogger example can be found in the BasePatch MarseyPatch example.
     /// </summary>
-    public static void InitLogger()
+    public static void InitLogger(List<MarseyPatch> patches)
     {
-        foreach (MarseyPatch patch in _patchAssemblies)
+        foreach (MarseyPatch patch in patches)
         {
             Assembly assembly = patch.Asm;
 

Marsey/Subversion/Subverse.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+
+namespace Marsey.Subversion;
+
+public static class Subverse
+{
+    private static MarseyPatch? _subverter = null; 
+
+    public static bool InitSubverter()
+    {
+        if (_subverter != null)
+            return true;
+
+        Subverter.LoadSubverts();
+        List<MarseyPatch> patches = Subverter.GetSubverterPatches();
+        foreach (MarseyPatch p in patches)
+        {
+            if (p.Name == "Subverter")
+            {
+                AssignSubverter(p);
+                PatchAssemblyManager.InitLogger(patches);
+                patches.RemoveAll(p => p.Name == "Subverter");
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static void AssignSubverter(MarseyPatch subverter)
+    {
+        _subverter = subverter;
+    }
+
+    public static void PatchSubverter()
+    {
+        if (_subverter != null) GameAssemblyManager.PatchProc(new List<MarseyPatch>() { _subverter });
+    }
+}

Marsey/Subversion/Subverter.cs

@@ -24,7 +24,7 @@ public static void AddSubvert(MarseyPatch patch)
         _subverterPatches.Add(patch);
     }
 
-    public static void SubversionPatch()
+    public static void SubversionPatcher()
     {
 
     }

SS14.Launcher/ViewModels/MainWindowTabs/PatchesTabViewModel.cs

@@ -16,7 +16,7 @@ namespace SS14.Launcher.ViewModels.MainWindowTabs
     public class PatchesTabViewModel : MainWindowTabViewModel
     {
         public override string Name => "Plugins";
-
+        public bool SubverterPresent { get; set; }
         public ObservableCollection<MarseyPatch> MarseyPatches { get; } = new ObservableCollection<MarseyPatch>();
         public ObservableCollection<MarseyPatch> SubverterPatches { get; } = new ObservableCollection<MarseyPatch>();
 
@@ -25,6 +25,7 @@ public class PatchesTabViewModel : MainWindowTabViewModel
 
         public PatchesTabViewModel()
         {
+            SubverterPresent = Subverse.InitSubverter();
             OpenMarseyPatchDirectoryCommand = new RelayCommand(() => OpenPatchDirectory("Marsey"));
             OpenSubverterPatchDirectoryCommand = new RelayCommand(() => OpenPatchDirectory("Subversion"));
             LoadPatches();
@@ -33,8 +34,9 @@ public PatchesTabViewModel()
         private void LoadPatches()
         {
             FileHandler.LoadAssemblies();
-            Subverter.LoadSubverts();
             LoadPatchList(PatchAssemblyManager.GetPatchList(), MarseyPatches, "marseypatches");
+            if (!SubverterPresent) return;
+            //Subverter.LoadSubverts();
             LoadPatchList(Subverter.GetSubverterPatches(), SubverterPatches, "subverterpatches");
         }
 
@@ -70,4 +72,25 @@ public class PathToFileNameConverter : IValueConverter
     {
         return value;
     }
+}
+
+public class BooleanToVisibilityConverter : IValueConverter
+{
+    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is bool booleanValue)
+        {
+            return booleanValue;
+        }
+        throw new InvalidOperationException("Invalid boolean value");
+    }
+
+    public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is bool visibilityValue)
+        {
+            return visibilityValue;
+        }
+        throw new InvalidOperationException("Invalid visibility value");
+    }
 }

SS14.Launcher/Views/MainWindowTabs/PatchesTabView.xaml

@@ -8,6 +8,7 @@
              x:Class="SS14.Launcher.Views.MainWindowTabs.PatchesTabView"
              Name="PatchesTab">
   <UserControl.Resources>
+    <global:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
     <global:PathToFileNameConverter x:Key="PathToFileNameConverter"/>
   </UserControl.Resources>
 
@@ -40,7 +41,7 @@
       </ScrollViewer>
     </TabItem>
 
-    <TabItem Header="Subverter">
+    <TabItem Header="Subverter" IsVisible="{Binding SubverterPresent, Converter={StaticResource BooleanToVisibilityConverter}}">
       <ScrollViewer HorizontalScrollBarVisibility="Disabled">
         <StackPanel>
           <TextBlock Margin="4, 0" Text="Plugins" Classes="NanoHeadingMedium" />