3.1.2

- API update to Minecraft version 1.20 - T2CodeLib API update to 15.0 (this version is required from now on)
Security bugfixes and improved debug messages
2023-06-08 06:58:46 +02:00 · 2023-04-23 16:35:32 +02:00 · 2023-04-23 12:53:25 +02:00 · 2023-02-28 00:15:48 +01:00 · 2022-12-28 08:12:36 +01:00 · 2022-12-23 00:38:55 +01:00
18 changed files with 193 additions and 81 deletions
--- a/V3/pom.xml
+++ b/V3/pom.xml
@@ -6,7 +6,7 @@

    <groupId>net.t2code</groupId>
    <artifactId>T2C-OPSecurity</artifactId>
-    <version>3.0.6</version>
+    <version>3.1.2</version>

    <packaging>jar</packaging>

@@ -83,7 +83,7 @@
        <dependency>
            <groupId>net.t2code</groupId>
            <artifactId>T2CodeLib</artifactId>
-            <version>13.4</version>
+            <version>15.0</version>
            <scope>provided</scope>
        </dependency>
        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
--- a/V3/src/main/java/net/t2code/opsecurity/API/T2COpSecAPI.java
+++ b/V3/src/main/java/net/t2code/opsecurity/API/T2COpSecAPI.java
@@ -0,0 +1,60 @@
+package net.t2code.opsecurity.API;
+
+import net.t2code.opsecurity.check.OpCheck;
+import net.t2code.opsecurity.check.PermissionCheck;
+import net.t2code.opsecurity.config.opWhitelist.OPWhitelist;
+import net.t2code.opsecurity.config.permissionWhitelist.PermissionWhitelist;
+import net.t2code.opsecurity.objects.PlayerCache;
+import net.t2code.opsecurity.objects.PlayerObject;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class T2COpSecAPI {
+    public static boolean checkOPWhiteList(Player player) {
+        if (!OPWhitelist.enable.valueBoolean) return true;
+        String debug = T2Cdebug.debugCode();
+        return OpCheck.opWhitelist(player,debug);
+    }
+
+    public static boolean checkPermissionWhiteList(Player player, String debug) {
+        if (!PermissionWhitelist.enable.valueBoolean) return true;
+        return PermissionCheck.permWhitelist(player, debug);
+    }
+
+    public static T2COpSecAPIPlayerStatus detailCheckOPWhiteList(Player player) {
+        if (!OPWhitelist.enable.valueBoolean) return T2COpSecAPIPlayerStatus.playerOnOpWhitelist;
+        List<String> nameList = new ArrayList<>();
+        List<String> uuidList = new ArrayList<>();
+        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.getOpHashMap().entrySet()) {
+            nameList.add(playerObject.getValue().playerName);
+            uuidList.add(playerObject.getValue().uuid);
+        }
+        if (!nameList.contains(player.getName())) {
+            return T2COpSecAPIPlayerStatus.playerNameNotOnTheOpWhitelist;
+        }
+        if (!uuidList.contains(player.getUniqueId().toString().replace("-", ""))) {
+            return T2COpSecAPIPlayerStatus.playerUuidNotOnTheOpWhitelist;
+        }
+        return T2COpSecAPIPlayerStatus.playerOnOpWhitelist;
+    }
+    public static T2COpSecAPIPlayerStatus detailCheckPermissionWhiteList(Player player) {
+        if (!PermissionWhitelist.enable.valueBoolean) return T2COpSecAPIPlayerStatus.playerOnPermissionWhitelist;
+        List<String> nameList = new ArrayList<>();
+        List<String> uuidList = new ArrayList<>();
+        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.getPermissionHashMap().entrySet()) {
+            nameList.add(playerObject.getValue().playerName);
+            uuidList.add(playerObject.getValue().uuid);
+        }
+        if (!nameList.contains(player.getName())) {
+            return T2COpSecAPIPlayerStatus.playerNameNotOnThePermissionWhitelist;
+        }
+        if (!uuidList.contains(player.getUniqueId().toString().replace("-", ""))) {
+            return T2COpSecAPIPlayerStatus.playerUuidNotOnThePermissionWhitelist;
+        }
+        return T2COpSecAPIPlayerStatus.playerOnPermissionWhitelist;
+    }
+}
--- a/V3/src/main/java/net/t2code/opsecurity/API/T2COpSecAPIPlayerStatus.java
+++ b/V3/src/main/java/net/t2code/opsecurity/API/T2COpSecAPIPlayerStatus.java
@@ -0,0 +1,10 @@
+package net.t2code.opsecurity.API;
+
+public enum T2COpSecAPIPlayerStatus {
+    playerOnOpWhitelist,
+    playerNameNotOnTheOpWhitelist,
+    playerUuidNotOnTheOpWhitelist,
+    playerOnPermissionWhitelist,
+    playerNameNotOnThePermissionWhitelist,
+    playerUuidNotOnThePermissionWhitelist
+}
--- a/V3/src/main/java/net/t2code/opsecurity/Util.java
+++ b/V3/src/main/java/net/t2code/opsecurity/Util.java
@@ -8,7 +8,7 @@ public class Util {
    private static String infoText = "";

    @Getter
-    private static String requiredT2CodeLibVersion = "13.4";
+    private static String requiredT2CodeLibVersion = "15.0";

    @Getter
    private static String prefix = "§8[§4T2C§8-§2OP§4Security§8]";
--- a/V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java
+++ b/V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java
@@ -4,11 +4,12 @@ import net.t2code.opsecurity.config.config.Config;
 import net.t2code.opsecurity.config.language.Language;
 import net.t2code.opsecurity.config.opWhitelist.OPWhitelist;
 import net.t2code.opsecurity.events.Events;
-import net.t2code.opsecurity.objects.PlayerCash;
+import net.t2code.opsecurity.objects.PlayerCache;
 import net.t2code.opsecurity.objects.PlayerObject;
 import net.t2code.opsecurity.system.BungeeSenderReceiver;
 import net.t2code.opsecurity.system.Main;
 import net.t2code.t2codelib.SPIGOT.api.commands.T2Ccmd;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,25 +17,26 @@ import org.bukkit.entity.Player;
 import java.util.Map;

 public class OpCheck {
-    public static Boolean onCheck(Player player, Boolean join) {
+    public static Boolean onCheck(Player player, Boolean join, String debug) {
        if (!OPWhitelist.enable.valueBoolean) return false;
        if (!player.isOp()) return false;
-        if (opWhitelist(player)) return false;
+        if (opWhitelist(player, debug)) return false;
        if (join) T2Csend.console(Language.opWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
        Bukkit.getScheduler().runTask(Main.getPlugin(), new Runnable() {
            @Override
            public void run() {
-                execute(player, join);
+                execute(player, join, debug);
            }
        });
        return true;
    }

-    private static void execute(Player player, Boolean join) {
+    private static void execute(Player player, Boolean join, String debug) {
        if (Config.notifyJoinWarning.valueBoolean && join) {
            if (Config.notifyBungee.valueBoolean) {
                BungeeSenderReceiver.sendToBungee(Language.opWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
-            } else Events.notifyPlayer(Language.opWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
+            } else
+                Events.notifyPlayer(Language.opWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
        }

        if (OPWhitelist.noOpPlayerSetGameModeEnable.valueBoolean) {
@@ -52,12 +54,12 @@ public class OpCheck {
                    } else player.kickPlayer(OPWhitelist.noOpPlayerDeopEnable.valueBoolean && OPWhitelist.noOpPlayerDeopPlayerSendMessage.valueBoolean
                            ? Language.opWhitelistKick.value + "\n \n" + Language.opWhitelistDeop.value : Language.opWhitelistKick.value);
                }
-                T2Csend.console(Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName().replace("[uuid]", String.valueOf(player.getUniqueId()))) + "<br>"
+                T2Csend.console("["+debug+ "]" +Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName().replace("[uuid]", String.valueOf(player.getUniqueId()))) + "<br>"
                        + Language.opWhitelistNotifyKick.value.replace("[player]", player.getName().replace("[uuid]", String.valueOf(player.getUniqueId()))).replace("[uuid]", String.valueOf(player.getUniqueId())));
                Events.notifyPlayer(Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName()) + "<br>"
                        + Language.opWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
            } else {
-                T2Csend.console(Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
+                T2Csend.console("["+debug+ "]" +Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
                Events.notifyPlayer(Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));

                if (OPWhitelist.noOpPlayerDeopPlayerSendMessage.valueBoolean) {
@@ -77,7 +79,7 @@ public class OpCheck {
                        T2Ccmd.console(Config.kickCommand.valueString.replace("[player]", player.getName()).replace("[reason]", Language.opWhitelistKick.value));
                    } else player.kickPlayer(Language.opWhitelistKick.value);
                }
-                T2Csend.console(Language.opWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
+                T2Csend.console("["+debug+ "]" +Language.opWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
                Events.notifyPlayer(Language.opWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
            }
        }
@@ -88,17 +90,18 @@ public class OpCheck {
        }
    }

-    public static Boolean opWhitelist(Player player) {
-        for (Map.Entry<String, PlayerObject> playerObject : PlayerCash.getOpHashMap().entrySet()) {
-            T2Csend.debug(Main.getPlugin(), "--------- " + player.getName());
-            T2Csend.debug(Main.getPlugin(), "opWhitelist playerObject Name: " + playerObject.getValue().playerName);
-            T2Csend.debug(Main.getPlugin(), "opWhitelist Player Name: " + player.getName());
-            T2Csend.debug(Main.getPlugin(), "opWhitelist playerObject UUID: " + playerObject.getValue().uuid);
-            T2Csend.debug(Main.getPlugin(), "opWhitelist Player UUID: " + player.getUniqueId().toString().replace("-", ""));
+    public static Boolean opWhitelist(Player player, String debug) {
+        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.getOpHashMap().entrySet()) {
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] --------- " + player.getName()+" ---------");
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] opWhitelist playerObject Name: " + playerObject.getValue().playerName);
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] opWhitelist Player Name: " + player.getName());
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] opWhitelist playerObject UUID: " + playerObject.getValue().uuid);
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] opWhitelist Player UUID: " + player.getUniqueId().toString().replace("-", ""));
            if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString().replace("-", ""))) {
-                T2Csend.debug(Main.getPlugin(), "opWhitelist Player on list!");
+                T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] opWhitelist Player on list!");
+                T2Cdebug.debug(Main.getPlugin(),"");
                return true;
-            }
+            } else T2Cdebug.debug(Main.getPlugin(),"");
        }
        return false;
    }
