Rename HISPCli to HISPd

.github/workflows/build.yml

@@ -88,25 +88,25 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: HISP-Win64
-        path: HorseIsleServer\HISPCli\bin\x64\Windows\net7.0\win-x64\publish\
+        path: HorseIsleServer\HISPd\bin\x64\Windows\net7.0\win-x64\publish\
     
     - name: Upload win-x86
       uses: actions/upload-artifact@v2
       with:
         name: HISP-Win32
-        path: HorseIsleServer\HISPCli\bin\x86\Windows\net7.0\win-x86\publish\
+        path: HorseIsleServer\HISPd\bin\x86\Windows\net7.0\win-x86\publish\
         
     - name: Upload win-arm
       uses: actions/upload-artifact@v2
       with:
         name: HISP-WinARM
-        path: HorseIsleServer\HISPCli\bin\arm\Windows\net7.0\windows-arm\publish\
+        path: HorseIsleServer\HISPd\bin\arm\Windows\net7.0\windows-arm\publish\
 
     - name: Upload win-arm64
       uses: actions/upload-artifact@v2
       with:
         name: HISP-WinARM64
-        path: HorseIsleServer\HISPCli\bin\arm64\Windows\net7.0\windows-arm64\publish\
+        path: HorseIsleServer\HISPd\bin\arm64\Windows\net7.0\windows-arm64\publish\
 
     - name: Upload win-x86-noobs
       uses: actions/upload-artifact@v2
@@ -124,43 +124,43 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: HISP-Linux64
-        path: HorseIsleServer/HISPCli/bin/x64/Linux/net7.0/linux-x64/publish/
+        path: HorseIsleServer/HISPd/bin/x64/Linux/net7.0/linux-x64/publish/
 
     - name: Upload linux-arm
       uses: actions/upload-artifact@v2
       with:
         name: HISP-LinuxARM
-        path: HorseIsleServer/HISPCli/bin/ARM/Linux/net7.0/linux-arm/publish/
+        path: HorseIsleServer/HISPd/bin/ARM/Linux/net7.0/linux-arm/publish/
     
     - name: Upload linux-arm64
       uses: actions/upload-artifact@v2
       with:
         name: HISP-LinuxARM64
-        path: HorseIsleServer/HISPCli/bin/ARM64/Linux/net7.0/linux-arm64/publish/
+        path: HorseIsleServer/HISPd/bin/ARM64/Linux/net7.0/linux-arm64/publish/
 
     - name: Upload mac-x64
       uses: actions/upload-artifact@v2
       with:
         name: HISP-Mac64
-        path: HorseIsleServer/HISPCli/bin/x64/MacOS/net7.0/osx-x64/publish/
+        path: HorseIsleServer/HISPd/bin/x64/MacOS/net7.0/osx-x64/publish/
 
     - name: Upload mac-arm64
       uses: actions/upload-artifact@v2
       with:
         name: HISP-MacARM64
-        path: HorseIsleServer/HISPCli/bin/arm64/MacOS/net7.0/osx-arm64/publish/
+        path: HorseIsleServer/HISPd/bin/arm64/MacOS/net7.0/osx-arm64/publish/
 
     - name: Upload android-arm
       uses: actions/upload-artifact@v2
       with:
         name: HISP-AndroidARM
-        path: HorseIsleServer/HISPCli/bin/arm/Android/net7.0/android-arm/publish/
+        path: HorseIsleServer/HISPd/bin/arm/Android/net7.0/android-arm/publish/
 
     - name: Upload android-arm64
       uses: actions/upload-artifact@v2
       with:
         name: HISP-AndroidARM64
-        path: HorseIsleServer/HISPCli/bin/arm64/Android/net7.0/android-arm64/publish/
+        path: HorseIsleServer/HISPd/bin/arm64/Android/net7.0/android-arm64/publish/
 
 
     - name: Upload Website (master)

.gitignore

