diff --git a/.idea/SL-Craft Plugin.iml b/.idea/SL-Craft Plugin.iml
new file mode 100644
index 0000000000000000000000000000000000000000..027874e56680f132f5bc08d783e249281485a01f
--- /dev/null
+++ b/.idea/SL-Craft Plugin.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="minecraft" name="Minecraft">
+ <configuration>
+ <autoDetectTypes>
+ <platformType>PAPER</platformType>
+ <platformType>ADVENTURE</platformType>
+ </autoDetectTypes>
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000000000000000000000000000000000000..797acea53eb091cf5b30518802c3073f544adeed
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RunConfigurationProducerService">
+ <option name="ignoredProducers">
+ <set>
+ <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+ </set>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d04bdb589001927b8b5f989da708e42514c2a920..9d59155f17d0f21aeeade32d1135dc94539557ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.slprojects</groupId>
<artifactId>SLCraftPlugin</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
<packaging>jar</packaging>
<name>SLCraftPlugin</name>
@@ -73,7 +73,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
- <version>1.18.1-R0.1-SNAPSHOT</version>
+ <version>1.18.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
diff --git a/src/main/java/com/slprojects/slcraftplugin/Main.java b/src/main/java/com/slprojects/slcraftplugin/Main.java
index 013a835288ba5d8d3dd3e9ddaff3d3c18dca26c3..80257c824e85ac53eb8eb825844e81d8bafa5c6f 100644
--- a/src/main/java/com/slprojects/slcraftplugin/Main.java
+++ b/src/main/java/com/slprojects/slcraftplugin/Main.java
@@ -1,5 +1,3 @@
-// Contient une partie du code de ce plugin: https://github.com/Twi5TeD/PlayTime
-
package com.slprojects.slcraftplugin;
import com.slprojects.slcraftplugin.commandes.linkCodeCommand;
@@ -47,11 +45,11 @@ public final class Main extends JavaPlugin implements Listener {
public void onEnable() {
// On s'assure qu'on a placeholder api
if (getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
- getLogger().info("PlaceholderAPI chargé");
+ getServer().getConsoleSender().sendMessage("PlaceholderAPI chargé");
// On initialise les listeners
getServer().getPluginManager().registerEvents(this, this);
} else {
- getLogger().info(ChatColor.RED+"PlaceholderAPI n'est pas accessible!");
+ getServer().getConsoleSender().sendMessage(ChatColor.RED+"PlaceholderAPI n'est pas accessible!");
getServer().getPluginManager().disablePlugin(this);
}
@@ -73,13 +71,13 @@ public final class Main extends JavaPlugin implements Listener {
waitForDiscordMsg.startServer(this);
- getLogger().info(ChatColor.GREEN+"SL-Craft | Plugin démarré");
+ getServer().getConsoleSender().sendMessage(ChatColor.GREEN+"SL-Craft | Plugin démarré");
}
@Override
public void onDisable() {
// Plugin shutdown logic
- getLogger().info(ChatColor.RED+"SL-Craft | Plugin éteint");
+ getServer().getConsoleSender().sendMessage(ChatColor.RED+"SL-Craft | Plugin éteint");
getServer().getOnlinePlayers().forEach(player -> savePlayerData.saveOnQuit(player));
}
@@ -127,7 +125,7 @@ public final class Main extends JavaPlugin implements Listener {
String response = getHttp(urlString);
if(getConfig().getBoolean("msg-verbose")){
- getLogger().info("Func AsyncChatEvent(PlayerChatEvent e), HTTP response:" + response);
+ getServer().getConsoleSender().sendMessage("Func AsyncChatEvent(PlayerChatEvent e), HTTP response:" + response);
}
} catch (UnsupportedEncodingException ex) {
getLogger().warning(ChatColor.RED + "Impossible de d'encoder les données. Func AsyncChatEvent(PlayerChatEvent e)");
diff --git a/src/main/java/com/slprojects/slcraftplugin/commandes/linkCodeCommand.java b/src/main/java/com/slprojects/slcraftplugin/commandes/linkCodeCommand.java
index e3750e1cbb3a843b3684114ad9a785e59c5cf575..b7691d00b5e19faf6d2268002f6d1d53f1de7169 100644
--- a/src/main/java/com/slprojects/slcraftplugin/commandes/linkCodeCommand.java
+++ b/src/main/java/com/slprojects/slcraftplugin/commandes/linkCodeCommand.java
@@ -66,7 +66,7 @@ public class linkCodeCommand implements CommandExecutor {
}
player.sendMessage("Utilise ce code pour lier ton compte: "+ChatColor.GREEN+generatedString);
player.sendMessage(ChatColor.GRAY+"Ce code à usage unique expirera dans 5 minutes.");
- plugin.getLogger().info("Le joueur "+ChatColor.GOLD+player.getName()+ChatColor.RESET+" a généré le code "+ChatColor.GREEN+generatedString+ChatColor.RESET+ChatColor.GRAY+" - Il expirera le "+ java.sql.Timestamp.valueOf(LocalDateTime.now().plusMinutes(5)));
+ plugin.getServer().getConsoleSender().sendMessage("Le joueur "+ChatColor.GOLD+player.getName()+ChatColor.RESET+" a généré le code "+ChatColor.GREEN+generatedString+ChatColor.RESET+ChatColor.GRAY+" - Il expirera le "+ java.sql.Timestamp.valueOf(LocalDateTime.now().plusMinutes(5)));
}catch (Exception e){
e.printStackTrace();
diff --git a/src/main/java/com/slprojects/slcraftplugin/commandes/wildCommand.java b/src/main/java/com/slprojects/slcraftplugin/commandes/wildCommand.java
index 2786b8360d035d95f1074302104aabc2a68da778..c36e6f6f2fdf4371a60bfe335ba956af0408a805 100644
--- a/src/main/java/com/slprojects/slcraftplugin/commandes/wildCommand.java
+++ b/src/main/java/com/slprojects/slcraftplugin/commandes/wildCommand.java
@@ -36,11 +36,11 @@ public class wildCommand implements CommandExecutor {
// On vérifie qu'il n'a pas déjà lancé la commande wild
if(!plugin.checkActiveUserForWildCommand(player.getUniqueId())){
- plugin.getLogger().info("Le joueur "+ChatColor.GOLD+player.getName()+ChatColor.RESET+" a exécuté la commande "+ChatColor.GOLD+"/wild"+ChatColor.RESET+" : "+ChatColor.RED+"refusé");
+ plugin.getServer().getConsoleSender().sendMessage("Le joueur "+ChatColor.GOLD+player.getName()+ChatColor.RESET+" a exécuté la commande "+ChatColor.GOLD+"/wild"+ChatColor.RESET+" : "+ChatColor.RED+"refusé");
player.sendMessage("§cVous devez attendre 5s avant de relancer la commande.");
return true;
}
- plugin.getLogger().info("Le joueur "+ChatColor.GOLD+player.getName()+ChatColor.RESET+" a exécuté la commande "+ChatColor.GOLD+"/wild"+ChatColor.RESET+" : "+ChatColor.GREEN+"accepté");
+ plugin.getServer().getConsoleSender().sendMessage("Le joueur "+ChatColor.GOLD+player.getName()+ChatColor.RESET+" a exécuté la commande "+ChatColor.GOLD+"/wild"+ChatColor.RESET+" : "+ChatColor.GREEN+"accepté");
// on récupère la liste des biomes exclus
List<String> excludedBiomes;
diff --git a/src/main/java/com/slprojects/slcraftplugin/tachesParalleles/waitForDiscordMsg.java b/src/main/java/com/slprojects/slcraftplugin/tachesParalleles/waitForDiscordMsg.java
index e9d4af4d4038aa46a92f0e7717144e8ed2cd301b..9c38df85e8bd8537df038fe8a3c156a77d3f801c 100644
--- a/src/main/java/com/slprojects/slcraftplugin/tachesParalleles/waitForDiscordMsg.java
+++ b/src/main/java/com/slprojects/slcraftplugin/tachesParalleles/waitForDiscordMsg.java
@@ -18,7 +18,7 @@ public class waitForDiscordMsg {
public static void startServer(Main plugin){
int serverPort = plugin.getConfig().getInt("msg-server-port");
- plugin.getLogger().info("Écoute des messages Discord sur le port " + ChatColor.GOLD + serverPort);
+ plugin.getServer().getConsoleSender().sendMessage("Écoute des messages Discord sur le port " + ChatColor.GOLD + serverPort);
// On fait un thread pour écouter le port
Runnable serverThread = () -> {
try {
@@ -49,7 +49,7 @@ public class waitForDiscordMsg {
if (line.length() == 0)
break;
//out.print(line + "\r\n");
- //plugin.getLogger().info(line);
+ //plugin.getServer().getConsoleSender().sendMessage(line);
// On va regarder si la ligne commence par GET
if (line.startsWith("GET")) {
@@ -72,7 +72,7 @@ public class waitForDiscordMsg {
for (Player p : plugin.getServer().getOnlinePlayers()) {
p.sendMessage(ChatColor.DARK_PURPLE + playerName + ChatColor.WHITE + ": " + message);
}
- plugin.getLogger().info(ChatColor.DARK_PURPLE + playerName + ": " + message);
+ plugin.getServer().getConsoleSender().sendMessage(ChatColor.DARK_PURPLE + playerName + ": " + message);
out.print("Message envoyé !");
} else {
out.print("La commande \"" + commandName + "\" n'est pas reconnue.\r\n");
@@ -87,7 +87,7 @@ public class waitForDiscordMsg {
client.close(); // Close the socket itself
}
} catch (IOException e) {
- plugin.getLogger().info(ChatColor.RED + "Erreur lors de l'écoute du port " + ChatColor.GOLD + serverPort);
+ plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "Erreur lors de l'écoute du port " + ChatColor.GOLD + serverPort);
e.printStackTrace();
// On va logger le message sur discord
@@ -99,7 +99,7 @@ public class waitForDiscordMsg {
urlString = plugin.getConfig().getString("discordBot-api-url") + "mc/error/" + URLEncoder.encode(json.toJSONString(), "UTF-8").replace("+", "%20");
relaunchListener(plugin);
} catch (UnsupportedEncodingException ex) {
- plugin.getLogger().info(ChatColor.RED + "Erreur lors de l'encodage du message. Func waitForDiscordMsg::startServer(Main plugin)");
+ plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "Erreur lors de l'encodage du message. Func waitForDiscordMsg::startServer(Main plugin)");
ex.printStackTrace();
}
plugin.getHttp(urlString);
diff --git a/target/classes/com/slprojects/slcraftplugin/Main.class b/target/classes/com/slprojects/slcraftplugin/Main.class
index eda2a9c1cd295bb879da822ff8dba76ad1658ddc..3ebfd74f46a879f7dbb7c90892bc31187cd9b28a 100644
Binary files a/target/classes/com/slprojects/slcraftplugin/Main.class and b/target/classes/com/slprojects/slcraftplugin/Main.class differ
diff --git a/target/classes/com/slprojects/slcraftplugin/commandes/linkCodeCommand.class b/target/classes/com/slprojects/slcraftplugin/commandes/linkCodeCommand.class
index cdfd694633b242e6f0da66ec130867ca659de54f..f669d297188c24923599800a5d200c97f60604de 100644
Binary files a/target/classes/com/slprojects/slcraftplugin/commandes/linkCodeCommand.class and b/target/classes/com/slprojects/slcraftplugin/commandes/linkCodeCommand.class differ
diff --git a/target/classes/com/slprojects/slcraftplugin/commandes/wildCommand.class b/target/classes/com/slprojects/slcraftplugin/commandes/wildCommand.class
index ea0d4ae5a0214c9cb712808a133e19048bb9d6ca..ef0b8ad223c6c5ab76e0b6fdd91a18b074df805b 100644
Binary files a/target/classes/com/slprojects/slcraftplugin/commandes/wildCommand.class and b/target/classes/com/slprojects/slcraftplugin/commandes/wildCommand.class differ
diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
index 01ae2d1012ccc95c16dbd9f3931b6d7f2cbad8f3..70a23ac692893fd340d12f0c95f864b0960ab84d 100644
--- a/target/classes/plugin.yml
+++ b/target/classes/plugin.yml
@@ -1,5 +1,5 @@
name: SLCraftPlugin
-version: '1.5.2'
+version: '1.5.3'
main: com.slprojects.slcraftplugin.Main
depend: [PlaceholderAPI]
api-version: 1.18
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index ca83351744e96cb1ec5c8cc62e0b6b83a01e0b62..097f81d4315eb6cf954400fa3a3b9f15e1d6785a 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Wed Mar 09 23:27:16 CET 2022
-groupId=com.slprojects
+#Sun Apr 03 12:10:13 CEST 2022
artifactId=SLCraftPlugin
-version=1.5.2
+groupId=com.slprojects
+version=1.5.3
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 6c547a5f3b441ff7458f3cab3dfe2abb00013160..af03a36ab54b46bf5d319f3eb492740951a0b243 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,5 +1,5 @@
-C:\Users\sofia\Documents\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\tachesParalleles\savePlayerData.java
-C:\Users\sofia\Documents\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\commandes\wildCommand.java
-C:\Users\sofia\Documents\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\Main.java
-C:\Users\sofia\Documents\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\commandes\linkCodeCommand.java
-C:\Users\sofia\Documents\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\tachesParalleles\waitForDiscordMsg.java
+D:\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\tachesParalleles\waitForDiscordMsg.java
+D:\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\commandes\wildCommand.java
+D:\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\commandes\linkCodeCommand.java
+D:\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\Main.java
+D:\Minecraft Plugin Workspace\SL-Craft Plugin\src\main\java\com\slprojects\slcraftplugin\tachesParalleles\savePlayerData.java