From 9b92ef2c0a54fce8e48d29664b4abb5e56fb8bfe Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sat, 12 Aug 2023 11:10:08 +0200
Subject: [PATCH] Moved Animation, Behaviour and Material -Resources to Helper
folder
---
.../Forms/Additional-Popups/Animation/ChangeTile.cs | 2 +-
PCK-Studio/Forms/Editor/AnimationEditor.cs | 7 ++++---
PCK-Studio/Forms/Editor/TextureAtlasEditor.cs | 6 +++---
.../{Forms/Utilities => Helper}/AnimationResources.cs | 10 ++++------
.../{Forms/Utilities => Helper}/BehaviourResources.cs | 8 ++------
.../{Forms/Utilities => Helper}/MaterialResources.cs | 9 ++-------
PCK-Studio/Internal/ApplicationScope.cs | 6 +-----
PCK-Studio/MainForm.cs | 1 +
PCK-Studio/PckStudio.csproj | 6 +++---
9 files changed, 21 insertions(+), 34 deletions(-)
rename PCK-Studio/{Forms/Utilities => Helper}/AnimationResources.cs (95%)
rename PCK-Studio/{Forms/Utilities => Helper}/BehaviourResources.cs (72%)
rename PCK-Studio/{Forms/Utilities => Helper}/MaterialResources.cs (93%)
diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
index 4360de42..c4c9e2c4 100644
--- a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
+++ b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
@@ -4,7 +4,7 @@ using System.Diagnostics;
using System.Windows.Forms;
using MetroFramework.Forms;
using PckStudio.Extensions;
-using PckStudio.Forms.Utilities;
+using PckStudio.Helper;
using PckStudio.Internal;
using PckStudio.Internal.Json;
diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs
index 5e170b2f..a8585abd 100644
--- a/PCK-Studio/Forms/Editor/AnimationEditor.cs
+++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs
@@ -5,19 +5,20 @@ using System.IO;
using System.Linq;
using System.Windows.Forms;
using System.Collections.Generic;
-
+using System.Diagnostics;
using MetroFramework.Forms;
+
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+
using OMI.Formats.Pck;
using PckStudio.Forms.Additional_Popups.Animation;
-using PckStudio.Forms.Utilities;
using PckStudio.Extensions;
using PckStudio.Properties;
-using System.Diagnostics;
using PckStudio.Internal;
using PckStudio.Internal.Json;
+using PckStudio.Helper;
namespace PckStudio.Forms.Editor
{
diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
index ec2b5db0..0333ad00 100644
--- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
+++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
@@ -17,7 +17,6 @@
**/
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
@@ -25,12 +24,13 @@ using System.IO;
using System.Linq;
using System.Windows.Forms;
using MetroFramework.Forms;
+
using OMI.Formats.Color;
using OMI.Formats.Pck;
using OMI.Workers.Color;
+
using PckStudio.Extensions;
-using PckStudio.Forms.Editor;
-using PckStudio.Forms.Utilities;
+using PckStudio.Helper;
using PckStudio.Internal.Json;
namespace PckStudio.Forms.Editor
diff --git a/PCK-Studio/Forms/Utilities/AnimationResources.cs b/PCK-Studio/Helper/AnimationResources.cs
similarity index 95%
rename from PCK-Studio/Forms/Utilities/AnimationResources.cs
rename to PCK-Studio/Helper/AnimationResources.cs
index 5cd26f8e..730d5ec6 100644
--- a/PCK-Studio/Forms/Utilities/AnimationResources.cs
+++ b/PCK-Studio/Helper/AnimationResources.cs
@@ -1,18 +1,16 @@
using System;
-using System.Drawing;
using System.Linq;
+using System.Drawing;
using System.Windows.Forms;
+using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
using PckStudio.Properties;
using PckStudio.Extensions;
-using PckStudio.Forms.Editor;
-using System.Collections.Generic;
-using Newtonsoft.Json;
using PckStudio.Internal.Json;
-namespace PckStudio.Forms.Utilities
+namespace PckStudio.Helper
{
public static class AnimationResources
{
diff --git a/PCK-Studio/Forms/Utilities/BehaviourResources.cs b/PCK-Studio/Helper/BehaviourResources.cs
similarity index 72%
rename from PCK-Studio/Forms/Utilities/BehaviourResources.cs
rename to PCK-Studio/Helper/BehaviourResources.cs
index 16674b80..c50b6b78 100644
--- a/PCK-Studio/Forms/Utilities/BehaviourResources.cs
+++ b/PCK-Studio/Helper/BehaviourResources.cs
@@ -1,13 +1,9 @@
-using System.Drawing;
-using System.Linq;
-using System.IO;
+using System.IO;
-using PckStudio.Properties;
-using PckStudio.Extensions;
using OMI.Formats.Behaviour;
using OMI.Workers.Behaviour;
-namespace PckStudio.Forms.Utilities
+namespace PckStudio.Helper
{
public static class BehaviourResources
{
diff --git a/PCK-Studio/Forms/Utilities/MaterialResources.cs b/PCK-Studio/Helper/MaterialResources.cs
similarity index 93%
rename from PCK-Studio/Forms/Utilities/MaterialResources.cs
rename to PCK-Studio/Helper/MaterialResources.cs
index b2b9e18a..d7755831 100644
--- a/PCK-Studio/Forms/Utilities/MaterialResources.cs
+++ b/PCK-Studio/Helper/MaterialResources.cs
@@ -1,15 +1,10 @@
-using System.Drawing;
-using System.Linq;
+using System;
using System.IO;
-using PckStudio.Properties;
-using PckStudio.Extensions;
-using OMI.Formats.Pck;
using OMI.Formats.Material;
using OMI.Workers.Material;
-using System;
-namespace PckStudio.Forms.Utilities
+namespace PckStudio.Helper
{
public static class MaterialResources
{
diff --git a/PCK-Studio/Internal/ApplicationScope.cs b/PCK-Studio/Internal/ApplicationScope.cs
index 70a14eb4..92d09dd4 100644
--- a/PCK-Studio/Internal/ApplicationScope.cs
+++ b/PCK-Studio/Internal/ApplicationScope.cs
@@ -1,17 +1,13 @@
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using PckStudio.Classes.Misc;
-using PckStudio.Forms.Utilities;
using PckStudio.Properties;
using PckStudio.Extensions;
using System.Globalization;
-using System.ComponentModel;
using PckStudio.Internal;
+using PckStudio.Helper;
namespace PckStudio
{
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 6a504f9e..a7d2af59 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -33,6 +33,7 @@ using PckStudio.Extensions;
using PckStudio.Popups;
using PckStudio.API.Miles;
using PckStudio.Classes.Utils;
+using PckStudio.Helper;
namespace PckStudio
{
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 3ea3ee56..31ba7bc8 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -361,9 +361,9 @@
InProgressPrompt.cs
-
-
-
+
+
+
Form