Updated TLibrary

Author: TavstalDev

Libraries/TLibrary.dll

@@ -17,8 +17,8 @@ public class CommandVersion : IRocketCommand
         public void Execute(IRocketPlayer caller, string[] command)
         {
             TSkinManager.Instance.SendPlainCommandReply(caller, "#########################################");
-            TSkinManager.Instance.SendPlainCommandReply(caller, string.Format("# Build Version: {0}", TSkinManager.Version));
-            TSkinManager.Instance.SendPlainCommandReply(caller, string.Format("# Build Date: {0}", TSkinManager.BuildDate));
+            TSkinManager.Instance.SendPlainCommandReply(caller, $"# Build Version: {TSkinManager.Version}");
+            TSkinManager.Instance.SendPlainCommandReply(caller, $"# Build Date: {TSkinManager.BuildDate}");
             TSkinManager.Instance.SendPlainCommandReply(caller, "#########################################");
         }
     }

TSkinManager/Commands/CommandVersion.cs

@@ -21,10 +21,10 @@ public static string GetDefaultGroupID()
             try
             {
                 FieldInfo helperFieldInfo = PermissionsManager.GetType().GetField("helper", BindingFlags.NonPublic | BindingFlags.Instance);
-                object helperObject = helperFieldInfo.GetValue(PermissionsManager);
-                Type helperType = helperObject.GetType();
-                Asset<RocketPermissions> permissions = (Asset<RocketPermissions>)(helperType.GetField("permissions", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(helperObject));
-                return permissions.Instance.DefaultGroup;
+                object helperObject = helperFieldInfo?.GetValue(PermissionsManager);
+                Type helperType = helperObject?.GetType();
+                Asset<RocketPermissions> permissions = (Asset<RocketPermissions>)(helperType?.GetField("permissions", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(helperObject));
+                return permissions?.Instance.DefaultGroup;
             }
             catch (Exception ex)
             {

TSkinManager/Helpers/PermissionHelper.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Tavstal.TSkinManager.Compability
+namespace Tavstal.TSkinManager.Models
 {
     public class CustomSkin
     {

TSkinManager/Models/CustomSkin.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Tavstal.TSkinManager.Compability
+namespace Tavstal.TSkinManager.Models
 {
     public class Event
     {

TSkinManager/Models/Event.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Tavstal.TSkinManager.Compability
+namespace Tavstal.TSkinManager.Models
 {
     public class EventSkin
     {

TSkinManager/Models/EventSkin.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

TSkinManager/Properties/AssemblyInfo.cs

@@ -4,17 +4,17 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Tavstal.TLibrary.Compatibility;
+using Tavstal.TLibrary.Models.Plugin;
 using Tavstal.TLibrary.Helpers.General;
-using Tavstal.TSkinManager.Compability;
+using Tavstal.TSkinManager.Models;
 using Tavstal.TSkinManager.Helpers;
 using UnityEngine;
 
 namespace Tavstal.TSkinManager
 {
     public class TSkinManager : PluginBase<TSkinManagerConfig>
     {
-        public static new TSkinManager Instance;
+        public new static TSkinManager Instance;
 
         public override void OnLoad()
         {
@@ -32,19 +32,14 @@ public override void OnLoad()
             Logger.Log("# Discord: Tavstal#6189");
             Logger.Log("# Website: https://redstoneplugins.com");
             Logger.Log("#########################################");
-            Logger.Log(string.Format("# Build Version: {0}", Version));
-            Logger.Log(string.Format("# Build Date: {0}", BuildDate));
+            Logger.Log($"# Build Version: {Version}");
+            Logger.Log($"# Build Date: {BuildDate}");
             Logger.Log("#########################################");
             Logger.Log("# Loading TSKinManager...");
 
             try
             {
                 UnturnedPermissions.OnJoinRequested += PlayerConnectPending;
-                var ev = Config.EventSkins.FirstOrDefault(x => x.StartDayOfTheYear <= DateTime.Now.DayOfYear && x.EndDayOfTheYear > DateTime.Now.DayOfYear);
-                string even = "None";
-                if (ev != null)
-                    even = ev.EventName;
-
                 Logger.Log("# TSKinManager has been loaded.");
             }
             catch (Exception ex)
@@ -85,8 +80,8 @@ public void PlayerConnectPending(CSteamID Player, ref ESteamRejection? REj)
                             hexColor += "FF";
 
                         ColorUtility.TryParseHtmlString(hexColor, out Color color);
-                        Logger.LogWarning(String.Format("{0} does not have acceptable skin color. ({1} -> {2})", steamPending.playerID.characterName, playerColorHex, hexColor));
-                        steamPending.GetType().GetField("_skin", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(steamPending, color);
+                        Logger.LogWarning($"{steamPending.playerID.characterName} does not have acceptable skin color. ({playerColorHex} -> {hexColor})");
+                        steamPending.GetType().GetField("_skin", BindingFlags.NonPublic | BindingFlags.Instance)?.SetValue(steamPending, color);
                     }
 
                     CustomSkin skin = Config.CustomSkins.FirstOrDefault(x => x.Player == steamPending.playerID.steamID.m_SteamID);
@@ -127,8 +122,8 @@ public void PlayerConnectPending(CSteamID Player, ref ESteamRejection? REj)
 
                     if (Config.RestrictWeaponSkins)
                     {
-                        steamPending.skinItems = new int[0];
-                        steamPending.packageSkins = new ulong[0];
+                        steamPending.skinItems = Array.Empty<int>();
+                        steamPending.packageSkins = Array.Empty<ulong>();
                     }
 
                     if (Config.RestrictBackpacks)

TSkinManager/TSkinManager.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using Tavstal.TLibrary.Compatibility;
-using Tavstal.TSkinManager.Compability;
+using Tavstal.TLibrary.Models.Plugin;
+using Tavstal.TSkinManager.Models;
 
 namespace Tavstal.TSkinManager
 {
@@ -34,7 +34,7 @@ public class TSkinManagerConfig : ConfigurationBase
         [JsonProperty(Order = 15)]
         public List<string> AllowedSkinColorsHex;
 
-        public override void LoadDefaults()
+        public new void LoadDefaults()
         {
             RestrictWeaponSkins = false;
             RestrictGlasses = true;