Update for Ashlands

Digitalroot-Valheim · May 14, 2024 · 9ac2c75 · 9ac2c75
1 parent d075c7a
commit 9ac2c75
Show file tree

Hide file tree

Showing 15 changed files with 757 additions and 103 deletions.
diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,18 +23,18 @@ jobs:
       aws-access-key-id: ${{ secrets.NUGET_S3_REPO_KEY_ID }}
       aws-secret-access-key: ${{ secrets.NUGET_S3_REPO_KEY_SECRET }}
       nexus-api-key: ${{ secrets.NEXUS_API_KEY }}
-      nexus-cookie-nxid-header: ${{ secrets.NEXUS_COOKIE_HEADER_NEXUSID }}
       nexus-cookie-sid-header: ${{ secrets.NEXUS_COOKIE_HEADER_SID_DEVELOP }}
       ts-api-key: ${{ secrets.TS_SERVICEACCOUNT }}
+      webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }}
 
     with:
       sln-file-name: Digitalroot.Valheim.EternalFire
       proj-file-name: Digitalroot.Valheim.EternalFire
       is-nuget-package: false
-      nexus-enable-upload: false
-      nexus-mod-id: 1463
-      ts-enable-upload: false
+      nexus-enable-upload: true
+      nexus-mod-id: 2754
+      ts-enable-upload: true
       ts-name: Eternal_Fire
       ts-description: "Keeps fires burning."
       ts-categories: "server-side client-side tweaks" #https://thunderstore.io/api/experimental/community/valheim/category/
-      ts-dependencies: [email protected] ValheimModding-Jotunn@2.11.5
+      ts-dependencies: ValheimModding-Jotunn-2.19.4
diff --git a/LICENSE b/LICENSE
diff --git a/src/Digitalroot.Valheim.EternalFire.sln b/src/Digitalroot.Valheim.EternalFire.sln
@@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{53F5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "worklfows", "worklfows", "{1A2C7529-FAA6-4705-9AD2-363DD17D6268}"
 	ProjectSection(SolutionItems) = preProject
-		..\.github\workflows\discord.yml = ..\.github\workflows\discord.yml
 		..\.github\workflows\nuget.autoupdate.yml = ..\.github\workflows\nuget.autoupdate.yml
 		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
 	EndProjectSection
@@ -26,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\LICENSE = ..\LICENSE
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +40,12 @@ Global
 		{73CF24C1-0509-43B3-A72B-90720901BF76}.DebugNoDeploy|Any CPU.Build.0 = DebugNoDeploy|Any CPU
 		{73CF24C1-0509-43B3-A72B-90720901BF76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73CF24C1-0509-43B3-A72B-90720901BF76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}.DebugNoDeploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}.DebugNoDeploy|Any CPU.Build.0 = Debug|Any CPU
+		{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB5C1C0E-D696-44A5-B7F8-CA4CC95CE486}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Digitalroot.Valheim.EternalFire/.nx/description.bbcode.txt b/src/Digitalroot.Valheim.EternalFire/.nx/description.bbcode.txt
@@ -1,18 +1,12 @@
-[size=3]Valheim mod to mute Misophonia triggering sounds.    
+[size=3]Keeps fires lit and burning without needing to fuel them. 
 [/size][b][size=4]
 License
-[/size][/b][size=3][url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly/blob/main/LICENSE]GNU Affero General Public License v3.0[/url][/size][size=3]
+[/size][/b][size=3][url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire/blob/main/LICENSE]GNU Affero General Public License v3.0[/url][/size][size=3]
 [/size][size=3]Closed-source license is available for commercial use.[/size]
 
 [b][size=4]Source[/size][/b]
-[size=3][url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly]GitHub[/url][/size]
+[size=3][url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire]GitHub[/url][/size]
 
-[b][size=4]Digitalroot's Max Dungeon Rooms[/size][/b]
-[size=3]Mutes Misophonia triggering sounds.   [/size]
-[list]
-[*][size=3]Puke[/size]
-[*][size=3]Eat[/size]
-[/list]
 [b][size=4]Installation (manual)[/size][/b]
 [list=1]
 [*][size=3]Download the latest release archive (zip) file.[/size]
