From 2ea94d9a35e077c90f30eb951bf270dda103602e Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sat, 22 Jun 2024 13:20:45 +0200
Subject: [PATCH] Remove Helper folder
---
.../MaterialContainerExtensions.cs} | 26 +++++++++----------
PCK-Studio/Forms/Editor/TextureAtlasEditor.cs | 2 --
PCK-Studio/Helper/BehaviourResources.cs | 18 -------------
PCK-Studio/MainForm.cs | 19 +++++++++-----
PCK-Studio/PckStudio.csproj | 3 +--
5 files changed, 25 insertions(+), 43 deletions(-)
rename PCK-Studio/{Helper/MaterialResources.cs => Extensions/MaterialContainerExtensions.cs} (81%)
delete mode 100644 PCK-Studio/Helper/BehaviourResources.cs
diff --git a/PCK-Studio/Helper/MaterialResources.cs b/PCK-Studio/Extensions/MaterialContainerExtensions.cs
similarity index 81%
rename from PCK-Studio/Helper/MaterialResources.cs
rename to PCK-Studio/Extensions/MaterialContainerExtensions.cs
index d7755831..d680a9c5 100644
--- a/PCK-Studio/Helper/MaterialResources.cs
+++ b/PCK-Studio/Extensions/MaterialContainerExtensions.cs
@@ -1,18 +1,15 @@
using System;
-using System.IO;
-
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
using OMI.Formats.Material;
-using OMI.Workers.Material;
-namespace PckStudio.Helper
+namespace PckStudio.Extensions
{
- public static class MaterialResources
+ internal static class MaterialContainerExtensions
{
- public static byte[] MaterialsFileInitializer()
- {
- using var stream = new MemoryStream();
- var matFile = new MaterialContainer
- {
+ private static readonly MaterialContainer.Material[] defaultMaterials = [
new MaterialContainer.Material("bat", "entity_alphatest"),
new MaterialContainer.Material("ender_dragon", "entity_emissive_alpha"),
new MaterialContainer.Material("blaze_head", "entity_emissive_alpha"),
@@ -35,10 +32,11 @@ namespace PckStudio.Helper
new MaterialContainer.Material("wither_boss", "entity_alphatest"),
new MaterialContainer.Material("wither_skeleton", "entity_alphatest"),
new MaterialContainer.Material("wolf", "entity_alphatest_change_color")
- };
- var writer = new MaterialFileWriter(matFile);
- writer.WriteToStream(stream);
- return stream.ToArray();
+ ];
+
+ public static void InitializeDefault(this MaterialContainer materials)
+ {
+ materials.AddRange(defaultMaterials);
}
}
}
diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
index 86893b9e..d3ffee2a 100644
--- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
+++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
@@ -30,8 +30,6 @@ using OMI.Formats.Pck;
using OMI.Workers.Color;
using PckStudio.Extensions;
-using PckStudio.Helper;
-using PckStudio.Internal;
using PckStudio.Internal.Deserializer;
using PckStudio.Internal.Json;
using PckStudio.Internal.Serializer;
diff --git a/PCK-Studio/Helper/BehaviourResources.cs b/PCK-Studio/Helper/BehaviourResources.cs
deleted file mode 100644
index c50b6b78..00000000
--- a/PCK-Studio/Helper/BehaviourResources.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.IO;
-
-using OMI.Formats.Behaviour;
-using OMI.Workers.Behaviour;
-
-namespace PckStudio.Helper
-{
- public static class BehaviourResources
- {
- internal static byte[] BehaviourFileInitializer()
- {
- using var stream = new MemoryStream();
- var writer = new BehavioursWriter(new BehaviourFile());
- writer.WriteToStream(stream);
- return stream.ToArray();
- }
- }
-}
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index f0f6260d..a7bf6b11 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -7,14 +7,20 @@ using System.Windows.Forms;
using System.Drawing.Drawing2D;
using System.Diagnostics;
using System.Drawing.Imaging;
+using System.Text.RegularExpressions;
using OMI.Formats.Pck;
-using OMI.Formats.GameRule;
-using OMI.Formats.Languages;
using OMI.Formats.Model;
+using OMI.Formats.GameRule;
+using OMI.Formats.Material;
+using OMI.Formats.Behaviour;
+using OMI.Formats.Languages;
+using OMI.Workers;
using OMI.Workers.Pck;
using OMI.Workers.GameRule;
using OMI.Workers.Language;
using OMI.Workers.Model;
+using OMI.Workers.Behaviour;
+using OMI.Workers.Material;
using PckStudio.Properties;
using PckStudio.FileFormats;
using PckStudio.Forms;
@@ -29,12 +35,9 @@ using PckStudio.Forms.Features;
using PckStudio.Extensions;
using PckStudio.Popups;
using PckStudio.Classes.Utils;
-using PckStudio.Helper;
-using System.Text.RegularExpressions;
using PckStudio.Internal.Json;
using PckStudio.Internal.Deserializer;
using PckStudio.Internal.Serializer;
-using OMI.Workers;
using PckStudio.Internal.App;
namespace PckStudio
@@ -2368,7 +2371,7 @@ namespace PckStudio
return;
}
- currentPCK.CreateNewAsset("behaviours.bin", PckAssetType.BehavioursFile, BehaviourResources.BehaviourFileInitializer);
+ currentPCK.CreateNewAsset("behaviours.bin", PckAssetType.BehavioursFile, new BehavioursWriter(new BehaviourFile()));
BuildMainTreeView();
}
@@ -2379,7 +2382,9 @@ namespace PckStudio
MessageBox.Show(this, "A behaviours file already exists in this PCK and a new one cannot be created.", "Operation aborted");
return;
}
- currentPCK.CreateNewAsset("entityMaterials.bin", PckAssetType.MaterialFile, MaterialResources.MaterialsFileInitializer);
+ var materialContainer = new MaterialContainer();
+ materialContainer.InitializeDefault();
+ currentPCK.CreateNewAsset("entityMaterials.bin", PckAssetType.MaterialFile, new MaterialFileWriter(materialContainer));
BuildMainTreeView();
}
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 4619e5c9..d8d6e488 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -133,6 +133,7 @@
+
Form
@@ -383,8 +384,6 @@
InProgressPrompt.cs
-
-
Form