diff --git a/src/main/java/dev/plex/command/impl/BanCMD.java b/src/main/java/dev/plex/command/impl/BanCMD.java index f053b29..73f5514 100644 --- a/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/src/main/java/dev/plex/command/impl/BanCMD.java @@ -14,6 +14,7 @@ import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; +import dev.plex.util.WebUtils; import java.time.LocalDateTime; import java.util.List; import java.util.UUID; @@ -38,7 +39,7 @@ public class BanCMD extends PlexCommand return usage(); } - UUID targetUUID = PlexUtils.getFromName(args[0]); + UUID targetUUID = WebUtils.getFromName(args[0]); if (targetUUID == null || !DataUtils.hasPlayedBefore(targetUUID)) { diff --git a/src/main/java/dev/plex/command/impl/DebugCMD.java b/src/main/java/dev/plex/command/impl/DebugCMD.java index 2a86b0c..c6fced9 100644 --- a/src/main/java/dev/plex/command/impl/DebugCMD.java +++ b/src/main/java/dev/plex/command/impl/DebugCMD.java @@ -6,6 +6,7 @@ import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.System; import dev.plex.rank.enums.Rank; +import dev.plex.util.GameRuleUtil; import dev.plex.util.PlexLog; import dev.plex.util.PlexUtils; import java.util.Arrays; @@ -47,7 +48,7 @@ public class DebugCMD extends PlexCommand { for (World world : Bukkit.getWorlds()) { - PlexUtils.commitGlobalGameRules(world); + GameRuleUtil.commitGlobalGameRules(world); PlexLog.log("Set global gamerules for world: " + world.getName()); } for (String world : plugin.config.getConfigurationSection("worlds").getKeys(false)) @@ -55,7 +56,7 @@ public class DebugCMD extends PlexCommand World bukkitWorld = Bukkit.getWorld(world); if (bukkitWorld != null) { - PlexUtils.commitSpecificGameRules(bukkitWorld); + GameRuleUtil.commitSpecificGameRules(bukkitWorld); PlexLog.log("Set specific gamerules for world: " + world.toLowerCase(Locale.ROOT)); } } diff --git a/src/main/java/dev/plex/command/impl/KickCMD.java b/src/main/java/dev/plex/command/impl/KickCMD.java index 3957bb6..3e8f9c5 100644 --- a/src/main/java/dev/plex/command/impl/KickCMD.java +++ b/src/main/java/dev/plex/command/impl/KickCMD.java @@ -11,6 +11,7 @@ import dev.plex.punishment.Punishment; import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; +import dev.plex.util.WebUtils; import java.time.LocalDateTime; import java.util.UUID; import net.kyori.adventure.text.Component; @@ -33,7 +34,7 @@ public class KickCMD extends PlexCommand return usage(); } - UUID targetUUID = PlexUtils.getFromName(args[0]); + UUID targetUUID = WebUtils.getFromName(args[0]); String reason = "No reason provided"; if (targetUUID == null || !DataUtils.hasPlayedBefore(targetUUID)) diff --git a/src/main/java/dev/plex/command/impl/TempbanCMD.java b/src/main/java/dev/plex/command/impl/TempbanCMD.java index 5f202de..7e70016 100644 --- a/src/main/java/dev/plex/command/impl/TempbanCMD.java +++ b/src/main/java/dev/plex/command/impl/TempbanCMD.java @@ -12,19 +12,18 @@ import dev.plex.punishment.Punishment; import dev.plex.punishment.PunishmentType; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; +import dev.plex.util.TimeUtils; +import dev.plex.util.WebUtils; +import java.util.List; +import java.util.UUID; import net.kyori.adventure.text.Component; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.time.LocalDateTime; -import java.util.List; -import java.util.UUID; - @CommandParameters(name = "tempban", usage = "/