diff --git a/.gitignore b/.gitignore
index cd2946a..fe43043 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,7 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk
+
+# build folders
+bin/
+obj/
\ No newline at end of file
diff --git a/AdminWarnings.csproj b/AdminWarnings.csproj
index 8549f2c..88e8b82 100644
--- a/AdminWarnings.csproj
+++ b/AdminWarnings.csproj
@@ -76,7 +76,11 @@
-
+
+
+
+
+
REM copy "$(TargetPath)" "C:\Users\owner\Desktop\Unturned\unturned\Servers\testserver\Rocket\Plugins\"
diff --git a/obj/Release/AdminWarnings.dll b/BUILT_DLL/AdminWarnings.dll
similarity index 98%
rename from obj/Release/AdminWarnings.dll
rename to BUILT_DLL/AdminWarnings.dll
index dc1d75e..39ca3f9 100644
Binary files a/obj/Release/AdminWarnings.dll and b/BUILT_DLL/AdminWarnings.dll differ
diff --git a/BUILT_DLL/hashes.txt b/BUILT_DLL/hashes.txt
new file mode 100644
index 0000000..080ae13
--- /dev/null
+++ b/BUILT_DLL/hashes.txt
@@ -0,0 +1,8 @@
+------------------------------------------------------------
+HASHES ARE FROM BUILDING THIS AS A DLL AND AS A RELEASE MODE
+DATE BUILT: JULY/4/2020 @ 10:38PM (CST)
+------------------------------------------------------------
+MD5 - E46264997271E62FE0AB39526438DBDE
+SHA-1 - 27B67D9D93C1B0C2ECBC0EB1D8DFEFED04144F04
+SHA-256 - 39BF85744B1188CA16A367BB5076288F6FAB22230A5BAEEE4C54B6FA22224766
+SHA-512 - D2709CD5D02C3E25616E880FE87B1CE5810839AC67B831C03A4ABFBF45CACE8036558AA3BD22A6BE4A3207EDA8FD357C1523DEB5CC9A780C8E8A0441BDA137C7
diff --git a/WarningsPlugin.cs b/WarningsPlugin.cs
index 00b3e6f..572dce6 100644
--- a/WarningsPlugin.cs
+++ b/WarningsPlugin.cs
@@ -10,7 +10,6 @@
using Steamworks;
using System.Threading;
using AdminWarnings.Helpers;
-
using logger = Rocket.Core.Logging.Logger;
namespace AdminWarnings
@@ -19,6 +18,7 @@ public class WarningsPlugin : RocketPlugin
{
public static WarningsPlugin Instance;
public static WarningUtilities util = new WarningUtilities();
+
public override Rocket.API.Collections.TranslationList DefaultTranslations
{
get
@@ -29,8 +29,14 @@ public override Rocket.API.Collections.TranslationList DefaultTranslations
{"warning_reason", "You have been given a warning! Reason: '{0}'"},
{"warning_count_self", "You currently have {0} warnings!"},
{"warning_count_admin", "'{0}' currently has {1} warnings!"},
- {"warning_ban", "You have been banned because you reached {0} warnings! Ban duration (seconds): {1}"},
- {"warning_ban_reason", "You have been banned because you reached {0} warnings! Reason: '{1}' Ban duration (seconds): {2}"},
+ {
+ "warning_ban",
+ "You have been banned because you reached {0} warnings! Ban duration (seconds): {1}"
+ },
+ {
+ "warning_ban_reason",
+ "You have been banned because you reached {0} warnings! Reason: '{1}' Ban duration (seconds): {2}"
+ },
{"warning_kick", "You have been kicked because you reached {0} warnings!"},
{"warning_kick_reason", "You have been kicked because you reached {0} warnings! Reason: '{1}'"},
{"warned_caller", "You have warned player: {0}"},
@@ -40,17 +46,23 @@ public override Rocket.API.Collections.TranslationList DefaultTranslations
{"wrong_usage_removewarn", "Correct command usage: /removewarn [amount]"},
{"console_player_warning", "'{0}' has warned '{1}', '{1}' is at {2} warnings"},
{"console_player_banned", "'{0}' has warned '{1}', '{1}' was banned for {2} seconds"},
- {"console_player_banned_reason", "'{0}' has warned '{1}', '{1}' was banned for {2} seconds with the reason '{3}'"},
+ {
+ "console_player_banned_reason",
+ "'{0}' has warned '{1}', '{1}' was banned for {2} seconds with the reason '{3}'"
+ },
{"console_player_kicked", "'{0}' has warned '{1}', '{1}' was kicked"},
{"console_player_kicked_reason", "'{0}' has warned '{1}', '{1}' was kicked with the reason '{2}'"},
{"public_player_banned", "'{0}' has received {1} warnings and was banned for {2} seconds!"},
{"public_player_kicked", "'{0}' has received {1} warnings and was kicked!"},
{"public_player_warned", "'{0}' has been giving a warning, they are currently at {1} warnings!"},
- {"console_warnings_noparameter", "You must enter a player when calling this command from the console!"},
+ {
+ "console_warnings_noparameter",
+ "You must enter a player when calling this command from the console!"
+ },
{"public_player_warned_reason", "'{0}' has been giving a warning! Reason: {1}"},
{"remove_warn", "Removed {0} warnings from '{1}'!"},
{"no_data", "'{0}' does not have any warnings!"},
- { "cleared_logs", "Cleared warning logs!" },
+ {"cleared_logs", "Cleared warning logs!"},
{"console_command", "Ran command '{0}' because player:{1} hit {2} warnings"}
};
}
@@ -80,7 +92,8 @@ public void RemoveExpiredWarnings(int delay)
Thread.Sleep(delay);
foreach (var playerWarning in GetAllPlayerWarnings())
{
- if (GetDaysSinceWarning(playerWarning.DateAdded) >= WarningsPlugin.Instance.Configuration.Instance.DaysWarningsExpire)
+ if (GetDaysSinceWarning(playerWarning.DateAdded) >=
+ WarningsPlugin.Instance.Configuration.Instance.DaysWarningsExpire)
{
RemovePlayerData(playerWarning);
}
@@ -90,17 +103,19 @@ public void RemoveExpiredWarnings(int delay)
public int GetDaysSinceWarning(DateTime warningDate)
{
- return (int)(DateTime.Now - warningDate).TotalDays;
+ return (int) (DateTime.Now - warningDate).TotalDays;
}
public int GetPlayerWarnings(UnturnedPlayer P)
{
- return GetAllPlayerWarnings().FirstOrDefault(pWarning => pWarning.CSteamID.ToString() == P.CSteamID.ToString()).Warnings;
+ return GetAllPlayerWarnings()
+ .FirstOrDefault(pWarning => pWarning.CSteamID.ToString() == P.CSteamID.ToString()).Warnings;
}
public PlayerWarning GetPlayerData(UnturnedPlayer P)
{
- return GetAllPlayerWarnings().FirstOrDefault(pWarning => pWarning.CSteamID.ToString() == P.CSteamID.ToString());
+ return GetAllPlayerWarnings()
+ .FirstOrDefault(pWarning => pWarning.CSteamID.ToString() == P.CSteamID.ToString());
}
public void DecreasePlayerWarnings(UnturnedPlayer player, int amount)
@@ -120,7 +135,8 @@ public void DecreasePlayerWarnings(UnturnedPlayer player, int amount)
public bool CheckIfHasData(UnturnedPlayer P)
{
- var pWarning = GetAllPlayerWarnings().FirstOrDefault(warning => warning.CSteamID.ToString() == P.CSteamID.ToString());
+ var pWarning = GetAllPlayerWarnings()
+ .FirstOrDefault(warning => warning.CSteamID.ToString() == P.CSteamID.ToString());
if (pWarning == null) return false;
return true;
}
@@ -138,44 +154,54 @@ public void WarnPlayer(IRocketPlayer caller, UnturnedPlayer Player, string reaso
if (!string.IsNullOrEmpty(point.ConsoleCommand))
{
- string cmd = ConsoleCommandHelper.FormatConsoleCommandString(point.ConsoleCommand.ToLower(), Player);
+ var cmd = ConsoleCommandHelper.FormatConsoleCommandString(point.ConsoleCommand.ToLower(), Player);
CommandWindow.input.onInputText(cmd);
- logger.Log(WarningsPlugin.Instance.Translate("console_command", cmd, Player.DisplayName, point.WarningsToTrigger));
+ logger.Log(WarningsPlugin.Instance.Translate("console_command", cmd, Player.DisplayName,
+ point.WarningsToTrigger));
}
else if (point.KickPlayer)
{
if (reasonIncluded)
{
KickPlayer(Player, reason, pData.Warnings);
- LogWarning(WarningsPlugin.Instance.Translate("console_player_kicked_reason", GetPlayerName(caller), Player.DisplayName, reason));
+ LogWarning(WarningsPlugin.Instance.Translate("console_player_kicked_reason",
+ GetPlayerName(caller), Player.DisplayName, reason));
}
else
{
KickPlayer(Player, pData.Warnings);
- LogWarning(WarningsPlugin.Instance.Translate("console_player_kicked", GetPlayerName(caller), Player.DisplayName));
+ LogWarning(WarningsPlugin.Instance.Translate("console_player_kicked", GetPlayerName(caller),
+ Player.DisplayName));
}
+
actionTaken = true;
if (GetConfigAnnouceMessageServerWide())
- UnturnedChat.Say(WarningsPlugin.Instance.Translate("public_player_kicked", Player.DisplayName, pData.Warnings), GetMessageColor());
-
+ UnturnedChat.Say(
+ WarningsPlugin.Instance.Translate("public_player_kicked", Player.DisplayName,
+ pData.Warnings), GetMessageColor());
}
else if (point.BanPlayer)
{
if (reasonIncluded)
{
BanPlayer(Player, reason, pData.Warnings, point.BanLengthSeconds, caller);
- LogWarning(WarningsPlugin.Instance.Translate("console_player_banned_reason", GetPlayerName(caller), Player.DisplayName, point.BanLengthSeconds, reason));
+ LogWarning(WarningsPlugin.Instance.Translate("console_player_banned_reason",
+ GetPlayerName(caller), Player.DisplayName, point.BanLengthSeconds, reason));
}
else
{
BanPlayer(Player, pData.Warnings, point.BanLengthSeconds, caller);
- LogWarning(WarningsPlugin.Instance.Translate("console_player_banned", GetPlayerName(caller), Player.DisplayName, point.BanLengthSeconds));
+ LogWarning(WarningsPlugin.Instance.Translate("console_player_banned", GetPlayerName(caller),
+ Player.DisplayName, point.BanLengthSeconds));
}
+
actionTaken = true;
if (GetConfigAnnouceMessageServerWide())
- UnturnedChat.Say(WarningsPlugin.Instance.Translate("public_player_banned", Player.DisplayName, pData.Warnings, point.BanLengthSeconds), GetMessageColor());
+ UnturnedChat.Say(
+ WarningsPlugin.Instance.Translate("public_player_banned", Player.DisplayName,
+ pData.Warnings, point.BanLengthSeconds), GetMessageColor());
}
}
@@ -190,7 +216,8 @@ public void WarnPlayer(IRocketPlayer caller, UnturnedPlayer Player, string reaso
PrivateWarnPlayer(Player, pData, reason, reasonIncluded);
}
- LogWarning(WarningsPlugin.Instance.Translate("console_player_warning", GetPlayerName(caller), Player.DisplayName, pData.Warnings));
+ LogWarning(WarningsPlugin.Instance.Translate("console_player_warning", GetPlayerName(caller),
+ Player.DisplayName, pData.Warnings));
}
var allWarningPoints = GetAllWarningPoints();
@@ -203,22 +230,21 @@ public void WarnPlayer(IRocketPlayer caller, UnturnedPlayer Player, string reaso
if (caller is ConsolePlayer)
WarningLogger.LogWarning(0.ToString(), "*Console*", Player, reason);
else
- WarningLogger.LogWarning((UnturnedPlayer)caller, Player, reason);
-
+ WarningLogger.LogWarning((UnturnedPlayer) caller, Player, reason);
}
public void PublicWarnPlayer(UnturnedPlayer Player, PlayerWarning pData, string reason, bool reasonIncluded)
{
-
if (reasonIncluded)
- TellPlayerWarning(Player, WarningsPlugin.Instance.Translate("public_player_warned_reason", Player.DisplayName, reason));
+ TellPlayerWarning(Player,
+ WarningsPlugin.Instance.Translate("public_player_warned_reason", Player.DisplayName, reason));
else
- TellPlayerWarning(Player, WarningsPlugin.Instance.Translate("public_player_warned", Player.DisplayName, pData.Warnings));
+ TellPlayerWarning(Player,
+ WarningsPlugin.Instance.Translate("public_player_warned", Player.DisplayName, pData.Warnings));
}
public void PrivateWarnPlayer(UnturnedPlayer Player, PlayerWarning pData, string reason, bool reasonIncluded)
{
-
if (reasonIncluded)
SendMessage(Player, WarningsPlugin.Instance.Translate("warning_reason", reason));
else
@@ -233,7 +259,7 @@ public string GetPlayerName(IRocketPlayer caller)
}
else
{
- return ((UnturnedPlayer)caller).DisplayName;
+ return ((UnturnedPlayer) caller).DisplayName;
}
}
@@ -280,25 +306,28 @@ public void KickPlayer(UnturnedPlayer player, string reason, int warnings)
public void BanPlayer(UnturnedPlayer player, int warnings, uint banDuration, IRocketPlayer caller)
{
- CSteamID judge = (CSteamID)0;
+ CSteamID judge = (CSteamID) 0;
if (!(caller is ConsolePlayer))
{
- judge = ((UnturnedPlayer)caller).CSteamID;
+ judge = ((UnturnedPlayer) caller).CSteamID;
}
- SteamBlacklist.ban(player.CSteamID, GetIP(player.CSteamID), judge, WarningsPlugin.Instance.Translate("warning_ban", warnings, banDuration),
+ SteamBlacklist.ban(player.CSteamID, GetIP(player.CSteamID), judge,
+ WarningsPlugin.Instance.Translate("warning_ban", warnings, banDuration),
banDuration);
}
- public void BanPlayer(UnturnedPlayer player, string reason, int warnings, uint banDuration, IRocketPlayer caller)
+ public void BanPlayer(UnturnedPlayer player, string reason, int warnings, uint banDuration,
+ IRocketPlayer caller)
{
- CSteamID judge = (CSteamID)0;
+ CSteamID judge = (CSteamID) 0;
if (!(caller is ConsolePlayer))
{
- judge = ((UnturnedPlayer)caller).CSteamID;
+ judge = ((UnturnedPlayer) caller).CSteamID;
}
- SteamBlacklist.ban(player.CSteamID, GetIP(player.CSteamID), judge, WarningsPlugin.Instance.Translate("warning_ban_reason", warnings, reason, banDuration),
+ SteamBlacklist.ban(player.CSteamID, GetIP(player.CSteamID), judge,
+ WarningsPlugin.Instance.Translate("warning_ban_reason", warnings, reason, banDuration),
banDuration);
}
@@ -328,7 +357,8 @@ public UnityEngine.Color GetMessageColor()
{
UnityEngine.Color MsgColor;
- MsgColor = UnturnedChat.GetColorFromName(WarningsPlugin.Instance.Configuration.Instance.MessageColor, UnityEngine.Color.green);
+ MsgColor = UnturnedChat.GetColorFromName(WarningsPlugin.Instance.Configuration.Instance.MessageColor,
+ UnityEngine.Color.green);
return MsgColor;
}
@@ -384,4 +414,4 @@ public static void SendMessage(IRocketPlayer caller, string message)
UnturnedChat.Say(caller, message, WarningsPlugin.util.GetMessageColor());
}
}
-}
+}
\ No newline at end of file
diff --git a/bin/Debug/AdminWarnings.dll b/bin/Debug/AdminWarnings.dll
deleted file mode 100644
index 9158dc9..0000000
Binary files a/bin/Debug/AdminWarnings.dll and /dev/null differ
diff --git a/bin/Debug/AdminWarnings.pdb b/bin/Debug/AdminWarnings.pdb
deleted file mode 100644
index 60ac630..0000000
Binary files a/bin/Debug/AdminWarnings.pdb and /dev/null differ
diff --git a/bin/Debug/AdminWarnings.zip b/bin/Debug/AdminWarnings.zip
deleted file mode 100644
index 029d5ee..0000000
Binary files a/bin/Debug/AdminWarnings.zip and /dev/null differ
diff --git a/bin/Release/AdminWarnings.dll b/bin/Release/AdminWarnings.dll
deleted file mode 100644
index dc1d75e..0000000
Binary files a/bin/Release/AdminWarnings.dll and /dev/null differ
diff --git a/bin/Release/AdminWarnings.pdb b/bin/Release/AdminWarnings.pdb
deleted file mode 100644
index 0bc8467..0000000
Binary files a/bin/Release/AdminWarnings.pdb and /dev/null differ
diff --git a/lib/Assembly-CSharp-firstpass.dll b/lib/Assembly-CSharp-firstpass.dll
index 0f3748a..3d553f7 100644
Binary files a/lib/Assembly-CSharp-firstpass.dll and b/lib/Assembly-CSharp-firstpass.dll differ
diff --git a/lib/Assembly-CSharp.dll b/lib/Assembly-CSharp.dll
index d4c8200..1881b7e 100644
Binary files a/lib/Assembly-CSharp.dll and b/lib/Assembly-CSharp.dll differ
diff --git a/lib/Rocket.Unturned.dll b/lib/Rocket.Unturned.dll
index 08ebe4c..fc273fa 100644
Binary files a/lib/Rocket.Unturned.dll and b/lib/Rocket.Unturned.dll differ
diff --git a/lib/UnityEngine.CoreModule.dll b/lib/UnityEngine.CoreModule.dll
index f1e9533..a65727c 100644
Binary files a/lib/UnityEngine.CoreModule.dll and b/lib/UnityEngine.CoreModule.dll differ
diff --git a/lib/UnityEngine.dll b/lib/UnityEngine.dll
index 6d6e44f..b9465fc 100644
Binary files a/lib/UnityEngine.dll and b/lib/UnityEngine.dll differ
diff --git a/obj/Debug/AdminWarnings.csproj.FileListAbsolute.txt b/obj/Debug/AdminWarnings.csproj.FileListAbsolute.txt
deleted file mode 100644
index 3170556..0000000
--- a/obj/Debug/AdminWarnings.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\bin\Debug\AdminWarnings.dll
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\bin\Debug\AdminWarnings.pdb
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\obj\Debug\AdminWarnings.dll
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\obj\Debug\AdminWarnings.pdb
diff --git a/obj/Debug/AdminWarnings.dll b/obj/Debug/AdminWarnings.dll
deleted file mode 100644
index 9158dc9..0000000
Binary files a/obj/Debug/AdminWarnings.dll and /dev/null differ
diff --git a/obj/Debug/AdminWarnings.pdb b/obj/Debug/AdminWarnings.pdb
deleted file mode 100644
index 60ac630..0000000
Binary files a/obj/Debug/AdminWarnings.pdb and /dev/null differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 8b0edeb..0000000
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/obj/Release/AdminWarnings.csproj.FileListAbsolute.txt b/obj/Release/AdminWarnings.csproj.FileListAbsolute.txt
deleted file mode 100644
index 92d7470..0000000
--- a/obj/Release/AdminWarnings.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\bin\Release\AdminWarnings.dll
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\bin\Release\AdminWarnings.pdb
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\obj\Release\AdminWarnings.dll
-C:\Users\owner\Desktop\GitHub\RocketModPlugins\AdminWarnings\AdminWarnings\obj\Release\AdminWarnings.pdb
-D:\Gereksizler\GitHub\AdminWarnings\bin\Release\AdminWarnings.dll
-D:\Gereksizler\GitHub\AdminWarnings\bin\Release\AdminWarnings.pdb
-D:\Gereksizler\GitHub\AdminWarnings\obj\Release\AdminWarnings.csprojAssemblyReference.cache
-D:\Gereksizler\GitHub\AdminWarnings\obj\Release\AdminWarnings.csproj.CoreCompileInputs.cache
-D:\Gereksizler\GitHub\AdminWarnings\obj\Release\AdminWarnings.dll
-D:\Gereksizler\GitHub\AdminWarnings\obj\Release\AdminWarnings.pdb
diff --git a/obj/Release/AdminWarnings.pdb b/obj/Release/AdminWarnings.pdb
deleted file mode 100644
index 0bc8467..0000000
Binary files a/obj/Release/AdminWarnings.pdb and /dev/null differ
diff --git a/obj/Release/CoreCompileInputs.cache b/obj/Release/CoreCompileInputs.cache
deleted file mode 100644
index 8ac9287..0000000
--- a/obj/Release/CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-ede140261b2aafbeafe80847eb2519a3109a88e1
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index f0a8527..0000000
Binary files a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