3.2

In this update, minor bugs have been fixed and the config has been slightly revised. Config changes: - check.onJoin -> check.onJoin.enable - check.onInteract -> check.onInteract.enable - check.onCommand -> check.onCommand.enable - check.onChat -> check.onChat.enable - add check.onCommand.whitelist A whitelist has been added for commands for which no check is performed.
3.1.3
2024-03-31 13:35:45 +02:00 · 2023-06-19 21:09:03 +02:00 · 2023-06-08 06:58:46 +02:00 · 2023-04-23 16:35:32 +02:00 · 2023-04-23 12:53:25 +02:00
15 changed files with 206 additions and 72 deletions
--- a/V3/pom.xml
+++ b/V3/pom.xml
@@ -6,7 +6,7 @@

    <groupId>net.t2code</groupId>
    <artifactId>T2C-OPSecurity</artifactId>
-    <version>3.1.0</version>
+    <version>3.2</version>

    <packaging>jar</packaging>

@@ -76,14 +76,14 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot-api</artifactId>
-            <version>1.19.2-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <!-- t2code -->
        <dependency>
            <groupId>net.t2code</groupId>
            <artifactId>T2CodeLib</artifactId>
-            <version>13.4</version>
+            <version>16.4</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
@@ -2,12 +2,11 @@ package net.t2code.opsecurity.API;

 import net.t2code.opsecurity.check.OpCheck;
 import net.t2code.opsecurity.check.PermissionCheck;
-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.objects.PlayerCache;
 import net.t2code.opsecurity.objects.PlayerObject;
-import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import org.bukkit.entity.Player;

 import java.util.ArrayList;
@@ -17,12 +16,13 @@ import java.util.Map;
 public class T2COpSecAPI {
    public static boolean checkOPWhiteList(Player player) {
        if (!OPWhitelist.enable.valueBoolean) return true;
-        return OpCheck.opWhitelist(player);
+        String debug = T2Cdebug.debugCode();
+        return OpCheck.opWhitelist(player,debug);
    }

-    public static boolean checkPermissionWhiteList(Player player) {
+    public static boolean checkPermissionWhiteList(Player player, String debug) {
        if (!PermissionWhitelist.enable.valueBoolean) return true;
-        return PermissionCheck.permWhitelist(player);
+        return PermissionCheck.permWhitelist(player, debug);
    }

    public static T2COpSecAPIPlayerStatus detailCheckOPWhiteList(Player player) {
--- 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]";
@@ -27,5 +27,8 @@ public class Util {

    @Getter
    private static String discord = "http://dc.t2code.net";
+    @Getter
+    private static Integer configVersion = 2;
+

 }
--- a/V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java
+++ b/V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java
@@ -9,6 +9,7 @@ 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) {
@@ -46,18 +48,18 @@ public class OpCheck {
            if (OPWhitelist.noOpPlayerKickEnable.valueBoolean) {
                if (!OPWhitelist.customCommandsEnable.valueBoolean) {
                    if (Config.kickCustomCommand.valueBoolean) {
-                        T2Ccmd.console(Config.kickCommand.valueString.replace("[player]", player.getName()).replace("[reason]",
+                        T2Ccmd.console( Config.kickCommand.valueString.replace("[player]", player.getName()).replace("[reason]",
                                OPWhitelist.noOpPlayerKickEnable.valueBoolean && OPWhitelist.noOpPlayerDeopEnable.valueBoolean && OPWhitelist.noOpPlayerDeopPlayerSendMessage.valueBoolean
                                        ? Language.opWhitelistKick.value + "<br> <br>" + Language.opWhitelistDeop.value : Language.opWhitelistKick.value));
                    } 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) {
+    public static Boolean opWhitelist(Player player, String debug) {
        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.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("-", ""));
+            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
@@ -9,6 +9,7 @@ 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,20 +34,22 @@ 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())));
+                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())));
        }

        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]",
