Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stuffs #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Stuffs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ec40cf
Stuffs
rube200 Dec 5, 2019
afde286
Update Libs
rube200 Dec 9, 2019
1a2c5ef
¯\_(ツ)_/¯
rube200 Dec 11, 2019
c0e1f56
¯\_(ツ)_/¯ x2
rube200 Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions CommandDelInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,22 @@ public void Execute(IRocketPlayer caller, string[] command)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_help"));
}
if (command.Length > 1)
else if (command.Length > 1)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("too_many_parameters"));
return;
}
if (command.Length == 1)
if (!ushort.TryParse(command[0], out var ID))
{
ushort ID;
if (!ushort.TryParse(command[0], out ID))
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_invalid"));
return;
}
if (PlayerInfoLib.Database.RemoveInstance(ID))
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_success"));
return;
}
else
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_not_found"));
}
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_invalid"));
return;
}
if (!PlayerInfoLib.Database.RemoveInstance(ID))
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_not_found"));
return;
}
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("delint_success"));
}
}
}
95 changes: 42 additions & 53 deletions CommandInvestigate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using Rocket.API.Extensions;
using Rocket.Unturned.Chat;
using SDG.Unturned;
using Steamworks;
using System;
using System.Collections.Generic;
using UnityEngine;
using Math = System.Math;


