bt 1.2 fix

BattletechModders · Aug 22, 2018 · f65c31d · f65c31d
1 parent eb3fd75
commit f65c31d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 106 deletions.
diff --git a/source/Control.cs b/source/Control.cs
@@ -48,7 +48,7 @@ public static void Init(string directory, string settingsJSON)
                 Validator.RegisterMechValidator(CategoryController.ValidateMech, CategoryController.ValidateMechCanBeFielded);
 
 
-                Logger.Log("Loaded CustomComponents v0.7.0.0.0");
+                Logger.Log("Loaded CustomComponents v0.7.0.1.0");
 #if CCDEBUG
                 Logger.LogDebug("Loading Categories");
 #endif  

diff --git a/source/CustomComponents.csproj b/source/CustomComponents.csproj
@@ -127,8 +127,6 @@
     <Compile Include="Validators\MechLabLocationWidget_OnMechLabDrop_Patch.cs" />
     <Compile Include="Patches\MechLabLocationWidget_OnItemGrab_Patch.cs" />
     <Compile Include="Components\ColorComponent.cs" />
-    <Compile Include="Patches\ListElementController_SalvageGear_NotListView_RefreshItemColor_Patch.cs" />
-    <Compile Include="Patches\ListElementController_SalvageGear_RefreshItemColor_Patch.cs" />
     <Compile Include="Patches\MechComponentRef_GetUIColor_Patch.cs" />
     <Compile Include="Control.cs" />
     <Compile Include="CustomComponentSettings.cs" />

diff --git a/source/Patches/ListElementController_SalvageGear_NotListView_RefreshItemColor_Patch.cs b/source/Patches/ListElementController_SalvageGear_NotListView_RefreshItemColor_Patch.cs
diff --git a/source/Patches/ListElementController_SalvageGear_RefreshItemColor_Patch.cs b/source/Patches/ListElementController_SalvageGear_RefreshItemColor_Patch.cs
diff --git a/source/Patches/MechLabLocationWidget_OnItemGrab_Patch.cs b/source/Patches/MechLabLocationWidget_OnItemGrab_Patch.cs
@@ -2,6 +2,7 @@
 using BattleTech;
 using BattleTech.UI;
 using Harmony;
+using Localize;
 
 namespace CustomComponents
 { 
@@ -20,7 +21,7 @@ public static bool Prefix(IMechLabDraggableItem item, ref bool __result, MechLab
                 if(!grab_handler.OnItemGrab(item, ___mechLab, out var error))
                 {
                     if (!string.IsNullOrEmpty(error))
-                        ___mechLab.ShowDropErrorMessage(error);
+                        ___mechLab.ShowDropErrorMessage(new Text(error));
                     __result = false;
                     return false;
                 }

diff --git a/source/Validators/MechLabLocationWidget_OnMechLabDrop_Patch.cs b/source/Validators/MechLabLocationWidget_OnMechLabDrop_Patch.cs
@@ -4,7 +4,7 @@
 using BattleTech;
 using BattleTech.UI;
 using Harmony;
-
+using Localize;
 using UnityEngine.EventSystems;
 
 namespace CustomComponents
@@ -27,7 +27,7 @@ bool do_cancel(string error)
 
                     Control.Logger.LogDebug($"- Canceled: {error}");
 
-                    ___mechLab.ShowDropErrorMessage(error);
+                    ___mechLab.ShowDropErrorMessage(new Text(error));
                     ___mechLab.OnDrop(eventData);
                     return true;
                 }