Removed right click config option

emyhrberg · emyhrberg · commit 39f72b993602 · 2026-01-13T15:48:32.000+01:00
Removed it because it was unneccessary and cluttery.
diff --git a/Common/Configs/Config.cs b/Common/Configs/Config.cs
@@ -47,6 +47,9 @@ public class Config : ModConfig
         [DefaultValue(true)]
         public bool ShowCopyToClipboardButton;
 
+        [DefaultValue(true)]
+        public bool ShowBackToMainMenu;
+
         public enum WorldSize { ExtraSmall, Small, Medium, Large }
         [DrawTicks]
         [DefaultValue(WorldSize.Small)]
@@ -71,9 +74,6 @@ public enum WorldDifficulty { Normal, Expert, Master, Journey }
         [DefaultValue(true)]
         public bool LogDebugMessages;
 
-        [DefaultValue(true)]
-        public bool ShowBackToMainMenu;
-
         public override void OnChanged()
         {
             base.OnChanged();
@@ -105,7 +105,10 @@ private void UpdateMainMenuReloadTooltip()
 
     public static class Conf
     {
-        /// <summary> Quick instance getter. Usage example: Conf.C.Field /// </summary>
+        /// <summary> 
+        /// Quick instance getter. 
+        /// Usage example: Conf.C.YourField 
+        /// /// </summary>
         public static Config C => ModContent.GetInstance<Config>();
     }
 }
diff --git a/Common/Configs/ConfigElements/ModsConfigElements/ModCheckboxConfig.cs b/Common/Configs/ConfigElements/ModsConfigElements/ModCheckboxConfig.cs
@@ -113,8 +113,7 @@ public override void LeftClick(UIMouseEvent evt)
                         else
                         {
                             modsToReload = $"{modsToReload}";
-                            if (Conf.C.RightClickToolOptions)
-                                modsToReload += "\nRight click to reload mods without building any";
+                            modsToReload += "\nRight click to reload mods without building any";
                         }
                         sys.mainState.reloadSPButton?.UpdateHoverTextDescription(modsToReload);
                         sys.mainState.reloadMPButton?.UpdateHoverTextDescription(modsToReload);
diff --git a/Common/Integrations/DragonLens/DragonLensLogPanel.cs b/Common/Integrations/DragonLens/DragonLensLogPanel.cs
@@ -22,23 +22,14 @@ public class DragonLensLogPanel : Tool
 
         private string GetDescription()
         {
-            if (!Conf.C.RightClickToolOptions)
-            {
-                return Loc.Get("LogButton.HoverDescBase");
-            }
-
             string logFileName = Path.GetFileName(Logging.LogPath);
             string result = Loc.Get("LogButton.HoverDescBase");
             result += $"\n{Loc.Get("LogButton.HoverDescRightClick", Path.GetFileName(Logging.LogPath))}";
             return result;
         }
 
-        public override bool HasRightClick => Conf.C.RightClickToolOptions;
-
         public override void OnRightClick()
         {
-            if (!Conf.C.RightClickToolOptions) return;
-
             Log.OpenClientLog();
         }
 
diff --git a/Common/Integrations/DragonLens/DragonLensReload.cs b/Common/Integrations/DragonLens/DragonLensReload.cs
@@ -15,30 +15,18 @@ public class DragonLensReload : Tool
 
         private string GetDescription()
         {
-            if (!Conf.C.RightClickToolOptions)
-            {
-                return Loc.Get("ReloadButton.HoverText", string.Join(", ", Conf.C.ModsToReload));
-            }
-
             string result = $"{Loc.Get("ReloadButton.HoverText", string.Join(", ", Conf.C.ModsToReload))}\n{Loc.Get("ReloadButton.HoverDescRightClick")}";
             //result += $"\n{Helpers.LocalizationHelper.GetText("ReloadButton.HoverDescRightClick")}";
             return result;
         }
 
