diff --git a/ReallifeGamemode.Server/.editorconfig b/.editorconfig similarity index 100% rename from ReallifeGamemode.Server/.editorconfig rename to .editorconfig diff --git a/ReallifeGamemode.Server/Util/AdminLevel.cs b/ReallifeGamemode.Database/AdminLevel.cs similarity index 91% rename from ReallifeGamemode.Server/Util/AdminLevel.cs rename to ReallifeGamemode.Database/AdminLevel.cs index 5878089e..fb866049 100644 --- a/ReallifeGamemode.Server/Util/AdminLevel.cs +++ b/ReallifeGamemode.Database/AdminLevel.cs @@ -8,7 +8,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Util +namespace ReallifeGamemode.Database { public enum AdminLevel : int { diff --git a/ReallifeGamemode.Server/Entities/ATM.cs b/ReallifeGamemode.Database/Entities/ATM.cs similarity index 89% rename from ReallifeGamemode.Server/Entities/ATM.cs rename to ReallifeGamemode.Database/Entities/ATM.cs index 28070577..7b457dcf 100644 --- a/ReallifeGamemode.Server/Entities/ATM.cs +++ b/ReallifeGamemode.Database/Entities/ATM.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -14,7 +14,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class ATM : IBankAccountOwner, IBankAccount { diff --git a/ReallifeGamemode.Server/Entities/Ban.cs b/ReallifeGamemode.Database/Entities/Ban.cs similarity index 88% rename from ReallifeGamemode.Server/Entities/Ban.cs rename to ReallifeGamemode.Database/Entities/Ban.cs index 6b677b8b..951c5339 100644 --- a/ReallifeGamemode.Server/Entities/Ban.cs +++ b/ReallifeGamemode.Database/Entities/Ban.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Entities Ban (Ban.cs) @@ -11,7 +11,7 @@ using ReallifeGamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Ban { diff --git a/ReallifeGamemode.Server/Entities/BusRoute.cs b/ReallifeGamemode.Database/Entities/BusRoute.cs similarity index 94% rename from ReallifeGamemode.Server/Entities/BusRoute.cs rename to ReallifeGamemode.Database/Entities/BusRoute.cs index caae7648..0cade05f 100644 --- a/ReallifeGamemode.Server/Entities/BusRoute.cs +++ b/ReallifeGamemode.Database/Entities/BusRoute.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class BusRoute { diff --git a/ReallifeGamemode.Server/Entities/BusinessBankAccount.cs b/ReallifeGamemode.Database/Entities/BusinessBankAccount.cs similarity index 55% rename from ReallifeGamemode.Server/Entities/BusinessBankAccount.cs rename to ReallifeGamemode.Database/Entities/BusinessBankAccount.cs index 44ce9f4e..e3a75f96 100644 --- a/ReallifeGamemode.Server/Entities/BusinessBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/BusinessBankAccount.cs @@ -1,13 +1,12 @@ -using ReallifeGamemode.Server.Business; -using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Util; + using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; +using ReallifeGamemode.Database; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class BusinessBankAccount : IBankAccount { @@ -17,15 +16,7 @@ namespace ReallifeGamemode.Server.Entities [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; } - public int Balance - { - get => _balance; - set - { - _balance = value; - BusinessManager.GetBusiness(BusinessId).Update(value); - } - } + public int Balance { get; set; } public int BusinessId { get; set; } } diff --git a/ReallifeGamemode.Server/Entities/BusinessData.cs b/ReallifeGamemode.Database/Entities/BusinessData.cs similarity index 89% rename from ReallifeGamemode.Server/Entities/BusinessData.cs rename to ReallifeGamemode.Database/Entities/BusinessData.cs index c609d139..b2080a05 100644 --- a/ReallifeGamemode.Server/Entities/BusinessData.cs +++ b/ReallifeGamemode.Database/Entities/BusinessData.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class BusinessData { diff --git a/ReallifeGamemode.Server/Entities/Character.cs b/ReallifeGamemode.Database/Entities/Character.cs similarity index 98% rename from ReallifeGamemode.Server/Entities/Character.cs rename to ReallifeGamemode.Database/Entities/Character.cs index d4d25b3f..5ac2de3a 100644 --- a/ReallifeGamemode.Server/Entities/Character.cs +++ b/ReallifeGamemode.Database/Entities/Character.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Character { diff --git a/ReallifeGamemode.Server/Entities/CharacterCloth.cs b/ReallifeGamemode.Database/Entities/CharacterCloth.cs similarity index 93% rename from ReallifeGamemode.Server/Entities/CharacterCloth.cs rename to ReallifeGamemode.Database/Entities/CharacterCloth.cs index cddbca6f..679274b9 100644 --- a/ReallifeGamemode.Server/Entities/CharacterCloth.cs +++ b/ReallifeGamemode.Database/Entities/CharacterCloth.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class CharacterCloth { diff --git a/ReallifeGamemode.Server/Entities/ClothCombination.cs b/ReallifeGamemode.Database/Entities/ClothCombination.cs similarity index 92% rename from ReallifeGamemode.Server/Entities/ClothCombination.cs rename to ReallifeGamemode.Database/Entities/ClothCombination.cs index b78f0572..4682b91d 100644 --- a/ReallifeGamemode.Server/Entities/ClothCombination.cs +++ b/ReallifeGamemode.Database/Entities/ClothCombination.cs @@ -11,7 +11,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class ClothCombination { diff --git a/ReallifeGamemode.Server/Entities/Door.cs b/ReallifeGamemode.Database/Entities/Door.cs similarity index 95% rename from ReallifeGamemode.Server/Entities/Door.cs rename to ReallifeGamemode.Database/Entities/Door.cs index f7f4e4e9..406042f6 100644 --- a/ReallifeGamemode.Server/Entities/Door.cs +++ b/ReallifeGamemode.Database/Entities/Door.cs @@ -11,7 +11,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Door { diff --git a/ReallifeGamemode.Server/Entities/DutyCloth.cs b/ReallifeGamemode.Database/Entities/DutyCloth.cs similarity index 94% rename from ReallifeGamemode.Server/Entities/DutyCloth.cs rename to ReallifeGamemode.Database/Entities/DutyCloth.cs index 4b986ac3..36ea0c92 100644 --- a/ReallifeGamemode.Server/Entities/DutyCloth.cs +++ b/ReallifeGamemode.Database/Entities/DutyCloth.cs @@ -10,7 +10,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class DutyCloth { diff --git a/ReallifeGamemode.Server/Entities/Faction.cs b/ReallifeGamemode.Database/Entities/Faction.cs similarity index 88% rename from ReallifeGamemode.Server/Entities/Faction.cs rename to ReallifeGamemode.Database/Entities/Faction.cs index 534c5d75..2c5ec266 100644 --- a/ReallifeGamemode.Server/Entities/Faction.cs +++ b/ReallifeGamemode.Database/Entities/Faction.cs @@ -1,5 +1,5 @@ -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -10,7 +10,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Faction : IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Entities/FactionBankAccount.cs b/ReallifeGamemode.Database/Entities/FactionBankAccount.cs similarity index 91% rename from ReallifeGamemode.Server/Entities/FactionBankAccount.cs rename to ReallifeGamemode.Database/Entities/FactionBankAccount.cs index 5784d745..b96a1f60 100644 --- a/ReallifeGamemode.Server/Entities/FactionBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/FactionBankAccount.cs @@ -1,5 +1,4 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -11,7 +10,7 @@ using System.Text; * @author VegaZ * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class FactionBankAccount : IBankAccount { diff --git a/ReallifeGamemode.Server/Entities/FactionRank.cs b/ReallifeGamemode.Database/Entities/FactionRank.cs similarity index 78% rename from ReallifeGamemode.Server/Entities/FactionRank.cs rename to ReallifeGamemode.Database/Entities/FactionRank.cs index eadaf972..901ed982 100644 --- a/ReallifeGamemode.Server/Entities/FactionRank.cs +++ b/ReallifeGamemode.Database/Entities/FactionRank.cs @@ -1,8 +1,9 @@ -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.ComponentModel.DataAnnotations; using System.Linq; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class FactionRank { diff --git a/ReallifeGamemode.Server/Entities/FactionVehicles.cs b/ReallifeGamemode.Database/Entities/FactionVehicles.cs similarity index 84% rename from ReallifeGamemode.Server/Entities/FactionVehicles.cs rename to ReallifeGamemode.Database/Entities/FactionVehicles.cs index 1a503b28..8014ab0b 100644 --- a/ReallifeGamemode.Server/Entities/FactionVehicles.cs +++ b/ReallifeGamemode.Database/Entities/FactionVehicles.cs @@ -1,4 +1,5 @@ -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -8,7 +9,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { [Table("FactionVehicles")] public class FactionVehicle : ServerVehicle diff --git a/ReallifeGamemode.Server/Entities/FactionWeapon.cs b/ReallifeGamemode.Database/Entities/FactionWeapon.cs similarity index 92% rename from ReallifeGamemode.Server/Entities/FactionWeapon.cs rename to ReallifeGamemode.Database/Entities/FactionWeapon.cs index c1c910de..e366bc82 100644 --- a/ReallifeGamemode.Server/Entities/FactionWeapon.cs +++ b/ReallifeGamemode.Database/Entities/FactionWeapon.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text; using GTANetworkAPI; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class FactionWeapon { diff --git a/ReallifeGamemode.Server/Entities/GotoPoints.cs b/ReallifeGamemode.Database/Entities/GotoPoints.cs similarity index 88% rename from ReallifeGamemode.Server/Entities/GotoPoints.cs rename to ReallifeGamemode.Database/Entities/GotoPoints.cs index ff825c71..e70ad210 100644 --- a/ReallifeGamemode.Server/Entities/GotoPoints.cs +++ b/ReallifeGamemode.Database/Entities/GotoPoints.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Entities GotoPoints (GotoPoints.cs) @@ -11,7 +11,7 @@ using ReallifeGamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class GotoPoint { diff --git a/ReallifeGamemode.Server/Entities/Group.cs b/ReallifeGamemode.Database/Entities/Group.cs similarity index 91% rename from ReallifeGamemode.Server/Entities/Group.cs rename to ReallifeGamemode.Database/Entities/Group.cs index 4ec74086..8b37b8b1 100644 --- a/ReallifeGamemode.Server/Entities/Group.cs +++ b/ReallifeGamemode.Database/Entities/Group.cs @@ -1,14 +1,14 @@ using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; +using ReallifeGamemode.Database.Models; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Group : IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Entities/GroupBankAccount.cs b/ReallifeGamemode.Database/Entities/GroupBankAccount.cs similarity index 80% rename from ReallifeGamemode.Server/Entities/GroupBankAccount.cs rename to ReallifeGamemode.Database/Entities/GroupBankAccount.cs index 3b674e18..4c226e3d 100644 --- a/ReallifeGamemode.Server/Entities/GroupBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/GroupBankAccount.cs @@ -1,11 +1,10 @@ -using ReallifeGamemode.Server.Util; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class GroupBankAccount : IBankAccount { diff --git a/ReallifeGamemode.Server/Entities/GroupVehicle.cs b/ReallifeGamemode.Database/Entities/GroupVehicle.cs similarity index 81% rename from ReallifeGamemode.Server/Entities/GroupVehicle.cs rename to ReallifeGamemode.Database/Entities/GroupVehicle.cs index 95791b53..45252cf0 100644 --- a/ReallifeGamemode.Server/Entities/GroupVehicle.cs +++ b/ReallifeGamemode.Database/Entities/GroupVehicle.cs @@ -1,12 +1,13 @@ using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class GroupVehicle : ServerVehicle { diff --git a/ReallifeGamemode.Server/Entities/House.cs b/ReallifeGamemode.Database/Entities/House.cs similarity index 91% rename from ReallifeGamemode.Server/Entities/House.cs rename to ReallifeGamemode.Database/Entities/House.cs index 7113d984..faa2208c 100644 --- a/ReallifeGamemode.Server/Entities/House.cs +++ b/ReallifeGamemode.Database/Entities/House.cs @@ -1,5 +1,4 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -7,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class House { diff --git a/ReallifeGamemode.Server/Entities/HouseRental.cs b/ReallifeGamemode.Database/Entities/HouseRental.cs similarity index 91% rename from ReallifeGamemode.Server/Entities/HouseRental.cs rename to ReallifeGamemode.Database/Entities/HouseRental.cs index 7e753a3a..ce7315c7 100644 --- a/ReallifeGamemode.Server/Entities/HouseRental.cs +++ b/ReallifeGamemode.Database/Entities/HouseRental.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class HouseRental { diff --git a/ReallifeGamemode.Server/Entities/Interior.cs b/ReallifeGamemode.Database/Entities/Interior.cs similarity index 96% rename from ReallifeGamemode.Server/Entities/Interior.cs rename to ReallifeGamemode.Database/Entities/Interior.cs index 53513724..abc97dde 100644 --- a/ReallifeGamemode.Server/Entities/Interior.cs +++ b/ReallifeGamemode.Database/Entities/Interior.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Interior { diff --git a/ReallifeGamemode.Database/Entities/JobVehicle.cs b/ReallifeGamemode.Database/Entities/JobVehicle.cs new file mode 100644 index 00000000..fecf25d6 --- /dev/null +++ b/ReallifeGamemode.Database/Entities/JobVehicle.cs @@ -0,0 +1,15 @@ +using Microsoft.EntityFrameworkCore; +using ReallifeGamemode.Database.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using ReallifeGamemode.Database.Models; + +namespace ReallifeGamemode.Database.Entities +{ + public class JobVehicle : ServerVehicle + { + public int JobId { get; set; } + } +} diff --git a/ReallifeGamemode.Server/Entities/Logs/BankAccountTransactionHistory.cs b/ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs similarity index 95% rename from ReallifeGamemode.Server/Entities/Logs/BankAccountTransactionHistory.cs rename to ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs index ff47e816..b23ee865 100644 --- a/ReallifeGamemode.Server/Entities/Logs/BankAccountTransactionHistory.cs +++ b/ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs @@ -10,7 +10,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Logs +namespace ReallifeGamemode.Database.Entities.Logs { public class BankAccountTransactionHistory { diff --git a/ReallifeGamemode.Server/Entities/Logs/Death.cs b/ReallifeGamemode.Database/Entities/Logs/Death.cs similarity index 92% rename from ReallifeGamemode.Server/Entities/Logs/Death.cs rename to ReallifeGamemode.Database/Entities/Logs/Death.cs index caaa4806..f400a765 100644 --- a/ReallifeGamemode.Server/Entities/Logs/Death.cs +++ b/ReallifeGamemode.Database/Entities/Logs/Death.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Logs Death (Death.cs) @@ -11,7 +11,7 @@ using ReallifeGamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Logs +namespace ReallifeGamemode.Database.Entities.Logs { public class Death { diff --git a/ReallifeGamemode.Server/Entities/News.cs b/ReallifeGamemode.Database/Entities/News.cs similarity index 92% rename from ReallifeGamemode.Server/Entities/News.cs rename to ReallifeGamemode.Database/Entities/News.cs index 20905116..876f0994 100644 --- a/ReallifeGamemode.Server/Entities/News.cs +++ b/ReallifeGamemode.Database/Entities/News.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class News { diff --git a/ReallifeGamemode.Server/Entities/Saves/SavedBlip.cs b/ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs similarity index 95% rename from ReallifeGamemode.Server/Entities/Saves/SavedBlip.cs rename to ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs index 4f1bcb9d..d47746a4 100644 --- a/ReallifeGamemode.Server/Entities/Saves/SavedBlip.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Saves +namespace ReallifeGamemode.Database.Entities.Saves { public class SavedBlip { diff --git a/ReallifeGamemode.Server/Entities/Saves/SavedMarker.cs b/ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs similarity index 95% rename from ReallifeGamemode.Server/Entities/Saves/SavedMarker.cs rename to ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs index f69b88c8..31a78f0b 100644 --- a/ReallifeGamemode.Server/Entities/Saves/SavedMarker.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Saves +namespace ReallifeGamemode.Database.Entities.Saves { public class SavedMarker { diff --git a/ReallifeGamemode.Server/Entities/Saves/SavedPed.cs b/ReallifeGamemode.Database/Entities/Saves/SavedPed.cs similarity index 93% rename from ReallifeGamemode.Server/Entities/Saves/SavedPed.cs rename to ReallifeGamemode.Database/Entities/Saves/SavedPed.cs index 97c5d84d..4bb2d6f7 100644 --- a/ReallifeGamemode.Server/Entities/Saves/SavedPed.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedPed.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Saves +namespace ReallifeGamemode.Database.Entities.Saves { public class SavedPed { diff --git a/ReallifeGamemode.Server/Entities/Saves/SavedPickup.cs b/ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs similarity index 94% rename from ReallifeGamemode.Server/Entities/Saves/SavedPickup.cs rename to ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs index c99d4788..6d793fff 100644 --- a/ReallifeGamemode.Server/Entities/Saves/SavedPickup.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Saves +namespace ReallifeGamemode.Database.Entities.Saves { public class SavedPickup { diff --git a/ReallifeGamemode.Server/Entities/Saves/SavedTextLabel.cs b/ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs similarity index 95% rename from ReallifeGamemode.Server/Entities/Saves/SavedTextLabel.cs rename to ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs index 65b3a0fb..361b7cdd 100644 --- a/ReallifeGamemode.Server/Entities/Saves/SavedTextLabel.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs @@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Saves +namespace ReallifeGamemode.Database.Entities.Saves { public class SavedTextLabel { diff --git a/ReallifeGamemode.Server/Entities/Saves/SavedVehicle.cs b/ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs similarity index 83% rename from ReallifeGamemode.Server/Entities/Saves/SavedVehicle.cs rename to ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs index 8aaed488..7cd51e06 100644 --- a/ReallifeGamemode.Server/Entities/Saves/SavedVehicle.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs @@ -4,7 +4,7 @@ using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Saves SavedVehicle.cs @@ -12,7 +12,7 @@ using ReallifeGamemode.Server.Entities; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities.Saves +namespace ReallifeGamemode.Database.Entities.Saves { public class SavedVehicle : ServerVehicle { diff --git a/ReallifeGamemode.Database/Entities/ServerVehicle.cs b/ReallifeGamemode.Database/Entities/ServerVehicle.cs new file mode 100644 index 00000000..9751f51f --- /dev/null +++ b/ReallifeGamemode.Database/Entities/ServerVehicle.cs @@ -0,0 +1,36 @@ +using GTANetworkAPI; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace ReallifeGamemode.Database.Entities +{ + public abstract class ServerVehicle + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + + public VehicleHash Model { get; set; } + public float PositionX { get; set; } + public float PositionY { get; set; } + public float PositionZ { get; set; } + public float Heading { get; set; } + [StringLength(8)] + public string NumberPlate { get; set; } + public int PrimaryColor { get; set; } + public int SecondaryColor { get; set; } + public bool Locked { get; set; } + public bool Active { get; set; } + public float DistanceDriven { get; set; } + public float TankAmount { get; set; } + public int Livery { get; set; } + + [NotMapped] + public Vector3 Position => new Vector3(PositionX, PositionY, PositionZ); + + public new virtual string ToString() + { + return $"{Model}"; + } + } +} diff --git a/ReallifeGamemode.Server/Entities/ShopVehicles.cs b/ReallifeGamemode.Database/Entities/ShopVehicles.cs similarity index 69% rename from ReallifeGamemode.Server/Entities/ShopVehicles.cs rename to ReallifeGamemode.Database/Entities/ShopVehicles.cs index cb3dcfbc..7411a7cc 100644 --- a/ReallifeGamemode.Server/Entities/ShopVehicles.cs +++ b/ReallifeGamemode.Database/Entities/ShopVehicles.cs @@ -1,7 +1,4 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Business; -using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -14,7 +11,7 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { [Table("ShopVehicles")] public class ShopVehicle : ServerVehicle @@ -24,7 +21,7 @@ namespace ReallifeGamemode.Server.Entities public override string ToString() { - return "ShopVehicle | Shop: " + BusinessManager.GetBusiness(BusinessId).Name; + return "ShopVehicle"; } } } diff --git a/ReallifeGamemode.Server/Entities/TuningGarage.cs b/ReallifeGamemode.Database/Entities/TuningGarage.cs similarity index 91% rename from ReallifeGamemode.Server/Entities/TuningGarage.cs rename to ReallifeGamemode.Database/Entities/TuningGarage.cs index 39e86ec9..8f2ef1a8 100644 --- a/ReallifeGamemode.Server/Entities/TuningGarage.cs +++ b/ReallifeGamemode.Database/Entities/TuningGarage.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class TuningGarage { diff --git a/ReallifeGamemode.Server/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs similarity index 94% rename from ReallifeGamemode.Server/Entities/User.cs rename to ReallifeGamemode.Database/Entities/User.cs index 93598802..f240ef4d 100644 --- a/ReallifeGamemode.Server/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -1,8 +1,7 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Services; -using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -15,7 +14,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class User : IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Entities/UserBankAccount.cs b/ReallifeGamemode.Database/Entities/UserBankAccount.cs similarity index 86% rename from ReallifeGamemode.Server/Entities/UserBankAccount.cs rename to ReallifeGamemode.Database/Entities/UserBankAccount.cs index 7a4d89fe..fe8ff119 100644 --- a/ReallifeGamemode.Server/Entities/UserBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/UserBankAccount.cs @@ -1,9 +1,9 @@ -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Services; -using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using ReallifeGamemode.Services; /** * @overview Life of German Reallife - Entities UserBankAccount (UserBankAccount.cs) @@ -11,7 +11,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class UserBankAccount : IBankAccount { @@ -42,4 +42,4 @@ namespace ReallifeGamemode.Server.Entities } public bool Active { get; set; } } -} \ No newline at end of file +} diff --git a/ReallifeGamemode.Server/Entities/UserItem.cs b/ReallifeGamemode.Database/Entities/UserItem.cs similarity index 85% rename from ReallifeGamemode.Server/Entities/UserItem.cs rename to ReallifeGamemode.Database/Entities/UserItem.cs index 1fc4fa1e..32c78f34 100644 --- a/ReallifeGamemode.Server/Entities/UserItem.cs +++ b/ReallifeGamemode.Database/Entities/UserItem.cs @@ -1,4 +1,5 @@ -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -9,7 +10,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class UserItem { @@ -34,4 +35,4 @@ namespace ReallifeGamemode.Server.Entities } } } -} \ No newline at end of file +} diff --git a/ReallifeGamemode.Server/Entities/UserVehicle.cs b/ReallifeGamemode.Database/Entities/UserVehicle.cs similarity index 85% rename from ReallifeGamemode.Server/Entities/UserVehicle.cs rename to ReallifeGamemode.Database/Entities/UserVehicle.cs index 334a625c..1b6f7ca1 100644 --- a/ReallifeGamemode.Server/Entities/UserVehicle.cs +++ b/ReallifeGamemode.Database/Entities/UserVehicle.cs @@ -1,6 +1,6 @@ -using ReallifeGamemode.Server.Models; -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Entities UserVehicle (UserVehicle.cs) @@ -8,7 +8,7 @@ using System.Linq; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { [Table("UserVehicles")] public class UserVehicle : ServerVehicle diff --git a/ReallifeGamemode.Server/Entities/VehicleInventory.cs b/ReallifeGamemode.Database/Entities/VehicleInventory.cs similarity index 86% rename from ReallifeGamemode.Server/Entities/VehicleInventory.cs rename to ReallifeGamemode.Database/Entities/VehicleInventory.cs index b06e3543..197c47fe 100644 --- a/ReallifeGamemode.Server/Entities/VehicleInventory.cs +++ b/ReallifeGamemode.Database/Entities/VehicleInventory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class VehicleInventory { diff --git a/ReallifeGamemode.Server/Entities/VehicleItem.cs b/ReallifeGamemode.Database/Entities/VehicleItem.cs similarity index 85% rename from ReallifeGamemode.Server/Entities/VehicleItem.cs rename to ReallifeGamemode.Database/Entities/VehicleItem.cs index 1a6f23a6..4a0d7152 100644 --- a/ReallifeGamemode.Server/Entities/VehicleItem.cs +++ b/ReallifeGamemode.Database/Entities/VehicleItem.cs @@ -4,9 +4,10 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class VehicleItem { diff --git a/ReallifeGamemode.Server/Entities/VehicleMod.cs b/ReallifeGamemode.Database/Entities/VehicleMod.cs similarity index 91% rename from ReallifeGamemode.Server/Entities/VehicleMod.cs rename to ReallifeGamemode.Database/Entities/VehicleMod.cs index 8bd6fcc5..933e34df 100644 --- a/ReallifeGamemode.Server/Entities/VehicleMod.cs +++ b/ReallifeGamemode.Database/Entities/VehicleMod.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class VehicleMod { diff --git a/ReallifeGamemode.Server/Entities/Whitelist.cs b/ReallifeGamemode.Database/Entities/Whitelist.cs similarity index 88% rename from ReallifeGamemode.Server/Entities/Whitelist.cs rename to ReallifeGamemode.Database/Entities/Whitelist.cs index 9008c790..6090fea6 100644 --- a/ReallifeGamemode.Server/Entities/Whitelist.cs +++ b/ReallifeGamemode.Database/Entities/Whitelist.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text; -namespace ReallifeGamemode.Server.Entities +namespace ReallifeGamemode.Database.Entities { public class Whitelist { diff --git a/ReallifeGamemode.Server/Util/GroupRanks.cs b/ReallifeGamemode.Database/GroupRanks.cs similarity index 79% rename from ReallifeGamemode.Server/Util/GroupRanks.cs rename to ReallifeGamemode.Database/GroupRanks.cs index e9a9e810..9a8d89da 100644 --- a/ReallifeGamemode.Server/Util/GroupRanks.cs +++ b/ReallifeGamemode.Database/GroupRanks.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ReallifeGamemode.Server.Util +namespace ReallifeGamemode.Database { public enum GroupRank { diff --git a/ReallifeGamemode.Server/Util/IBankAccount.cs b/ReallifeGamemode.Database/IBankAccount.cs similarity index 78% rename from ReallifeGamemode.Server/Util/IBankAccount.cs rename to ReallifeGamemode.Database/IBankAccount.cs index b82b46d0..8e145cbf 100644 --- a/ReallifeGamemode.Server/Util/IBankAccount.cs +++ b/ReallifeGamemode.Database/IBankAccount.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ReallifeGamemode.Server.Util +namespace ReallifeGamemode.Database { public interface IBankAccount { diff --git a/ReallifeGamemode.Server/Util/IBankAccountOwner.cs b/ReallifeGamemode.Database/IBankAccountOwner.cs similarity index 65% rename from ReallifeGamemode.Server/Util/IBankAccountOwner.cs rename to ReallifeGamemode.Database/IBankAccountOwner.cs index 191f134e..470bc7a7 100644 --- a/ReallifeGamemode.Server/Util/IBankAccountOwner.cs +++ b/ReallifeGamemode.Database/IBankAccountOwner.cs @@ -1,6 +1,6 @@ -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; -namespace ReallifeGamemode.Server.Util +namespace ReallifeGamemode.Database { public interface IBankAccountOwner { diff --git a/ReallifeGamemode.Server/Models/DatabaseContext.cs b/ReallifeGamemode.Database/Models/DatabaseContext.cs similarity index 98% rename from ReallifeGamemode.Server/Models/DatabaseContext.cs rename to ReallifeGamemode.Database/Models/DatabaseContext.cs index 2ad7dc94..ece55d43 100644 --- a/ReallifeGamemode.Server/Models/DatabaseContext.cs +++ b/ReallifeGamemode.Database/Models/DatabaseContext.cs @@ -6,7 +6,7 @@ * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Models +namespace ReallifeGamemode.Database.Models { public partial class DatabaseContext : DbContext { diff --git a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj new file mode 100644 index 00000000..edc26b64 --- /dev/null +++ b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj @@ -0,0 +1,26 @@ + + + + netstandard2.0 + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + ..\..\bridge\runtime\Bootstrapper.dll + + + diff --git a/ReallifeGamemode.Server/Business/BusinessBase.cs b/ReallifeGamemode.Server/Business/BusinessBase.cs index 7c019566..769b0488 100644 --- a/ReallifeGamemode.Server/Business/BusinessBase.cs +++ b/ReallifeGamemode.Server/Business/BusinessBase.cs @@ -1,9 +1,9 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Util; using System.Linq; namespace ReallifeGamemode.Server.Business diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index c001c7f8..715aaa5c 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; @@ -13,11 +13,13 @@ using ReallifeGamemode.Server.Business; using System.Text.RegularExpressions; using ReallifeGamemode.Server.Classes; using ReallifeGamemode.Server.Factions.Medic; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Finance; using ReallifeGamemode.Server.Wanted; using Microsoft.EntityFrameworkCore; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Database; +using ReallifeGamemode.Services; /** * @overview Life of German Reallife - Admin Commands (Admin.cs) @@ -300,7 +302,7 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { ChatService.SendMessage(player, "~m~__________ ~s~Fraktionen ~m~__________"); - foreach (Entities.Faction f in dbContext.Factions) + foreach (Faction f in dbContext.Factions) { ChatService.SendMessage(player, f.Id.ToString().PadRight(3) + " | " + f.Name); } @@ -1662,14 +1664,14 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - Entities.Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == faction); + Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == faction); if (f == null && faction != 0) { ChatService.ErrorMessage(player, "Diese Fraktion existiert nicht (Liste: ~m~/factionlist~s~)"); return; } - Entities.User u = target.GetUser(dbContext); + User u = target.GetUser(dbContext); if (faction != 0) { @@ -1713,14 +1715,14 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - Entities.Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == faction); + Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == faction); if (f == null) { ChatService.ErrorMessage(player, "Diese Fraktion existiert nicht (Liste: ~m~/factionlist~s~)"); return; } - Entities.User u = target.GetUser(dbContext); + User u = target.GetUser(dbContext); u.FactionId = f.Id; u.FactionRankId = dbContext.FactionRanks. @@ -2198,7 +2200,7 @@ namespace ReallifeGamemode.Server.Commands using (var context = new DatabaseContext()) { - Entities.Faction f = context.Factions.FirstOrDefault(id => id.Id == factionID); + Faction f = context.Factions.FirstOrDefault(id => id.Id == factionID); if (f == null) { ChatService.ErrorMessage(player, "Diese Fraktion existiert nicht (Liste: ~m~/factionlist~s~)"); @@ -2378,7 +2380,7 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - Entities.User targetUser = target.GetUser(dbContext); + User targetUser = target.GetUser(dbContext); targetUser.BusinessId = businessid; dbContext.SaveChanges(); @@ -2756,7 +2758,7 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - Entities.Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == factionID); + Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == factionID); if (f == null) { ChatService.ErrorMessage(player, "Diese Fraktion existiert nicht (Liste: ~m~/factionlist~s~)"); @@ -2776,10 +2778,10 @@ namespace ReallifeGamemode.Server.Commands return; } - Entities.FactionWeapon fw = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); + FactionWeapon fw = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); if (fw == null) { - var newWeapon = new Entities.FactionWeapon + var newWeapon = new FactionWeapon { WeaponModel = weaponModel, SlotID = slotId, @@ -2799,10 +2801,10 @@ namespace ReallifeGamemode.Server.Commands } - Entities.FactionWeapon fw2 = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); + FactionWeapon fw2 = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); if (fw2 == null) { - var schutzweste = new Entities.FactionWeapon + var schutzweste = new FactionWeapon { WeaponModel = weaponModel, SlotID = slotId, @@ -2834,7 +2836,7 @@ namespace ReallifeGamemode.Server.Commands using (var dbContext = new DatabaseContext()) { - Entities.Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == factionID); + Faction f = dbContext.Factions.FirstOrDefault(x => x.Id == factionID); if (f == null) { ChatService.ErrorMessage(player, "Diese Fraktion existiert nicht (Liste: ~m~/factionlist~s~)"); @@ -2854,7 +2856,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Entities.FactionWeapon fw = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); + FactionWeapon fw = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); if (fw != null) { dbContext.FactionWeapons.Remove(fw); @@ -2865,7 +2867,7 @@ namespace ReallifeGamemode.Server.Commands ChatService.ErrorMessage(player, "Diese Waffe befindet sich nicht im Waffenlager"); return; } - Entities.FactionWeapon fw2 = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); + FactionWeapon fw2 = dbContext.FactionWeapons.FirstOrDefault(w => w.FactionId == factionID && w.WeaponModel == weaponModel); if (fw2 != null) { dbContext.FactionWeapons.Remove(fw2); diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 726b09b3..60344ec3 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -1,11 +1,12 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Factions.Medic; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Wanted; +using ReallifeGamemode.Services; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; @@ -41,7 +42,7 @@ namespace ReallifeGamemode.Server.Commands [Command("r", "~m~Benutzung: ~s~/r [Nachricht]", GreedyArg = true)] public void CmdFactionR(Client player, string message) { - Entities.Faction f = player.GetUser()?.Faction; + Faction f = player.GetUser()?.Faction; if (f == null || !f.StateOwned) { ChatService.NotAuthorized(player); @@ -157,7 +158,7 @@ namespace ReallifeGamemode.Server.Commands using (var context = new DatabaseContext()) { - Entities.FactionWeapon fw2 = context.FactionWeapons.FirstOrDefault(w => w.FactionId == user.FactionId && w.WeaponModel == weaponModel); + FactionWeapon fw2 = context.FactionWeapons.FirstOrDefault(w => w.FactionId == user.FactionId && w.WeaponModel == weaponModel); if (fw2 != null) { diff --git a/ReallifeGamemode.Server/Commands/GroupCommands.cs b/ReallifeGamemode.Server/Commands/GroupCommands.cs index fda76d63..799e51a4 100644 --- a/ReallifeGamemode.Server/Commands/GroupCommands.cs +++ b/ReallifeGamemode.Server/Commands/GroupCommands.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Commands [Command("gc", "~m~Benutzung: ~s~/gc [Nachricht]", GreedyArg = true)] public void CmdGroupG(Client player, string message) { - Entities.Group group = player.GetUser().Group; + Database.Entities.Group group = player.GetUser().Group; if (group == null) { ChatService.NotAuthorized(player); diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 30e98a67..c8b95964 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -1,8 +1,8 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Finance; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System; diff --git a/ReallifeGamemode.Server/Entities/JobVehicle.cs b/ReallifeGamemode.Server/Entities/JobVehicle.cs deleted file mode 100644 index 7bcaab77..00000000 --- a/ReallifeGamemode.Server/Entities/JobVehicle.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Server.Job; -using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace ReallifeGamemode.Server.Entities -{ - public class JobVehicle : ServerVehicle - { - public int JobId { get; set; } - - public JobBase GetJob() => JobManager.GetJob(JobId); - - public override string ToString() - { - using (var dbContext = new DatabaseContext()) - return "Job Fahrzeug | Job: " + this.GetJob().Name; - } - } -} diff --git a/ReallifeGamemode.Server/Entities/ServerVehicle.cs b/ReallifeGamemode.Server/Entities/ServerVehicle.cs deleted file mode 100644 index 0b5cb538..00000000 --- a/ReallifeGamemode.Server/Entities/ServerVehicle.cs +++ /dev/null @@ -1,93 +0,0 @@ -using GTANetworkAPI; -using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Util; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace ReallifeGamemode.Server.Entities -{ - public abstract class ServerVehicle - { - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int Id { get; set; } - - public VehicleHash Model { get; set; } - public float PositionX { get; set; } - public float PositionY { get; set; } - public float PositionZ { get; set; } - public float Heading { get; set; } - [StringLength(8)] - public string NumberPlate { get; set; } - public int PrimaryColor { get; set; } - public int SecondaryColor { get; set; } - public bool Locked { get; set; } - public bool Active { get; set; } - public float DistanceDriven { get; set; } - public float TankAmount { get; set; } - public int Livery { get; set; } - - [NotMapped] - public Vector3 Position => new Vector3(PositionX, PositionY, PositionZ); - - [NotMapped] - public Vehicle Vehicle => VehicleManager.GetVehicleFromServerVehicle(this); - - public Vehicle Spawn(Vehicle currentVeh = null) - { - if (currentVeh != null) VehicleManager.DeleteVehicle(currentVeh); - Vector3 position = this.Position; - uint model = (uint)this.Model; - float heading = this.Heading; - int c1 = this.PrimaryColor; - int c2 = this.SecondaryColor; - string np = this.NumberPlate; - Vehicle veh = NAPI.Vehicle.CreateVehicle(Model, position, heading, c1, c2, "", 255, false, false); - veh.Livery = Livery; - VehicleStreaming.SetEngineState(veh, false); - VehicleStreaming.SetLockStatus(veh, this.Locked); - VehicleManager.AddVehicle(this, veh); - - veh.SetSharedData("drivenDistance", this.DistanceDriven); - - string numberplate = $"{this.Id}"; - - if (this is FactionVehicle fV) - { - numberplate = $"F{fV.FactionId} " + numberplate; - } - - if (this is UserVehicle uV) - { - numberplate = $"U{uV.UserId} " + numberplate; - } - - if (this is ShopVehicle sV) - { - numberplate = "Shop"; - VehicleStreaming.SetLockStatus(veh, false); - TextLabel label = NAPI.TextLabel.CreateTextLabel("SHOPVEHICLE\n" + "~g~" + sV.Price.ToMoneyString(), - veh.Position.Add(new Vector3(0, 0, 1.3)), 20.0f, 1f, 1, new Color(255, 255, 255)); - - veh.SetSharedData("shopVehicleTextLabel", label.Handle.Value); - } - - if (this is GroupVehicle gV) - { - numberplate = $"G{gV.GroupId} " + numberplate; - } - - if (this is JobVehicle jV) - { - numberplate = $"J{jV.JobId} " + numberplate; - } - - veh.NumberPlate = numberplate; - - return veh; - } - - public abstract override string ToString(); - } -} diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 0117c7c4..684b60db 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -1,7 +1,8 @@ using System; using System.Linq; using GTANetworkAPI; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Wanted; diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 04e0d4a4..f7759e99 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -1,9 +1,10 @@ using System; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Factions.Medic; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Wanted; @@ -86,7 +87,7 @@ namespace ReallifeGamemode.Server.Events using (var userDeath = new DatabaseContext()) { - var dead = new Entities.Logs.Death + var dead = new Database.Entities.Logs.Death { VictimId = player.GetUser().Id, KillerId = killerId, diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 7759945e..dc1dc064 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -6,9 +6,10 @@ using GTANetworkAPI; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Database; /** * @overview Life of German Reallife - Event Login (Login.cs) diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index 43133258..a4a431a2 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; namespace ReallifeGamemode.Server.Events diff --git a/ReallifeGamemode.Server/Events/Faction.cs b/ReallifeGamemode.Server/Events/Faction.cs index e818dc5e..62a93984 100644 --- a/ReallifeGamemode.Server/Events/Faction.cs +++ b/ReallifeGamemode.Server/Events/Faction.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System.Collections.Generic; @@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Events FactionRankHelper helper = JsonConvert.DeserializeObject(jsonData); using (var context = new DatabaseContext()) { - Entities.Faction f = context.Factions.FirstOrDefault(x => x.Id == helper.FactionId); + Database.Entities.Faction f = context.Factions.FirstOrDefault(x => x.Id == helper.FactionId); if (f == null) { ChatService.ErrorMessage(player, "Bei der Bearbeitung der Ränge ist ein Fehler aufgetreten: Die Fraktion existiert nicht"); diff --git a/ReallifeGamemode.Server/Events/Inventory.cs b/ReallifeGamemode.Server/Events/Inventory.cs index 72d2c90c..637c966b 100644 --- a/ReallifeGamemode.Server/Events/Inventory.cs +++ b/ReallifeGamemode.Server/Events/Inventory.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Util; namespace ReallifeGamemode.Server.Events diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 59a83104..d1abdca1 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -3,15 +3,15 @@ using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; using ReallifeGamemode.Server.Classes; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Factions.Medic; using ReallifeGamemode.Server.Finance; using ReallifeGamemode.Server.Inventory; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; -using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Event Key (Key.cs) * @author VegaZ diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 75f7254b..a79c5963 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -3,10 +3,11 @@ using GTANetworkAPI; using Microsoft.EntityFrameworkCore; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Wanted; +using ReallifeGamemode.Database; /** * @overview Life of German Reallife - Event Login (Login.cs) diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs index c75b795f..f8b1214f 100644 --- a/ReallifeGamemode.Server/Events/Register.cs +++ b/ReallifeGamemode.Server/Events/Register.cs @@ -1,6 +1,7 @@ using System.Linq; using GTANetworkAPI; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Event Register (Register.cs) @@ -19,7 +20,7 @@ namespace ReallifeGamemode.Server.Events { if (!dbContext.Users.Any(u => u.Name.ToLower() == username.ToLower().Trim())) { - var user = new Entities.User + var user = new Database.Entities.User { Name = player.Name, SocialClubName = player.SocialClubName, @@ -31,7 +32,7 @@ namespace ReallifeGamemode.Server.Events dbContext.Users.Add(user); dbContext.SaveChanges(); - var userBankAccount = new Entities.UserBankAccount + var userBankAccount = new Database.Entities.UserBankAccount { UserId = user.Id, Balance = 5000, diff --git a/ReallifeGamemode.Server/Events/ResourceStop.cs b/ReallifeGamemode.Server/Events/ResourceStop.cs index 0274622c..bd74deb4 100644 --- a/ReallifeGamemode.Server/Events/ResourceStop.cs +++ b/ReallifeGamemode.Server/Events/ResourceStop.cs @@ -1,11 +1,6 @@ using GTANetworkAPI; -using GTANetworkMethods; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; -using System; -using System.Collections.Generic; +using ReallifeGamemode.Database.Models; using System.Linq; -using System.Text; /** * @overview Life of German Reallife - Event ResourceStop (ResourceStop.cs) diff --git a/ReallifeGamemode.Server/Events/Update.cs b/ReallifeGamemode.Server/Events/Update.cs deleted file mode 100644 index 05014693..00000000 --- a/ReallifeGamemode.Server/Events/Update.cs +++ /dev/null @@ -1,19 +0,0 @@ -using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; -using System; -using System.Collections.Generic; -using System.Text; - -namespace ReallifeGamemode.Server.Events -{ - class Update : Script - { - [ServerEvent(Event.Update)] - public void UpdateEvent() - { - - } - } -} diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index eb40581e..df79fa02 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -2,9 +2,9 @@ using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; namespace ReallifeGamemode.Server.Events { diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs index 33680a5b..5679fe66 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs @@ -1,22 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using GTANetworkAPI; -using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; -using ReallifeGamemode.Server.Services; +using GTANetworkAPI; namespace ReallifeGamemode.Server.Events { public class UpdateCharacterWeapon : Script { - - - [RemoteEvent("updateWeaponSelection")] public void UpdateWeaponSelection(Client client, string weaponModel, int slot) { diff --git a/ReallifeGamemode.Server/Events/VehicleMenu.cs b/ReallifeGamemode.Server/Events/VehicleMenu.cs index 057bdd73..9f516211 100644 --- a/ReallifeGamemode.Server/Events/VehicleMenu.cs +++ b/ReallifeGamemode.Server/Events/VehicleMenu.cs @@ -1,11 +1,10 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Util; using System; -using System.Collections.Generic; -using System.Text; namespace ReallifeGamemode.Server.Events { diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 23a35c81..c2f2529a 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -1,8 +1,8 @@ using GTANetworkAPI; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using System; using System.Collections.Generic; diff --git a/ReallifeGamemode.Server/Extensions/EnumExtensions.cs b/ReallifeGamemode.Server/Extensions/EnumExtensions.cs index d597e6a4..4c00c1a6 100644 --- a/ReallifeGamemode.Server/Extensions/EnumExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/EnumExtensions.cs @@ -1,8 +1,9 @@ using ReallifeGamemode.Server.Util; -using static ReallifeGamemode.Server.Util.AdminLevel; +using static ReallifeGamemode.Database.AdminLevel; using System; using System.Collections.Generic; using System.Text; +using ReallifeGamemode.Database; namespace ReallifeGamemode.Server.Extensions { diff --git a/ReallifeGamemode.Server/Extensions/HouseExtensions.cs b/ReallifeGamemode.Server/Extensions/HouseExtensions.cs index 0b1f15c2..970f6abb 100644 --- a/ReallifeGamemode.Server/Extensions/HouseExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/HouseExtensions.cs @@ -1,10 +1,7 @@ using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; -using System; -using System.Collections.Generic; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.Linq; -using System.Text; namespace ReallifeGamemode.Server.Extensions { diff --git a/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs b/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs new file mode 100644 index 00000000..de6868a1 --- /dev/null +++ b/ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Text; +using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Server.Job; +using ReallifeGamemode.Server.Managers; +using ReallifeGamemode.Server.Util; + +namespace ReallifeGamemode.Server.Extensions +{ + public static class ServerVehicleExtensions + { + public static JobBase GetJob(this JobVehicle vehicle) + { + return JobManager.GetJob(vehicle.JobId); + } + + public static Vehicle GetVehicle(this ServerVehicle veh) => VehicleManager.GetVehicleFromServerVehicle(veh); + + public static Vehicle Spawn(this ServerVehicle veh, Vehicle currentVeh = null) + { + if (currentVeh != null) VehicleManager.DeleteVehicle(currentVeh); + Vector3 position = veh.Position; + uint model = (uint)veh.Model; + float heading = veh.Heading; + int c1 = veh.PrimaryColor; + int c2 = veh.SecondaryColor; + Vehicle newVeh = NAPI.Vehicle.CreateVehicle(model, position, heading, c1, c2, "", 255, false, false); + veh.Livery = veh.Livery; + VehicleStreaming.SetEngineState(newVeh, false); + VehicleStreaming.SetLockStatus(newVeh, veh.Locked); + VehicleManager.AddVehicle(veh, newVeh); + + newVeh.SetSharedData("drivenDistance", veh.DistanceDriven); + + string numberplate = $"{veh.Id}"; + + if (veh is FactionVehicle fV) + { + numberplate = $"F{fV.FactionId} " + numberplate; + } + + if (veh is UserVehicle uV) + { + numberplate = $"U{uV.UserId} " + numberplate; + } + + if (veh is ShopVehicle sV) + { + numberplate = "Shop"; + VehicleStreaming.SetLockStatus(newVeh, false); + TextLabel label = NAPI.TextLabel.CreateTextLabel("SHOPVEHICLE\n" + "~g~" + sV.Price.ToMoneyString(), + veh.Position.Add(new Vector3(0, 0, 1.3)), 20.0f, 1f, 1, new Color(255, 255, 255)); + + newVeh.SetSharedData("shopVehicleTextLabel", label.Handle.Value); + } + + if (veh is GroupVehicle gV) + { + numberplate = $"G{gV.GroupId} " + numberplate; + } + + if (veh is JobVehicle jV) + { + numberplate = $"J{jV.JobId} " + numberplate; + } + + veh.NumberPlate = numberplate; + + return newVeh; + } + } +} diff --git a/ReallifeGamemode.Server/Extensions/VehicleExtension.cs b/ReallifeGamemode.Server/Extensions/VehicleExtension.cs index 28c7a96f..ce5005a7 100644 --- a/ReallifeGamemode.Server/Extensions/VehicleExtension.cs +++ b/ReallifeGamemode.Server/Extensions/VehicleExtension.cs @@ -1,11 +1,8 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Server.Models; -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; namespace ReallifeGamemode.Server.Extensions { diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index a1dc3cf6..50696569 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -11,9 +11,9 @@ using System.Linq; using System.Text; using GTANetworkAPI; using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Finance diff --git a/ReallifeGamemode.Server/Finance/Paycheck.cs b/ReallifeGamemode.Server/Finance/Paycheck.cs index 678cb0ae..f0187789 100644 --- a/ReallifeGamemode.Server/Finance/Paycheck.cs +++ b/ReallifeGamemode.Server/Finance/Paycheck.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Finance diff --git a/ReallifeGamemode.Server/Inventory/GroundItem.cs b/ReallifeGamemode.Server/Inventory/GroundItem.cs index 84949ec6..efd0ce8f 100644 --- a/ReallifeGamemode.Server/Inventory/GroundItem.cs +++ b/ReallifeGamemode.Server/Inventory/GroundItem.cs @@ -3,9 +3,9 @@ using GTANetworkAPI; using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Managers; using System.Linq; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Inventory { diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs index 0626bd76..bab77667 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IDroppableItem.cs @@ -1,10 +1,4 @@ -using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using System; -using System.Collections.Generic; -using System.Text; - -/** +/** * @overview Life of German Reallife - Inventory Interfaces DroppableItem (IDroppableItem.cs) * @author VegaZ * @copyright (c) 2008 - 2018 Life of German diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs index c0e32fa9..22769290 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IUsableItem.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using System; using System.Collections.Generic; using System.Text; diff --git a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs index 91be6728..9a840a29 100644 --- a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Managers; diff --git a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs index eee68551..b4df0940 100644 --- a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Inventory.Interfaces; using ReallifeGamemode.Server.Managers; diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index fb070f57..8bfc0304 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Text; using GTANetworkAPI; using ReallifeGamemode.Server.Util; using Newtonsoft.Json; -using GTANetworkAPI; -using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Job { @@ -17,8 +14,6 @@ namespace ReallifeGamemode.Server.Job public override bool NeedVehicleToStart => true; - public String routeText; - private readonly IReadOnlyCollection Route1 = new List { new Vector3(-105.5951, -1684.548, 29.23948), diff --git a/ReallifeGamemode.Server/Job/JobBase.cs b/ReallifeGamemode.Server/Job/JobBase.cs index 3bcda878..e3218979 100644 --- a/ReallifeGamemode.Server/Job/JobBase.cs +++ b/ReallifeGamemode.Server/Job/JobBase.cs @@ -1,11 +1,9 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using System.Collections.Generic; using System.Linq; -using ReallifeGamemode.Server.Util; -using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Job { diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index c6a903ef..e6e8e2a7 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using GTANetworkAPI; using ReallifeGamemode.Server.Util; -using Newtonsoft.Json; -using GTANetworkAPI; -using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Job { diff --git a/ReallifeGamemode.Server/Managers/ATMManager.cs b/ReallifeGamemode.Server/Managers/ATMManager.cs index d1e0545d..fd953bf1 100644 --- a/ReallifeGamemode.Server/Managers/ATMManager.cs +++ b/ReallifeGamemode.Server/Managers/ATMManager.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Managers ATMManager (ATMManager.cs) diff --git a/ReallifeGamemode.Server/Managers/BankManager.cs b/ReallifeGamemode.Server/Managers/BankManager.cs index 53c9933f..4c1e013e 100644 --- a/ReallifeGamemode.Server/Managers/BankManager.cs +++ b/ReallifeGamemode.Server/Managers/BankManager.cs @@ -4,11 +4,11 @@ using System.Linq; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Server.Business; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Entities.Logs; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Database.Entities.Logs; /** * @overview Life of German Reallife - Managers BankManager (BankManager.cs) diff --git a/ReallifeGamemode.Server/Managers/BusinessManager.cs b/ReallifeGamemode.Server/Managers/BusinessManager.cs index 69b8fe19..c5e1c60a 100644 --- a/ReallifeGamemode.Server/Managers/BusinessManager.cs +++ b/ReallifeGamemode.Server/Managers/BusinessManager.cs @@ -1,15 +1,16 @@ using GTANetworkAPI; using Newtonsoft.Json; using ReallifeGamemode.Server.Business; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using ReallifeGamemode.Database; namespace ReallifeGamemode.Server.Managers { diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index 7988d272..744e5d92 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -2,7 +2,7 @@ using GTANetworkAPI; using Newtonsoft.Json.Linq; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Managers { @@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.Managers using (var saveCharacter = new DatabaseContext()) { - var character = new Entities.Character + var character = new Database.Entities.Character { UserId = player.GetUser().Id, Gender = gender, diff --git a/ReallifeGamemode.Server/Managers/CityHallManager.cs b/ReallifeGamemode.Server/Managers/CityHallManager.cs index 24f35520..6acad9d6 100644 --- a/ReallifeGamemode.Server/Managers/CityHallManager.cs +++ b/ReallifeGamemode.Server/Managers/CityHallManager.cs @@ -1,14 +1,15 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.Linq; using System.Text; +using ReallifeGamemode.Database; namespace ReallifeGamemode.Server.Managers { diff --git a/ReallifeGamemode.Server/Managers/DoorManager.cs b/ReallifeGamemode.Server/Managers/DoorManager.cs index 7d6c61dc..0825e2ef 100644 --- a/ReallifeGamemode.Server/Managers/DoorManager.cs +++ b/ReallifeGamemode.Server/Managers/DoorManager.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database; /** * @overview Life of German Reallife - Managers BankManager (BankManager.cs) * @author VegaZ diff --git a/ReallifeGamemode.Server/Managers/HouseManager.cs b/ReallifeGamemode.Server/Managers/HouseManager.cs index cbeb5e08..20c69778 100644 --- a/ReallifeGamemode.Server/Managers/HouseManager.cs +++ b/ReallifeGamemode.Server/Managers/HouseManager.cs @@ -1,9 +1,9 @@ using GTANetworkAPI; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; using System; using System.Collections.Generic; diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 7a5935de..9b52bfc2 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -1,15 +1,17 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Job; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; using System.Linq; using System.Text; +using ReallifeGamemode.Database; +using ReallifeGamemode.Services; /** * @overview Life of German Reallife - Managers Interaction (InteractionManager.cs) diff --git a/ReallifeGamemode.Server/Managers/InteriorManager.cs b/ReallifeGamemode.Server/Managers/InteriorManager.cs index a84d2de5..0583c21b 100644 --- a/ReallifeGamemode.Server/Managers/InteriorManager.cs +++ b/ReallifeGamemode.Server/Managers/InteriorManager.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System.Collections.Generic; using System.Linq; diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index 64a27414..c72c3e63 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -1,10 +1,9 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Inventory; using ReallifeGamemode.Server.Inventory.Interfaces; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System; @@ -12,6 +11,8 @@ using System.Timers; using System.Collections.Generic; using System.Linq; using System.Reflection; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Services; /** * @overview Life of German Reallife - Managers InventoryManager (InventoryManager.cs) @@ -146,7 +147,7 @@ namespace ReallifeGamemode.Server.Managers } } - public static void GetUserItemsAsAdmin(Client player, Entities.User user) + public static void GetUserItemsAsAdmin(Client player, User user) { var inventoryWeight = 0; diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 8c893ae4..eb7e13fc 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -1,16 +1,16 @@ using GTANetworkAPI; using Newtonsoft.Json; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Job; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Services; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Text; namespace ReallifeGamemode.Server.Managers { @@ -167,7 +167,7 @@ namespace ReallifeGamemode.Server.Managers return; } - if (job.NeedVehicleToStart && !job.GetJobVehicles().Any(v => v.Vehicle.Handle.Value == player.Vehicle?.Handle.Value)) + if (job.NeedVehicleToStart && !job.GetJobVehicles().Any(v => v.GetVehicle().Handle.Value == player.Vehicle?.Handle.Value)) { ChatService.ErrorMessage(player, "Zum Start dieses Jobs musst du in einem Jobfahrzeug sein"); return; diff --git a/ReallifeGamemode.Server/Managers/LoadManager.cs b/ReallifeGamemode.Server/Managers/LoadManager.cs index 6e8c6775..99f6889c 100644 --- a/ReallifeGamemode.Server/Managers/LoadManager.cs +++ b/ReallifeGamemode.Server/Managers/LoadManager.cs @@ -1,7 +1,8 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Entities.Saves; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Entities.Saves; +using ReallifeGamemode.Database.Models; +using ReallifeGamemode.Server.Extensions; /** * @overview Life of German Reallife - Managers LoadManager (LoadManager.cs) diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index 54b54dc8..2173b215 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; namespace ReallifeGamemode.Server.Managers { diff --git a/ReallifeGamemode.Server/Managers/SaveManager.cs b/ReallifeGamemode.Server/Managers/SaveManager.cs index 4a59171e..f9f4eeac 100644 --- a/ReallifeGamemode.Server/Managers/SaveManager.cs +++ b/ReallifeGamemode.Server/Managers/SaveManager.cs @@ -1,9 +1,9 @@ using GTANetworkAPI; using ReallifeGamemode.Server.Business; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Entities.Saves; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Entities.Saves; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using System; namespace ReallifeGamemode.Server.Managers diff --git a/ReallifeGamemode.Server/Managers/TuningManager.cs b/ReallifeGamemode.Server/Managers/TuningManager.cs index 78053fbd..0f96f874 100644 --- a/ReallifeGamemode.Server/Managers/TuningManager.cs +++ b/ReallifeGamemode.Server/Managers/TuningManager.cs @@ -1,7 +1,7 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using System.Collections.Generic; using System.Linq; diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 661fb120..40b51611 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using System; using System.Collections.Generic; using System.Linq; diff --git a/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs b/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs index 2714aaec..75a07626 100644 --- a/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190226185806_Initial.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs b/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs index 49d9d1b1..fec84486 100644 --- a/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190306194826_VehicleDistanceDriven.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190307163335_VehicleTank.Designer.cs b/ReallifeGamemode.Server/Migrations/20190307163335_VehicleTank.Designer.cs index 57e961ef..3379f7fd 100644 --- a/ReallifeGamemode.Server/Migrations/20190307163335_VehicleTank.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190307163335_VehicleTank.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190309184251_ATM.Designer.cs b/ReallifeGamemode.Server/Migrations/20190309184251_ATM.Designer.cs index 03f89742..1a1ebae9 100644 --- a/ReallifeGamemode.Server/Migrations/20190309184251_ATM.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190309184251_ATM.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190408143319_Handmoney.Designer.cs b/ReallifeGamemode.Server/Migrations/20190408143319_Handmoney.Designer.cs index dde51589..f8913be7 100644 --- a/ReallifeGamemode.Server/Migrations/20190408143319_Handmoney.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190408143319_Handmoney.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190411180607_TuningGarage.Designer.cs b/ReallifeGamemode.Server/Migrations/20190411180607_TuningGarage.Designer.cs index 74da1c9c..38dfc56f 100644 --- a/ReallifeGamemode.Server/Migrations/20190411180607_TuningGarage.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190411180607_TuningGarage.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190505154643_Groups.Designer.cs b/ReallifeGamemode.Server/Migrations/20190505154643_Groups.Designer.cs index 791187a5..5673438e 100644 --- a/ReallifeGamemode.Server/Migrations/20190505154643_Groups.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190505154643_Groups.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190513111017_UnusedColumnRemove.Designer.cs b/ReallifeGamemode.Server/Migrations/20190513111017_UnusedColumnRemove.Designer.cs index 396614c7..d94eea24 100644 --- a/ReallifeGamemode.Server/Migrations/20190513111017_UnusedColumnRemove.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190513111017_UnusedColumnRemove.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190513161249_Jobs.Designer.cs b/ReallifeGamemode.Server/Migrations/20190513161249_Jobs.Designer.cs index 036bb577..5b9011f8 100644 --- a/ReallifeGamemode.Server/Migrations/20190513161249_Jobs.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190513161249_Jobs.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190516094446_JobFix.Designer.cs b/ReallifeGamemode.Server/Migrations/20190516094446_JobFix.Designer.cs index b6390e3c..f7ed68d7 100644 --- a/ReallifeGamemode.Server/Migrations/20190516094446_JobFix.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190516094446_JobFix.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190624153156_ClothesTexture.Designer.cs b/ReallifeGamemode.Server/Migrations/20190624153156_ClothesTexture.Designer.cs index 6b85cca9..414fc235 100644 --- a/ReallifeGamemode.Server/Migrations/20190624153156_ClothesTexture.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190624153156_ClothesTexture.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs b/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs index 1121a111..67c51a48 100644 --- a/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190626193631_House.Designer.cs b/ReallifeGamemode.Server/Migrations/20190626193631_House.Designer.cs index bda1694e..8da1f2a8 100644 --- a/ReallifeGamemode.Server/Migrations/20190626193631_House.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190626193631_House.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190626202159_HousePosition.Designer.cs b/ReallifeGamemode.Server/Migrations/20190626202159_HousePosition.Designer.cs index 33f9da63..f9a1c0f8 100644 --- a/ReallifeGamemode.Server/Migrations/20190626202159_HousePosition.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190626202159_HousePosition.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190627162731_UserHouseReference.Designer.cs b/ReallifeGamemode.Server/Migrations/20190627162731_UserHouseReference.Designer.cs index 09d8b503..0801e8bc 100644 --- a/ReallifeGamemode.Server/Migrations/20190627162731_UserHouseReference.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190627162731_UserHouseReference.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190706132925_UserWage.Designer.cs b/ReallifeGamemode.Server/Migrations/20190706132925_UserWage.Designer.cs index aafa934b..9a677e08 100644 --- a/ReallifeGamemode.Server/Migrations/20190706132925_UserWage.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190706132925_UserWage.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190707184050_BusRoutes.Designer.cs b/ReallifeGamemode.Server/Migrations/20190707184050_BusRoutes.Designer.cs index a45ae703..c1a0ee5d 100644 --- a/ReallifeGamemode.Server/Migrations/20190707184050_BusRoutes.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190707184050_BusRoutes.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190708161922_UserHouseReferenceFix.Designer.cs b/ReallifeGamemode.Server/Migrations/20190708161922_UserHouseReferenceFix.Designer.cs index 2534b6d4..23423503 100644 --- a/ReallifeGamemode.Server/Migrations/20190708161922_UserHouseReferenceFix.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190708161922_UserHouseReferenceFix.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190715192123_JailTime.Designer.cs b/ReallifeGamemode.Server/Migrations/20190715192123_JailTime.Designer.cs index 6e47c3ab..54eccf83 100644 --- a/ReallifeGamemode.Server/Migrations/20190715192123_JailTime.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190715192123_JailTime.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190719210722_PaydayTimer.Designer.cs b/ReallifeGamemode.Server/Migrations/20190719210722_PaydayTimer.Designer.cs index c04ba8a9..a5c6d88f 100644 --- a/ReallifeGamemode.Server/Migrations/20190719210722_PaydayTimer.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190719210722_PaydayTimer.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190721144830_FactionWeapons.Designer.cs b/ReallifeGamemode.Server/Migrations/20190721144830_FactionWeapons.Designer.cs index 5e7efa31..7b286cdc 100644 --- a/ReallifeGamemode.Server/Migrations/20190721144830_FactionWeapons.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190721144830_FactionWeapons.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190722201850_VehicleLivery.Designer.cs b/ReallifeGamemode.Server/Migrations/20190722201850_VehicleLivery.Designer.cs index f9a0e626..968064db 100644 --- a/ReallifeGamemode.Server/Migrations/20190722201850_VehicleLivery.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190722201850_VehicleLivery.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190728142431_HouseEnhancments.Designer.cs b/ReallifeGamemode.Server/Migrations/20190728142431_HouseEnhancments.Designer.cs index 850b24c4..0f55bad5 100644 --- a/ReallifeGamemode.Server/Migrations/20190728142431_HouseEnhancments.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190728142431_HouseEnhancments.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190805184145_VehicleItems.Designer.cs b/ReallifeGamemode.Server/Migrations/20190805184145_VehicleItems.Designer.cs index 302c8759..c3a92b15 100644 --- a/ReallifeGamemode.Server/Migrations/20190805184145_VehicleItems.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190805184145_VehicleItems.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/20190911192912_BusinessData.Designer.cs b/ReallifeGamemode.Server/Migrations/20190911192912_BusinessData.Designer.cs index ef80206c..10495dea 100644 --- a/ReallifeGamemode.Server/Migrations/20190911192912_BusinessData.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190911192912_BusinessData.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs b/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs index e6dc47e9..c7f64025 100644 --- a/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs +++ b/ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs @@ -3,7 +3,7 @@ using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Migrations { diff --git a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj index 36d399b3..cb9af71f 100644 --- a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj +++ b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj @@ -19,12 +19,12 @@ - - + + all runtime; build; native; contentfiles; analyzers - + @@ -35,6 +35,9 @@ + + + ..\..\bridge\runtime\Bootstrapper.dll diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index 03d2739d..5dc3e4b4 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -1,8 +1,8 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Finance; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using System; @@ -10,6 +10,8 @@ using System.Linq; using System.Collections; using System.Collections.Generic; using Newtonsoft.Json; +using ReallifeGamemode.Database; +using ReallifeGamemode.Services; namespace ReallifeGamemode.Server.Report { diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs index 38827032..abf257b4 100644 --- a/ReallifeGamemode.Server/Services/ChatService.cs +++ b/ReallifeGamemode.Server/Services/ChatService.cs @@ -1,8 +1,9 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Job; -using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Util; using System; using System.Collections.Generic; diff --git a/ReallifeGamemode.Server/Util/CheckPointHandle.cs b/ReallifeGamemode.Server/Util/CheckPointHandle.cs index cd452462..8c9e7fc8 100644 --- a/ReallifeGamemode.Server/Util/CheckPointHandle.cs +++ b/ReallifeGamemode.Server/Util/CheckPointHandle.cs @@ -1,14 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Finance; -using ReallifeGamemode.Server.Models; +using System.Collections.Generic; using ReallifeGamemode.Server.Services; -using ReallifeGamemode.Server.Util; using GTANetworkAPI; -using System.Collections; using System.Linq; namespace ReallifeGamemode.Server.Util { @@ -59,9 +51,6 @@ namespace ReallifeGamemode.Server.Util public int delay = 0; public int markerID; - Vector3 checkPoint; - bool done; - int checkPointsDone = 0; public CheckPointListForPlayer(Client nPlayer, IEnumerable nList, int nDelay, int nMarkerID) diff --git a/ReallifeGamemode.Server/Util/DatabaseHelper.cs b/ReallifeGamemode.Server/Util/DatabaseHelper.cs index 89231f81..64b08ef6 100644 --- a/ReallifeGamemode.Server/Util/DatabaseHelper.cs +++ b/ReallifeGamemode.Server/Util/DatabaseHelper.cs @@ -1,5 +1,5 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using System.Linq; namespace ReallifeGamemode.Server.Util diff --git a/ReallifeGamemode.Server/Util/FactionHelper.cs b/ReallifeGamemode.Server/Util/FactionHelper.cs index b0109df8..1d8571af 100644 --- a/ReallifeGamemode.Server/Util/FactionHelper.cs +++ b/ReallifeGamemode.Server/Util/FactionHelper.cs @@ -1,6 +1,6 @@ using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Server.Util { diff --git a/ReallifeGamemode.Server/Wanted/Autowanted.cs b/ReallifeGamemode.Server/Wanted/Autowanted.cs index ac795689..8f494c50 100644 --- a/ReallifeGamemode.Server/Wanted/Autowanted.cs +++ b/ReallifeGamemode.Server/Wanted/Autowanted.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; namespace ReallifeGamemode.Server.Wanted { diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index 4187773a..27cd38db 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Factions.Medic; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Services; namespace ReallifeGamemode.Server.Wanted { diff --git a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs index c8046669..a9e057bc 100644 --- a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs +++ b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs @@ -10,16 +10,15 @@ using System.Collections.Generic; using System.Text; using System.Threading; using GTANetworkAPI; -using ReallifeGamemode.Server.Entities; +using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Server.Extensions; -using ReallifeGamemode.Server.Models; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Wanted { public class WantedEscapeTimer { - public static Dictionary waTimer { get; set; } = new Dictionary(); //zeit in ms public static void WantedTimer() diff --git a/ReallifeGamemode.Server/Services/ClientService.cs b/ReallifeGamemode.Services/ClientService.cs similarity index 94% rename from ReallifeGamemode.Server/Services/ClientService.cs rename to ReallifeGamemode.Services/ClientService.cs index 54e4233e..a4aba3a8 100644 --- a/ReallifeGamemode.Server/Services/ClientService.cs +++ b/ReallifeGamemode.Services/ClientService.cs @@ -9,9 +9,9 @@ using System.Text; * @copyright (c) 2008 - 2018 Life of German */ -namespace ReallifeGamemode.Server.Services +namespace ReallifeGamemode.Services { - class ClientService + public class ClientService { /// /// Gibt einen Client anhand seines Namens oder der ID zurück diff --git a/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj b/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj new file mode 100644 index 00000000..13d7f42d --- /dev/null +++ b/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj @@ -0,0 +1,13 @@ + + + + netstandard2.0 + + + + + ..\..\bridge\runtime\Bootstrapper.dll + + + + diff --git a/ReallifeGamemode.sln b/ReallifeGamemode.sln index 7dc75b14..1f3f54de 100644 --- a/ReallifeGamemode.sln +++ b/ReallifeGamemode.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.421 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29009.5 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Server", "ReallifeGamemode.Server\ReallifeGamemode.Server.csproj", "{6A490613-C8B7-4C45-8562-4455F59BCDD4}" EndProject @@ -9,14 +9,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Client", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D5D3F762-4CB5-4521-8A0D-7D39DA5E3967}" ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig .gitattributes = .gitattributes .gitignore = .gitignore .gitlab-ci.yml = .gitlab-ci.yml - readme.md = readme.md - postbuild.ps1 = postbuild.ps1 postbuild.config.xml = postbuild.config.xml + postbuild.ps1 = postbuild.ps1 + readme.md = readme.md EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Database", "ReallifeGamemode.Database\ReallifeGamemode.Database.csproj", "{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Services", "ReallifeGamemode.Services\ReallifeGamemode.Services.csproj", "{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +56,30 @@ Global {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|Any CPU.Build.0 = ServerBuild|Any CPU {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.ActiveCfg = ServerBuild|Any CPU {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.Build.0 = ServerBuild|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.ActiveCfg = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.Build.0 = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|Any CPU.Build.0 = Release|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.ActiveCfg = Release|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.Build.0 = Release|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.ActiveCfg = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.Build.0 = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.ActiveCfg = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.Build.0 = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|Any CPU.Build.0 = Release|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.ActiveCfg = Release|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.Build.0 = Release|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.ActiveCfg = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE