Finish MPN00Bs

.github/workflows/build.yml

@@ -193,7 +193,7 @@ jobs:
         cd HISPd
         dotnet publish -p:PublishProfile=Win64.pubxml
         cd ..
-        cd N00BS
+        cd MPN00BS
         dotnet publish -p:PublishProfile=Win64.pubxml
         cd ..
 
@@ -218,7 +218,7 @@ jobs:
         cd HISPd
         dotnet publish -p:PublishProfile=Win32.pubxml
         cd ..
-        cd N00BS
+        cd MPN00BS
         dotnet publish -p:PublishProfile=Win32.pubxml
         cd ..
     - name: Build win-arm
@@ -280,13 +280,13 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: HISP-Win32-Noobs
-        path: HorseIsleServer\N00BS\bin\x86\Windows\net7.0\win-x86\publish\
+        path: HorseIsleServer\MPN00BS\bin\x86\Windows\net7.0\win-x86\publish\
 
     - name: Upload win-x64-noobs
       uses: actions/upload-artifact@v2
       with:
         name: HISP-Win64-Noobs
-        path: HorseIsleServer\N00BS\bin\x64\Windows\net7.0\win-x64\publish\
+        path: HorseIsleServer\MPN00BS\bin\x64\Windows\net7.0\win-x64\publish\
 
 
 

HorseIsleServer/HISPd/Resources/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: hisp
-Version: 1.7.102
+Version: 1.7.103
 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
 Maintainer: Li
 Homepage: https://islehorse.com

HorseIsleServer/LibHISP/Game/Chat/Chat.cs

