Load defs to static class

eth0net · Mar 29, 2023 · 867a463 · 867a463
1 parent 85823b1
commit 867a463
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Assemblies/SubcoreInfo.dll b/Assemblies/SubcoreInfo.dll
diff --git a/Source/SubcoreInfo/Harmony/Harmony_Building_SubcoreScanner.cs b/Source/SubcoreInfo/Harmony/Harmony_Building_SubcoreScanner.cs
@@ -37,7 +37,7 @@ internal static class Harmony_Building_SubcoreScanner_Tick
         /// <returns></returns>
         internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions) => instructions.MethodReplacer(
             AccessTools.Method(typeof(GenPlace), nameof(GenPlace.TryPlaceThing), new Type[] { typeof(Thing), typeof(IntVec3), typeof(Map), typeof(ThingPlaceMode), typeof(Action<Thing, int>), typeof(Predicate<IntVec3>), typeof(Rot4) }),
-            AccessTools.Method(typeof(Harmony_Building_SubcoreScanner_Tick), nameof(Harmony_Building_SubcoreScanner_Tick.TryUpdateAndPlaceSubcore))
+            AccessTools.Method(typeof(Harmony_Building_SubcoreScanner_Tick), nameof(TryUpdateAndPlaceSubcore))
         );
 
         /// <summary>
@@ -55,8 +55,8 @@ internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruct
         {
             ThingDef scannerDef = thing.def.defName switch
             {
-                "SubcoreRegular" => ThingDef.Named("SubcoreSoftscanner"),
-                "SubcoreHigh" => ThingDef.Named("SubcoreRipscanner"),
+                "SubcoreRegular" => ThingDefOf.SubcoreSoftscanner,
+                "SubcoreHigh" => ThingDefOf.SubcoreRipscanner,
                 _ => null
             };
 

diff --git a/Source/SubcoreInfo/SubcoreInfo.csproj b/Source/SubcoreInfo/SubcoreInfo.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Harmony\Harmony_Pawn.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SubcoreInfoSettings.cs" />
+    <Compile Include="ThingDefOf.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/Source/SubcoreInfo/ThingDefOf.cs b/Source/SubcoreInfo/ThingDefOf.cs
@@ -0,0 +1,15 @@
+using RimWorld;
+using Verse;
+
+namespace SubcoreInfo
+{
+    [DefOf]
+    internal static class ThingDefOf
+    {
+        [MayRequireBiotech]
+        public static ThingDef SubcoreSoftscanner;
+
+        [MayRequireBiotech]
+        public static ThingDef SubcoreRipscanner;
+    }
+}