diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java index f2f5691..12a7947 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java @@ -4,7 +4,7 @@ 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; @@ -89,7 +89,7 @@ public class OpCheck { } public static Boolean opWhitelist(Player player) { - for (Map.Entry playerObject : PlayerCash.getOpHashMap().entrySet()) { + for (Map.Entry 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()); diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java index 6f5a74b..f8a3aa1 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java @@ -4,7 +4,7 @@ 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; @@ -56,7 +56,7 @@ public class PermissionCheck { private static Boolean permWhitelist(Player player) { - for (Map.Entry playerObject : PlayerCash.getPermissionHashMap().entrySet()) { + for (Map.Entry 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() ); diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/CmdExecuter.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/CmdExecuter.java index 37fac7d..ac84f06 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/CmdExecuter.java +++ b/OpSecurity 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 { diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/Commands.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/Commands.java index 94391dd..a3e3e20 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/Commands.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/command/Commands.java @@ -5,8 +5,6 @@ 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.messages.T2Csend; diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java index f7d04fa..609f94e 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java @@ -5,7 +5,7 @@ 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.messages.T2Creplace; @@ -115,7 +115,7 @@ public class FileSelect { } 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 +144,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 +168,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 +197,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; } diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java index 14048cd..b17a3af 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java @@ -1,10 +1,9 @@ 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.messages.T2Csend; @@ -79,7 +78,7 @@ public class OpCommand implements Listener { } private static Boolean opWhitelist(String playerName, String playerUuid) { - for (Map.Entry playerObject : PlayerCash.getOpHashMap().entrySet()) { + for (Map.Entry 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 ); diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/objects/PlayerCash.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/objects/PlayerCache.java similarity index 92% rename from OpSecurity V3/src/main/java/net/t2code/opsecurity/objects/PlayerCash.java rename to OpSecurity V3/src/main/java/net/t2code/opsecurity/objects/PlayerCache.java index 05e5826..be5ce76 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/objects/PlayerCash.java +++ b/OpSecurity 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 opHashMap = new HashMap(); @Getter