From 386feb46946aeed631d544873df492ec2f1f6151 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Fri, 16 Jan 2026 15:30:38 +0100
Subject: [PATCH] Core - Refactor stuff

---
 .../Forms/Additional-Popups/Animation/ChangeTile.cs       | 5 ++++-
 PCK-Studio/Forms/Additional-Popups/FilterPrompt.cs        | 8 ++++++++
 PCK-Studio/Forms/Editor/AnimationEditor.cs                | 3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
index 1b1838d6..6bd050ee 100644
--- a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
+++ b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
@@ -63,7 +63,9 @@ namespace PckStudio.Forms.Additional_Popups.Animation
 			};
             TreeView view = filterPrompt.AddFilterPage(name, null, filterPredicate);
 			view.ImageList = images.ToImageList();
-			foreach ((int i, JsonTileInfo tileData) in textureInfos?.Enumerate())
+
+			int i = 0;
+            foreach (JsonTileInfo tileData in textureInfos)
 			{
 				if (string.IsNullOrEmpty(tileData.InternalName) || view.Nodes.ContainsKey(tileData.InternalName))
 					continue;
@@ -73,6 +75,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation
 					Tag = tileData
 				};
                 view.Nodes.Add(tileNode);
+				i++;
 			}
         }
 
diff --git a/PCK-Studio/Forms/Additional-Popups/FilterPrompt.cs b/PCK-Studio/Forms/Additional-Popups/FilterPrompt.cs
index 37428cd9..9f86bbe5 100644
--- a/PCK-Studio/Forms/Additional-Popups/FilterPrompt.cs
+++ b/PCK-Studio/Forms/Additional-Popups/FilterPrompt.cs
@@ -91,6 +91,14 @@ namespace PckStudio.Forms.Additional_Popups.Animation
 				_selectedItem = e.Node.Tag;
 				Events[nameof(OnSelectedItemChanged)]?.DynamicInvoke(this, EventArgs.Empty);
             };
+			pageView.KeyPress += (s, e) =>
+			{
+				if ((e.KeyChar == '\n' || e.KeyChar == '\r') && Parent is Form f)
+				{
+					f.DialogResult = DialogResult.OK;
+					e.Handled = true;
+				}
+			};
 			var backingView = new TreeView()
             {
                 Dock = DockStyle.Fill,
diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs
index ba281ae3..c0075c5e 100644
--- a/PCK-Studio/Forms/Editor/AnimationEditor.cs
+++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs
@@ -35,6 +35,7 @@ using PckStudio.Core.Serializer;
 using PckStudio.Core;
 using PckStudio.Interfaces;
 using PckStudio.Controls;
+using PckStudio.Core.IO.Java;
 
 namespace PckStudio.Forms.Editor
 {
@@ -328,7 +329,7 @@ namespace PckStudio.Forms.Editor
             try
 			{
                 Image img = Image.FromFile(textureFile).ReleaseFromFile();
-				JObject mcmeta = JObject.Parse(File.ReadAllText(fileDialog.FileName));
+				McMeta mcmeta = McMeta.LoadMcMeta(File.ReadAllText(fileDialog.FileName));
                 Animation javaAnimation = AnimationDeserializer.DefaultDeserializer.DeserializeJavaAnimation(mcmeta, img);
                 EditorValue = javaAnimation;
 				LoadAnimationTreeView();