namespace PlayerInfoLibrary
{
Expand Down Expand Up @@ -49,66 +49,55 @@ public void Execute(IRocketPlayer caller, string[] command)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("investigate_help"));
}
CSteamID cSteamID;
uint totalRecods = 1;
else if (command.Length > 2)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("too_many_parameters"));
return;
}
var totalRecods = 1u;
uint? page = 1;
uint start = 0;
uint perPage = caller is ConsolePlayer ? 10u : 4u;
List<PlayerData> pInfo = new List<PlayerData>();
if (command.Length >= 1)
var perPage = caller is ConsolePlayer ? 10u : 4u;
var pInfo = new List<PlayerData>();
uint start;
if (command.Length == 2)
{
if (command.Length ==2)
page = command.GetUInt32Parameter(1);
if (page == null || page == 0)
{
page = command.GetUInt32Parameter(1);
if (page == null || page == 0)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("invalid_page"));
return;
}
}
if (command.Length > 2)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("too_many_parameters"));
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("invalid_page"));
return;
}
// Is what is entered in the command a SteamID64 number?
if (command[0].isCSteamID(out cSteamID))
{
PlayerData pData = PlayerInfoLib.Database.QueryById(cSteamID);
if(pData.IsValid())
pInfo.Add(pData);
}
else if(Parser.checkIP(command[0]))
{
pInfo = PlayerInfoLib.Database.QueryByName(command[0], QueryType.IP, out totalRecods, true, (uint)page, perPage);
}
else
{
pInfo = PlayerInfoLib.Database.QueryByName(command[0], QueryType.Both, out totalRecods, true, (uint)page, perPage);
}
if (pInfo.Count > 0)
}
// Is what is entered in the command a SteamID64 number?
if (command[0].IsCSteamID(out var cSteamID))
{
var pData = PlayerInfoLib.Database.QueryById(cSteamID);
if (pData.IsValid())
pInfo.Add(pData);
}
else
{
pInfo = PlayerInfoLib.Database.QueryByName(command[0], Parser.checkIP(command[0]) ? QueryType.IP : QueryType.Both, out totalRecods, true, (uint)page, perPage);
}
if (pInfo.Count == 0)
{
UnturnedChat.Say(caller, "No players found by that name.");
return;
}
start = ((uint)page - 1) * perPage;
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("number_of_records_found", totalRecods, command[0], page, Math.Ceiling(totalRecods / (float)perPage)), Color.red);
foreach (var pData in pInfo)
{
start++;
if (pData.IsLocal())
{
start = ((uint)page - 1) * perPage;
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("number_of_records_found", totalRecods, command[0], page, Math.Ceiling(totalRecods / (float)perPage)), Color.red);
foreach (PlayerData pData in pInfo)
{
start++;
if (pData.IsLocal())
{
UnturnedChat.Say(caller, string.Format("{0}: {1} [{2}] ({3}), IP: {4}, Local: {5}, IsVip: {6}", start, caller is ConsolePlayer ? pData.CharacterName : pData.CharacterName.Truncate(12), caller is ConsolePlayer ? pData.SteamName : pData.SteamName.Truncate(12), pData.SteamID, pData.IP, pData.IsLocal(), pData.IsVip()), Color.yellow);
UnturnedChat.Say(caller, string.Format("Seen: {0}, TT: {1}, Cleaned:{2}:{3}", pData.LastLoginLocal, pData.TotalPlayime.FormatTotalTime(), pData.CleanedBuildables, pData.CleanedPlayerData), Color.yellow);
}
else
{
UnturnedChat.Say(caller, string.Format("{0}: {1} [{2}] ({3}), IP: {4}, Local: {5}", start, caller is ConsolePlayer ? pData.CharacterName : pData.CharacterName.Truncate(12), caller is ConsolePlayer ? pData.SteamName : pData.SteamName.Truncate(12), pData.SteamID, pData.IP, pData.IsLocal()), Color.yellow);
UnturnedChat.Say(caller, string.Format("Seen: {0}, TT: {1}, on: {2}:{3}", pData.LastLoginLocal, pData.TotalPlayime.FormatTotalTime(), pData.LastServerID, pData.LastServerName), Color.yellow);
}
}
UnturnedChat.Say(caller, string.Format("{0}: {1} [{2}] ({3}), IP: {4}, Local: {5}, IsVip: {6}", start, caller is ConsolePlayer ? pData.CharacterName : pData.CharacterName.Truncate(12), caller is ConsolePlayer ? pData.SteamName : pData.SteamName.Truncate(12), pData.SteamID, pData.IP, pData.IsLocal(), pData.IsVip()), Color.yellow);
UnturnedChat.Say(caller, string.Format("Seen: {0}, TT: {1}, Cleaned:{2}:{3}", pData.LastLoginLocal, pData.TotalPlayTime.FormatTotalTime(), pData.CleanedBuildables, pData.CleanedPlayerData), Color.yellow);
}
else
{
UnturnedChat.Say(caller, "No players found by that name.");
return;
UnturnedChat.Say(caller, string.Format("{0}: {1} [{2}] ({3}), IP: {4}, Local: {5}", start, caller is ConsolePlayer ? pData.CharacterName : pData.CharacterName.Truncate(12), caller is ConsolePlayer ? pData.SteamName : pData.SteamName.Truncate(12), pData.SteamID, pData.IP, pData.IsLocal()), Color.yellow);
UnturnedChat.Say(caller, string.Format("Seen: {0}, TT: {1}, on: {2}:{3}", pData.LastLoginLocal, pData.TotalPlayTime.FormatTotalTime(), pData.LastServerID, pData.LastServerName), Color.yellow);
}
}
}
Expand Down
18 changes: 6 additions & 12 deletions CommandRnInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,18 @@ public void Execute(IRocketPlayer caller, string[] command)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("rnint_help"));
}
if (command.Length > 1)
else if (command.Length > 1)
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("too_many_parameters"));
return;
}
if (command.Length == 1)
var newName = command[0].ToLower();
if (PlayerInfoLib.Database.SetInstanceName(newName))
{
string newName = command[0].ToLower();
if (PlayerInfoLib.Database.SetInstanceName(newName))
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("rnint_success"));
return;
}
else
{
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("rnint_not_found"));
}
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("rnint_success"));
return;
}
UnturnedChat.Say(caller, PlayerInfoLib.Instance.Translate("rnint_not_found"));
}
}
}
17 changes: 8 additions & 9 deletions DatabaseManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ namespace PlayerInfoLibrary
{
public class DatabaseManager
{
private Dictionary<CSteamID, PlayerData> Cache = new Dictionary<CSteamID, PlayerData>();
private readonly Dictionary<CSteamID, PlayerData> Cache = new Dictionary<CSteamID, PlayerData>();
public bool Initialized { get; private set; }
private MySqlConnection Connection = null;
private int MaxRetry = 5;
private string Table;
private string TableConfig;
private string TableInstance;
private string TableServer;
private readonly int MaxRetry = 5;
private readonly string Table;
private readonly string TableConfig;
private readonly string TableInstance;
private readonly string TableServer;
internal ushort InstanceID { get; private set; }
public static readonly uint DatabaseSchemaVersion = 4;
public static readonly uint DatabaseInterfaceVersion = 2;
Expand Down Expand Up @@ -332,7 +332,7 @@ private bool HandleException(MySqlException ex, string msg = null)
else
{
Logger.LogWarning(ex.Number.ToString() + ":" + ((MySqlErrorCode)ex.Number).ToString());
Logger.LogException(ex , msg != null ? msg : null);
Logger.LogException(ex , msg ?? null);
}
return false;
}
Expand Down Expand Up @@ -410,7 +410,6 @@ public List<PlayerData> QueryByName(string playerName, QueryType queryType, out
List<PlayerData> playerList = new List<PlayerData>();
MySqlDataReader reader = null;
totalRecods = 0;
uint limitStart = (page - 1) * limit;
MySqlCommand command = Connection.CreateCommand();
try
{
Expand Down Expand Up @@ -767,7 +766,7 @@ internal void SaveToDB(PlayerData pdata, bool retry = false)
command.Parameters.AddWithValue("@instanceid", pdata.ServerID);
command.Parameters.AddWithValue("@lastinstanceid", pdata.LastServerID);
command.Parameters.AddWithValue("@lastloginglobal", pdata.LastLoginGlobal.ToTimeStamp());
command.Parameters.AddWithValue("@totalplaytime", pdata.TotalPlayime);
command.Parameters.AddWithValue("@totalplaytime", pdata.TotalPlayTime);
command.Parameters.AddWithValue("@lastloginlocal", pdata.LastLoginLocal.ToTimeStamp());
command.Parameters.AddWithValue("@cleanedbuildables", pdata.CleanedBuildables);
command.Parameters.AddWithValue("@cleanedplayerdata", pdata.CleanedPlayerData);
Expand Down
39 changes: 31 additions & 8 deletions Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using MySql.Data.MySqlClient;
using Rocket.Unturned.Player;
using SDG.Unturned;
using Steamworks;
using System;
Expand All @@ -17,29 +18,27 @@ public static long ToTimeStamp(this DateTime datetime)
return (long)(datetime.ToUniversalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds);
}

public static bool IsDBNull (this MySqlDataReader reader, string fieldname)
public static bool IsDBNull(this MySqlDataReader reader, string fieldname)
{
return reader.IsDBNull(reader.GetOrdinal(fieldname));
}

public static string GetIP(this CSteamID cSteamID)
{
// Grab an active players ip address from CSteamID.
P2PSessionState_t sessionState;
SteamGameServerNetworking.GetP2PSessionState(cSteamID, out sessionState);
SteamGameServerNetworking.GetP2PSessionState(cSteamID, out var sessionState);
return Parser.getIPFromUInt32(sessionState.m_nRemoteIP);
}

// Returns a Steamworks.CSteamID on out from a string, and returns true if it is a CSteamID.
public static bool isCSteamID(this string sCSteamID, out CSteamID cSteamID)
public static bool IsCSteamID(this string sCSteamID, out CSteamID cSteamID)
{
ulong ulCSteamID;
cSteamID = (CSteamID)0;
if (ulong.TryParse(sCSteamID, out ulCSteamID))
cSteamID = CSteamID.Nil;
if (ulong.TryParse(sCSteamID, out var ulCSteamID))
{
if ((ulCSteamID >= 0x0110000100000000 && ulCSteamID <= 0x0170000000000000) || ulCSteamID == 0)
{
cSteamID = (CSteamID)ulCSteamID;
cSteamID = new CSteamID(ulCSteamID);
return true;
}
}
Expand Down Expand Up @@ -71,5 +70,29 @@ public static string FormatTotalTime(this int totalTime)
totalTimeFormated += ((int)(totalTime % 60)).ToString() + "s";
return totalTimeFormated;
}

public static int TotalPlayTime(this CSteamID PlayerID)
{
var RegistedTime = 0;
var Player = UnturnedPlayer.FromCSteamID(PlayerID);
if (Player != null)
{
var Component = Player.GetComponent<PlayerInfoLibPComponent>();
if (Component != null && Component.pData.IsValid() && Component.pData.IsLocal())
RegistedTime = Component.pData.TotalPlayTime;
}

if (RegistedTime == 0)
{
var pData = PlayerInfoLib.Database.QueryById(PlayerID, false);
if (pData.IsValid() && pData.IsLocal())
RegistedTime = pData.TotalPlayTime;
}

if (PlayerInfoLib.LoginTime.TryGetValue(PlayerID, out var Date))
RegistedTime += (int)(DateTime.Now - Date).TotalSeconds;

return RegistedTime;
}
}
}
Binary file added Libraries/BouncyCastle.Crypto.dll
View file
Open in desktop
Binary file not shown.
Binary file added Libraries/Google.Protobuf.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Libraries/I18N.West.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Libraries/I18N.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Libraries/MySql.Data.dll
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions PlayerData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class PlayerData
public string CharacterName { get; internal set; }
public string IP { get; internal set; }
public DateTime LastLoginGlobal { get; internal set; }
public int TotalPlayime { get; internal set; }
public int TotalPlayTime { get; internal set; }
public ushort LastServerID { get; internal set; }
public string LastServerName { get; internal set; }
public ushort ServerID { get; private set; }
Expand Down Expand Up @@ -67,7 +67,7 @@ public bool IsVip()
internal PlayerData()
{
SteamID = CSteamID.Nil;
TotalPlayime = 0;
TotalPlayTime = 0;
}
internal PlayerData(CSteamID steamID, string steamName, string characterName, string ip, DateTime lastLoginGlobal, ushort lastServerID, string lastServerName, ushort serverID, DateTime lastLoginLocal, bool cleanedBuildables, bool cleanedPlayerData, int totalPlayTime)
{
Expand All @@ -82,7 +82,7 @@ internal PlayerData(CSteamID steamID, string steamName, string characterName, st
LastLoginLocal = lastLoginLocal;
CleanedBuildables = cleanedBuildables;
CleanedPlayerData = cleanedPlayerData;
TotalPlayime = totalPlayTime;
TotalPlayTime = totalPlayTime;
}
}
}
13 changes: 6 additions & 7 deletions PlayerInfoLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ private void Events_OnPlayerConnected(UnturnedPlayer player)
if (LoginTime.ContainsKey(player.CSteamID))
LoginTime.Remove(player.CSteamID);
LoginTime.Add(player.CSteamID, DateTime.Now);
PlayerData pData = Database.QueryById(player.CSteamID, false);
int totalTime = pData.TotalPlayime;
DateTime loginTime = PlayerInfoLib.LoginTime[player.CSteamID];
var pData = Database.QueryById(player.CSteamID, false);
var totalTime = pData.TotalPlayTime;
var loginTime = LoginTime[player.CSteamID];
pData = new PlayerData(player.CSteamID, player.SteamName, player.CharacterName, player.CSteamID.GetIP(), loginTime, Database.InstanceID, Provider.serverName, Database.InstanceID, loginTime, false, false, totalTime);
Database.SaveToDB(pData);
// Recheck the ip address in the component, the ip isn't always fully set by the time this event is called.
PlayerInfoLibPComponent pc = player.GetComponent<PlayerInfoLibPComponent>();
var pc = player.GetComponent<PlayerInfoLibPComponent>();
pc.Start(pData);
}

Expand All @@ -72,11 +72,10 @@ private void Events_OnPlayerDisconnected(UnturnedPlayer player)
{
if (LoginTime.ContainsKey(player.CSteamID))
{
PlayerData pData = Database.QueryById(player.CSteamID, false);
var pData = Database.QueryById(player.CSteamID, false);
if (pData.IsValid() && pData.IsLocal())
{
int totalSessionTime = (int)(DateTime.Now - LoginTime[player.CSteamID]).TotalSeconds;
pData.TotalPlayime += totalSessionTime;
pData.TotalPlayTime += (int)(DateTime.Now - LoginTime[player.CSteamID]).TotalSeconds;
Database.SaveToDB(pData);
}
LoginTime.Remove(player.CSteamID);
Expand Down
Loading