Merge branch 'main' of https://github.com/RandyKnapp/ValheimMods

Author: RandyKnapp

AdvancedPortals/AddPortals.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Reflection;
+using HarmonyLib;
+using JetBrains.Annotations;
+
+namespace AdvancedPortals
+{
+  
+  [HarmonyPatch]
+  public static class AddPortal
+  {
+    public static readonly HashSet<int> Hashes = new HashSet<int>();
+
+    [UsedImplicitly]
+    private static IEnumerable<MethodInfo> TargetMethods() => new[]
+    {
+      AccessTools.DeclaredMethod(typeof(Game), nameof(Game.Awake)),
+    };
+    
+    [UsedImplicitly]
+    private static void Prefix(Game __instance)
+    {
+      __instance.PortalPrefabHash.AddRange(Hashes);
+    }
+  }
+}

AdvancedPortals/AdvancedPortals.cs

@@ -29,8 +29,9 @@ public class AdvancedPortals : BaseUnityPlugin
     {
         public const string PluginId = "randyknapp.mods.advancedportals";
         public const string DisplayName = "Advanced Portals";
-        public const string Version = "1.0.6";
-
+        public const string Version = "1.0.8";
+        public static readonly string[] _portalPrefabs = { "portal_ancient", "portal_obsidian", "portal_blackmarble" };
+        
         public static readonly List<GameObject> RegisteredPrefabs = new List<GameObject>();
         public static readonly Dictionary<GameObject, PieceDef> RegisteredPieces = new Dictionary<GameObject, PieceDef>();
 
@@ -164,6 +165,12 @@ private void Awake()
 
             _harmony = Harmony.CreateAndPatchAll(Assembly.GetExecutingAssembly(), PluginId);
 
+            //Add Prefabs to Portal Connections
+            foreach (var portalPrefab in _portalPrefabs)
+            {
+                AddPortal.Hashes.Add(portalPrefab.GetStableHashCode());    
+            }
+            
             // Patch TargetPortal's handle click method, since it does not directly call TeleportWorld.Teleport
             var targetPortal = gameObject.GetComponent("TargetPortal.TargetPortal");
             if (targetPortal)

AdvancedPortals/AdvancedPortals.csproj

@@ -82,9 +82,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AddPortals.cs" />
     <Compile Include="AdvancedPortal.cs" />
     <Compile Include="AdvancedPortals.cs" />
-    <Compile Include="ConnectPortals_Patch.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Teleport_Patch.cs" />
   </ItemGroup>

AdvancedPortals/ConnectPortals_Patch.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.6")]
-[assembly: AssemblyFileVersion("1.0.6")]
+[assembly: AssemblyVersion("1.0.8")]
+[assembly: AssemblyFileVersion("1.0.8")]

AdvancedPortals/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-# AdvancedPortals v1.0.4
+# AdvancedPortals
 Author: RandyKnapp
 Source: [Github](https://github.com/RandyKnapp/ValheimMods/tree/main/AdvancedPortals)
 Discord: [RandyKnapp's Mod Community](https://discord.gg/randyknappmods)
@@ -51,7 +51,7 @@ Includes ServerSync.
 #### 1.0.5
   * Updated Portal Connection logic which was preventing Advanced Portals from connecting
 #### 1.0.4 
-  * Updates for Valheim 0.216.9
+  * Updates for Valheim 0.217.5
 #### 1.0.3
   * Vapok fixed a bug that makes Adventure Backpacks work with Advanced Portals
 #### 1.0.2

AdvancedPortals/README.md

@@ -1,6 +1,6 @@
 {
   "name": "AdvancedPortals",
-  "version_number": "1.0.6",
+  "version_number": "1.0.8",
   "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": []

AdvancedPortals/manifest.json

@@ -1,6 +1,6 @@
 using System.Collections;
 using UnityEngine;
- 
+
 namespace EpicLoot_UnityLib
 {
     [RequireComponent(typeof(CanvasGroup))]
@@ -48,4 +48,4 @@ public void Show()
             _coroutine = StartCoroutine(FadeOut());
         }
     }
-}
+}