LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-31 05:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update JavaTextFormatForm.cs

Browse Source
This commit is contained in:
miku-666
2025-12-20 02:17:54 +01:00
parent 10737a450b
commit 9fee72d05c
2 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
PCK-Studio/Controls/JavaTextFormatForm.Designer.cs generated
View File

@@ -31,7 +31,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(JavaTextFormatForm));
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.importWorker = new System.ComponentModel.BackgroundWorker();
this.cancelButton = new System.Windows.Forms.Button();
this.importButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// richTextBox1
@@ -53,24 +53,24 @@
this.importWorker.WorkerReportsProgress = true;
this.importWorker.WorkerSupportsCancellation = true;
//
// cancelButton
// importButton
//
this.cancelButton.Dock = System.Windows.Forms.DockStyle.Bottom;
this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
this.cancelButton.Location = new System.Drawing.Point(0, 411);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(754, 23);
this.cancelButton.TabIndex = 1;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseVisualStyleBackColor = true;
this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
this.importButton.Dock = System.Windows.Forms.DockStyle.Bottom;
this.importButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
this.importButton.Location = new System.Drawing.Point(0, 411);
this.importButton.Name = "importButton";
this.importButton.Size = new System.Drawing.Size(754, 23);
this.importButton.TabIndex = 1;
this.importButton.Text = "Cancel";
this.importButton.UseVisualStyleBackColor = true;
this.importButton.Click += new System.EventHandler(this.Cancel_Click);
//
// JavaTextFormatForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(754, 434);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.importButton);
this.Controls.Add(this.richTextBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "JavaTextFormatForm";
@@ -83,6 +83,6 @@
private System.Windows.Forms.RichTextBox richTextBox1;
private System.ComponentModel.BackgroundWorker importWorker;
private System.Windows.Forms.Button cancelButton;
private System.Windows.Forms.Button importButton;
}
}

98
PCK-Studio/Controls/JavaTextFormatForm.cs
View File

