fixing shit part 3 - the fixening

This commit is contained in:
Bitl 2022-09-12 15:05:23 -07:00
parent 99585ff635
commit c4825952b1
9 changed files with 26 additions and 26 deletions

View File

@ -48,7 +48,7 @@ public static class TextLineRemover
} }
//FixedFileMove deletes the original file and moves the temp file in. //FixedFileMove deletes the original file and moves the temp file in.
GlobalFuncs.FixedFileMove(tempFilename, filename, true); Util.FixedFileMove(tempFilename, filename, true);
// Final calculations // Final calculations
DateTime endTime = DateTime.Now; DateTime endTime = DateTime.Now;

View File

@ -320,7 +320,7 @@ public class SecurityFuncs
#if URI || LAUNCHER || CMD || BASICLAUNCHER #if URI || LAUNCHER || CMD || BASICLAUNCHER
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
#else #else
catch (Exception) catch (Exception)
{ {

View File

@ -210,14 +210,14 @@ public static class SplashReader
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
try try
{ {
splash = splashes[0]; splash = splashes[0];
} }
catch (Exception ex2) catch (Exception ex2)
{ {
GlobalFuncs.LogExceptions(ex2); Util.LogExceptions(ex2);
if (splash.SplashText != missingsplash.SplashText) if (splash.SplashText != missingsplash.SplashText)
{ {
splash = missingsplash; splash = missingsplash;
@ -228,7 +228,7 @@ public static class SplashReader
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
if (splash.SplashText != missingsplash.SplashText) if (splash.SplashText != missingsplash.SplashText)
{ {
splash = missingsplash; splash = missingsplash;
@ -248,7 +248,7 @@ public static class SplashReader
if (GlobalVars.ProgramInformation.InitialBootup) if (GlobalVars.ProgramInformation.InitialBootup)
{ {
returnsplash = new Splash("Welcome to Novetus " + GlobalVars.ProgramInformation.Version + "!|Hi!"); returnsplash = new Splash("Welcome to Novetus " + GlobalVars.ProgramInformation.Version + "!|Hi!");
GlobalFuncs.TurnOffInitialSequence(); FileManagement.TurnOffInitialSequence();
return returnsplash; return returnsplash;
} }

View File

@ -111,7 +111,7 @@ public partial class ClientinfoEditor : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
label9.Text = "v1 (v1.1)"; label9.Text = "v1 (v1.1)";
ConvertedLine = SecurityFuncs.Base64DecodeOld(file); ConvertedLine = SecurityFuncs.Base64DecodeOld(file);
} }
@ -170,7 +170,7 @@ public partial class ClientinfoEditor : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
if (!label9.Text.Equals("v1 (v1.1)")) if (!label9.Text.Equals("v1 (v1.1)"))
{ {
label9.Text = "v2 Alpha (Last used in v1.2 Snapshot 7440)"; label9.Text = "v2 Alpha (Last used in v1.2 Snapshot 7440)";
@ -230,7 +230,7 @@ public partial class ClientinfoEditor : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
//Again, fake it. //Again, fake it.
SelectedClientInfo.ClientLoadOptions = Settings.ClientLoadOptions.Client_2008AndUp; SelectedClientInfo.ClientLoadOptions = Settings.ClientLoadOptions.Client_2008AndUp;
SelectedClientInfo.CommandLineArgs = cmdargsorclientoptions; SelectedClientInfo.CommandLineArgs = cmdargsorclientoptions;

View File

@ -49,7 +49,7 @@ using System.Windows.Forms;
if (ofd.FilterIndex == 1) if (ofd.FilterIndex == 1)
{ {
line = GlobalFuncs.CryptStringWithByte(line); line = Util.CryptStringWithByte(line);
label2.Text = "v2"; label2.Text = "v2";
} }
else else
@ -86,7 +86,7 @@ using System.Windows.Forms;
{ {
if (!string.IsNullOrWhiteSpace(s)) if (!string.IsNullOrWhiteSpace(s))
{ {
builder.AppendLine(GlobalFuncs.CryptStringWithByte(s)); builder.AppendLine(Util.CryptStringWithByte(s));
} }
label2.Text = "v2"; label2.Text = "v2";
} }

View File

@ -83,7 +83,7 @@ public partial class ItemCreationSDK : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
} }
if (!string.IsNullOrWhiteSpace(icon.getInstallOutcome())) if (!string.IsNullOrWhiteSpace(icon.getInstallOutcome()))
@ -98,7 +98,7 @@ public partial class ItemCreationSDK : Form
MessageBox.Show(icon.getInstallOutcome(), "Novetus Item Creation SDK - Icon Copy Completed", MessageBoxButtons.OK, boxicon); MessageBox.Show(icon.getInstallOutcome(), "Novetus Item Creation SDK - Icon Copy Completed", MessageBoxButtons.OK, boxicon);
} }
Image icon1 = GlobalFuncs.LoadImage(icon.ItemDir + "\\" + icon.ItemName.Replace(" ", "") + ".png", ""); Image icon1 = Util.LoadImage(icon.ItemDir + "\\" + icon.ItemName.Replace(" ", "") + ".png", "");
ItemIcon.Image = icon1; ItemIcon.Image = icon1;
if (type == RobloxFileType.TShirt || type == RobloxFileType.Face) if (type == RobloxFileType.TShirt || type == RobloxFileType.Face)
@ -162,7 +162,7 @@ public partial class ItemCreationSDK : Form
if (LaunchCharCustom == DialogResult.Yes) if (LaunchCharCustom == DialogResult.Yes)
{ {
GlobalFuncs.LaunchCharacterCustomization(); NovetusFuncs.LaunchCharacterCustomization();
} }
} }
} }
@ -306,7 +306,7 @@ public partial class ItemCreationSDK : Form
{ {
if (!string.IsNullOrWhiteSpace(assetpath)) if (!string.IsNullOrWhiteSpace(assetpath))
{ {
GlobalFuncs.FixedFileCopy(assetpath, outputPath + "\\" + assetfilename, true); Util.FixedFileCopy(assetpath, outputPath + "\\" + assetfilename, true);
} }
item3.Value = inGameDir + assetfilename; item3.Value = inGameDir + assetfilename;
} }
@ -1379,7 +1379,7 @@ public partial class ItemCreationSDK : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
MessageBox.Show("The Item Creation SDK has experienced an error: " + ex.Message, "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("The Item Creation SDK has experienced an error: " + ex.Message, "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
success = false; success = false;
} }
@ -1588,7 +1588,7 @@ public partial class ItemCreationSDK : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
MessageBox.Show("The Item Creation SDK has experienced an error: " + ex.Message, "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("The Item Creation SDK has experienced an error: " + ex.Message, "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
success = false; success = false;
} }
@ -1602,14 +1602,14 @@ public partial class ItemCreationSDK : Form
textbox.ReadOnly = !enable; textbox.ReadOnly = !enable;
textbox.Text = ""; textbox.Text = "";
button.Enabled = browseButton; button.Enabled = browseButton;
ItemIcon.Image = GlobalFuncs.LoadImage("", ""); ItemIcon.Image = Util.LoadImage("", "");
} }
private void ToggleGroup(GroupBox groupbox, string labelText, bool enable = true) private void ToggleGroup(GroupBox groupbox, string labelText, bool enable = true)
{ {
groupbox.Text = enable ? labelText : (string.IsNullOrWhiteSpace(labelText) ? "This option is disabled." : labelText); groupbox.Text = enable ? labelText : (string.IsNullOrWhiteSpace(labelText) ? "This option is disabled." : labelText);
groupbox.Enabled = enable; groupbox.Enabled = enable;
ItemIcon.Image = GlobalFuncs.LoadImage("", ""); ItemIcon.Image = Util.LoadImage("", "");
} }
private void ToggleHatMeshBox(string labelText, bool enable = true) private void ToggleHatMeshBox(string labelText, bool enable = true)
@ -1794,7 +1794,7 @@ public partial class ItemCreationSDK : Form
if (File.Exists(iconpath)) if (File.Exists(iconpath))
{ {
Image icon1 = GlobalFuncs.LoadImage(iconpath); Image icon1 = Util.LoadImage(iconpath);
ItemIcon.Image = icon1; ItemIcon.Image = icon1;
} }
else else
@ -1856,7 +1856,7 @@ public partial class ItemCreationSDK : Form
if (File.Exists(previconpath) && !File.Exists(rbxmpath)) if (File.Exists(previconpath) && !File.Exists(rbxmpath))
{ {
GlobalFuncs.FixedFileDelete(previconpath); Util.FixedFileDelete(previconpath);
} }
} }

