Deleted DomeShieldEffect and added half sphere parameters to the SphereEffect

Author: Emafire003

src/main/java/me/emafire003/dev/particleanimationlib/commands/PALDebugCommand.java

@@ -3,23 +3,18 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.tree.LiteralCommandNode;
-import me.emafire003.dev.particleanimationlib.effects.ConeEffect;
-import me.emafire003.dev.particleanimationlib.effects.CuboidEffect;
+import me.emafire003.dev.particleanimationlib.ParticleAnimationLib;
 import me.emafire003.dev.particleanimationlib.effects.TextEffect;
-import me.emafire003.dev.particleanimationlib.effects.image.BaseImageEffect;
-import me.emafire003.dev.particleanimationlib.effects.image.ColoredImageEffect;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.command.argument.EntityArgumentType;
 import net.minecraft.entity.Entity;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
 
 import java.awt.*;
 import java.util.Collection;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class PALDebugCommand implements PALCommand {
 
@@ -40,17 +35,31 @@ private int particleEffect(CommandContext<ServerCommandSource> context) throws C
                     return 0;
                 }
 
-                TextEffect textEffect = new TextEffect(source.getWorld(), ParticleTypes.ELECTRIC_SPARK, target.getPos(), target.getHeadYaw(), target.getPitch(), "Hello world", false, 1, 1, (float) 1 / 10, true, new Font("Times New Roman", Font.PLAIN, 16));
+                /*TextEffect textEffect = new TextEffect(source.getWorld(), ParticleTypes.ENCHANTED_HIT, target.getPos().add(0,2,0), target.getHeadYaw(), target.getPitch(), "Hello world", false, 1, 1, (float) 1 / 5, true, new Font("Courier New", Font.PLAIN, 13));
                 //textEffect.runFor(5);
                 textEffect.runFor(5, ((effect, current_tick) -> {
                     TextEffect instance = (TextEffect) effect;
                     instance.text = "hello world " + current_tick;
                     //instance.text = "hello world " + source.getPlayer().getRandom().nextBetween(0,10);
 
-                }));
+                }));*/
+                Font a = new Font("Tahoma", Font.PLAIN, 16);
 
-                ConeEffect coneEffect = ConeEffect.builder(source.getWorld(), ParticleTypes.WITCH, target.getPos()).build();
-                coneEffect.runFor(5);
+                //TODO niente lagga e si blocca se uso il builder
+                TextEffect textEffect1 = TextEffect.builder(source.getWorld(), ParticleTypes.EGG_CRACK, target.getPos()).text("\uD800\uDC06 Hello worldo \uD800\uDC06").font(new Font("Times New Roman", Font.PLAIN, 13)).build();
+                ParticleAnimationLib.LOGGER.info("The font: " + textEffect1.font);
+                ParticleAnimationLib.LOGGER.info("The scale: " + textEffect1.size);
+                //textEffect1.runFor(5);
+
+                TextEffect textEffect2 = TextEffect.builder(source.getWorld(), ParticleTypes.ENCHANTED_HIT, target.getPos()).build();
+                TextEffect.copy(textEffect1, textEffect2);
+                textEffect2.setFont(new Font("Verdana", Font.PLAIN, 13));
+                textEffect2.setParticle(ParticleTypes.ELECTRIC_SPARK);
+                textEffect2.setOriginPos(target.getPos().add(2,0,0));
+                //textEffect2.runFor(3);
+
+                /*ConeEffect coneEffect = ConeEffect.builder(source.getWorld(), ParticleTypes.WITCH, target.getPos()).build();
+                coneEffect.runFor(5);*/
 
                 /*CuboidEffect effect = CuboidEffect.builder(source.getWorld(), ParticleTypes.ELECTRIC_SPARK, source.getPosition().add(0,10,0)).build();
                 effect.runFor(5);*/

src/main/java/me/emafire003/dev/particleanimationlib/commands/SphereCommand.java

@@ -1,5 +1,6 @@
 package me.emafire003.dev.particleanimationlib.commands;
 
+import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.context.CommandContext;
@@ -28,7 +29,9 @@ private int spawnEffect(CommandContext<ServerCommandSource> context) throws Comm
                     IntegerArgumentType.getInteger(context, "count"),
                     DoubleArgumentType.getDouble(context, "radius"),
                     DoubleArgumentType.getDouble(context, "radiusIncrease"),
-                    IntegerArgumentType.getInteger(context, "particleIncrease")
+                    IntegerArgumentType.getInteger(context, "particleIncrease"),
+                    BoolArgumentType.getBool(context, "halfSphere"),
+                    BoolArgumentType.getBool(context, "invertHalfSphere")
             );
             effect.runFor(IntegerArgumentType.getInteger(context, "duration"));
 
