diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml index 052b989..b2ed5b9 100644 --- a/.github/workflows/discord.yml +++ b/.github/workflows/discord.yml @@ -2,54 +2,15 @@ name: Discord Webhook on: push: - branches: [ main ] # Default release branch + branches: [ "main" ] # Default release branch paths: - 'src/**' - '.github/workflows/**' jobs: discord: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run Discord Webhook - uses: johnnyhuy/actions-discord-git-webhook@main - with: - webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} - hide_links: false - censor_username: false - repo_name: Digitalroot.Valheim.ForsakenJVL - - - # Disable URL links to the repository - # - # - name: Run Discord Webhook - # uses: johnnyhuy/discord-webhook@main - # with: - # webhook_url: ${{ secrets.YOUR_DISCORD_WEBHOOK_URL }} - # hide_links: true - - # Censor username - # - # - name: Run Discord Webhook - # uses: johnnyhuy/discord-webhook@main - # with: - # webhook_url: ${{ secrets.YOUR_DISCORD_WEBHOOK_URL }} - # censor_username: false - - # Using an ID and token - # - # - name: Run Discord Webhook - # uses: johnnyhuy/discord-webhook@main - # with: - # id: ${{ secrets.YOUR_DISCORD_WEBHOOK_ID }} - # token: ${{ secrets.YOUR_DISCORD_WEBHOOK_TOKEN }} - - # Using a custom repo name - # - # - name: Run Discord Webhook - # uses: johnnyhuy/discord-webhook@main - # with: - # id: ${{ secrets.YOUR_DISCORD_WEBHOOK_ID }} - # token: ${{ secrets.YOUR_DISCORD_WEBHOOK_TOKEN }} - # repo_name: My Special Repo + uses: Digitalroot-Valheim/.github/.github/workflows/discord.yml@main + with: + repo_name: ${{ github.event.repository.name }} + secrets: + webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} diff --git a/.github/workflows/nuget.autoupdate.yml b/.github/workflows/nuget.autoupdate.yml new file mode 100644 index 0000000..3151456 --- /dev/null +++ b/.github/workflows/nuget.autoupdate.yml @@ -0,0 +1,19 @@ +name: Automated NuGet Dependency Updates + +concurrency: ci-${{ github.ref }} + +on: + workflow_dispatch: + + schedule: + - cron: "0/15 16-23,0-9 * * *" + +env: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + +jobs: + call-workflow-nuget-autoupdate: + uses: Digitalroot-Valheim/.github/.github/workflows/nuget.autoupdate.yml@main + secrets: + github-pat: ${{ secrets.AUTOMATED_DEPENDENCY_UPDATES_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b1b06b..002801f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,8 @@ name: Release concurrency: ci-${{ github.ref }} on: + workflow_dispatch: + push: branches: [ main ] # Default release branch paths: @@ -20,11 +22,11 @@ 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-cookies-header: ${{ secrets.NEXUS_COOKIE_HEADER }} + nexus-cookie-nxid-header: ${{ secrets.NEXUS_COOKIE_HEADER_NEXUSID }} + nexus-cookie-sid-header: ${{ secrets.NEXUS_COOKIE_HEADER_SID_DEVELOP }} with: sln-file-name: Digitalroot.Valheim.ForsakenJVL proj-file-name: Digitalroot.Valheim.ForsakenJVL - skip-unit-tests: true is-nuget-package: false nexus-enable-upload: true nexus-mod-id: 1538 diff --git a/docs/README.md b/docs/README.md index 0bf65dc..4135721 100644 --- a/docs/README.md +++ b/docs/README.md @@ -24,10 +24,13 @@ Go to https://www.nexusmods.com/valheim/mods/799 to learn what this mod does. ### Configuration - No need to configure. -Issues/Bugs +### Known Issues +1. Rimefang's secondary attack does not work and throws an error. + +## Issues/Bugs Open an issue or bug on the [issue board](https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.ForsakenJVL/issues). -Questions +## Questions Ask a question on the [discussions board](https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.ForsakenJVL/discussions). ### Support Me @ https://www.buymeacoffee.com/digitalroot diff --git a/src/Digitalroot.Valheim.ForsakenJVL.sln b/src/Digitalroot.Valheim.ForsakenJVL.sln index ef2eb9a..110b28a 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL.sln +++ b/src/Digitalroot.Valheim.ForsakenJVL.sln @@ -15,6 +15,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1960DCD1-3C51-48FF-BFF8-5FE4C3CBABB2}" 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 EndProject @@ -23,7 +24,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{CDDAD0F9-2 ..\docs\README.md = ..\docs\README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digitalroot.Valheim.ForsakenJVL", "Digitalroot.Valheim.ForsakenJVL\Digitalroot.Valheim.ForsakenJVL.csproj", "{C944D10B-5164-4D46-8430-5BDC3F1D9E85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Digitalroot.Valheim.ForsakenJVL", "Digitalroot.Valheim.ForsakenJVL\Digitalroot.Valheim.ForsakenJVL.csproj", "{C944D10B-5164-4D46-8430-5BDC3F1D9E85}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{1213C2AD-8E52-41AB-AA08-298190B700E6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -38,6 +41,12 @@ Global {C944D10B-5164-4D46-8430-5BDC3F1D9E85}.DebugNoDeploy|Any CPU.Build.0 = DebugNoDeploy|Any CPU {C944D10B-5164-4D46-8430-5BDC3F1D9E85}.Release|Any CPU.ActiveCfg = Release|Any CPU {C944D10B-5164-4D46-8430-5BDC3F1D9E85}.Release|Any CPU.Build.0 = Release|Any CPU + {1213C2AD-8E52-41AB-AA08-298190B700E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1213C2AD-8E52-41AB-AA08-298190B700E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1213C2AD-8E52-41AB-AA08-298190B700E6}.DebugNoDeploy|Any CPU.ActiveCfg = Debug|Any CPU + {1213C2AD-8E52-41AB-AA08-298190B700E6}.DebugNoDeploy|Any CPU.Build.0 = Debug|Any CPU + {1213C2AD-8E52-41AB-AA08-298190B700E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1213C2AD-8E52-41AB-AA08-298190B700E6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Digitalroot.Valheim.ForsakenJVL/.nx/description.bbcode.txt b/src/Digitalroot.Valheim.ForsakenJVL/.nx/description.bbcode.txt index c2b7d55..59623db 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL/.nx/description.bbcode.txt +++ b/src/Digitalroot.Valheim.ForsakenJVL/.nx/description.bbcode.txt @@ -28,6 +28,10 @@ Go to [size=3][size=3][url=https://www.nexusmods.com/valheim/mods/799]https://ww [list] [*][size=3]No need to configure.[/size] [/list] +[b][size=4]Known Issues[/size][/b] +[list=1] +[*]Rimefang's secondary attack does not work and throws an error. +[/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.ForsakenJVL/issues]issue board[/url].[/size] @@ -40,5 +44,6 @@ Ask a question on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Va [size=3][url=https://www.nexusmods.com/valheim/users/1082594]v801[/url] for the mod.[/size] + [center][size=3][b][color=#00ffff]Digitalroot can be found in the Odin Plus Team Discord[/color][/b][/size] -[url=https://discord.gg/mbkPcvu9ax][img]https://digitalroot.net/img/odinplusdisc.png[/img][/url][/center] +[url=https://discord.gg/mbkPcvu9ax][img]https://digitalroot.net/img/odinplusdisc.png[/img][/url][/center] \ No newline at end of file diff --git a/src/Digitalroot.Valheim.ForsakenJVL/.ts/manifest.json b/src/Digitalroot.Valheim.ForsakenJVL/.ts/manifest.json index c535b32..ef1717f 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL/.ts/manifest.json +++ b/src/Digitalroot.Valheim.ForsakenJVL/.ts/manifest.json @@ -5,8 +5,8 @@ "description": "A port of Forsaken to JVL", "version_number": "%VERSION_NUMBER%", "dependencies": [ - "denikson-BepInExPack_Valheim-5.4.1700", - "ValheimModding-Jotunn-2.4.6" + "denikson-BepInExPack_Valheim-5.4.1901", + "ValheimModding-Jotunn-2.10.0" ], "website_url": "https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.ForsakenJVL" } diff --git a/src/Digitalroot.Valheim.ForsakenJVL/CMB_BurnWhenHeld.cs b/src/Digitalroot.Valheim.ForsakenJVL/CMB_BurnWhenHeld.cs index 9e25d81..faf73aa 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL/CMB_BurnWhenHeld.cs +++ b/src/Digitalroot.Valheim.ForsakenJVL/CMB_BurnWhenHeld.cs @@ -15,7 +15,7 @@ public CMB_BurnWhenHeld() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); _timer = new System.Timers.Timer { AutoReset = true @@ -34,7 +34,7 @@ private void TimerElapsed(object sender, System.Timers.ElapsedEventArgs e) { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); if (!Common.Utils.IsPlayerReady()) return; if (!Player.m_localPlayer.IsItemEquiped(gameObject.GetComponent().m_itemData)) return; Player.m_localPlayer.AddFireDamage(10); @@ -48,7 +48,7 @@ private void TimerElapsed(object sender, System.Timers.ElapsedEventArgs e) [UsedImplicitly] public void Start() { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); _timer.Elapsed += TimerElapsed; _timer.Start(); } @@ -56,7 +56,7 @@ public void Start() [UsedImplicitly] private void OnDestroy() { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); _timer.Elapsed -= TimerElapsed; _timer.Stop(); _timer.Dispose(); diff --git a/src/Digitalroot.Valheim.ForsakenJVL/Digitalroot.Valheim.ForsakenJVL.csproj b/src/Digitalroot.Valheim.ForsakenJVL/Digitalroot.Valheim.ForsakenJVL.csproj index e1f7724..2c531b2 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL/Digitalroot.Valheim.ForsakenJVL.csproj +++ b/src/Digitalroot.Valheim.ForsakenJVL/Digitalroot.Valheim.ForsakenJVL.csproj @@ -12,7 +12,7 @@ false true AGPL-3.0-or-later - Copyright © Digitalroot Technologies 2021 - 2022 + Copyright © Digitalroot Technologies 2021 - 2023 https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.ForsakenJVL https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.ForsakenJVL git @@ -27,7 +27,7 @@ https://nuget.bepinex.dev/v3/index.json; https://digitalroot-valheim-nuget.s3.us-west-2.amazonaws.com/index.json - 1.3.0 + 0.0.1 Debug;Release;DebugNoDeploy @@ -42,45 +42,33 @@ - + all - + all - + all runtime compile; build; native; contentfiles; analyzers; buildtransitive - - - + + + all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime - compile; build; native; contentfiles; analyzers; buildtransitive - - - all - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - - + all - runtime diff --git a/src/Digitalroot.Valheim.ForsakenJVL/Main.cs b/src/Digitalroot.Valheim.ForsakenJVL/Main.cs index 2437c15..fd606bd 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL/Main.cs +++ b/src/Digitalroot.Valheim.ForsakenJVL/Main.cs @@ -29,11 +29,11 @@ public Main() NexusId = Config.Bind("General", "NexusID", 1538, new ConfigDescription("Nexus mod ID for updates", null, new ConfigurationManagerAttributes { IsAdminOnly = false, Browsable = false, ReadOnly = true })); #if DEBUG EnableTrace = true; - Log.RegisterSource(Instance); #else EnableTrace = false; #endif - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.RegisterSource(Instance); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); } [UsedImplicitly] @@ -41,7 +41,7 @@ private void Awake() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var assetFile = new FileInfo(Path.Combine(new FileInfo(typeof(Main).Assembly.Location).DirectoryName ?? throw new InvalidOperationException("Unable to load assetFile."), "forsakenmod")); @@ -73,7 +73,7 @@ private void AddCustomItems() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); AddBattleaxeLightning(); AddBowFrost(); @@ -102,7 +102,7 @@ private void AddSpellFire() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_SpellFire/v801_SpellFire.prefab"); if (prefab == null) @@ -169,7 +169,7 @@ private void AddShieldFire() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_ShieldFire/v801_ShieldFire.prefab"); if (prefab == null) @@ -241,7 +241,7 @@ private void AddSwordLightning() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_SwordLightning/v801_SwordLightning.prefab"); if (prefab == null) @@ -326,7 +326,7 @@ private void AddSwordFire() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_SwordFire/v801_SwordFire.prefab"); if (prefab == null) @@ -425,7 +425,7 @@ private void AddUnarmedFrostOh() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_UnarmedFrost/v801_UnarmedFrostOH.prefab"); if (prefab == null) @@ -512,7 +512,7 @@ private void AddUnarmedFrost() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_UnarmedFrost/v801_UnarmedFrost.prefab"); if (prefab == null) @@ -602,7 +602,7 @@ private void AddKnifeFrost() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/weapons/v801_KnifeFrost/v801_KnifeFrost.prefab"); if (prefab == null) @@ -686,7 +686,7 @@ private void AddBattleaxeLightning() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_BattleaxeLightning/v801_BattleaxeLightning.prefab"); @@ -779,7 +779,7 @@ private void AddBowFrost() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_BowFrost/v801_BowFrost.prefab"); @@ -855,7 +855,7 @@ private void AddSledgeFire() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_SledgeFire/v801_SledgeFire.prefab"); @@ -961,7 +961,7 @@ private void AddSledgePoison() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_SledgePoison/v801_SledgePoison.prefab"); if (prefab == null) @@ -1061,7 +1061,7 @@ private void AddSpearSpirit() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_SpearSpirit/v801_SpearSpirit.prefab"); @@ -1147,7 +1147,7 @@ private void AddUnarmedFenring() { try { - Log.Trace(Main.Instance, $"{Main.Namespace}.{MethodBase.GetCurrentMethod().DeclaringType?.Name}.{MethodBase.GetCurrentMethod().Name}"); + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); var prefab = _assetBundle.LoadAsset("Assets/Custom_Items/v801_UnarmedFenring/v801_UnarmedFenring.prefab"); if (prefab == null) diff --git a/src/Digitalroot.Valheim.ForsakenJVL/packages.lock.json b/src/Digitalroot.Valheim.ForsakenJVL/packages.lock.json index 4af4a16..aa8ffa7 100644 --- a/src/Digitalroot.Valheim.ForsakenJVL/packages.lock.json +++ b/src/Digitalroot.Valheim.ForsakenJVL/packages.lock.json @@ -4,58 +4,57 @@ ".NETFramework,Version=v4.6.2": { "BepInEx.Core": { "type": "Direct", - "requested": "[5.4.17, )", - "resolved": "5.4.17", - "contentHash": "f0UCf6tZxdhPrcHAgj/wQNz5V9RAAV0elgvgaFl8wFjaEdiKLxepkxdV0Y8Xuprm+AVrQUGcaSIhTBQvpRzk+g==", + "requested": "[5.4.19, 5.4.19]", + "resolved": "5.4.19", + "contentHash": "2/eY1qT2LaVO36G91LWo2yNLwmEEODKoC8IpePyA5WP2eGrrMvGxxLC9v4OPmX3IT8q1G4SYzKDL3ziZRQVUWg==", "dependencies": { - "BepInEx.BaseLib": "5.4.17", - "HarmonyX": "2.5.5" + "BepInEx.BaseLib": "5.4.19", + "HarmonyX": "2.7.0" } }, "Digitalroot.Valheim.Build.Targets": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "AQKLRxbRMaLH4IKyYkCPIoYhzCyNf6TJHyjW8bqOAdqTvX3Y7eCnx+MKhlKAwE6TC/gYN4F6P6Yh8OoYFEGDEQ==" + "requested": "[1.0.21, )", + "resolved": "1.0.21", + "contentHash": "8mErk3UFjy80d9IlTjXNsofT7YfKLz897YE10ieB/SHNbBorzwVCPYRGsmuaNH8HyqjKQH3KnK4gDwDMBEC+DQ==" }, "Digitalroot.Valheim.Common.AssemblyInfo": { "type": "Direct", - "requested": "[1.0.8, )", - "resolved": "1.0.8", - "contentHash": "bdZ7FluHAyoNrBKaKC62Yxg4F4TM9ptlNj17QbT1/CWX3kLM6iFyakDar9KagZso0l1NFO8yxmdz1oWlQfy9Ug==" + "requested": "[1.0.12, )", + "resolved": "1.0.12", + "contentHash": "W/IFiAuY63JPQEC9/HRJSeEuJY9oJqmhOBecyrmzUCOz4wxJjROpOrqy9c3QiC7NZdhftnUiVGju71Aa0xIJYg==" }, "Digitalroot.Valheim.Common.Log": { "type": "Direct", - "requested": "[1.1.18, )", - "resolved": "1.1.18", - "contentHash": "N5HRU0uzR6WiL3OMWN9OPkkfMQ4dbOZqUQjOqoQwNzKbcf5a4BwgerXjoxvHVzBj3s7a0Or3faTk4C2RGL+05g==", + "requested": "[1.1.34, )", + "resolved": "1.1.34", + "contentHash": "zfGxrXQzsGuP8JBcqFzK2M63sR/cXEMa4azOzVpHDsgwL0paRg9quAMgx+PeMaEbsslduP4Zapt93gEgxLgSfg==", "dependencies": { - "Digitalroot.Valheim.Common.Json": "1.0.15" + "Digitalroot.Valheim.Common.Json": "1.0.23" } }, "Digitalroot.Valheim.Common.Names": { "type": "Direct", - "requested": "[1.4.8, )", - "resolved": "1.4.8", - "contentHash": "/og5338cqZ3iwK4tw5jdIr6HSD8fT0jMdhnka1C82cVUrx3faxAuaoH7Lc6wt+qgE/NRjZYjqOkS3zc87K/FNQ==", + "requested": "[1.4.13, )", + "resolved": "1.4.13", + "contentHash": "YXmgzsL6n6BpbNSq88gfaqX7+aTnR1cxc1FGis95BJnfS2Oc1LEDBDb5LdVzX2TjXGc2bo4a5dc+boDLE2buKg==", "dependencies": { - "Digitalroot.Valheim.Common.Utils": "1.0.18" + "Digitalroot.Valheim.Common.Utils": "1.0.21" } }, "Digitalroot.Valheim.Common.References": { "type": "Direct", - "requested": "[0.205.7, )", - "resolved": "0.205.7", - "contentHash": "iUIYAsg5HXZj3S4yhUECEuZJk98X8RG75wkJrlmIvfriwIZgV57wt4S6ym3KQNHvx87sxSbU3raSPMPTSfi0hw==" + "requested": "[0.212.14, )", + "resolved": "0.212.14", + "contentHash": "emcS47E/Z95h0Sg8M7Rg1xhbvpVlqFzmVJPT6mGpjaAdppeSVI46lvH25TO2Iig3lGE5Ye0Gmyrvop0Q/e4rgg==" }, "Digitalroot.Valheim.Common.Utils": { "type": "Direct", - "requested": "[1.0.18, )", - "resolved": "1.0.18", - "contentHash": "0ZRi20qHatJL5PgFPuq2x0pPj86t53UygKQka5WlKQfhxWZKWWn+UK+iuteAYGdaFRCVl5t+/gWdx0bs7XxHcw==", + "requested": "[1.0.26, )", + "resolved": "1.0.26", + "contentHash": "baWunIE0qEJ83ozoDGyHFdB6wX2/+LUiGx2gu4UwmlMuzIV8ozlHwpBcwL4tuTngWN8L+kxuLv/fTo5pHPa9ow==", "dependencies": { - "Digitalroot.Valheim.Common.Log": "1.1.16", - "Digitalroot.Valheim.Common.References": "0.205.7" + "Digitalroot.Valheim.Common.Log": "1.1.34" } }, "ErrorProne.NET.CoreAnalyzers": { @@ -66,55 +65,30 @@ }, "Fody": { "type": "Direct", - "requested": "[6.6.0, )", + "requested": "[6.6.0, 6.6.0]", "resolved": "6.6.0", "contentHash": "NWWM8KiR9DGiAi47q9px9oI27xYBiM5KXxSnI4R5mz2/rG8LIcXJfw5zDLLH1xOgzqRNJgc8KTPQPoiQCidYUw==" }, - "HarmonyX": { - "type": "Direct", - "requested": "[2.8.0, )", - "resolved": "2.8.0", - "contentHash": "B4ClvOIp2vQ+MwUTs7NWb7UYQBg+7xQsEsvOuQhGPTl8mPXe5d9mFPtzFnYtTQ+2HNePXexZYoGO95DIPX9ywQ==", - "dependencies": { - "MonoMod.RuntimeDetour": "22.1.4.3" - } - }, "ILMerge.Fody": { "type": "Direct", - "requested": "[1.22.0, )", + "requested": "[1.22.0, 1.22.0]", "resolved": "1.22.0", "contentHash": "VCWQM8q7wZwHMgksBsFfbImRUmlgn7E6EKkrnUV86/keqBvMTjhlA7mBYtz6Dace8XsJYufYJvRP25uur5W5WA==", "dependencies": { "Fody": "6.3.0" } }, - "JotunnLib": { - "type": "Direct", - "requested": "[2.4.6, )", - "resolved": "2.4.6", - "contentHash": "MTkKYCKfqgXWwUroLObVrlq2qNDgC2xUT0rbH6MtUNz+ndHDRrT1DDSiCzLlk/I7KNs6GPXFdDsbq9KGPakkFQ==", - "dependencies": { - "HarmonyX": "2.5.5", - "MonoMod": "21.9.19.1" - } - }, - "UnityEngine.Modules": { - "type": "Direct", - "requested": "[2019.4.31, 2019.4.31]", - "resolved": "2019.4.31", - "contentHash": "xZjdfGGzZw6nnrn4auRNis6WnAlsvqY1XXioEGJnSku+CylESgEt/sTLYlrbrQ0srnLfSCfx80vR8z4SsI1EuQ==" - }, "BepInEx.BaseLib": { "type": "Transitive", - "resolved": "5.4.17", - "contentHash": "92N4BKDiF9KO8kXbY2+zp7dHNXZP3WBKhzw7U8orcYncutD7peHtuLfUdMW4PGY/d0SsoA5eOcBeklFuh7OS8A==" + "resolved": "5.4.19", + "contentHash": "gwP3NK0WL5E+U/L0FMrygiDDNzEL4TYnezy+S7ocbUUhkhty3ueG5BRsKdKdra/2R3vWopf42CoA+MnnEmSY+w==" }, "Digitalroot.Valheim.Common.Json": { "type": "Transitive", - "resolved": "1.0.15", - "contentHash": "AHEPM0ApZBBf1H2TINqbNC7+iIzeYPJepxfYrmDwU20p5pwIC88w7Pm4k9A9UQPbnTeFX4qgtrzVKa3v145D1w==", + "resolved": "1.0.23", + "contentHash": "bZXNqDjY5voyX239z/BtUXnMhIlD9sRvAB9rkVDcLu7ogMhQ1WVSNvvzD2QiupoGRaZRcgGOc4fkt+roTS46jA==", "dependencies": { - "UnityEngine.Modules": "[2019.4.31]", + "Digitalroot.Valheim.Common.References": "0.212.12", "fastJSON": "2.4.0.4" } }, @@ -123,33 +97,32 @@ "resolved": "2.4.0.4", "contentHash": "lbxY+miTOvCNbNfOk8HcbmBD9F6wv2dRKZlMjtJBm6rjA5vFKXBYtR6eoIe96HnCHOE1nCJbMsaZDKGNPg5mIA==" }, + "HarmonyX": { + "type": "Transitive", + "resolved": "2.7.0", + "contentHash": "lec/SkduQspMa3Pi/nM/NSvA84Za8HCCWA8ybdToKiTqnBZa+JC5g6rxoFQCg/1vNuYcvjy77edePZzIEsRmvw==", + "dependencies": { + "MonoMod.RuntimeDetour": "21.12.13.1" + } + }, "Mono.Cecil": { "type": "Transitive", "resolved": "0.11.4", "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ==" }, - "MonoMod": { - "type": "Transitive", - "resolved": "21.9.19.1", - "contentHash": "9qIjktFWIN+6snxPkII7kGxRZIXz/AEJ38syL7a0Ip/8PwUKc5uhChWeld10P3uDp3A1Zfs2ThFB8yrok9Uyxw==", - "dependencies": { - "Mono.Cecil": "0.11.4", - "MonoMod.Utils": "21.9.19.1" - } - }, "MonoMod.RuntimeDetour": { "type": "Transitive", - "resolved": "22.1.4.3", - "contentHash": "b+Er1cINx9gOZUh65B+0Lm6Bt6U8RHmB03DRtfSopVlbOEstnq5ACpAN+T7jSB0O9qqDIlpP4K2xyvjuy/QHww==", + "resolved": "21.12.13.1", + "contentHash": "65mB+bHjT6UCGCgO+/pYhpuGPf96rQ1Whwkut/x7cqVIW0DTndDFyWc/3bngzhnY/Y6IYtBMlXsU2ATq+CxpHg==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoMod.Utils": "22.1.4.3" + "MonoMod.Utils": "21.12.13.1" } }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "22.1.4.3", - "contentHash": "+lFiiOXbPscwht9rnQbWfUR30+YE0T55iGAoHyUM46sB4eW3HrHWsaY6UQsugdUA3oWVlBQWi7vtdnd1la2u7Q==", + "resolved": "21.12.13.1", + "contentHash": "/H+0RMWqx/D1/fSuY5jhY6GFvqhdYdlnI7J3IfL8P6y4nJkoZDxqts6+RxWWOz4pbnJdWnxSjS8XG+Lq6rUi7w==", "dependencies": { "Mono.Cecil": "0.11.4" } diff --git a/src/UnitTests/UnitTests.cs b/src/UnitTests/UnitTests.cs new file mode 100644 index 0000000..a469531 --- /dev/null +++ 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(); + } + } +} \ No newline at end of file diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj new file mode 100644 index 0000000..210ccfa --- /dev/null +++ b/src/UnitTests/UnitTests.csproj @@ -0,0 +1,16 @@ + + + + net6.0 + + false + + + + + + + + + +