-                    player.getName()).replace("[perm]", perm).replace("[uuid]",String.valueOf(player.getUniqueId())));
+            T2Csend.console("[" + debug + "]" + Language.permissionWhitelistNotifyKick.value.replace("[player]",
+                    player.getName()).replace("[perm]", perm).replace("[uuid]", String.valueOf(player.getUniqueId())));
        }
        if (PermissionWhitelist.customCommandsEnable.valueBoolean) {
            for (String cmd : PermissionWhitelist.customCommandsCommands.valueStringList) {
@@ -54,18 +58,19 @@ public class PermissionCheck {
        }
    }

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

        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.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("-","") );
-            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 + "] --------- " + 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("-", ""))) {
+                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/Commands.java
+++ b/V3/src/main/java/net/t2code/opsecurity/command/Commands.java
@@ -7,6 +7,7 @@ import net.t2code.opsecurity.config.config.Config;
 import net.t2code.opsecurity.config.language.Language;
 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;
@@ -15,7 +16,7 @@ import org.bukkit.entity.Player;

 public class Commands {

-    public static void help(CommandSender sender){
+    public static void help(CommandSender sender) {
        if (!sender.hasPermission(Permissions.help)) {
            T2Csend.sender(sender, Language.noPermissionForOpSec.value);
            return;
@@ -53,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;
                }
@@ -64,7 +66,7 @@ public class Commands {
        Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + "§8-------------------------------");
        Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + " §6Plugin reload...");
        Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + "§8-------------------------------");
-       // Load.onLoad(Main.getPlugin(),Main.getAutor(),Main.getVersion());
+        // Load.onLoad(Main.getPlugin(),Main.getAutor(),Main.getVersion());
        FileSelect.selectConfig();
        FileSelect.selectLanguage();
        FileSelect.selectOpWhitelist();
@@ -79,6 +81,6 @@ public class Commands {
            sender.sendMessage(Util.getPrefix() + "§cYou do not have permission for OPSecurity! §7<" + Permissions.info + ">");
            return;
        }
-        T2Ctemplate.sendInfo(sender,Main.getPlugin(),Util.getSpigotID(),Util.getDiscord(),Util.getInfoText());
+        T2Ctemplate.sendInfo(sender, Main.getPlugin(), Util.getSpigotID(), Util.getDiscord(), Util.getInfoText());
    }
 }
--- a/V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java
+++ b/V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java
@@ -2,14 +2,17 @@ package net.t2code.opsecurity.config;

 import net.t2code.opsecurity.Util;
 import net.t2code.opsecurity.config.config.Config;
+import net.t2code.opsecurity.config.config.Converter;
 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.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.api.yaml.T2Cconfig;
 import net.t2code.t2codelib.SPIGOT.system.config.languages.SelectLibMsg;
 import org.bukkit.GameMode;
 import org.bukkit.Sound;
