From d8af511f5d3d2b224b1c15d1822a4d19a0828ea7 Mon Sep 17 00:00:00 2001 From: Quacky Date: Thu, 10 Aug 2017 23:51:55 -0500 Subject: [PATCH] rename stuff --- .../CharacterCustomization.cs | 72 +++++++++---------- .../RBXLegacyLauncher/LoaderForm.cs | 4 +- .../RBXLegacyLauncher/MainForm.cs | 8 +-- .../RBXLegacyLauncher/SecurityFuncs.cs | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs index 6db4a20..fcbc64c 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs @@ -189,7 +189,7 @@ namespace RBXLegacyLauncher string partdir; if (SelectedPart == "Head") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\heads"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\heads"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -212,7 +212,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Torso") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\2"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\2"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -235,7 +235,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Right Arm") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\3"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\3"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -258,7 +258,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Left Arm") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\4"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\4"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -281,7 +281,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Right Leg") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\5"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\5"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -304,7 +304,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Left Leg") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\6"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\6"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -338,7 +338,7 @@ namespace RBXLegacyLauncher } else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage2"]) { - string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\faces"; + string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\faces"; if (Directory.Exists(facedir)) { DirectoryInfo dinfo = new DirectoryInfo(facedir); @@ -365,7 +365,7 @@ namespace RBXLegacyLauncher } else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage3"]) { - string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\hats"; + string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\hats"; if (Directory.Exists(hatdir)) { DirectoryInfo dinfo = new DirectoryInfo(hatdir); @@ -420,7 +420,7 @@ namespace RBXLegacyLauncher string partdir; if (SelectedPart == "Head") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\heads"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\heads"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -443,7 +443,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Torso") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\2"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\2"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -466,7 +466,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Right Arm") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\3"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\3"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -489,7 +489,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Left Arm") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\4"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\4"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -512,7 +512,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Right Leg") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\5"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\5"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -535,7 +535,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Left Leg") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\6"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\6"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1220,7 +1220,7 @@ namespace RBXLegacyLauncher PartSelectionLabel2.Text = SelectedPart; if (tabControl2.SelectedTab == tabControl2.TabPages["tabPage6"]) { - string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\heads"; + string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\heads"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1250,7 +1250,7 @@ namespace RBXLegacyLauncher if (tabControl2.SelectedTab == tabControl2.TabPages["tabPage6"]) { - string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\2"; + string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\2"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1280,7 +1280,7 @@ namespace RBXLegacyLauncher if (tabControl2.SelectedTab == tabControl2.TabPages["tabPage6"]) { - string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\3"; + string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\3"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1310,7 +1310,7 @@ namespace RBXLegacyLauncher if (tabControl2.SelectedTab == tabControl2.TabPages["tabPage6"]) { - string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\4"; + string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\4"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1340,7 +1340,7 @@ namespace RBXLegacyLauncher if (tabControl2.SelectedTab == tabControl2.TabPages["tabPage6"]) { - string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\5"; + string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\5"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1370,7 +1370,7 @@ namespace RBXLegacyLauncher if (tabControl2.SelectedTab == tabControl2.TabPages["tabPage6"]) { - string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\6"; + string partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\6"; if (Directory.Exists(partdir)) { listBox5.Items.Clear(); @@ -1397,7 +1397,7 @@ namespace RBXLegacyLauncher void ListBox1SelectedIndexChanged(object sender, EventArgs e) { - string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\hats"; + string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\hats"; if (Directory.Exists(hatdir)) { GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); @@ -1408,7 +1408,7 @@ namespace RBXLegacyLauncher void ListBox2SelectedIndexChanged(object sender, EventArgs e) { - string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\hats"; + string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\hats"; if (Directory.Exists(hatdir)) { GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); @@ -1419,7 +1419,7 @@ namespace RBXLegacyLauncher void ListBox3SelectedIndexChanged(object sender, EventArgs e) { - string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\hats"; + string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\hats"; if (Directory.Exists(hatdir)) { GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); @@ -1430,7 +1430,7 @@ namespace RBXLegacyLauncher void Button8Click(object sender, EventArgs e) { - string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\hats"; + string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\hats"; if (Directory.Exists(hatdir)) { Random random = new Random(); @@ -1454,7 +1454,7 @@ namespace RBXLegacyLauncher void Button2Click(object sender, EventArgs e) { - string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\hats"; + string hatdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\hats"; if (Directory.Exists(hatdir)) { listBox1.SelectedItem = "NoHat.rbxm"; @@ -1474,7 +1474,7 @@ namespace RBXLegacyLauncher void ListBox4SelectedIndexChanged(object sender, EventArgs e) { - string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\faces"; + string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\faces"; if (Directory.Exists(facedir)) { GlobalVars.FaceID = listBox4.SelectedItem.ToString(); @@ -1485,7 +1485,7 @@ namespace RBXLegacyLauncher void Button1Click(object sender, EventArgs e) { - string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\faces"; + string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\faces"; if (Directory.Exists(facedir)) { Random random = new Random(); @@ -1499,7 +1499,7 @@ namespace RBXLegacyLauncher void Button3Click(object sender, EventArgs e) { - string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\faces"; + string facedir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\faces"; if (Directory.Exists(facedir)) { listBox4.SelectedItem = "DefaultFace.rbxm"; @@ -1514,7 +1514,7 @@ namespace RBXLegacyLauncher string partdir; if (SelectedPart == "Head") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\heads"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\heads"; if (Directory.Exists(partdir)) { GlobalVars.HeadID = listBox5.SelectedItem.ToString(); @@ -1524,7 +1524,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Torso") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\2"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\2"; if (Directory.Exists(partdir)) { GlobalVars.TorsoID = listBox5.SelectedItem.ToString(); @@ -1534,7 +1534,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Right Arm") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\3"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\3"; if (Directory.Exists(partdir)) { GlobalVars.RightArmID = listBox5.SelectedItem.ToString(); @@ -1544,7 +1544,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Left Arm") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\4"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\4"; if (Directory.Exists(partdir)) { GlobalVars.LeftArmID = listBox5.SelectedItem.ToString(); @@ -1554,7 +1554,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Right Leg") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\5"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\5"; if (Directory.Exists(partdir)) { GlobalVars.RightLegID = listBox5.SelectedItem.ToString(); @@ -1564,7 +1564,7 @@ namespace RBXLegacyLauncher } else if (SelectedPart == "Left Leg") { - partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\bodies\\6"; + partdir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\avatar\\bodies\\6"; if (Directory.Exists(partdir)) { GlobalVars.LeftLegID = listBox5.SelectedItem.ToString(); @@ -1598,8 +1598,8 @@ namespace RBXLegacyLauncher void Start3DView() { - string mapfile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\3DView\\content\\fonts\\3DView.rbxl"; - string rbxexe = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\charcustom\\3DView\\3DView.exe"; + string mapfile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\thumbnails\\content\\fonts\\3DView.rbxl"; + string rbxexe = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\thumbnails\\3DView.exe"; string quote = "\""; string args = ""; string HatIDOffline1 = GlobalVars.Custom_Hat1ID_Offline; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs index 60124f1..87d5650 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs @@ -112,7 +112,7 @@ namespace RBXLegacyLauncher void ClientExited(object sender, EventArgs e) { - Process[] sudp = Process.GetProcessesByName("sudppipe"); + Process[] sudp = Process.GetProcessesByName("udpipe"); if (sudp != null) { foreach (var process in sudp) @@ -147,7 +147,7 @@ namespace RBXLegacyLauncher string client = SecurityFuncs.Base64Decode(SplitArg[2]); label1.Text = "Launching " + client + " Game..."; Process sudp = new Process(); - sudp.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\sudppipe.exe"; + sudp.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\udpipe.exe"; sudp.StartInfo.Arguments = "-p " + ip + " " + port + " " + port; sudp.StartInfo.UseShellExecute = false; sudp.StartInfo.CreateNoWindow = true; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index 9da5aad..28ca892 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -77,7 +77,7 @@ namespace RBXLegacyLauncher if (GlobalVars.HasRocky == true) { Process sudp = new Process(); - sudp.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\sudppipe.exe"; + sudp.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\udpipe.exe"; sudp.StartInfo.Arguments = "-p " + GlobalVars.IP + " " + GlobalVars.RobloxPort + " " + GlobalVars.RobloxPort; sudp.StartInfo.UseShellExecute = false; sudp.StartInfo.CreateNoWindow = true; @@ -180,7 +180,7 @@ namespace RBXLegacyLauncher GlobalVars.ScriptsDir = GlobalVars.ScriptsDir.Replace(@"\",@"\\"); GlobalVars.MapsDir = Path.Combine(Environment.CurrentDirectory, @"maps"); GlobalVars.MapsDir = GlobalVars.MapsDir.Replace(@"\",@"\\"); - GlobalVars.CustomPlayerDir = Path.Combine(Environment.CurrentDirectory, @"charcustom"); + GlobalVars.CustomPlayerDir = Path.Combine(Environment.CurrentDirectory, @"avatar"); GlobalVars.CustomPlayerDir = GlobalVars.CustomPlayerDir.Replace(@"\",@"\\"); label5.Text = Environment.CurrentDirectory; label8.Text = Application.ProductVersion; @@ -731,7 +731,7 @@ namespace RBXLegacyLauncher void ClientExited(object sender, EventArgs e) { - Process[] sudp = Process.GetProcessesByName("sudppipe"); + Process[] sudp = Process.GetProcessesByName("udpipe"); if (sudp != null) { foreach (var process in sudp) @@ -911,7 +911,7 @@ namespace RBXLegacyLauncher if (GlobalVars.HasRocky == true) { Process sudp = new Process(); - sudp.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\sudppipe.exe"; + sudp.StartInfo.FileName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\udp.exe"; sudp.StartInfo.Arguments = "-p " + GlobalVars.IP + " " + GlobalVars.RobloxPort + " " + GlobalVars.RobloxPort; sudp.StartInfo.UseShellExecute = false; sudp.StartInfo.CreateNoWindow = true; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/SecurityFuncs.cs b/RBXLegacyLauncher/RBXLegacyLauncher/SecurityFuncs.cs index 23ab90f..0e2fd71 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/SecurityFuncs.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/SecurityFuncs.cs @@ -75,7 +75,7 @@ namespace RBXLegacyLauncher public static bool checkScriptMD5() { - string rbxexe = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\scripts\\CSMPFunctions.lua"; + string rbxexe = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\CSMPFunctions.lua"; using (var md5 = MD5.Create()) { using (var stream = File.OpenRead(rbxexe))