@@ -110,7 +110,7 @@ namespace HISP.Game.Chat
         }
         public static Object FilterMessage(string message) // Handles chat filtering and violation stuffs
         {
-            if (!ConfigReader.BadWords) // Freedom of Speech Mode
+            if (!ConfigReader.EnableSwearFilter) // Freedom of Speech Mode
                 return null;
 
 
@@ -359,7 +359,7 @@ namespace HISP.Game.Chat
 
         public static string DoCorrections(string message)
         {
-            if (!ConfigReader.DoCorrections)
+            if (!ConfigReader.EnableCorrections)
                 return message;
 
             foreach(Correction correct in CorrectedWords)
@@ -466,7 +466,7 @@ namespace HISP.Game.Chat
 
         public static string NonViolationChecks(User user, string message)
         {
-            if(!ConfigReader.DoNonViolations)
+            if(!ConfigReader.EnableNonViolations)
                 return null;
 
             // Check if contains password.

HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.7.102.0")]
+[assembly: AssemblyVersion("1.7.103.0")]
-[assembly: AssemblyFileVersion("1.7.102.0")]
+[assembly: AssemblyFileVersion("1.7.103.0")]

HorseIsleServer/LibHISP/Server/ConfigReader.cs

@@ -28,9 +28,9 @@ namespace HISP.Server
         public static bool EnableSpamFilter = true;
         public static bool AllUsersSubbed = false;
         public static bool FixOfficalBugs = false;
-        public static bool BadWords = true;
+        public static bool EnableSwearFilter = true;
-        public static bool DoCorrections = true;
+        public static bool EnableCorrections = true;
-        public static bool DoNonViolations = true;
+        public static bool EnableNonViolations = true;
 
         public static string ConfigurationFileName = "server.properties";
         public static void OpenConfig()
@@ -102,13 +102,13 @@ namespace HISP.Server
                         AllUsersSubbed = data == "true";
                         break;
                     case "enable_corrections":
-                        DoCorrections = data == "true";
+                        EnableCorrections = data == "true";
                         break;
                     case "sql_lite":
                         SqlLite = data == "true";
                         break;
                     case "enable_non_violation_check":
-                        DoNonViolations = data == "true";
+                        EnableNonViolations = data == "true";
                         break;
                     case "enable_spam_filter":
                         EnableSpamFilter = data == "true";
@@ -117,7 +117,7 @@ namespace HISP.Server
                         FixOfficalBugs = data == "true";
                         break;
                     case "enable_word_filter":
-                        BadWords = data == "true";
+                        EnableSwearFilter = data == "true";
                         break;
                     case "mods_folder":
                         ModsFolder = data;

HorseIsleServer/LibHISP/Server/Entry.cs

@@ -67,10 +67,10 @@ namespace HISP.Server
             Exception execpt = (Exception)e.ExceptionObject;
 
 
-            string crashMsg = "HISP HAS CRASHED :(";
+            string crashMsg = "HISP HAS CRASHED :(" + "\n";
-            crashMsg += "Build: " + ServerVersion.GetBuildString();
+            crashMsg += "Build: " + ServerVersion.GetBuildString() + "\n";
-            crashMsg += "Unhandled Exception: " + execpt.Message;
+            crashMsg += "Unhandled Exception: " + execpt.Message + "\n";
-            crashMsg += execpt.StackTrace;
+            crashMsg += execpt.StackTrace + "\n";
 
             Logger.CrashPrint(crashMsg);
             

HorseIsleServer/MPN00BS/App.axaml

@@ -1,5 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="using:MPN00BS.ViewModels"
+             x:DataType="vm:HispViewModel"
+             x:CompileBindings="True"
              Name="Horse Isle"
              x:Class="MPN00BS.App">
     <Application.Styles>
@@ -14,31 +17,31 @@
           <NativeMenu>
             <NativeMenuItem Header="Users">
               <NativeMenu>
-                <NativeMenuItem Header="Create New User" />
+                <NativeMenuItem Header="Create New User" Command="{Binding createAccountCommand}"/>
-                <NativeMenuItem Header="Reset Passsword" />
+                <NativeMenuItem Header="Reset Passsword" Command="{Binding resetPasswordCommand}"/>
               </NativeMenu>
             </NativeMenuItem>
             <NativeMenuItem Header="Server">
               <NativeMenu>
-                <NativeMenuItem Header="Shutdown Server" />
+                <NativeMenuItem Header="Shutdown Server" Command="{Binding shutdownServerCommand}"/>
-                <NativeMenuItem Header="Chat">
+                <!-- <NativeMenuItem Header="Chat">
                   <NativeMenu>
-                    <NativeMenuItem Header="Disable Swear Filter" ToggleType="CheckBox" IsChecked="True"/>
+                    <NativeMenuItem Header="{Binding swearFilterHeader}" Command="{Binding toggleSwearFilter}"/>
-                    <NativeMenuItem Header="Disable Corrections" ToggleType="CheckBox" IsChecked="True"/>
+                    <NativeMenuItem Header="Disable Corrections"/>
-                    <NativeMenuItem Header="Disable Non-Vio Checks" ToggleType="CheckBox" IsChecked="True"/>
+                    <NativeMenuItem Header="Disable Non-Vio Checks"/>
-                    <NativeMenuItem Header="Disable Spam Filter" ToggleType="CheckBox" IsChecked="True"/>
+                    <NativeMenuItem Header="Disable Spam Filter"/>
                   </NativeMenu>
                 </NativeMenuItem>
                 <NativeMenuItem Header="Game">
                   <NativeMenu>
-                    <NativeMenuItem Header="All Users Subscribed" ToggleType="CheckBox" IsChecked="True"/>
+                    <NativeMenuItem Header="Disable All Users Subscribed"/>
-                    <NativeMenuItem Header="Fix Offical Bugs" ToggleType="CheckBox" IsChecked="True"/>
+                    <NativeMenuItem Header="Disable Fix Offical Bugs"/>
                   </NativeMenu>
-                </NativeMenuItem>
+                </NativeMenuItem> -->
                 <NativeMenuItem Header="Advanced">
                   <NativeMenu>
-                    <NativeMenuItem Header="Edit &quot;server.properties&quot;" />
+                    <NativeMenuItem Header="Edit &quot;server.properties&quot;" Command="{Binding editServerPropertiesCommand}"/>
-                    <NativeMenuItem Header="Open Server Folder" />
+                    <NativeMenuItem Header="Open Server Folder" Command="{Binding openServerFolderCommand}"/>
                   </NativeMenu>
                 </NativeMenuItem>
               </NativeMenu>

HorseIsleServer/MPN00BS/App.axaml.cs

@@ -1,11 +1,18 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using HISP.Server;
+using MPN00BS.ViewModels;
 
 namespace MPN00BS
 {
     public partial class App : Application
     {
+        public App()
+        {
+            this.DataContext = new HispViewModel();
+        }
+        
         public override void Initialize()
         {
             AvaloniaXamlLoader.Load(this);

HorseIsleServer/MPN00BS/HispViewModel.cs

@@ -0,0 +1,106 @@
+using HISP.Server;
+using MiniMvvm;
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace MPN00BS.ViewModels
+{
+    public class HispViewModel : ViewModelBase
+    {
+        public HispViewModel()
+        {
+            ServerStarter.ReadServerProperties();
+            swearFilterHeader = (ConfigReader.EnableSwearFilter ? "Disable" : "Enable") + " Swear Filter";
+
+            createAccountCommand = MiniCommand.Create(() =>
+            {
+                if (!ServerStarter.HasServerStarted)
+                {
+                    MessageBox.Show(null, "There is no Horse Isle Server running yet.", "Server not Started.", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+                new RegisterWindow().Show();
+            });
+
+            resetPasswordCommand = MiniCommand.Create(() =>
+            {
+                if (!ServerStarter.HasServerStarted)
+                {
+                    MessageBox.Show(null, "There is no Horse Isle Server running yet.", "Server not Started.", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+
+                new ResetWindow().Show();
+            });
+
+            editServerPropertiesCommand = MiniCommand.Create(() =>
+            {
+                if (!ServerStarter.HasServerStarted)
+                {
+                    MessageBox.Show(null, "There is no Horse Isle Server running yet.", "Server not Started.", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+
+                Process p = new Process();
+                p.StartInfo.FileName = Path.Combine(ServerStarter.BaseDir, "server.properties");
+                p.StartInfo.UseShellExecute = true;
+                p.Start();
+
+            });
+
+            openServerFolderCommand = MiniCommand.Create(() =>
+            {
+                if (!ServerStarter.HasServerStarted)
+                {
+                    MessageBox.Show(null, "There is no Horse Isle Server running yet.", "Server not Started.", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+
+                Process p = new Process();
+                p.StartInfo.FileName = ServerStarter.BaseDir;
+                p.StartInfo.UseShellExecute = true;
+                p.Start();
+            });
+
+            shutdownServerCommand = MiniCommand.Create(() =>
+            {
+                if (!ServerStarter.HasServerStarted)
+                {
+                    MessageBox.Show(null, "There is no Horse Isle Server running yet.", "Server not Started.", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+
+                GameServer.ShutdownServer();
+            });
+
+
+            toggleSwearFilter = MiniCommand.Create(() =>
+            {
+                if (!ServerStarter.HasServerStarted)
+                {
+                    MessageBox.Show(null, "There is no Horse Isle Server running yet.", "Server not Started.", MessageBox.MessageBoxButtons.Ok);
+                    return;
+                }
+
+                bool enab = !ConfigReader.EnableSwearFilter;
+                ServerStarter.ModifyConfig("enable_word_filter", enab.ToString().ToLowerInvariant());
+                ConfigReader.EnableSwearFilter = enab;
+                swearFilterHeader = (ConfigReader.EnableSwearFilter ? "Disable" : "Enable") + " Swear Filter";
+            });
+            
+        }
+
+ 
+
+
+        public String swearFilterHeader { get; set; }
+        public MiniCommand shutdownServerCommand { get; }
+        public MiniCommand createAccountCommand { get; }
+        public MiniCommand editServerPropertiesCommand { get; }
+        public MiniCommand openServerFolderCommand { get; }
+        public MiniCommand toggleSwearFilter { get; }
+        public MiniCommand resetPasswordCommand { get; }
+
+    }
+}

HorseIsleServer/MPN00BS/LoadingWindow.axaml

@@ -5,7 +5,8 @@
         mc:Ignorable="d" d:DesignWidth="820" d:DesignHeight="200"
         x:Class="MPN00BS.LoadingWindow"
         Title="Starting Server ..." Height="200" Width="820"
-        MaxHeight="200" MaxWidth="820" Icon="/icon.ico">
+        MaxHeight="200" MaxWidth="820" Icon="/icon.ico"
+        Closing="OnServerClose">
   <Grid Height="200" Width="820">
     <Grid.ColumnDefinitions>
       <ColumnDefinition Width="1*" />

HorseIsleServer/MPN00BS/LoadingWindow.axaml.cs

@@ -1,22 +1,28 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
+using HISP.Server;
+using System;
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace MPN00BS
 {
     public partial class LoadingWindow : Window
     {
-
+        private void OnClientExit()
-
+        {
+            try
+            {
+                GameServer.ShutdownServer();
+            }catch(Exception) { }
+        }
         public void OnServerStarted()
         {
             Dispatcher.UIThread.InvokeAsync(() =>
             {
                 this.Hide();
-                new SystemTrayIcon().Show();
+                ServerStarter.StartHorseIsleClient(OnClientExit, "127.0.0.1", 12321);
-                this.Close();
             });
         }
         public void OnNoUsersFound()
@@ -27,6 +33,15 @@ namespace MPN00BS
             });
         }
 
+        private void OnShutdown()
+        {
+            Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                ServerStarter.CloseHorseIsleClient();
+                this.Close();
+            });
+        }
+
         public void ProgressUpdate()
         {
             Dispatcher.UIThread.InvokeAsync(() =>
@@ -40,9 +55,13 @@ namespace MPN00BS
 #if DEBUG
             this.AttachDevTools();
 #endif
-
             ServerStarter.StartHttpServer();
-            new Task( () => ServerStarter.StartHispServer(ProgressUpdate, OnNoUsersFound, OnServerStarted)).Start();
+            new Task( () => ServerStarter.StartHispServer(ProgressUpdate, OnNoUsersFound, OnServerStarted, OnShutdown)).Start();
+        }
+
+        private void OnServerClose(object sender, CancelEventArgs e)
+        {
+            GameServer.ShutdownServer();
         }
 
         private void InitializeComponent()

HorseIsleServer/MPN00BS/MiniMvvm/MiniCommand.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace MiniMvvm
+{
+    public sealed class MiniCommand<T> : MiniCommand, ICommand
+    {
+        private readonly Action<T> _cb;
+        private bool _busy;
+        private Func<T, Task> _acb;
+
+        public MiniCommand(Action<T> cb)
+        {
+            _cb = cb;
+        }
+
+        public MiniCommand(Func<T, Task> cb)
+        {
+            _acb = cb;
+        }
+
+        private bool Busy
+        {
+            get => _busy;
+            set
+            {
+                _busy = value;
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+
+        public override event EventHandler CanExecuteChanged;
+        public override bool CanExecute(object parameter) => !_busy;
+
+        public override async void Execute(object parameter)
+        {
+            if (Busy)
+                return;
+            try
+            {
+                Busy = true;
+                if (_cb != null)
+                    _cb((T)parameter);
+                else
+                    await _acb((T)parameter);
+            }
+            finally
+            {
+                Busy = false;
+            }
+        }
+    }
+
+    public abstract class MiniCommand : ICommand
+    {
+        public static MiniCommand Create(Action cb) => new MiniCommand<object>(_ => cb());
+        public static MiniCommand Create<TArg>(Action<TArg> cb) => new MiniCommand<TArg>(cb);
+        public static MiniCommand CreateFromTask(Func<Task> cb) => new MiniCommand<object>(_ => cb());
+
+        public abstract bool CanExecute(object parameter);
+        public abstract void Execute(object parameter);
+        public abstract event EventHandler CanExecuteChanged;
+    }
+}

HorseIsleServer/MPN00BS/MiniMvvm/PropertyChangedExtensions.cs

@@ -0,0 +1,108 @@
+using System;
+using System.ComponentModel;
+using System.Linq.Expressions;
+using System.Reactive.Linq;
+using System.Reflection;
+
+namespace MiniMvvm
+{
+    public static class PropertyChangedExtensions
+    {
+        class PropertyObservable<T> : IObservable<T>
+        {
+            private readonly INotifyPropertyChanged _target;
+            private readonly PropertyInfo _info;
+
+            public PropertyObservable(INotifyPropertyChanged target, PropertyInfo info)
+            {
+                _target = target;
+                _info = info;
+            }
+
+            class Subscription : IDisposable
+            {
+                private readonly INotifyPropertyChanged _target;
+                private readonly PropertyInfo _info;
+                private readonly IObserver<T> _observer;
+
+                public Subscription(INotifyPropertyChanged target, PropertyInfo info, IObserver<T> observer)
+                {
+                    _target = target;
+                    _info = info;
+                    _observer = observer;
+                    _target.PropertyChanged += OnPropertyChanged;
+                    _observer.OnNext((T)_info.GetValue(_target));
+                }
+
+                private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+                {
+                    if (e.PropertyName == _info.Name)
+                        _observer.OnNext((T)_info.GetValue(_target));
+                }
+
+                public void Dispose()
+                {
+                    _target.PropertyChanged -= OnPropertyChanged;
+                    _observer.OnCompleted();
+                }
+            }
+
+            public IDisposable Subscribe(IObserver<T> observer)
+            {
+                return new Subscription(_target, _info, observer);
+            }
+        }
+
+        public static IObservable<TRes> WhenAnyValue<TModel, TRes>(this TModel model,
+            Expression<Func<TModel, TRes>> expr) where TModel : INotifyPropertyChanged
+        {
+            var l = (LambdaExpression)expr;
+            var ma = (MemberExpression)l.Body;
+            var prop = (PropertyInfo)ma.Member;
+            return new PropertyObservable<TRes>(model, prop);
+        }
+
+        public static IObservable<TRes> WhenAnyValue<TModel, T1, TRes>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Func<T1, TRes> cb
+        ) where TModel : INotifyPropertyChanged
+        {
+            return model.WhenAnyValue(v1).Select(cb);
+        }
+
+        public static IObservable<TRes> WhenAnyValue<TModel, T1, T2, TRes>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2,
+            Func<T1, T2, TRes> cb
+        ) where TModel : INotifyPropertyChanged =>
+            Observable.CombineLatest(
+                model.WhenAnyValue(v1),
+                model.WhenAnyValue(v2),
+                cb);
+
+        public static IObservable<ValueTuple<T1, T2>> WhenAnyValue<TModel, T1, T2>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2
+        ) where TModel : INotifyPropertyChanged =>
+            model.WhenAnyValue(v1, v2, (a1, a2) => (a1, a2));
+
+        public static IObservable<TRes> WhenAnyValue<TModel, T1, T2, T3, TRes>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2,
+            Expression<Func<TModel, T3>> v3,
+            Func<T1, T2, T3, TRes> cb
+        ) where TModel : INotifyPropertyChanged =>
+            Observable.CombineLatest(
+                model.WhenAnyValue(v1),
+                model.WhenAnyValue(v2),
+                model.WhenAnyValue(v3),
+                cb);
+
+        public static IObservable<ValueTuple<T1, T2, T3>> WhenAnyValue<TModel, T1, T2, T3>(this TModel model,
+            Expression<Func<TModel, T1>> v1,
+            Expression<Func<TModel, T2>> v2,
+            Expression<Func<TModel, T3>> v3
+        ) where TModel : INotifyPropertyChanged =>
+            model.WhenAnyValue(v1, v2, v3, (a1, a2, a3) => (a1, a2, a3));
+    }
+}

HorseIsleServer/MPN00BS/MiniMvvm/ViewModelBase.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Joins;
+using System.Runtime.CompilerServices;
+
+namespace MiniMvvm
+{
+    public class ViewModelBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (!EqualityComparer<T>.Default.Equals(field, value))
+            {
+                field = value;
+                RaisePropertyChanged(propertyName);
+                return true;
+            }
+            return false;
+        }
+
+
+        protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}

HorseIsleServer/MPN00BS/ResetWindow.axaml

@@ -0,0 +1,29 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="530" d:DesignHeight="200"
+        x:Class="MPN00BS.ResetWindow"
+        Title="Reset Password" 
+        Icon="/icon.ico"
+        MinWidth="530"
+        MinHeight="200"
+        MaxWidth="530"
+        MaxHeight="530"
+        Height="200" 
+        Width="530">
+    <Grid Height="200" Width="530">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*" />
+            <RowDefinition Height="1*" />
+            <RowDefinition Height="1*" />
+            <RowDefinition Height="1*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <TextBox Name="usernameBox" KeyUp="usernameChanged" HorizontalAlignment="Center" Grid.Row="0" TextWrapping="Wrap" Watermark="Username" VerticalAlignment="Center" Width="510"/>
+        <TextBox Name="passwordBox" KeyUp="passwordChanged" HorizontalAlignment="Center" Grid.Row="1" TextWrapping="Wrap" PasswordChar="*" Watermark="Password" VerticalAlignment="Center" Width="510"/>
+        <Label Name="usernameValidationFailReason" Content="- Username not found." HorizontalAlignment="Left" Grid.Row="2" VerticalAlignment="Center" Foreground="Red"/>
+        <Label Name="passwordValidationFailReason" Content="- Password must be more than 6 characters." HorizontalAlignment="Left" Grid.Row="3" VerticalAlignment="Center" Foreground="Red"/>
+        <Button Name="resetPasswordButton" Click="ResetPassword" IsEnabled="False" Content="Reset Password" HorizontalAlignment="Center" Grid.Row="4" Width="510"/>
+    </Grid>
+</Window>

HorseIsleServer/MPN00BS/ResetWindow.axaml.cs

@@ -0,0 +1,147 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using HISP.Security;
+using HISP.Server;
+using System;
+using System.Text.RegularExpressions;
+
+namespace MPN00BS
+{
+    public partial class ResetWindow : Window
+    {
+        public ResetWindow()
+        {
+            InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        private void ValidateInput()
+        {
+            if (ValidateUsername() && ValidatePassword())
+                resetPasswordButton.IsEnabled = true;
+            else
+                resetPasswordButton.IsEnabled = false;
+        }
+
+        private bool ValidatePassword()
+        {
+            if (passwordBox == null)
+                return false;
+            if (passwordBox.Text == null)
+                return false;
+
+            int selStart = passwordBox.SelectionStart;
+            int selEnd = passwordBox.SelectionEnd;
+            passwordBox.Text = Regex.Replace(passwordBox.Text, "[^A-Za-z0-9]", "");
+            passwordBox.SelectionStart = selStart;
+            passwordBox.SelectionEnd = selEnd;
+
+            if (passwordBox.Text.Length < 6)
+            {
+                passwordValidationFailReason.Content = "- Password must be more than 6 characters.";
+                return false;
+            }
+
+            if (passwordBox.Text.Length >= 16)
+            {
+                passwordValidationFailReason.Content = "- Password must be less than 16 characters.";
+                return false;
+            }
+
+            passwordValidationFailReason.Content = "";
+            return true;
+        }
+
+        private bool ValidateUsername()
+        {
+            if (usernameBox == null)
+                return false;
+            if (usernameBox.Text == null)
+                return false;
+            int selStart = usernameBox.SelectionStart;
+            int selEnd = usernameBox.SelectionEnd;
+            usernameBox.Text = Regex.Replace(usernameBox.Text, "[^A-Za-z]", "");
+            usernameBox.SelectionStart = selStart;
+            usernameBox.SelectionEnd = selEnd;
+
+            if (usernameBox.Text.Length < 3)
+            {
+                usernameValidationFailReason.Content = "- Username must be more than 3 characters.";
+                return false;
+            }
+
+            if (usernameBox.Text.Length >= 16)
+            {
+                usernameValidationFailReason.Content = "- Username must be less than 16 characters.";
+                return false;
+            }
+
+            if (Regex.IsMatch(usernameBox.Text, "[A-Z]{2,}"))
+            {
+                usernameValidationFailReason.Content = "- Username have the first letter of each word capitalized.";
+                return false;
+            }
+
+            if (usernameBox.Text.ToUpper()[0] != usernameBox.Text[0])
+            {
+                usernameValidationFailReason.Content = "- Username have the first letter of each word capitalized.";
+                return false;
+            }
+
+            if (!Database.CheckUserExist(usernameBox.Text))
+            {
+                usernameValidationFailReason.Content = "- Username not found.";
+                return false;
+            }
+
+            usernameValidationFailReason.Content = "";
+            return true;
+        }
+
+        private void usernameChanged(object sender, KeyEventArgs e)
+        {
+            if (usernameBox == null)
+                return;
+
+            ValidateInput();
+        }
+        private void passwordChanged(object sender, KeyEventArgs e)
+        {
+            if (passwordBox == null)
+                return;
+
+            ValidateInput();
+
+        }
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+            resetPasswordButton = this.FindControl<Button>("resetPasswordButton");
+
+            usernameValidationFailReason = this.FindControl<Label>("usernameValidationFailReason");
+            passwordValidationFailReason = this.FindControl<Label>("passwordValidationFailReason");
+
+            usernameBox = this.FindControl<TextBox>("usernameBox");
+            passwordBox = this.FindControl<TextBox>("passwordBox");
+        }
+
+        private void ResetPassword(object sender, RoutedEventArgs e)
+        {
+            // Get salt
+            byte[] salt = Database.GetPasswordSalt(usernameBox.Text);
+
+            // Hash password
+            string hashsalt = BitConverter.ToString(Authentication.HashAndSalt(passwordBox.Text, salt)).Replace("-", "");
+
+            Database.SetPasswordHash(usernameBox.Text, hashsalt);
+
+            this.Close();
+        }
+
+    }
+
+}

HorseIsleServer/MPN00BS/ServerStarter.cs

@@ -11,12 +11,14 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using static MPN00BS.MessageBox;
-using System.Threading.Tasks;
 
 namespace MPN00BS
 {
+    
     public class ServerStarter
     {
+        public static bool HasServerStarted = false;
+        private static Process clientProcess = new Process();
         private static Action HorseIsleClientExitCallback;
         public static string BaseDir = "";
         private static ContentServer cs = null;
@@ -30,27 +32,30 @@ namespace MPN00BS
 
         }
 
-        public static void OnShutdown()
-        {
-            if (!Process.GetCurrentProcess().CloseMainWindow())
-                Process.GetCurrentProcess().Close();
-        }
 
         public static void ShowCrash(bool error, string type, string text)
         {
             if (type == "CRASH")
+            {
+                File.AppendAllText(Path.Combine(BaseDir, "crash.log"), text);
                 MessageBox.Show(null, text, type, MessageBoxButtons.Ok);
+            }
         }
+
         private static void HorseIsleClientExited(object sender, EventArgs e)
         {
             HorseIsleClientExitCallback();
         }
 
+        public static void CloseHorseIsleClient()
+        {
+            clientProcess.Kill();
+        }
         public static void StartHorseIsleClient(Action callback, string serverIp, int serverPort)
         {
             HorseIsleClientExitCallback = callback;
 
-            Process clientProcess = new Process();
+            clientProcess = new Process();
             clientProcess.StartInfo.FileName = "flash.dll";
             clientProcess.StartInfo.Arguments = "http://127.0.0.1/horseisle.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString();
 
@@ -62,17 +67,15 @@ namespace MPN00BS
             clientProcess.Start();
         }
 
-        public static void StartHispServer(Action ProgressCallback, Action UserCreationCallback, Action ServerStartedCallback)
+        public static void ReadServerProperties()
         {
-
+            SetBaseDir();
-            Entry.RegisterCrashHandler();
-            Logger.SetCallback(ShowCrash);
-
             ConfigReader.ConfigurationFileName = Path.Combine(BaseDir, "server.properties");
             ConfigReader.OpenConfig();
             ConfigReader.SqlLite = true;
             ConfigReader.LogLevel = 0;
-            ConfigReader.CrossDomainPolicyFile = Path.Combine(BaseDir, "CrossDomainPolicy.xml");
+            ConfigReader.CrossDomainPolicyFile = Path.Combine(BaseDir, ConfigReader.CrossDomainPolicyFile);
+
 
             // Compatibility patch
             if (File.Exists(Path.Combine(BaseDir, "game1.db.db")))
@@ -80,7 +83,15 @@ namespace MPN00BS
                 File.Move(Path.Combine(BaseDir, "game1.db.db"), Path.Combine(BaseDir, "game1.db"));
             }
 
-            ConfigReader.DatabaseName = Path.Combine(BaseDir, "game1");
+            ConfigReader.DatabaseName = Path.Combine(BaseDir, ConfigReader.DatabaseName);
+        }
+        public static void StartHispServer(Action ProgressCallback, Action UserCreationCallback, Action ServerStartedCallback, Action OnShutdown)
+        {
+
+            Entry.RegisterCrashHandler();
+            Logger.SetCallback(ShowCrash);
+            ReadServerProperties();
+
 
             ProgressCallback();
             Database.OpenDatabase();
@@ -147,19 +158,50 @@ namespace MPN00BS
                 return;
             }
             ProgressCallback();
-
+            HasServerStarted = true;
             ServerStartedCallback();
         }
-        public static void StartHttpServer()
+
+        public static void ModifyConfig(string okey, string value)
         {
+            string[] configFile = File.ReadAllLines(ConfigReader.ConfigurationFileName);
+            for (int i = 0; i < configFile.Length; i++)
+            {
+                string setting = configFile[i];
+
+                if (setting.Length < 1)
+                    continue;
+                if (setting[0] == '#')
+                    continue;
+                if (!setting.Contains("="))
+                    continue;
+
+                string[] dataPair = setting.Split('=');
+
+                string key = dataPair[0];
+
+                if (key == okey)
+                {
+                    dataPair[1] = value;
+                    configFile[i] = string.Join('=', dataPair);
+                }
+            }
+            File.WriteAllLines(ConfigReader.ConfigurationFileName, configFile);
+        }
+
+        public static void SetBaseDir()
+        {
+
             string hispFolder = Environment.GetEnvironmentVariable("APPDATA");
             if (hispFolder == null)
                 return;
 
             BaseDir = Path.Combine(hispFolder, "HISP", "N00BS");
             Directory.CreateDirectory(BaseDir);
-
+        }
-
+        public static void StartHttpServer()
+        {
+            SetBaseDir();
             try
             {
                 cs = new ContentServer("127.0.0.1");

HorseIsleServer/MPN00BS/SystemTrayIcon.axaml

@@ -1,15 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="1" d:DesignHeight="0"
-        x:Class="MPN00BS.SystemTrayIcon"
-        Title="System Tray Icon"
-        Height="0"
-        Width="0"
-        MaxWidth="0"
-        MaxHeight="0"
-        Icon="/icon.ico"
-        IsVisible="False">
-  
-</Window>

HorseIsleServer/MPN00BS/SystemTrayIcon.axaml.cs

@@ -1,73 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
-using HISP.Server;
-
-namespace MPN00BS
-{
-    public partial class SystemTrayIcon : Window
-    {
-        public bool swearFilterEnabled
-        {
-            get
-            {
-                return ConfigReader.BadWords;
-            }
-        }
-        public bool correctionsEnabled
-        {
-            get
-            {
-                return ConfigReader.DoCorrections;
-            }
-        }
-        public bool nonVioChecksEnabled
-        {
-            get
-            {
-                return ConfigReader.DoNonViolations;
-            }
-        }
-        public bool spamFilterEnabled
-        {
-            get
-            {
-                return ConfigReader.EnableSpamFilter;
-            }
-        }
-        public bool allUsersSubbed
-        {
-            get
-            {
-                return ConfigReader.AllUsersSubbed;
-            }
-        }
-        public bool fixOfficalBugs
-        {
-            get
-            {
-                return ConfigReader.FixOfficalBugs;
-            }
-        }
-        private void OnClientExit()
-        {
-            Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                this.Close();
-            });
-        }
-
-        public SystemTrayIcon()
-        {
-            InitializeComponent();
-            this.Hide();
-            ServerStarter.StartHorseIsleClient(OnClientExit, "127.0.0.1", 12321);
-
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}

HorseIsleServer/N00BS/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.102.0")]
+[assembly: AssemblyVersion("1.7.103.0")]
-[assembly: AssemblyFileVersion("1.7.102.0")]
+[assembly: AssemblyFileVersion("1.7.103.0")]

HorseIsleServer/N00BS/SystemTrayIcon.cs

@@ -13,9 +13,9 @@ namespace HISP.Noobs
         public SystemTrayIcon()
         {
             InitializeComponent();
-            disableSwearFilterToolStripMenuItem.Checked = !ConfigReader.BadWords;
+            disableSwearFilterToolStripMenuItem.Checked = !ConfigReader.EnableSwearFilter;
-            disableCorrectionsToolStripMenuItem.Checked = !ConfigReader.DoCorrections;
+            disableCorrectionsToolStripMenuItem.Checked = !ConfigReader.EnableCorrections;
-            disableNonvioChecksToolStripMenuItem.Checked = !ConfigReader.DoNonViolations;
+            disableNonvioChecksToolStripMenuItem.Checked = !ConfigReader.EnableNonViolations;
             disableSpamFilterToolStripMenuItem.Checked = !ConfigReader.EnableSpamFilter;
 
             allUsersSubscribedToolStripMenuItem.Checked = ConfigReader.AllUsersSubbed;
@@ -132,21 +132,21 @@ namespace HISP.Noobs
         {
             bool enab = !disableSwearFilterToolStripMenuItem.Checked;
             ModifyConfig("enable_word_filter", enab.ToString().ToLowerInvariant());
-            ConfigReader.BadWords = enab;
+            ConfigReader.EnableSwearFilter = enab;
         }
 
         private void disableCorrectionsToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
         {
             bool enab = !disableCorrectionsToolStripMenuItem.Checked;
             ModifyConfig("enable_corrections", enab.ToString().ToLowerInvariant());
-            ConfigReader.DoCorrections = enab;
+            ConfigReader.EnableCorrections = enab;
         }
 
         private void disableNonvioChecksToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
         {
             bool enab = !disableNonvioChecksToolStripMenuItem.Checked;
             ModifyConfig("enable_non_violation_check", enab.ToString().ToLowerInvariant());
-            ConfigReader.DoNonViolations = enab;
+            ConfigReader.EnableNonViolations = enab;
         }
 
         private void disableSpamFilterToolStripMenuItem_CheckedChanged(object sender, EventArgs e)

HorseIsleServer/server.properties

@@ -0,0 +1,99 @@
+# =======================
+# Horse Isle Server Configuration    
+# =======================
+# 
+# HISP was Created and Developed by SilicaAndPina
+# However it is NOT COPYRIGHTED! This software is in the Public Domain!
+#
+# Ip address the server will bind to (default: 0.0.0.0 ALL INTERFACES)
+
+ip=0.0.0.0
+
+# Port the server will bind to defaults: (on beta.horseisle.com: 12321, on pinto.horseisle.com: 443)
+# Though, 443 is likely to interfere with TLS, if you happen to have a web server or something
+# running on the same port, so i prefer 12321.
+port=12321
+
+# MariaDB Database Information
+# For best performance, the database should be hosted on the SAME MACHINE as the HISP server.
+# Or atleast, on a local network.
+db_ip=127.0.0.1
+db_name=game1
+db_username=root
+db_password=test123
+db_port=3306
+
+# Connect to a sqllite database instead of a sql server.
+sql_lite=false
+
+# File that contains the map tile data
+# the default was downloaded from the original server
+map=HI1.MAP
+
+# This folder contains all definitions in the game
+# such as items, horses. and quest data.
+# NOTE: This can be a folder or a file.
+gamedata=gamedata
+
+
+# =======================
+# Security               
+# =======================
+
+# Adobe Flash; Cross-Domain Policy File. (see: https://web.archive.org/web/20170610235331if_/http://www.adobe.com/devnet/flashplayer/articles/socket_policy_files.html)
+# The default file, just allows all domains access to all ports.
+crossdomain=CrossDomainPolicy.xml
+
+# =======================
+# Chat Filter Settings   
+# =======================
+
+# Wether to block 'bad' words
+# ex 'Fuck You!' gets blocked
+enable_word_filter=true
+
+# Wether to expand slang.
+# ex 'lol' becomes '*laughing out loud!*'
+# (NOTE: This feature is also used to filter some less-'bad' words disabling it will allow users to say them!)
+enable_corrections=true
+
+# Include non-violations
+# stuff like blocking you from saying your password in chat
+# and FULL CAPS messages.
+enable_non_violation_check=true
+
+# Limits ad and global chat
+# to just a few messages every minute
+# by each user
+enable_spam_filter=true
+
+# =======================
+# Misc Settings.         
+# =======================
+
+# Should the server consider all users "Subscribers"
+# (warning: makes ranches be in use forever.)
+all_users_subscribed=false
+
+# Red Text Stating "Todays Note:"
+# Default is "April 11, 2020. New breed, Camarillo White Horse. Two new quests."
+motd=April 11, 2020. New breed, Camarillo White Horse. Two new quests.
+
+# Equation is: BANK_BALANCE * (1/INTREST_RATE);
+# on All servers except Black its 3333, on black its 1000.
+# but of course you can make it whatever you want
+intrest_rate=3333
+
+# Should i fix bugs all the bugs
+# That were in the original Horse Isle Game??
+# (eg training, special treat, ranch descriptions, etc)
+fix_offical_bugs=false
+
+# Should print extra debug logs
+# 0 - no logs
+# 1 - errors only
+# 2 - errors, warnings
+# 3 - errors, warnings, hackers
+# 4 - errors, warnings, hackers,  info,
+# 5 - debug, errors, warnings, info, hackers
+log_level=4