From d1b4f2399282a9e9014a5d522bfe52824f0aceb4 Mon Sep 17 00:00:00 2001 From: sardelka9515 Date: Sat, 15 Oct 2022 11:51:18 +0800 Subject: [PATCH] Restructure solution --- .../Installer}/App.xaml | 0 .../Installer}/App.xaml.cs | 0 .../Installer}/AssemblyInfo.cs | 0 .../Installer}/MainWindow.xaml | 0 .../Installer}/MainWindow.xaml.cs | 0 .../RageCoop.Client.Installer.csproj | 50 +++ ...op.Client.Installer_ki4xybf5_wpftmp.csproj | 0 .../Installer}/Resource.Designer.cs | 0 .../Installer}/Resource.resx | 0 .../Installer}/Resources/LemonUI.SHVDN3.dll | Bin .../Installer}/bg.png | Bin .../Loader}/DomainLoader.cs | 0 .../Loader}/Main.cs | 0 .../Loader}/Properties/AssemblyInfo.cs | 0 Client/Loader/RageCoop.Client.Loader.csproj | 58 ++++ {RageCoop.Client => Client/Scripts}/Debug.cs | 0 .../Scripts}/DevTools/DevTool.cs | 0 {RageCoop.Client => Client/Scripts}/Main.cs | 0 .../Scripts}/Menus/CoopMenu.cs | 0 .../Scripts}/Menus/Sub/DebugMenu.cs | 0 .../Scripts}/Menus/Sub/DevToolMenu.cs | 0 .../Scripts}/Menus/Sub/ServersMenu.cs | 0 .../Scripts}/Menus/Sub/SettingsMenu.cs | 0 .../Scripts}/Menus/Sub/UpdateMenu.cs | 0 .../Scripts}/Networking/Chat.cs | 0 .../Scripts}/Networking/DownloadManager.cs | 0 .../Scripts}/Networking/HolePunch.cs | 0 .../Scripts}/Networking/Networking.cs | 0 .../Scripts}/Networking/Receive.cs | 0 .../Scripts}/Networking/Send.cs | 0 .../Scripts}/Networking/Statistics.cs | 0 .../Scripts}/PlayerList.cs | 0 .../Scripts}/Properties/AssemblyInfo.cs | 4 +- .../Scripts}/Properties/AssemblyInfo.tt | 0 Client/Scripts/RageCoop.Client.csproj | 316 +++++++++++++++++ .../Scripts}/Scripting/API.cs | 0 .../Scripts}/Scripting/BaseScript.cs | 0 .../Scripts}/Scripting/ClientScript.cs | 0 .../Scripts}/Scripting/Resources.cs | 0 .../Scripts}/Security.cs | 0 .../Scripts}/Settings.cs | 0 .../Sync/Entities/Ped/SyncedPed.Animations.cs | 0 .../Sync/Entities/Ped/SyncedPed.Members.cs | 0 .../Scripts}/Sync/Entities/Ped/SyncedPed.cs | 0 .../Scripts}/Sync/Entities/SyncedEntity.cs | 0 .../Sync/Entities/SyncedProjectile.cs | 0 .../Scripts}/Sync/Entities/SyncedProp.cs | 0 .../Entities/Vehicle/SyncedVehicle.Members.cs | 0 .../Sync/Entities/Vehicle/SyncedVehicle.cs | 0 .../Scripts}/Sync/EntityPool.cs | 0 .../Scripts}/Sync/SyncEvents.cs | 0 .../Scripts}/Sync/Voice.cs | 0 .../Scripts}/Util/AddOnDataProvider.cs | 0 .../Scripts}/Util/Memory.cs | 0 .../Scripts}/Util/NativeCaller.cs | 0 .../Scripts}/Util/PedConfigFlags.cs | 0 .../Scripts}/Util/PedExtensions.cs | 0 .../Scripts}/Util/TaskType.cs | 0 .../Scripts}/Util/Util.cs | 0 .../Scripts}/Util/VehicleExtensions.cs | 0 .../Scripts}/Util/WeaponUtil.cs | 0 .../Scripts}/WorldThread.cs | 0 Client/Scripts/app.config | 11 + .../Scripts}/packages.config | 23 +- {RageCoop.Core => Core}/BitReader.cs | 0 {RageCoop.Core => Core}/CoreUtils.cs | 0 {RageCoop.Core => Core}/FodyWeavers.xml | 0 {RageCoop.Client => Core}/FodyWeavers.xsd | 0 {RageCoop.Core => Core}/Logger.cs | 0 {RageCoop.Core => Core}/MathExtensions.cs | 0 .../Networking/CoopPeer.cs | 0 .../Networking/HttpHelper.cs | 0 .../Networking/PublicKey.cs | 0 .../Networking/ServerInfo.cs | 0 .../Networking/ZeroTierHelper.cs | 0 {RageCoop.Core => Core}/PacketExtensions.cs | 0 .../Packets/ChatMessage.cs | 0 .../Packets/CustomEvent.cs | 0 .../Packets/FilePackets.cs | 0 {RageCoop.Core => Core}/Packets/HolePunch.cs | 0 {RageCoop.Core => Core}/Packets/Misc.cs | 0 {RageCoop.Core => Core}/Packets/Packets.cs | 0 {RageCoop.Core => Core}/Packets/PedSync.cs | 0 .../Packets/PlayerPackets.cs | 0 .../Packets/ProjectileSync.cs | 0 .../Packets/SyncEvents/BulletShot.cs | 0 .../Packets/SyncEvents/NozzleTransform.cs | 0 .../Packets/SyncEvents/OwnerChanged.cs | 0 .../Packets/SyncEvents/PedKilled.cs | 0 .../Packets/SyncEvents/VehicleBulletShot.cs | 0 .../Packets/VehicleSync.cs | 0 {RageCoop.Core => Core}/Packets/Voice.cs | 0 {RageCoop.Core => Core}/RageCoop.Core.csproj | 0 .../Scripting/CustomEvents.cs | 0 .../Scripting/ResourceFile.cs | 0 {RageCoop.Core => Core}/Worker.cs | 0 RageCoop-V.sln | 10 +- .../RageCoop.Client.Installer.csproj | 36 -- .../RageCoop.Client.Loader.csproj | 60 ---- RageCoop.Client/FodyWeavers.xml | 4 - RageCoop.Client/RageCoop.Client.csproj | 317 ------------------ RageCoop.Server/FodyWeavers.xsd | 141 -------- {RageCoop.Server => Server}/Client.cs | 0 {RageCoop.Server => Server}/FileTransfer.cs | 0 {RageCoop.Server => Server}/FodyWeavers.xml | 0 {RageCoop.Core => Server}/FodyWeavers.xsd | 0 {RageCoop.Server => Server}/HolePunch.cs | 0 .../Networking/Server.Background.cs | 0 .../Networking/Server.Connections.cs | 0 .../Networking/Server.EntitySync.cs | 0 .../Networking/Server.HolePunch.cs | 0 .../Networking/Server.Listener.cs | 0 .../Networking/Server.cs | 0 {RageCoop.Server => Server}/Program.cs | 0 .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.tt | 0 .../RageCoop.Server.csproj | 2 +- .../RageCoop.Server.csproj.user | 0 {RageCoop.Server => Server}/Scripting/API.cs | 0 .../Scripting/BaseScript.cs | 0 .../Scripting/EventArgs/EventArgs.cs | 0 .../Scripting/Resources.cs | 0 .../Scripting/ServerEntities.cs | 0 .../Scripting/ServerObject.cs | 0 .../Scripting/ServerResource.cs | 0 .../Scripting/ServerScript.cs | 0 {RageCoop.Server => Server}/Security.cs | 0 {RageCoop.Server => Server}/Settings.cs | 0 {RageCoop.Server => Server}/Util.cs | 0 {RageCoop.Server => Server}/icon.ico | Bin 130 files changed, 458 insertions(+), 578 deletions(-) rename {RageCoop.Client.Installer => Client/Installer}/App.xaml (100%) rename {RageCoop.Client.Installer => Client/Installer}/App.xaml.cs (100%) rename {RageCoop.Client.Installer => Client/Installer}/AssemblyInfo.cs (100%) rename {RageCoop.Client.Installer => Client/Installer}/MainWindow.xaml (100%) rename {RageCoop.Client.Installer => Client/Installer}/MainWindow.xaml.cs (100%) create mode 100644 Client/Installer/RageCoop.Client.Installer.csproj rename {RageCoop.Client.Installer => Client/Installer}/RageCoop.Client.Installer_ki4xybf5_wpftmp.csproj (100%) rename {RageCoop.Client.Installer => Client/Installer}/Resource.Designer.cs (100%) rename {RageCoop.Client.Installer => Client/Installer}/Resource.resx (100%) rename {RageCoop.Client.Installer => Client/Installer}/Resources/LemonUI.SHVDN3.dll (100%) rename {RageCoop.Client.Installer => Client/Installer}/bg.png (100%) rename {RageCoop.Client.Loader => Client/Loader}/DomainLoader.cs (100%) rename {RageCoop.Client.Loader => Client/Loader}/Main.cs (100%) rename {RageCoop.Client.Loader => Client/Loader}/Properties/AssemblyInfo.cs (100%) create mode 100644 Client/Loader/RageCoop.Client.Loader.csproj rename {RageCoop.Client => Client/Scripts}/Debug.cs (100%) rename {RageCoop.Client => Client/Scripts}/DevTools/DevTool.cs (100%) rename {RageCoop.Client => Client/Scripts}/Main.cs (100%) rename {RageCoop.Client => Client/Scripts}/Menus/CoopMenu.cs (100%) rename {RageCoop.Client => Client/Scripts}/Menus/Sub/DebugMenu.cs (100%) rename {RageCoop.Client => Client/Scripts}/Menus/Sub/DevToolMenu.cs (100%) rename {RageCoop.Client => Client/Scripts}/Menus/Sub/ServersMenu.cs (100%) rename {RageCoop.Client => Client/Scripts}/Menus/Sub/SettingsMenu.cs (100%) rename {RageCoop.Client => Client/Scripts}/Menus/Sub/UpdateMenu.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/Chat.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/DownloadManager.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/HolePunch.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/Networking.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/Receive.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/Send.cs (100%) rename {RageCoop.Client => Client/Scripts}/Networking/Statistics.cs (100%) rename {RageCoop.Client => Client/Scripts}/PlayerList.cs (100%) rename {RageCoop.Client => Client/Scripts}/Properties/AssemblyInfo.cs (87%) rename {RageCoop.Client => Client/Scripts}/Properties/AssemblyInfo.tt (100%) create mode 100644 Client/Scripts/RageCoop.Client.csproj rename {RageCoop.Client => Client/Scripts}/Scripting/API.cs (100%) rename {RageCoop.Client => Client/Scripts}/Scripting/BaseScript.cs (100%) rename {RageCoop.Client => Client/Scripts}/Scripting/ClientScript.cs (100%) rename {RageCoop.Client => Client/Scripts}/Scripting/Resources.cs (100%) rename {RageCoop.Client => Client/Scripts}/Security.cs (100%) rename {RageCoop.Client => Client/Scripts}/Settings.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/Ped/SyncedPed.Animations.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/Ped/SyncedPed.Members.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/Ped/SyncedPed.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/SyncedEntity.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/SyncedProjectile.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/SyncedProp.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/Vehicle/SyncedVehicle.Members.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Entities/Vehicle/SyncedVehicle.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/EntityPool.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/SyncEvents.cs (100%) rename {RageCoop.Client => Client/Scripts}/Sync/Voice.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/AddOnDataProvider.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/Memory.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/NativeCaller.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/PedConfigFlags.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/PedExtensions.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/TaskType.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/Util.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/VehicleExtensions.cs (100%) rename {RageCoop.Client => Client/Scripts}/Util/WeaponUtil.cs (100%) rename {RageCoop.Client => Client/Scripts}/WorldThread.cs (100%) create mode 100644 Client/Scripts/app.config rename {RageCoop.Client => Client/Scripts}/packages.config (88%) rename {RageCoop.Core => Core}/BitReader.cs (100%) rename {RageCoop.Core => Core}/CoreUtils.cs (100%) rename {RageCoop.Core => Core}/FodyWeavers.xml (100%) rename {RageCoop.Client => Core}/FodyWeavers.xsd (100%) rename {RageCoop.Core => Core}/Logger.cs (100%) rename {RageCoop.Core => Core}/MathExtensions.cs (100%) rename {RageCoop.Core => Core}/Networking/CoopPeer.cs (100%) rename {RageCoop.Core => Core}/Networking/HttpHelper.cs (100%) rename {RageCoop.Core => Core}/Networking/PublicKey.cs (100%) rename {RageCoop.Core => Core}/Networking/ServerInfo.cs (100%) rename {RageCoop.Core => Core}/Networking/ZeroTierHelper.cs (100%) rename {RageCoop.Core => Core}/PacketExtensions.cs (100%) rename {RageCoop.Core => Core}/Packets/ChatMessage.cs (100%) rename {RageCoop.Core => Core}/Packets/CustomEvent.cs (100%) rename {RageCoop.Core => Core}/Packets/FilePackets.cs (100%) rename {RageCoop.Core => Core}/Packets/HolePunch.cs (100%) rename {RageCoop.Core => Core}/Packets/Misc.cs (100%) rename {RageCoop.Core => Core}/Packets/Packets.cs (100%) rename {RageCoop.Core => Core}/Packets/PedSync.cs (100%) rename {RageCoop.Core => Core}/Packets/PlayerPackets.cs (100%) rename {RageCoop.Core => Core}/Packets/ProjectileSync.cs (100%) rename {RageCoop.Core => Core}/Packets/SyncEvents/BulletShot.cs (100%) rename {RageCoop.Core => Core}/Packets/SyncEvents/NozzleTransform.cs (100%) rename {RageCoop.Core => Core}/Packets/SyncEvents/OwnerChanged.cs (100%) rename {RageCoop.Core => Core}/Packets/SyncEvents/PedKilled.cs (100%) rename {RageCoop.Core => Core}/Packets/SyncEvents/VehicleBulletShot.cs (100%) rename {RageCoop.Core => Core}/Packets/VehicleSync.cs (100%) rename {RageCoop.Core => Core}/Packets/Voice.cs (100%) rename {RageCoop.Core => Core}/RageCoop.Core.csproj (100%) rename {RageCoop.Core => Core}/Scripting/CustomEvents.cs (100%) rename {RageCoop.Core => Core}/Scripting/ResourceFile.cs (100%) rename {RageCoop.Core => Core}/Worker.cs (100%) delete mode 100644 RageCoop.Client.Installer/RageCoop.Client.Installer.csproj delete mode 100644 RageCoop.Client.Loader/RageCoop.Client.Loader.csproj delete mode 100644 RageCoop.Client/FodyWeavers.xml delete mode 100644 RageCoop.Client/RageCoop.Client.csproj delete mode 100644 RageCoop.Server/FodyWeavers.xsd rename {RageCoop.Server => Server}/Client.cs (100%) rename {RageCoop.Server => Server}/FileTransfer.cs (100%) rename {RageCoop.Server => Server}/FodyWeavers.xml (100%) rename {RageCoop.Core => Server}/FodyWeavers.xsd (100%) rename {RageCoop.Server => Server}/HolePunch.cs (100%) rename {RageCoop.Server => Server}/Networking/Server.Background.cs (100%) rename {RageCoop.Server => Server}/Networking/Server.Connections.cs (100%) rename {RageCoop.Server => Server}/Networking/Server.EntitySync.cs (100%) rename {RageCoop.Server => Server}/Networking/Server.HolePunch.cs (100%) rename {RageCoop.Server => Server}/Networking/Server.Listener.cs (100%) rename {RageCoop.Server => Server}/Networking/Server.cs (100%) rename {RageCoop.Server => Server}/Program.cs (100%) rename {RageCoop.Server => Server}/Properties/AssemblyInfo.cs (87%) rename {RageCoop.Server => Server}/Properties/AssemblyInfo.tt (100%) rename {RageCoop.Server => Server}/RageCoop.Server.csproj (98%) rename {RageCoop.Server => Server}/RageCoop.Server.csproj.user (100%) rename {RageCoop.Server => Server}/Scripting/API.cs (100%) rename {RageCoop.Server => Server}/Scripting/BaseScript.cs (100%) rename {RageCoop.Server => Server}/Scripting/EventArgs/EventArgs.cs (100%) rename {RageCoop.Server => Server}/Scripting/Resources.cs (100%) rename {RageCoop.Server => Server}/Scripting/ServerEntities.cs (100%) rename {RageCoop.Server => Server}/Scripting/ServerObject.cs (100%) rename {RageCoop.Server => Server}/Scripting/ServerResource.cs (100%) rename {RageCoop.Server => Server}/Scripting/ServerScript.cs (100%) rename {RageCoop.Server => Server}/Security.cs (100%) rename {RageCoop.Server => Server}/Settings.cs (100%) rename {RageCoop.Server => Server}/Util.cs (100%) rename {RageCoop.Server => Server}/icon.ico (100%) diff --git a/RageCoop.Client.Installer/App.xaml b/Client/Installer/App.xaml similarity index 100% rename from RageCoop.Client.Installer/App.xaml rename to Client/Installer/App.xaml diff --git a/RageCoop.Client.Installer/App.xaml.cs b/Client/Installer/App.xaml.cs similarity index 100% rename from RageCoop.Client.Installer/App.xaml.cs rename to Client/Installer/App.xaml.cs diff --git a/RageCoop.Client.Installer/AssemblyInfo.cs b/Client/Installer/AssemblyInfo.cs similarity index 100% rename from RageCoop.Client.Installer/AssemblyInfo.cs rename to Client/Installer/AssemblyInfo.cs diff --git a/RageCoop.Client.Installer/MainWindow.xaml b/Client/Installer/MainWindow.xaml similarity index 100% rename from RageCoop.Client.Installer/MainWindow.xaml rename to Client/Installer/MainWindow.xaml diff --git a/RageCoop.Client.Installer/MainWindow.xaml.cs b/Client/Installer/MainWindow.xaml.cs similarity index 100% rename from RageCoop.Client.Installer/MainWindow.xaml.cs rename to Client/Installer/MainWindow.xaml.cs diff --git a/Client/Installer/RageCoop.Client.Installer.csproj b/Client/Installer/RageCoop.Client.Installer.csproj new file mode 100644 index 0000000..f3b51ee --- /dev/null +++ b/Client/Installer/RageCoop.Client.Installer.csproj @@ -0,0 +1,50 @@ + + + + WinExe + net48 + true + true + + + + + + + ..\..\bin\Debug\Client + true + DEBUG + 4 + 1591 + + + ..\..\bin\Release\Client + true + + + + + + + + + + + + + + + True + True + Resource.resx + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + + diff --git a/RageCoop.Client.Installer/RageCoop.Client.Installer_ki4xybf5_wpftmp.csproj b/Client/Installer/RageCoop.Client.Installer_ki4xybf5_wpftmp.csproj similarity index 100% rename from RageCoop.Client.Installer/RageCoop.Client.Installer_ki4xybf5_wpftmp.csproj rename to Client/Installer/RageCoop.Client.Installer_ki4xybf5_wpftmp.csproj diff --git a/RageCoop.Client.Installer/Resource.Designer.cs b/Client/Installer/Resource.Designer.cs similarity index 100% rename from RageCoop.Client.Installer/Resource.Designer.cs rename to Client/Installer/Resource.Designer.cs diff --git a/RageCoop.Client.Installer/Resource.resx b/Client/Installer/Resource.resx similarity index 100% rename from RageCoop.Client.Installer/Resource.resx rename to Client/Installer/Resource.resx diff --git a/RageCoop.Client.Installer/Resources/LemonUI.SHVDN3.dll b/Client/Installer/Resources/LemonUI.SHVDN3.dll similarity index 100% rename from RageCoop.Client.Installer/Resources/LemonUI.SHVDN3.dll rename to Client/Installer/Resources/LemonUI.SHVDN3.dll diff --git a/RageCoop.Client.Installer/bg.png b/Client/Installer/bg.png similarity index 100% rename from RageCoop.Client.Installer/bg.png rename to Client/Installer/bg.png diff --git a/RageCoop.Client.Loader/DomainLoader.cs b/Client/Loader/DomainLoader.cs similarity index 100% rename from RageCoop.Client.Loader/DomainLoader.cs rename to Client/Loader/DomainLoader.cs diff --git a/RageCoop.Client.Loader/Main.cs b/Client/Loader/Main.cs similarity index 100% rename from RageCoop.Client.Loader/Main.cs rename to Client/Loader/Main.cs diff --git a/RageCoop.Client.Loader/Properties/AssemblyInfo.cs b/Client/Loader/Properties/AssemblyInfo.cs similarity index 100% rename from RageCoop.Client.Loader/Properties/AssemblyInfo.cs rename to Client/Loader/Properties/AssemblyInfo.cs diff --git a/Client/Loader/RageCoop.Client.Loader.csproj b/Client/Loader/RageCoop.Client.Loader.csproj new file mode 100644 index 0000000..cc3a75f --- /dev/null +++ b/Client/Loader/RageCoop.Client.Loader.csproj @@ -0,0 +1,58 @@ + + + + + Debug + AnyCPU + {FC8CBDBB-6DC3-43AF-B34D-092E476410A5} + Library + Properties + RageCoop.Client.Loader + RageCoop.Client.Loader + v4.8 + 512 + true + + + + ..\..\bin\Debug\Client + true + full + false + DEBUG;TRACE + prompt + 4 + + + ..\..\bin\Release\Client + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\libs\ScriptHookVDotNet.dll + + + ..\..\libs\ScriptHookVDotNet3.dll + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RageCoop.Client/Debug.cs b/Client/Scripts/Debug.cs similarity index 100% rename from RageCoop.Client/Debug.cs rename to Client/Scripts/Debug.cs diff --git a/RageCoop.Client/DevTools/DevTool.cs b/Client/Scripts/DevTools/DevTool.cs similarity index 100% rename from RageCoop.Client/DevTools/DevTool.cs rename to Client/Scripts/DevTools/DevTool.cs diff --git a/RageCoop.Client/Main.cs b/Client/Scripts/Main.cs similarity index 100% rename from RageCoop.Client/Main.cs rename to Client/Scripts/Main.cs diff --git a/RageCoop.Client/Menus/CoopMenu.cs b/Client/Scripts/Menus/CoopMenu.cs similarity index 100% rename from RageCoop.Client/Menus/CoopMenu.cs rename to Client/Scripts/Menus/CoopMenu.cs diff --git a/RageCoop.Client/Menus/Sub/DebugMenu.cs b/Client/Scripts/Menus/Sub/DebugMenu.cs similarity index 100% rename from RageCoop.Client/Menus/Sub/DebugMenu.cs rename to Client/Scripts/Menus/Sub/DebugMenu.cs diff --git a/RageCoop.Client/Menus/Sub/DevToolMenu.cs b/Client/Scripts/Menus/Sub/DevToolMenu.cs similarity index 100% rename from RageCoop.Client/Menus/Sub/DevToolMenu.cs rename to Client/Scripts/Menus/Sub/DevToolMenu.cs diff --git a/RageCoop.Client/Menus/Sub/ServersMenu.cs b/Client/Scripts/Menus/Sub/ServersMenu.cs similarity index 100% rename from RageCoop.Client/Menus/Sub/ServersMenu.cs rename to Client/Scripts/Menus/Sub/ServersMenu.cs diff --git a/RageCoop.Client/Menus/Sub/SettingsMenu.cs b/Client/Scripts/Menus/Sub/SettingsMenu.cs similarity index 100% rename from RageCoop.Client/Menus/Sub/SettingsMenu.cs rename to Client/Scripts/Menus/Sub/SettingsMenu.cs diff --git a/RageCoop.Client/Menus/Sub/UpdateMenu.cs b/Client/Scripts/Menus/Sub/UpdateMenu.cs similarity index 100% rename from RageCoop.Client/Menus/Sub/UpdateMenu.cs rename to Client/Scripts/Menus/Sub/UpdateMenu.cs diff --git a/RageCoop.Client/Networking/Chat.cs b/Client/Scripts/Networking/Chat.cs similarity index 100% rename from RageCoop.Client/Networking/Chat.cs rename to Client/Scripts/Networking/Chat.cs diff --git a/RageCoop.Client/Networking/DownloadManager.cs b/Client/Scripts/Networking/DownloadManager.cs similarity index 100% rename from RageCoop.Client/Networking/DownloadManager.cs rename to Client/Scripts/Networking/DownloadManager.cs diff --git a/RageCoop.Client/Networking/HolePunch.cs b/Client/Scripts/Networking/HolePunch.cs similarity index 100% rename from RageCoop.Client/Networking/HolePunch.cs rename to Client/Scripts/Networking/HolePunch.cs diff --git a/RageCoop.Client/Networking/Networking.cs b/Client/Scripts/Networking/Networking.cs similarity index 100% rename from RageCoop.Client/Networking/Networking.cs rename to Client/Scripts/Networking/Networking.cs diff --git a/RageCoop.Client/Networking/Receive.cs b/Client/Scripts/Networking/Receive.cs similarity index 100% rename from RageCoop.Client/Networking/Receive.cs rename to Client/Scripts/Networking/Receive.cs diff --git a/RageCoop.Client/Networking/Send.cs b/Client/Scripts/Networking/Send.cs similarity index 100% rename from RageCoop.Client/Networking/Send.cs rename to Client/Scripts/Networking/Send.cs diff --git a/RageCoop.Client/Networking/Statistics.cs b/Client/Scripts/Networking/Statistics.cs similarity index 100% rename from RageCoop.Client/Networking/Statistics.cs rename to Client/Scripts/Networking/Statistics.cs diff --git a/RageCoop.Client/PlayerList.cs b/Client/Scripts/PlayerList.cs similarity index 100% rename from RageCoop.Client/PlayerList.cs rename to Client/Scripts/PlayerList.cs diff --git a/RageCoop.Client/Properties/AssemblyInfo.cs b/Client/Scripts/Properties/AssemblyInfo.cs similarity index 87% rename from RageCoop.Client/Properties/AssemblyInfo.cs rename to Client/Scripts/Properties/AssemblyInfo.cs index 65610d6..ed26586 100644 --- a/RageCoop.Client/Properties/AssemblyInfo.cs +++ b/Client/Scripts/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Resources; // Version informationr( -[assembly: AssemblyVersion("1.5.4.291")] -[assembly: AssemblyFileVersion("1.5.4.291")] +[assembly: AssemblyVersion("1.5.4.294")] +[assembly: AssemblyFileVersion("1.5.4.294")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/RageCoop.Client/Properties/AssemblyInfo.tt b/Client/Scripts/Properties/AssemblyInfo.tt similarity index 100% rename from RageCoop.Client/Properties/AssemblyInfo.tt rename to Client/Scripts/Properties/AssemblyInfo.tt diff --git a/Client/Scripts/RageCoop.Client.csproj b/Client/Scripts/RageCoop.Client.csproj new file mode 100644 index 0000000..8fb6f67 --- /dev/null +++ b/Client/Scripts/RageCoop.Client.csproj @@ -0,0 +1,316 @@ + + + + + None + Debug + AnyCPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681} + Library + Properties + RageCoop.Client + RageCoop.Client + v4.8 + 512 + true + + + + + + ..\..\bin\Debug\Client + true + DEBUG + 4 + 1591 + + + ..\..\bin\Release\Client + true + + + + + + + + + + + + + + + + + + + + + True + True + AssemblyInfo.tt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\packages\SharpZipLib.1.4.0\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll + + + ..\..\libs\LemonUI.SHVDN3.dll + + + ..\..\libs\Lidgren.Network.dll + + + + ..\packages\Microsoft.Extensions.ObjectPool.6.0.8\lib\net461\Microsoft.Extensions.ObjectPool.dll + + + ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + True + True + + + ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll + + + ..\..\packages\NAudio.2.1.0\lib\net472\NAudio.dll + + + ..\..\packages\NAudio.Asio.2.1.0\lib\netstandard2.0\NAudio.Asio.dll + + + ..\..\packages\NAudio.Core.2.1.0\lib\netstandard2.0\NAudio.Core.dll + + + ..\..\packages\NAudio.Midi.2.1.0\lib\netstandard2.0\NAudio.Midi.dll + + + ..\..\packages\NAudio.Wasapi.2.1.0\lib\netstandard2.0\NAudio.Wasapi.dll + + + ..\..\packages\NAudio.WinForms.2.1.0\lib\net472\NAudio.WinForms.dll + + + ..\..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll + + + False + ..\libs\Newtonsoft.Json.dll + + + ..\..\libs\ScriptHookVDotNet.dll + + + ..\..\libs\ScriptHookVDotNet3.dll + + + + ..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll + True + True + + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + True + True + + + ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll + True + True + + + + ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + True + True + + + ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + + + + ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True + + + ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True + + + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll + True + True + + + ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll + True + True + + + ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + True + True + + + ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll + True + True + + + ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + True + True + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll + True + True + + + ..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll + True + True + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + + + ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll + True + True + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + + + + ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + True + True + + + + + + + + + + TextTemplatingFileGenerator + AssemblyInfo.cs + + + + + + + + {cc2e8102-e568-4524-aa1f-f8e0f1cfe58a} + RageCoop.Core + + + {fc8cbdbb-6dc3-43af-b34d-092e476410a5} + RageCoop.Client.Loader + + + + + "$(DevEnvDir)TextTransform.exe" -a !!BuildConfiguration!$(Configuration) "$(ProjectDir)Properties\AssemblyInfo.tt" + + \ No newline at end of file diff --git a/RageCoop.Client/Scripting/API.cs b/Client/Scripts/Scripting/API.cs similarity index 100% rename from RageCoop.Client/Scripting/API.cs rename to Client/Scripts/Scripting/API.cs diff --git a/RageCoop.Client/Scripting/BaseScript.cs b/Client/Scripts/Scripting/BaseScript.cs similarity index 100% rename from RageCoop.Client/Scripting/BaseScript.cs rename to Client/Scripts/Scripting/BaseScript.cs diff --git a/RageCoop.Client/Scripting/ClientScript.cs b/Client/Scripts/Scripting/ClientScript.cs similarity index 100% rename from RageCoop.Client/Scripting/ClientScript.cs rename to Client/Scripts/Scripting/ClientScript.cs diff --git a/RageCoop.Client/Scripting/Resources.cs b/Client/Scripts/Scripting/Resources.cs similarity index 100% rename from RageCoop.Client/Scripting/Resources.cs rename to Client/Scripts/Scripting/Resources.cs diff --git a/RageCoop.Client/Security.cs b/Client/Scripts/Security.cs similarity index 100% rename from RageCoop.Client/Security.cs rename to Client/Scripts/Security.cs diff --git a/RageCoop.Client/Settings.cs b/Client/Scripts/Settings.cs similarity index 100% rename from RageCoop.Client/Settings.cs rename to Client/Scripts/Settings.cs diff --git a/RageCoop.Client/Sync/Entities/Ped/SyncedPed.Animations.cs b/Client/Scripts/Sync/Entities/Ped/SyncedPed.Animations.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/Ped/SyncedPed.Animations.cs rename to Client/Scripts/Sync/Entities/Ped/SyncedPed.Animations.cs diff --git a/RageCoop.Client/Sync/Entities/Ped/SyncedPed.Members.cs b/Client/Scripts/Sync/Entities/Ped/SyncedPed.Members.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/Ped/SyncedPed.Members.cs rename to Client/Scripts/Sync/Entities/Ped/SyncedPed.Members.cs diff --git a/RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs b/Client/Scripts/Sync/Entities/Ped/SyncedPed.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs rename to Client/Scripts/Sync/Entities/Ped/SyncedPed.cs diff --git a/RageCoop.Client/Sync/Entities/SyncedEntity.cs b/Client/Scripts/Sync/Entities/SyncedEntity.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/SyncedEntity.cs rename to Client/Scripts/Sync/Entities/SyncedEntity.cs diff --git a/RageCoop.Client/Sync/Entities/SyncedProjectile.cs b/Client/Scripts/Sync/Entities/SyncedProjectile.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/SyncedProjectile.cs rename to Client/Scripts/Sync/Entities/SyncedProjectile.cs diff --git a/RageCoop.Client/Sync/Entities/SyncedProp.cs b/Client/Scripts/Sync/Entities/SyncedProp.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/SyncedProp.cs rename to Client/Scripts/Sync/Entities/SyncedProp.cs diff --git a/RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.Members.cs b/Client/Scripts/Sync/Entities/Vehicle/SyncedVehicle.Members.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.Members.cs rename to Client/Scripts/Sync/Entities/Vehicle/SyncedVehicle.Members.cs diff --git a/RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.cs b/Client/Scripts/Sync/Entities/Vehicle/SyncedVehicle.cs similarity index 100% rename from RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.cs rename to Client/Scripts/Sync/Entities/Vehicle/SyncedVehicle.cs diff --git a/RageCoop.Client/Sync/EntityPool.cs b/Client/Scripts/Sync/EntityPool.cs similarity index 100% rename from RageCoop.Client/Sync/EntityPool.cs rename to Client/Scripts/Sync/EntityPool.cs diff --git a/RageCoop.Client/Sync/SyncEvents.cs b/Client/Scripts/Sync/SyncEvents.cs similarity index 100% rename from RageCoop.Client/Sync/SyncEvents.cs rename to Client/Scripts/Sync/SyncEvents.cs diff --git a/RageCoop.Client/Sync/Voice.cs b/Client/Scripts/Sync/Voice.cs similarity index 100% rename from RageCoop.Client/Sync/Voice.cs rename to Client/Scripts/Sync/Voice.cs diff --git a/RageCoop.Client/Util/AddOnDataProvider.cs b/Client/Scripts/Util/AddOnDataProvider.cs similarity index 100% rename from RageCoop.Client/Util/AddOnDataProvider.cs rename to Client/Scripts/Util/AddOnDataProvider.cs diff --git a/RageCoop.Client/Util/Memory.cs b/Client/Scripts/Util/Memory.cs similarity index 100% rename from RageCoop.Client/Util/Memory.cs rename to Client/Scripts/Util/Memory.cs diff --git a/RageCoop.Client/Util/NativeCaller.cs b/Client/Scripts/Util/NativeCaller.cs similarity index 100% rename from RageCoop.Client/Util/NativeCaller.cs rename to Client/Scripts/Util/NativeCaller.cs diff --git a/RageCoop.Client/Util/PedConfigFlags.cs b/Client/Scripts/Util/PedConfigFlags.cs similarity index 100% rename from RageCoop.Client/Util/PedConfigFlags.cs rename to Client/Scripts/Util/PedConfigFlags.cs diff --git a/RageCoop.Client/Util/PedExtensions.cs b/Client/Scripts/Util/PedExtensions.cs similarity index 100% rename from RageCoop.Client/Util/PedExtensions.cs rename to Client/Scripts/Util/PedExtensions.cs diff --git a/RageCoop.Client/Util/TaskType.cs b/Client/Scripts/Util/TaskType.cs similarity index 100% rename from RageCoop.Client/Util/TaskType.cs rename to Client/Scripts/Util/TaskType.cs diff --git a/RageCoop.Client/Util/Util.cs b/Client/Scripts/Util/Util.cs similarity index 100% rename from RageCoop.Client/Util/Util.cs rename to Client/Scripts/Util/Util.cs diff --git a/RageCoop.Client/Util/VehicleExtensions.cs b/Client/Scripts/Util/VehicleExtensions.cs similarity index 100% rename from RageCoop.Client/Util/VehicleExtensions.cs rename to Client/Scripts/Util/VehicleExtensions.cs diff --git a/RageCoop.Client/Util/WeaponUtil.cs b/Client/Scripts/Util/WeaponUtil.cs similarity index 100% rename from RageCoop.Client/Util/WeaponUtil.cs rename to Client/Scripts/Util/WeaponUtil.cs diff --git a/RageCoop.Client/WorldThread.cs b/Client/Scripts/WorldThread.cs similarity index 100% rename from RageCoop.Client/WorldThread.cs rename to Client/Scripts/WorldThread.cs diff --git a/Client/Scripts/app.config b/Client/Scripts/app.config new file mode 100644 index 0000000..f6e7dca --- /dev/null +++ b/Client/Scripts/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/RageCoop.Client/packages.config b/Client/Scripts/packages.config similarity index 88% rename from RageCoop.Client/packages.config rename to Client/Scripts/packages.config index 9f7a5f3..99e89f4 100644 --- a/RageCoop.Client/packages.config +++ b/Client/Scripts/packages.config @@ -1,21 +1,20 @@  - - - - - - - - - + + + + + + + - + + @@ -32,15 +31,18 @@ + + + @@ -57,6 +59,7 @@ + diff --git a/RageCoop.Core/BitReader.cs b/Core/BitReader.cs similarity index 100% rename from RageCoop.Core/BitReader.cs rename to Core/BitReader.cs diff --git a/RageCoop.Core/CoreUtils.cs b/Core/CoreUtils.cs similarity index 100% rename from RageCoop.Core/CoreUtils.cs rename to Core/CoreUtils.cs diff --git a/RageCoop.Core/FodyWeavers.xml b/Core/FodyWeavers.xml similarity index 100% rename from RageCoop.Core/FodyWeavers.xml rename to Core/FodyWeavers.xml diff --git a/RageCoop.Client/FodyWeavers.xsd b/Core/FodyWeavers.xsd similarity index 100% rename from RageCoop.Client/FodyWeavers.xsd rename to Core/FodyWeavers.xsd diff --git a/RageCoop.Core/Logger.cs b/Core/Logger.cs similarity index 100% rename from RageCoop.Core/Logger.cs rename to Core/Logger.cs diff --git a/RageCoop.Core/MathExtensions.cs b/Core/MathExtensions.cs similarity index 100% rename from RageCoop.Core/MathExtensions.cs rename to Core/MathExtensions.cs diff --git a/RageCoop.Core/Networking/CoopPeer.cs b/Core/Networking/CoopPeer.cs similarity index 100% rename from RageCoop.Core/Networking/CoopPeer.cs rename to Core/Networking/CoopPeer.cs diff --git a/RageCoop.Core/Networking/HttpHelper.cs b/Core/Networking/HttpHelper.cs similarity index 100% rename from RageCoop.Core/Networking/HttpHelper.cs rename to Core/Networking/HttpHelper.cs diff --git a/RageCoop.Core/Networking/PublicKey.cs b/Core/Networking/PublicKey.cs similarity index 100% rename from RageCoop.Core/Networking/PublicKey.cs rename to Core/Networking/PublicKey.cs diff --git a/RageCoop.Core/Networking/ServerInfo.cs b/Core/Networking/ServerInfo.cs similarity index 100% rename from RageCoop.Core/Networking/ServerInfo.cs rename to Core/Networking/ServerInfo.cs diff --git a/RageCoop.Core/Networking/ZeroTierHelper.cs b/Core/Networking/ZeroTierHelper.cs similarity index 100% rename from RageCoop.Core/Networking/ZeroTierHelper.cs rename to Core/Networking/ZeroTierHelper.cs diff --git a/RageCoop.Core/PacketExtensions.cs b/Core/PacketExtensions.cs similarity index 100% rename from RageCoop.Core/PacketExtensions.cs rename to Core/PacketExtensions.cs diff --git a/RageCoop.Core/Packets/ChatMessage.cs b/Core/Packets/ChatMessage.cs similarity index 100% rename from RageCoop.Core/Packets/ChatMessage.cs rename to Core/Packets/ChatMessage.cs diff --git a/RageCoop.Core/Packets/CustomEvent.cs b/Core/Packets/CustomEvent.cs similarity index 100% rename from RageCoop.Core/Packets/CustomEvent.cs rename to Core/Packets/CustomEvent.cs diff --git a/RageCoop.Core/Packets/FilePackets.cs b/Core/Packets/FilePackets.cs similarity index 100% rename from RageCoop.Core/Packets/FilePackets.cs rename to Core/Packets/FilePackets.cs diff --git a/RageCoop.Core/Packets/HolePunch.cs b/Core/Packets/HolePunch.cs similarity index 100% rename from RageCoop.Core/Packets/HolePunch.cs rename to Core/Packets/HolePunch.cs diff --git a/RageCoop.Core/Packets/Misc.cs b/Core/Packets/Misc.cs similarity index 100% rename from RageCoop.Core/Packets/Misc.cs rename to Core/Packets/Misc.cs diff --git a/RageCoop.Core/Packets/Packets.cs b/Core/Packets/Packets.cs similarity index 100% rename from RageCoop.Core/Packets/Packets.cs rename to Core/Packets/Packets.cs diff --git a/RageCoop.Core/Packets/PedSync.cs b/Core/Packets/PedSync.cs similarity index 100% rename from RageCoop.Core/Packets/PedSync.cs rename to Core/Packets/PedSync.cs diff --git a/RageCoop.Core/Packets/PlayerPackets.cs b/Core/Packets/PlayerPackets.cs similarity index 100% rename from RageCoop.Core/Packets/PlayerPackets.cs rename to Core/Packets/PlayerPackets.cs diff --git a/RageCoop.Core/Packets/ProjectileSync.cs b/Core/Packets/ProjectileSync.cs similarity index 100% rename from RageCoop.Core/Packets/ProjectileSync.cs rename to Core/Packets/ProjectileSync.cs diff --git a/RageCoop.Core/Packets/SyncEvents/BulletShot.cs b/Core/Packets/SyncEvents/BulletShot.cs similarity index 100% rename from RageCoop.Core/Packets/SyncEvents/BulletShot.cs rename to Core/Packets/SyncEvents/BulletShot.cs diff --git a/RageCoop.Core/Packets/SyncEvents/NozzleTransform.cs b/Core/Packets/SyncEvents/NozzleTransform.cs similarity index 100% rename from RageCoop.Core/Packets/SyncEvents/NozzleTransform.cs rename to Core/Packets/SyncEvents/NozzleTransform.cs diff --git a/RageCoop.Core/Packets/SyncEvents/OwnerChanged.cs b/Core/Packets/SyncEvents/OwnerChanged.cs similarity index 100% rename from RageCoop.Core/Packets/SyncEvents/OwnerChanged.cs rename to Core/Packets/SyncEvents/OwnerChanged.cs diff --git a/RageCoop.Core/Packets/SyncEvents/PedKilled.cs b/Core/Packets/SyncEvents/PedKilled.cs similarity index 100% rename from RageCoop.Core/Packets/SyncEvents/PedKilled.cs rename to Core/Packets/SyncEvents/PedKilled.cs diff --git a/RageCoop.Core/Packets/SyncEvents/VehicleBulletShot.cs b/Core/Packets/SyncEvents/VehicleBulletShot.cs similarity index 100% rename from RageCoop.Core/Packets/SyncEvents/VehicleBulletShot.cs rename to Core/Packets/SyncEvents/VehicleBulletShot.cs diff --git a/RageCoop.Core/Packets/VehicleSync.cs b/Core/Packets/VehicleSync.cs similarity index 100% rename from RageCoop.Core/Packets/VehicleSync.cs rename to Core/Packets/VehicleSync.cs diff --git a/RageCoop.Core/Packets/Voice.cs b/Core/Packets/Voice.cs similarity index 100% rename from RageCoop.Core/Packets/Voice.cs rename to Core/Packets/Voice.cs diff --git a/RageCoop.Core/RageCoop.Core.csproj b/Core/RageCoop.Core.csproj similarity index 100% rename from RageCoop.Core/RageCoop.Core.csproj rename to Core/RageCoop.Core.csproj diff --git a/RageCoop.Core/Scripting/CustomEvents.cs b/Core/Scripting/CustomEvents.cs similarity index 100% rename from RageCoop.Core/Scripting/CustomEvents.cs rename to Core/Scripting/CustomEvents.cs diff --git a/RageCoop.Core/Scripting/ResourceFile.cs b/Core/Scripting/ResourceFile.cs similarity index 100% rename from RageCoop.Core/Scripting/ResourceFile.cs rename to Core/Scripting/ResourceFile.cs diff --git a/RageCoop.Core/Worker.cs b/Core/Worker.cs similarity index 100% rename from RageCoop.Core/Worker.cs rename to Core/Worker.cs diff --git a/RageCoop-V.sln b/RageCoop-V.sln index 5011468..951e3e7 100644 --- a/RageCoop-V.sln +++ b/RageCoop-V.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31919.166 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Server", "RageCoop.Server\RageCoop.Server.csproj", "{84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Server", "Server\RageCoop.Server.csproj", "{84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Core", "RageCoop.Core\RageCoop.Core.csproj", "{CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Core", "Core\RageCoop.Core.csproj", "{CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageCoop.Client", "RageCoop.Client\RageCoop.Client.csproj", "{EF56D109-1F22-43E0-9DFF-CFCFB94E0681}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageCoop.Client", "Client\Scripts\RageCoop.Client.csproj", "{EF56D109-1F22-43E0-9DFF-CFCFB94E0681}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Client.Installer", "RageCoop.Client.Installer\RageCoop.Client.Installer.csproj", "{576D8610-0C28-4B60-BE2B-8657EA7CEE1B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Client.Installer", "Client\Installer\RageCoop.Client.Installer.csproj", "{576D8610-0C28-4B60-BE2B-8657EA7CEE1B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageCoop.Client.Loader", "RageCoop.Client.Loader\RageCoop.Client.Loader.csproj", "{D2A39C1C-2454-4411-8BA1-BE34EEB9042F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageCoop.Client.Loader", "Client\Loader\RageCoop.Client.Loader.csproj", "{D2A39C1C-2454-4411-8BA1-BE34EEB9042F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj b/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj deleted file mode 100644 index e35c73e..0000000 --- a/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - WinExe - net48 - true - true - - - - - - - - - - - - - - - - True - True - Resource.resx - - - - - - ResXFileCodeGenerator - Resource.Designer.cs - - - - diff --git a/RageCoop.Client.Loader/RageCoop.Client.Loader.csproj b/RageCoop.Client.Loader/RageCoop.Client.Loader.csproj deleted file mode 100644 index 9c3ac6c..0000000 --- a/RageCoop.Client.Loader/RageCoop.Client.Loader.csproj +++ /dev/null @@ -1,60 +0,0 @@ - - - - - Debug - AnyCPU - {FC8CBDBB-6DC3-43AF-B34D-092E476410A5} - Library - Properties - RageCoop.Client.Loader - RageCoop.Client.Loader - v4.8 - 512 - true - - - - - ..\bin\Debug\Client.Loader - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - ..\bin\Release\Client.Loader - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\libs\ScriptHookVDotNet.dll - - - ..\libs\ScriptHookVDotNet3.dll - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RageCoop.Client/FodyWeavers.xml b/RageCoop.Client/FodyWeavers.xml deleted file mode 100644 index 2835016..0000000 --- a/RageCoop.Client/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/RageCoop.Client/RageCoop.Client.csproj b/RageCoop.Client/RageCoop.Client.csproj deleted file mode 100644 index 5f250bd..0000000 --- a/RageCoop.Client/RageCoop.Client.csproj +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - None - Debug - AnyCPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681} - Library - Properties - RageCoop.Client - RageCoop.Client - v4.8 - 512 - true - - - - - - ..\bin\Debug\Client - true - DEBUG - 4 - 1591 - - - ..\bin\Release\Client - true - - - - - - - - - - - - - - - - - - - - - True - True - AssemblyInfo.tt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {d2a39c1c-2454-4411-8ba1-be34eeb9042f} - RageCoop.Client.Loader - - - {cc2e8102-e568-4524-aa1f-f8e0f1cfe58a} - RageCoop.Core - - - - - ..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll - - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll - - - False - ..\libs\LemonUI.SHVDN3.dll - - - False - ..\libs\Lidgren.Network.dll - - - - ..\packages\Microsoft.Extensions.ObjectPool.6.0.8\lib\net461\Microsoft.Extensions.ObjectPool.dll - - - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - True - True - - - ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\packages\NAudio.2.1.0\lib\net472\NAudio.dll - - - ..\packages\NAudio.Asio.2.1.0\lib\netstandard2.0\NAudio.Asio.dll - - - ..\packages\NAudio.Core.2.1.0\lib\netstandard2.0\NAudio.Core.dll - - - ..\packages\NAudio.Midi.2.1.0\lib\netstandard2.0\NAudio.Midi.dll - - - ..\packages\NAudio.Wasapi.2.1.0\lib\netstandard2.0\NAudio.Wasapi.dll - - - ..\packages\NAudio.WinForms.2.1.0\lib\net472\NAudio.WinForms.dll - - - ..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll - - - False - ..\libs\Newtonsoft.Json.dll - - - ..\libs\ScriptHookVDotNet.dll - - - ..\libs\ScriptHookVDotNet3.dll - - - - ..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll - True - True - - - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - True - True - - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll - True - True - - - - ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - True - True - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll - True - True - - - ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - True - True - - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll - True - True - - - ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll - True - True - - - - ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll - True - True - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll - - - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll - True - True - - - - - - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - True - True - - - - - - - - - - TextTemplatingFileGenerator - AssemblyInfo.cs - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - "$(DevEnvDir)TextTransform.exe" -a !!BuildConfiguration!$(Configuration) "$(ProjectDir)Properties\AssemblyInfo.tt" - - \ No newline at end of file diff --git a/RageCoop.Server/FodyWeavers.xsd b/RageCoop.Server/FodyWeavers.xsd deleted file mode 100644 index 05e92c1..0000000 --- a/RageCoop.Server/FodyWeavers.xsd +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Controls if runtime assemblies are also embedded. - - - - - Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with |. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/RageCoop.Server/Client.cs b/Server/Client.cs similarity index 100% rename from RageCoop.Server/Client.cs rename to Server/Client.cs diff --git a/RageCoop.Server/FileTransfer.cs b/Server/FileTransfer.cs similarity index 100% rename from RageCoop.Server/FileTransfer.cs rename to Server/FileTransfer.cs diff --git a/RageCoop.Server/FodyWeavers.xml b/Server/FodyWeavers.xml similarity index 100% rename from RageCoop.Server/FodyWeavers.xml rename to Server/FodyWeavers.xml diff --git a/RageCoop.Core/FodyWeavers.xsd b/Server/FodyWeavers.xsd similarity index 100% rename from RageCoop.Core/FodyWeavers.xsd rename to Server/FodyWeavers.xsd diff --git a/RageCoop.Server/HolePunch.cs b/Server/HolePunch.cs similarity index 100% rename from RageCoop.Server/HolePunch.cs rename to Server/HolePunch.cs diff --git a/RageCoop.Server/Networking/Server.Background.cs b/Server/Networking/Server.Background.cs similarity index 100% rename from RageCoop.Server/Networking/Server.Background.cs rename to Server/Networking/Server.Background.cs diff --git a/RageCoop.Server/Networking/Server.Connections.cs b/Server/Networking/Server.Connections.cs similarity index 100% rename from RageCoop.Server/Networking/Server.Connections.cs rename to Server/Networking/Server.Connections.cs diff --git a/RageCoop.Server/Networking/Server.EntitySync.cs b/Server/Networking/Server.EntitySync.cs similarity index 100% rename from RageCoop.Server/Networking/Server.EntitySync.cs rename to Server/Networking/Server.EntitySync.cs diff --git a/RageCoop.Server/Networking/Server.HolePunch.cs b/Server/Networking/Server.HolePunch.cs similarity index 100% rename from RageCoop.Server/Networking/Server.HolePunch.cs rename to Server/Networking/Server.HolePunch.cs diff --git a/RageCoop.Server/Networking/Server.Listener.cs b/Server/Networking/Server.Listener.cs similarity index 100% rename from RageCoop.Server/Networking/Server.Listener.cs rename to Server/Networking/Server.Listener.cs diff --git a/RageCoop.Server/Networking/Server.cs b/Server/Networking/Server.cs similarity index 100% rename from RageCoop.Server/Networking/Server.cs rename to Server/Networking/Server.cs diff --git a/RageCoop.Server/Program.cs b/Server/Program.cs similarity index 100% rename from RageCoop.Server/Program.cs rename to Server/Program.cs diff --git a/RageCoop.Server/Properties/AssemblyInfo.cs b/Server/Properties/AssemblyInfo.cs similarity index 87% rename from RageCoop.Server/Properties/AssemblyInfo.cs rename to Server/Properties/AssemblyInfo.cs index 256e4bb..a6625b0 100644 --- a/RageCoop.Server/Properties/AssemblyInfo.cs +++ b/Server/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.5.4.66")] -[assembly: AssemblyFileVersion("1.5.4.66")] +[assembly: AssemblyVersion("1.5.4.73")] +[assembly: AssemblyFileVersion("1.5.4.73")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/RageCoop.Server/Properties/AssemblyInfo.tt b/Server/Properties/AssemblyInfo.tt similarity index 100% rename from RageCoop.Server/Properties/AssemblyInfo.tt rename to Server/Properties/AssemblyInfo.tt diff --git a/RageCoop.Server/RageCoop.Server.csproj b/Server/RageCoop.Server.csproj similarity index 98% rename from RageCoop.Server/RageCoop.Server.csproj rename to Server/RageCoop.Server.csproj index 7c0fdf6..c7cedf6 100644 --- a/RageCoop.Server/RageCoop.Server.csproj +++ b/Server/RageCoop.Server.csproj @@ -64,7 +64,7 @@ - + diff --git a/RageCoop.Server/RageCoop.Server.csproj.user b/Server/RageCoop.Server.csproj.user similarity index 100% rename from RageCoop.Server/RageCoop.Server.csproj.user rename to Server/RageCoop.Server.csproj.user diff --git a/RageCoop.Server/Scripting/API.cs b/Server/Scripting/API.cs similarity index 100% rename from RageCoop.Server/Scripting/API.cs rename to Server/Scripting/API.cs diff --git a/RageCoop.Server/Scripting/BaseScript.cs b/Server/Scripting/BaseScript.cs similarity index 100% rename from RageCoop.Server/Scripting/BaseScript.cs rename to Server/Scripting/BaseScript.cs diff --git a/RageCoop.Server/Scripting/EventArgs/EventArgs.cs b/Server/Scripting/EventArgs/EventArgs.cs similarity index 100% rename from RageCoop.Server/Scripting/EventArgs/EventArgs.cs rename to Server/Scripting/EventArgs/EventArgs.cs diff --git a/RageCoop.Server/Scripting/Resources.cs b/Server/Scripting/Resources.cs similarity index 100% rename from RageCoop.Server/Scripting/Resources.cs rename to Server/Scripting/Resources.cs diff --git a/RageCoop.Server/Scripting/ServerEntities.cs b/Server/Scripting/ServerEntities.cs similarity index 100% rename from RageCoop.Server/Scripting/ServerEntities.cs rename to Server/Scripting/ServerEntities.cs diff --git a/RageCoop.Server/Scripting/ServerObject.cs b/Server/Scripting/ServerObject.cs similarity index 100% rename from RageCoop.Server/Scripting/ServerObject.cs rename to Server/Scripting/ServerObject.cs diff --git a/RageCoop.Server/Scripting/ServerResource.cs b/Server/Scripting/ServerResource.cs similarity index 100% rename from RageCoop.Server/Scripting/ServerResource.cs rename to Server/Scripting/ServerResource.cs diff --git a/RageCoop.Server/Scripting/ServerScript.cs b/Server/Scripting/ServerScript.cs similarity index 100% rename from RageCoop.Server/Scripting/ServerScript.cs rename to Server/Scripting/ServerScript.cs diff --git a/RageCoop.Server/Security.cs b/Server/Security.cs similarity index 100% rename from RageCoop.Server/Security.cs rename to Server/Security.cs diff --git a/RageCoop.Server/Settings.cs b/Server/Settings.cs similarity index 100% rename from RageCoop.Server/Settings.cs rename to Server/Settings.cs diff --git a/RageCoop.Server/Util.cs b/Server/Util.cs similarity index 100% rename from RageCoop.Server/Util.cs rename to Server/Util.cs diff --git a/RageCoop.Server/icon.ico b/Server/icon.ico similarity index 100% rename from RageCoop.Server/icon.ico rename to Server/icon.ico