--- a/V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java
+++ b/V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java
@@ -4,11 +4,12 @@ import net.t2code.opsecurity.config.config.Config;
 import net.t2code.opsecurity.config.language.Language;
 import net.t2code.opsecurity.config.permissionWhitelist.PermissionWhitelist;
 import net.t2code.opsecurity.events.Events;
-import net.t2code.opsecurity.objects.PlayerCash;
+import net.t2code.opsecurity.objects.PlayerCache;
 import net.t2code.opsecurity.objects.PlayerObject;
 import net.t2code.opsecurity.system.BungeeSenderReceiver;
 import net.t2code.opsecurity.system.Main;
 import net.t2code.t2codelib.SPIGOT.api.commands.T2Ccmd;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,15 +17,16 @@ import org.bukkit.entity.Player;
 import java.util.Map;

 public class PermissionCheck {
-    public static Boolean onCheck(Player player, Boolean join) {
+    public static Boolean onCheck(Player player, Boolean join, String debug) {
        if (!PermissionWhitelist.enable.valueBoolean) return false;
        for (String perm : PermissionWhitelist.permissions.valueStringList) {
            if (!player.hasPermission(perm)) return false;
-            if (permWhitelist(player)) return false;
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] check Permission: " + perm);
+            if (permWhitelist(player, debug)) return false;
            Bukkit.getScheduler().runTask(Main.getPlugin(), new Runnable() {
                @Override
                public void run() {
-                    execute(player, join, perm);
+                    execute(player, join, perm, debug);
                }
            });
            return true;
@@ -32,19 +34,21 @@ public class PermissionCheck {
        return false;
    }

-    private static void execute(Player player, Boolean join, String perm) {
-        if (join) T2Csend.console(Language.permissionWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[uuid]",String.valueOf(player.getUniqueId())));
+    private static void execute(Player player, Boolean join, String perm, String debug) {
+        if (join)
+            T2Csend.console("[" + debug + "]" + Language.permissionWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
        if (Config.notifyJoinWarning.valueBoolean && join) {
            if (Config.notifyBungee.valueBoolean) {
                BungeeSenderReceiver.sendToBungee(Language.permissionWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
-            } else Events.notifyPlayer(Language.permissionWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]",String.valueOf(player.getUniqueId())));
+            } else
+                Events.notifyPlayer(Language.permissionWhitelistNotifyOnJoin.value.replace("[player]", player.getName()).replace("[uuid]", String.valueOf(player.getUniqueId())));
        }

        if (PermissionWhitelist.playerWithPermissionKick.valueBoolean) {
            if (Config.kickCustomCommand.valueBoolean) {
                T2Ccmd.console(Config.kickCommand.valueString.replace("[perm]", perm).replace("[player]", player.getName()).replace("[reason]", Language.permissionWhitelistKick.value));
            } else player.kickPlayer(Language.permissionWhitelistKick.value);
-            T2Csend.console(Language.permissionWhitelistNotifyKick.value.replace("[player]",
+            T2Csend.console("[" + debug + "]" + Language.permissionWhitelistNotifyKick.value.replace("[player]",
                    player.getName()).replace("[perm]", perm).replace("[uuid]", String.valueOf(player.getUniqueId())));
        }
        if (PermissionWhitelist.customCommandsEnable.valueBoolean) {
@@ -54,18 +58,19 @@ public class PermissionCheck {
        }
    }

-    private static Boolean permWhitelist(Player player) {
+    public static Boolean permWhitelist(Player player, String debug) {

-        for (Map.Entry<String, PlayerObject> playerObject : PlayerCash.getPermissionHashMap().entrySet()) {
-            T2Csend.debug(Main.getPlugin(), "--------- " + player.getName());
-            T2Csend.debug(Main.getPlugin(),"permWhitelist playerObject Name: "+playerObject.getValue().playerName );
-            T2Csend.debug(Main.getPlugin(),"permWhitelist Player Name: "+player.getName() );
-            T2Csend.debug(Main.getPlugin(),"permWhitelist playerObject UUID: "+playerObject.getValue().uuid );
-            T2Csend.debug(Main.getPlugin(),"permWhitelist Player UUID: "+player.getUniqueId().toString().replace("-","") );
+        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.getPermissionHashMap().entrySet()) {
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] --------- " + player.getName() + " ---------");
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] permWhitelist playerObject Name: " + playerObject.getValue().playerName);
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] permWhitelist Player Name: " + player.getName());
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] permWhitelist playerObject UUID: " + playerObject.getValue().uuid);
+            T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] permWhitelist Player UUID: " + player.getUniqueId().toString().replace("-", ""));
            if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString().replace("-", ""))) {
-                T2Csend.debug(Main.getPlugin(),"permWhitelist Player on list!");
+                T2Cdebug.debug(Main.getPlugin(), "[" + debug + "] permWhitelist Player on list!");
+                T2Cdebug.debug(Main.getPlugin(), "");
                return true;
-            }
+            } else T2Cdebug.debug(Main.getPlugin(), "");
        }
        return false;
    }
--- a/V3/src/main/java/net/t2code/opsecurity/check/Timer.java
+++ b/V3/src/main/java/net/t2code/opsecurity/check/Timer.java
@@ -6,6 +6,7 @@ import net.t2code.opsecurity.config.config.Config;
 import net.t2code.opsecurity.config.opWhitelist.OPWhitelist;
 import net.t2code.opsecurity.config.permissionWhitelist.PermissionWhitelist;
 import net.t2code.opsecurity.system.Main;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

@@ -19,8 +20,9 @@ public class Timer {
            @Override
            public void run() {
                for (Player player : Bukkit.getOnlinePlayers()) {
-                    OpCheck.onCheck(player, false);
-                    PermissionCheck.onCheck(player, false);
+                    String debug = T2Cdebug.debugCode();
+                    OpCheck.onCheck(player, false, debug);
+                    PermissionCheck.onCheck(player, false, debug);
                }
            }
        }, 0, 20L * Config.checkTimerRefreshInSec.valueInt);
--- a/V3/src/main/java/net/t2code/opsecurity/command/CmdExecuter.java
+++ b/V3/src/main/java/net/t2code/opsecurity/command/CmdExecuter.java
@@ -4,12 +4,8 @@ package net.t2code.opsecurity.command;

 import net.t2code.opsecurity.Util;
 import net.t2code.opsecurity.config.config.Config;
-import net.t2code.opsecurity.objects.PlayerCash;
-import net.t2code.opsecurity.objects.PlayerObject;
-import net.t2code.opsecurity.system.Main;
 import net.t2code.opsecurity.system.Permissions;
 import net.t2code.t2codelib.SPIGOT.api.commands.T2Ctab;
-import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -18,7 +14,6 @@ import org.bukkit.command.TabCompleter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 public class CmdExecuter implements CommandExecutor, TabCompleter {

--- a/V3/src/main/java/net/t2code/opsecurity/command/Commands.java
+++ b/V3/src/main/java/net/t2code/opsecurity/command/Commands.java
@@ -5,10 +5,9 @@ import net.t2code.opsecurity.check.OpCheck;
 import net.t2code.opsecurity.config.FileSelect;
 import net.t2code.opsecurity.config.config.Config;
 import net.t2code.opsecurity.config.language.Language;
-import net.t2code.opsecurity.enums.OpCommandRequest;
-import net.t2code.opsecurity.objects.PlayerCash;
 import net.t2code.opsecurity.system.Main;
 import net.t2code.opsecurity.system.Permissions;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
 import org.bukkit.Bukkit;
@@ -55,7 +54,8 @@ public class Commands {
        if (sender instanceof Player) {
            Player player = (Player) sender;
            if (Config.onlyOPcanUseThePlugin.valueBoolean) {
-                if (!OpCheck.opWhitelist(player)) {
+                String debug = T2Cdebug.debugCode();
+                if (!OpCheck.opWhitelist(player,debug)) {
                    sender.sendMessage(Util.getPrefix() + " §4You are not on the Whitelist!"); // todo
                    return;
                }
--- a/V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java
+++ b/V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java
@@ -5,9 +5,10 @@ import net.t2code.opsecurity.config.config.Config;
 import net.t2code.opsecurity.config.language.Language;
 import net.t2code.opsecurity.config.opWhitelist.OPWhitelist;
 import net.t2code.opsecurity.config.permissionWhitelist.PermissionWhitelist;
-import net.t2code.opsecurity.objects.PlayerCash;
+import net.t2code.opsecurity.objects.PlayerCache;
 import net.t2code.opsecurity.objects.PlayerObject;
 import net.t2code.opsecurity.system.Main;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.system.config.languages.SelectLibMsg;
@@ -84,7 +85,7 @@ public class FileSelect {
                    }
                }
            }
-            T2Csend.debug(Main.getPlugin(), "save: " + language);
+            T2Cdebug.debug(Main.getPlugin(), "save: " + language);
            try {
                yamlConfiguration.save(config);
            } catch (IOException e) {
@@ -94,7 +95,7 @@ public class FileSelect {

        String selectMSG;
        File config = new File(Main.getPath(), "languages/" + Config.language.valueString + ".yml");
-        T2Csend.debug(Main.getPlugin(), config.getAbsolutePath());
+        T2Cdebug.debug(Main.getPlugin(), config.getAbsolutePath());
        if (!config.isFile()) {
            T2Csend.console(Util.getPrefix());
            T2Csend.console(Util.getPrefix() + " §4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
@@ -108,14 +109,14 @@ public class FileSelect {
        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);

        for (Language value : Language.values()) {
-            T2Csend.debug(Main.getPlugin(), "Select: File: " + config.getName() + " Path: " + value.path);
+            T2Cdebug.debug(Main.getPlugin(), "Select: File: " + config.getName() + " Path: " + value.path);
            value.value = T2Creplace.replace(Util.getPrefix(), yamlConfiguration.getString(value.path));
        }
        T2Csend.console(Util.getPrefix() + " §2Language successfully selected to: §6" + selectMSG + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
    }

    public static void selectOpWhitelist() {
-        PlayerCash.getOpHashMap().clear();
+        PlayerCache.getOpHashMap().clear();
        File config = new File(Main.getPath(), "opWhitelist.yml");
        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
        for (OPWhitelist value : OPWhitelist.values()) {
@@ -144,7 +145,7 @@ public class FileSelect {
                        PlayerObject playerObject = new PlayerObject(
                                name,
                                yamlConfiguration.getString(value.pathPlayerUuid.replace("KEY", key)).replace("-", ""));
-                        PlayerCash.getOpHashMap().put(name, playerObject);
+                        PlayerCache.getOpHashMap().put(name, playerObject);
                    }
                    break;
                case GAMEMODE:
@@ -168,7 +169,7 @@ public class FileSelect {
    }

    public static void selectPermissionWhitelist() {
-        PlayerCash.getPermissionHashMap().clear();
+        PlayerCache.getPermissionHashMap().clear();
        File config = new File(Main.getPath(), "permissionWhitelist.yml");
        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
        for (PermissionWhitelist value : PermissionWhitelist.values()) {
@@ -197,7 +198,7 @@ public class FileSelect {
                        PlayerObject playerObject = new PlayerObject(
                                name,
                                yamlConfiguration.getString(value.pathPlayerUuid.replace("KEY", key)).replace("-", ""));
-                        PlayerCash.getPermissionHashMap().put(name, playerObject);
+                        PlayerCache.getPermissionHashMap().put(name, playerObject);
                    }
                    break;
            }
--- a/V3/src/main/java/net/t2code/opsecurity/config/config/Config.java
+++ b/V3/src/main/java/net/t2code/opsecurity/config/config/Config.java
@@ -19,7 +19,7 @@ public enum Config {
    checkOnChat("check.onChat", true, ConfigParam.BOOLEAN),
    checkTimerEnable("check.timer.enable", true, ConfigParam.BOOLEAN),
    checkTimerRefreshInSec("check.timer.refreshInSec", 60, ConfigParam.INTEGER),
-    kickCustomCommand("kick.customCommand.Enable", false, ConfigParam.BOOLEAN),
+    kickCustomCommand("kick.customCommand.enable", false, ConfigParam.BOOLEAN),
    kickCommand("kick.customCommand.command", "minecraft:kick [player] [reason]", ConfigParam.STRING),
    notifyJoinWarning("notify.joinWarn.enable", true, ConfigParam.BOOLEAN),
    notifyBungee("notify.allBungeePlayer.enable", false, ConfigParam.BOOLEAN),
--- a/V3/src/main/java/net/t2code/opsecurity/config/opWhitelist/OPWhitelist.java
+++ b/V3/src/main/java/net/t2code/opsecurity/config/opWhitelist/OPWhitelist.java
@@ -9,7 +9,7 @@ import java.util.List;
 public enum OPWhitelist {
    enable("opWhitelist.enable", false, ConfigParam.BOOLEAN),
    playerMustBeOnlineToOp("opWhitelist.playerMustBeOnlineToOp", true, ConfigParam.BOOLEAN),
-    noOpPlayerDeopEnable("opWhitelist.enable", true, ConfigParam.BOOLEAN),
+    noOpPlayerDeopEnable("opWhitelist.noOpPlayerDeop.enable", true, ConfigParam.BOOLEAN),
    noOpPlayerDeopPlayerSendMessage("opWhitelist.noOpPlayerDeop.playerSendMessage", true, ConfigParam.BOOLEAN),
    noOpPlayerKickEnable("opWhitelist.noOpPlayerKick.enable", true, ConfigParam.BOOLEAN),
    noOpPlayerSetGameModeEnable("opWhitelist.noOpPlayerSetGameMode.enable", true, ConfigParam.BOOLEAN),
--- a/V3/src/main/java/net/t2code/opsecurity/events/Events.java
+++ b/V3/src/main/java/net/t2code/opsecurity/events/Events.java
@@ -6,6 +6,7 @@ import net.t2code.opsecurity.check.OpCheck;
 import net.t2code.opsecurity.check.PermissionCheck;
 import net.t2code.opsecurity.system.Main;
 import net.t2code.opsecurity.system.Permissions;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
 import org.bukkit.Bukkit;
@@ -28,7 +29,13 @@ public class Events implements Listener {
    public void CommandSendEvent(PlayerCommandPreprocessEvent event) {
        if (!Config.checkOnCommand.valueBoolean) return;
        Player player = event.getPlayer();
-        if (OpCheck.onCheck(player, false) || PermissionCheck.onCheck(player, false)) {
+        String debug = T2Cdebug.debugCode();
+        if (OpCheck.onCheck(player, false, debug)) {
+            if (event.isCancelled()) return;
+            event.setCancelled(true);
+        }
+        String debug2 = T2Cdebug.debugCode();
+        if (PermissionCheck.onCheck(player, false, debug2)) {
            if (event.isCancelled()) return;
            event.setCancelled(true);
        }
@@ -38,7 +45,13 @@ public class Events implements Listener {
    public void PlayerChatEvent(PlayerChatEvent event) {
        if (!Config.checkOnChat.valueBoolean) return;
        Player player = event.getPlayer();
-        if (OpCheck.onCheck(player, false) || PermissionCheck.onCheck(player, false)) {
+        String debug = T2Cdebug.debugCode();
+        if (OpCheck.onCheck(player, false, debug)) {
+            if (event.isCancelled()) return;
+            event.setCancelled(true);
+        }
+        String debug2 = T2Cdebug.debugCode();
+        if (PermissionCheck.onCheck(player, false, debug2)) {
            if (event.isCancelled()) return;
            event.setCancelled(true);
        }
@@ -47,11 +60,16 @@ public class Events implements Listener {
    @EventHandler
    public void onInteract(PlayerInteractEvent event) {
        if (!Config.checkOnInteract.valueBoolean) return;
-        Player player = event.getPlayer();
        Bukkit.getScheduler().runTaskLaterAsynchronously(Main.getPlugin(), new Runnable() {
            @Override
            public void run() {
-                if (OpCheck.onCheck(player, false) || PermissionCheck.onCheck(player, false)) {
+                Player player = event.getPlayer();
+                String debug = T2Cdebug.debugCode();
+                if (OpCheck.onCheck(player, false, debug)) {
+                    event.setCancelled(true);
+                }
+                String debug2 = T2Cdebug.debugCode();
+                if (PermissionCheck.onCheck(player, false, debug2)) {
                    event.setCancelled(true);
                }
            }
@@ -61,12 +79,14 @@ public class Events implements Listener {
    @EventHandler
    public void onJoinCheck(PlayerJoinEvent event) {
        if (!Config.checkOnJoin.valueBoolean) return;
-        Player player = event.getPlayer();
        Bukkit.getScheduler().runTaskLaterAsynchronously(Main.getPlugin(), new Runnable() {
            @Override
            public void run() {
-                OpCheck.onCheck(player, true);
-                PermissionCheck.onCheck(player, true);
+                Player player = event.getPlayer();
+                String debug = T2Cdebug.debugCode();
+                OpCheck.onCheck(player, true, debug);
+                String debug2 = T2Cdebug.debugCode();
+                PermissionCheck.onCheck(player, true, debug2);
            }
        }, 1L);
    }
--- a/V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java
+++ b/V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java
@@ -1,12 +1,12 @@
 package net.t2code.opsecurity.events;

-import net.t2code.opsecurity.check.OpCheck;
 import net.t2code.opsecurity.config.language.Language;
 import net.t2code.opsecurity.config.opWhitelist.OPWhitelist;
 import net.t2code.opsecurity.enums.OpCommandRequest;
-import net.t2code.opsecurity.objects.PlayerCash;
+import net.t2code.opsecurity.objects.PlayerCache;
 import net.t2code.opsecurity.objects.PlayerObject;
 import net.t2code.opsecurity.system.Main;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.api.player.T2CnameHistory;
 import org.bukkit.Bukkit;
@@ -79,14 +79,14 @@ public class OpCommand implements Listener {
    }

    private static Boolean opWhitelist(String playerName, String playerUuid) {
-        for (Map.Entry<String, PlayerObject> playerObject : PlayerCash.getOpHashMap().entrySet()) {
-            T2Csend.debug(Main.getPlugin(), "--------- " + playerName);
-            T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) playerObject Name: "+playerObject.getValue().playerName );
-            T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) Player Name: "+ playerName );
-            T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) playerObject UUID: "+playerObject.getValue().uuid );
-            T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) Player UUID: "+ playerUuid );
+        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.getOpHashMap().entrySet()) {
+            T2Cdebug.debug(Main.getPlugin(), "--------- " + playerName);
+            T2Cdebug.debug(Main.getPlugin(),"opWhitelist (op command) playerObject Name: "+playerObject.getValue().playerName );
+            T2Cdebug.debug(Main.getPlugin(),"opWhitelist (op command) Player Name: "+ playerName );
+            T2Cdebug.debug(Main.getPlugin(),"opWhitelist (op command) playerObject UUID: "+playerObject.getValue().uuid );
+            T2Cdebug.debug(Main.getPlugin(),"opWhitelist (op command) Player UUID: "+ playerUuid );
            if (playerObject.getValue().playerName.equals(playerName) && playerObject.getValue().uuid.equals(playerUuid.replace("-", ""))) {
-                T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) on list!");
+                T2Cdebug.debug(Main.getPlugin(),"opWhitelist (op command) on list!");
                return true;
            }
        }
--- a/V3/src/main/java/net/t2code/opsecurity/objects/PlayerCache.java
+++ b/V3/src/main/java/net/t2code/opsecurity/objects/PlayerCache.java
@@ -4,7 +4,7 @@ import lombok.Getter;

 import java.util.HashMap;

-public class PlayerCash {
+public class PlayerCache {
    @Getter
    private static HashMap<String, PlayerObject> opHashMap = new HashMap<String, PlayerObject>();
    @Getter
--- a/V3/src/main/java/net/t2code/opsecurity/system/BungeeSenderReceiver.java
+++ b/V3/src/main/java/net/t2code/opsecurity/system/BungeeSenderReceiver.java
@@ -1,6 +1,7 @@
 package net.t2code.opsecurity.system;

 import net.t2code.opsecurity.events.Events;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -27,7 +28,7 @@ public class BungeeSenderReceiver implements PluginMessageListener {
    @Override
    public void onPluginMessageReceived(String channel, Player player, byte[] message) {
        DataInputStream stream = new DataInputStream(new ByteArrayInputStream(message));
-        T2Csend.debug(Main.getPlugin(), "stream: " + stream.toString());
+        T2Cdebug.debug(Main.getPlugin(), "stream: " + stream.toString());
        try {
            String subChannel = stream.readUTF();
            String information = stream.readUTF();
--- a/V3/src/main/java/net/t2code/opsecurity/system/Main.java
+++ b/V3/src/main/java/net/t2code/opsecurity/system/Main.java
@@ -32,6 +32,20 @@ public final class Main extends JavaPlugin {
        autor = this.getDescription().getAuthors();
        version = this.getDescription().getVersion();
        if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return;
+        load();
+
+
+    }
+    private static void load(){
+        if (!Bukkit.getPluginManager().getPlugin("T2CodeLib").isEnabled()){
+            Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+                @Override
+                public void run() {
+                    load();
+                }
+            },5L);
+            return;
+        }
        t2codeLib = true;
        Load.onLoad(plugin,autor,version);
    }
--- a/V3/src/main/resources/plugin.yml
+++ b/V3/src/main/resources/plugin.yml
@@ -6,9 +6,10 @@ api-version: 1.13
 load: STARTUP
 prefix: T2C-OPSecurity
 authors: [ JaTiTV ]
+
 softdepend:
  - T2CodeLib
-  - OPSecurity
+
 commands:
  t2c-opsecurity:
    aliases: [opsec, opsecurity]
Author	SHA1	Message	Date
JaTiTV	f5dfca5f72	3.1.2 - API update to Minecraft version 1.20 - T2CodeLib API update to 15.0 (this version is required from now on)	2023-06-08 06:58:46 +02:00
JaTiTV	0dc694d29f	Security bugfixes and improved debug messages	2023-04-23 16:35:32 +02:00
JaTiTV	9351c0dfb7	better debug information & async bugfix	2023-04-23 12:53:25 +02:00
JaTiTV	98fd0409fd	load bugfix Fixed an error that occurred when loading the plugin, because since paper build 404 the T2CodeLib was loaded only after OPSecurity	2023-02-28 00:15:48 +01:00
JaTiTV	a2bd88ac7c	3.1.0 \| add API	2022-12-28 08:12:36 +01:00
JaTiTV	dba1e57b91	code changes	2022-12-23 00:38:55 +01:00
JaTiTV	e14f91c584	Update OPWhitelist.java	2022-12-22 02:14:04 +01:00
JaTiTV	1547c16093	3.0.7 \| Bugfix - noOpPlayerDeop.enable' was missing in opWhitelist.yml and was read in incorrectly - kick.customCommand.Enable' was corrected to 'kick.customCommand.enable' in config.yml	2022-12-12 11:38:45 +01:00