Umstrukturierung

This commit is contained in:
hydrant
2019-09-17 20:45:54 +02:00
parent 76ebab53d5
commit 331141d6bb
140 changed files with 455 additions and 444 deletions

View File

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

View File

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

View File

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

View File

@@ -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,

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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