From 3d497fcd80e8aaf23744d67b2b69a06e1b827240 Mon Sep 17 00:00:00 2001 From: Bitl Date: Wed, 22 Dec 2021 11:40:31 -0700 Subject: [PATCH] small tool fixes --- Novetus/NovetusCore/Classes/RobloxXML.cs | 3 + Novetus/NovetusCore/NovetusCore.projitems | 2 +- .../Forms/SDK/AssetSDK.Designer.cs | 47 ++++---- Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs | 105 +++++++++++++++--- .../Forms/SDK/ItemCreationSDK.Designer.cs | 36 +++++- .../Forms/SDK/ItemCreationSDK.cs | 56 ++++++++++ .../Forms/SDK/NovetusSDK.Designer.cs | 2 +- .../NovetusLauncher/Forms/SDK/NovetusSDK.resx | 2 +- 8 files changed, 212 insertions(+), 41 deletions(-) diff --git a/Novetus/NovetusCore/Classes/RobloxXML.cs b/Novetus/NovetusCore/Classes/RobloxXML.cs index 0097665..bec3731 100644 --- a/Novetus/NovetusCore/Classes/RobloxXML.cs +++ b/Novetus/NovetusCore/Classes/RobloxXML.cs @@ -214,6 +214,7 @@ public static class RobloxXML string newurl = "assetdelivery.roblox.com/v1/asset/?id="; string urlFixed = url.Replace("http://", "https://") .Replace("?version=1&id=", "?id=") + .Replace("?version=1&id=", "?id=") .Replace("www.roblox.com/asset/?id=", newurl) .Replace("www.roblox.com/asset?id=", newurl) .Replace("assetgame.roblox.com/asset/?id=", newurl) @@ -306,6 +307,7 @@ public static class RobloxXML string urlFixed = oldurl.Replace("http://", "") .Replace("https://", "") .Replace("?version=1&id=", "?id=") + .Replace("?version=1&id=", "?id=") .Replace("www.roblox.com/asset/?id=", url) .Replace("www.roblox.com/asset?id=", url) .Replace("assetgame.roblox.com/asset/?id=", url) @@ -366,6 +368,7 @@ public static class RobloxXML string urlFixed = oldurl.Replace("http://", "") .Replace("https://", "") .Replace("?version=1&id=", "?id=") + .Replace("?version=1&id=", "?id=") .Replace("www.roblox.com/asset/?id=", url) .Replace("www.roblox.com/asset?id=", url) .Replace("assetgame.roblox.com/asset/?id=", url) diff --git a/Novetus/NovetusCore/NovetusCore.projitems b/Novetus/NovetusCore/NovetusCore.projitems index 4deaccd..832a81d 100644 --- a/Novetus/NovetusCore/NovetusCore.projitems +++ b/Novetus/NovetusCore/NovetusCore.projitems @@ -18,7 +18,7 @@ - + diff --git a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.Designer.cs b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.Designer.cs index f7d634b..e427414 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.Designer.cs @@ -34,17 +34,18 @@ this.AssetDownloaderBatch_BatchIDBox = new System.Windows.Forms.TextBox(); this.AssetDownloader_AssetNameBox = new System.Windows.Forms.TextBox(); this.AssetDownloader_AssetNameText = new System.Windows.Forms.Label(); - this.AssetDownloader_LoadHelpMessage = new System.Windows.Forms.CheckBox(); this.AssetDownloader_AssetVersionText = new System.Windows.Forms.Label(); this.AssetDownloader_AssetIDText = new System.Windows.Forms.Label(); this.AssetDownloader_AssetVersionSelector = new System.Windows.Forms.NumericUpDown(); this.AssetDownloader_AssetIDBox = new System.Windows.Forms.TextBox(); this.AssetDownloader_AssetDownloaderButton = new System.Windows.Forms.Button(); + this.AssetDownloader_LoadHelpMessage = new System.Windows.Forms.CheckBox(); this.CustomDLURLLabel = new System.Windows.Forms.Label(); this.URLOverrideBox = new System.Windows.Forms.TextBox(); this.URLListLabel = new System.Windows.Forms.Label(); this.URLSelection = new System.Windows.Forms.ComboBox(); this.AssetLocalization = new System.Windows.Forms.GroupBox(); + this.AssetLocalization_ShowItemTypes = new System.Windows.Forms.CheckBox(); this.AssetLocalization_AssetLinks = new System.Windows.Forms.CheckBox(); this.AssetLocalization_LocalizePermanentlyBox = new System.Windows.Forms.CheckBox(); this.AssetLocalization_SaveBackups = new System.Windows.Forms.CheckBox(); @@ -151,16 +152,6 @@ this.AssetDownloader_AssetNameText.TabIndex = 20; this.AssetDownloader_AssetNameText.Text = "Name"; // - // AssetDownloader_LoadHelpMessage - // - this.AssetDownloader_LoadHelpMessage.Location = new System.Drawing.Point(204, 38); - this.AssetDownloader_LoadHelpMessage.Name = "AssetDownloader_LoadHelpMessage"; - this.AssetDownloader_LoadHelpMessage.Size = new System.Drawing.Size(145, 24); - this.AssetDownloader_LoadHelpMessage.TabIndex = 19; - this.AssetDownloader_LoadHelpMessage.Text = "Disable Help Messages"; - this.AssetDownloader_LoadHelpMessage.UseVisualStyleBackColor = true; - this.AssetDownloader_LoadHelpMessage.CheckedChanged += new System.EventHandler(this.AssetDownloader_LoadHelpMessage_CheckedChanged); - // // AssetDownloader_AssetVersionText // this.AssetDownloader_AssetVersionText.Location = new System.Drawing.Point(194, 14); @@ -207,6 +198,16 @@ this.AssetDownloader_AssetDownloaderButton.UseVisualStyleBackColor = true; this.AssetDownloader_AssetDownloaderButton.Click += new System.EventHandler(this.AssetDownloader_AssetDownloaderButton_Click); // + // AssetDownloader_LoadHelpMessage + // + this.AssetDownloader_LoadHelpMessage.Location = new System.Drawing.Point(204, 38); + this.AssetDownloader_LoadHelpMessage.Name = "AssetDownloader_LoadHelpMessage"; + this.AssetDownloader_LoadHelpMessage.Size = new System.Drawing.Size(145, 24); + this.AssetDownloader_LoadHelpMessage.TabIndex = 19; + this.AssetDownloader_LoadHelpMessage.Text = "Disable Help Messages"; + this.AssetDownloader_LoadHelpMessage.UseVisualStyleBackColor = true; + this.AssetDownloader_LoadHelpMessage.CheckedChanged += new System.EventHandler(this.AssetDownloader_LoadHelpMessage_CheckedChanged); + // // CustomDLURLLabel // this.CustomDLURLLabel.AutoSize = true; @@ -247,6 +248,7 @@ // // AssetLocalization // + this.AssetLocalization.Controls.Add(this.AssetLocalization_ShowItemTypes); this.AssetLocalization.Controls.Add(this.AssetLocalization_AssetLinks); this.AssetLocalization.Controls.Add(this.AssetLocalization_LocalizePermanentlyBox); this.AssetLocalization.Controls.Add(this.AssetLocalization_SaveBackups); @@ -266,6 +268,16 @@ this.AssetLocalization.TabStop = false; this.AssetLocalization.Text = "Asset Fixer"; // + // AssetLocalization_ShowItemTypes + // + this.AssetLocalization_ShowItemTypes.Location = new System.Drawing.Point(177, 8); + this.AssetLocalization_ShowItemTypes.Name = "AssetLocalization_ShowItemTypes"; + this.AssetLocalization_ShowItemTypes.Size = new System.Drawing.Size(84, 33); + this.AssetLocalization_ShowItemTypes.TabIndex = 23; + this.AssetLocalization_ShowItemTypes.Text = "Show Item\r\nTypes"; + this.AssetLocalization_ShowItemTypes.UseVisualStyleBackColor = true; + this.AssetLocalization_ShowItemTypes.CheckedChanged += new System.EventHandler(this.AssetLocalization_ShowItemTypes_CheckedChanged); + // // AssetLocalization_AssetLinks // this.AssetLocalization_AssetLinks.AutoSize = true; @@ -342,9 +354,9 @@ this.AssetLocalization_ItemNameText.AutoSize = true; this.AssetLocalization_ItemNameText.Location = new System.Drawing.Point(6, 45); this.AssetLocalization_ItemNameText.Name = "AssetLocalization_ItemNameText"; - this.AssetLocalization_ItemNameText.Size = new System.Drawing.Size(125, 13); + this.AssetLocalization_ItemNameText.Size = new System.Drawing.Size(115, 13); this.AssetLocalization_ItemNameText.TabIndex = 15; - this.AssetLocalization_ItemNameText.Text = "Asset Name (Items Only):"; + this.AssetLocalization_ItemNameText.Text = "Asset Name (Optional):"; // // AssetLocalization_ItemNameBox // @@ -370,16 +382,10 @@ this.AssetLocalization_AssetTypeBox.Items.AddRange(new object[] { "RBXL", "RBXM", - "Hat", - "Head", - "Face", - "T-Shirt", - "Shirt", - "Pants", "Lua Script"}); this.AssetLocalization_AssetTypeBox.Location = new System.Drawing.Point(75, 15); this.AssetLocalization_AssetTypeBox.Name = "AssetLocalization_AssetTypeBox"; - this.AssetLocalization_AssetTypeBox.Size = new System.Drawing.Size(185, 21); + this.AssetLocalization_AssetTypeBox.Size = new System.Drawing.Size(98, 21); this.AssetLocalization_AssetTypeBox.TabIndex = 12; this.AssetLocalization_AssetTypeBox.SelectedIndexChanged += new System.EventHandler(this.AssetLocalization_AssetTypeBox_SelectedIndexChanged); // @@ -539,4 +545,5 @@ private System.Windows.Forms.CheckBox AssetLocalization_LocalizePermanentlyBox; private System.Windows.Forms.ComboBox MeshConverter_MeshVersionSelector; private System.Windows.Forms.CheckBox AssetLocalization_AssetLinks; + private System.Windows.Forms.CheckBox AssetLocalization_ShowItemTypes; } \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs index c7f1a85..5c47f47 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs @@ -773,8 +773,8 @@ public partial class AssetSDK : Form } //meshes worker.ReportProgress(5); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts, 1, 1, 1, 1); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts, itemname); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts, 1, 1, 1, 1, itemname); //skybox worker.ReportProgress(10); RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Sky); @@ -785,10 +785,10 @@ public partial class AssetSDK : Form RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Sky, 5, 0, 0, 0); //decal worker.ReportProgress(15); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Decal); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Decal, itemname); //texture worker.ReportProgress(20); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Texture); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Texture, itemname); //tools and hopperbin worker.ReportProgress(25); RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Tool); @@ -801,11 +801,11 @@ public partial class AssetSDK : Form RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.ImageLabel); //clothing worker.ReportProgress(60); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Shirt); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Shirt, itemname); worker.ReportProgress(65); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.ShirtGraphic); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.ShirtGraphic, itemname); worker.ReportProgress(70); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Pants); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Pants, itemname); //scripts worker.ReportProgress(80); RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Script); @@ -833,8 +833,8 @@ public partial class AssetSDK : Form worker.ReportProgress(0); } //meshes - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts, 1, 1, 1, 1); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts, itemname); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Fonts, 1, 1, 1, 1, itemname); //skybox worker.ReportProgress(10); RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Sky); @@ -845,10 +845,10 @@ public partial class AssetSDK : Form RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Sky, 5, 0, 0, 0); //decal worker.ReportProgress(15); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Decal); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Decal, itemname); //texture worker.ReportProgress(20); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Texture); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Texture, itemname); //tools and hopperbin worker.ReportProgress(25); RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Tool); @@ -861,11 +861,11 @@ public partial class AssetSDK : Form RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.ImageLabel); //clothing worker.ReportProgress(60); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Shirt); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Shirt, itemname); worker.ReportProgress(65); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.ShirtGraphic); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.ShirtGraphic, itemname); worker.ReportProgress(70); - RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Pants); + RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Pants, itemname); //scripts worker.ReportProgress(80); RobloxXML.DownloadOrFixURLS(doc, useURLs, remoteurl, RobloxDefs.Script); @@ -1092,7 +1092,54 @@ public partial class AssetSDK : Form private void AssetLocalization_AssetTypeBox_SelectedIndexChanged(object sender, EventArgs e) { - currentType = (RobloxFileType)AssetLocalization_AssetTypeBox.SelectedIndex; + if (AssetLocalization_ShowItemTypes.Checked) + { + switch (AssetLocalization_AssetTypeBox.SelectedIndex) + { + case 1: + currentType = RobloxFileType.RBXM; + break; + case 2: + currentType = RobloxFileType.Hat; + break; + case 3: + currentType = RobloxFileType.Head; + break; + case 4: + currentType = RobloxFileType.Face; + break; + case 5: + currentType = RobloxFileType.TShirt; + break; + case 6: + currentType = RobloxFileType.Shirt; + break; + case 7: + currentType = RobloxFileType.Pants; + break; + case 8: + currentType = RobloxFileType.Script; + break; + default: + currentType = RobloxFileType.RBXL; + break; + } + } + else + { + switch (AssetLocalization_AssetTypeBox.SelectedIndex) + { + case 1: + currentType = RobloxFileType.RBXM; + break; + case 2: + currentType = RobloxFileType.Script; + break; + default: + currentType = RobloxFileType.RBXL; + break; + } + } } private void AssetLocalization_ItemNameBox_TextChanged(object sender, EventArgs e) @@ -1214,6 +1261,34 @@ public partial class AssetSDK : Form SetAssetCachePaths(); } } + + private void AssetLocalization_ShowItemTypes_CheckedChanged(object sender, EventArgs e) + { + AssetLocalization_AssetTypeBox.Items.Clear(); + + if (AssetLocalization_ShowItemTypes.Checked) + { + AssetLocalization_AssetTypeBox.Items.AddRange(new object[] { + "RBXL", + "RBXM", + "Hat", + "Head", + "Face", + "T-Shirt", + "Shirt", + "Pants", + "Lua Script"}); + } + else + { + AssetLocalization_AssetTypeBox.Items.AddRange(new object[] { + "RBXL", + "RBXM", + "Lua Script"}); + } + + AssetLocalization_AssetTypeBox.SelectedItem = "RBXL"; + } #endregion #region Mesh Converter diff --git a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.Designer.cs b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.Designer.cs index 50b12e0..5c5bead 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.Designer.cs @@ -121,6 +121,8 @@ partial class ItemCreationSDK this.ItemNameBox = new System.Windows.Forms.TextBox(); this.Warning = new System.Windows.Forms.Label(); this.SettingsButton = new System.Windows.Forms.Button(); + this.UsesHatMeshBoxRefresh = new System.Windows.Forms.Button(); + this.UsesHatTexBoxRefresh = new System.Windows.Forms.Button(); this.ItemSettingsGroup.SuspendLayout(); this.OtherGroup.SuspendLayout(); this.CoordGroup3.SuspendLayout(); @@ -209,6 +211,8 @@ partial class ItemCreationSDK // // ItemSettingsGroup // + this.ItemSettingsGroup.Controls.Add(this.UsesHatTexBoxRefresh); + this.ItemSettingsGroup.Controls.Add(this.UsesHatMeshBoxRefresh); this.ItemSettingsGroup.Controls.Add(this.OtherGroup); this.ItemSettingsGroup.Controls.Add(this.CoordGroup3); this.ItemSettingsGroup.Controls.Add(this.UsesHatTexLabel); @@ -415,7 +419,7 @@ partial class ItemCreationSDK this.UsesHatTexBox.FormattingEnabled = true; this.UsesHatTexBox.Location = new System.Drawing.Point(284, 80); this.UsesHatTexBox.Name = "UsesHatTexBox"; - this.UsesHatTexBox.Size = new System.Drawing.Size(264, 21); + this.UsesHatTexBox.Size = new System.Drawing.Size(202, 21); this.UsesHatTexBox.TabIndex = 20; this.UsesHatTexBox.SelectedIndexChanged += new System.EventHandler(this.UsesHatTexBox_SelectedIndexChanged); // @@ -562,7 +566,7 @@ partial class ItemCreationSDK this.UsesHatMeshBox.FormattingEnabled = true; this.UsesHatMeshBox.Location = new System.Drawing.Point(7, 80); this.UsesHatMeshBox.Name = "UsesHatMeshBox"; - this.UsesHatMeshBox.Size = new System.Drawing.Size(264, 21); + this.UsesHatMeshBox.Size = new System.Drawing.Size(202, 21); this.UsesHatMeshBox.TabIndex = 17; this.UsesHatMeshBox.SelectedIndexChanged += new System.EventHandler(this.UsesHatMeshBox_SelectedIndexChanged); // @@ -1524,6 +1528,30 @@ partial class ItemCreationSDK this.SettingsButton.UseVisualStyleBackColor = true; this.SettingsButton.Click += new System.EventHandler(this.SettingsButton_Click); // + // UsesHatMeshBoxRefresh + // + this.UsesHatMeshBoxRefresh.Enabled = false; + this.UsesHatMeshBoxRefresh.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.UsesHatMeshBoxRefresh.Location = new System.Drawing.Point(215, 82); + this.UsesHatMeshBoxRefresh.Name = "UsesHatMeshBoxRefresh"; + this.UsesHatMeshBoxRefresh.Size = new System.Drawing.Size(56, 20); + this.UsesHatMeshBoxRefresh.TabIndex = 23; + this.UsesHatMeshBoxRefresh.Text = "Refresh"; + this.UsesHatMeshBoxRefresh.UseVisualStyleBackColor = true; + this.UsesHatMeshBoxRefresh.Click += new System.EventHandler(this.UsesHatMeshBoxRefresh_Click); + // + // UsesHatTexBoxRefresh + // + this.UsesHatTexBoxRefresh.Enabled = false; + this.UsesHatTexBoxRefresh.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.UsesHatTexBoxRefresh.Location = new System.Drawing.Point(492, 81); + this.UsesHatTexBoxRefresh.Name = "UsesHatTexBoxRefresh"; + this.UsesHatTexBoxRefresh.Size = new System.Drawing.Size(56, 20); + this.UsesHatTexBoxRefresh.TabIndex = 24; + this.UsesHatTexBoxRefresh.Text = "Refresh"; + this.UsesHatTexBoxRefresh.UseVisualStyleBackColor = true; + this.UsesHatTexBoxRefresh.Click += new System.EventHandler(this.UsesHatTexBoxRefresh_Click); + // // ItemCreationSDK // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1550,7 +1578,7 @@ partial class ItemCreationSDK this.MaximizeBox = false; this.Name = "ItemCreationSDK"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Novetus Item Creation SDK"; + this.Text = "Novetus Item SDK"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ItemCreationSDK_Close); this.Load += new System.EventHandler(this.ItemCreationSDK_Load); this.ItemSettingsGroup.ResumeLayout(false); @@ -1699,4 +1727,6 @@ partial class ItemCreationSDK private System.Windows.Forms.Button HatColorButton; public System.Windows.Forms.Label partColorLabel; private System.Windows.Forms.Label hatPartColorIDLabel; + private System.Windows.Forms.Button UsesHatTexBoxRefresh; + private System.Windows.Forms.Button UsesHatMeshBoxRefresh; } \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs index b9c90bb..db7d249 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs @@ -151,6 +151,13 @@ public partial class ItemCreationSDK : Form DescBox.Text )) { + string itemName = ItemNameBox.Text; + RobloxFileType itemType = type; + + Reset(true); + ItemTypeListBox.SelectedIndex = GetIntForType(itemType); + ItemNameBox.Text = itemName; + DialogResult LaunchCharCustom = MessageBox.Show("The creation of your item, " + ItemNameBox.Text + ", is successful! Would you like to test your item out in Character Customization?", "Novetus Item Creation SDK - Item Creation Success", MessageBoxButtons.YesNo, MessageBoxIcon.Information); if (LaunchCharCustom == DialogResult.Yes) @@ -244,6 +251,30 @@ public partial class ItemCreationSDK : Form ItemCreationSDKColorMenu menu = new ItemCreationSDKColorMenu(this); menu.Show(); } + + private void UsesHatMeshBoxRefresh_Click(object sender, EventArgs e) + { + switch (type) + { + case RobloxFileType.Hat: + ToggleHatMeshBox("Uses Existing Hat Mesh"); + break; + default: + break; + } + } + + private void UsesHatTexBoxRefresh_Click(object sender, EventArgs e) + { + switch (type) + { + case RobloxFileType.Hat: + ToggleHatTextureBox("Uses Existing Hat Texture"); + break; + default: + break; + } + } #endregion #region Functions @@ -1255,6 +1286,29 @@ public partial class ItemCreationSDK : Form } } + public static int GetIntForType(RobloxFileType type) + { + switch (type) + { + case RobloxFileType.Hat: + return 0; + case RobloxFileType.Head: + return 1; + case RobloxFileType.HeadNoCustomMesh: + return 2; + case RobloxFileType.Face: + return 3; + case RobloxFileType.TShirt: + return 4; + case RobloxFileType.Shirt: + return 5; + case RobloxFileType.Pants: + return 6; + default: + return -1; + } + } + public bool CreateItem(string filepath, RobloxFileType type, string itemname, string[] assetfilenames, Vector3 coordoptions, Vector3 coordoptions2, Vector3 coordoptions3, Vector3[] rotationoptions, double transparency, double reflectiveness, object[] headoptions, string desctext = "") { string oldfile = File.ReadAllText(filepath); @@ -1562,6 +1616,7 @@ public partial class ItemCreationSDK : Form { UsesHatMeshLabel.Text = enable ? labelText : (string.IsNullOrWhiteSpace(labelText) ? "This option is disabled." : labelText); UsesHatMeshBox.Enabled = enable; + UsesHatMeshBoxRefresh.Enabled = enable; if (enable && Directory.Exists(GlobalPaths.hatdirFonts)) { @@ -1591,6 +1646,7 @@ public partial class ItemCreationSDK : Form { UsesHatTexLabel.Text = enable ? labelText : (string.IsNullOrWhiteSpace(labelText) ? "This option is disabled." : labelText); UsesHatTexBox.Enabled = enable; + UsesHatTexBoxRefresh.Enabled = enable; if (enable && Directory.Exists(GlobalPaths.hatdirTextures)) { diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs index 1dfba7d..81710f3 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs @@ -32,7 +32,7 @@ System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] { "Asset SDK"}, "AssetSDK.png", System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("Microsoft Sans Serif", 9.75F)); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] { - "Item Creation SDK"}, "ItemCreationSDK.png", System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("Microsoft Sans Serif", 9.75F)); + "Item SDK"}, "ItemCreationSDK.png", System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("Microsoft Sans Serif", 9.75F)); System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem(new string[] { "ClientScript Documentation"}, "ClientScriptTester.png", System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("Microsoft Sans Serif", 9.75F)); System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem(new string[] { diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx index d510d54..2532221 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - EwAAAk1TRnQBSQFMAgEBCgEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EwAAAk1TRnQBSQFMAgEBCgEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA