Small changes

Author: Mr-Baguetter

UncomplicatedCustomItems/API/YAMLCaster.cs

@@ -26,7 +26,7 @@ public static class YAMLCaster
         /// <returns>The <see cref="Dictionary{string, object}"/> of the class</returns>
         public static Dictionary<string, object> Encode(Data element)
         {
-            Dictionary<string, object> serialized = new();
+            Dictionary<string, object> serialized = [];
             SnakeCaseNamingStrategy snakeCaseStrategy = new();
 
             foreach (PropertyInfo property in element.GetType().GetProperties())

UncomplicatedCustomItems/Intergrations/ECR.cs

@@ -7,48 +7,26 @@
 using UncomplicatedCustomItems.API;
 using LabApi.Features.Wrappers;
 using UnityEngine;
-using MEC;
 using UncomplicatedCustomItems.API.Interfaces;
 
 namespace UncomplicatedCustomItems.Integrations
 {
-    public static class ECRIntegration
+    internal static class ECRIntegration
     {
         private static bool _isPatched = false;
-        private static Harmony _harmonyInstance;
+        private static bool Found;
 
-        public static void Initialize(Harmony harmonyInstance)
+        public static void Init()
         {
-            _harmonyInstance = harmonyInstance;
-
             if (TryPatchECRIntegration())
             {
-                LogManager.Silent("ECR Integration patched successfully on initialization.");
+                LogManager.Silent("ECR Integration patched.");
+                Found = true;
                 return;
             }
 
-            AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoad;
-            LogManager.Silent("ECR Integration waiting for Exiled.CustomRoles to load...");
-        }
-
-        private static void OnAssemblyLoad(object sender, AssemblyLoadEventArgs args)
-        {
-            if (_isPatched)
-                return;
-
-            if (args.LoadedAssembly.GetName().Name.Contains("Exiled.CustomRoles"))
-            {
-                LogManager.Silent($"Detected Exiled.CustomRoles assembly load: {args.LoadedAssembly.FullName}");
-
-                Timing.CallDelayed(1f, () =>
-                {
-                    if (TryPatchECRIntegration())
-                    {
-                        LogManager.Silent("ECR Integration patched successfully after assembly load.");
-                        AppDomain.CurrentDomain.AssemblyLoad -= OnAssemblyLoad;
-                    }
-                });
-            }
+            if (Found)
+                LogManager.Silent($"ECR found! :D");
         }
 
         private static bool TryPatchECRIntegration()
@@ -61,13 +39,13 @@ private static bool TryPatchECRIntegration()
                 MethodBase targetMethod = GetTargetMethod();
                 if (targetMethod == null)
                 {
-                    LogManager.Silent("ECR target method not found - Exiled.CustomRoles may not be loaded yet.");
+                    LogManager.Silent("ECR target method not found.");
                     return false;
                 }
 
                 MethodInfo prefixMethod = typeof(ECRIntegration).GetMethod(nameof(Prefix), BindingFlags.Static | BindingFlags.Public);
 
-                _harmonyInstance.Patch(targetMethod, new HarmonyMethod(prefixMethod));
+                Plugin.Instance._harmony.Patch(targetMethod, new HarmonyMethod(prefixMethod));
                 _isPatched = true;
                 LogManager.Silent("ECR Integration successfully patched TryAddItem method.");
                 return true;
@@ -83,27 +61,21 @@ private static MethodBase GetTargetMethod()
         {
             try
             {
-                Type customRoleType = AppDomain.CurrentDomain.GetAssemblies()
-                    .SelectMany(GetTypesFromAssembly)
-                    .FirstOrDefault(t => t.FullName == "Exiled.CustomRoles.API.Features.CustomRole");
-
+                Type customRoleType = AppDomain.CurrentDomain.GetAssemblies().SelectMany(GetTypesFromAssembly).FirstOrDefault(t => t.FullName == "Exiled.CustomRoles.API.Features.CustomRole");
                 if (customRoleType == null)
                     return null;
 
-                MethodInfo method = customRoleType.GetMethod("TryAddItem",
-                    BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public,
-                    null,
-                    [
-                        Type.GetType("Exiled.API.Features.Player, Exiled.API"),
-                        typeof(string)
-                    ],
-                    null);
+                Type[] paramTypes = [
+                    Type.GetType("Exiled.API.Features.Player, Exiled.API"),
+                    typeof(string)
+                ];
 
+                MethodInfo method = customRoleType.GetMethod("TryAddItem", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, paramTypes, null);
                 return method;
             }
             catch (Exception ex)
             {
-                LogManager.Debug($"Error in GetTargetMethod(): {ex.Message}");
+                LogManager.Debug($"{nameof(GetTargetMethod)}: {ex.Message}");
                 return null;
             }
         }
@@ -163,14 +135,13 @@ public static bool Prefix(object __instance, object player, string itemName, ref
             }
             catch (Exception ex)
             {
-                LogManager.Error($"Error in ECRIntegration.Prefix(): {ex}");
+                LogManager.Error($"{nameof(ECRIntegration)}: {ex}");
                 return true;
             }
         }
 
         public static void Cleanup()
         {
-            AppDomain.CurrentDomain.AssemblyLoad -= OnAssemblyLoad;
             _isPatched = false;
         }
     }

UncomplicatedCustomItems/Intergrations/MER.cs

@@ -34,7 +34,7 @@ public static void Init()
 
             if (Found)
             {
-                LogManager.Silent($"MER Found!");
+                LogManager.Silent($"MER Found! :D");
                 Register();
             }
             else

UncomplicatedCustomItems/Plugin.cs

@@ -44,7 +44,7 @@ public class Plugin : Plugin<Config>
 #endif
         public override string Author => "SpGerg, FoxWorn & Mr. Baguetter";
 #if EXILED
-        public override Version RequiredExiledVersion { get; } = new(9, 9, 1);
+        public override Version RequiredExiledVersion { get; } = new(9, 8, 1);
 #else
         public override Version RequiredApiVersion { get; } = LabApi.Features.LabApiProperties.CurrentVersion;
 #endif
@@ -172,9 +172,12 @@ public override void Enable()
             FileConfig.LoadAll(Server.Port.ToString());
             FileConfig.LoadAll("Actions");
 
+#if EXILED
+            _harmony = new($"com.ucs.uci_exiled-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}");
+#else
             _harmony = new($"com.ucs.uci_labapi-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}");
+#endif
             _harmony.PatchAll();
-            ECRIntegration.Initialize(_harmony);
 #if EXILED
             if (Round.IsStarted)
 #else
@@ -261,6 +264,7 @@ public void OnFinishedLoading()
 
             LabAPIExtensions.Init();
             MERIntergration.Init();
+            ECRIntegration.Init();
 #if EXILED
             CommonUtilitiesPatch.Initialize();
 #endif