Merge pull request #36 from thomasfn/staging

release 0.6.0
thomasfn · Aug 29, 2024 · 66f77eb · 66f77eb
2 parents 75da949 + 18addae
commit 66f77eb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,8 @@ jobs:
     name: Build Mod
     runs-on: ubuntu-latest
     env:
-      MODKIT_VERSION: 0.10.2.0-beta
-      ECO_BRANCH: release
+      MODKIT_VERSION: 0.11.0.2-beta-release-707
+      ECO_BRANCH: staging
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core 7.0

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -9,8 +9,8 @@ jobs:
   build-mod:
     runs-on: ubuntu-latest
     env:
-      MODKIT_VERSION: 0.10.2.0-beta
-      ECO_BRANCH: release
+      MODKIT_VERSION: 0.11.0.2-beta-release-707
+      ECO_BRANCH: staging
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core 7.0

diff --git a/EcoLawExtensionsMod/GameActions/PowerConsumed.cs b/EcoLawExtensionsMod/GameActions/PowerConsumed.cs
@@ -23,7 +23,7 @@ public class PowerConsumed : GameAction, IUserGameAction, IPositionGameAction
 
         [Eco, LocDescription("The location of the object consuming the power.")] public Vector3i ActionLocation { get; set; }
 
-        [Eco, LocDescription("The object consuming the power."), RequiredTag("World Object")] public Item PowerConsumer { get; set; }
+        [Eco, LocDescription("The object consuming the power."), RequiredTag("World Object")] public IPlaceableItem PowerConsumer { get; set; }
 
         [Eco, LocDescription("What interval of time was spent consuming?")] public float TimeConsuming { get; set; }
 

diff --git a/EcoLawExtensionsMod/GameActions/PowerGenerated.cs b/EcoLawExtensionsMod/GameActions/PowerGenerated.cs
@@ -23,7 +23,7 @@ public class PowerGenerated : GameAction, IUserGameAction, IPositionGameAction
 
         [Eco, LocDescription("The location of the object generating the power.")] public Vector3i ActionLocation { get; set; }
 
-        [Eco, LocDescription("The object generating the power."), RequiredTag("World Object")] public Item PowerGenerator { get; set; }
+        [Eco, LocDescription("The object generating the power."), RequiredTag("World Object")] public IPlaceableItem PowerGenerator { get; set; }
 
         [Eco, LocDescription("What interval of time was spent generating?")] public float TimeGenerating { get; set; }
 

diff --git a/EcoLawExtensionsMod/Logger.cs b/EcoLawExtensionsMod/Logger.cs
@@ -1,9 +1,7 @@
-using System;
-
-namespace Eco.Mods.LawExtensions
+namespace Eco.Mods.LawExtensions
 {
     using Shared.Localization;
-    using Shared.Utils;
+    using Shared.Logging;
 
     public static class Logger
     {

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Eco Law Extensions Mod
-A server mod for Eco 10.0 that extends the law system with a number of helpful utility game values and legal actions.
+A server mod for Eco 11.0 that extends the law system with a number of helpful utility game values and legal actions.
 
 Added game values:
  - Citizen Population - the current citizen count of a title or demographic
@@ -174,7 +174,7 @@ Note that the `PowerAvailable` and `PowerProduced` values are measured in Joules
 
 ### Linux
 
-1. Run `ECO_BRANCH="release" MODKIT_VERSION="0.10.0.0-beta" fetch-eco-reference-assemblies.sh` (change the modkit branch and version as needed)
+1. Run `ECO_BRANCH="release" MODKIT_VERSION="0.11.0.0-beta" fetch-eco-reference-assemblies.sh` (change the modkit branch and version as needed)
 2. Enter the `EcoLawExtensionsMod` directory and run:
 `dotnet restore`
 `dotnet build`