diff --git a/.gitignore b/.gitignore index bd92233..6108ab0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -Horse Isle Server/Horse Isle Server/bin/* -Horse Isle Server/Horse Isle Server/obj/* +Horse Isle Server/HorseIsleServer/bin/* +Horse Isle Server/HorseIsleServer/obj/* Horse Isle Server/.vs/* *.log *.suo diff --git a/Horse Isle Server/Horse Isle Server.sln b/Horse Isle Server/HorseIsleServer.sln similarity index 85% rename from Horse Isle Server/Horse Isle Server.sln rename to Horse Isle Server/HorseIsleServer.sln index 8f4e5e4..de7a384 100644 --- a/Horse Isle Server/Horse Isle Server.sln +++ b/Horse Isle Server/HorseIsleServer.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Horse Isle Server", "Horse Isle Server\Horse Isle Server.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HorseIsleServer", "HorseIsleServer\HorseIsleServer.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Horse Isle Server/Horse Isle Server/Game/AbuseReport.cs b/Horse Isle Server/HorseIsleServer/Game/AbuseReport.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/AbuseReport.cs rename to Horse Isle Server/HorseIsleServer/Game/AbuseReport.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Chat/Chat.cs b/Horse Isle Server/HorseIsleServer/Game/Chat/Chat.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Chat/Chat.cs rename to Horse Isle Server/HorseIsleServer/Game/Chat/Chat.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Chat/Command.cs b/Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Chat/Command.cs rename to Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/DroppedItems.cs b/Horse Isle Server/HorseIsleServer/Game/DroppedItems.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/DroppedItems.cs rename to Horse Isle Server/HorseIsleServer/Game/DroppedItems.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/GameExceptions.cs b/Horse Isle Server/HorseIsleServer/Game/GameExceptions.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/GameExceptions.cs rename to Horse Isle Server/HorseIsleServer/Game/GameExceptions.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Horse/HorseInfo.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Horse/HorseInfo.cs rename to Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Horse/HorseInstance.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Horse/HorseInstance.cs rename to Horse Isle Server/HorseIsleServer/Game/Horse/HorseInstance.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Horse/WildHorse.cs b/Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Horse/WildHorse.cs rename to Horse Isle Server/HorseIsleServer/Game/Horse/WildHorse.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Inventory/HorseInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/HorseInventory.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Inventory/HorseInventory.cs rename to Horse Isle Server/HorseIsleServer/Game/Inventory/HorseInventory.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Inventory/IInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/IInventory.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Inventory/IInventory.cs rename to Horse Isle Server/HorseIsleServer/Game/Inventory/IInventory.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Inventory/InventoryItem.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/InventoryItem.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Inventory/InventoryItem.cs rename to Horse Isle Server/HorseIsleServer/Game/Inventory/InventoryItem.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Inventory/PlayerInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/PlayerInventory.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Inventory/PlayerInventory.cs rename to Horse Isle Server/HorseIsleServer/Game/Inventory/PlayerInventory.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Inventory/ShopInventory.cs b/Horse Isle Server/HorseIsleServer/Game/Inventory/ShopInventory.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Inventory/ShopInventory.cs rename to Horse Isle Server/HorseIsleServer/Game/Inventory/ShopInventory.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Item.cs b/Horse Isle Server/HorseIsleServer/Game/Item.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Item.cs rename to Horse Isle Server/HorseIsleServer/Game/Item.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/ItemInstance.cs b/Horse Isle Server/HorseIsleServer/Game/ItemInstance.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/ItemInstance.cs rename to Horse Isle Server/HorseIsleServer/Game/ItemInstance.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Map.cs b/Horse Isle Server/HorseIsleServer/Game/Map.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Map.cs rename to Horse Isle Server/HorseIsleServer/Game/Map.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Messages.cs b/Horse Isle Server/HorseIsleServer/Game/Messages.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Messages.cs rename to Horse Isle Server/HorseIsleServer/Game/Messages.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Meta.cs b/Horse Isle Server/HorseIsleServer/Game/Meta.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Meta.cs rename to Horse Isle Server/HorseIsleServer/Game/Meta.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Npc.cs b/Horse Isle Server/HorseIsleServer/Game/Npc.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Npc.cs rename to Horse Isle Server/HorseIsleServer/Game/Npc.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Quest.cs b/Horse Isle Server/HorseIsleServer/Game/Quest.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Quest.cs rename to Horse Isle Server/HorseIsleServer/Game/Quest.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Services/Inn.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Inn.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Services/Inn.cs rename to Horse Isle Server/HorseIsleServer/Game/Services/Inn.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Services/Shop.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Shop.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Services/Shop.cs rename to Horse Isle Server/HorseIsleServer/Game/Services/Shop.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Services/Transport.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Transport.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Services/Transport.cs rename to Horse Isle Server/HorseIsleServer/Game/Services/Transport.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Services/Vet.cs b/Horse Isle Server/HorseIsleServer/Game/Services/Vet.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Services/Vet.cs rename to Horse Isle Server/HorseIsleServer/Game/Services/Vet.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/SwfModules/Brickpoet.cs b/Horse Isle Server/HorseIsleServer/Game/SwfModules/Brickpoet.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/SwfModules/Brickpoet.cs rename to Horse Isle Server/HorseIsleServer/Game/SwfModules/Brickpoet.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/Tracking.cs b/Horse Isle Server/HorseIsleServer/Game/Tracking.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/Tracking.cs rename to Horse Isle Server/HorseIsleServer/Game/Tracking.cs diff --git a/Horse Isle Server/Horse Isle Server/Game/World.cs b/Horse Isle Server/HorseIsleServer/Game/World.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Game/World.cs rename to Horse Isle Server/HorseIsleServer/Game/World.cs diff --git a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj similarity index 96% rename from Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj rename to Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj index 29cb443..887db0e 100644 --- a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj +++ b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj @@ -1,39 +1,39 @@ - - - Exe - HISP - 7.0 - - - - - - - True - True - Resources.resx - - - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - - - - - - - - - copy "$(SolutionDir)..\DataCollection\GameData.json" "$(TargetDir)GameData.json" /Y -copy "$(SolutionDir)..\DataCollection\HI1.MAP" "$(TargetDir)HI1.MAP" /Y - - - net5.0 - false - + + + Exe + HISP + 7.0 + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + + + + + + + + + copy "$(SolutionDir)..\DataCollection\GameData.json" "$(TargetDir)GameData.json" /Y +copy "$(SolutionDir)..\DataCollection\HI1.MAP" "$(TargetDir)HI1.MAP" /Y + + + net5.0 + false + \ No newline at end of file diff --git a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user similarity index 81% rename from Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user rename to Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user index 6698dbc..8a25379 100644 --- a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user +++ b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user @@ -1,7 +1,7 @@  - Horse Isle Server + HorseIsleServer ProjectDebugger diff --git a/Horse Isle Server/Horse Isle Server/Player/Award.cs b/Horse Isle Server/HorseIsleServer/Player/Award.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/Award.cs rename to Horse Isle Server/HorseIsleServer/Player/Award.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/Equips/CompetitionGear.cs b/Horse Isle Server/HorseIsleServer/Player/Equips/CompetitionGear.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/Equips/CompetitionGear.cs rename to Horse Isle Server/HorseIsleServer/Player/Equips/CompetitionGear.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/Equips/Jewelry.cs b/Horse Isle Server/HorseIsleServer/Player/Equips/Jewelry.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/Equips/Jewelry.cs rename to Horse Isle Server/HorseIsleServer/Player/Equips/Jewelry.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/Friends.cs b/Horse Isle Server/HorseIsleServer/Player/Friends.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/Friends.cs rename to Horse Isle Server/HorseIsleServer/Player/Friends.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/Highscore.cs b/Horse Isle Server/HorseIsleServer/Player/Highscore.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/Highscore.cs rename to Horse Isle Server/HorseIsleServer/Player/Highscore.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/Mailbox.cs b/Horse Isle Server/HorseIsleServer/Player/Mailbox.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/Mailbox.cs rename to Horse Isle Server/HorseIsleServer/Player/Mailbox.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/PlayerQuests.cs b/Horse Isle Server/HorseIsleServer/Player/PlayerQuests.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/PlayerQuests.cs rename to Horse Isle Server/HorseIsleServer/Player/PlayerQuests.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/TrackedQuest.cs b/Horse Isle Server/HorseIsleServer/Player/TrackedQuest.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/TrackedQuest.cs rename to Horse Isle Server/HorseIsleServer/Player/TrackedQuest.cs diff --git a/Horse Isle Server/Horse Isle Server/Player/User.cs b/Horse Isle Server/HorseIsleServer/Player/User.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Player/User.cs rename to Horse Isle Server/HorseIsleServer/Player/User.cs diff --git a/Horse Isle Server/Horse Isle Server/Program.cs b/Horse Isle Server/HorseIsleServer/Program.cs similarity index 96% rename from Horse Isle Server/Horse Isle Server/Program.cs rename to Horse Isle Server/HorseIsleServer/Program.cs index bcaaaa2..2f2320b 100644 --- a/Horse Isle Server/Horse Isle Server/Program.cs +++ b/Horse Isle Server/HorseIsleServer/Program.cs @@ -1,30 +1,30 @@ -using System; -using System.IO; -using System.Reflection; -using HISP.Game; -using HISP.Game.Horse; -using HISP.Game.SwfModules; -using HISP.Security; -using HISP.Server; -namespace HISP -{ - class Program - { - static void Main(string[] args) - { - Console.Title = "HISP - Horse Isle Server Emulator"; - Directory.SetCurrentDirectory(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)); - ConfigReader.OpenConfig(); - CrossDomainPolicy.GetPolicy(); - Database.OpenDatabase(); - GameDataJson.ReadGamedata(); - Map.OpenMap(); - World.ReadWorldData(); - DroppedItems.Init(); - WildHorse.Init(); - Brickpoet.LoadPoetryRooms(); - GameServer.StartServer(); - - } - } -} +using System; +using System.IO; +using System.Reflection; +using HISP.Game; +using HISP.Game.Horse; +using HISP.Game.SwfModules; +using HISP.Security; +using HISP.Server; +namespace HISP +{ + class Program + { + static void Main(string[] args) + { + Console.Title = "HISP - Horse Isle Server Emulator"; + Directory.SetCurrentDirectory(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)); + ConfigReader.OpenConfig(); + CrossDomainPolicy.GetPolicy(); + Database.OpenDatabase(); + GameDataJson.ReadGamedata(); + Map.OpenMap(); + World.ReadWorldData(); + DroppedItems.Init(); + WildHorse.Init(); + Brickpoet.LoadPoetryRooms(); + GameServer.StartServer(); + + } + } +} diff --git a/Horse Isle Server/Horse Isle Server/Properties/AssemblyInfo.cs b/Horse Isle Server/HorseIsleServer/Properties/AssemblyInfo.cs similarity index 90% rename from Horse Isle Server/Horse Isle Server/Properties/AssemblyInfo.cs rename to Horse Isle Server/HorseIsleServer/Properties/AssemblyInfo.cs index d604330..c596e06 100644 --- a/Horse Isle Server/Horse Isle Server/Properties/AssemblyInfo.cs +++ b/Horse Isle Server/HorseIsleServer/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -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("Horse Isle Server")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Horse Isle Server")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c48cbd82-ab30-494a-8ffa-4de7069b5827")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +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("HorseIsleServer")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("HorseIsleServer")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c48cbd82-ab30-494a-8ffa-4de7069b5827")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Horse Isle Server/Horse Isle Server/Properties/Resources.Designer.cs b/Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs similarity index 95% rename from Horse Isle Server/Horse Isle Server/Properties/Resources.Designer.cs rename to Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs index c43104d..daa4025 100644 --- a/Horse Isle Server/Horse Isle Server/Properties/Resources.Designer.cs +++ b/Horse Isle Server/HorseIsleServer/Properties/Resources.Designer.cs @@ -1,108 +1,108 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace HISP.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // 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.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal 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); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to <cross-domain-policy> - /// <allow-access-from domain="*" to-ports="12321" secure="false"/> - ///</cross-domain-policy>. - /// - internal static string DefaultCrossDomain { - get { - return ResourceManager.GetString("DefaultCrossDomain", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to # Horse Isle Server Default Configuration File - /// - ///# 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 - ///db_ip=127.0.0.1 - ///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 "Todays Note:" - ///motd=April 11, 2020. New breed, C [rest of string was truncated]";. - /// - internal static string DefaultServerProperties { - get { - return ResourceManager.GetString("DefaultServerProperties", resourceCulture); - } - } - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace HISP.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal 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); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to <cross-domain-policy> + /// <allow-access-from domain="*" to-ports="12321" secure="false"/> + ///</cross-domain-policy>. + /// + internal static string DefaultCrossDomain { + get { + return ResourceManager.GetString("DefaultCrossDomain", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to # HorseIsleServer Default Configuration File + /// + ///# 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 + ///db_ip=127.0.0.1 + ///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 "Todays Note:" + ///motd=April 11, 2020. New breed, C [rest of string was truncated]";. + /// + internal static string DefaultServerProperties { + get { + return ResourceManager.GetString("DefaultServerProperties", resourceCulture); + } + } + } +} diff --git a/Horse Isle Server/Horse Isle Server/Properties/Resources.resx b/Horse Isle Server/HorseIsleServer/Properties/Resources.resx similarity index 97% rename from Horse Isle Server/Horse Isle Server/Properties/Resources.resx rename to Horse Isle Server/HorseIsleServer/Properties/Resources.resx index 11b57d8..80bf1bc 100644 --- a/Horse Isle Server/Horse Isle Server/Properties/Resources.resx +++ b/Horse Isle Server/HorseIsleServer/Properties/Resources.resx @@ -1,127 +1,127 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - ..\Resources\default_cross_domain.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\Server.properties;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\Resources\default_cross_domain.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\Resources\Server.properties;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + \ No newline at end of file diff --git a/Horse Isle Server/Horse Isle Server/Properties/launchSettings.json b/Horse Isle Server/HorseIsleServer/Properties/launchSettings.json similarity index 95% rename from Horse Isle Server/Horse Isle Server/Properties/launchSettings.json rename to Horse Isle Server/HorseIsleServer/Properties/launchSettings.json index c6d8646..178ea64 100644 --- a/Horse Isle Server/Horse Isle Server/Properties/launchSettings.json +++ b/Horse Isle Server/HorseIsleServer/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Horse Isle Server": { + "HorseIsleServer": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/Horse Isle Server/Horse Isle Server/Resources/default_cross_domain.xml b/Horse Isle Server/HorseIsleServer/Resources/default_cross_domain.xml similarity index 78% rename from Horse Isle Server/Horse Isle Server/Resources/default_cross_domain.xml rename to Horse Isle Server/HorseIsleServer/Resources/default_cross_domain.xml index f1dfb38..b9c7e79 100644 --- a/Horse Isle Server/Horse Isle Server/Resources/default_cross_domain.xml +++ b/Horse Isle Server/HorseIsleServer/Resources/default_cross_domain.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/Horse Isle Server/Horse Isle Server/Resources/server.properties b/Horse Isle Server/HorseIsleServer/Resources/server.properties similarity index 91% rename from Horse Isle Server/Horse Isle Server/Resources/server.properties rename to Horse Isle Server/HorseIsleServer/Resources/server.properties index a7f55f0..c948779 100644 --- a/Horse Isle Server/Horse Isle Server/Resources/server.properties +++ b/Horse Isle Server/HorseIsleServer/Resources/server.properties @@ -1,47 +1,47 @@ -# Horse Isle Server Default Configuration File - -# 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 -db_ip=127.0.0.1 -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 "Todays Note:" -motd=April 11, 2020. New breed, Camarillo White Horse. Two new quests. - -# 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 - -# Wether or not to consider all users "Subscribers" -all_users_subscribed=false - -# Equation is: BANK_BALANCE * (1/INTREST_RATE); -# on All servers except Black its 8, on black its 3. -# but of course you can make it whatever you want -intrest_rate=8 - -# Should print extra debug logs +# HISP Default Configuration File + +# 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 +db_ip=127.0.0.1 +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 "Todays Note:" +motd=April 11, 2020. New breed, Camarillo White Horse. Two new quests. + +# 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 + +# Wether or not to consider all users "Subscribers" +all_users_subscribed=false + +# Equation is: BANK_BALANCE * (1/INTREST_RATE); +# on All servers except Black its 8, on black its 3. +# but of course you can make it whatever you want +intrest_rate=8 + +# Should print extra debug logs debug=false \ No newline at end of file diff --git a/Horse Isle Server/Horse Isle Server/Security/Authentication.cs b/Horse Isle Server/HorseIsleServer/Security/Authentication.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Security/Authentication.cs rename to Horse Isle Server/HorseIsleServer/Security/Authentication.cs diff --git a/Horse Isle Server/Horse Isle Server/Security/CrossDomainPolicy.cs b/Horse Isle Server/HorseIsleServer/Security/CrossDomainPolicy.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Security/CrossDomainPolicy.cs rename to Horse Isle Server/HorseIsleServer/Security/CrossDomainPolicy.cs diff --git a/Horse Isle Server/Horse Isle Server/Security/RandomID.cs b/Horse Isle Server/HorseIsleServer/Security/RandomID.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Security/RandomID.cs rename to Horse Isle Server/HorseIsleServer/Security/RandomID.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/ConfigReader.cs b/Horse Isle Server/HorseIsleServer/Server/ConfigReader.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/ConfigReader.cs rename to Horse Isle Server/HorseIsleServer/Server/ConfigReader.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/Converters.cs b/Horse Isle Server/HorseIsleServer/Server/Converters.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/Converters.cs rename to Horse Isle Server/HorseIsleServer/Server/Converters.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/Database.cs b/Horse Isle Server/HorseIsleServer/Server/Database.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/Database.cs rename to Horse Isle Server/HorseIsleServer/Server/Database.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/GameClient.cs b/Horse Isle Server/HorseIsleServer/Server/GameClient.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/GameClient.cs rename to Horse Isle Server/HorseIsleServer/Server/GameClient.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs rename to Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/GameServer.cs rename to Horse Isle Server/HorseIsleServer/Server/GameServer.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/Logger.cs b/Horse Isle Server/HorseIsleServer/Server/Logger.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/Logger.cs rename to Horse Isle Server/HorseIsleServer/Server/Logger.cs diff --git a/Horse Isle Server/Horse Isle Server/Server/PacketBuilder.cs b/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs similarity index 100% rename from Horse Isle Server/Horse Isle Server/Server/PacketBuilder.cs rename to Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs diff --git a/Horse Isle Server/Horse Isle Server/icon.ico b/Horse Isle Server/HorseIsleServer/icon.ico similarity index 100% rename from Horse Isle Server/Horse Isle Server/icon.ico rename to Horse Isle Server/HorseIsleServer/icon.ico