From bb0c04ae05dc44f9bc7a4bad8239197274949861 Mon Sep 17 00:00:00 2001 From: DocSystem <42613513+DocSystem@users.noreply.github.com> Date: Fri, 28 Oct 2022 10:40:26 +0200 Subject: [PATCH 1/6] Bump version to 1.0.6-dev --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9cf7cb2..fc4cdd5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'fr.efreicraft' -version = '1.0.5' +version = '1.0.6-dev' compileJava.options.encoding "UTF-8" From aae661bee7819d3217348b4970119cc00babc84b Mon Sep 17 00:00:00 2001 From: Niilyx _ Date: Fri, 28 Oct 2022 19:46:53 +0200 Subject: [PATCH 2/6] minor spelling mistake :trollface: --- src/main/java/fr/efreicraft/ecatup/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/efreicraft/ecatup/Main.java b/src/main/java/fr/efreicraft/ecatup/Main.java index d1fecbe..645effb 100644 --- a/src/main/java/fr/efreicraft/ecatup/Main.java +++ b/src/main/java/fr/efreicraft/ecatup/Main.java @@ -175,7 +175,7 @@ public static void sendGlobalChat(String msg, @Nullable Player player) { (player == null ? "a player's" : (player.getName() + "'s")) + " global message: " + msg); if (player != null) { - Component failed = Component.text("Votre dernier message n'a pas été envoyé aux autres serveur.").color(NamedTextColor.DARK_RED); + Component failed = Component.text("Votre dernier message n'a pas été envoyé aux autres serveurs.").color(NamedTextColor.DARK_RED); player.sendMessage(failed); } } From 3cbb41915583118683112e0e74aecf7f15bf4aeb Mon Sep 17 00:00:00 2001 From: Niilyx _ Date: Fri, 28 Oct 2022 19:52:03 +0200 Subject: [PATCH 3/6] =?UTF-8?q?check=20si=20le=20joueur=20PEUT=20aller=20s?= =?UTF-8?q?ur=20un=20serveur=20avant=20de=20l'y=20exp=C3=A9dier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/fr/efreicraft/ecatup/Main.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/fr/efreicraft/ecatup/Main.java b/src/main/java/fr/efreicraft/ecatup/Main.java index 645effb..b9a7d11 100644 --- a/src/main/java/fr/efreicraft/ecatup/Main.java +++ b/src/main/java/fr/efreicraft/ecatup/Main.java @@ -150,6 +150,13 @@ public static List getPlayersForTabList(String[] args, int argPos) { } public static void sendPlayerToServer(Player player, String server) { + if (!player.hasPermission("server." + server.toLowerCase())) { + Component nope = Component.text("Vous ne pouvez pas aller sur ce serveur !").color(NamedTextColor.RED); + player.sendMessage(nope); + INSTANCE.getLogger().info(player.getName() + " tried to join " + server + " but doesn't have permission to do so."); + return; + } + ByteArrayDataOutput out = ByteStreams.newDataOutput(); out.writeUTF("Connect"); out.writeUTF(server); From dcb4b1defe5bce5ab3fc7692bdaab8d57122968f Mon Sep 17 00:00:00 2001 From: Niilyx _ Date: Fri, 28 Oct 2022 19:53:52 +0200 Subject: [PATCH 4/6] opti imports inutiles --- src/main/java/fr/efreicraft/ecatup/Main.java | 4 +--- src/main/java/fr/efreicraft/ecatup/commands/Chat.java | 1 - src/main/java/fr/efreicraft/ecatup/commands/Skull.java | 3 --- src/main/java/fr/efreicraft/ecatup/commands/WhoIs.java | 5 ----- src/main/java/fr/efreicraft/ecatup/listeners/Join.java | 2 +- src/main/java/fr/efreicraft/ecatup/listeners/Quit.java | 2 +- .../java/fr/efreicraft/ecatup/utils/DiscordWebhook.java | 7 ++----- 7 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/main/java/fr/efreicraft/ecatup/Main.java b/src/main/java/fr/efreicraft/ecatup/Main.java index b9a7d11..77ef9a6 100644 --- a/src/main/java/fr/efreicraft/ecatup/Main.java +++ b/src/main/java/fr/efreicraft/ecatup/Main.java @@ -3,12 +3,11 @@ import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import fr.efreicraft.ecatup.commands.*; -import fr.efreicraft.ecatup.listeners.*; -import fr.efreicraft.ecatup.utils.DiscordWebhook; import fr.efreicraft.ecatup.listeners.Chat; import fr.efreicraft.ecatup.listeners.Join; import fr.efreicraft.ecatup.listeners.LuckPermsListener; import fr.efreicraft.ecatup.listeners.Quit; +import fr.efreicraft.ecatup.utils.DiscordWebhook; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.luckperms.api.LuckPerms; @@ -28,7 +27,6 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; diff --git a/src/main/java/fr/efreicraft/ecatup/commands/Chat.java b/src/main/java/fr/efreicraft/ecatup/commands/Chat.java index e70d43c..52fe8ab 100644 --- a/src/main/java/fr/efreicraft/ecatup/commands/Chat.java +++ b/src/main/java/fr/efreicraft/ecatup/commands/Chat.java @@ -1,6 +1,5 @@ package fr.efreicraft.ecatup.commands; -import com.google.common.collect.Lists; import fr.efreicraft.ecatup.Main; import fr.efreicraft.ecatup.PreferenceCache; import org.bukkit.Bukkit; diff --git a/src/main/java/fr/efreicraft/ecatup/commands/Skull.java b/src/main/java/fr/efreicraft/ecatup/commands/Skull.java index eb39d69..e6263f1 100644 --- a/src/main/java/fr/efreicraft/ecatup/commands/Skull.java +++ b/src/main/java/fr/efreicraft/ecatup/commands/Skull.java @@ -14,10 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class Skull implements CommandExecutor, TabExecutor { @Override diff --git a/src/main/java/fr/efreicraft/ecatup/commands/WhoIs.java b/src/main/java/fr/efreicraft/ecatup/commands/WhoIs.java index 6aaba9c..1e72dd1 100644 --- a/src/main/java/fr/efreicraft/ecatup/commands/WhoIs.java +++ b/src/main/java/fr/efreicraft/ecatup/commands/WhoIs.java @@ -9,7 +9,6 @@ import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import net.luckperms.api.LuckPerms; -import net.luckperms.api.model.group.Group; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; @@ -18,10 +17,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import java.util.Collection; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - import static fr.efreicraft.ecatup.utils.Msg.colorize; public class WhoIs implements CommandExecutor { diff --git a/src/main/java/fr/efreicraft/ecatup/listeners/Join.java b/src/main/java/fr/efreicraft/ecatup/listeners/Join.java index c7f3671..934c013 100644 --- a/src/main/java/fr/efreicraft/ecatup/listeners/Join.java +++ b/src/main/java/fr/efreicraft/ecatup/listeners/Join.java @@ -1,8 +1,8 @@ package fr.efreicraft.ecatup.listeners; import fr.efreicraft.ecatup.Main; -import fr.efreicraft.ecatup.utils.DiscordWebhook; import fr.efreicraft.ecatup.PreferenceCache; +import fr.efreicraft.ecatup.utils.DiscordWebhook; import net.kyori.adventure.text.Component; import net.luckperms.api.LuckPerms; import net.luckperms.api.node.Node; diff --git a/src/main/java/fr/efreicraft/ecatup/listeners/Quit.java b/src/main/java/fr/efreicraft/ecatup/listeners/Quit.java index 9a218ce..bdbad7e 100644 --- a/src/main/java/fr/efreicraft/ecatup/listeners/Quit.java +++ b/src/main/java/fr/efreicraft/ecatup/listeners/Quit.java @@ -1,8 +1,8 @@ package fr.efreicraft.ecatup.listeners; import fr.efreicraft.ecatup.Main; -import fr.efreicraft.ecatup.utils.DiscordWebhook; import fr.efreicraft.ecatup.PreferenceCache; +import fr.efreicraft.ecatup.utils.DiscordWebhook; import net.kyori.adventure.text.Component; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; diff --git a/src/main/java/fr/efreicraft/ecatup/utils/DiscordWebhook.java b/src/main/java/fr/efreicraft/ecatup/utils/DiscordWebhook.java index af26cca..1080ba0 100644 --- a/src/main/java/fr/efreicraft/ecatup/utils/DiscordWebhook.java +++ b/src/main/java/fr/efreicraft/ecatup/utils/DiscordWebhook.java @@ -1,16 +1,13 @@ package fr.efreicraft.ecatup.utils; import javax.net.ssl.HttpsURLConnection; -import java.awt.Color; +import java.awt.*; import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.Array; import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * Class used to execute Discord Webhooks with low effort From d236b1db753b62490fce674efb899a27a9e9ac15 Mon Sep 17 00:00:00 2001 From: Niilyx _ Date: Fri, 28 Oct 2022 19:54:18 +0200 Subject: [PATCH 5/6] opti imports inutiles --- src/main/java/fr/efreicraft/ecatup/commands/Slap.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/fr/efreicraft/ecatup/commands/Slap.java b/src/main/java/fr/efreicraft/ecatup/commands/Slap.java index 321ca58..d94bf98 100644 --- a/src/main/java/fr/efreicraft/ecatup/commands/Slap.java +++ b/src/main/java/fr/efreicraft/ecatup/commands/Slap.java @@ -13,10 +13,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import static fr.efreicraft.ecatup.utils.Msg.colorize; From 5b5d9c75364ad5503b7535a8f55bbf5f26dadaf2 Mon Sep 17 00:00:00 2001 From: Niilyx _ Date: Fri, 28 Oct 2022 20:05:04 +0200 Subject: [PATCH 6/6] version stable --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fc4cdd5..8d8d798 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'fr.efreicraft' -version = '1.0.6-dev' +version = '1.0.6' compileJava.options.encoding "UTF-8"