Code cleanup - Switch to null-forgiving operator

- Switch to null-forgiving operator (!) to remove compiler warnings
data-bomb · Jan 6, 2024 · 9c59a8c · 9c59a8c
1 parent 2e6d377
commit 9c59a8c
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 82 deletions.
diff --git a/Si_AFKManager/Si_AFK.cs b/Si_AFKManager/Si_AFK.cs
@@ -34,7 +34,7 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System;
 
-[assembly: MelonInfo(typeof(AwayFromKeyboard), "AFK Manager", "1.2.3", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(AwayFromKeyboard), "AFK Manager", "1.2.4", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -64,9 +64,9 @@ public uint Minutes
         static bool oneMinuteCheckTime;
         static bool skippedFirstCheck;
 
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<bool>? Pref_AFK_KickIfServerNotFull;
-        static MelonPreferences_Entry<int>? Pref_AFK_MinutesBeforeKick;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<bool> Pref_AFK_KickIfServerNotFull = null!;
+        static MelonPreferences_Entry<int> Pref_AFK_MinutesBeforeKick = null!;
 
         public override void OnInitializeMelon()
         {

diff --git a/Si_AdminMod/Si_AdminMod.cs b/Si_AdminMod/Si_AdminMod.cs
@@ -1,6 +1,6 @@
 /*
 Silica Admin Mod
-Copyright (C) 2023 by databomb
+Copyright (C) 2024 by databomb
 
 * Description *
 Provides basic admin mod system to allow additional admins beyond
@@ -36,8 +36,8 @@ namespace SilicaAdminMod
 {
     public class SiAdminMod : MelonMod
     {
-        static MelonPreferences_Category? _modCategory;
-        public static MelonPreferences_Entry<bool>? Pref_Admin_AcceptTeamChatCommands;
+        static MelonPreferences_Category _modCategory = null!;
+        public static MelonPreferences_Entry<bool> Pref_Admin_AcceptTeamChatCommands = null!;
 
         public static List<Admin> AdminList = null!;
         public static List<AdminCommand> AdminCommands = null!;

diff --git a/Si_Announcements/Si_Announcements.cs b/Si_Announcements/Si_Announcements.cs
@@ -1,6 +1,6 @@
 /*
  Silica Announcements Mod
- Copyright (C) 2023 by databomb
+ Copyright (C) 2024 by databomb
  
  * Description *
  For Silica listen servers, periodically sends a pre-set announcement
@@ -36,19 +36,19 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System.Linq;
 
-[assembly: MelonInfo(typeof(Announcements), "Server Announcements", "1.1.1", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(Announcements), "Server Announcements", "1.1.2", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
 namespace Si_Announcements
 {
     public class Announcements : MelonMod
     {
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<int>? _Announcements_SecondsBetweenMessages;
-        static MelonPreferences_Entry<bool>? _Announcements_ShowIfLastChatWasAnnouncement;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<int> _Announcements_SecondsBetweenMessages = null!;
+        static MelonPreferences_Entry<bool> _Announcements_ShowIfLastChatWasAnnouncement = null!;
 
-        static System.Timers.Timer? announcementTimer;
+        static Timer announcementTimer = null!;
         static int announcementCount;
         static string[]? announcementsText;
         static string? lastChatMessage;

diff --git a/Si_AntiGrief/Si_AntiGrief.cs b/Si_AntiGrief/Si_AntiGrief.cs
@@ -1,6 +1,6 @@
 /*
  Silica Anti-Grief Mod
- Copyright (C) 2023 by databomb
+ Copyright (C) 2024 by databomb
  
  * Description *
  For Silica servers, automatically identifies players who fall below a 
@@ -33,17 +33,17 @@ You should have received a copy of the GNU General Public License
 using Si_AntiGrief;
 using SilicaAdminMod;
 
-[assembly: MelonInfo(typeof(AntiGrief), "Anti-Grief", "1.1.3", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(AntiGrief), "Anti-Grief", "1.1.4", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
 namespace Si_AntiGrief
 {
     public class AntiGrief : MelonMod
     {
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<int>? _NegativeKillsThreshold;
-        static MelonPreferences_Entry<bool>? _NegativeKills_Penalty_Ban;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<int> _NegativeKillsThreshold = null!;
+        static MelonPreferences_Entry<bool> _NegativeKills_Penalty_Ban = null!;
 
         private const string ModCategory = "Silica";
 

diff --git a/Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs b/Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs
@@ -35,7 +35,7 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System;
 
-[assembly: MelonInfo(typeof(VersusTeamsAutoSelectMod), "Versus Auto-Select Team", "1.1.2", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(VersusTeamsAutoSelectMod), "Versus Auto-Select Team", "1.1.3", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -52,8 +52,8 @@ public class VersusTeamsAutoSelectMod : MelonMod
 
         private static System.Timers.Timer? DelayTimer;
 
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<MP_Strategy.ETeamsVersus>? _versusAutoSelectMode;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<MP_Strategy.ETeamsVersus> _versusAutoSelectMode = null;
 
         private const string ModCategory = "Silica";
         private const string AutoSelectMode = "VersusAutoSelectMode";

diff --git a/Si_BasicBanlist/Si_BasicBans.cs b/Si_BasicBanlist/Si_BasicBans.cs
@@ -1,6 +1,6 @@
 /*
  Silica Basic Banlist Mod
- Copyright (C) 2023 by databomb
+ Copyright (C) 2024 by databomb
  
  * Description *
  For Silica listen servers, retains history of kicked players across
@@ -35,7 +35,7 @@ You should have received a copy of the GNU General Public License
 using System.Collections.Generic;
 using System.Linq;
 
-[assembly: MelonInfo(typeof(BasicBanlist), "Basic Banlist", "1.3.0", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(BasicBanlist), "Basic Banlist", "1.3.1", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -71,8 +71,8 @@ public String? Comments
         static readonly String banListFile = System.IO.Path.Combine(MelonEnvironment.UserDataDirectory, "banned_users.json");
         static bool AdminModAvailable = false;
 
-        static MelonPreferences_Category _modCategory;
-        static MelonPreferences_Entry<bool> Pref_Ban_KickButton_PermaBan;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<bool> _Pref_Ban_KickButton_PermaBan = null!;
 
         public static void UpdateBanFile()
         {
@@ -86,7 +86,7 @@ public override void OnInitializeMelon()
             try
             {
                 _modCategory ??= MelonPreferences.CreateCategory("Silica");
-                Pref_Ban_KickButton_PermaBan ??= _modCategory.CreateEntry<bool>("Ban_HostKickButton_Permabans", false);
+                _Pref_Ban_KickButton_PermaBan ??= _modCategory.CreateEntry<bool>("Ban_HostKickButton_Permabans", false);
 
                 if (System.IO.File.Exists(banListFile))
                 {
@@ -270,7 +270,7 @@ public static void Prefix(Player __0)
                     }
 
                     // if we just intended to kick, we can skip the rest
-                    if (!Pref_Ban_KickButton_PermaBan.Value)
+                    if (!_Pref_Ban_KickButton_PermaBan.Value)
                     {
                         MelonLogger.Msg("Kicked player name (" + __0.PlayerName + ") SteamID (" + __0.ToString() + ")");
                         return;

diff --git a/Si_BasicTeamBalance/Si_BasicTeamBalance.cs b/Si_BasicTeamBalance/Si_BasicTeamBalance.cs
@@ -38,21 +38,21 @@ You should have received a copy of the GNU General Public License
 using System;
 using SilicaAdminMod;
 
-[assembly: MelonInfo(typeof(BasicTeamBalance), "Basic Team Balance", "1.2.1", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(BasicTeamBalance), "Basic Team Balance", "1.2.2", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
 namespace Si_BasicTeamBalance
 {
     public class BasicTeamBalance : MelonMod
     {
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<float>? _TwoTeamBalanceDivisor;
-        static MelonPreferences_Entry<float>? _TwoTeamBalanceAddend;
-        static MelonPreferences_Entry<float>? _ThreeTeamBalanceDivisor;
-        static MelonPreferences_Entry<float>? _ThreeTeamBalanceAddend;
-        static MelonPreferences_Entry<bool>?  _PreventEarlyTeamSwitches;
-        static MelonPreferences_Entry<int>?   _AllowTeamSwitchAfterTime;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<float> _TwoTeamBalanceDivisor = null!;
+        static MelonPreferences_Entry<float> _TwoTeamBalanceAddend = null!;
+        static MelonPreferences_Entry<float> _ThreeTeamBalanceDivisor = null!;
+        static MelonPreferences_Entry<float> _ThreeTeamBalanceAddend = null!;
+        static MelonPreferences_Entry<bool> _PreventEarlyTeamSwitches = null!;
+        static MelonPreferences_Entry<int> _AllowTeamSwitchAfterTime = null!;
 
         static Player? LastPlayerChatMessage;
         static bool preventTeamSwitches;
@@ -175,7 +175,7 @@ public static int GetNumberOfActiveTeams(MP_Strategy.ETeamsVersus versusMode)
         // Team Index 2 - Human (Sol)
         public static bool JoinCausesImbalance(Team? TargetTeam)
         {
-            if (TargetTeam == null || _TwoTeamBalanceDivisor == null || _TwoTeamBalanceAddend == null || _ThreeTeamBalanceDivisor == null || _ThreeTeamBalanceAddend == null)
+            if (TargetTeam == null)
             {
                 return false;
             }
@@ -231,7 +231,7 @@ public static bool Prefix(MP_Strategy __instance, GameByteStreamReader __0, byte
             {
                 try
                 {
-                    if (__instance == null || __0 == null || _PreventEarlyTeamSwitches == null)
+                    if (__instance == null || __0 == null)
                     {
                         return true;
                     }
@@ -348,7 +348,7 @@ public static void Postfix(MusicJukeboxHandler __instance, GameMode __0)
             {
                 try
                 {
-                    if (_PreventEarlyTeamSwitches != null && _PreventEarlyTeamSwitches.Value && _AllowTeamSwitchAfterTime != null)
+                    if (_PreventEarlyTeamSwitches.Value)
                     {
                         preventTeamSwitches = true;
 
@@ -382,7 +382,7 @@ public static void Postfix(MusicJukeboxHandler __instance, GameMode __0, Team __
             {
                 try
                 {
-                    if (_PreventEarlyTeamSwitches != null && !_PreventEarlyTeamSwitches.Value || Timer_AllowTeamSwitches == null)
+                    if (!_PreventEarlyTeamSwitches.Value || Timer_AllowTeamSwitches == null)
                     {
                         return;
                     }

diff --git a/Si_CommManagement/Si_CmdrMgr.cs b/Si_CommManagement/Si_CmdrMgr.cs
@@ -1,6 +1,6 @@
 /*
  Silica Commander Management Mod
- Copyright (C) 2023 by databomb
+ Copyright (C) 2024 by databomb
  
  * Description *
  For Silica servers, establishes a random selection for commander at the 
@@ -40,16 +40,16 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System.Linq;
 
-[assembly: MelonInfo(typeof(CommanderManager), "Commander Management", "1.3.0", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(CommanderManager), "Commander Management", "1.3.1", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
 namespace Si_CommanderManagement
 {
     public class CommanderManager : MelonMod
     {
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<bool>? _BlockRoundStartUntilEnoughApplicants;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<bool> _BlockRoundStartUntilEnoughApplicants = null!;
 
         const int MaxTeams = 3;
         const int AlienTeam = 0;

diff --git a/Si_DefaultUnits/Si_DefaultUnits.cs b/Si_DefaultUnits/Si_DefaultUnits.cs
@@ -1,6 +1,6 @@
 /*
  Silica Default Spawn Units
- Copyright (C) 2023 by databomb
+ Copyright (C) 2024 by databomb
  
  * Description *
  For Silica servers, allows hosts to modify the default spawn units at
@@ -42,20 +42,20 @@ namespace Si_DefaultUnits
 {
     public class DefaultUnits : MelonMod
     {
-        static MelonPreferences_Category? _modCategory;
+        static MelonPreferences_Category _modCategory = null!;
         private const string ModCategory = "Silica";
 
-        static MelonPreferences_Entry<string>? _Human_Unit_Tier_0;
-        static MelonPreferences_Entry<string>? _Human_Unit_Tier_I;
-        static MelonPreferences_Entry<string>? _Human_Unit_Tier_II;
-        static MelonPreferences_Entry<string>? _Human_Unit_Tier_III;
-        static MelonPreferences_Entry<string>? _Human_Unit_Tier_IV;
+        static MelonPreferences_Entry<string> _Human_Unit_Tier_0 = null!;
+        static MelonPreferences_Entry<string> _Human_Unit_Tier_I = null!;
+        static MelonPreferences_Entry<string> _Human_Unit_Tier_II = null!;
+        static MelonPreferences_Entry<string> _Human_Unit_Tier_III = null!;
+        static MelonPreferences_Entry<string> _Human_Unit_Tier_IV = null!;
 
-        static MelonPreferences_Entry<string>? _Alien_Unit_Tier_0;
-        static MelonPreferences_Entry<string>? _Alien_Unit_Tier_I;
-        static MelonPreferences_Entry<string>? _Alien_Unit_Tier_II;
-        static MelonPreferences_Entry<string>? _Alien_Unit_Tier_III;
-        static MelonPreferences_Entry<string>? _Alien_Unit_Tier_IV;
+        static MelonPreferences_Entry<string> _Alien_Unit_Tier_0 = null!;
+        static MelonPreferences_Entry<string> _Alien_Unit_Tier_I = null!;
+        static MelonPreferences_Entry<string> _Alien_Unit_Tier_II = null!;
+        static MelonPreferences_Entry<string> _Alien_Unit_Tier_III = null!;
+        static MelonPreferences_Entry<string> _Alien_Unit_Tier_IV = null!;
 
         const int MaxTeams = 3;
         static int[]? teamTechTiers;
@@ -219,12 +219,7 @@ static string GetDesiredSpawnConfig(Team team)
         {
             bool humanTeam = team.TeamName.StartsWith("Human");
 
-            if (teamTechTiers == null || 
-                _Human_Unit_Tier_0 == null || _Alien_Unit_Tier_0 == null || 
-                _Human_Unit_Tier_I == null || _Alien_Unit_Tier_I == null || 
-                _Human_Unit_Tier_II == null || _Alien_Unit_Tier_II == null || 
-                _Human_Unit_Tier_III == null || _Alien_Unit_Tier_III == null || 
-                _Human_Unit_Tier_IV == null || _Alien_Unit_Tier_IV == null)
+            if (teamTechTiers == null)
             {
                 return "";
             }

diff --git a/Si_FriendlyFireLimits/Si_FF.cs b/Si_FriendlyFireLimits/Si_FF.cs
@@ -31,22 +31,20 @@ You should have received a copy of the GNU General Public License
 using System;
 using SilicaAdminMod;
 
-[assembly: MelonInfo(typeof(FriendlyFireLimits), "Friendly Fire Limits", "1.2.1", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(FriendlyFireLimits), "Friendly Fire Limits", "1.2.2", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
 namespace Si_FriendlyFireLimits
 {
     public class FriendlyFireLimits : MelonMod
     {
-        #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-        static MelonPreferences_Category _modCategory;
-        static MelonPreferences_Entry<float> _UnitOnUnitNonExplosionDamageMultipler;
-        static MelonPreferences_Entry<float> _UnitOnUnitExplosionDamageMultiplier;
-        static MelonPreferences_Entry<float> _UnitOnStructureExplosionDamageMultiplier;
-        static MelonPreferences_Entry<float> _UnitOnStructureNonExplosionDamageMultiplier;
-        static MelonPreferences_Entry<bool> _HarvesterPassthrough;
-        #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<float> _UnitOnUnitNonExplosionDamageMultipler = null!;
+        static MelonPreferences_Entry<float> _UnitOnUnitExplosionDamageMultiplier = null!;
+        static MelonPreferences_Entry<float> _UnitOnStructureExplosionDamageMultiplier = null!;
+        static MelonPreferences_Entry<float> _UnitOnStructureNonExplosionDamageMultiplier = null!;
+        static MelonPreferences_Entry<bool> _HarvesterPassthrough = null!;
 
         private const string ModCategory = "Silica";
 

diff --git a/Si_Logging/Si_Logging.cs b/Si_Logging/Si_Logging.cs
@@ -1,6 +1,6 @@
 /*
  Silica Logging Mod
- Copyright (C) 2023 by databomb
+ Copyright (C) 2024 by databomb
  
  * Description *
  For Silica listen servers, creates a log file with console replication
@@ -37,7 +37,7 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System.Collections.Generic;
 
-[assembly: MelonInfo(typeof(HL_Logging), "Half-Life Logger", "1.1.0", "databomb&zawedcvg", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(HL_Logging), "Half-Life Logger", "1.1.1", "databomb&zawedcvg", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -49,9 +49,9 @@ public class HL_Logging : MelonMod
         const int MaxTeams = 3;
         static Player?[]? lastCommander;
 
-        static MelonPreferences_Category? _modCategory;
-        static MelonPreferences_Entry<bool>? Pref_Log_Damage;
-        static MelonPreferences_Entry<bool>? Pref_Log_Kills_Include_AI_vs_Player;
+        static MelonPreferences_Category _modCategory = null!;
+        static MelonPreferences_Entry<bool> Pref_Log_Damage = null!;
+        static MelonPreferences_Entry<bool> Pref_Log_Kills_Include_AI_vs_Player = null!;
 
         public static void PrintLogLine(string LogMessage, bool suppressConsoleOutput = false)
         {
@@ -290,11 +290,6 @@ public static void Postfix(StrategyMode __instance, Unit __0, EDamageType __1, U
                         return;
                     }
 
-                    if (Pref_Log_Kills_Include_AI_vs_Player == null)
-                    {
-                        return;
-                    }
-
                     // Attacker
                     BaseGameObject attackerBase = GameFuncs.GetBaseGameObject(__2);
                     if (attackerBase == null)
@@ -502,7 +497,7 @@ private static class ApplyPatchOnDamageReceived
             public static void Postfix(DamageManager __instance, UnityEngine.Collider __0, float __1, EDamageType __2, UnityEngine.GameObject __3, UnityEngine.Vector3 __4)
             {
                 // should we log the damage?
-                if (Pref_Log_Damage != null && !Pref_Log_Damage.Value)
+                if (!Pref_Log_Damage.Value)
                 {
                     return;
                 }