Halloween fixes

Author: marchellcx

LabExtended/API/Containers/EffectContainer.cs

@@ -19,6 +19,7 @@
 using LabApi.Events.Arguments.PlayerEvents;
 
 using UnityEngine;
+using InventorySystem.Items.MarshmallowMan;
 // ReSharper disable UnusedAutoPropertyAccessor.Local
 
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
@@ -275,7 +276,12 @@ static EffectContainer()
     /// Gets the player's SCP-1576 effect.
     /// </summary>
     public Scp1576 Scp1576 { get; private set; }
-    
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.Scp1509Resurrected"/> effect.
+    /// </summary>
+    public Scp1509Resurrected Scp1509Resurrected { get; private set; }
+
     /// <summary>
     /// Gets the player's AmnesiaVision effect.
     /// </summary>
@@ -342,6 +348,73 @@ static EffectContainer()
     public Vitality Vitality { get; private set; }
     #endregion
 
+    #region Halloween Effects
+    /// <summary>
+    /// Gets the player's <see cref="MarshmallowEffect"/> effect.
+    /// </summary>
+    public MarshmallowEffect Marshmallow { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.Metal"/> effect.
+    /// </summary>
+    public Metal Metal { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.Prismatic"/> effect.
+    /// </summary>
+    public Prismatic Prismatic { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.Spicy"/> effect.
+    /// </summary>
+    public Spicy Spicy { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.SugarRush"/> effect.
+    /// </summary>
+    public SugarRush SugarRush { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.SugarHigh"/> effect.
+    /// </summary>
+    public SugarHigh SugarHigh { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.SugarCrave"/> effect.
+    /// </summary>
+    public SugarCrave SugarCrave { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.OrangeCandy"/> effect.
+    /// </summary>
+    public OrangeCandy OrangeCandy { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.OrangeWitness"/> effect.
+    /// </summary>
+    public OrangeWitness OrangeWitness { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.WhiteCandy"/> effect.
+    /// </summary>
+    public WhiteCandy WhiteCandy { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.SlowMetabolism"/> effect.
+    /// </summary>
+    public SlowMetabolism SlowMetabolism { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.TemporaryBypass"/> effect.
+    /// </summary>
+    public TemporaryBypass TemporaryBypass { get; private set; }
+
+    /// <summary>
+    /// Gets the player's <see cref="CustomPlayerEffects.TraumatizedByEvil"/> effect.
+    /// </summary>
+    public TraumatizedByEvil TraumatizedByEvil { get; private set; }
+    #endregion
+
     /// <summary>
     /// Whether or not the player has a forced fog type.
     /// </summary>
@@ -464,7 +537,7 @@ internal EffectContainer(PlayerEffectsController controller, ExPlayer player)
                 }
                 else
                 {
-                    ApiLog.Warn("Effect API", $"No properties are defined for effect: {type.FullName}");
+                    ApiLog.Error("LabExtended", $"Effect &3{type.Name}&r does not have any properties!");
                 }
             }
 
@@ -478,24 +551,22 @@ internal EffectContainer(PlayerEffectsController controller, ExPlayer player)
 
             if (props.Count != _properties.Count())
             {
-                ApiLog.Warn("Effect API",
-                    $"Failed to set some effect properties (total={_properties.Count()} / set={props.Count})");
+                ApiLog.Error("LabExtended", $"Some effects are missing! (set &6{props.Count}&r / &3{_properties.Count()}&r)");
 
                 foreach (var prop in _properties)
                 {
                     if (props.Contains(prop))
                         continue;
 
-                    ApiLog.Warn("Effect API", $"Missing effect for property: {prop.GetMemberName()}");
+                    ApiLog.Error("LabExtended", $"- &3{prop.Name}&r (&1{prop.PropertyType.Name}&r)");
                 }
             }
 
             ListPool<PropertyInfo>.Shared.Return(props);
         }
         catch (Exception ex)
         {
-            ApiLog.Error("Effect API",
-                $"An error occurred while setting up the effect container!\n{ex.ToColoredString()}");
+            ApiLog.Error("LabExtended", $"An error occurred while setting up the effect container!\n{ex.ToColoredString()}");
         }
     }
 

LabExtended/Extensions/EnumExtensions.cs

@@ -28,6 +28,31 @@ public enum EnumOperation
 
     private static readonly Dictionary<Type, Enum[]> _enumValuesCache = new();
 
+    /// <summary>
+    /// Retrieves the highest value from the specified enumeration type.
+    /// </summary>
+    /// <remarks>This method uses the default comparer to determine the highest value in the
+    /// enumeration.</remarks>
+    /// <param name="enumType">The enumeration type to evaluate. Must be a valid enumeration type.</param>
+    /// <returns>The highest value in the enumeration as an object, or <see langword="null"/> if the enumeration has no values.</returns>
+    public static object? GetHighestEnumValue(this Type enumType)
+    {
+        var values = enumType.GetEnumValues();
+        var highest = default(object);
+        var type = Enum.GetUnderlyingType(enumType);
+
+        foreach (var value in values)
+        {
+            var underlyingValue = Convert.ChangeType(value, type);
+
+            if (highest is null
+                || Comparer<object>.Default.Compare(underlyingValue, highest) > 0)
+                highest = underlyingValue;
+        }
+
+        return highest;
+    }
+
     /// <summary>
     /// Gets all (cached) enum members.
     /// </summary>

LabExtended/Patches/Fixes/LabApiSupressLogsPatch.cs

@@ -0,0 +1,34 @@
+using HarmonyLib;
+
+using InventorySystem.Items.Pickups;
+
+using LabApi.Features.Console;
+using LabApi.Features.Wrappers;
+
+namespace LabExtended.Patches.Fixes
+{
+    /// <summary>
+    /// Supresses certain logs from the LabAPI that are deemed unnecessary or overly verbose.
+    /// </summary>
+    public static class LabApiSupressLogsPatch
+    {
+        private static HashSet<Type> missingWrappersLogged = new();
+
+        [HarmonyPatch(typeof(Pickup), nameof(Pickup.CreateItemWrapper))]
+        private static bool PickupWrapperPrefix(ItemPickupBase pickupBase, ref Pickup __result)
+        {
+            var type = pickupBase.GetType();
+
+            if (Pickup.TypeWrappers.TryGetValue(type, out var constructor))
+            {
+                __result = constructor(pickupBase);
+            }
+            else if (missingWrappersLogged.Add(type))
+            {
+                ServerConsole.AddLog($"[LabApi] Failed to find pickup wrapper for type {type}", ConsoleColor.Yellow);
+            }
+
+            return false;
+        }
+    }
+}

LabExtended/Patches/Functions/Items/ItemWeightPatches.cs

@@ -19,6 +19,8 @@
 using InventorySystem.Items.ToggleableLights.Lantern;
 
 using LabExtended.API.Custom.Items;
+using LabExtended.Extensions;
+using LabExtended.Core;
 
 namespace LabExtended.Patches.Functions.Items;
 
@@ -27,11 +29,7 @@ namespace LabExtended.Patches.Functions.Items;
 /// </summary>
 public static class ItemWeightPatches
 {
-    /// <summary>
-    /// Gets the highest item ID.
-    /// </summary>
-    public const int HighestItemId = 66;
-
+    private static int loggedOutOfRange = 0;
     private static float[] customWeightArray;
 
     /// <summary>
@@ -46,9 +44,16 @@ public static float[] GlobalCustomWeight
         {
             if (customWeightArray is null)
             {
-                customWeightArray = new float[HighestItemId];
+                var highestItemId = typeof(ItemType).GetHighestEnumValue();
+
+                if (highestItemId is null)
+                    throw new InvalidOperationException("Unable to determine the highest item ID from ItemType enum.");
+
+                var castItemId = (int)highestItemId;
 
-                for (var x = 0; x < HighestItemId; x++)
+                customWeightArray = new float[castItemId + 1];
+
+                for (var x = 0; x < castItemId; x++)
                     customWeightArray[x] = -1f;
             }
 
@@ -67,12 +72,17 @@ public static float[] GlobalCustomWeight
     /// <param name="type">The item type for which to set the custom weight. Must be a valid, non-negative value.</param>
     /// <param name="weight">The weight value to assign to the specified item type.</param>
     /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="type"/> is less than zero.</exception>
-    public static void SetWeight(ItemType type, float weight)
+    public static void SetWeight(this ItemType type, float weight)
     {
         if (type < 0)
             throw new ArgumentOutOfRangeException(nameof(type));
 
-        GlobalCustomWeight[(int)type] = weight;
+        var index = (int)type;
+
+        if (index < 0 || index >= GlobalCustomWeight.Length)
+            return;
+
+        GlobalCustomWeight[index] = weight;
     }
 
     /// <summary>
@@ -100,7 +110,26 @@ public static void SetWeight(ushort serial, float weight)
     /// customizations are found.</returns>
     public static float GetWeight(ItemType type, ushort serial, float baseWeight)
     {
-        var globalWeight = GlobalCustomWeight[(int)type];
+        if (type is ItemType.None)
+            return baseWeight;
+
+        var index = (int)type;
+
+        if (index < 0 || index >= GlobalCustomWeight.Length)
+        {
+            var logBit = index << 1;
+
+            if ((loggedOutOfRange & logBit) == 0)
+            {
+                ApiLog.Error("LabExtended", $"ItemType &3{type}&r (&6{(int)type}&r) is out of range for custom weight array!");
+
+                loggedOutOfRange |= logBit;
+            }
+
+            return baseWeight;
+        }
+
+        var globalWeight = GlobalCustomWeight[index];
 
         if (type > 0 && globalWeight != -1f)
             baseWeight = globalWeight;