aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Umstrukturierung

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Server/Events/Connect.cs
View File

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

7
ReallifeGamemode.Server/Events/Death.cs
View File

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

3
ReallifeGamemode.Server/Events/Disconnect.cs
View File

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

2
ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs
View File

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

6
ReallifeGamemode.Server/Events/Faction.cs
View File

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

4
ReallifeGamemode.Server/Events/Inventory.cs
View File

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

6
ReallifeGamemode.Server/Events/Key.cs
View File

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

3
ReallifeGamemode.Server/Events/Login.cs
View File

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

7
ReallifeGamemode.Server/Events/Register.cs
View File

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

7
ReallifeGamemode.Server/Events/ResourceStop.cs
View File

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

19
ReallifeGamemode.Server/Events/Update.cs
View File

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

4
ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs
View File

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

15
ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
View File

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

7
ReallifeGamemode.Server/Events/VehicleMenu.cs
View File

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