fix: dynamically lookup PieceCategory.Max

Valheim-Modding · Apr 23, 2024 · b9bd3ee · b9bd3ee
1 parent 00906b2
commit b9bd3ee
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/JotunnLib/Configs/PieceTableConfig.cs b/JotunnLib/Configs/PieceTableConfig.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Jotunn.Utils;
 using UnityEngine;
 
 namespace Jotunn.Configs
@@ -42,7 +43,7 @@ public string[] GetCategories()
 
             if (UseCategories)
             {
-                for (int i = 0; i < (int)Piece.PieceCategory.Max; i++)
+                for (int i = 0; i < PieceUtils.MaxPieceCategory; i++)
                 {
                     categories.Add(Enum.GetName(typeof(Piece.PieceCategory), i));
                 }

diff --git a/JotunnLib/Entities/CustomPieceTable.cs b/JotunnLib/Entities/CustomPieceTable.cs
@@ -52,7 +52,7 @@ public CustomPieceTable(GameObject pieceTablePrefab) : base(Assembly.GetCallingA
             if (PieceTable != null && PieceTable.m_useCategories)
             {
                 List<string> categories = new List<string>();
-                for (int i = 0; i < (int)Piece.PieceCategory.Max; i++)
+                for (int i = 0; i < PieceUtils.MaxPieceCategory; i++)
                 {
                     categories.Add(Enum.GetName(typeof(Piece.PieceCategory), i));
                 }

diff --git a/JotunnLib/Managers/PieceManager.cs b/JotunnLib/Managers/PieceManager.cs
@@ -625,7 +625,7 @@ private void ReloadKnownRecipes(Player self)
 
         private static IEnumerable<CodeInstruction> TranspileMaxCategory(IEnumerable<CodeInstruction> instructions, int maxOffset)
         {
-            int number = (int)Piece.PieceCategory.Max + maxOffset;
+            int number = PieceUtils.MaxPieceCategory + maxOffset;
 
             foreach (CodeInstruction instruction in instructions)
             {

diff --git a/JotunnLib/Utils/PieceUtils.cs b/JotunnLib/Utils/PieceUtils.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Linq;
+
+namespace Jotunn.Utils
+{
+    internal static class PieceUtils
+    {
+        public static int MaxPieceCategory { get; } = GetMaxPieceCategory();
+
+        private static int GetMaxPieceCategory()
+        {
+            var indexOfMax = Array.IndexOf(Enum.GetNames(typeof(Piece.PieceCategory)), nameof(Piece.PieceCategory.Max));
+            var values = Enum.GetValues(typeof(Piece.PieceCategory)).Cast<int>().ToArray();
+
+            if (indexOfMax >= 0)
+            {
+                return values[indexOfMax];
+            }
+
+            Logger.LogWarning("Could not find Piece.PieceCategory.Max, using fallback value 4");
+            return 4;
+        }
+    }
+}