From 4e84fdce42f889f6ddf2a311e46be10049d5fc59 Mon Sep 17 00:00:00 2001 From: UserR00T Date: Fri, 29 Jun 2018 14:51:43 +0200 Subject: [PATCH] Merged branch develop and master together --- source/BP-Essentials/BP-Essentials.csproj | 19 +- source/BP-Essentials/Chat/Announce.cs | 11 +- .../Chat/Commands/Admin/Arrest.cs | 28 +- .../BP-Essentials/Chat/Commands/Admin/Ban.cs | 36 +-- .../Chat/Commands/Admin/CheckAlts.cs | 81 +++-- .../Chat/Commands/Admin/Clear.cs | 31 ++ .../Chat/Commands/Admin/ClearWanted.cs | 49 ++-- .../Chat/Commands/Admin/DebugCommands.cs | 153 +++++----- .../Chat/Commands/Admin/ExecuteOnPlayer.cs | 103 ------- .../Chat/Commands/Admin/FakeJoin.cs | 28 +- .../Chat/Commands/Admin/FakeLeave.cs | 28 +- .../BP-Essentials/Chat/Commands/Admin/Feed.cs | 54 ++-- .../BP-Essentials/Chat/Commands/Admin/Free.cs | 27 +- .../Chat/Commands/Admin/GetLogs.cs | 68 ++--- .../BP-Essentials/Chat/Commands/Admin/Give.cs | 59 ++-- .../Chat/Commands/Admin/GodMode.cs | 61 ++-- .../BP-Essentials/Chat/Commands/Admin/Heal.cs | 50 ++-- .../BP-Essentials/Chat/Commands/Admin/Info.cs | 51 ++-- .../BP-Essentials/Chat/Commands/Admin/Jail.cs | 34 +-- .../BP-Essentials/Chat/Commands/Admin/Kick.cs | 27 +- .../BP-Essentials/Chat/Commands/Admin/Kill.cs | 27 +- .../Chat/Commands/Admin/Knockout.cs | 27 +- .../Chat/Commands/Admin/LatestVoteResults.cs | 26 +- .../Chat/Commands/Admin/Launch.cs | 43 +-- .../Chat/Commands/Admin/Money.cs | 71 ++--- .../BP-Essentials/Chat/Commands/Admin/Mute.cs | 62 ++-- .../Chat/Commands/Admin/Promote.cs | 31 ++ .../Chat/Commands/Admin/Reload.cs | 13 +- .../Chat/Commands/Admin/Restrain.cs | 31 +- .../BP-Essentials/Chat/Commands/Admin/Save.cs | 20 +- .../BP-Essentials/Chat/Commands/Admin/Say.cs | 28 +- .../Chat/Commands/Admin/Search.cs | 60 ++-- .../BP-Essentials/Chat/Commands/Admin/Slap.cs | 52 ++-- .../BP-Essentials/Chat/Commands/Admin/Spy.cs | 16 + .../Chat/Commands/Admin/Strip.cs | 67 ++--- .../Commands/Admin/ToggleReceiveStaffChat.cs | 25 +- .../Chat/Commands/Admin/ToggleStaffChat.cs | 54 ++-- .../BP-Essentials/Chat/Commands/Admin/Tp.cs | 51 +--- .../Chat/Commands/Admin/TpHere.cs | 29 ++ .../Chat/Commands/Admin/TpToApartment.cs | 44 +++ .../Chat/Commands/Admin/_SetJob.cs | 68 ++--- .../Chat/Commands/Everyone/Afk.cs | 35 +-- .../Chat/Commands/Everyone/Atm.cs | 36 +-- .../Chat/Commands/Everyone/ClearChat.cs | 37 ++- .../Chat/Commands/Everyone/Confirm.cs | 3 +- .../Chat/Commands/Everyone/Essentials.cs | 55 ++-- .../Chat/Commands/Everyone/OnlinePlayers.cs | 33 +-- .../Chat/Commands/Everyone/Pay.cs | 95 +++--- .../Chat/Commands/Everyone/Report.cs | 77 +++-- .../Chat/Commands/Everyone/ToggleChat.cs | 38 +-- source/BP-Essentials/Chat/LangAndChatBlock.cs | 3 +- source/BP-Essentials/EssentialsChat.cs | 276 ++++++------------ source/BP-Essentials/EssentialsCore.cs | 9 +- source/BP-Essentials/EssentialsMethods.cs | 101 +++++-- source/BP-Essentials/EssentialsVariables.cs | 132 +++------ source/BP-Essentials/GlobalSuppressions.cs | 73 ++--- .../Methods/API/GetPlaceHolders.cs | 11 +- .../BP-Essentials/Methods/API/GetShByStr.cs | 29 ++ .../Methods/API/HasPermission.cs | 13 +- .../Methods/API/SendDiscordMessage.cs | 57 ++++ .../BP-Essentials/Methods/API/StringToVar.cs | 2 +- .../Methods/Check/CheckAltAcc.cs | 5 +- .../Methods/Check/CheckBanned.cs | 42 +-- .../Methods/Check/CheckGodMode.cs | 7 +- .../Methods/FileHandler/CheckFiles.cs | 1 + .../Methods/FileHandler/CreateFile.cs | 9 +- .../Methods/FileHandler/ReadFile.cs | 56 +++- .../Methods/FileHandler/RegisterCommands.cs | 52 ++++ .../Methods/FileHandler/WriteIpToFile.cs | 3 +- .../Methods/GameMethods/UnRetain.cs | 2 +- source/BP-Essentials/Methods/misc/IsOnline.cs | 5 +- .../BP-Essentials/Methods/misc/LogMessage.cs | 77 ++--- source/BP-Essentials/Methods/misc/Reload.cs | 3 +- source/BP-Essentials/Methods/misc/SaveNow.cs | 2 +- .../Methods/misc/SavePeriodically.cs | 6 +- .../Methods/misc/SetTimeStamp.cs | 2 +- source/BP-Essentials/Newtonsoft.Json.dll | Bin 360960 -> 0 bytes .../System.Runtime.Serialization.dll | Bin 67072 -> 0 bytes 78 files changed, 1435 insertions(+), 1795 deletions(-) create mode 100644 source/BP-Essentials/Chat/Commands/Admin/Clear.cs delete mode 100644 source/BP-Essentials/Chat/Commands/Admin/ExecuteOnPlayer.cs create mode 100644 source/BP-Essentials/Chat/Commands/Admin/Promote.cs create mode 100644 source/BP-Essentials/Chat/Commands/Admin/Spy.cs create mode 100644 source/BP-Essentials/Chat/Commands/Admin/TpHere.cs create mode 100644 source/BP-Essentials/Chat/Commands/Admin/TpToApartment.cs create mode 100644 source/BP-Essentials/Methods/API/GetShByStr.cs create mode 100644 source/BP-Essentials/Methods/API/SendDiscordMessage.cs create mode 100644 source/BP-Essentials/Methods/FileHandler/RegisterCommands.cs delete mode 100644 source/BP-Essentials/Newtonsoft.Json.dll delete mode 100644 source/BP-Essentials/System.Runtime.Serialization.dll diff --git a/source/BP-Essentials/BP-Essentials.csproj b/source/BP-Essentials/BP-Essentials.csproj index 85c62a16..9bdc56e5 100644 --- a/source/BP-Essentials/BP-Essentials.csproj +++ b/source/BP-Essentials/BP-Essentials.csproj @@ -43,6 +43,7 @@ + @@ -58,11 +59,15 @@ + + + + @@ -73,7 +78,6 @@ - @@ -92,8 +96,10 @@ + + @@ -101,6 +107,7 @@ + @@ -138,11 +145,7 @@ False - - False - ..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Unity Full v3.5\System.Runtime.Serialization.dll - False - + ..\..\BrokeProtocol_Data\Managed\UnityEngine.dll @@ -291,10 +294,6 @@ - - - -