Update to the latest version of the mods

.gitignore

@@ -9,11 +9,12 @@
 /[Bb]uilds/
 /[Ll]ogs/
 /[Mm]emoryCaptures/
-*/bin/
-*/obj/
+/bin/
+/**/bin/
+/obj/
+/**/obj/
 /packages/
 
-
 # Never ignore Asset meta data
 !/[Aa]ssets/**/*.meta
 
@@ -25,6 +26,7 @@
 
 # Visual Studio cache directory
 .vs/
+.vscode/
 
 # Rider cache directory
 .idea/
@@ -76,3 +78,17 @@ 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
+
+# Unity
+ValheimUnity/Assets/ExternalLibraries/*
+ValheimUnity/AssetBundles/*.manifest
+ValheimUnity/Assets/ExternalLibraries/*.dll
+ValheimUnity/Assets/ExternalLibraries/valheim/*.dll
+ValheimUnity/UserSettings
+ValheimUnity/Assets/ExternalLibraries/EpicLoot-UnityLib.dll
+ValheimUnity/Packages/packages-lock.json
+
+# Manual adds
+Common
+ValheimMods.sln
+*.env

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,94 +35,23 @@
     <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">
-      <Link>ServerSync.dll</Link>
-    </EmbeddedResource>
-    <Content Include="ILRepack.targets">
-      <SubType>Designer</SubType>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\ValheimUnity\AssetBundles\advancedportals">
       <Link>advancedportals</Link>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="manifest.json" />
+    <None Include="thunderstore\manifest.json" />
     <None Include="README.md" />
+    <None Include="CHANGELOG.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>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\ILRepack.Lib.MSBuild.Task.2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.Lib.MSBuild.Task.2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets'))" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties manifest_1json__JsonSchema="" />
-    </VisualStudio>
-  </ProjectExtensions>
+    <Target Name="CopyAssembly" AfterTargets="Build">
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(SolutionDir)ValheimUnity\Assets\ExternalLibraries" />
+    </Target>
 </Project>

AdvancedPortals/CHANGELOG.md

@@ -0,0 +1,52 @@
+## 1.1.3
+* Fixed an issue with the AllowEverything config option no longer being used in the teleport check.
+
+## 1.1.2
+* Changed portals metal check patch to better respect other mods including World Advancement & Progression.
+
+## 1.1.1
+* Fixed a small typo issue that only manifested when TargetPortal was installed.
+
+## 1.1.0
+* Overhauled portal appearances to better match vanilla styles!
+* Now requires Jotunn to run, please install this new dependency!
+
+## 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.1.3")]
+[assembly: AssemblyFileVersion("1.1.3")]

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/OrianaVenture/Randy_Vapok_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!
 
@@ -13,53 +14,23 @@ Adds three new portals to provide a lore-friendly and balanced way to reduce the
   * **Black Marble Portal:** Allows teleporting anything
     * *Requires:* 20 Black Marble, BlackMetal 5, 2 Refined Eitr
 
-Includes ServerSync.
-
-## Configuration:
-
-### Ancient Portal
+## Version 1.1.0!
 
-  * Ancient Portal Enabled: Enable this portal. If false, the portal will not be buildable.
-  * Ancient Portal Recipe: The items needed to build the Ancient portal. Must be in the following format: "ITEM1:QUANTITY,ITEM2:QUANTITY,..." where each ITEM is the item ID ([found here](https://valheim-modding.github.io/Jotunn/data/objects/item-list.html)), and QUANTITY is an integer.
-  * Ancient Portal Allowed Items: The items that will be allowed to teleport through the Ancient Portal. Must be in the following format: "ITEM1,ITEM2,ITEM3,..." where ITEM is the item ID.
-  * Ancient Portal Allow Everything: If set to true, the Allowed Items will be ignored and all items will be teleportable through this portal. Default=false.
+As of the 1.1.0 update Jotunn is required to run this mod. A version check will be performed on server connection to ensure all players have the mod installed properly.
 
-### Obsidian Portal
+Configurations should sync on servers and live update on changing the randyknapp.mods.advancedportals.cfg file.
 
-  * Obsidian Portal Enabled: Enable this portal. If false, the portal will not be buildable.
-  * Obsidian Portal Recipe: The items needed to build the Obsidian portal. (same format as Ancient Portal Recipe)
-  * Obsidian Portal Allowed Items: The items that will be allowed to teleport through the Obsidian Portal. (same format as Ancient Portal Allowed Items)
-  * Obsidian Portal Allow Everything: If set to true, the Allowed Items will be ignored and all items will be teleportable through this portal. Default=false.
-  * Obsidian Portal Use All Previous: If set to true, automatically allow all the Allowed Items from the Ancient Portal through this portal too. Default=true.
+## Configuration:
 
-### Black Marble Portal
+Each portal can be configured:
 
-  * Black Marble Portal Enabled: Enable this portal. If false, the portal will not be buildable.
-  * Black Marble Portal Recipe: The items needed to build the Black Marble portal. (same format as Ancient Portal Recipe)
-  * Black Marble Portal Allowed Items: The items that will be allowed to teleport through the Black Marble Portal. (same format as Ancient Portal Allowed Items)
-  * Black Marble Portal Allow Everything: If set to true, the Allowed Items will be ignored and all items will be teleportable through this portal. Default=true;
-  * Black Marble Portal Use All Previous: If set to true, automatically allow all the Allowed Items from the Ancient Portal and Obsidian Portal through this portal too. Default=true.
+  * Enabled: Enable building the portal. Existing portals of this type will not be removed.
+  * Recipe: Items needed to build the portal in the format "ITEM1:QUANTITY,ITEM2:QUANTITY,..." where each ITEM is the item ID ([found here](https://valheim-modding.github.io/Jotunn/data/objects/item-list.html)), and QUANTITY is an integer.
+  * Allowed Items: Items allowed to teleport through the portal in the format: "ITEM1,ITEM2,ITEM3,..." where ITEM is the item ID.
+  * Allow Everything: Allow all items through the portal.
+  * Use All Previous: For the Obsidian portal also include the Allowed Items from the Ancient portal. For the Black Marble portal also include the Allowed Items from both the Ancient and Obsidian portals.
 
 ## 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
+  * Manual: Drop the AdvancedPortals.dll into your BepInEx/plugins folder. Download Jotunn and install similarly.
+  * ThunderStore: When using a thunderstore mod manager the files should be placed in the correct directory for you. Dependencies should install automatically.