From 4e9b9e50c444271c374c291ae50db459000d04a2 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Fri, 16 Jan 2026 15:35:33 +0100 Subject: [PATCH] Core - Add `ImportStatusReport.CreateEmpty()` --- PCK-Studio/Controls/JavaImportForm.cs | 9 ++++----- PckStudio.Core/IO/Java/ImportStatusReport.cs | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PCK-Studio/Controls/JavaImportForm.cs b/PCK-Studio/Controls/JavaImportForm.cs index 16e56f63..faf3fa55 100644 --- a/PCK-Studio/Controls/JavaImportForm.cs +++ b/PCK-Studio/Controls/JavaImportForm.cs @@ -31,7 +31,6 @@ namespace PckStudio.Controls importWorker.RunWorkerCompleted += ImportCompleted; _importer = new ResourcePackImporter(default); _dlcManager = dlcManager; - _importStatusReport = ImportStatusReport.CreateCustom(importWorker.ReportProgressInfo); StartImport(fileInfo); } @@ -43,7 +42,7 @@ namespace PckStudio.Controls var zip = new ZipArchive(fileInfo.OpenRead(), ZipArchiveMode.Read); string name = Path.GetFileNameWithoutExtension(fileInfo.Name); - if (_importer.StartImport(name, zip, _importStatusReport)) + if (_importer.StartImport(name, zip, ImportStatusReport.Debug)) { FormatPackDescription(Path.GetFileNameWithoutExtension(fileInfo.Name), _importer.ReadPackMeta(zip).Description); importWorker.RunWorkerAsync(zip); @@ -136,17 +135,17 @@ namespace PckStudio.Controls string value = new string(textSection.Value.Select(c => Convert.ToChar(c + rng.Next(26 - (char.ToLower(c) - 0x30)))).ToArray()); richTextBox1.AppendText(value); continue; - // bold + // bold §l case "§l": if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Bold)) fontStyle |= FontStyle.Bold; break; - // strikethrough + // strikethrough §m case "§m": if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Strikeout)) fontStyle |= FontStyle.Strikeout; break; - // underline + // underline §n case "§n": if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Underline)) fontStyle |= FontStyle.Underline; diff --git a/PckStudio.Core/IO/Java/ImportStatusReport.cs b/PckStudio.Core/IO/Java/ImportStatusReport.cs index be5a99db..b181bca8 100644 --- a/PckStudio.Core/IO/Java/ImportStatusReport.cs +++ b/PckStudio.Core/IO/Java/ImportStatusReport.cs @@ -48,6 +48,11 @@ namespace PckStudio.Core.IO.Java return new ImportStatusReport(listener); } + public static ImportStatusReport CreateEmpty() + { + return new ImportStatusReport(); + } + public void Post(string message) { foreach (TraceListener listener in _listeners)