-        public override bool HasRightClick => Conf.C.RightClickToolOptions;
-
         public override async void OnActivate()
         {
             await ReloadUtilities.SinglePlayerReload();
         }
 
         public override async void OnRightClick()
         {
-            if (!Conf.C.RightClickToolOptions)
-            {
-                return;
-            }
-
             ReloadUtilities.forceJustReload = true;
             await ReloadUtilities.SinglePlayerReload();
         }
diff --git a/Common/Integrations/DragonLens/DragonLensReloadMP.cs b/Common/Integrations/DragonLens/DragonLensReloadMP.cs
@@ -15,18 +15,11 @@ public class DragonLensReloadMP : Tool
 
         private string GetDescription()
         {
-            if (!Conf.C.RightClickToolOptions)
-            {
-                return Loc.Get("ReloadMPButton.HoverText", string.Join(", ", Conf.C.ModsToReload));
-            }
-
             string result = $"{Loc.Get("ReloadMPButton.HoverText", string.Join(", ", Conf.C.ModsToReload))}\n{Loc.Get("ReloadMPButton.HoverDescRightClick")}";
             //result += $"\n{Helpers.LocalizationHelper.GetText("ReloadButton.HoverDescRightClick")}";
             return result;
         }
 
-        public override bool HasRightClick => Conf.C.RightClickToolOptions;
-
         public override async void OnActivate()
         {
             await ReloadUtilities.MultiPlayerMainReload();
diff --git a/Common/Integrations/DragonLens/DragonLensUIPanel.cs b/Common/Integrations/DragonLens/DragonLensUIPanel.cs
@@ -22,11 +22,6 @@ public class DragonLensUIPanel : Tool
 
         private string GetDescription()
         {
-            if (!Conf.C.RightClickToolOptions)
-            {
-                return Loc.Get("UIElementButton.HoverDescBase");
-            }
-
             string result = Loc.Get("UIElementButton.HoverDescBase");
             result += $"\n{Loc.Get("UIElementButton.HoverDescRightClick")}";
             return result;
@@ -69,15 +64,8 @@ public override void OnActivate()
             }
         }
 
