Update to the latest version of the mods

.gitignore

@@ -76,3 +76,14 @@ crashlytics-build.properties
 /valheim_Data/BepInEx-out/plugins/EpicLoot/enchantcosts.json
 /valheim_Data/BepInEx-out/plugins/EpicLoot/adventuredata.json
 /valheim_Data/BepInEx-out/plugins/EpicLoot/abilities.json
+ValheimUnity/Assets/ExternalLibraries/EpicLoot-UnityLib.dll
+
+# Unity
+ValheimUnity/AssetBundles
+ValheimUnity/Assets/ExternalLibraries/*.dll
+ValheimUnity/Assets/ExternalLibraries/valheim/*.dll
+ValheimUnity/UserSettings
+
+# Manual adds
+Common
+ValheimMods.sln

AdvancedPortals/AdvancedPortals.cs

@@ -29,7 +29,7 @@ public class AdvancedPortals : BaseUnityPlugin
     {
         public const string PluginId = "randyknapp.mods.advancedportals";
         public const string DisplayName = "Advanced Portals";
-        public const string Version = "1.0.8";
+        public const string Version = "1.0.11";
         public static readonly string[] _portalPrefabs = { "portal_ancient", "portal_obsidian", "portal_blackmarble" };
 
         public static readonly List<GameObject> RegisteredPrefabs = new List<GameObject>();
@@ -250,7 +250,6 @@ private static List<RecipeRequirementConfig> MakeRecipeFromConfig(string portalN
         private void OnDestroy()
         {
             _instance = null;
-            _harmony?.UnpatchSelf();
         }
 
         private ConfigEntry<T> SyncedConfig<T>(string group, string configName, T value, string description, bool synchronizedSetting = true) => SyncedConfig(group, configName, value, new ConfigDescription(description), synchronizedSetting);
@@ -389,7 +388,7 @@ public static void TryRegisterObjects()
                 return;
             }
 
-            ObjectDB.instance.UpdateItemHashes();
+            ObjectDB.instance.UpdateRegisters();
 
             var pieceTables = new List<PieceTable>();
             foreach (var itemPrefab in ObjectDB.instance.m_items)

AdvancedPortals/AdvancedPortals.csproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="..\Paths.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +10,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AdvancedPortals</RootNamespace>
     <AssemblyName>AdvancedPortals</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <LangVersion>10.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -33,60 +35,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\core\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="assembly_utils_publicized">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\valheim_Data\Managed\publicized_assemblies\assembly_utils_publicized.dll</HintPath>
-    </Reference>
-    <Reference Include="assembly_valheim_publicized">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\valheim_Data\Managed\publicized_assemblies\assembly_valheim_publicized.dll</HintPath>
-    </Reference>
-    <Reference Include="BepInEx">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\core\BepInEx.dll</HintPath>
-    </Reference>
-    <Reference Include="ServerSync">
-      <HintPath>..\Libs\ServerSync.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AssetBundleModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.AssetBundleModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AudioModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.AudioModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.CoreModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ImageConversionModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.ImageConversionModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.PhysicsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.TextRenderingModule.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AddPortals.cs" />
-    <Compile Include="AdvancedPortal.cs" />
+    <Compile Include="src\*.cs" />
     <Compile Include="AdvancedPortals.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Teleport_Patch.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\Libs\ServerSync.dll">
@@ -102,15 +53,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="manifest.json" />
+    <None Include="thunderstore\manifest.json" />
     <None Include="README.md" />
   </ItemGroup>
   <Import Project="..\Common\Common.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="Copy" AfterTargets="ILRepack">
-    <Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\plugins\$(ProjectName)\&quot; /q /y /i" />
-    <Exec Command="xcopy &quot;$(TargetDir)$(TargetFileName)&quot; &quot;C:\Program Files (x86)\Steam\steamapps\common\Valheim_Dev\BepInEx\plugins\$(ProjectName)\&quot; /q /y /i" />
-  </Target>
   <Import Project="..\packages\ILRepack.Lib.MSBuild.Task.2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

AdvancedPortals/CHANGELOG.md

@@ -0,0 +1,39 @@
+## 1.0.11
+* Update for Valheim version 0.219.13 Bog Witch.
+
+## 1.0.10
+* ServerSync Update fixing a multiplayer issue
+
+## 1.0.9
+* Update for 0.217.24 - Hildr's Request
+
+## 1.0.8
+* Fixing the Portal Saving issue with the changes that were presented in a recent update.
+* This now adds the Custom Portal Prefabs to the PortalPrefab list during Game.Awake reducing the need to patch any ZDOMan stuff.
+
+## 1.0.7
+* Hildir's Request Update 0.217.14
+
+## 1.0.6
+* Restored Portal Connections on Dedicated Servers.
+
+## 1.0.5
+* Updated Portal Connection logic which was preventing Advanced Portals from connecting
+
+## 1.0.4
+* Updates for 0.216.9 Valheim
+
+## 1.0.3
+* Vapok fixed a bug that makes Adventure Backpacks work with Advanced Portals
+
+## 1.0.2
+* Added bronze to Ancient portal transport list (how could I forget?)
+* Updated to support other mods that extend the inventory (Thanks Vapok)
+
+## 1.0.1
+* Added compatibility with AnyPortal and TargetPortal
+* Fixed a bug with Obsidian and Black Marble portal recipes
+* Added 5 BlackMetal to the default recipe for Black Marble portals (delete your config to automatically use the new recipe)
+
+## 1.0.0
+* Initial Release

AdvancedPortals/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.8")]
-[assembly: AssemblyFileVersion("1.0.8")]
+[assembly: AssemblyVersion("1.0.11")]
+[assembly: AssemblyFileVersion("1.0.11")]

AdvancedPortals/README.md

@@ -1,8 +1,9 @@
-# AdvancedPortals
-Author: RandyKnapp
-Source: [Github](https://github.com/RandyKnapp/ValheimMods/tree/main/AdvancedPortals)
-Discord: [RandyKnapp's Mod Community](https://discord.gg/randyknappmods)
-Patreon: [Randy's Patreon](https://www.patreon.com/randyknapp)
+# Advanced Portals
+
+Author: [RandyKnapp](https://discord.gg/ZNhYeavv3C)
+Source: [Github](https://github.com/RandyKnapp/ValheimMods/tree/main/AdvancedPortals/)
+Patreon: [patreon.com/randyknapp](https://www.patreon.com/randyknapp)
+Discord: [RandyKnapp's Mod Community](https://discord.gg/ZNhYeavv3C)
 
 Adds three new portals to provide a lore-friendly and balanced way to reduce the item-transport slog!
 
@@ -42,24 +43,4 @@ Includes ServerSync.
 
 ## Installation:
   * Nexus: Drop the AdvancedPortals.dll right into your BepInEx/plugins folder
-  * ThunderStore: Use r2modman to install, or manually drop the dll into your BepInEx/plugins folder
-
-### Changelist:
-
-#### 1.0.6
-* Restored Portal Connections on Dedicated Servers.
-#### 1.0.5
-  * Updated Portal Connection logic which was preventing Advanced Portals from connecting
-#### 1.0.4 
-  * Updates for Valheim 0.217.5
-#### 1.0.3
-  * Vapok fixed a bug that makes Adventure Backpacks work with Advanced Portals
-#### 1.0.2
-  * Added bronze to Ancient portal transport list (how could I forget?)
-  * Updated to support other mods that extend the inventory (Thanks Vapok)
-#### 1.0.1
-  * Added compatibility with AnyPortal and TargetPortal
-  * Fixed a bug with Obsidian and Black Marble portal recipes
-  * Added 5 BlackMetal to the default recipe for Black Marble portals (delete your config to automatically use the new recipe)
-#### 1.0.0
-  * Initial Release
+  * ThunderStore: Use r2modman to install, or manually drop the dll into your BepInEx/plugins folder

AdvancedPortals/AdvancedPortal.cs → AdvancedPortals/src/AdvancedPortal.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace AdvancedPortals

AdvancedPortals/thunderstore/manifest.json

@@ -0,0 +1,9 @@
+{
+  "name": "AdvancedPortals",
+  "version_number": "1.0.10",
+  "website_url": "https://github.com/RandyKnapp/ValheimMods/tree/main/AdvancedPortals",
+  "description": "Add new, lore-friendly and balanced portals to allow some items to be teleported.",
+  "dependencies": [
+    "denikson-BepInExPack_Valheim-5.4.2200"
+  ]
+}

Common/Common.projitems

@@ -9,15 +9,6 @@
     <Import_RootNamespace>Common</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)ConfigPositionedElement.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Consumables.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)GameObjectExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)GotDestroyed.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)MultiValueDictionary.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PlayerExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PrefabCreator.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SerializableVector3.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WeightedRandomCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)src\*.cs" />
   </ItemGroup>
 </Project>

ConsoleHelper/ConsoleHelper.csproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="..\Paths.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +10,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ConsoleHelper</RootNamespace>
     <AssemblyName>ConsoleHelper</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <LangVersion>10.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -31,31 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="0Harmony">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\core\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="assembly_valheim_publicized">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\valheim_Data\Managed\publicized_assemblies\assembly_valheim_publicized.dll</HintPath>
-    </Reference>
-    <Reference Include="BepInEx">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\core\BepInEx.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Valheim\unstripped_corlib\UnityEngine.CoreModule.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="ConsoleHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "C:\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\plugins\" /q /y /i</PostBuildEvent>
-  </PropertyGroup>
 </Project>