From f01aeef7c768c1c8ce37fb34019e83219a168836 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 11:41:51 -0800 Subject: Update Infobox.cs --- ShiftOS_TheReturn/Infobox.cs | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ShiftOS_TheReturn/Infobox.cs b/ShiftOS_TheReturn/Infobox.cs index e45ac69..4e7a87b 100644 --- a/ShiftOS_TheReturn/Infobox.cs +++ b/ShiftOS_TheReturn/Infobox.cs @@ -36,25 +36,41 @@ namespace ShiftOS.Engine { public class Infobox { + // Set the infobox's interface to null private static IInfobox _infobox = null; - + + /// + /// Creates a new infobox + /// + /// Infobox title + /// Infobox message [Obsolete("Please use Infobox.Show instead.")] public Infobox(string title, string message) { Infobox.Show(title, message); } - + + /// + /// Shows an infobox + /// + /// Infobox title + /// Infobox message public static void Show(string title, string message) { _infobox.Open(title, message); } - + + /// + /// Inits an infobox + /// + /// Interface for infobox public static void Init(IInfobox info) { _infobox = info; } } - + + // Infobox Interface public interface IInfobox { void Open(string title, string msg); -- cgit v1.2.3 From 97cdc9a9050c6e48c01fb1d61df03abf37a1ebad Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 11:45:48 -0800 Subject: Update NotFound.txt --- ShiftOS.Server/Resources/NotFound.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ShiftOS.Server/Resources/NotFound.txt b/ShiftOS.Server/Resources/NotFound.txt index cd65829..8f998fc 100644 --- a/ShiftOS.Server/Resources/NotFound.txt +++ b/ShiftOS.Server/Resources/NotFound.txt @@ -1,9 +1,11 @@ - + +

This page wasn't found.

We couldn't find this page...

- \ No newline at end of file + -- cgit v1.2.3 From b33c78669dce7e3a547fcebc83c56fdfbb2e11d3 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 11:48:12 -0800 Subject: Update Home.txt --- ShiftOS.Server/Resources/Home.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ShiftOS.Server/Resources/Home.txt b/ShiftOS.Server/Resources/Home.txt index 41c8995..27fa97c 100644 --- a/ShiftOS.Server/Resources/Home.txt +++ b/ShiftOS.Server/Resources/Home.txt @@ -1,17 +1,16 @@ - + + ShiftOS Multi-User Domain • Admin Panel - - - - + + +
- {BODY} -

MUD server on {IP_ADDR}:{PORT}

- \ No newline at end of file + -- cgit v1.2.3 From ed3c7e675bc23251ed5b397b2ea0068d5395f429 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Jan 2017 13:58:42 -0600 Subject: Create some nice ass ;) --- ass | 1 + 1 file changed, 1 insertion(+) create mode 100644 ass diff --git a/ass b/ass new file mode 100644 index 0000000..bf5257c --- /dev/null +++ b/ass @@ -0,0 +1 @@ +tits -- cgit v1.2.3 From 43a9abbd4b3ab091d1623219244e94b3f74d10ad Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 12:01:29 -0800 Subject: Ass was too big --- ass | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ass diff --git a/ass b/ass deleted file mode 100644 index bf5257c..0000000 --- a/ass +++ /dev/null @@ -1 +0,0 @@ -tits -- cgit v1.2.3 From 18da0d0f24f6d46eccb238e085a0e99cf294ae44 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 13:04:39 -0700 Subject: Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c09e3fb..b949a89 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # ShiftOS +[![Build status](https://ci.appveyor.com/api/projects/status/ktdv3nt6c3q88g2t?svg=true)](https://ci.appveyor.com/project/ComputeLinux/shiftos) The official, open-source, C# revamp of ShiftOS by Michael VanOverbeek and the ShiftOS devs. -- cgit v1.2.3 From 7f5486502eb7e5a534fafe685789f89748598a37 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 13:05:08 -0700 Subject: ass was too small --- ass | 1 + 1 file changed, 1 insertion(+) create mode 100644 ass diff --git a/ass b/ass new file mode 100644 index 0000000..bf5257c --- /dev/null +++ b/ass @@ -0,0 +1 @@ +tits -- cgit v1.2.3 From 6a12008f972a9802bd4eaedff4f5a9e6b4e7b620 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Jan 2017 14:06:18 -0600 Subject: Fixed AppVeyor badge placement --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b949a89..0ba8d41 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # ShiftOS [![Build status](https://ci.appveyor.com/api/projects/status/ktdv3nt6c3q88g2t?svg=true)](https://ci.appveyor.com/project/ComputeLinux/shiftos) + The official, open-source, C# revamp of ShiftOS by Michael VanOverbeek and the ShiftOS devs. -- cgit v1.2.3 From c6ec12bb8f4a15f6b8aba3faef4af22ba2d20055 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 13:07:13 -0700 Subject: ass was too big --- ass | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ass diff --git a/ass b/ass deleted file mode 100644 index bf5257c..0000000 --- a/ass +++ /dev/null @@ -1 +0,0 @@ -tits -- cgit v1.2.3 From 2e0daf41df86d4f09cd36a484ca8316fbff8a429 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 12:10:03 -0800 Subject: Rename Home.html to index.html --- ShiftOS.Server/Resources/Home.txt | 28 ---------------------------- ShiftOS.Server/Resources/index.html | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 ShiftOS.Server/Resources/Home.txt create mode 100644 ShiftOS.Server/Resources/index.html diff --git a/ShiftOS.Server/Resources/Home.txt b/ShiftOS.Server/Resources/Home.txt deleted file mode 100644 index 27fa97c..0000000 --- a/ShiftOS.Server/Resources/Home.txt +++ /dev/null @@ -1,28 +0,0 @@ - - - - ShiftOS Multi-User Domain • Admin Panel - - - - - - - - -
- {BODY} -
-

MUD server on {IP_ADDR}:{PORT}

-
-
- - diff --git a/ShiftOS.Server/Resources/index.html b/ShiftOS.Server/Resources/index.html new file mode 100644 index 0000000..27fa97c --- /dev/null +++ b/ShiftOS.Server/Resources/index.html @@ -0,0 +1,28 @@ + + + + ShiftOS Multi-User Domain • Admin Panel + + + + + + + + +
+ {BODY} +
+

MUD server on {IP_ADDR}:{PORT}

+
+
+ + -- cgit v1.2.3 From 7a306444264d21c12e0012b01aaf5ba6c6c7be6a Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 12:10:57 -0800 Subject: Rename NotFound.txt to 404.html --- ShiftOS.Server/Resources/404.html | 11 +++++++++++ ShiftOS.Server/Resources/NotFound.txt | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 ShiftOS.Server/Resources/404.html delete mode 100644 ShiftOS.Server/Resources/NotFound.txt diff --git a/ShiftOS.Server/Resources/404.html b/ShiftOS.Server/Resources/404.html new file mode 100644 index 0000000..8f998fc --- /dev/null +++ b/ShiftOS.Server/Resources/404.html @@ -0,0 +1,11 @@ + + + + +

This page wasn't found.

+

We couldn't find this page...

+ + diff --git a/ShiftOS.Server/Resources/NotFound.txt b/ShiftOS.Server/Resources/NotFound.txt deleted file mode 100644 index 8f998fc..0000000 --- a/ShiftOS.Server/Resources/NotFound.txt +++ /dev/null @@ -1,11 +0,0 @@ - - - - -

This page wasn't found.

-

We couldn't find this page...

- - -- cgit v1.2.3 From 19340e5205acf217cf3bebc741480b0d8e1390f7 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 12:12:50 -0800 Subject: Update Resources.resx --- ShiftOS.Server/Properties/Resources.resx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ShiftOS.Server/Properties/Resources.resx b/ShiftOS.Server/Properties/Resources.resx index cd10c06..dacce92 100644 --- a/ShiftOS.Server/Properties/Resources.resx +++ b/ShiftOS.Server/Properties/Resources.resx @@ -119,9 +119,9 @@ - ..\Resources\Home.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\Resources\index.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\Resources\NotFound.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\Resources\404.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - \ No newline at end of file + -- cgit v1.2.3 From 3d6454bce16cf9d68e2ed6e18e373b7d83fbb80a Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 13:13:03 -0700 Subject: to take this seriously --- ass | 1 + 1 file changed, 1 insertion(+) create mode 100644 ass diff --git a/ass b/ass new file mode 100644 index 0000000..e5e3897 --- /dev/null +++ b/ass @@ -0,0 +1 @@ +i refuse -- cgit v1.2.3 From 176b0d3355e392f36f863053d059b648b9893e29 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 13:13:50 -0700 Subject: fine ill take it seriously --- ass | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ass diff --git a/ass b/ass deleted file mode 100644 index e5e3897..0000000 --- a/ass +++ /dev/null @@ -1 +0,0 @@ -i refuse -- cgit v1.2.3 From 03964a4dd7ef92fd47d437584dd88a317d068aea Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 12:23:16 -0800 Subject: Added trm.echo command --- ShiftOS_TheReturn/Commands.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs index d2bfbfd..4571387 100644 --- a/ShiftOS_TheReturn/Commands.cs +++ b/ShiftOS_TheReturn/Commands.cs @@ -169,6 +169,13 @@ namespace ShiftOS.Engine { AppearanceManager.ConsoleOut.Clear(); return true; } + + [Command("echo")] + [RequiresArgument("text")] + public static bool Echo(Dictionary args) { + Console.WriteLine(args["text"]); + return true; + } } #if DEVEL -- cgit v1.2.3 From b203b746b024e6090712c5aa3904dd2f08d73c17 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 14:38:58 -0700 Subject: on buy update cp shiftorium --- ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs index 74e6482..bb6d93e 100644 --- a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs +++ b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs @@ -85,6 +85,7 @@ namespace ShiftOS.WinForms.Applications lbupgrades.Items.Clear(); upgrades.Clear(); Timer(); + label2.Text = "You have: " + SaveSystem.CurrentSave.Codepoints.ToString() + " Codepoints"; foreach (var upg in backend.GetAvailable()) { -- cgit v1.2.3 From a0cd53f033cd192a55e4d38334ecba8ac0b5a7a4 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 13:56:42 -0800 Subject: Create Legion.cs --- ShiftOS.Objects/Legion.cs | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ShiftOS.Objects/Legion.cs diff --git a/ShiftOS.Objects/Legion.cs b/ShiftOS.Objects/Legion.cs new file mode 100644 index 0000000..953a8e6 --- /dev/null +++ b/ShiftOS.Objects/Legion.cs @@ -0,0 +1,30 @@ +public enum LegionRole + { + Admin, + Manager, + Committed, + Trainee, + AwaitingInvite + } + + public enum LegionPublicity + { + Public, //Will display on the 'Join Legion' page, anyone can join + PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited + Unlisted, //Won't display on 'Join Legion', but anyone can join + UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required. + } + + public class Legion + { + public string Name { get; set; } + public LegionPublicity Publicity { get; set; } + public ConsoleColor BannerColor { get; set; } + public string Description { get; set; } + public string ShortName { get; set; } + + public Dictionary Roles { get; set; } + public Dictionary RoleNames { get; set; } + + + } -- cgit v1.2.3 From 412f3a12c6dc5359a7b9f54791f0e68103c9d8e7 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 13:57:05 -0800 Subject: Update Legion.cs --- ShiftOS.Objects/Legion.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ShiftOS.Objects/Legion.cs b/ShiftOS.Objects/Legion.cs index 953a8e6..04c64c4 100644 --- a/ShiftOS.Objects/Legion.cs +++ b/ShiftOS.Objects/Legion.cs @@ -1,3 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + public enum LegionRole { Admin, -- cgit v1.2.3 From 5c5f9400035d78177cb43a277dd5ba0ba662d8fb Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 13:57:30 -0800 Subject: Update Legion.cs --- ShiftOS.Objects/Legion.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ShiftOS.Objects/Legion.cs b/ShiftOS.Objects/Legion.cs index 04c64c4..078064f 100644 --- a/ShiftOS.Objects/Legion.cs +++ b/ShiftOS.Objects/Legion.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - +namespace ShiftOS.Objects +{ public enum LegionRole { Admin, @@ -34,3 +35,4 @@ public enum LegionRole } +} -- cgit v1.2.3 From 693f0b5f44494555823c9093d351f10914cef798 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 13:58:03 -0800 Subject: Update Objects.cs --- ShiftOS.Objects/Objects.cs | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/ShiftOS.Objects/Objects.cs b/ShiftOS.Objects/Objects.cs index 4c1abcc..2aafbd9 100644 --- a/ShiftOS.Objects/Objects.cs +++ b/ShiftOS.Objects/Objects.cs @@ -30,36 +30,6 @@ using System.Threading.Tasks; namespace ShiftOS.Objects { - public enum LegionRole - { - Admin, - Manager, - Committed, - Trainee, - AwaitingInvite - } - - public enum LegionPublicity - { - Public, //Will display on the 'Join Legion' page, anyone can join - PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited - Unlisted, //Won't display on 'Join Legion', but anyone can join - UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required. - } - - public class Legion - { - public string Name { get; set; } - public LegionPublicity Publicity { get; set; } - public ConsoleColor BannerColor { get; set; } - public string Description { get; set; } - public string ShortName { get; set; } - - public Dictionary Roles { get; set; } - public Dictionary RoleNames { get; set; } - - - } public class MUDMemo { -- cgit v1.2.3 From ca45ae1bda9711a4ad24e143ce190cc2ca948b3e Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 15:03:34 -0700 Subject: Revert "Moved Leigion into its own file" --- ShiftOS.Objects/Legion.cs | 38 -------------------------------------- ShiftOS.Objects/Objects.cs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 38 deletions(-) delete mode 100644 ShiftOS.Objects/Legion.cs diff --git a/ShiftOS.Objects/Legion.cs b/ShiftOS.Objects/Legion.cs deleted file mode 100644 index 078064f..0000000 --- a/ShiftOS.Objects/Legion.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace ShiftOS.Objects -{ -public enum LegionRole - { - Admin, - Manager, - Committed, - Trainee, - AwaitingInvite - } - - public enum LegionPublicity - { - Public, //Will display on the 'Join Legion' page, anyone can join - PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited - Unlisted, //Won't display on 'Join Legion', but anyone can join - UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required. - } - - public class Legion - { - public string Name { get; set; } - public LegionPublicity Publicity { get; set; } - public ConsoleColor BannerColor { get; set; } - public string Description { get; set; } - public string ShortName { get; set; } - - public Dictionary Roles { get; set; } - public Dictionary RoleNames { get; set; } - - - } -} diff --git a/ShiftOS.Objects/Objects.cs b/ShiftOS.Objects/Objects.cs index 2aafbd9..4c1abcc 100644 --- a/ShiftOS.Objects/Objects.cs +++ b/ShiftOS.Objects/Objects.cs @@ -30,6 +30,36 @@ using System.Threading.Tasks; namespace ShiftOS.Objects { + public enum LegionRole + { + Admin, + Manager, + Committed, + Trainee, + AwaitingInvite + } + + public enum LegionPublicity + { + Public, //Will display on the 'Join Legion' page, anyone can join + PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited + Unlisted, //Won't display on 'Join Legion', but anyone can join + UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required. + } + + public class Legion + { + public string Name { get; set; } + public LegionPublicity Publicity { get; set; } + public ConsoleColor BannerColor { get; set; } + public string Description { get; set; } + public string ShortName { get; set; } + + public Dictionary Roles { get; set; } + public Dictionary RoleNames { get; set; } + + + } public class MUDMemo { -- cgit v1.2.3 From 78fcfce2522f0d3a16d148725beb4a6eafd6e215 Mon Sep 17 00:00:00 2001 From: Rylan/wowmom98 Date: Sun, 8 Jan 2017 17:48:56 -0500 Subject: localization in titles of programs read the summary --- ShiftOS.WinForms/Applications/Chat.Designer.cs | 2 +- ShiftOS.WinForms/Applications/ColorPicker.Designer.cs | 2 +- ShiftOS.WinForms/Applications/Dialog.Designer.cs | 2 +- ShiftOS.WinForms/Applications/FileDialog.Designer.cs | 2 +- ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs | 2 +- ShiftOS.WinForms/Applications/GraphicPicker.Designer.cs | 2 +- ShiftOS.WinForms/Applications/MUDAuthenticator.Designer.cs | 2 +- ShiftOS.WinForms/Applications/MUDControlCentre.Designer.cs | 1 + ShiftOS.WinForms/Applications/Shifter.Designer.cs | 2 +- ShiftOS.WinForms/Applications/Skin Loader.Designer.cs | 2 +- ShiftOS.WinForms/Applications/VirusScanner.Designer.cs | 2 +- ShiftOS.WinForms/Resources/strings_de.txt | 13 +++++++++++++ ShiftOS.WinForms/Resources/strings_en.txt | 13 +++++++++++++ 13 files changed, 37 insertions(+), 10 deletions(-) diff --git a/ShiftOS.WinForms/Applications/Chat.Designer.cs b/ShiftOS.WinForms/Applications/Chat.Designer.cs index d2284f2..f2c0a70 100644 --- a/ShiftOS.WinForms/Applications/Chat.Designer.cs +++ b/ShiftOS.WinForms/Applications/Chat.Designer.cs @@ -93,7 +93,7 @@ namespace ShiftOS.WinForms.Applications this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.panel1); this.Name = "Chat"; - this.Text = "Chat"; + this.Text = "{CHAT_NAME}"; this.Size = new System.Drawing.Size(633, 318); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs b/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs index 487dd4b..9f0abf0 100644 --- a/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs +++ b/ShiftOS.WinForms/Applications/ColorPicker.Designer.cs @@ -3266,7 +3266,7 @@ namespace ShiftOS.WinForms.Applications this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pgcontents); this.Name = "ColorPicker"; - this.Text = "Color Picker"; + this.Text = "{COLOR_PICKER_NAME}"; this.Size = new System.Drawing.Size(552, 657); this.Load += new System.EventHandler(this.Color_Picker_Load); this.pgcontents.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/Dialog.Designer.cs b/ShiftOS.WinForms/Applications/Dialog.Designer.cs index 41619ea..7f9a9b2 100644 --- a/ShiftOS.WinForms/Applications/Dialog.Designer.cs +++ b/ShiftOS.WinForms/Applications/Dialog.Designer.cs @@ -54,7 +54,7 @@ namespace ShiftOS.WinForms.Applications { this.components = new System.ComponentModel.Container(); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Text = "Dialog"; + this.Text = "{DIALOG_NAME}"; } #endregion diff --git a/ShiftOS.WinForms/Applications/FileDialog.Designer.cs b/ShiftOS.WinForms/Applications/FileDialog.Designer.cs index f43d473..467e0c0 100644 --- a/ShiftOS.WinForms/Applications/FileDialog.Designer.cs +++ b/ShiftOS.WinForms/Applications/FileDialog.Designer.cs @@ -149,7 +149,7 @@ namespace ShiftOS.WinForms.Applications this.ClientSize = new System.Drawing.Size(634, 369); this.Controls.Add(this.panel1); this.Name = "FileDialog"; - this.Text = "File Dialog"; + this.Text = "{FILE_DIALOG_NAME}"; this.panel1.ResumeLayout(false); this.pnlfiletype.ResumeLayout(false); this.pnlfiletype.PerformLayout(); diff --git a/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs b/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs index 7067387..df31977 100644 --- a/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs +++ b/ShiftOS.WinForms/Applications/FileSkimmer.Designer.cs @@ -94,7 +94,7 @@ namespace ShiftOS.WinForms.Applications this.ClientSize = new System.Drawing.Size(634, 369); this.Controls.Add(this.panel1); this.Name = "FileSkimmer"; - this.Text = "File Skimmer"; + this.Text = "{FILE_SKIMMER_NAME}"; this.Load += new System.EventHandler(this.FileSkimmer_Load); this.panel1.ResumeLayout(false); this.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/GraphicPicker.Designer.cs b/ShiftOS.WinForms/Applications/GraphicPicker.Designer.cs index 04ee3d2..988acbd 100644 --- a/ShiftOS.WinForms/Applications/GraphicPicker.Designer.cs +++ b/ShiftOS.WinForms/Applications/GraphicPicker.Designer.cs @@ -252,7 +252,7 @@ namespace ShiftOS.WinForms.Applications this.ClientSize = new System.Drawing.Size(390, 383); this.Controls.Add(this.pgcontents); this.Name = "GraphicPicker"; - this.Text = "Graphic Picker"; + this.Text = "{GRAPHIC_PICKER_NAME}"; this.Load += new System.EventHandler(this.Graphic_Picker_Load); this.pgcontents.ResumeLayout(false); this.pgcontents.PerformLayout(); diff --git a/ShiftOS.WinForms/Applications/MUDAuthenticator.Designer.cs b/ShiftOS.WinForms/Applications/MUDAuthenticator.Designer.cs index 7e8a451..154cfe4 100644 --- a/ShiftOS.WinForms/Applications/MUDAuthenticator.Designer.cs +++ b/ShiftOS.WinForms/Applications/MUDAuthenticator.Designer.cs @@ -206,7 +206,7 @@ namespace ShiftOS.WinForms.Applications this.ClientSize = new System.Drawing.Size(622, 430); this.Controls.Add(this.panel1); this.Name = "MUDAuthenticator"; - this.Text = "Multi-User Domain Admin Panel"; + this.Text = "{MUD_AUTHENTICATOR_NAME}"; this.panel1.ResumeLayout(false); this.pnlmain.ResumeLayout(false); this.pnlusers.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.Designer.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.Designer.cs index 8938c27..2843fc0 100644 --- a/ShiftOS.WinForms/Applications/MUDControlCentre.Designer.cs +++ b/ShiftOS.WinForms/Applications/MUDControlCentre.Designer.cs @@ -748,6 +748,7 @@ namespace ShiftOS.WinForms.Applications this.Controls.Add(this.toolStripContainer1); this.ForeColor = System.Drawing.Color.White; this.Name = "MUDControlCentre"; + this.Text = "{MUD_CONTROL_CENTRE_NAME}"; this.Size = new System.Drawing.Size(756, 488); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); diff --git a/ShiftOS.WinForms/Applications/Shifter.Designer.cs b/ShiftOS.WinForms/Applications/Shifter.Designer.cs index a5ea55b..44045b5 100644 --- a/ShiftOS.WinForms/Applications/Shifter.Designer.cs +++ b/ShiftOS.WinForms/Applications/Shifter.Designer.cs @@ -162,7 +162,7 @@ namespace ShiftOS.WinForms.Applications this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.panel1); this.Name = "Shifter"; - this.Text = "Shifter"; + this.Text = "{SHIFTER_NAME}"; this.Size = new System.Drawing.Size(893, 539); this.Load += new System.EventHandler(this.Shifter_Load); this.panel1.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs b/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs index 62a5bc1..ef5be7e 100644 --- a/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs +++ b/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs @@ -426,7 +426,7 @@ namespace ShiftOS.WinForms.Applications this.Controls.Add(this.pnlborder); this.Controls.Add(this.pnldesktop); this.Name = "Skin_Loader"; - this.Text = "Skin Loader"; + this.Text = "{SKIN_LOADER_NAME}"; this.pnldesktop.ResumeLayout(false); this.pnlborder.ResumeLayout(false); this.flbuttons.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Applications/VirusScanner.Designer.cs b/ShiftOS.WinForms/Applications/VirusScanner.Designer.cs index 54c8c63..3d6088d 100644 --- a/ShiftOS.WinForms/Applications/VirusScanner.Designer.cs +++ b/ShiftOS.WinForms/Applications/VirusScanner.Designer.cs @@ -199,7 +199,7 @@ namespace ShiftOS.WinForms.Applications this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pgcontents); this.Name = "VirusScanner"; - this.Text = "Virus Scanner"; + this.Text = "{VIRUS_SCANNER_NAME}"; this.Size = new System.Drawing.Size(565, 343); this.Load += new System.EventHandler(this.VirusScanner_Load); this.grpresults.ResumeLayout(false); diff --git a/ShiftOS.WinForms/Resources/strings_de.txt b/ShiftOS.WinForms/Resources/strings_de.txt index 3cd11e4..5661c45 100644 --- a/ShiftOS.WinForms/Resources/strings_de.txt +++ b/ShiftOS.WinForms/Resources/strings_de.txt @@ -224,4 +224,17 @@ Wenn eine Systemdatei von dem Virenscanner erkannt wird, wird sie ersetzt.", "{WAV_PLAYER_NAME}":"WAV Player", "{SHIFTORIUM_NAME}":"Shiftorium", "{TEXTPAD_NAME}":"TextPad", + "{VIRUS_SCANNER_NAME}":"Virus Scanner", + "{SKIN_LOADER_NAME}":"Skin Loader", + "{SHIFTER_NAME}":"Shifter", + "{NAME_CHANGER_NAME}":"Name Changer", + "{MUD_PASSWORD_CRACKER_NAME}":"Multi-User Domain Password Cracker v1.0", + "{MUD_CONTROL_CENTRE_NAME}":"MUD Control Centre", + "{MUD_AUTHENTICATOR_NAME}":"Multi-User Domain Admin Panel", + "{GRAPHIC_PICKER_NAME}":"Graphic Picker", + "{FILE_SKIMMER_NAME}":"File Skimmer", + "{FILE_DIALOG_NAME}":"File Dialog", + "{DIALOG_NAME}":"Dialog", + "{COLOR_PICKER_NAME}":"Color Picker", + "{CHAT_NAME}":"Chat", } \ No newline at end of file diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt index 267724a..032a554 100644 --- a/ShiftOS.WinForms/Resources/strings_en.txt +++ b/ShiftOS.WinForms/Resources/strings_en.txt @@ -223,4 +223,17 @@ If a system file is deleted by the virus scanner, it will be replaced.", "{WAV_PLAYER_NAME}":"WAV Player", "{SHIFTORIUM_NAME}":"Shiftorium", "{TEXTPAD_NAME}":"TextPad", + "{VIRUS_SCANNER_NAME}":"Virus Scanner", + "{SKIN_LOADER_NAME}":"Skin Loader", + "{SHIFTER_NAME}":"Shifter", + "{NAME_CHANGER_NAME}":"Name Changer", + "{MUD_PASSWORD_CRACKER_NAME}":"Multi-User Domain Password Cracker v1.0", + "{MUD_CONTROL_CENTRE_NAME}":"MUD Control Centre", + "{MUD_AUTHENTICATOR_NAME}":"Multi-User Domain Admin Panel", + "{GRAPHIC_PICKER_NAME}":"Graphic Picker", + "{FILE_SKIMMER_NAME}":"File Skimmer", + "{FILE_DIALOG_NAME}":"File Dialog", + "{DIALOG_NAME}":"Dialog", + "{COLOR_PICKER_NAME}":"Color Picker", + "{CHAT_NAME}":"Chat", } \ No newline at end of file -- cgit v1.2.3 From 2950f6c0248082a16c345a553a0072e9b15fd033 Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Sun, 8 Jan 2017 18:05:48 -0500 Subject: Update README to test our gitbot on discord --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ba8d41..8a72a60 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,20 @@ # ShiftOS -[![Build status](https://ci.appveyor.com/api/projects/status/ktdv3nt6c3q88g2t?svg=true)](https://ci.appveyor.com/project/ComputeLinux/shiftos) The official, open-source, C# revamp of ShiftOS by Michael VanOverbeek and the ShiftOS devs. + +## Repository status: + +AppVeyor build status: +[![Build status](https://ci.appveyor.com/api/projects/status/ktdv3nt6c3q88g2t?svg=true)](https://ci.appveyor.com/project/ComputeLinux/shiftos) + +## License + +We are licensed under the MIT license. All we ask is that you: + +1. Don't steal our code and call it yours +2. If you fork us, please leave any copyright statements and license info at the top of all .cs files. You can use the InsertLicense executable to insert the statement into any code files missing the copyright statement. + + +## Using our code for your own front-end project + +You may use the ShiftOS.Engine, ShiftOS.Objects, and ShiftOS.Server projects to create your own games. Just, please, include our original license and linkback to us in your game. After all, we spend a lot of time working on this! -- cgit v1.2.3 From 3bad43698a2b9053aeaa9b1e371f9ac601ad8375 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 16:29:48 -0700 Subject: Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8a72a60..66bf2e3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # ShiftOS +[![Discord](https://discordapp.com/api/guilds/234414439330349056/widget.png?style=shield](https://discord.gg/Kd8BJ93) The official, open-source, C# revamp of ShiftOS by Michael VanOverbeek and the ShiftOS devs. -- cgit v1.2.3 From 1cc8368baa56e2c3c28844e2749dc521c1ababbf Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 16:30:14 -0700 Subject: Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 66bf2e3..6f63915 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # ShiftOS -[![Discord](https://discordapp.com/api/guilds/234414439330349056/widget.png?style=shield](https://discord.gg/Kd8BJ93) +[![Discord](https://discordapp.com/api/guilds/234414439330349056/widget.png?style=shield] +(https://discord.gg/Kd8BJ93) The official, open-source, C# revamp of ShiftOS by Michael VanOverbeek and the ShiftOS devs. -- cgit v1.2.3 From 65449eda4ce016c1f1e30fb7f6bc56c41b8b0305 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 8 Jan 2017 16:30:25 -0700 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f63915..f258260 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ShiftOS -[![Discord](https://discordapp.com/api/guilds/234414439330349056/widget.png?style=shield] +[![Discord](https://discordapp.com/api/guilds/234414439330349056/widget.png?style=shield)] (https://discord.gg/Kd8BJ93) The official, open-source, C# revamp of ShiftOS by Michael VanOverbeek and the ShiftOS devs. -- cgit v1.2.3 From 6393f91ad1acb2f84ac09f404076a50a2bf84c37 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 8 Jan 2017 15:36:09 -0800 Subject: Moved Stuff into files and made things look better --- ShiftOS.MFSProfiler/Form1.Designer.cs | 272 ------------------------- ShiftOS.MFSProfiler/Form1.cs | 135 ------------ ShiftOS.MFSProfiler/Form1.resx | 120 ----------- ShiftOS.MFSProfiler/Main.Designer.cs | 272 +++++++++++++++++++++++++ ShiftOS.MFSProfiler/Main.cs | 135 ++++++++++++ ShiftOS.MFSProfiler/Main.resx | 120 +++++++++++ ShiftOS.MFSProfiler/Program.cs | 2 +- ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj | 10 +- ShiftOS.Objects/ClientSave.cs | 14 ++ ShiftOS.Objects/Exploit.cs | 38 ++++ ShiftOS.Objects/ExploitContext.cs | 38 ++++ ShiftOS.Objects/Hack.cs | 60 +----- ShiftOS.Objects/Legion.cs | 39 ++++ ShiftOS.Objects/Objects.cs | 78 ------- ShiftOS.Objects/Save.cs | 48 +++++ ShiftOS.Objects/ShiftOS.Objects.csproj | 5 + 16 files changed, 717 insertions(+), 669 deletions(-) delete mode 100644 ShiftOS.MFSProfiler/Form1.Designer.cs delete mode 100644 ShiftOS.MFSProfiler/Form1.cs delete mode 100644 ShiftOS.MFSProfiler/Form1.resx create mode 100644 ShiftOS.MFSProfiler/Main.Designer.cs create mode 100644 ShiftOS.MFSProfiler/Main.cs create mode 100644 ShiftOS.MFSProfiler/Main.resx create mode 100644 ShiftOS.Objects/ClientSave.cs create mode 100644 ShiftOS.Objects/Exploit.cs create mode 100644 ShiftOS.Objects/ExploitContext.cs create mode 100644 ShiftOS.Objects/Legion.cs create mode 100644 ShiftOS.Objects/Save.cs diff --git a/ShiftOS.MFSProfiler/Form1.Designer.cs b/ShiftOS.MFSProfiler/Form1.Designer.cs deleted file mode 100644 index 2fbdb4a..0000000 --- a/ShiftOS.MFSProfiler/Form1.Designer.cs +++ /dev/null @@ -1,272 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -namespace ShiftOS.MFSProfiler -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tvfiles = new System.Windows.Forms.TreeView(); - this.pnlfileinfo = new System.Windows.Forms.Panel(); - this.pnldirectorylisting = new System.Windows.Forms.Panel(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button1 = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.txtbinary = new System.Windows.Forms.TextBox(); - this.txtascii = new System.Windows.Forms.TextBox(); - this.lbfileinfo = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.pnlfileinfo.SuspendLayout(); - this.panel1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.tabControl1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.SuspendLayout(); - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.tvfiles); - this.splitContainer1.Panel1.Controls.Add(this.panel1); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.pnlfileinfo); - this.splitContainer1.Panel2.Controls.Add(this.pnldirectorylisting); - this.splitContainer1.Size = new System.Drawing.Size(739, 466); - this.splitContainer1.SplitterDistance = 246; - this.splitContainer1.TabIndex = 0; - // - // tvfiles - // - this.tvfiles.Dock = System.Windows.Forms.DockStyle.Fill; - this.tvfiles.Location = new System.Drawing.Point(0, 30); - this.tvfiles.Name = "tvfiles"; - this.tvfiles.Size = new System.Drawing.Size(246, 436); - this.tvfiles.TabIndex = 0; - this.tvfiles.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvfiles_AfterSelect); - // - // pnlfileinfo - // - this.pnlfileinfo.Controls.Add(this.groupBox2); - this.pnlfileinfo.Controls.Add(this.groupBox1); - this.pnlfileinfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlfileinfo.Location = new System.Drawing.Point(0, 0); - this.pnlfileinfo.Name = "pnlfileinfo"; - this.pnlfileinfo.Size = new System.Drawing.Size(489, 466); - this.pnlfileinfo.TabIndex = 0; - // - // pnldirectorylisting - // - this.pnldirectorylisting.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnldirectorylisting.Location = new System.Drawing.Point(0, 0); - this.pnldirectorylisting.Name = "pnldirectorylisting"; - this.pnldirectorylisting.Size = new System.Drawing.Size(489, 466); - this.pnldirectorylisting.TabIndex = 1; - // - // panel1 - // - this.panel1.Controls.Add(this.button1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(246, 30); - this.panel1.TabIndex = 1; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(4, 4); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 0; - this.button1.Text = "Mount file"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.lbfileinfo); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox1.Location = new System.Drawing.Point(0, 0); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(489, 164); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "File record information"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.tabControl1); - this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox2.Location = new System.Drawing.Point(0, 164); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(489, 302); - this.groupBox2.TabIndex = 1; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Contents"; - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(3, 16); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(483, 283); - this.tabControl1.TabIndex = 0; - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.txtascii); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(475, 257); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "ASCII"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.txtbinary); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(475, 257); - this.tabPage1.TabIndex = 2; - this.tabPage1.Text = "Binary"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // txtbinary - // - this.txtbinary.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtbinary.Location = new System.Drawing.Point(3, 3); - this.txtbinary.Multiline = true; - this.txtbinary.Name = "txtbinary"; - this.txtbinary.Size = new System.Drawing.Size(469, 251); - this.txtbinary.TabIndex = 0; - // - // txtascii - // - this.txtascii.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtascii.Location = new System.Drawing.Point(3, 3); - this.txtascii.Multiline = true; - this.txtascii.Name = "txtascii"; - this.txtascii.Size = new System.Drawing.Size(469, 251); - this.txtascii.TabIndex = 0; - // - // lbfileinfo - // - this.lbfileinfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.lbfileinfo.Location = new System.Drawing.Point(3, 16); - this.lbfileinfo.Name = "lbfileinfo"; - this.lbfileinfo.Size = new System.Drawing.Size(483, 145); - this.lbfileinfo.TabIndex = 0; - this.lbfileinfo.Text = "label1"; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(739, 466); - this.Controls.Add(this.splitContainer1); - this.Name = "Form1"; - this.Text = "Form1"; - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.pnlfileinfo.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); - this.tabControl1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.SplitContainer splitContainer1; - private System.Windows.Forms.TreeView tvfiles; - private System.Windows.Forms.Panel pnldirectorylisting; - private System.Windows.Forms.Panel pnlfileinfo; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.TextBox txtascii; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TextBox txtbinary; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label lbfileinfo; - } -} - diff --git a/ShiftOS.MFSProfiler/Form1.cs b/ShiftOS.MFSProfiler/Form1.cs deleted file mode 100644 index 2262fa2..0000000 --- a/ShiftOS.MFSProfiler/Form1.cs +++ /dev/null @@ -1,135 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using static ShiftOS.Objects.ShiftFS.Utils; - -using ShiftOS.Engine; -using ShiftOS.Objects.ShiftFS; -using System.Threading; - -namespace ShiftOS.MFSProfiler -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - SetupTree(); - } - - public void SetupTree() - { - tvfiles.Nodes.Clear(); - - foreach(var dir in Mounts) - { - var mountNode = new TreeNode(); - mountNode.Text = dir.Name; - mountNode.Tag = Mounts.IndexOf(dir).ToString() + ":"; - - RecursiveDirectoryAdd(mountNode); - - tvfiles.Nodes.Add(mountNode); - } - } - - public void RecursiveDirectoryAdd(TreeNode node) - { - foreach (var dir in GetDirectories(node.Tag.ToString())) - { - var dirInf = GetDirectoryInfo(dir); - var child = new TreeNode(); - child.Text = dirInf.Name; - child.Tag = dir; - RecursiveDirectoryAdd(child); - node.Nodes.Add(child); - node.Expand(); - } - foreach (var dir in GetFiles(node.Tag.ToString())) - { - var dirInf = GetFileInfo(dir); - var child = new TreeNode(); - child.Text = dirInf.Name; - child.Tag = dir; - node.Nodes.Add(child); - node.Expand(); - } - } - - private void button1_Click(object sender, EventArgs e) - { - var opener = new OpenFileDialog(); - opener.Filter = "Mini Filesystem|*.mfs"; - opener.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - opener.Title = "Mount filesystem"; - if(opener.ShowDialog() == DialogResult.OK) - { - Mount(System.IO.File.ReadAllText(opener.FileName)); - SetupTree(); - } - } - - private void tvfiles_AfterSelect(object sender, TreeViewEventArgs e) - { - try - { - if (FileExists(tvfiles.SelectedNode.Tag.ToString())) - { - pnlfileinfo.BringToFront(); - - txtascii.Text = ReadAllText(tvfiles.SelectedNode.Tag.ToString()); - txtbinary.Text = ""; - var finf = GetFileInfo(tvfiles.SelectedNode.Tag.ToString()); - var t = new Thread(new ThreadStart(() => - { - foreach (var b in finf.Data) - { - txtbinary.Invoke(new Action(() => - { - txtbinary.Text += b.ToString() + " "; - })); - } - })); - t.IsBackground = true; - t.Start(); - - - lbfileinfo.Text = $@"Name: {finf.Name} -Permissions: {finf.permissions} -Size: {finf.Data.Length} -System path: {tvfiles.SelectedNode.Tag.ToString()}"; - } - } catch { } - } - } -} diff --git a/ShiftOS.MFSProfiler/Form1.resx b/ShiftOS.MFSProfiler/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ShiftOS.MFSProfiler/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ShiftOS.MFSProfiler/Main.Designer.cs b/ShiftOS.MFSProfiler/Main.Designer.cs new file mode 100644 index 0000000..85f1310 --- /dev/null +++ b/ShiftOS.MFSProfiler/Main.Designer.cs @@ -0,0 +1,272 @@ +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace ShiftOS.MFSProfiler +{ + partial class Main + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.tvfiles = new System.Windows.Forms.TreeView(); + this.pnlfileinfo = new System.Windows.Forms.Panel(); + this.pnldirectorylisting = new System.Windows.Forms.Panel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.button1 = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.txtbinary = new System.Windows.Forms.TextBox(); + this.txtascii = new System.Windows.Forms.TextBox(); + this.lbfileinfo = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.pnlfileinfo.SuspendLayout(); + this.panel1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.tvfiles); + this.splitContainer1.Panel1.Controls.Add(this.panel1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.pnlfileinfo); + this.splitContainer1.Panel2.Controls.Add(this.pnldirectorylisting); + this.splitContainer1.Size = new System.Drawing.Size(739, 466); + this.splitContainer1.SplitterDistance = 246; + this.splitContainer1.TabIndex = 0; + // + // tvfiles + // + this.tvfiles.Dock = System.Windows.Forms.DockStyle.Fill; + this.tvfiles.Location = new System.Drawing.Point(0, 30); + this.tvfiles.Name = "tvfiles"; + this.tvfiles.Size = new System.Drawing.Size(246, 436); + this.tvfiles.TabIndex = 0; + this.tvfiles.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvfiles_AfterSelect); + // + // pnlfileinfo + // + this.pnlfileinfo.Controls.Add(this.groupBox2); + this.pnlfileinfo.Controls.Add(this.groupBox1); + this.pnlfileinfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlfileinfo.Location = new System.Drawing.Point(0, 0); + this.pnlfileinfo.Name = "pnlfileinfo"; + this.pnlfileinfo.Size = new System.Drawing.Size(489, 466); + this.pnlfileinfo.TabIndex = 0; + // + // pnldirectorylisting + // + this.pnldirectorylisting.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnldirectorylisting.Location = new System.Drawing.Point(0, 0); + this.pnldirectorylisting.Name = "pnldirectorylisting"; + this.pnldirectorylisting.Size = new System.Drawing.Size(489, 466); + this.pnldirectorylisting.TabIndex = 1; + // + // panel1 + // + this.panel1.Controls.Add(this.button1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(246, 30); + this.panel1.TabIndex = 1; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(4, 4); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 0; + this.button1.Text = "Mount file"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.lbfileinfo); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox1.Location = new System.Drawing.Point(0, 0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(489, 164); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "File record information"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.tabControl1); + this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox2.Location = new System.Drawing.Point(0, 164); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(489, 302); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Contents"; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(3, 16); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(483, 283); + this.tabControl1.TabIndex = 0; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.txtascii); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(475, 257); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "ASCII"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.txtbinary); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(475, 257); + this.tabPage1.TabIndex = 2; + this.tabPage1.Text = "Binary"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // txtbinary + // + this.txtbinary.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtbinary.Location = new System.Drawing.Point(3, 3); + this.txtbinary.Multiline = true; + this.txtbinary.Name = "txtbinary"; + this.txtbinary.Size = new System.Drawing.Size(469, 251); + this.txtbinary.TabIndex = 0; + // + // txtascii + // + this.txtascii.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtascii.Location = new System.Drawing.Point(3, 3); + this.txtascii.Multiline = true; + this.txtascii.Name = "txtascii"; + this.txtascii.Size = new System.Drawing.Size(469, 251); + this.txtascii.TabIndex = 0; + // + // lbfileinfo + // + this.lbfileinfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbfileinfo.Location = new System.Drawing.Point(3, 16); + this.lbfileinfo.Name = "lbfileinfo"; + this.lbfileinfo.Size = new System.Drawing.Size(483, 145); + this.lbfileinfo.TabIndex = 0; + this.lbfileinfo.Text = "label1"; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(739, 466); + this.Controls.Add(this.splitContainer1); + this.Name = "Form1"; + this.Text = "Form1"; + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.pnlfileinfo.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TreeView tvfiles; + private System.Windows.Forms.Panel pnldirectorylisting; + private System.Windows.Forms.Panel pnlfileinfo; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TextBox txtascii; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TextBox txtbinary; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label lbfileinfo; + } +} + diff --git a/ShiftOS.MFSProfiler/Main.cs b/ShiftOS.MFSProfiler/Main.cs new file mode 100644 index 0000000..dbfe276 --- /dev/null +++ b/ShiftOS.MFSProfiler/Main.cs @@ -0,0 +1,135 @@ +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using static ShiftOS.Objects.ShiftFS.Utils; + +using ShiftOS.Engine; +using ShiftOS.Objects.ShiftFS; +using System.Threading; + +namespace ShiftOS.MFSProfiler +{ + public partial class Main : Form + { + public Main() + { + InitializeComponent(); + SetupTree(); + } + + public void SetupTree() + { + tvfiles.Nodes.Clear(); + + foreach(var dir in Mounts) + { + var mountNode = new TreeNode(); + mountNode.Text = dir.Name; + mountNode.Tag = Mounts.IndexOf(dir).ToString() + ":"; + + RecursiveDirectoryAdd(mountNode); + + tvfiles.Nodes.Add(mountNode); + } + } + + public void RecursiveDirectoryAdd(TreeNode node) + { + foreach (var dir in GetDirectories(node.Tag.ToString())) + { + var dirInf = GetDirectoryInfo(dir); + var child = new TreeNode(); + child.Text = dirInf.Name; + child.Tag = dir; + RecursiveDirectoryAdd(child); + node.Nodes.Add(child); + node.Expand(); + } + foreach (var dir in GetFiles(node.Tag.ToString())) + { + var dirInf = GetFileInfo(dir); + var child = new TreeNode(); + child.Text = dirInf.Name; + child.Tag = dir; + node.Nodes.Add(child); + node.Expand(); + } + } + + private void button1_Click(object sender, EventArgs e) + { + var opener = new OpenFileDialog(); + opener.Filter = "Mini Filesystem|*.mfs"; + opener.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + opener.Title = "Mount filesystem"; + if(opener.ShowDialog() == DialogResult.OK) + { + Mount(System.IO.File.ReadAllText(opener.FileName)); + SetupTree(); + } + } + + private void tvfiles_AfterSelect(object sender, TreeViewEventArgs e) + { + try + { + if (FileExists(tvfiles.SelectedNode.Tag.ToString())) + { + pnlfileinfo.BringToFront(); + + txtascii.Text = ReadAllText(tvfiles.SelectedNode.Tag.ToString()); + txtbinary.Text = ""; + var finf = GetFileInfo(tvfiles.SelectedNode.Tag.ToString()); + var t = new Thread(new ThreadStart(() => + { + foreach (var b in finf.Data) + { + txtbinary.Invoke(new Action(() => + { + txtbinary.Text += b.ToString() + " "; + })); + } + })); + t.IsBackground = true; + t.Start(); + + + lbfileinfo.Text = $@"Name: {finf.Name} +Permissions: {finf.permissions} +Size: {finf.Data.Length} +System path: {tvfiles.SelectedNode.Tag.ToString()}"; + } + } catch { } + } + } +} diff --git a/ShiftOS.MFSProfiler/Main.resx b/ShiftOS.MFSProfiler/Main.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS.MFSProfiler/Main.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS.MFSProfiler/Program.cs b/ShiftOS.MFSProfiler/Program.cs index ef34d38..b30e7eb 100644 --- a/ShiftOS.MFSProfiler/Program.cs +++ b/ShiftOS.MFSProfiler/Program.cs @@ -40,7 +40,7 @@ namespace ShiftOS.MFSProfiler { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new Main()); } } } diff --git a/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj b/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj index ce02df2..6e98065 100644 --- a/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj +++ b/ShiftOS.MFSProfiler/ShiftOS.MFSProfiler.csproj @@ -46,16 +46,16 @@ - + Form - - Form1.cs + + Main.cs - - Form1.cs + + Main.cs ResXFileCodeGenerator diff --git a/ShiftOS.Objects/ClientSave.cs b/ShiftOS.Objects/ClientSave.cs new file mode 100644 index 0000000..08f7a09 --- /dev/null +++ b/ShiftOS.Objects/ClientSave.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Objects +{ + public class ClientSave + { + public string Username { get; set; } + public string Password { get; set; } + } +} diff --git a/ShiftOS.Objects/Exploit.cs b/ShiftOS.Objects/Exploit.cs new file mode 100644 index 0000000..7b220f1 --- /dev/null +++ b/ShiftOS.Objects/Exploit.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Objects +{ + public abstract class Exploit + { + public void BeginExploit(string remote_user, bool isMud) + { + var ctx = new ExploitContext(); + SendToMUD(remote_user, "hack_getcontext"); + MessageReceived += (u, c, j) => + { + + }; + ThisContext = ctx; + } + + public ExploitContext ThisContext { get; internal set; } + + public virtual void SendToMUD(string target_user, string command, string json = "") + { + ThisContext.IsMUDHack = false; + if (command == "hack_getcontext") + { + MessageReceived?.Invoke(target_user, "context_info", ExploitContext.CreateRandom()); + } + } + + public event MUDMessageEventHandler MessageReceived; + + + public abstract void OnRun(ExploitContext ctx); + } +} diff --git a/ShiftOS.Objects/ExploitContext.cs b/ShiftOS.Objects/ExploitContext.cs new file mode 100644 index 0000000..5d8f378 --- /dev/null +++ b/ShiftOS.Objects/ExploitContext.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Objects +{ + public class ExploitContext + { + public static string CreateRandom() + { + //We can't use JSON.NET. We must construct the JSON ourselves. + StringBuilder jBuilder = new StringBuilder(); + jBuilder.AppendLine("{"); + jBuilder.Append("\tIsMUDHack: \"false\","); + + jBuilder.AppendLine("}"); + return jBuilder.ToString(); + } + + /// + /// Gets or sets whether or not this exploit context belongs to a MUD hack session. + /// + public bool IsMUDHack { get; set; } + + /// + /// Gets or sets the target username for this exploit context. Used for talking with the MUD about it. + /// + public string TargetUsername { get; set; } + + /// + /// Gets or sets the target's locks. + /// + public List TargetLocks { get; set; } + + } +} diff --git a/ShiftOS.Objects/Hack.cs b/ShiftOS.Objects/Hack.cs index 0884a53..c1791ec 100644 --- a/ShiftOS.Objects/Hack.cs +++ b/ShiftOS.Objects/Hack.cs @@ -30,67 +30,11 @@ using System.Threading.Tasks; namespace ShiftOS.Objects { - public abstract class Exploit - { - public void BeginExploit(string remote_user, bool isMud) - { - var ctx = new ExploitContext(); - SendToMUD(remote_user, "hack_getcontext"); - MessageReceived += (u, c, j) => - { - - }; - ThisContext = ctx; - } - - public ExploitContext ThisContext { get; internal set; } - - public virtual void SendToMUD(string target_user, string command, string json = "") - { - ThisContext.IsMUDHack = false; - if (command == "hack_getcontext") - { - MessageReceived?.Invoke(target_user, "context_info", ExploitContext.CreateRandom()); - } - } - - public event MUDMessageEventHandler MessageReceived; - - - public abstract void OnRun(ExploitContext ctx); - } + public delegate void MUDMessageEventHandler(string target_user, string command, string json); - public class ExploitContext - { - public static string CreateRandom() - { - //We can't use JSON.NET. We must construct the JSON ourselves. - StringBuilder jBuilder = new StringBuilder(); - jBuilder.AppendLine("{"); - jBuilder.Append("\tIsMUDHack: \"false\","); - - jBuilder.AppendLine("}"); - return jBuilder.ToString(); - } - - /// - /// Gets or sets whether or not this exploit context belongs to a MUD hack session. - /// - public bool IsMUDHack { get; set; } - - /// - /// Gets or sets the target username for this exploit context. Used for talking with the MUD about it. - /// - public string TargetUsername { get; set; } - - /// - /// Gets or sets the target's locks. - /// - public List TargetLocks { get; set; } - - } + public abstract class Lock { diff --git a/ShiftOS.Objects/Legion.cs b/ShiftOS.Objects/Legion.cs new file mode 100644 index 0000000..0bd4d37 --- /dev/null +++ b/ShiftOS.Objects/Legion.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Objects +{ + public enum LegionRole + { + Admin, + Manager, + Committed, + Trainee, + AwaitingInvite + } + + public enum LegionPublicity + { + Public, //Will display on the 'Join Legion' page, anyone can join + PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited + Unlisted, //Won't display on 'Join Legion', but anyone can join + UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required. + } + + public class Legion + { + public string Name { get; set; } + public LegionPublicity Publicity { get; set; } + public ConsoleColor BannerColor { get; set; } + public string Description { get; set; } + public string ShortName { get; set; } + + public Dictionary Roles { get; set; } + public Dictionary RoleNames { get; set; } + + + } +} diff --git a/ShiftOS.Objects/Objects.cs b/ShiftOS.Objects/Objects.cs index 4c1abcc..bcd476f 100644 --- a/ShiftOS.Objects/Objects.cs +++ b/ShiftOS.Objects/Objects.cs @@ -30,37 +30,6 @@ using System.Threading.Tasks; namespace ShiftOS.Objects { - public enum LegionRole - { - Admin, - Manager, - Committed, - Trainee, - AwaitingInvite - } - - public enum LegionPublicity - { - Public, //Will display on the 'Join Legion' page, anyone can join - PublicInviteOnly, //Will display on the 'Join Legion' page but you must be invited - Unlisted, //Won't display on 'Join Legion', but anyone can join - UnlistedInviteOnly //Won't display in 'Join Legion', and admin/manager invitation is required. - } - - public class Legion - { - public string Name { get; set; } - public LegionPublicity Publicity { get; set; } - public ConsoleColor BannerColor { get; set; } - public string Description { get; set; } - public string ShortName { get; set; } - - public Dictionary Roles { get; set; } - public Dictionary RoleNames { get; set; } - - - } - public class MUDMemo { public string UserFrom { get; set; } @@ -70,12 +39,6 @@ namespace ShiftOS.Objects public string Subject { get; set; } } - public class ClientSave - { - public string Username { get; set; } - public string Password { get; set; } - } - public enum MemoType { Regular, @@ -121,45 +84,4 @@ namespace ShiftOS.Objects public string Contents { get; set; } public string GUID { get; set; } } - - //Better to store this stuff server-side so we can do some neat stuff with hacking... - public class Save - { - public string Username { get; set; } - public int Codepoints { get; set; } - public Dictionary Upgrades { get; set; } - public int StoryPosition { get; set; } - public string Language { get; set; } - - public List CurrentLegions { get; set; } - - public int MajorVersion { get; set; } - public int MinorVersion { get; set; } - public int Revision { get; set; } - - public string Password { get; set; } - public string SystemName { get; set; } - - public string DiscourseName { get; set; } - - /// - /// If the user has entered their Discourse account into ShiftOS, this is the password they gave. - /// - /// ANY developer caught abusing this property will have their dev status revoked and their account PERMANENTLY SUSPENDED. - Michael - /// - public string DiscoursePass { get; set; } - - - public int CountUpgrades() - { - int count = 0; - foreach (var upg in Upgrades) - { - if (upg.Value == true) - count++; - } - return count; - } - } - } diff --git a/ShiftOS.Objects/Save.cs b/ShiftOS.Objects/Save.cs new file mode 100644 index 0000000..ff4bf53 --- /dev/null +++ b/ShiftOS.Objects/Save.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Objects +{ + //Better to store this stuff server-side so we can do some neat stuff with hacking... + public class Save + { + public string Username { get; set; } + public int Codepoints { get; set; } + public Dictionary Upgrades { get; set; } + public int StoryPosition { get; set; } + public string Language { get; set; } + + public List CurrentLegions { get; set; } + + public int MajorVersion { get; set; } + public int MinorVersion { get; set; } + public int Revision { get; set; } + + public string Password { get; set; } + public string SystemName { get; set; } + + public string DiscourseName { get; set; } + + /// + /// If the user has entered their Discourse account into ShiftOS, this is the password they gave. + /// + /// ANY developer caught abusing this property will have their dev status revoked and their account PERMANENTLY SUSPENDED. - Michael + /// + public string DiscoursePass { get; set; } + + + public int CountUpgrades() + { + int count = 0; + foreach (var upg in Upgrades) + { + if (upg.Value == true) + count++; + } + return count; + } + } +} diff --git a/ShiftOS.Objects/ShiftOS.Objects.csproj b/ShiftOS.Objects/ShiftOS.Objects.csproj index 84d7ea8..adbe161 100644 --- a/ShiftOS.Objects/ShiftOS.Objects.csproj +++ b/ShiftOS.Objects/ShiftOS.Objects.csproj @@ -54,10 +54,15 @@ + + + + + -- cgit v1.2.3