@@ -9,8 +9,8 @@ HorseIsleServer/N00BS/obj/*
 HorseIsleServer/N00BS/bin/*
 HorseIsleServer/N00BS/flash.dll.idb
 
-HorseIsleServer/HISPCli/obj/*
+HorseIsleServer/HISPd/obj/*
-HorseIsleServer/HISPCli/bin/*
+HorseIsleServer/HISPd/bin/*
 
 HorseIsleServer/Installer/Windows/*
 

HorseIsleServer/HISP.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.2.32210.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibHISP", "LibHISP\LibHISP.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HISPCli", "HISPCli\HISPCli.csproj", "{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HISPd", "HISPd\HISPd.csproj", "{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N00BS", "N00BS\N00BS.csproj", "{6B45A1E8-0F54-4BF7-AF48-41B9FE676570}"
 EndProject

HorseIsleServer/HISPd/HISPd.csproj

@@ -16,6 +16,12 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>

HorseIsleServer/HISPd/Properties/AssemblyInfo.cs

@@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HISP")]
+[assembly: AssemblyTitle("HISPd")]
 [assembly: AssemblyDescription("Server Emulator for \"Horse Isle\"")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SilicaAndPina")]
-[assembly: AssemblyProduct("HISP")]
+[assembly: AssemblyProduct("HISPd")]
 [assembly: AssemblyCopyright("Public Domain © 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

HorseIsleServer/HISPd/Properties/Resources.Designer.cs

@@ -8,21 +8,21 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace HISP.Cli.Properties {
+namespace HISP.Properties {
     using System;
     
     
     /// <summary>
-    ///   A strongly-typed resource public class, for looking up localized strings, etc.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // This public class was auto-generated by the StronglyTypedResourceBuilder
+    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // public class via a tool like ResGen or Visual Studio.
+    // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -33,10 +33,10 @@ namespace HISP.Cli.Properties {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this public class.
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HISP.Properties.Resources", typeof(Resources).Assembly);
@@ -48,10 +48,10 @@ namespace HISP.Cli.Properties {
         
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource public class.
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -60,11 +60,14 @@ namespace HISP.Cli.Properties {
             }
         }
         
-        internal static string HISPService {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] HISPService {
             get {
-                return ResourceManager.GetString("HISPService", resourceCulture);
+                object obj = ResourceManager.GetObject("HISPService", resourceCulture);
+                return ((byte[])(obj));
             }
         }
-
     }
 }

HorseIsleServer/HISPd/Resources/HISP.service

@@ -27,7 +27,7 @@ User=horseisle
 Group=horseisle
 
 WorkingDirectory=/etc/hisp
-ExecStart=/usr/bin/HISPCli
+ExecStart=/usr/bin/HISPd
 
 Environment=USER=horseisle HOME=/etc/hisp/home HISP_BASE_DIR=/etc/hisp HISP_CONF_FILE=/etc/hisp/server.properties
 

HorseIsleServer/LibHISP/Properties/Resources.Designer.cs

@@ -13,16 +13,16 @@ namespace HISP.Properties {
     
     
     /// <summary>
-    ///   A strongly-typed resource public class, for looking up localized strings, etc.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // This public class was auto-generated by the StronglyTypedResourceBuilder
+    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // public class via a tool like ResGen or Visual Studio.
+    // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -33,10 +33,10 @@ namespace HISP.Properties {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this public class.
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HISP.Properties.Resources", typeof(Resources).Assembly);
@@ -48,10 +48,10 @@ namespace HISP.Properties {
         
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource public class.
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -60,88 +60,86 @@ namespace HISP.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Fri 15/04/2022 
+        ///.
+        /// </summary>
+        public static string BuildDate {
+            get {
+                return ResourceManager.GetString("BuildDate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 12:19 am
+        ///.
+        /// </summary>
+        public static string BuildTime {
+            get {
+                return ResourceManager.GetString("BuildTime", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to &lt;cross-domain-policy&gt;
         ///	&lt;allow-access-from domain=&quot;*&quot; to-ports=&quot;12321&quot; secure=&quot;false&quot;/&gt;
         ///&lt;/cross-domain-policy&gt;.
         /// </summary>
-        internal static string DefaultCrossDomain {
+        public static string DefaultCrossDomain {
             get {
                 return ResourceManager.GetString("DefaultCrossDomain", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to # HorseIsleServer Default Configuration File
+        ///   Looks up a localized string similar to # =======================
-        ///
+        ///# Horse Isle Server Configuration    
+        ///# =======================
+        ///# 
+        ///# Configuration Version 1.3.1
+        ///# 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 (default: 12321)
-        ///port=12321
         ///
-        ///# MariaDB Database 
+        ///# Port the server will bind to defaults: (on beta.horseisle.com: 12321, on pinto.horseisle.com: 443)
-        ///db_ip=127.0.0.1
+        ///# Though, 443 is likely to interfere with TLS, if you happen to have a web server [rest of string was truncated]&quot;;.
-        ///db_name=beta
-        ///db_username=root
-        ///db_password=test123
-        ///db_port=3306
-        ///
-        ///# Map Data
-        ///map=HI1.MAP
-        ///
-        ///# JSON Format Data
-        ///
-        ///gamedata=gamedata.json
-        ///
-        ///# Cross-Domain Policy File
-        ///crossdomain=CrossDomainPolicy.xml
-        ///
-        ///# Red Text Stating &quot;Todays Note:&quot;
-        ///motd=April 11, 2020. New breed, C [rest of string was truncated]&quot;;.
         /// </summary>
-        internal static string DefaultServerProperties {
+        public static string DefaultServerProperties {
             get {
                 return ResourceManager.GetString("DefaultServerProperties", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   UNKNOWN COMMIT HASH
+        ///   Looks up a localized string similar to master
+        ///.
         /// </summary>
-        internal static string GitCommit {
+        public static string GitBranch {
+            get {
+                return ResourceManager.GetString("GitBranch", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 03b55d148a1a109b501162095b1d04101c103cc3
+        ///.
+        /// </summary>
+        public static string GitCommit {
             get {
                 return ResourceManager.GetString("GitCommit", resourceCulture);
             }
         }
         
-        internal static string GitTag
+        /// <summary>
-        {
+        ///   Looks up a localized string similar to v1.3
-            get
+        ///.
-            {
+        /// </summary>
+        public static string GitTag {
+            get {
                 return ResourceManager.GetString("GitTag", resourceCulture);
             }
         }
-        internal static string GitBranch
-        {
-            get
-            {
-                return ResourceManager.GetString("GitBranch", resourceCulture);
-            }
-        }
-        internal static string BuildDate
-        {
-            get
-            {
-                return ResourceManager.GetString("BuildDate", resourceCulture);
-            }
-        }
-        internal static string BuildTime
-        {
-            get
-            {
-                return ResourceManager.GetString("BuildTime", resourceCulture);
-            }
-        }
-
     }
 }

HorseIsleServer/LibHISP/Properties/Resources.resx

@@ -119,25 +119,24 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="DefaultCrossDomain" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\default_cross_domain.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\default_cross_domain.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="DefaultServerProperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\server.properties;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\server.properties;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="GitCommit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Versioning\GitCommit;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\Versioning\GitCommit;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="GitTag" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Versioning\GitTag;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\Versioning\GitTag;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="GitBranch" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Versioning\GitBranch;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\Versioning\GitBranch;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Versioning\BuildDate;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\Versioning\BuildDate;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="BuildTime" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Versioning\BuildTime;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\Versioning\BuildTime;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-  
 </root>