@@ -51,12 +51,20 @@ namespace PckStudio.Controls
public JavaTextFormatForm(FileInfo fileInfo)
{
InitializeComponent();
var zip = new ZipArchive(fileInfo.OpenRead(), ZipArchiveMode.Read);
ResourcePackImporter importer = new ResourcePackImporter(zip, default);
FormatPackDescription(fileInfo.Name, importer.ReadPackMeta(zip).Description);
importWorker.DoWork += Import;
importWorker.ProgressChanged += ImportProgressChanged;
importWorker.RunWorkerCompleted += ImportCompleted;
StartImport(fileInfo);
}
private void StartImport(FileInfo fileInfo)
{
importButton.Click -= Import_Click;
importButton.Click += Cancel_Click;
importButton.Text = "Cancel";
var zip = new ZipArchive(fileInfo.OpenRead(), ZipArchiveMode.Read);
ResourcePackImporter importer = new ResourcePackImporter(zip, default);
FormatPackDescription(Path.GetFileNameWithoutExtension(fileInfo.Name), importer.ReadPackMeta(zip).Description);
importWorker.RunWorkerAsync(importer);
}
@@ -70,7 +78,11 @@ namespace PckStudio.Controls
private void Import(object sender, DoWorkEventArgs eventArgs)
{
if (sender is not BackgroundWorker worker)
throw new Exception();
{
Debug.WriteLine("Sender was not a background worker.");
eventArgs.Cancel = true;
return;
}
if (eventArgs.Argument is not ResourcePackImporter importer)
{
worker.ReportProgressError("Invalid argument passed to background worker.");
@@ -81,8 +93,8 @@ namespace PckStudio.Controls
while(!(eventArgs.Cancel = worker.CancellationPending))
{
AtlasResource.AtlasType atlasType = AtlasResource.AtlasType.BlockAtlas;
ImportResult<Atlas, ResourcePackImporter.ImportStats> res = importer.ImportAtlas(ResourceLocations.GetFromCategory(AtlasResource.GetId(atlasType)) as AtlasResource);
AtlasResource.AtlasType atlasType = AtlasResource.AtlasType.ParticleAtlas;
ImportResult<(Atlas atlas, IDictionary<string, Animation> animations), ResourcePackImporter.ImportStats> res = importer.ImportAtlas(ResourceLocations.GetFromCategory(AtlasResource.GetId(atlasType)) as AtlasResource, true);
worker.ReportProgressDebug("Import Stats");
worker.ReportProgressDebug($"Textures: {res.Stats.Textures}/{res.Stats.MaxTextures}({res.Stats.MissingTextures} missing)");
worker.ReportProgressDebug($"Animations: {res.Stats.Animations}");
@@ -98,21 +110,24 @@ namespace PckStudio.Controls
private void ImportCompleted(object sender, RunWorkerCompletedEventArgs e)
{
importButton.Click -= Cancel_Click;
importButton.Click += Import_Click;
importButton.Text = "Import";
if (e.Cancelled)
{
MessageBox.Show("Import cancelled", $"Import cancelled.");
return;
}
MessageBox.Show("Import successful", $"");
(Atlas atlas, IDictionary<string, Animation> animations) res = ((Atlas atlas, IDictionary<string, Animation> animations))e.Result;
var f = new Form();
f.Size = new Size(600, 600);
var picBox = new InterpolationPictureBox();
picBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
picBox.SizeMode = PictureBoxSizeMode.Zoom;
picBox.Dock = DockStyle.Fill;
picBox.Image = e.Result as Atlas;
picBox.Image = res.atlas;
f.Controls.Add(picBox);
cancelButton.Enabled = false;
f.ShowDialog();
}
@@ -120,17 +135,33 @@ namespace PckStudio.Controls
{
richTextBox1.SelectionAlignment = HorizontalAlignment.Center;
richTextBox1.AppendLine("Name: ");
richTextBox1.AppendLine(title);
if (!FormatJavaFormatString(title))
{
richTextBox1.SelectionAlignment = HorizontalAlignment.Left;
return;
}
richTextBox1.AppendLine("Description: ");
if (!FormatJavaFormatString(text))
{
richTextBox1.SelectionAlignment = HorizontalAlignment.Left;
return;
}
richTextBox1.AppendLine("");
richTextBox1.SelectionAlignment = HorizontalAlignment.Left;
}
private bool FormatJavaFormatString(string text)
{
if (!text.Contains("§"))
{
richTextBox1.AppendLine(text);
richTextBox1.SelectionAlignment = HorizontalAlignment.Left;
return;
richTextBox1.AppendLine("");
return false;
}
foreach (KeyValuePair<string, string> textSection in text.Split(['§'], StringSplitOptions.RemoveEmptyEntries).Select(s => new KeyValuePair<string, string>("§" + char.ToLower(s[0]), string.IsNullOrWhiteSpace(s) ? string.Empty : s.Substring(1))))
{
FontStyle fontStyle = FontStyle.Regular;
switch (textSection.Key)
{
// obfuscated/MTS*
@@ -138,26 +169,26 @@ namespace PckStudio.Controls
var rng = new Random();
string value = new string(textSection.Value.Select(c => Convert.ToChar(c + rng.Next(26 - (char.ToLower(c) - 0x30)))).ToArray());
richTextBox1.AppendText(value);
break;
continue;
// bold
case "§l":
if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Bold))
richTextBox1.SelectionFont = new Font(richTextBox1.SelectionFont, FontStyle.Bold);
fontStyle |= FontStyle.Bold;
break;
// strikethrough
case "§m":
if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Strikeout))
richTextBox1.SelectionFont = new Font(richTextBox1.SelectionFont, FontStyle.Strikeout);
fontStyle |= FontStyle.Strikeout;
break;
// underline
case "§n":
if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Underline))
richTextBox1.SelectionFont = new Font(richTextBox1.SelectionFont, FontStyle.Underline);
fontStyle |= FontStyle.Underline;
break;
// italic
case "§o":
if (richTextBox1.Font.FontFamily.IsStyleAvailable(FontStyle.Italic))
richTextBox1.SelectionFont = new Font(richTextBox1.SelectionFont, FontStyle.Italic);
fontStyle |= FontStyle.Italic;
break;
// reset
case "§r":
@@ -165,18 +196,19 @@ namespace PckStudio.Controls
richTextBox1.SelectionFont = richTextBox1.Font;
break;
default:
if (_javaColorCodeToColor.TryGetValue(textSection.Key, out RichTextBoxColor textColor))
{
richTextBox1.AppendText(textSection.Value, textColor);
break;
}
richTextBox1.AppendText(textSection.Key);
richTextBox1.AppendText(textSection.Value);
break;
}
richTextBox1.SelectionFont = new Font(richTextBox1.Font, fontStyle);
if (_javaColorCodeToColor.TryGetValue(textSection.Key, out RichTextBoxColor textColor))
{
richTextBox1.AppendText(textSection.Value, textColor);
break;
}
richTextBox1.AppendText(textSection.Key);
richTextBox1.AppendText(textSection.Value);
}
richTextBox1.AppendLine("");
richTextBox1.SelectionAlignment = HorizontalAlignment.Left;
return true;
}
protected override void OnFormClosing(FormClosingEventArgs e)
@@ -189,12 +221,26 @@ namespace PckStudio.Controls
base.OnFormClosing(e);
}
private void cancelButton_Click(object sender, EventArgs e)
private void Import_Click(object sender, EventArgs e)
{
richTextBox1.Clear();
OpenFileDialog fileDialog = new OpenFileDialog()
{
Filter = "Minecraft texturepack|*.zip"
};
if (fileDialog.ShowDialog() != DialogResult.OK)
return;
StartImport(new FileInfo(fileDialog.FileName));
}
private void Cancel_Click(object sender, EventArgs e)
{
if (importWorker.IsBusy)
{
importWorker.CancelAsync();
cancelButton.Enabled = false;
importButton.Click -= Cancel_Click;
importButton.Click += Import_Click;
importButton.Text = "Import";
}
}
}