From fcea7f6cc391d5a70cd19457eec019997cae7b5d Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sun, 2 Apr 2023 18:14:36 +0200
Subject: [PATCH] Rename 'LCEToBedrock' to 'BedrockConverter'

---
 .../FromLCE/BedrockConverter.cs}              | 22 +++++++------------
 PCK-Studio/MainForm.cs                        |  2 +-
 PCK-Studio/PckStudio.csproj                   |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)
 rename PCK-Studio/Classes/{Convert/FromLCE/LCEToBedrock.cs => Conversion/FromLCE/BedrockConverter.cs} (98%)

diff --git a/PCK-Studio/Classes/Convert/FromLCE/LCEToBedrock.cs b/PCK-Studio/Classes/Conversion/FromLCE/BedrockConverter.cs
similarity index 98%
rename from PCK-Studio/Classes/Convert/FromLCE/LCEToBedrock.cs
rename to PCK-Studio/Classes/Conversion/FromLCE/BedrockConverter.cs
index 60399fb6..ca7805b4 100644
--- a/PCK-Studio/Classes/Convert/FromLCE/LCEToBedrock.cs
+++ b/PCK-Studio/Classes/Conversion/FromLCE/BedrockConverter.cs
@@ -16,11 +16,8 @@ using PckStudio.Classes.Utils;
 
 namespace PckStudio.Classes.FromLCE
 {
-	internal class LCEToBedrock
+	internal class BedrockConverter
     {
-
-        #region variables
-
         // this is just a placeholder in case the locfile entry fails
         // the placeholder name can be changed at any time
         string PackName = "pck_studio";
@@ -168,7 +165,7 @@ namespace PckStudio.Classes.FromLCE
             {"stripped_oak_log","stripped_oak_log_top","stripped_acacia_log","stripped_acacia_log_top","stripped_birch_log","stripped_birch_log_top","stripped_dark_oak_log","stripped_dark_oak_log_top","stripped_jungle_log","stripped_jungle_log_top","stripped_spruce_log","stripped_spruce_log_top","acacia_trapdoor","birch_trapdoor","dark_oak_trapdoor","jungle_trapdoor" }
         };
 
-        Dictionary<string, string> ImgCopyLookup = new Dictionary<string, string>()
+        static Dictionary<string, string> ImgCopyLookup = new Dictionary<string, string>()
         {
             { "res/mob", "/textures/entity" },
             { "res/art", "/textures/painting" },
@@ -177,8 +174,6 @@ namespace PckStudio.Classes.FromLCE
             { "res/armor", "/textures/models/armor" }
         };
 
-        #endregion
-
         #region Texture Packs
 
         public void ConvertTexturePack(PckFile sourcePck, string exportPath)
@@ -219,9 +214,9 @@ namespace PckStudio.Classes.FromLCE
                 OutPath = "\\textures\\items\\";
             }
 
-            var bm = Image.FromStream(ms);
-            int width = bm.Width / defaultWidth;
-            int height = bm.Height / defaultHeight;
+            var img = Image.FromStream(ms);
+            int width = img.Width / defaultWidth;
+            int height = img.Height / defaultHeight;
             Directory.CreateDirectory(exportPath + OutPath);
 
             // Start splitting the Bitmap.
@@ -229,8 +224,8 @@ namespace PckStudio.Classes.FromLCE
             Rectangle dest_rect = new Rectangle(0, 0, width, height);
             using (Graphics gr = Graphics.FromImage(piece))
             {
-                int num_rows = bm.Height / height;
-                int num_cols = bm.Width / width;
+                int num_rows = img.Height / height;
+                int num_cols = img.Width / width;
                 Rectangle source_rect = new Rectangle(0, 0, width, height);
                 for (int row = 0; row < num_rows; row++)
                 {
@@ -239,8 +234,7 @@ namespace PckStudio.Classes.FromLCE
                     {
                         // Copy the piece of the image.
                         gr.Clear(Color.Transparent);
-                        gr.DrawImage(bm, dest_rect, source_rect,
-                            GraphicsUnit.Pixel);
+                        gr.DrawImage(img, dest_rect, source_rect, GraphicsUnit.Pixel);
 
                         // Save the piece.
                         string filename = sheetArray[row, col] + ".png";
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 51147a96..a2f5962d 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -1694,7 +1694,7 @@ namespace PckStudio
             };
             if (sfd.ShowDialog() == DialogResult.OK)
             {
-				LCEToBedrock lb = new LCEToBedrock();
+				BedrockConverter lb = new BedrockConverter();
 				lb.ConvertSkinPack(currentPCK, sfd.FileName);
 			}
 		}
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index bf42f4b1..0d82cdf1 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -170,7 +170,7 @@
     <Compile Include="Classes\API\PCKCenter\PCKCollections.cs" />
     <Compile Include="Classes\API\PCKCenter\PCKCollectionsLocal.cs" />
     <Compile Include="Classes\API\PCKCenter\SaveLocalJSON.cs" />
-    <Compile Include="Classes\Convert\FromLCE\LCEToBedrock.cs" />
+    <Compile Include="Classes\Conversion\FromLCE\BedrockConverter.cs" />
     <Compile Include="Classes\Extentions\EnumerableExtentions.cs" />
     <Compile Include="Classes\FileTypes\CSMBFile.cs" />
     <Compile Include="Classes\FileTypes\PCKAudioFile.cs" />