diff --git a/src/main/java/com/slprojects/slcraftplugin/Main.java b/src/main/java/com/slprojects/slcraftplugin/Main.java index e0e04cec9a1f67627d2753299f01a6eb07a7e936..b35113d220342a9fa995111cc5663a8f292acda1 100644 --- a/src/main/java/com/slprojects/slcraftplugin/Main.java +++ b/src/main/java/com/slprojects/slcraftplugin/Main.java @@ -1,10 +1,10 @@ package com.slprojects.slcraftplugin; -import com.slprojects.slcraftplugin.commands.admins.wildReset; -import com.slprojects.slcraftplugin.commands.publics.linkCode; -import com.slprojects.slcraftplugin.commands.publics.wild; -import com.slprojects.slcraftplugin.parallelTasks.playerDataHandler; -import com.slprojects.slcraftplugin.parallelTasks.internalWebServer; +import com.slprojects.slcraftplugin.commands.admins.WildReset; +import com.slprojects.slcraftplugin.commands.publics.LinkCode; +import com.slprojects.slcraftplugin.commands.publics.Wild; +import com.slprojects.slcraftplugin.parallelTasks.PlayerDataHandler; +import com.slprojects.slcraftplugin.parallelTasks.InternalWebServer; import me.clip.placeholderapi.PlaceholderAPI; import net.luckperms.api.LuckPerms; import net.luckperms.api.cacheddata.CachedMetaData; @@ -47,8 +47,8 @@ public final class Main extends JavaPlugin implements Listener { private List<UUID> wildCommandActiveUsers; private static FileConfiguration config; private static LuckPerms luckPermsApi; - public playerDataHandler playerDataHandler; - public wild wildCommand; + public PlayerDataHandler playerDataHandler; + public Wild wildCommand; // Fonctions appelées à des évènements clés @Override @@ -84,21 +84,21 @@ public final class Main extends JavaPlugin implements Listener { reloadConfig(); config = getConfig(); updateConfig(); - playerDataHandler = new playerDataHandler(this); + playerDataHandler = new PlayerDataHandler(this); // On initialise la base de donnée initDatabase(); - wildCommand = new wild(this); + wildCommand = new Wild(this); getCommand("wild").setExecutor(wildCommand); - wildReset wildReset = new wildReset(this); + WildReset wildReset = new WildReset(this); getCommand("reset-wild").setExecutor(wildReset); - linkCode linkCodeCommand = new linkCode(this); + LinkCode linkCodeCommand = new LinkCode(this); getCommand("getLinkCode").setExecutor(linkCodeCommand); - internalWebServer.startServer(this); + InternalWebServer.startServer(this); getServer().getConsoleSender().sendMessage(ChatColor.GREEN+"SL-Craft | Plugin démarré"); } @@ -160,7 +160,7 @@ public final class Main extends JavaPlugin implements Listener { playerFormattedMessage = Pattern.compile("~~(.*?)~~").matcher(playerFormattedMessage).replaceAll("§m$1§r "); // Couleurs - playerFormattedMessage = Pattern.compile("&([a-f]|r|[0-8])").matcher(playerFormattedMessage).replaceAll("§$1"); + playerFormattedMessage = Pattern.compile("&([a-f]|r|[0-9])").matcher(playerFormattedMessage).replaceAll("§$1"); // Ping utilisateur Matcher m = Pattern.compile("@(.*?)($|[ ,;:!])").matcher(playerFormattedMessage); diff --git a/src/main/java/com/slprojects/slcraftplugin/commands/admins/wildReset.java b/src/main/java/com/slprojects/slcraftplugin/commands/admins/WildReset.java similarity index 96% rename from src/main/java/com/slprojects/slcraftplugin/commands/admins/wildReset.java rename to src/main/java/com/slprojects/slcraftplugin/commands/admins/WildReset.java index 4b199bc8153b075fb3e8982d000b6c32c14e01d3..9b1bac3737fabd27c439455fe579e7558cb04254 100644 --- a/src/main/java/com/slprojects/slcraftplugin/commands/admins/wildReset.java +++ b/src/main/java/com/slprojects/slcraftplugin/commands/admins/WildReset.java @@ -13,10 +13,10 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -public class wildReset implements CommandExecutor { +public class WildReset implements CommandExecutor { private final Main plugin; - public wildReset(Main plugin){ + public WildReset(Main plugin){ this.plugin = plugin; } diff --git a/src/main/java/com/slprojects/slcraftplugin/commands/publics/linkCode.java b/src/main/java/com/slprojects/slcraftplugin/commands/publics/LinkCode.java similarity index 97% rename from src/main/java/com/slprojects/slcraftplugin/commands/publics/linkCode.java rename to src/main/java/com/slprojects/slcraftplugin/commands/publics/LinkCode.java index 1633f2d54371ad9f348fe7c4c0f31927308e45dc..254ca8bf8ff774f3ae573756834cefec2dc23720 100644 --- a/src/main/java/com/slprojects/slcraftplugin/commands/publics/linkCode.java +++ b/src/main/java/com/slprojects/slcraftplugin/commands/publics/LinkCode.java @@ -14,12 +14,12 @@ import java.sql.ResultSet; import java.time.LocalDateTime; import java.util.Random; -public class linkCode implements CommandExecutor { +public class LinkCode implements CommandExecutor { // Variables private final Main plugin; - public linkCode(Main plugin){ + public LinkCode(Main plugin){ // On récupère la classe parente pour les paramètres this.plugin = plugin; } diff --git a/src/main/java/com/slprojects/slcraftplugin/commands/publics/wild.java b/src/main/java/com/slprojects/slcraftplugin/commands/publics/Wild.java similarity index 99% rename from src/main/java/com/slprojects/slcraftplugin/commands/publics/wild.java rename to src/main/java/com/slprojects/slcraftplugin/commands/publics/Wild.java index f22a80655b61f18c97a190cac452a4a45e653469..852e1b942c219f7a2294151f7e897d676dc236bf 100644 --- a/src/main/java/com/slprojects/slcraftplugin/commands/publics/wild.java +++ b/src/main/java/com/slprojects/slcraftplugin/commands/publics/Wild.java @@ -19,7 +19,7 @@ import java.util.*; import static java.lang.Math.abs; -public class wild implements CommandExecutor { +public class Wild implements CommandExecutor { // Variables private final Main plugin; @@ -31,7 +31,7 @@ public class wild implements CommandExecutor { private final int usageCooldown; private final int usagePerDay; - public wild(Main plugin){ + public Wild(Main plugin){ // On récupère la classe parente pour les paramètres this.plugin = plugin; wildUsersIndexes = new ArrayList<>(); diff --git a/src/main/java/com/slprojects/slcraftplugin/parallelTasks/internalWebServer.java b/src/main/java/com/slprojects/slcraftplugin/parallelTasks/InternalWebServer.java similarity index 99% rename from src/main/java/com/slprojects/slcraftplugin/parallelTasks/internalWebServer.java rename to src/main/java/com/slprojects/slcraftplugin/parallelTasks/InternalWebServer.java index 1de5e8ab7a2bbf3912cec57107f3a8973be24b95..ae2a4eb28ebbc814889f1b374462facf200f2ed1 100644 --- a/src/main/java/com/slprojects/slcraftplugin/parallelTasks/internalWebServer.java +++ b/src/main/java/com/slprojects/slcraftplugin/parallelTasks/InternalWebServer.java @@ -13,7 +13,7 @@ import java.net.Socket; import java.net.URLDecoder; import java.net.URLEncoder; -public class internalWebServer { +public class InternalWebServer { @SuppressWarnings({ "unchecked", "InfiniteLoopStatement" }) public static void startServer(Main plugin){ int serverPort = plugin.getConfig().getInt("internal-webserver-port"); diff --git a/src/main/java/com/slprojects/slcraftplugin/parallelTasks/PeriodicPlayerEvent.java b/src/main/java/com/slprojects/slcraftplugin/parallelTasks/PeriodicPlayerEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..48a22cd3908d6ddcdbe419a154456cc92d73f7fe --- /dev/null +++ b/src/main/java/com/slprojects/slcraftplugin/parallelTasks/PeriodicPlayerEvent.java @@ -0,0 +1,4 @@ +package com.slprojects.slcraftplugin.parallelTasks; + +public class PeriodicPlayerEvent { +} diff --git a/src/main/java/com/slprojects/slcraftplugin/parallelTasks/playerDataHandler.java b/src/main/java/com/slprojects/slcraftplugin/parallelTasks/PlayerDataHandler.java similarity index 99% rename from src/main/java/com/slprojects/slcraftplugin/parallelTasks/playerDataHandler.java rename to src/main/java/com/slprojects/slcraftplugin/parallelTasks/PlayerDataHandler.java index e1f8b23c2a48eccded03c844108589d41be4c651..a9704bc77e59599826f73dc866b52a9f68121349 100644 --- a/src/main/java/com/slprojects/slcraftplugin/parallelTasks/playerDataHandler.java +++ b/src/main/java/com/slprojects/slcraftplugin/parallelTasks/PlayerDataHandler.java @@ -15,14 +15,14 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -public class playerDataHandler { +public class PlayerDataHandler { private final Main plugin; private Connection con; // Playtime private final List<UUID> playTimeUsersIndexes; private final List<LocalDateTime> playTimeUsersDate; - public playerDataHandler(Main plugin){ + public PlayerDataHandler(Main plugin){ this.plugin = plugin; playTimeUsersIndexes = new ArrayList<>(); playTimeUsersDate = new ArrayList<>();