Run cc

emyhrberg · emyhrberg · commit 132af14f297e · 2025-08-20T07:06:13.000+02:00
diff --git a/Common/Configs/Config.cs b/Common/Configs/Config.cs
@@ -3,7 +3,6 @@
 using Terraria.ModLoader.Config;
 using UICustomizer.MainMenu.Helpers;
 using UICustomizer.MainMenu.Hooks;
-using UICustomizer.MainMenu.UI;
 
 namespace UICustomizer.Common.Configs
 {
diff --git a/EditMode/Helpers/DefaultLayouts.cs b/EditMode/Helpers/DefaultLayouts.cs
@@ -1,10 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
-using static UICustomizer.Edit.Helpers.ElementHelper;
-using static UICustomizer.Edit.Helpers.MapThemeHelper;
-using static UICustomizer.Edit.Helpers.ResourceThemeHelper;
 
-namespace UICustomizer.Edit.Helpers
+namespace UICustomizer.EditMode.Helpers
 {
     public static class DefaultLayouts
     {
diff --git a/EditMode/Helpers/ElementHelper.cs b/EditMode/Helpers/ElementHelper.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace UICustomizer.Edit.Helpers
+namespace UICustomizer.EditMode.Helpers
 {
     public static class ElementHelper
     {
diff --git a/EditMode/Helpers/FileHelper.cs b/EditMode/Helpers/FileHelper.cs
@@ -4,10 +4,9 @@
 using System.IO;
 using System.Linq;
 using Terraria;
-using UICustomizer.EditMode.Helpers;
 using UICustomizer.EditMode.Hooks;
 
-namespace UICustomizer.Helpers.Layouts
+namespace UICustomizer.EditMode.Helpers
 {
     /// <summary>
     /// Handles file I/O operations for UICustomizer layouts.
@@ -48,14 +47,14 @@ public static string LoadLastLayoutName()
 
         public static void CreateAndOpenNewLayoutFile(string layoutName)
         {
-            string basePath = FileHelper.GetLayoutFilePath(layoutName);
+            string basePath = GetLayoutFilePath(layoutName);
             string path = basePath;
             int counter = 1;
 
             // Generate unique filename if needed
             while (File.Exists(path))
             {
-                path = FileHelper.GetLayoutFilePath($"{layoutName}{counter}");
+                path = GetLayoutFilePath($"{layoutName}{counter}");
                 counter++;
             }
 
@@ -102,7 +101,7 @@ public static void CreateAndOpenNewLayoutFile(string layoutName)
 
         public static List<string> GetLayouts()
         {
-            string folder = FileHelper.GetLayoutsFolderPath();
+            string folder = GetLayoutsFolderPath();
             if (!Directory.Exists(folder))
             {
                 Log.Warn($"Layouts folder does not exist: {folder}");
diff --git a/EditMode/Helpers/LayoutData.cs b/EditMode/Helpers/LayoutData.cs
@@ -1,10 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json.Converters;
-using static UICustomizer.Edit.Helpers.ElementHelper;
-using static UICustomizer.Edit.Helpers.MapThemeHelper;
-using static UICustomizer.Edit.Helpers.ResourceThemeHelper;
 
-namespace UICustomizer.Edit.Helpers
+namespace UICustomizer.EditMode.Helpers
 {
     public class LayoutData
     {
diff --git a/EditMode/Helpers/LayoutHelper.cs b/EditMode/Helpers/LayoutHelper.cs
@@ -4,11 +4,6 @@
 using System.Linq;
 using Newtonsoft.Json;
 using UICustomizer.EditMode.Hooks;
-using UICustomizer.Helpers.Layouts;
-using static UICustomizer.Edit.Helpers.ElementHelper;
-using static UICustomizer.Helpers.Layouts.ElementHelper;
-using static UICustomizer.Helpers.Layouts.MapThemeHelper;
-using static UICustomizer.Helpers.Layouts.ResourceThemeHelper;
 
 namespace UICustomizer.EditMode.Helpers
 {
diff --git a/EditMode/Helpers/MapThemeHelper.cs b/EditMode/Helpers/MapThemeHelper.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Terraria;
 
-namespace UICustomizer.Edit.Helpers
+namespace UICustomizer.EditMode.Helpers
 {
     public static class MapThemeHelper
     {
diff --git a/EditMode/Helpers/ResourceThemeHelper.cs b/EditMode/Helpers/ResourceThemeHelper.cs
@@ -1,6 +1,6 @@
 using Terraria;
 
-namespace UICustomizer.Edit.Helpers
+namespace UICustomizer.EditMode.Helpers
 {
     public static class ResourceThemeHelper
     {
diff --git a/EditMode/Old/LayoutsTab.cs b/EditMode/Old/LayoutsTab.cs
@@ -7,7 +7,7 @@
 using UICustomizer.EditMode.Helpers;
 using UICustomizer.EditMode.System;
 
-namespace UICustomizer.EditMode.UI.Old
+namespace UICustomizer.EditMode.Old
 {
     public class LayoutsTab : Tab
     {
diff --git a/EditMode/System/EditState.cs b/EditMode/System/EditState.cs
@@ -1,6 +1,5 @@
 using Microsoft.Xna.Framework.Graphics;
 using Terraria.UI;
-using UICustomizer.EditMode.UI;
 
 namespace UICustomizer.EditMode.System
 {
diff --git a/Helpers/DrawHelper.cs b/Helpers/DrawHelper.cs
@@ -3,8 +3,6 @@
 using Terraria.GameContent;
 using Terraria.ModLoader;
 using UICustomizer.EditMode.System;
-using UICustomizer.Helpers.Layouts;
-using static UICustomizer.Helpers.Layouts.ElementHelper;
 
 namespace UICustomizer.Helpers
 {
diff --git a/MainMenu/System/MainMenuState.cs b/MainMenu/System/MainMenuState.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Xna.Framework.Graphics;
-using Terraria;
 using Terraria.GameContent.UI.Elements;
 using Terraria.ModLoader.UI;
 using Terraria.UI;
@@ -27,7 +26,7 @@ public MainMenuState()
 
         panel = new();
         panel.Width.Set(320, 0);
-        panel.Height.Set(795+30, 0);
+        panel.Height.Set(795 + 30, 0);
         panel.OverflowHidden = false;
         panel.BackgroundColor = ColorHelper.DarkBluePanel * 0.5f;
         panel.SetPadding(0);
diff --git a/MainMenu/UI/EyeButton.cs b/MainMenu/UI/EyeButton.cs
@@ -2,7 +2,6 @@
 using Microsoft.Xna.Framework.Graphics;
 using ReLogic.Content;
 using Terraria.GameContent.UI.Elements;
-using Terraria.ModLoader;
 using Terraria.ModLoader.UI;
 
 namespace UICustomizer.MainMenu.UI
diff --git a/MainMenu/UI/PlayPause.cs b/MainMenu/UI/PlayPause.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Xna.Framework.Graphics;
-using Terraria;
 using Terraria.GameContent.UI.Elements;
 using Terraria.ModLoader.UI;
 using UICustomizer.MainMenu.Helpers;
@@ -27,7 +26,7 @@ public PlayPause() : base(Ass.Pause, true)
                 MainMenuPauseSystem.IsPaused = !MainMenuPauseSystem.IsPaused;
                 SetImage(isPaused ? Ass.Pause : Ass.Play);
                 Conf.C.MainMenuTime.IsPaused = !isPaused;
-                Conf.C.MainMenuTime.Time = (float) WorldTimeHelper.ConvertToTotalTime();
+                Conf.C.MainMenuTime.Time = (float)WorldTimeHelper.ConvertToTotalTime();
                 Conf.Save();
             };
         }
diff --git a/MainMenu/UI/Sections/BackgroundSection.cs b/MainMenu/UI/Sections/BackgroundSection.cs
@@ -6,7 +6,6 @@
 using Terraria.GameContent.UI.Elements;
 using Terraria.Localization;
 using Terraria.UI;
-using UICustomizer.EditMode.UI;
 using UICustomizer.MainMenu.Hooks;
 using static Terraria.GameContent.UI.States.UICharacterCreation;
 
diff --git a/MainMenu/UI/Sections/LogoSection.cs b/MainMenu/UI/Sections/LogoSection.cs
@@ -5,7 +5,6 @@
 using Terraria.GameContent.UI.Elements;
 using Terraria.Localization;
 using Terraria.UI;
-using UICustomizer.EditMode.UI;
 using UICustomizer.MainMenu.Hooks;
 using static Terraria.GameContent.UI.States.UICharacterCreation;
 
diff --git a/MainMenu/UI/Sections/TextColorSection.cs b/MainMenu/UI/Sections/TextColorSection.cs
@@ -5,7 +5,6 @@
 using Terraria.GameContent.UI.Elements;
 using Terraria.Localization;
 using Terraria.UI;
-using UICustomizer.EditMode.UI;
 using UICustomizer.MainMenu.Hooks;
 using static Terraria.GameContent.UI.States.UICharacterCreation;
 
diff --git a/MainMenu/UI/Sections/TimeSection.cs b/MainMenu/UI/Sections/TimeSection.cs
@@ -1,8 +1,6 @@
 ﻿using Microsoft.Xna.Framework.Graphics;
 using ReLogic.Content;
-using Terraria;
 using Terraria.GameContent.UI.Elements;
-using UICustomizer.EditMode.UI;
 using UICustomizer.MainMenu.Hooks;
 using UICustomizer.UI;
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Terraria.ModLoader.Config;`
`4`	`4`	`using UICustomizer.MainMenu.Helpers;`
`5`	`5`	`using UICustomizer.MainMenu.Hooks;`
`6`		`-using UICustomizer.MainMenu.UI;`
`7`	`6`
`8`	`7`	`namespace UICustomizer.Common.Configs`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.IO;`
`3`		`-using static UICustomizer.Edit.Helpers.ElementHelper;`
`4`		`-using static UICustomizer.Edit.Helpers.MapThemeHelper;`
`5`		`-using static UICustomizer.Edit.Helpers.ResourceThemeHelper;`
`6`	`3`
`7`		`-namespace UICustomizer.Edit.Helpers`
	`4`	`+namespace UICustomizer.EditMode.Helpers`
`8`	`5`	`{`
`9`	`6`	`public static class DefaultLayouts`
`10`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace UICustomizer.Edit.Helpers`
	`3`	`+namespace UICustomizer.EditMode.Helpers`
`4`	`4`	`{`
`5`	`5`	`public static class ElementHelper`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,9 @@`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using Terraria;`
`7`		`-using UICustomizer.EditMode.Helpers;`
`8`	`7`	`using UICustomizer.EditMode.Hooks;`
`9`	`8`
`10`		`-namespace UICustomizer.Helpers.Layouts`
	`9`	`+namespace UICustomizer.EditMode.Helpers`
`11`	`10`	`{`
`12`	`11`	`/// <summary>`
`13`	`12`	`/// Handles file I/O operations for UICustomizer layouts.`
`@@ -48,14 +47,14 @@ public static string LoadLastLayoutName()`
`48`	`47`
`49`	`48`	`public static void CreateAndOpenNewLayoutFile(string layoutName)`
`50`	`49`	`{`
`51`		`- string basePath = FileHelper.GetLayoutFilePath(layoutName);`
	`50`	`+ string basePath = GetLayoutFilePath(layoutName);`
`52`	`51`	`string path = basePath;`
`53`	`52`	`int counter = 1;`
`54`	`53`
`55`	`54`	`// Generate unique filename if needed`
`56`	`55`	`while (File.Exists(path))`
`57`	`56`	`{`
`58`		`- path = FileHelper.GetLayoutFilePath($"{layoutName}{counter}");`
	`57`	`+ path = GetLayoutFilePath($"{layoutName}{counter}");`
`59`	`58`	`counter++;`
`60`	`59`	`}`
`61`	`60`
`@@ -102,7 +101,7 @@ public static void CreateAndOpenNewLayoutFile(string layoutName)`
`102`	`101`
`103`	`102`	`public static List<string> GetLayouts()`
`104`	`103`	`{`
`105`		`- string folder = FileHelper.GetLayoutsFolderPath();`
	`104`	`+ string folder = GetLayoutsFolderPath();`
`106`	`105`	`if (!Directory.Exists(folder))`
`107`	`106`	`{`
`108`	`107`	`Log.Warn($"Layouts folder does not exist: {folder}");`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using Newtonsoft.Json.Converters;`
`3`		`-using static UICustomizer.Edit.Helpers.ElementHelper;`
`4`		`-using static UICustomizer.Edit.Helpers.MapThemeHelper;`
`5`		`-using static UICustomizer.Edit.Helpers.ResourceThemeHelper;`
`6`	`3`
`7`		`-namespace UICustomizer.Edit.Helpers`
	`4`	`+namespace UICustomizer.EditMode.Helpers`
`8`	`5`	`{`
`9`	`6`	`public class LayoutData`
`10`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using Terraria;`
`3`	`3`
`4`		`-namespace UICustomizer.Edit.Helpers`
	`4`	`+namespace UICustomizer.EditMode.Helpers`
`5`	`5`	`{`
`6`	`6`	`public static class MapThemeHelper`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using UICustomizer.EditMode.Helpers;`
`8`	`8`	`using UICustomizer.EditMode.System;`
`9`	`9`
`10`		`-namespace UICustomizer.EditMode.UI.Old`
	`10`	`+namespace UICustomizer.EditMode.Old`
`11`	`11`	`{`
`12`	`12`	`public class LayoutsTab : Tab`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using Microsoft.Xna.Framework.Graphics;`
`2`	`2`	`using Terraria.UI;`
`3`		`-using UICustomizer.EditMode.UI;`
`4`	`3`
`5`	`4`	`namespace UICustomizer.EditMode.System`
`6`	`5`	`{`