@@ -23,6 +26,20 @@ public class FileSelect {
    public static void selectConfig() {
        File config = new File(Main.getPath(), "config.yml");
        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+        if (!config.exists()) T2Cconfig.set("configVersion", Util.getConfigVersion(), yamlConfiguration);
+        if (yamlConfiguration.getInt("configVersion") < Util.getConfigVersion() && new File(Main.getPath(), "config.yml").exists()) {
+            if (yamlConfiguration.getInt("configVersion") < 2) {
+                Converter.convertCheck();
+                T2Csend.console(Util.getPrefix() + " §4----------------------");
+                T2Csend.console(Util.getPrefix() + " ");
+                T2Csend.console(Util.getPrefix() + " §6New features have been added to T2C-OPSecurity. The Config is adapted!");
+                T2Csend.console(Util.getPrefix() + " ");
+                T2Csend.console(Util.getPrefix() + " §4----------------------");
+            }
+            config = new File(Main.getPath(), "config.yml");
+            yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+        }
+
        for (Config value : Config.values()) {
            switch (value.configParam) {
                case STRING:
@@ -31,6 +48,12 @@ public class FileSelect {
                    }
                    value.valueString = T2Creplace.replace(Util.getPrefix(), Objects.requireNonNull(yamlConfiguration.getString(value.path)));
                    break;
+                case STRINGLIST:
+                    if (!yamlConfiguration.contains(value.path)) {
+                        yamlConfiguration.set(value.path, value.valueStringList);
+                    }
+                    value.valueStringList = T2Creplace.replace(Util.getPrefix(), yamlConfiguration.getStringList(value.path));
+                    break;
                case SOUND:
                    if (!yamlConfiguration.contains(value.path)) {
                        yamlConfiguration.set(value.path, value.sound.toString());
@@ -84,7 +107,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 +117,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,7 +131,7 @@ 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");
--- a/V3/src/main/java/net/t2code/opsecurity/config/config/Config.java
+++ b/V3/src/main/java/net/t2code/opsecurity/config/config/Config.java
@@ -4,6 +4,9 @@ import net.t2code.opsecurity.enums.ConfigParam;
 import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
 import org.bukkit.Sound;

+import java.util.Arrays;
+import java.util.List;
+
 public enum Config {

    language("plugin.language", "english", ConfigParam.STRING),
@@ -13,10 +16,11 @@ public enum Config {
    updateCheckSeePreReleaseUpdates("plugin.updateCheck.seePreReleaseUpdates",true,ConfigParam.BOOLEAN),
    updateCheckTimeInterval("plugin.updateCheck.timeInterval",60,ConfigParam.INTEGER),

-    checkOnJoin("check.onJoin", true, ConfigParam.BOOLEAN),
-    checkOnInteract("check.onInteract", true, ConfigParam.BOOLEAN),
-    checkOnCommand("check.onCommand", true, ConfigParam.BOOLEAN),
-    checkOnChat("check.onChat", true, ConfigParam.BOOLEAN),
+    checkOnJoin("check.onJoin.enable", true, ConfigParam.BOOLEAN),
+    checkOnInteract("check.onInteract.enable", true, ConfigParam.BOOLEAN),
+    checkOnCommand("check.onCommand.enable", true, ConfigParam.BOOLEAN),
+    checkOnCommandWhitelist("check.onCommand.whitelist", Arrays.asList("command 1","command 2"), ConfigParam.STRINGLIST),
+    checkOnChat("check.onChat.enable", true, ConfigParam.BOOLEAN),
    checkTimerEnable("check.timer.enable", true, ConfigParam.BOOLEAN),
    checkTimerRefreshInSec("check.timer.refreshInSec", 60, ConfigParam.INTEGER),
    kickCustomCommand("kick.customCommand.enable", false, ConfigParam.BOOLEAN),
@@ -28,6 +32,7 @@ public enum Config {

    public String path;
    public String valueString;
+    public List<String> valueStringList;
    public Integer valueInt;
    public Boolean valueBoolean;
    public Sound sound;
@@ -56,6 +61,11 @@ public enum Config {
        this.valueBoolean = value;
        this.configParam = cEnum;
    }
+    Config(String path, List<String> value, ConfigParam cEnum) {
+        this.path = path;
+        this.valueStringList = value;
+        this.configParam = cEnum;
+    }

    public static Sound sound() {
        if (T2CmcVersion.isMc1_8()) {
--- a/V3/src/main/java/net/t2code/opsecurity/config/config/Converter.java
+++ b/V3/src/main/java/net/t2code/opsecurity/config/config/Converter.java
@@ -4,6 +4,7 @@ import net.t2code.opsecurity.config.opWhitelist.OPWhitelist;
 import net.t2code.opsecurity.config.permissionWhitelist.PermissionWhitelist;
 import net.t2code.opsecurity.objects.PlayerObject;
 import net.t2code.opsecurity.system.Main;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import org.bukkit.configuration.file.YamlConfiguration;

 import java.io.File;
@@ -93,4 +94,37 @@ public class Converter {
            }
        }
    }
+
+    public static void convertCheck() {
+        File config = new File(Main.getPath(), "config.yml");
+        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+
+
+        if (!yamlConfiguration.contains("check.onJoin.enable")) {
+            Boolean onJoin = yamlConfiguration.getBoolean("check.onJoin");
+            T2Csend.debugmsg(Main.getPlugin(),"onJoin = " + onJoin);
+            yamlConfiguration.set("check.onJoin.enable", onJoin);
+        }
+        if (!yamlConfiguration.contains("check.onInteract.enable")) {
+            Boolean onInteract = yamlConfiguration.getBoolean("check.onInteract");
+            T2Csend.debugmsg(Main.getPlugin(),"onInteract = " + onInteract);
+            yamlConfiguration.set("check.onInteract.enable", onInteract);
+        }
+        if (!yamlConfiguration.contains("check.onCommand.enable")) {
+            Boolean onCommand = yamlConfiguration.getBoolean("check.onCommand");
+            T2Csend.debugmsg(Main.getPlugin(),"onCommand = " + onCommand);
+            yamlConfiguration.set("check.onCommand.enable", onCommand);
+        }
+        if (!yamlConfiguration.contains("check.onChat.enable")) {
+            Boolean onChat = yamlConfiguration.getBoolean("check.onChat");
+            T2Csend.debugmsg(Main.getPlugin(),"onChat = " + onChat);
+            yamlConfiguration.set("check.onChat.enable", onChat);
+        }
+
+        try {
+            yamlConfiguration.save(config);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
--- 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,17 +29,37 @@ 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();
+
+        for (String s : Config.checkOnCommandWhitelist.valueStringList){
+            if (event.getMessage().startsWith("/"+s)) {
+                return;
+            }
+        }
+
+        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);
        }
    }

+
    @EventHandler
    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 +68,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 +87,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
@@ -6,6 +6,7 @@ import net.t2code.opsecurity.enums.OpCommandRequest;
 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,13 +80,13 @@ public class OpCommand implements Listener {

    private static Boolean opWhitelist(String playerName, String playerUuid) {
        for (Map.Entry<String, PlayerObject> playerObject : PlayerCache.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 );
+            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/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/Load.java
+++ b/V3/src/main/java/net/t2code/opsecurity/system/Load.java
@@ -9,11 +9,17 @@ import net.t2code.opsecurity.events.Events;
 import net.t2code.opsecurity.events.OpCommand;
 import net.t2code.opsecurity.events.PlugManCommand;
 import net.t2code.opsecurity.check.Timer;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
 import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister;
 import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
+import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.checkerframework.checker.units.qual.C;

+import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.logging.Level;

@@ -33,12 +39,17 @@ public class Load {
        FileSelect.selectOpWhitelist();
        FileSelect.selectPermissionWhitelist();

+        setConfigVersion();
+
        plugin.getCommand("t2c-opsecurity").setExecutor(new CmdExecuter());

        T2Cregister.listener(new OpCommand(), plugin);
        T2Cregister.listener(new PlugManCommand(), plugin);
        T2Cregister.listener(new Events(), plugin);
-
+        if (SelectLibConfig.getBungee()) {
+            Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "t2c:opsec");
+            T2Csend.debug(plugin, "registerIncomingPluginChannel §et2c:opsec");
+        }
        Timer.refreshTimer();
        Permissions.register();
        T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(),Util.getGit(),Util.getSpigotID(),Util.getDiscord(), Config.updateCheckOnJoin.valueBoolean,
@@ -46,4 +57,14 @@ public class Load {
        Metrics.Bstats(plugin, Util.getBstatsID());
        T2Ctemplate.onLoadFooter(Util.getPrefix(), long_);
    }
+    public static void setConfigVersion() {
+        File config = new File(Main.getPath(), "config.yml");
+        YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+        yamlConfiguration.set("configVersion", Util.getConfigVersion());
+        try {
+            yamlConfiguration.save(config);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
--- a/V3/src/main/resources/plugin.yml
+++ b/V3/src/main/resources/plugin.yml
@@ -7,6 +7,7 @@ load: STARTUP
 prefix: T2C-OPSecurity
 authors: [ JaTiTV ]

+
 softdepend:
  - T2CodeLib
Author	SHA1	Message	Date
JaTiTV	c89430b219	3.2 In this update, minor bugs have been fixed and the config has been slightly revised. Config changes: - check.onJoin -> check.onJoin.enable - check.onInteract -> check.onInteract.enable - check.onCommand -> check.onCommand.enable - check.onChat -> check.onChat.enable - add check.onCommand.whitelist A whitelist has been added for commands for which no check is performed.	2024-03-31 13:35:45 +02:00
JaTiTV	052592cff6	3.1.3 The notify.allBungeePlayer option did not work as it should, this bug was fixed	2023-06-19 21:09:03 +02:00
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