@@ -23,16 +17,13 @@ License
 [*][size=3]No need to configure.[/size]
 [/list]
 [b][size=4]Issues/Bugs[/size][/b]
-[size=3]Open an issue or bug on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly/issues]issue board[/url].[/size]
+[size=3]Open an issue or bug on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire/issues]issue board[/url].[/size]
 
 [b][size=4]Questions[/size][/b]
-[size=3]Ask a question on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly/discussions]discussions board[/url].[/size]
+[size=3]Ask a question on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire/discussions]discussions board[/url].[/size]
 
 [b][size=4]Support Me[/size][/b] @ [url=https://www.buymeacoffee.com/digitalroot]https://www.buymeacoffee.com/digitalroot[/url]
 
+[center][color=#fff2cc][size=3][b]Digitalroot can be found in the Valhalla Legends' Discord[/b][/size][/color]
 
-[center][size=3][b][color=#00ffff]Digitalroot can be found in the following Discords[/color][/b][/size]
-[url=https://discord.gg/Xh3UHcDC][img]https://digitalroot.net/img/jvldisc.png[/img][/url]
-[url=https://discord.gg/randyknappmods][img]https://digitalroot.net/img/epiclootdisc.png[/img][/url]
-[url=https://discord.gg/mbkPcvu9ax][img]https://digitalroot.net/img/odinplusdisc.png[/img][/url]
-[/center]
+[url=https://discord.gg/SsMW3rm67u][img]https://digitalroot.net/img/vl/vl_logo_125x154.png[/img][/url][/center]
diff --git a/src/Digitalroot.Valheim.EternalFire/.ts/icon.png b/src/Digitalroot.Valheim.EternalFire/.ts/icon.png
diff --git a/src/Digitalroot.Valheim.EternalFire/.ts/manifest.json b/src/Digitalroot.Valheim.EternalFire/.ts/manifest.json
@@ -6,7 +6,7 @@
   "version_number": "%VERSION_NUMBER%",
   "dependencies": [
     "denikson-BepInExPack_Valheim-5.4.2202",
-    "ValheimModding-Jotunn-2.16.1"
+    "ValheimModding-Jotunn-2.19.4"
   ],
   "website_url": "https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire"
 }
diff --git a/src/Digitalroot.Valheim.EternalFire/Digitalroot.Valheim.EternalFire.csproj b/src/Digitalroot.Valheim.EternalFire/Digitalroot.Valheim.EternalFire.csproj
@@ -49,22 +49,22 @@
     <PackageReference Include="Digitalroot.Valheim.Build.Targets" Version="1.0.21">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Digitalroot.Valheim.Common.AssemblyInfo" Version="1.0.16">
+    <PackageReference Include="Digitalroot.Valheim.Common.AssemblyInfo" Version="1.0.17">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Digitalroot.Valheim.Common.Log" Version="1.1.46" />
-    <PackageReference Include="Digitalroot.Valheim.Common.Names" Version="1.4.18">
+    <PackageReference Include="Digitalroot.Valheim.Common.Log" Version="1.1.52" />
+    <PackageReference Include="Digitalroot.Valheim.Common.Names" Version="1.4.28">
       <IncludeAssets></IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.217.38">
+    <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.218.14">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Digitalroot.Valheim.Common.Utils" Version="1.0.55" />
-    <PackageReference Include="Digitalroot.Valheim.References.JvL" Version="2.15.2" />
+    <PackageReference Include="Digitalroot.Valheim.Common.Utils" Version="1.0.62" />
+    <PackageReference Include="Digitalroot.Valheim.References.JvL" Version="2.19.4" />
     <PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Digitalroot.Valheim.EternalFire/TemplateOutputs.txt b/src/Digitalroot.Valheim.EternalFire/TemplateOutputs.txt
diff --git a/src/Digitalroot.Valheim.EternalFire/packages.lock.json b/src/Digitalroot.Valheim.EternalFire/packages.lock.json
@@ -20,48 +20,48 @@
       },
       "Digitalroot.Valheim.Common.AssemblyInfo": {
         "type": "Direct",
-        "requested": "[1.0.16, )",
-        "resolved": "1.0.16",
-        "contentHash": "+QeepsgH/cRv93h1NrhKLnjARUYNplFWVrFX4MBYLV2K2MQ9hGWV/bhR4As/2IOeNVKX42x5wJqw4YFbZLky/w=="
+        "requested": "[1.0.17, )",
+        "resolved": "1.0.17",
+        "contentHash": "EMa138YM/LPqUEnJixjQlL8pBo+UvZULBrpFmq/8Lu7TggcJgwhLQ3n5534sh/vV7D5w4LZu1iJRrScMrRidlg=="
       },
       "Digitalroot.Valheim.Common.Log": {
         "type": "Direct",
-        "requested": "[1.1.46, )",
-        "resolved": "1.1.46",
-        "contentHash": "WgwWYfcJJae4pQI0oRxkLj/NvFvYILo4p2P3nQkLX0i9fPpVB+eDlgAGUEsyG76PmsM/N7eZpGeiFvbnSDEEJQ==",
+        "requested": "[1.1.52, )",
+        "resolved": "1.1.52",
+        "contentHash": "lVupf88cUsqjD0rgm8YidGiHlHNkWG4vO8X9eBHO0mJ0CeC4kqnhRrFYASeLlrnyQ0LtUCCtVa0t9ruw8qHCyw==",
         "dependencies": {
-          "Digitalroot.Valheim.Common.Json": "1.0.34"
+          "Digitalroot.Valheim.Common.Json": "1.0.40"
         }
       },
       "Digitalroot.Valheim.Common.Names": {
         "type": "Direct",
-        "requested": "[1.4.18, )",
-        "resolved": "1.4.18",
-        "contentHash": "FqjWNLeVXk6J14c7GWftZ8aIpsqPJ3uXKy+HXgS66SjED/h6j5EEirUZnDMGe7A/6GboNUA06/JDp3R8qfR2kg==",
+        "requested": "[1.4.28, )",
+        "resolved": "1.4.28",
+        "contentHash": "JH6ZnwMXt69Byp/uORFJ+6rOSBy96RdX6udLtPGbDeSSlObzKVaoEapwvNbzmrhJcxEeTb9uG4Uesqpb2bBgWA==",
         "dependencies": {
-          "Digitalroot.Valheim.Common.Utils": "1.0.55"
+          "Digitalroot.Valheim.Common.Utils": "1.0.62"
         }
       },
       "Digitalroot.Valheim.Common.References": {
         "type": "Direct",
-        "requested": "[0.217.38, )",
-        "resolved": "0.217.38",
-        "contentHash": "y8KIE7aSMeFytv1ks7CJIoDLWUPN4vzaSkWN2r4kDhkoq65rmmxB1UsjI+VZvfs9LZ5COfZwdQlz628/2Nclgg=="
+        "requested": "[0.218.14, )",
+        "resolved": "0.218.14",
+        "contentHash": "8dMznAyPkousBWKy1zoq6JvYYLxEatNqoDoB9Ys/KfXSOHWnlLvrYmHwxB8tLb6lvruEQO0nBL/Il123lCIg/A=="
       },
       "Digitalroot.Valheim.Common.Utils": {
         "type": "Direct",
-        "requested": "[1.0.55, )",
-        "resolved": "1.0.55",
-        "contentHash": "J9VWU0c+GLXvUYKlBx0zeN5t49iCEnYWC27O2/CSC6IitOe3tR3YhSCanFvAQPNuR0UOpjmbUgHegA3t6NS6AQ==",
+        "requested": "[1.0.62, )",
+        "resolved": "1.0.62",
+        "contentHash": "PZlePkto8ho6Wo8Ex5PjWL/hNjmXtNVq4vdWhPtINtmvc3vMdu3Cq8/fxzzu7AUoG5nbAGeI1V8kEieVA+ClBA==",
         "dependencies": {
-          "Digitalroot.Valheim.Common.Log": "1.1.46"
+          "Digitalroot.Valheim.Common.Log": "1.1.52"
         }
       },
       "Digitalroot.Valheim.References.JvL": {
         "type": "Direct",
-        "requested": "[2.15.2, )",
-        "resolved": "2.15.2",
-        "contentHash": "+GcLrGLT7mqaniFbBthYMNgRClTbDP0VSEBN+Leo56rDm4YFHbZVUanXOzJK+dWIEtttIeDINKtAJt4iljjdiw=="
+        "requested": "[2.19.4, )",
+        "resolved": "2.19.4",
+        "contentHash": "dQd2yW6vti6c3emnD+uxNd+wU//LkHKLabkZV3aetFTco9mE+tFyNqZEe3xzk0dFfUyblmF06KqM9m8gJFBfdg=="
       },
       "ErrorProne.NET.CoreAnalyzers": {
         "type": "Direct",
@@ -91,24 +91,18 @@
       },
       "Digitalroot.References.Unity": {
         "type": "Transitive",
-        "resolved": "2022.3.12",
-        "contentHash": "QgMwg+WAnbvmjxSuL+PKjr+35B0FhO0Thw9ddoSBrfBkYsMSCYAqJ0APsN2AQfXn3zVdJgP7Rw2S41DJfuBxRQ=="
+        "resolved": "2022.3.17",
+        "contentHash": "edxgtveXwn+ACtMyak1McLwoQxKm/GXdh8Drcx2hoFl5VoFeR9wdwEz1yJdVtbamtecZOVghEn3tKKR3ekqOeg=="
       },
       "Digitalroot.Valheim.Common.Json": {
         "type": "Transitive",
-        "resolved": "1.0.34",
-        "contentHash": "L7xiFHkundjUriPdJeqpy+V65EjaJpIrQu925VV1E1JbvL16jcVDY32Hj5HoREUEe1Tn8VJSYJBU6SJTqha2kw==",
+        "resolved": "1.0.40",
+        "contentHash": "Iabdb4/ro5RtpLmIYpwcgvhkA3sCG57H/A3Mt7VZ+3E1u58w9Mi+asqhujrOmKBJeGbEBjfvv3UfFw4hLQM8wQ==",
         "dependencies": {
-          "Digitalroot.References.Unity": "2022.3.12",
-          "Digitalroot.Valheim.Common.References": "0.217.30",
-          "fastJSON": "2.4.0.4"
+          "Digitalroot.References.Unity": "2022.3.17",
+          "LibZ.Tool": "1.2.0"
         }
       },
-      "fastJSON": {
-        "type": "Transitive",
-        "resolved": "2.4.0.4",
-        "contentHash": "lbxY+miTOvCNbNfOk8HcbmBD9F6wv2dRKZlMjtJBm6rjA5vFKXBYtR6eoIe96HnCHOE1nCJbMsaZDKGNPg5mIA=="
-      },
       "HarmonyX": {
         "type": "Transitive",
         "resolved": "2.7.0",
@@ -117,6 +111,11 @@
           "MonoMod.RuntimeDetour": "21.12.13.1"
         }
       },
+      "LibZ.Tool": {
+        "type": "Transitive",
+        "resolved": "1.2.0",
+        "contentHash": "jcZROJ28bmrZx/RaFHcTlSy3x4SmSsMolJiKoluFFrE7oMiXUnYx1K+SJeHJhow05W0Rg9oi9HEyZWwdYSV3cw=="
+      },
       "Mono.Cecil": {
         "type": "Transitive",
         "resolved": "0.11.4",

diff --git a/src/UnitTests/UnitTests.cs b/src/UnitTests/UnitTests.cs
@@ -0,0 +1,18 @@
+using NUnit.Framework;
+
+namespace UnitTests
+{
+  public class Tests
+  {
+    [SetUp]
+    public void Setup()
+    {
+    }
+
+    [Test]
+    public void Test1()
+    {
+      Assert.Pass();
+    }
+  }
+}
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/ico/Logo.xcf b/src/ico/Logo.xcf
diff --git a/src/ico/_677aed42-4363-4fbd-b1c0-2713743d6353.jpg b/src/ico/_677aed42-4363-4fbd-b1c0-2713743d6353.jpg
diff --git a/src/ico/icon.png b/src/ico/icon.png