Changement sur le Cube (stop command, une bulle = un cube) (#1227)

* one particuleTask for each Cube

* add stop command

* finalize

* orthograf

Author: iambibi

src/main/java/fr/openmc/core/features/cube/Cube.java

@@ -25,6 +25,8 @@
 // - iambibi_
 public class Cube extends MultiBlock {
     public BukkitTask corruptedBubbleTask;
+    public BukkitTask particuleBubbleTask;
+
     public ReproductionTask reproductionTask;
     public BossBar cubeBossBar;
     public boolean showBossBar;
@@ -199,15 +201,17 @@ public void startMagneticShock() {
         }
     }
 
-    public final int RADIUS_BUBBLE = this.radius * 3;
+    public final int RADIUS_BUBBLE = this.radius * 4;
 
     public void startCorruptedBubble() {
         Location center = this.getCenter();
 
-        int totalTicks = 20 * 3600;
+        int totalTicks = 20 * 1300;
 
         startBubbleParticles();
 
+        if (corruptedBubbleTask != null) corruptedBubbleTask.cancel();
+
         int intervalCorruption = 20 * 15;
         corruptedBubbleTask = new BukkitRunnable() {
             int elapsed = 0;
@@ -231,7 +235,7 @@ public void run() {
 
                     if (isPartOf(new Location(origin.getWorld(), x, y, z))) continue;
 
-                    Location loc = center.clone().add(x, y, z);
+                    Location loc = center.add(x, y, z);
                     Block block = loc.getBlock();
                     Material type = block.getType();
 
@@ -264,31 +268,36 @@ public void startBubbleParticles() {
         Location center = this.getCenter();
         double radius = RADIUS_BUBBLE;
 
-        Bukkit.getScheduler().runTaskTimer(OMCPlugin.getInstance(), () -> {
-            for (int i = 0; i < 50; i++) {
-                double theta = Math.random() * 2 * Math.PI;
-                double phi = Math.random() * Math.PI;
-                double x = radius * Math.sin(phi) * Math.cos(theta);
-                double y = radius * Math.cos(phi);
-                double z = radius * Math.sin(phi) * Math.sin(theta);
+        if (particuleBubbleTask != null) particuleBubbleTask.cancel();
 
-                Location particleLoc = center.clone().add(x, y, z);
-                world.spawnParticle(Particle.OMINOUS_SPAWNING, particleLoc, 1, 0.1, 0.1, 0.1, 0);
-            }
-
-            for (double theta = 0; theta < Math.PI; theta += Math.PI / 16) {
-                for (double phi = 0; phi < 2 * Math.PI; phi += Math.PI / 16) {
-                    double x = radius * Math.sin(theta) * Math.cos(phi);
-                    double y = radius * Math.cos(theta);
-                    double z = radius * Math.sin(theta) * Math.sin(phi);
+        particuleBubbleTask = new BukkitRunnable() {
+            @Override
+            public void run() {
+                for (int i = 0; i < 50; i++) {
+                    double theta = Math.random() * 2 * Math.PI;
+                    double phi = Math.random() * Math.PI;
+                    double x = radius * Math.sin(phi) * Math.cos(theta);
+                    double y = radius * Math.cos(phi);
+                    double z = radius * Math.sin(phi) * Math.sin(theta);
 
                     Location particleLoc = center.clone().add(x, y, z);
+                    world.spawnParticle(Particle.OMINOUS_SPAWNING, particleLoc, 1, 0.1, 0.1, 0.1, 0);
+                }
 
-                    Vector dir = center.clone().subtract(particleLoc).toVector().normalize();
-                    world.spawnParticle(Particle.SNEEZE, particleLoc, 1, dir.getX(), dir.getY(), dir.getZ(), 0.1);
+                for (double theta = 0; theta < Math.PI; theta += Math.PI / 16) {
+                    for (double phi = 0; phi < 2 * Math.PI; phi += Math.PI / 16) {
+                        double x = radius * Math.sin(theta) * Math.cos(phi);
+                        double y = radius * Math.cos(theta);
+                        double z = radius * Math.sin(theta) * Math.sin(phi);
+
+                        Location particleLoc = center.clone().add(x, y, z);
+
+                        Vector dir = center.clone().subtract(particleLoc).toVector().normalize();
+                        world.spawnParticle(Particle.SNEEZE, particleLoc, 1, dir.getX(), dir.getY(), dir.getZ(), 0.1);
+                    }
                 }
             }
-        }, 0L, 20L);
+        }.runTaskTimer(OMCPlugin.getInstance(), 0L, 20L);
     }
 
     public void startReproduction() {
@@ -345,14 +354,13 @@ public void startEventsCycle() {
             public void run() {
                 double roll = ThreadLocalRandom.current().nextDouble();
 
-                if (roll < 0.5) {
+                if (roll < 0.7) {
                     startMagneticShock();
                 } else {
-                    if (corruptedBubbleTask == null)
-                        startCorruptedBubble();
+                    startCorruptedBubble();
                 }
             }
-        }.runTaskTimer(OMCPlugin.getInstance(), 20L * 60 * 5, 20L * 60 * 20);
+        }.runTaskTimer(OMCPlugin.getInstance(), 20L * 60 * 5, 20L * 60 * 10);
     }
 
     public void startSoundCycle() {

src/main/java/fr/openmc/core/features/cube/CubeCommands.java

@@ -47,6 +47,41 @@ public void startCorruptedBubble(
         MessagesManager.sendMessage(player, Component.text("Bulle corrompue lancé"), Prefix.STAFF, MessageType.SUCCESS, false);
     }
 
+    @Subcommand("stopShock")
+    @CommandPermission("omc.admins.commands.cube.shock")
+    public void stopShock(
+            Player player,
+            @Named("cubeLoc") @SuggestWith(CubeLocationAutoComplete.class) String cubeLoc
+    ) {
+        Cube cube = getInputCubes(player, cubeLoc);
+
+        if (cube == null) return;
+
+        MessagesManager.sendMessage(player, Component.text("Choc éléctro-magnétique arreté"), Prefix.STAFF, MessageType.SUCCESS, false);
+    }
+
+    @Subcommand("stopBubble")
+    @CommandPermission("omc.admins.commands.cube.bubble")
+    public void stopCorruptedBubble(
+            Player player,
+            @Named("cubeLoc") @SuggestWith(CubeLocationAutoComplete.class) String cubeLoc
+    ) {
+        Cube cube = getInputCubes(player, cubeLoc);
+
+        if (cube == null) return;
+
+        if (cube.particuleBubbleTask != null) {
+            cube.particuleBubbleTask.cancel();
+            cube.particuleBubbleTask = null;
+        }
+
+        if (cube.corruptedBubbleTask != null) {
+            cube.corruptedBubbleTask.cancel();
+            cube.corruptedBubbleTask = null;
+        }
+        MessagesManager.sendMessage(player, Component.text("Bulle corrompue arreté"), Prefix.STAFF, MessageType.SUCCESS, false);
+    }
+
     @Subcommand("reproduce")
     @CommandPermission("omc.admins.commands.cube.reproduce")
     public void reproduceCube(

src/main/java/fr/openmc/core/features/cube/ReproductionTask.java

@@ -40,6 +40,10 @@ public void run() {
             world.playSound(babyOrigin, Sound.ENTITY_ENDER_DRAGON_GROWL, 0.3f, 0.2f);
             world.spawnParticle(Particle.EXPLOSION_EMITTER, babyCube.getCenter(), 3, 1, 1, 1, 0);
 
+            for (int i = 0; i <= 10; i++) {
+                world.strikeLightningEffect(babyCube.getCenter());
+            }
+
             MultiBlockManager.register(babyCube);
             cancel();
             parent.reproductionTask = null;

src/main/java/fr/openmc/core/features/friend/FriendCommand.java

@@ -164,7 +164,7 @@ public void listCommand(
                                     .color(isOnline ? NamedTextColor.GREEN : NamedTextColor.YELLOW)
                                     .decoration(TextDecoration.BOLD, isOnline))
                             .hoverEvent(HoverEvent.showText(
-                                    Component.text("§7Vile : §e" + (city != null ? city.getName() : "Aucune") +
+                                    Component.text("§7Ville : §e" + (city != null ? city.getName() : "Aucune") +
                                             "\n§7Argent : §e" + formattedMoney +
                                             "\n§7Statut : " + (isOnline ? "§aEn ligne" : "§cHors ligne")
                                     )))