@@ -49,8 +52,12 @@ public LiteralCommandNode<ServerCommandSource> getNode(CommandRegistryAccess reg
                                         .then(CommandManager.argument("radius", DoubleArgumentType.doubleArg(0))
                                                 .then(CommandManager.argument("radiusIncrease", DoubleArgumentType.doubleArg(0))
                                                         .then(CommandManager.argument("particleIncrease", IntegerArgumentType.integer(0))
-                                                                .then(CommandManager.argument("duration", IntegerArgumentType.integer(0))
-                                                                        .executes(this::spawnEffect)
+                                                                .then(CommandManager.argument("halfSphere", BoolArgumentType.bool())
+                                                                        .then(CommandManager.argument("invertHalfSphere", BoolArgumentType.bool())
+                                                                                .then(CommandManager.argument("duration", IntegerArgumentType.integer(0))
+                                                                                        .executes(this::spawnEffect)
+                                                                                )
+                                                                        )
                                                                 )
                                                         )
                                                 )

src/main/java/me/emafire003/dev/particleanimationlib/effects/DomeShieldEffect.java

@@ -28,8 +28,15 @@ public class SphereEffect extends Effect {
      */
     public double radiusIncrease = 0;
 
-    // Amount to increase the particles per tick
+    /** Amount to increase the particles per tick*/
     public int particleIncrease = 0;
+    
+    //TODO new stuff
+    /**Should it display as an half sphere?*/
+    public boolean halfSphere = false;
+    
+    /**If it is an half sphere, should it be inverted the other way around? Like upside down*/
+    public boolean invertHalfSphere = false;
 
     /**
      * Creates a new sphere effect.
@@ -41,13 +48,17 @@ public class SphereEffect extends Effect {
      * @param radius The radius of the sphere
      * @param radiusIncrease The amount to increase the radius per iteration/tick
      * @param particleIncrease The amount to increase the particles per iteration/tick
+     * @param half_sphere If true, displays as an half sphere/dome
+     * @param invert_half_sphere If true and displaying as an half sphere, displays the bottom half
      * */
-    public SphereEffect(ServerWorld world, ParticleEffect particle, Vec3d origin, int particles, double radius, double radiusIncrease, int particleIncrease) {
+    public SphereEffect(ServerWorld world, ParticleEffect particle, Vec3d origin, int particles, double radius, double radiusIncrease, int particleIncrease, boolean half_sphere, boolean invert_half_sphere) {
         super(world, EffectType.REPEATING, particle, origin);
         this.particles = particles;
         this.radius = radius;
         this.radiusIncrease = radiusIncrease;
         this.particleIncrease = particleIncrease;
+        this.halfSphere = half_sphere;
+        this.invertHalfSphere = invert_half_sphere;
     }
 
 
@@ -57,6 +68,8 @@ public static void copy(SphereEffect original, SphereEffect copy) {
         copy.setRadiusIncrease(original.getRadiusIncrease());
         copy.setParticleIncrease(original.getParticleIncrease());
         copy.setParticles(original.getParticles());
+        copy.setHalfSphere(original.isHalfSphere());
+        copy.setInvertedHalfSphere(original.isInvertHalSphere());
     }
 
     /**
@@ -100,6 +113,8 @@ private SphereEffect(Builder builder) {
         setParticleIncrease(builder.particleIncrease);
         setUseEyePosAsOrigin(builder.useEyePosAsOrigin);
         setExecuteOnStop(builder.executeOnStop);
+        setHalfSphere(builder.halfSphere);
+        setInvertedHalfSphere(builder.invertHalfSphere);
     }
 
 
@@ -129,11 +144,19 @@ public void onRun() {
 
         //Should be already adding the stuff
         //origin.add(0, yOffset, 0);
-        Vec3d v;
+        Vec3d vector;
 
         for (int i = 0; i < particles; i++) {
-            v = RandomUtils.getRandomVector().multiply(radius);
-            this.displayParticle(particle, origin.add(v));
+            vector = RandomUtils.getRandomVector().multiply(radius);
+            if (halfSphere) {
+                if (invertHalfSphere){
+                    vector = new Vec3d(vector.getX(), Math.abs(vector.getY()) * -1, vector.getZ());
+                }
+                else {
+                    vector = new Vec3d(vector.getX(), Math.abs(vector.getY()), vector.getZ());
+                }
+            }
+            this.displayParticle(particle, origin.add(vector));
         }
     }
 
@@ -168,6 +191,22 @@ public void setParticles(int particles) {
         this.particles = particles;
     }
 
+    public boolean isHalfSphere() {
+        return halfSphere;
+    }
+
+    public void setHalfSphere(boolean half_sphere) {
+        this.halfSphere = half_sphere;
+    }
+
+    public boolean isInvertHalSphere() {
+        return invertHalfSphere;
+    }
+
+    public void setInvertedHalfSphere(boolean invert_half_sphere) {
+        this.invertHalfSphere = invert_half_sphere;
+    }
+
     /**
      * {@code SphereEffect} builder static inner class.
      */
@@ -200,6 +239,12 @@ public static final class Builder {
         // Amount to increase the particles per tick
         private int particleIncrease = 0;
 
+        /**Should it display as an half sphere?*/
+        public boolean halfSphere = false;
+
+        /**If it is an half sphere, should it be inverted the other way around? Like upside down*/
+        public boolean invertHalfSphere = false;
+
 
         private Builder() {
         }
@@ -347,6 +392,28 @@ public Builder particleIncrease(int particleIncrease) {
             return this;
         }
 
+        /**
+         * Sets the {@code halfSphere} and returns a reference to this Builder enabling method chaining.
+         *
+         * @param halfSphere the {@code halfSphere} to set
+         * @return a reference to this Builder
+         */
+        public Builder halfSphere(boolean halfSphere) {
+            this.halfSphere = halfSphere;
+            return this;
+        }
+
+        /**
+         * Sets the {@code invertHalfSphere} and returns a reference to this Builder enabling method chaining.
+         *
+         * @param invertHalfSphere the {@code invertHalfSphere} to set
+         * @return a reference to this Builder
+         */
+        public Builder invertHalfSphere(boolean invertHalfSphere) {
+            this.invertHalfSphere = invertHalfSphere;
+            return this;
+        }
+
         /**
          * Returns a {@code SphereEffect} built from the parameters previously set.
          *