Fixed compatibility with EnemySkinRegistry that made the mod not work…

…ing for players that didn't have the mod
Feiryn · Sep 25, 2024 · a343871 · a343871
1 parent f097d95
commit a343871
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/LethalMon/Behaviours/TamedEnemyBehaviour.cs b/LethalMon/Behaviours/TamedEnemyBehaviour.cs
@@ -630,7 +630,8 @@ public virtual void MoveTowards(Vector3 position)
         pokeballItem.scrapPersistedThroughRounds = scrapPersistedThroughRounds || alreadyCollectedThisRound;
         pokeballItem.SetScrapValue(ballValue);
         ball.GetComponent<NetworkObject>().Spawn(false);
-        pokeballItem.enemySkinRegistryId = EnemySkinRegistryId;
+        if (EnemySkinRegistryCompatibility.Instance.Enabled)
+            pokeballItem.enemySkinRegistryId = EnemySkinRegistryId;
         pokeballItem.SetCaughtEnemyServerRpc(Enemy.enemyType.name, pokeballItem.enemySkinRegistryId);
         pokeballItem.isDnaComplete = isDnaComplete;
         pokeballItem.FallToGround();

diff --git a/LethalMon/Compatibility/EnemySkinRegistryCompatibility.cs b/LethalMon/Compatibility/EnemySkinRegistryCompatibility.cs
@@ -1,5 +1,6 @@
 using System;
 using AntlerShed.SkinRegistry;
+using BepInEx;
 using HarmonyLib;
 using LethalMon.Behaviours;
 
@@ -9,9 +10,27 @@ public class EnemySkinRegistryCompatibility() : ModCompatibility("antlershed.let
 {
     public static EnemySkinRegistryCompatibility Instance { get; } = new();
 
-    private static EnemySkinRegistry? _pluginInstance;
+    private BaseUnityPlugin? _pluginInstance;
 
-    internal static EnemySkinRegistry PluginInstance => _pluginInstance ??= BepInEx.Bootstrap.Chainloader.PluginInfos["antlershed.lethalcompany.enemyskinregistry"].Instance as EnemySkinRegistry;
+    internal BaseUnityPlugin? PluginInstance
+    {
+        get
+        {
+            if (_pluginInstance == null)
+            {
+                if (Instance.Enabled)
+                {
+                    _pluginInstance = BepInEx.Bootstrap.Chainloader.PluginInfos["antlershed.lethalcompany.enemyskinregistry"].Instance as EnemySkinRegistry;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+            return _pluginInstance;
+        }
+    }
 
     public static string GetEnemySkinId(EnemyAI enemy)
     {
@@ -25,7 +44,7 @@ public static string GetSkinName(string skinId)
 
         try
         {
-            var skinData = PluginInstance.GetSkinData(skinId);
+            var skinData = ((EnemySkinRegistry) Instance.PluginInstance!).GetSkinData(skinId);
             return skinData != null ? skinData.Label : string.Empty;
         }
         catch (Exception e)

diff --git a/LethalMon/Items/PokeballItem.cs b/LethalMon/Items/PokeballItem.cs
@@ -348,7 +348,10 @@ private void CaptureEnemy(EnemyAI enemyAI, CatchableEnemy.CatchableEnemy catchab
         this.catchableEnemy = catchable;
         this.enemyAI = enemyAI;
         this.enemyType = enemyAI.enemyType;
-        this.enemySkinRegistryId = EnemySkinRegistryCompatibility.GetEnemySkinId(enemyAI);
+        if (EnemySkinRegistryCompatibility.Instance.Enabled)
+        {
+            this.enemySkinRegistryId = EnemySkinRegistryCompatibility.GetEnemySkinId(enemyAI);
+        }
 
         float captureProbability = catchable.GetCaptureProbability(this.captureStrength, this.enemyAI);
         float shakeProbability = Mathf.Pow(captureProbability, 1f / 3f); // Cube root