Umstrukturierung

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
   {

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
   {

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
   {

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
   {

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; }
   }

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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; }
+  }
+}

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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}";
+    }
+  }
+}

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";
     }
   }
 }

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
   {

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
   {

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; }
   }
-}
+}

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
       }
     }
   }
-}
+}

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

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

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
   {

ReallifeGamemode.Database/ReallifeGamemode.Database.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReallifeGamemode.Services\ReallifeGamemode.Services.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Bootstrapper">
+      <HintPath>..\..\bridge\runtime\Bootstrapper.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>

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

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);

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)
         {

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);

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;

ReallifeGamemode.Server/Entities/JobVehicle.cs

@@ -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;
-    }
-  }
-}

ReallifeGamemode.Server/Entities/ServerVehicle.cs

@@ -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();
-  }
-}

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;

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,

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)

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

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<FactionRankHelper>(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");

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

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

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)

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,

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)

ReallifeGamemode.Server/Events/Update.cs

@@ -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()
-    {
-
-    }
-  }
-}

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
 {

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)
     {

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
 {

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;

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
 {

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
 {

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;
+    }
+  }
+}

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
 {

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

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

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
 {

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

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;

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;

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;

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<Vector3> Route1 = new List<Vector3>
       {
         new Vector3(-105.5951, -1684.548, 29.23948),

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
 {

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
 {

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)

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)

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
 {

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,

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
 {

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

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;

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)

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;
 

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;
 

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;

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)

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
 {

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