From 78525e6c04152957c5862ace155b90a9ac060002 Mon Sep 17 00:00:00 2001 From: EverythingWindows Date: Mon, 7 Nov 2022 07:13:50 +0700 Subject: [PATCH] 0.2.4 started --- .../MainForms/FileManagement.vb | 14 ++++- .../MainForms/SaveLoadSystem.vb | 9 +++ ShiftOS-TheRevival/MainForms/Shiftoriums.vb | 63 ++++++++++++++----- ShiftOS-TheRevival/MainForms/Strings.vb | 6 +- ShiftOS-TheRevival/MainForms/Terminal.vb | 19 ++++++ .../Resources/man Manuals/bc.txt | 7 ++- 6 files changed, 100 insertions(+), 18 deletions(-) diff --git a/ShiftOS-TheRevival/MainForms/FileManagement.vb b/ShiftOS-TheRevival/MainForms/FileManagement.vb index b943fba..b4f6757 100644 --- a/ShiftOS-TheRevival/MainForms/FileManagement.vb +++ b/ShiftOS-TheRevival/MainForms/FileManagement.vb @@ -3,8 +3,18 @@ Module FileManagement Public Sub CatFile(filename As String) If File.Exists(Terminal.CurrentDirectory & "\" & filename) = True Then - Dim Contents As String = File.ReadAllText(Terminal.CurrentDirectory & "\" & filename) - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & Contents + Try + Dim Contents As Byte() = File.ReadAllBytes(Terminal.CurrentDirectory & "\" & filename) + Dim ContentsFinal As String = Convert.ToString(Contents) + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ContentsFinal + Catch ex As Exception + Try + Dim ContentsFinal As String() = File.ReadAllLines(Terminal.CurrentDirectory & "\" & filename) + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ContentsFinal + Catch ex As Exception + + End Try + End Try End If End Sub End Module diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb index d08cf00..37f03d7 100644 --- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb @@ -21,6 +21,9 @@ Module SaveLoadSystem Strings.AvailableFeature(13) = "2" Strings.AvailableFeature(14) = "2" Strings.AvailableFeature(15) = "2" + '0.2.4 Features + Strings.AvailableFeature(16) = "2" + Strings.AvailableFeature(17) = "2" End Sub Public Sub FreeRoamMode() @@ -42,6 +45,9 @@ Module SaveLoadSystem Strings.AvailableFeature(13) = "1" Strings.AvailableFeature(14) = "1" Strings.AvailableFeature(15) = "1" + '0.2.4 Features + Strings.AvailableFeature(16) = "1" + Strings.AvailableFeature(17) = "1" End Sub Public Sub GodMode() @@ -62,6 +68,9 @@ Module SaveLoadSystem Strings.AvailableFeature(12) = "2" Strings.AvailableFeature(14) = "2" Strings.AvailableFeature(15) = "2" + '0.2.4 Features + Strings.AvailableFeature(16) = "2" + Strings.AvailableFeature(17) = "2" End Sub Public Sub SaveGame() diff --git a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb index 23552ee..9b31a28 100644 --- a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb +++ b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb @@ -35,29 +35,37 @@ Else If Strings.AvailableFeature(15) = "0" Then Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(4bitcolor | 80 CP) 4-bit Color Support" + Else + If Strings.AvailableFeature(16) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(romdriver | 90 CP) Terminal Read-Only Memory Support" + Else + If Strings.AvailableFeature(17) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(textpad | 100 CP) TextPad" + End If + End If End If End If End If End If - End If - End If - If Strings.AvailableFeature(5) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds" - Else - If Strings.AvailableFeature(6) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(mtime | 20 CP) Time by Minutes" + End If + If Strings.AvailableFeature(5) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds" Else - If Strings.AvailableFeature(7) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(htime | 30 CP) Time by Hours" + If Strings.AvailableFeature(6) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(mtime | 20 CP) Time by Minutes" Else - If Strings.AvailableFeature(12) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(pmam | 40 CP) PM and AM" + If Strings.AvailableFeature(7) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(htime | 30 CP) Time by Hours" + Else + If Strings.AvailableFeature(12) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(pmam | 40 CP) PM and AM" + End If End If End If End If - End If - If Strings.AvailableFeature(9) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(bc | 55 CP) Basic Calculator" + If Strings.AvailableFeature(9) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(bc | 55 CP) Basic Calculator" + End If End If End If End If @@ -181,6 +189,20 @@ Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds to 16 colours support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1) Terminal.BadCommand = False End If + Case "romdriver" + If Strings.AvailableFeature(16) = "0" Then + ManHeader(0) = "Terminal Read-Only Memory Driver" + ManHeader(1) = "90 CP" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS Read-Only Memory support for ShiftOS such as writing and reading permanent memory such as HDD, SDD, etc." & Environment.NewLine & Environment.NewLine & ManHeader(1) + Terminal.BadCommand = False + End If + Case "textpad" + If Strings.AvailableFeature(17) = "0" Then + ManHeader(0) = "TextPad" + ManHeader(1) = "100 CP" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "A simple text-editor for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1) + Terminal.BadCommand = False + End If Case Else Terminal.BadCommand = False Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -238,6 +260,12 @@ Case "4bitcolor" Shiftorium_InstallFeatures(True, "4bitcolor", 15, 80) Terminal.BadCommand = False + Case "romdriver" + Shiftorium_InstallFeatures(True, "romdriver", 16, 90) + Terminal.BadCommand = False + Case "textpad" + Shiftorium_InstallFeatures(True, "textpad", 17, 100) + Terminal.BadCommand = False Case Else Terminal.BadCommand = False Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -316,7 +344,14 @@ success = True Case "4bitcolor" Strings.AvailableFeature(15) = "1" + Strings.AvailableFeature(16) = "0" success = True + Case "romdriver" + Strings.AvailableFeature(16) = "1" + Strings.AvailableFeature(17) = "0" + success = True + Case "textpad" + Strings.AvailableFeature(17) = "1" End Select If success = False Then If IsCLI = True Then diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb index feccafb..062966f 100644 --- a/ShiftOS-TheRevival/MainForms/Strings.vb +++ b/ShiftOS-TheRevival/MainForms/Strings.vb @@ -3,7 +3,7 @@ Public Shared ComputerInfo(4) As String Public Shared IsFree As Boolean Public Shared OnceInfo(6) As String - Public Shared AvailableFeature(15) As String + Public Shared AvailableFeature(17) As String Public Shared CLIInterpreter As String Public Shared SaveFile As String @@ -59,6 +59,8 @@ '13 = Red, Green, Blue [Adds Red, Green, and Blue support to the Display Driver] (0.2.3) (default : 0) '14 = RGB Variant [Adds lighter or darker variant of Red, Green, and Blue] (0.2.3) (default : 0) '15 = 4-bit Color Display [Adds to 16 colours support to the Display Driver] (0.2.3) (default : 0) + '16 = Terminal Read-Only Memory Driver [ShiftOS Read-Only Memory support for HDD, SSD, etc.] (0.2.4) (default : 0) + '17 = TextPad [Notepad] (0.2.4) (default : 0) ' 'Features bought hierarchy : 'ShiftOS Key (KEY) (5 CP) @@ -72,6 +74,8 @@ '>>>>>Red, Green, Blue (rgb) (70 CP) '>>>>>>RGB Variant (rgb2) (75 CP) '>>>>>>>4-bit Color Display (4BITCOLOR) (80 CP) + '>>>>>>>>Terminal Read-Only Memory Driver (ROMDRIVER, DIR, MKDIR, RMDIR, CD, PWD) (90 CP) + '>>>>>>>>>TextPad (100 CP) '>>Basic Calculator (BC) (55 CP) '>>Time by Seconds (TIME, STIME) (10 CP) '>>>Time by Minutes (TIME, MTIME) (20 CP) diff --git a/ShiftOS-TheRevival/MainForms/Terminal.vb b/ShiftOS-TheRevival/MainForms/Terminal.vb index c4a4e7b..0c5565a 100644 --- a/ShiftOS-TheRevival/MainForms/Terminal.vb +++ b/ShiftOS-TheRevival/MainForms/Terminal.vb @@ -211,21 +211,36 @@ Public Class Terminal If Strings.AvailableFeature(9) = 1 Then TextBox1.Text = TextBox1.Text & Environment.NewLine & "BC Basic Calculator for simple calculation" End If + If Strings.AvailableFeature(16) = 1 Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & "CD Changes directory to a selected one" + End If If Strings.AvailableFeature(1) = 1 Then TextBox1.Text = TextBox1.Text & Environment.NewLine & "CLEAR Clear the terminal" End If TextBox1.Text = TextBox1.Text & Environment.NewLine & "CODEPOINT Display Codepoint(s) from your wallet" TextBox1.Text = TextBox1.Text & Environment.NewLine & "COLOR Changes Terminal Text and Background color to the corresponding choice" TextBox1.Text = TextBox1.Text & Environment.NewLine & "COLORS Shows available colors support for the terminal" + If Strings.AvailableFeature(16) = 1 Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & "DIR Displays subdirectories and files in a directory" + End If TextBox1.Text = TextBox1.Text & Environment.NewLine & "GUESS Runs 'Guess the Number' application" TextBox1.Text = TextBox1.Text & Environment.NewLine & "HELP Shows all commands available and its corresponding action" If Strings.AvailableFeature(0) = 1 Then TextBox1.Text = TextBox1.Text & Environment.NewLine & "MAN Shows a command, its corresponding action, and its example usage" End If + If Strings.AvailableFeature(16) = 1 Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & "MKDIR Creating a directory" + End If + If Strings.AvailableFeature(16) = 1 Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & "PWD Display current directory navigated on ShiftOS" + End If If Strings.AvailableFeature(2) = 1 Then TextBox1.Text = TextBox1.Text & Environment.NewLine & "PRINT Prints a corresponding text entered in the command" End If TextBox1.Text = TextBox1.Text & Environment.NewLine & "REBOOT Terminate and re-run ShiftOS session" + If Strings.AvailableFeature(16) = 1 Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & "RMDIR Deleting a directory" + End If If Strings.AvailableFeature(8) = 1 Then TextBox1.Text = TextBox1.Text & Environment.NewLine & "SHIFTFETCH Shows informations about your computer" End If @@ -256,6 +271,10 @@ Public Class Terminal AppHost("textpad", True) AdvancedCommand = False BadCommand = False + Case "pwd" + TextBox1.Text = TextBox1.Text & Environment.NewLine & CurrentDirectory.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", "!") + AdvancedCommand = False + BadCommand = False Case "reboot" TextBox1.Text = Nothing AdvancedCommand = False diff --git a/ShiftOS-TheRevival/Resources/man Manuals/bc.txt b/ShiftOS-TheRevival/Resources/man Manuals/bc.txt index c710e86..249210e 100644 --- a/ShiftOS-TheRevival/Resources/man Manuals/bc.txt +++ b/ShiftOS-TheRevival/Resources/man Manuals/bc.txt @@ -1 +1,6 @@ -A basic command-line tool for simple calculation. \ No newline at end of file +A basic command-line tool for simple calculation. + +example: +5*5+5 +8-3 +44/2 \ No newline at end of file