-        public override bool HasRightClick => Conf.C.RightClickToolOptions;
-
         public override void OnRightClick()
         {
-            if (!Conf.C.RightClickToolOptions)
-            {
-                return;
-            }
-
             UIElementSystem elementSystem = ModContent.GetInstance<UIElementSystem>();
             if (elementSystem == null) return;
             UIElementState elementState = elementSystem.debugState;
diff --git a/Core/Features/LogFeatures/LogButton.cs b/Core/Features/LogFeatures/LogButton.cs
@@ -16,7 +16,6 @@ public class LogButton(Asset<Texture2D> spritesheet, string buttonText, string h
 
         public override void RightClick(UIMouseEvent evt)
         {
-            if (!Conf.C.RightClickToolOptions) return;
             Log.OpenClientLog();
         }
     }
diff --git a/Core/Features/Reload/ReloadSPButton.cs b/Core/Features/Reload/ReloadSPButton.cs
@@ -23,8 +23,6 @@ public override async void RightClick(UIMouseEvent evt)
         {
             base.RightClick(evt);
 
-            if (!Conf.C.RightClickToolOptions) return;
-
             ReloadUtilities.forceJustReload = true;
             await ReloadUtilities.SinglePlayerReload();
         }
diff --git a/Core/Features/UIElementFeatures/UIElementButton.cs b/Core/Features/UIElementFeatures/UIElementButton.cs
@@ -19,8 +19,6 @@ public class UIElementButton(Asset<Texture2D> spritesheet, string buttonText, st
 
         public override void RightClick(UIMouseEvent evt)
         {
-            if (!Conf.C.RightClickToolOptions) return;
-
             base.RightClick(evt);
 
             // Toggle all elements
diff --git a/Core/MainState.cs b/Core/MainState.cs
@@ -70,12 +70,10 @@ public MainState()
                 AreButtonsShowing = true; // Show our own collapse and show buttons by default
 
                 string uiElementHoverDesc = Loc.Get("UIElementButton.HoverDescBase");
-                if (Conf.C.RightClickToolOptions)
-                    uiElementHoverDesc += "\n" + Loc.Get("UIElementButton.HoverDescRightClick");
+                uiElementHoverDesc += "\n" + Loc.Get("UIElementButton.HoverDescRightClick");
 
                 string logHoverDesc = Loc.Get("LogButton.HoverDescBase");
-                if (Conf.C.RightClickToolOptions)
-                    logHoverDesc += "\n" + Loc.Get("LogButton.HoverDescRightClick", Path.GetFileName(Logging.LogPath));
+                logHoverDesc += "\n" + Loc.Get("LogButton.HoverDescRightClick", Path.GetFileName(Logging.LogPath));
 
                 modsButton = AddButton<ModsButton>(
                     Ass.ButtonMods,
@@ -107,8 +105,7 @@ public MainState()
                     ? Loc.Get("ReloadButton.HoverDescNoMods")
                     : string.Join(",", Conf.C.ModsToReload);
 
-                if (Conf.C.RightClickToolOptions)
-                    reloadHoverMods += "\n" + Loc.Get("ReloadButton.HoverDescRightClick");
+                reloadHoverMods += "\n" + Loc.Get("ReloadButton.HoverDescRightClick");
 
                 if (Main.netMode == NetmodeID.SinglePlayer)
                 {
diff --git a/Localization/en-US_Mods.ModReloader.hjson b/Localization/en-US_Mods.ModReloader.hjson
@@ -63,11 +63,6 @@ Configs: {
 			Tooltip: A new button will appear allowing you to copy the message in the error menu
 		}
 
-		RightClickToolOptions: {
-			Label: Right Click Tool Options
-			Tooltip: Adds the option for tools to have additional functionality with right click options.
-		}
-
 		MoveChat: {
 			Label: Move Chat
 			Tooltip: Moves the chat box position a little to make space for debug info

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,7 @@ public override void LeftClick(UIMouseEvent evt)`
`113`	`113`	`else`
`114`	`114`	`{`
`115`	`115`	`modsToReload = $"{modsToReload}";`
`116`		`- if (Conf.C.RightClickToolOptions)`
`117`		`- modsToReload += "\nRight click to reload mods without building any";`
	`116`	`+ modsToReload += "\nRight click to reload mods without building any";`
`118`	`117`	`}`
`119`	`118`	`sys.mainState.reloadSPButton?.UpdateHoverTextDescription(modsToReload);`
`120`	`119`	`sys.mainState.reloadMPButton?.UpdateHoverTextDescription(modsToReload);`
Original file line number	Diff line number	Diff line change
`@@ -22,23 +22,14 @@ public class DragonLensLogPanel : Tool`
`22`	`22`
`23`	`23`	`private string GetDescription()`
`24`	`24`	`{`
`25`		`- if (!Conf.C.RightClickToolOptions)`
`26`		`- {`
`27`		`- return Loc.Get("LogButton.HoverDescBase");`
`28`		`- }`
`29`		`-`
`30`	`25`	`string logFileName = Path.GetFileName(Logging.LogPath);`
`31`	`26`	`string result = Loc.Get("LogButton.HoverDescBase");`
`32`	`27`	`result += $"\n{Loc.Get("LogButton.HoverDescRightClick", Path.GetFileName(Logging.LogPath))}";`
`33`	`28`	`return result;`
`34`	`29`	`}`
`35`	`30`
`36`		`- public override bool HasRightClick => Conf.C.RightClickToolOptions;`
`37`		`-`
`38`	`31`	`public override void OnRightClick()`
`39`	`32`	`{`
`40`		`- if (!Conf.C.RightClickToolOptions) return;`
`41`		`-`
`42`	`33`	`Log.OpenClientLog();`
`43`	`34`	`}`
`44`	`35`
Original file line number	Diff line number	Diff line change
`@@ -15,30 +15,18 @@ public class DragonLensReload : Tool`
`15`	`15`
`16`	`16`	`private string GetDescription()`
`17`	`17`	`{`
`18`		`- if (!Conf.C.RightClickToolOptions)`
`19`		`- {`
`20`		`- return Loc.Get("ReloadButton.HoverText", string.Join(", ", Conf.C.ModsToReload));`
`21`		`- }`
`22`		`-`
`23`	`18`	`string result = $"{Loc.Get("ReloadButton.HoverText", string.Join(", ", Conf.C.ModsToReload))}\n{Loc.Get("ReloadButton.HoverDescRightClick")}";`
`24`	`19`	`//result += $"\n{Helpers.LocalizationHelper.GetText("ReloadButton.HoverDescRightClick")}";`
`25`	`20`	`return result;`
`26`	`21`	`}`
`27`	`22`
`28`		`- public override bool HasRightClick => Conf.C.RightClickToolOptions;`
`29`		`-`
`30`	`23`	`public override async void OnActivate()`
`31`	`24`	`{`
`32`	`25`	`await ReloadUtilities.SinglePlayerReload();`
`33`	`26`	`}`
`34`	`27`
`35`	`28`	`public override async void OnRightClick()`
`36`	`29`	`{`
`37`		`- if (!Conf.C.RightClickToolOptions)`
`38`		`- {`
`39`		`- return;`
`40`		`- }`
`41`		`-`
`42`	`30`	`ReloadUtilities.forceJustReload = true;`
`43`	`31`	`await ReloadUtilities.SinglePlayerReload();`
`44`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,18 +15,11 @@ public class DragonLensReloadMP : Tool`
`15`	`15`
`16`	`16`	`private string GetDescription()`
`17`	`17`	`{`
`18`		`- if (!Conf.C.RightClickToolOptions)`
`19`		`- {`
`20`		`- return Loc.Get("ReloadMPButton.HoverText", string.Join(", ", Conf.C.ModsToReload));`
`21`		`- }`
`22`		`-`
`23`	`18`	`string result = $"{Loc.Get("ReloadMPButton.HoverText", string.Join(", ", Conf.C.ModsToReload))}\n{Loc.Get("ReloadMPButton.HoverDescRightClick")}";`
`24`	`19`	`//result += $"\n{Helpers.LocalizationHelper.GetText("ReloadButton.HoverDescRightClick")}";`
`25`	`20`	`return result;`
`26`	`21`	`}`
`27`	`22`
`28`		`- public override bool HasRightClick => Conf.C.RightClickToolOptions;`
`29`		`-`
`30`	`23`	`public override async void OnActivate()`
`31`	`24`	`{`
`32`	`25`	`await ReloadUtilities.MultiPlayerMainReload();`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public class LogButton(Asset<Texture2D> spritesheet, string buttonText, string h`
`16`	`16`
`17`	`17`	`public override void RightClick(UIMouseEvent evt)`
`18`	`18`	`{`
`19`		`- if (!Conf.C.RightClickToolOptions) return;`
`20`	`19`	`Log.OpenClientLog();`
`21`	`20`	`}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ public override async void RightClick(UIMouseEvent evt)`
`23`	`23`	`{`
`24`	`24`	`base.RightClick(evt);`
`25`	`25`
`26`		`- if (!Conf.C.RightClickToolOptions) return;`
`27`		`-`
`28`	`26`	`ReloadUtilities.forceJustReload = true;`
`29`	`27`	`await ReloadUtilities.SinglePlayerReload();`
`30`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ public class UIElementButton(Asset<Texture2D> spritesheet, string buttonText, st`
`19`	`19`
`20`	`20`	`public override void RightClick(UIMouseEvent evt)`
`21`	`21`	`{`
`22`		`- if (!Conf.C.RightClickToolOptions) return;`
`23`		`-`
`24`	`22`	`base.RightClick(evt);`
`25`	`23`
`26`	`24`	`// Toggle all elements`