Ajout de SFX (détails) dans la feature des rêves (clone npc, particle when enter/leave, ...)

.github/workflows/milestone-close.yml

@@ -58,10 +58,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
 
       - name: Deploy to server
-        uses: rexlmanu/pterodactyl-upload-action@v2.4
+        uses: blobles-dev/pterodactyl-upload-action@pterodactyl-file-upload-modification-allow-http-200-fileupload
         with:
           panel-host: ${{ secrets.PANEL_HOST }}
           api-key: ${{ secrets.API_KEY }}
           server-id: ${{ secrets.SERVER_ID }}
           source: builds/OpenMC.jar
-          target: "./plugins/OpenMC.jar"
+          target: "./plugins/update/"

src/main/java/fr/openmc/api/hooks/FancyNpcsHook.java

@@ -7,6 +7,8 @@ public class FancyNpcsHook {
     @Getter
     private static boolean hasFancyNpc = false;
 
+    public static long FANCY_INIT_DELAY = 20L * 30; // 30 seconds
+
     public static void init() {
         hasFancyNpc = Bukkit.getPluginManager().isPluginEnabled("FancyNpcs");
     }

src/main/java/fr/openmc/core/features/city/view/CityViewManager.java

@@ -186,8 +186,8 @@ private static void showChunkBorders(@NotNull Player player, @NotNull ChunkPos c
         particleLocations.forEach(location ->
                 ParticleUtils.sendParticlePacket(
                         player,
-                        location,
                         particle,
+                        location,
                         1,
                         0D, 0D, 0D,
                         0D,

src/main/java/fr/openmc/core/features/dream/DreamManager.java

@@ -18,17 +18,15 @@
 import fr.openmc.core.features.dream.generation.listeners.CloudStructureDispenserListener;
 import fr.openmc.core.features.dream.generation.listeners.ReplaceBlockListener;
 import fr.openmc.core.features.dream.generation.structures.DreamStructuresManager;
-import fr.openmc.core.features.dream.listeners.biomes.PlayerEnteredBiome;
 import fr.openmc.core.features.dream.listeners.dream.*;
-import fr.openmc.core.features.dream.listeners.orb.PlayerObtainOrb;
-import fr.openmc.core.features.dream.listeners.others.CraftingConvertorListener;
-import fr.openmc.core.features.dream.listeners.others.PlayerEatSomnifere;
-import fr.openmc.core.features.dream.listeners.others.SingularityCraftListener;
+import fr.openmc.core.features.dream.listeners.registry.CraftingConvertorListener;
 import fr.openmc.core.features.dream.listeners.registry.DreamItemEquipListener;
 import fr.openmc.core.features.dream.mecanism.cloudfishing.CloudFishingManager;
 import fr.openmc.core.features.dream.mecanism.cold.ColdManager;
 import fr.openmc.core.features.dream.mecanism.metaldetector.MetalDetectorManager;
 import fr.openmc.core.features.dream.mecanism.rng.DreamLootListener;
+import fr.openmc.core.features.dream.mecanism.sfx.PlayerCloneNpc;
+import fr.openmc.core.features.dream.mecanism.singularity.SingularityCraftListener;
 import fr.openmc.core.features.dream.mecanism.singularity.SingularityManager;
 import fr.openmc.core.features.dream.mecanism.tradernpc.GlaciteNpcManager;
 import fr.openmc.core.features.dream.models.db.DBDreamPlayer;
@@ -43,7 +41,6 @@
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
@@ -90,6 +87,7 @@ public static void init() {
         // ** MANAGERS **
         DreamDimensionManager.init();
         GlaciteNpcManager.init();
+        PlayerCloneNpc.init();
         DreamStructuresManager.init();
         DreamItemRegistry.init();
         DreamLootTableRegistry.init();

src/main/java/fr/openmc/core/features/dream/commands/AdminDreamCommands.java

@@ -2,7 +2,7 @@
 
 import fr.openmc.core.commands.autocomplete.OnlinePlayerAutoComplete;
 import fr.openmc.core.features.dream.DreamManager;
-import fr.openmc.core.features.dream.listeners.orb.PlayerObtainOrb;
+import fr.openmc.core.features.dream.listeners.dream.PlayerObtainOrb;
 import fr.openmc.core.features.dream.models.db.DBDreamPlayer;
 import fr.openmc.core.features.dream.models.db.DreamPlayer;
 import org.bukkit.entity.Player;

src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerChangeWorldListener.java

@@ -1,14 +1,20 @@
 package fr.openmc.core.features.dream.listeners.dream;
 
+import fr.openmc.core.OMCPlugin;
 import fr.openmc.core.features.displays.bossbar.BossbarManager;
 import fr.openmc.core.features.displays.bossbar.BossbarsType;
 import fr.openmc.core.features.dream.DreamManager;
 import fr.openmc.core.features.dream.DreamUtils;
 import fr.openmc.core.features.dream.displays.DreamBossBar;
+import fr.openmc.core.features.dream.mecanism.sfx.PlayerCloneNpc;
 import fr.openmc.core.features.dream.models.db.DreamPlayer;
+import fr.openmc.core.utils.ParticleUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Particle;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Pose;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -44,6 +50,13 @@ public void onDreamEntrered(PlayerTeleportEvent event) {
         AttributeInstance inst = player.getAttribute(Attribute.MAX_HEALTH);
         if (inst == null) return;
         player.setHealth(inst.getBaseValue());
+
+        // * SFX
+        sendSFX(player);
+        if (PlayerCloneNpc.getCloneNpc(player) == null)
+            PlayerCloneNpc.createCloneNpc(player, player.getLocation(), Pose.SITTING);
+        Bukkit.getScheduler().runTaskLater(OMCPlugin.getInstance(), () ->
+                sendSFX(player), 20);
     }
 
     @EventHandler
@@ -62,5 +75,16 @@ public void onDreamLeave(PlayerTeleportEvent event) {
         BossbarManager.removeBossBar(BossbarsType.DREAM, player);
 
         DreamManager.removeDreamPlayer(player, event.getFrom());
+
+        // * SFX
+        sendSFX(player);
+        Bukkit.getScheduler().runTaskLater(OMCPlugin.getInstance(), () ->
+            sendSFX(player), 20);
+    }
+
+    private void sendSFX(Player player) {
+        // * SFX
+        ParticleUtils.sendParticlePacket(Particle.FLASH, player.getLocation().add(0, 1, 0), 15);
+        ParticleUtils.spawnDispersingParticles(player.getLocation(), Particle.REVERSE_PORTAL, 20, 15, 1, null);
     }
 }

src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDreamTimeEndListener.java

@@ -2,6 +2,7 @@
 
 import fr.openmc.core.features.dream.DreamManager;
 import fr.openmc.core.features.dream.events.DreamEndEvent;
+import fr.openmc.core.features.dream.mecanism.sfx.PlayerCloneNpc;
 import fr.openmc.core.features.dream.models.db.DreamPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -13,6 +14,7 @@ public class PlayerDreamTimeEndListener implements Listener {
     public void onTimeEnd(DreamEndEvent event) {
         Player player = event.getPlayer();
 
+        PlayerCloneNpc.deleteCloneNpc(player);
         DreamPlayer dreamPlayer = DreamManager.getDreamPlayer(player);
 
         if (dreamPlayer == null) return;

src/main/java/fr/openmc/core/features/dream/listeners/others/PlayerEatSomnifere.java → src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerEatSomnifere.java

@@ -1,4 +1,4 @@
-package fr.openmc.core.features.dream.listeners.others;
+package fr.openmc.core.features.dream.listeners.dream;
 
 import fr.openmc.core.features.dream.DreamManager;
 import fr.openmc.core.features.dream.DreamUtils;

src/main/java/fr/openmc/core/features/dream/listeners/biomes/PlayerEnteredBiome.java → src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerEnteredBiome.java

@@ -1,4 +1,4 @@
-package fr.openmc.core.features.dream.listeners.biomes;
+package fr.openmc.core.features.dream.listeners.dream;
 
 import fr.openmc.core.OMCPlugin;
 import fr.openmc.core.features.dream.DreamManager;
@@ -103,8 +103,8 @@ private void applyFog(Player player) {
     private void spawnParticles(Player player) {
         ParticleUtils.sendParticlePacket(
                 player,
-                player.getLocation(),
                 Particle.CLOUD,
+                player.getLocation(),
                 100, 1.0, 1.0, 1.0, 0.1, null
         );
     }

src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerFoodChangeListener.java

@@ -2,7 +2,6 @@
 
 import fr.openmc.core.features.dream.DreamManager;
 import fr.openmc.core.features.dream.DreamUtils;
-import fr.openmc.core.features.dream.listeners.orb.PlayerObtainOrb;
 import fr.openmc.core.features.dream.models.db.DBDreamPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/fr/openmc/core/features/dream/listeners/orb/PlayerObtainOrb.java → src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerObtainOrb.java

@@ -1,8 +1,7 @@
-package fr.openmc.core.features.dream.listeners.orb;
+package fr.openmc.core.features.dream.listeners.dream;
 
 import fr.openmc.core.OMCPlugin;
 import fr.openmc.core.features.dream.DreamManager;
-import fr.openmc.core.features.dream.DreamUtils;
 import fr.openmc.core.features.dream.events.GlaciteTradeEvent;
 import fr.openmc.core.features.dream.events.MetalDetectorLootEvent;
 import fr.openmc.core.features.dream.generation.DreamBiome;
@@ -12,19 +11,18 @@
 import fr.openmc.core.features.dream.models.db.DreamPlayer;
 import fr.openmc.core.features.dream.models.registry.items.DreamItem;
 import fr.openmc.core.features.dream.registries.DreamItemRegistry;
+import fr.openmc.core.utils.ParticleUtils;
 import fr.openmc.core.utils.messages.MessageType;
 import fr.openmc.core.utils.messages.MessagesManager;
 import fr.openmc.core.utils.messages.Prefix;
 import net.kyori.adventure.text.Component;
-import org.bukkit.Keyed;
-import org.bukkit.NamespacedKey;
+import org.bukkit.Particle;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
-import org.bukkit.event.inventory.PrepareItemCraftEvent;
+import org.bukkit.event.inventory.CraftItemEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.Recipe;
 
 public class PlayerObtainOrb implements Listener {
     private final int SCULK_PLAINS_ORB = 1;
@@ -34,20 +32,21 @@ public class PlayerObtainOrb implements Listener {
     private final int GLACITE_GROTTO_ORB = 5;
 
     @EventHandler
-    public void onCraft(PrepareItemCraftEvent event) {
-        Recipe recipe = event.getRecipe();
-        if (recipe == null) return;
-        if (event.getViewers().isEmpty()) return;
+    public void onCraft(CraftItemEvent event) {
+        ItemStack item = event.getCurrentItem();
+        if (item == null) return;
 
-        Player player = (Player) event.getViewers().getFirst();
+        DreamItem dreamItem = DreamItemRegistry.getByItemStack(item);
+        if (dreamItem == null) return;
+        if (!(event.getWhoClicked() instanceof Player player)) return;
 
-        if (!DreamUtils.isInDream(player)) return;
-        if (!(recipe instanceof Keyed keyed)) return;
+        if (!dreamItem.getName().equals("omc_dream:domination_orb")) return;
 
-        NamespacedKey key = keyed.getKey();
-        if (key.toString().contains("omc_dream") && key.toString().contains("domination_orb")) { // contains beacuse key is ex zzzfake_omc_items:aywenite
-            setProgressionOrb(player, SCULK_PLAINS_ORB, DreamBiome.SOUL_FOREST);
-        }
+        setProgressionOrb(player, SCULK_PLAINS_ORB, DreamBiome.SOUL_FOREST);
+
+        // * SFX
+        player.getWorld().playSound(player.getLocation(), "minecraft:entity.wither.spawn", 1f, 2f);
+        ParticleUtils.spawnDispersingParticles(player.getLocation(), Particle.TRIAL_SPAWNER_DETECTION, 15, 15, 0.5,  null);
     }
 
     @EventHandler
@@ -60,6 +59,10 @@ public void onAltarCraft(AltarCraftingEvent event) {
         Player player = event.getPlayer();
 
         setProgressionOrb(player, SOUL_FOREST_ORB, DreamBiome.CLOUD_LAND);
+
+        // * SFX
+        player.getWorld().playSound(player.getLocation(), "minecraft:entity.wither.spawn", 1f, 2f);
+        ParticleUtils.spawnDispersingParticles(player.getLocation(), Particle.SCULK_SOUL, 15, 15, 0.5,  null);
     }
 
     @EventHandler
@@ -73,6 +76,10 @@ public void onCloudOrbDispense(EntityPickupItemEvent event) {
         if (!dreamItem.getName().equals("omc_dream:cloud_orb")) return;
 
         setProgressionOrb(player, CLOUD_CASTLE_ORB, DreamBiome.MUD_BEACH);
+
+        // * SFX
+        player.getWorld().playSound(player.getLocation(), "minecraft:entity.wither.spawn", 1f, 2f);
+        ParticleUtils.spawnDispersingParticles(player.getLocation(), Particle.GUST, 15, 15, 0.5,  null);
     }
 
     @EventHandler
@@ -86,6 +93,10 @@ public void onMetalDetectorLoot(MetalDetectorLootEvent event) {
             if (!dreamItem.getName().equals("omc_dream:mud_orb")) continue;
 
             setProgressionOrb(player, MUD_BEACH_ORB, DreamBiome.GLACITE_GROTTO);
+
+            // * SFX
+            player.getWorld().playSound(player.getLocation(), "minecraft:entity.wither.spawn", 1f, 2f);
+            ParticleUtils.spawnDispersingParticles(player.getLocation(), Particle.ASH, 15, 15, 0.5,  null);
             break;
         }
     }
@@ -97,6 +108,10 @@ public void onGlaciteTrade(GlaciteTradeEvent event) {
         if (!event.getTrade().equals(GlaciteTrade.ORB_GLACITE)) return;
 
         setProgressionOrb(player, GLACITE_GROTTO_ORB, null);
+
+        // * SFX
+        player.getWorld().playSound(player.getLocation(), "minecraft:entity.wither.spawn", 1f, 2f);
+        ParticleUtils.spawnDispersingParticles(player.getLocation(), Particle.SNOWFLAKE, 15, 15, 0.5,  null);
     }
 
     public static void setProgressionOrb(Player player, int progressionOrb, DreamBiome unlocked) {
@@ -122,6 +137,21 @@ public static void setProgressionOrb(Player player, int progressionOrb, DreamBio
         DreamManager.saveDreamPlayerData(cache);
         if (unlocked != null)
             sendMessageProgression(player, unlocked);
+        sendBroadcastMessageOrb(player, progressionOrb);
+    }
+
+    private static void sendBroadcastMessageOrb(Player player, int progressionOrb) {
+        String strOrb;
+        switch (progressionOrb) {
+            case 1 -> strOrb = "l'Orbe de Domination";
+            case 2 -> strOrb = "l'Orbe des Ames";
+            case 3 -> strOrb = "l'Orbe des Nuages";
+            case 4 -> strOrb = "l'Orbe de Boue";
+            case 5 -> strOrb = "l'Orbe Glaciale";
+            default -> strOrb = "une Orbe Inconnu";
+        }
+
+        MessagesManager.broadcastMessage(player.getWorld(), Component.text(player.getName() + " a obtenu " + strOrb + " !"), Prefix.DREAM, MessageType.INFO);
     }
 
     private static void sendMessageProgression(Player player, DreamBiome biome) {

src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerQuitListener.java

@@ -2,6 +2,7 @@
 
 import fr.openmc.core.features.dream.DreamManager;
 import fr.openmc.core.features.dream.DreamUtils;
+import fr.openmc.core.features.dream.mecanism.sfx.PlayerCloneNpc;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -16,6 +17,8 @@ public void onPlayerQuitWhenDream(PlayerQuitEvent event) {
 
         if (!DreamUtils.isInDream(player)) return;
 
+        if (PlayerCloneNpc.getCloneNpc(player) != null)
+            PlayerCloneNpc.deleteCloneNpc(player);
         DreamManager.removeDreamPlayer(player, player.getLocation());
     }
 }

src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerSleepListener.java

@@ -2,9 +2,11 @@
 
 import fr.openmc.core.OMCPlugin;
 import fr.openmc.core.features.dream.DreamManager;
+import fr.openmc.core.features.dream.mecanism.sfx.PlayerCloneNpc;
 import fr.openmc.core.features.dream.models.db.DBDreamPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Pose;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerBedEnterEvent;
@@ -25,7 +27,7 @@ public class PlayerSleepListener implements Listener {
 
     private final Set<Player> isPlayerSleeping = new HashSet<>();
     private final int DREAM_TELEPORT_DELAY = 20 * 3;
-  
+
     @EventHandler
     public void onPlayerEnterBed(PlayerBedEnterEvent event) {
         Player player = event.getPlayer();
@@ -60,6 +62,7 @@ public void onNightSkip(TimeSkipEvent event) {
                     new BukkitRunnable() {
                         @Override
                         public void run() {
+                            PlayerCloneNpc.createCloneNpc(player, player.getLocation(), Pose.SLEEPING);
                             DBDreamPlayer dbDreamPlayer = DreamManager.getCacheDreamPlayer(player);
                             if(dbDreamPlayer ==null||(dbDreamPlayer.getDreamX()==null||dbDreamPlayer.getDreamY()==null||dbDreamPlayer.getDreamZ()==null)) {
                                 DreamManager.tpPlayerDream(player);

src/main/java/fr/openmc/core/features/dream/listeners/others/CraftingConvertorListener.java → src/main/java/fr/openmc/core/features/dream/listeners/registry/CraftingConvertorListener.java

@@ -1,4 +1,4 @@
-package fr.openmc.core.features.dream.listeners.others;
+package fr.openmc.core.features.dream.listeners.registry;
 
 import fr.openmc.core.features.dream.DreamUtils;
 import fr.openmc.core.features.dream.models.registry.items.DreamItem;