View File

@ -42,9 +42,9 @@ public partial class ItemCreationSDKColorMenu : Form
private void ItemCreationSDKColorMenu_Load(object sender, EventArgs e) private void ItemCreationSDKColorMenu_Load(object sender, EventArgs e)
{ {
if (GlobalFuncs.HasColorsChanged()) if (FileManagement.HasColorsChanged())
{ {
GlobalVars.ColorsLoaded = GlobalFuncs.InitColors(); GlobalVars.ColorsLoaded = FileManagement.InitColors();
closeOnLaunch = !GlobalVars.ColorsLoaded; closeOnLaunch = !GlobalVars.ColorsLoaded;
} }

View File

@ -101,7 +101,7 @@ public partial class SplashTester : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
} }
} }
@ -151,7 +151,7 @@ public partial class SplashTester : Form
void splashLabelStylish_Paint(object sender, PaintEventArgs e) void splashLabelStylish_Paint(object sender, PaintEventArgs e)
{ {
GlobalFuncs.DrawBorderSimple(e.Graphics, splashLabelStylish.DisplayRectangle, Color.White, ButtonBorderStyle.Solid, 1); Util.DrawBorderSimple(e.Graphics, splashLabelStylish.DisplayRectangle, Color.White, ButtonBorderStyle.Solid, 1);
} }
private void variableToolStripMenuItem_Click(object sender, EventArgs e) private void variableToolStripMenuItem_Click(object sender, EventArgs e)

View File

@ -140,7 +140,7 @@ public partial class XMLContentEditor : Form
} }
catch (Exception ex) catch (Exception ex)
{ {
GlobalFuncs.LogExceptions(ex); Util.LogExceptions(ex);
} }
finally finally
{ {