Merge pull request #689 from zymex22/issue688

#688 removed ITab_Bills2
zymex22 · Mar 28, 2023 · defa9cb · defa9cb
2 parents 19b656c + ccda0c5
commit defa9cb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 209 deletions.
diff --git a/Defs/ThingDefs_Buildings/Buildings_Miners.xml b/Defs/ThingDefs_Buildings/Buildings_Miners.xml
@@ -612,7 +612,7 @@
     <drawPlaceWorkersWhileSelected>true</drawPlaceWorkersWhileSelected>
     <inspectorTabs>
       <li>ProjectRimFactory.Common.ITab_PowerSupply</li>      <!-- Power boost -->
-      <li>ProjectRimFactory.AutoMachineTool.ITab_Bills2</li>      <!-- AutomachineTool ITab not PRF -->
+      <li>ProjectRimFactory.SAL3.UI.ITab_SAL3Bills</li>      <!-- ITab -->
     </inspectorTabs>
     <modExtensions>
       <!--  <li Class="ProjectRimFactory.AutoMachineTool.ModExtension_EffectWorking">

diff --git a/Source/ProjectRimFactory/AutoMachineTool/Building_MIner.cs b/Source/ProjectRimFactory/AutoMachineTool/Building_MIner.cs
@@ -1,4 +1,5 @@
 using ProjectRimFactory.Common;
+using ProjectRimFactory.SAL3.UI;
 using RimWorld;
 using System;
 using System.Collections.Generic;
@@ -9,17 +10,13 @@
 
 namespace ProjectRimFactory.AutoMachineTool
 {
-    public class Building_Miner : Building_BaseMachine<Building_Miner>, IBillGiver, IRecipeProductWorker, ITabBillTable, IXMLThingDescription
+    public class Building_Miner : Building_BaseMachine<Building_Miner>, IBillGiver, IRecipeProductWorker, IXMLThingDescription, IBillTab
     {
 
         public BillStack BillStack => this.billStack;
 
         public IEnumerable<IntVec3> IngredientStackCells => Enumerable.Empty<IntVec3>();
 
-        ThingDef ITabBillTable.def => this.def;
-
-        BillStack ITabBillTable.billStack => this.BillStack;
-
         public IEnumerable<RecipeDef> AllRecipes => this.def.AllRecipes;
 
         public IEnumerable<RecipeDef> GetAllRecipes()

diff --git a/Source/ProjectRimFactory/AutoMachineTool/ITab_Bills2.cs b/Source/ProjectRimFactory/AutoMachineTool/ITab_Bills2.cs
diff --git a/...ectRimFactory/Common/HarmonyPatches/Patch_SaveStorageSettings_Patch_Building_GetGizmos.cs b/...ectRimFactory/Common/HarmonyPatches/Patch_SaveStorageSettings_Patch_Building_GetGizmos.cs
@@ -1,5 +1,6 @@
 using HarmonyLib;
 using ProjectRimFactory.SAL3.Things.Assemblers;
+using ProjectRimFactory.SAL3.UI;
 using RimWorld;
 using System;
 using System.Collections.Generic;
@@ -112,10 +113,7 @@ static IEnumerable<CodeInstruction> Transpiler_IsWorkTable(IEnumerable<CodeInstr
         /// <returns></returns>
         public static bool IsValidBuilding(Building building)
         {
-            var isworktable = (building as Building_WorkTable) != null;
-            var isRimfactory = ((building as ProjectRimFactory.AutoMachineTool.ITabBillTable) != null) || building is Building_DynamicBillGiver;
-
-            return isworktable || isRimfactory;
+            return (building as IBillTab) != null;
         }
 
         /// <summary>
@@ -127,10 +125,9 @@ public static BillStack GetBillstack(Building building)
         {
             Building_WorkTable building_WorkTable = building as Building_WorkTable;
             if (building_WorkTable != null) return building_WorkTable.billStack;
-            ProjectRimFactory.AutoMachineTool.ITabBillTable tabBillTable = building as ProjectRimFactory.AutoMachineTool.ITabBillTable;
-            if (tabBillTable != null) return tabBillTable.billStack;
-            Building_DynamicBillGiver building_DynamicBillGiver = building as Building_DynamicBillGiver;
-            if (building_DynamicBillGiver != null) return building_DynamicBillGiver.BillStack;
+
+            IBillTab building_IBillTab = building as IBillTab;
+            if (building_IBillTab != null) return building_IBillTab.BillStack;
 
             //This should never happen
             Log.Error($"PRF Error GetBillstack returns null - {building}");

diff --git a/Source/ProjectRimFactory/SAL3/Things/Assemblers/Building_DynamicBillGiver.cs b/Source/ProjectRimFactory/SAL3/Things/Assemblers/Building_DynamicBillGiver.cs
@@ -1,4 +1,5 @@
 using ProjectRimFactory.Common;
+using ProjectRimFactory.SAL3.UI;
 using RimWorld;
 using System;
 using System.Collections.Generic;
@@ -8,7 +9,7 @@
 namespace ProjectRimFactory.SAL3.Things.Assemblers
 {
     [StaticConstructorOnStartup]
-    public abstract class Building_DynamicBillGiver : PRF_Building, IBillGiver
+    public abstract class Building_DynamicBillGiver : PRF_Building, IBillGiver, IBillTab
     {
         public abstract BillStack BillStack { get; }
 

diff --git a/Source/ProjectRimFactory/SAL3/UI/ITab_SAL3Bills.cs b/Source/ProjectRimFactory/SAL3/UI/ITab_SAL3Bills.cs
@@ -11,6 +11,15 @@
 
 namespace ProjectRimFactory.SAL3.UI
 {
+    public interface IBillTab
+    {
+        BillStack BillStack { get; }
+        Map Map { get; } 
+        IEnumerable<RecipeDef> GetAllRecipes();
+        IntVec3 Position { get; }
+    }
+
+
     [StaticConstructorOnStartup]
     public class ITab_SAL3Bills : ITab
     {
@@ -28,11 +37,11 @@ public class ITab_SAL3Bills : ITab
 
         public static readonly FieldInfo PasteSizeField = typeof(ITab_Bills).GetField("PasteSize", BindingFlags.NonPublic | BindingFlags.Static);
 
-        protected Building_DynamicBillGiver SelAssembler
+        protected IBillTab SelBuilding
         {
             get
             {
-                return (Building_DynamicBillGiver)SelThing;
+                return (IBillTab)SelThing;
             }
         }
 
@@ -42,7 +51,7 @@ public ITab_SAL3Bills()
             labelKey = "SAL3_BillsTabLabel";
         }
 
-        public override bool IsVisible => SelThing is Building_DynamicBillGiver;
+        public override bool IsVisible => SelThing is IBillTab;
 
         protected override void FillTab()
         {
@@ -58,14 +67,14 @@ protected override void FillTab()
                 GUI.color = Color.white;
                 TooltipHandler.TipRegion(rect, "PasteBillTip".Translate());
             }
-            else if (!SelAssembler.GetAllRecipes().Contains(BillUtility.Clipboard.recipe) || !BillUtility.Clipboard.recipe.AvailableNow)
+            else if (!SelBuilding.GetAllRecipes().Contains(BillUtility.Clipboard.recipe) || !BillUtility.Clipboard.recipe.AvailableNow)
             {
                 GUI.color = Color.gray;
                 Widgets.DrawTextureFitted(rect, Textures.Paste, 1f);
                 GUI.color = Color.white;
                 TooltipHandler.TipRegion(rect, "ClipboardBillNotAvailableHere".Translate());
             }
-            else if (SelAssembler.BillStack.Count >= 15)
+            else if (SelBuilding.BillStack.Count >= 15)
             {
                 GUI.color = Color.gray;
                 Widgets.DrawTextureFitted(rect, Textures.Paste, 1f);
@@ -78,7 +87,7 @@ protected override void FillTab()
                 {
                     Bill bill = BillUtility.Clipboard.Clone();
                     bill.InitializeAfterClone();
-                    SelAssembler.BillStack.AddBill(bill);
+                    SelBuilding.BillStack.AddBill(bill);
                     SoundDefOf.Tick_Low.PlayOneShotOnCamera(null);
                 }
                 TooltipHandler.TipRegion(rect, "PasteBillTip".Translate());
@@ -87,18 +96,18 @@ protected override void FillTab()
             Func<List<FloatMenuOption>> recipeOptionsMaker = delegate ()
             {
                 List<FloatMenuOption> list = new List<FloatMenuOption>();
-                foreach (RecipeDef recipe in SelAssembler.GetAllRecipes())
+                foreach (RecipeDef recipe in SelBuilding.GetAllRecipes())
                 {
                     if (recipe.AvailableNow)
                     {
                         list.Add(new FloatMenuOption(recipe.LabelCap, delegate ()
                         {
-                            if (!SelAssembler.Map.mapPawns.FreeColonists.Any((Pawn col) => recipe.PawnSatisfiesSkillRequirements(col)))
+                            if (!SelBuilding.Map.mapPawns.FreeColonists.Any((Pawn col) => recipe.PawnSatisfiesSkillRequirements(col)))
                             {
                                 Bill.CreateNoPawnsWithSkillDialog(recipe);
                             }
                             Bill bill2 = recipe.MakeNewBill();
-                            SelAssembler.BillStack.AddBill(bill2);
+                            SelBuilding.BillStack.AddBill(bill2);
                             if (recipe.conceptLearned != null)
                             {
                                 PlayerKnowledgeDatabase.KnowledgeDemonstrated(recipe.conceptLearned, KnowledgeAmount.Total);
@@ -112,7 +121,7 @@ protected override void FillTab()
                 }
                 return list;
             };
-            mouseoverBill = SelAssembler.BillStack.DoListing(rect2, recipeOptionsMaker, ref scrollPosition, ref viewHeight);
+            mouseoverBill = SelBuilding.BillStack.DoListing(rect2, recipeOptionsMaker, ref scrollPosition, ref viewHeight);
             //
             //Rect rect = new Rect(0f, 0f, WinSize.x, WinSize.y).ContractedBy(10f);
             //Func<List<FloatMenuOption>> recipeOptionsMaker = delegate
@@ -142,7 +151,7 @@ public override void TabUpdate()
         {
             if (mouseoverBill != null)
             {
-                mouseoverBill.TryDrawIngredientSearchRadiusOnMap(SelAssembler.Position);
+                mouseoverBill.TryDrawIngredientSearchRadiusOnMap(SelBuilding.Position);
                 mouseoverBill = null;
             }
         }