First 1.0 (exp) compatibility

OCB7D2D · Jul 5, 2024 · 6ba8db6 · 6ba8db6
1 parent d6bd194
commit 6ba8db6
Show file tree

Hide file tree

Showing 11 changed files with 229 additions and 178 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,10 +18,11 @@ jobs:
 
     steps:
     - name: Check out repository code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Call 7D2D compiler action
       uses: OCB7D2D/OcbModCompiler@master
       with:
+        v7d2d: 'V1.0'
         name: "OcbDensityHoe"
         version: "${{ github.ref_name }}"
         token: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/Config/items.xml b/Config/items.xml
@@ -1,20 +1,20 @@
-<configs patcher-version="4">
-
-  <!-- 	<setattribute xpath="/items/item[@name='meleeToolFarmT1IronHoe']/property[@name='CreativeMode']" name="value">Player</setattribute> -->
-
-  <modif condition="UndeadLegacy_CoreModule">
-    <include path="items.a20.xml"/>
-    <include path="items.a20.ulm.xml"/>
-  </modif>
-  <modelsif condition="DarknessFallsCore">
-    <!-- unlock item via iron tool schematics -->
-    <!-- include the main item -->
-    <include path="items.a21.xml"/>
-    <include path="items.a21.df.xml"/>
-  </modelsif>
-  <modelse>
-    <!-- include the main item -->
-    <include path="items.a21.xml"/>
-  </modelse>
-
-</configs>
+<configs patcher-version="4">
+
+  <!-- 	<setattribute xpath="/items/item[@name='meleeToolFarmT1IronHoe']/property[@name='CreativeMode']" name="value">Player</setattribute> -->
+
+  <modif condition="UndeadLegacy_CoreModule">
+    <modinc path="items.a20.xml"/>
+    <modinc path="items.a20.ulm.xml"/>
+  </modif>
+  <modelsif condition="DarknessFallsCore">
+    <!-- unlock item via iron tool schematics -->
+    <!-- include the main item -->
+    <modinc path="items.a21.xml"/>
+    <modinc path="items.a21.df.xml"/>
+  </modelsif>
+  <modelse>
+    <!-- include the main item -->
+    <modinc path="items.a21.xml"/>
+  </modelse>
+
+</configs>
diff --git a/Config/progression.xml b/Config/progression.xml
@@ -1,13 +1,13 @@
-<configs patcher-version="4">
-
-  <modif condition="UndeadLegacy_CoreModule">
-    <!-- unlocks items via schematics only -->
-  </modif>
-  <modelsif condition="DarknessFallsCore">
-    <include path="progression.a21.df.xml"/>
-  </modelsif>
-  <modelse>
-    <include path="progression.a21.xml"/>
-  </modelse>
-
-</configs>
+<configs patcher-version="4">
+
+  <modif condition="UndeadLegacy_CoreModule">
+    <!-- unlocks items via schematics only -->
+  </modif>
+  <modelsif condition="DarknessFallsCore">
+    <modinc path="progression.a21.df.xml"/>
+  </modelsif>
+  <modelse>
+    <modinc path="progression.a21.xml"/>
+  </modelse>
+
+</configs>
diff --git a/Config/recipes.xml b/Config/recipes.xml
@@ -1,13 +1,13 @@
-<configs patcher-version="4">
-
-  <modif condition="UndeadLegacy_CoreModule">
-    <include path="recipes.a20.ulm.xml"/>
-  </modif>
-  <modelsif condition="DarknessFallsCore">
-    <include path="recipes.a21.df.xml"/>
-  </modelsif>
-  <modelse>
-    <include path="recipes.a21.xml"/>
-  </modelse>
-
-</configs>
+<configs patcher-version="4">
+
+  <modif condition="UndeadLegacy_CoreModule">
+    <modinc path="recipes.a20.ulm.xml"/>
+  </modif>
+  <modelsif condition="DarknessFallsCore">
+    <modinc path="recipes.a21.df.xml"/>
+  </modelsif>
+  <modelse>
+    <modinc path="recipes.a21.xml"/>
+  </modelse>
+
+</configs>
diff --git a/Config/traders.xml b/Config/traders.xml
@@ -1,7 +1,7 @@
 <configs patcher-version="4">
 
   <modif condition="UndeadLegacy_CoreModule">
-    <!-- <include path="traders.ulm.xml"/> -->
+    <!-- <modinc path="traders.ulm.xml"/> -->
   </modif>
   <modelsif condition="DarknessFallsCore">
     <append xpath="/traders/trader_item_groups/trader_item_group[@name='tools']">

diff --git a/DensityHoe.dll b/DensityHoe.dll
diff --git a/Harmony/DensityHoe.cs b/Harmony/DensityHoe.cs
@@ -46,7 +46,7 @@ public static bool Prefix(
             ref EntityAlive _player,
             ref WorldRayHitInfo _hitInfo,
             RenderDisplacedCube __instance,
-            ref Bounds ___myBounds,
+            ref Bounds ___localPos,
             ref Vector3 ___multiDim,
             ref float ___lastTimeFocusTransformMoved,
             ref Transform ___transformFocusCubePrefab,
@@ -103,7 +103,7 @@ public static bool Prefix(
 
             // Update some states, which are static for our use case
             // We only target terrain blocks, so block size is fixed
-            ___myBounds = new Bounds(new Vector3(0.5f, 0.5f, 0.5f), Vector3.one);
+            ___localPos = new Bounds(new Vector3(0.5f, 0.5f, 0.5f), Vector3.one);
             ___multiDim = Vector3i.one; // Terrain blocks are never multi-dims?
 
             // Note: disabled as too cheasy and doesn't always work (when not dense enough)

diff --git a/Harmony/ItemActionDensityHoe.cs b/Harmony/ItemActionDensityHoe.cs
@@ -24,7 +24,7 @@ public override void ReadFrom(DynamicProperties _props)
         base.ReadFrom(_props);
     }
 
-    protected override void hitTarget(
+    public override void hitTarget(
         ItemActionData action,
         WorldRayHitInfo hitInfo,
         bool isGrazingHit)
@@ -41,10 +41,10 @@ public override RenderCubeType GetFocusType(ItemActionData action) =>
     public override ItemClass.EnumCrosshairType GetCrosshairType(ItemActionData action) =>
         IsHitValid(action) ? ItemClass.EnumCrosshairType.Plus : base.GetCrosshairType(action);
 
-    protected override bool isShowOverlay(ItemActionData action) =>
+    public override bool isShowOverlay(ItemActionData action) =>
         IsHitValid(action) || base.isShowOverlay(action);
 
-    protected override void getOverlayData(
+    public override void getOverlayData(
         ItemActionData action,
         out float _perc,
         out string _text)