Ajout d'un cooldown de téléportation lors d'un combat

build.gradle

@@ -133,6 +133,69 @@ tasks.shadowJar {
     relocate("revxrsal.commands", "fr.openmc.shaded.revxrsal.commands")
     relocate("com.j256.ormlite", "fr.openmc.shaded.com.j256.ormlite")
 }
+def serverJar = file("run/paper.jar")
+def paperUrl = "https://fill-data.papermc.io/v1/objects/8600cc3b91ea38d7e836d562550b31d0fa3ed785d14dffc1a6d9dc1d36c21fa5/paper-26.2-56.jar"
+
+tasks.register("runDevServer") {
+    dependsOn shadowJar
+
+    doLast {
+        mkdir("run")
+        mkdir("run/plugins")
+
+        if (!serverJar.exists()) {
+            println("Téléchargement de Paper...")
+
+            new URL(paperUrl).withInputStream { input ->
+                serverJar.withOutputStream { output ->
+                    output << input
+                }
+            }
+        }
+
+        copy {
+            from shadowJar.archiveFile
+            into "run/plugins"
+            rename { "OpenMC.jar" }
+        }
+
+        def javaExe = javaToolchains.launcherFor {
+            languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+        }.get().executablePath.asFile.absolutePath
+
+        def process = new ProcessBuilder(
+                javaExe,
+                "-Xms2G",
+                "-Xmx2G",
+                "-jar",
+                serverJar.name,
+                "--nogui"
+        )
+                .directory(file("run"))
+                .redirectErrorStream(true)
+                .start()
+
+            Thread.start {
+            process.inputStream.eachLine {
+                println(it)
+            }
+        }
+
+        Thread.start {
+            def writer = new BufferedWriter(new OutputStreamWriter(process.outputStream))
+            System.in.withReader { reader ->
+                String line
+                while ((line = reader.readLine()) != null) {
+                    writer.write(line)
+                    writer.newLine()
+                    writer.flush()
+                }
+            }
+        }
+
+        process.waitFor()
+    }
+}
 
 tasks.test {
     useJUnitPlatform()

src/main/java/fr/openmc/core/ListenersManager.java

@@ -2,9 +2,24 @@
 
 import fr.openmc.api.input.ChatInput;
 import fr.openmc.api.input.location.ItemInteraction;
+import fr.openmc.core.features.combat.CombatCooldownListener;
 import fr.openmc.core.features.itemsadder.SpawnerExtractorListener;
 import fr.openmc.core.hooks.itemsadder.ItemsAdderHook;
-import fr.openmc.core.listeners.*;
+import fr.openmc.core.listeners.ArmorListener;
+import fr.openmc.core.listeners.AsyncChatListener;
+import fr.openmc.core.listeners.BlockBreakListener;
+import fr.openmc.core.listeners.BlockPlaceListener;
+import fr.openmc.core.listeners.ChronometerListener;
+import fr.openmc.core.listeners.ClockInfos;
+import fr.openmc.core.listeners.EquipableItemListener;
+import fr.openmc.core.listeners.HappyGhastListener;
+import fr.openmc.core.listeners.InteractListener;
+import fr.openmc.core.listeners.ItemsAddersListener;
+import fr.openmc.core.listeners.JoinQuitMessageListener;
+import fr.openmc.core.listeners.NoMoreRabbit;
+import fr.openmc.core.listeners.PlayerDeathListener;
+import fr.openmc.core.listeners.SessionsListener;
+import fr.openmc.core.listeners.SleepListener;
 import fr.openmc.core.registry.ambient.listeners.AmbientWeatherListener;
 import fr.openmc.core.registry.ambient.listeners.BiomesOnChunkLoad;
 import fr.openmc.core.registry.ambient.listeners.CustomAmbientListener;
@@ -24,6 +39,7 @@ public class ListenersManager {
     public static void init() {
         registerEvents(
                 new HappyGhastListener(),
+                new CombatCooldownListener(),
                 new SessionsListener(),
                 new JoinQuitMessageListener(),
                 new ClockInfos(),

src/main/java/fr/openmc/core/commands/utils/RTPCommands.java

@@ -115,7 +115,9 @@ private boolean isSafe(Location loc) {
     }
 
     private void tpPlayer(Player player, Location loc) {
-        PlayerUtils.sendFadeTitleTeleport(player, loc);
+        if (!PlayerUtils.sendFadeTitleTeleport(player, loc)) {
+            return;
+        }
         MessagesManager.sendMessage(player, TranslationManager.translation("command.utils.rtp.success",
                         Component.text(loc.getBlockX()).color(YELLOW),
                         Component.text(loc.getBlockY()).color(YELLOW),

src/main/java/fr/openmc/core/commands/utils/Spawn.java

@@ -11,7 +11,11 @@
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import revxrsal.commands.annotation.*;
+import revxrsal.commands.annotation.Command;
+import revxrsal.commands.annotation.Description;
+import revxrsal.commands.annotation.Named;
+import revxrsal.commands.annotation.Optional;
+import revxrsal.commands.annotation.SuggestWith;
 import revxrsal.commands.bukkit.annotation.CommandPermission;
 
 public class Spawn {
@@ -27,12 +31,16 @@ public void spawn(
         Location spawnLocation = SpawnManager.getSpawnLocation();
 
         if (sender instanceof Player player && (target == null || player.getUniqueId().equals(target.getUniqueId()))) {
-            PlayerUtils.sendFadeTitleTeleport(player, spawnLocation);
+            if (!PlayerUtils.sendFadeTitleTeleport(player, spawnLocation)) {
+                return;
+            }
             MessagesManager.sendMessage(player, TranslationManager.translation("command.utils.spawn.got_sent"),
                     Prefix.OPENMC, MessageType.SUCCESS, true);
         } else {
             if(!(sender instanceof Player) || sender.hasPermission("omc.admin.commands.spawn.others")) {
-                PlayerUtils.sendFadeTitleTeleport(target, spawnLocation);
+                if (!PlayerUtils.sendFadeTitleTeleport(target, spawnLocation)) {
+                    return;
+                }
                 MessagesManager.sendMessage(sender, TranslationManager.translation("command.utils.spawn.have_sent",
                         Component.text(target.getName()).color(NamedTextColor.YELLOW)), Prefix.OPENMC, MessageType.SUCCESS, true);
                 MessagesManager.sendMessage(target, TranslationManager.translation("command.utils.spawn.have_sent_by",

src/main/java/fr/openmc/core/features/combat/CombatCooldownListener.java

@@ -0,0 +1,33 @@
+package fr.openmc.core.features.combat;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+public final class CombatCooldownListener implements Listener {
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerHit(EntityDamageByEntityEvent event) {
+        if (!(event.getEntity() instanceof Player player)) {
+            return;
+        }
+
+        if (!(event.getDamager() instanceof Player)) {
+            return;
+        }
+
+        if (event.getFinalDamage() <= 0) {
+            return;
+        }
+
+        CombatCooldownManager.recordHit(player.getUniqueId());
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        CombatCooldownManager.clear(event.getPlayer().getUniqueId());
+    }
+}

src/main/java/fr/openmc/core/features/combat/CombatCooldownManager.java

@@ -0,0 +1,37 @@
+package fr.openmc.core.features.combat;
+
+import java.time.Duration;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class CombatCooldownManager {
+
+    private static final long COMBAT_COOLDOWN_MILLIS = Duration.ofSeconds(10).toMillis();
+    private static final ConcurrentHashMap<UUID, Long> LAST_HIT_TIMES = new ConcurrentHashMap<>();
+
+    private CombatCooldownManager() {
+    }
+
+    public static void recordHit(UUID playerId) {
+        LAST_HIT_TIMES.put(playerId, System.currentTimeMillis());
+    }
+
+    public static long getRemainingSeconds(UUID playerId) {
+        Long lastHitTime = LAST_HIT_TIMES.get(playerId);
+        if (lastHitTime == null) {
+            return 0;
+        }
+
+        long remainingMillis = lastHitTime + COMBAT_COOLDOWN_MILLIS - System.currentTimeMillis();
+        if (remainingMillis <= 0) {
+            LAST_HIT_TIMES.remove(playerId, lastHitTime);
+            return 0;
+        }
+
+        return Math.ceilDiv(remainingMillis, 1000L);
+    }
+
+    public static void clear(UUID playerId) {
+        LAST_HIT_TIMES.remove(playerId);
+    }
+}

src/main/java/fr/openmc/core/features/homes/command/TpHomeCommand.java

@@ -18,7 +18,11 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
-import revxrsal.commands.annotation.*;
+import revxrsal.commands.annotation.Command;
+import revxrsal.commands.annotation.Description;
+import revxrsal.commands.annotation.Named;
+import revxrsal.commands.annotation.Optional;
+import revxrsal.commands.annotation.SuggestWith;
 import revxrsal.commands.bukkit.annotation.CommandPermission;
 
 import java.util.List;
@@ -59,7 +63,9 @@ public static void home(
 
             for(Home h : homes) {
                 if (h.getName().equalsIgnoreCase(split[1])) {
-                    PlayerUtils.sendFadeTitleTeleport(player, h.getLocation());
+                    if (!PlayerUtils.sendFadeTitleTeleport(player, h.getLocation())) {
+                        return;
+                    }
                     new BukkitRunnable() {
                         @Override
                         public void run() {
@@ -100,7 +106,9 @@ public void run() {
 
         for(Home h : homes) {
             if(h.getName().equalsIgnoreCase(home)) {
-                PlayerUtils.sendFadeTitleTeleport(player, h.getLocation());
+                if (!PlayerUtils.sendFadeTitleTeleport(player, h.getLocation())) {
+                    return;
+                }
                 new BukkitRunnable() {
                     @Override
                     public void run() {

src/main/java/fr/openmc/core/features/homes/menu/HomeMenu.java

@@ -13,6 +13,7 @@
 import fr.openmc.core.features.homes.icons.HomeIcon;
 import fr.openmc.core.features.homes.icons.HomeIconRegistry;
 import fr.openmc.core.features.homes.models.Home;
+import fr.openmc.core.utils.bukkit.PlayerUtils;
 import fr.openmc.core.utils.text.messages.MessageType;
 import fr.openmc.core.utils.text.messages.MessagesManager;
 import fr.openmc.core.utils.text.messages.Prefix;
@@ -107,24 +108,25 @@ public List<ItemStack> getItems() {
                 }).hide(ItemUtils.getDataComponentType()).setOnClick(event -> {
                     if(event.isLeftClick()) {
                         this.getInventory().close();
-                        getOwner().teleportAsync(home.getLocation()).thenAccept(success -> {
-                            new BukkitRunnable() {
-                                @Override
-                                public void run() {
-                                    Bukkit.getPluginManager().callEvent(new HomeTpEvent(home, getOwner()));
-                                }
-                            }.runTask(OMCPlugin.getInstance());
-                            MessagesManager.sendMessage(
-                                    getOwner(),
-                                    TranslationManager.translation(
-                                            "feature.homes.menu.teleport.success",
-                                            Component.text(home.getName()).color(NamedTextColor.YELLOW)
-                                    ),
-                                    Prefix.HOME,
-                                    MessageType.SUCCESS,
-                                    true
-                            );
-                        });
+                        if (!PlayerUtils.sendFadeTitleTeleport(getOwner(), home.getLocation())) {
+                            return;
+                        }
+                        new BukkitRunnable() {
+                            @Override
+                            public void run() {
+                                Bukkit.getPluginManager().callEvent(new HomeTpEvent(home, getOwner()));
+                            }
+                        }.runTask(OMCPlugin.getInstance());
+                        MessagesManager.sendMessage(
+                                getOwner(),
+                                TranslationManager.translation(
+                                        "feature.homes.menu.teleport.success",
+                                        Component.text(home.getName()).color(NamedTextColor.YELLOW)
+                                ),
+                                Prefix.HOME,
+                                MessageType.SUCCESS,
+                                true
+                        );
                     } else if(event.isRightClick()) {
                         Player player = (Player) event.getWhoClicked();
                         new HomeConfigMenu(player, home).open();