LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-18 16:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

PckAudioFile - Rename member variable 'audioType' to 'AudioType'

Browse Source
This commit is contained in:
miku-666
2024-07-14 19:17:54 +02:00
parent 7be4ca67b2
commit 6af20ea0bf
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PCK-Studio/FileFormats/PckAudioFile.cs
View File

@@ -44,15 +44,15 @@ namespace PckStudio.FileFormats
}
public string Name { get; set; } = string.Empty;
public EAudioParameterType parameterType { get; }
public EAudioType audioType { get; }
public EAudioType AudioType { get; }
public List<string> SongNames { get; } = new List<string>();
public EAudioParameterType parameterType { get; }
public AudioCategory(string name, EAudioParameterType parameterType, EAudioType audioType)
{
this.Name = name;
this.parameterType = parameterType;
this.audioType = audioType;
this.AudioType = audioType;
}
}

12
PCK-Studio/Forms/Editor/AudioEditor.cs
View File

@@ -89,7 +89,7 @@ namespace PckStudio.Forms.Editor
foreach (string songname in category.SongNames.FindAll(s => s.Contains('\\')))
category.SongNames[category.SongNames.IndexOf(songname)] = songname.Replace('\\', '/');
if (category.audioType == PckAudioFile.AudioCategory.EAudioType.Creative)
if (category.AudioType == PckAudioFile.AudioCategory.EAudioType.Creative)
{
if (category.Name == "include_overworld" &&
_audioFile.TryGetCategory(PckAudioFile.AudioCategory.EAudioType.Overworld, out PckAudioFile.AudioCategory overworldCategory))
@@ -104,7 +104,7 @@ namespace PckStudio.Forms.Editor
playOverworldInCreative.Visible = true;
}
TreeNode treeNode = new TreeNode(GetCategoryFromId(category.audioType), (int)category.audioType, (int)category.audioType);
TreeNode treeNode = new TreeNode(GetCategoryFromId(category.AudioType), (int)category.AudioType, (int)category.AudioType);
treeNode.Tag = category;
treeView1.Nodes.Add(treeNode);
}
@@ -153,7 +153,7 @@ namespace PckStudio.Forms.Editor
playOverworldInCreative.Checked = false;
}
TreeNode treeNode = new TreeNode(GetCategoryFromId(category.audioType), (int)category.audioType, (int)category.audioType);
TreeNode treeNode = new TreeNode(GetCategoryFromId(category.AudioType), (int)category.AudioType, (int)category.AudioType);
treeNode.Tag = category;
treeView1.Nodes.Add(treeNode);
@@ -386,7 +386,7 @@ namespace PckStudio.Forms.Editor
}
category.Name = "";
if (playOverworldInCreative.Checked && category.audioType == PckAudioFile.AudioCategory.EAudioType.Creative)
if (playOverworldInCreative.Checked && category.AudioType == PckAudioFile.AudioCategory.EAudioType.Creative)
{
foreach (var name in overworldCategory.SongNames)
{
@@ -576,9 +576,9 @@ namespace PckStudio.Forms.Editor
add.ButtonText = "Save";
if (add.ShowDialog(this) != DialogResult.OK) return;
_audioFile.RemoveCategory(category.audioType);
_audioFile.RemoveCategory(category.AudioType);
_audioFile.AddCategory(category.parameterType, GetCategoryId(add.SelectedItem), category.audioType == PckAudioFile.AudioCategory.EAudioType.Overworld && playOverworldInCreative.Checked ? "include_overworld" : "");
_audioFile.AddCategory(category.parameterType, GetCategoryId(add.SelectedItem), category.AudioType == PckAudioFile.AudioCategory.EAudioType.Overworld && playOverworldInCreative.Checked ? "include_overworld" : "");
var newCategory = _audioFile.GetCategory(GetCategoryId(add.SelectedItem));

2
PCK-Studio/Internal/IO/PckAudio/PckAudioFileWriter.cs
View File

@@ -71,7 +71,7 @@ namespace PckStudio.Internal.IO.PckAudio
foreach (var category in _file.Categories)
{
writer.Write((int)category.parameterType);
writer.Write((int)category.audioType);
writer.Write((int)category.AudioType);
WriteString(writer, category.Name);
}
}