feat: add Special.java and update BrickFactory for strong & shield bricks

Author: ManhTanTran

mailmap.txt

@@ -2,12 +2,17 @@
 
 import com.almasb.fxgl.dsl.FXGL;
 import com.almasb.fxgl.entity.component.Component;
+import com.github.codestorm.bounceverse.typing.annotations.ForEntity;
+import com.github.codestorm.bounceverse.typing.enums.EntityType;
 
-public class Special extends Component{
+/**
+ * Khi brick bị phá thì spawn PowerUp.
+ */
+@ForEntity({ EntityType.BRICK })
+public class Special extends Component {
 
     @Override
     public void onRemoved() {
-        // Khi bị phá → spawn PowerUp ngẫu nhiên
         FXGL.spawn("powerUp", getEntity().getCenter());
     }
 }

src/main/java/com/github/codestorm/bounceverse/components/behaviors/Special.java

@@ -1,8 +1,11 @@
 package com.github.codestorm.bounceverse.factory.entities;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
+import javax.management.Attribute;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.almasb.fxgl.dsl.FXGL;
@@ -19,13 +22,16 @@
 import com.github.codestorm.bounceverse.components.behaviors.Explosion;
 import com.github.codestorm.bounceverse.components.behaviors.HealthDeath;
 import com.github.codestorm.bounceverse.components.behaviors.Special;
+import com.github.codestorm.bounceverse.components.properties.Attributes;
 import com.github.codestorm.bounceverse.components.properties.Shield;
 import com.github.codestorm.bounceverse.typing.enums.EntityType;
 
 import javafx.geometry.Point2D;
 import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.image.ImageView;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 
 /**
  *
@@ -43,23 +49,47 @@ public final class BrickFactory implements EntityFactory {
     private static final int DEFAULT_HEIGHT = 30;
     private static final int DEFAULT_HP = 1;
 
-    private static final List<String> BRICK_TEXTURES = List.of(
+    private static final Random RANDOM = new Random();
+
+    private static final List<String> NORMAL_TEXTURES = List.of(
             "bricks/normalBrick/06_test11.png",
             "bricks/normalBrick/07_test11.png",
             "bricks/normalBrick/08_test11.png",
             "bricks/normalBrick/09_test11.png",
             "bricks/normalBrick/10_test11.png",
-            "bricks/normalBrick/11_test11.png"
-    );
+            "bricks/normalBrick/11_test11.png");
 
-    private static final Random RANDOM = new Random();
+    private static final List<String> STRONG_TEXTURES = List.of(
+            "bricks/strongBrick/12_test11.png");
+
+    private static final List<String> SHIELD_TEXTURES = List.of(
+            "bricks/shieldBrick/00_test11.png");
+
+    private static final List<String> EXPLODING_TEXTURES = List.of(
+            "bricks/shieldBrick/00_test11.png");
+
+    private static final List<String> SPECIAL_TEXTURES = List.of(
+            "bricks/specialBrick/special_01.png");
+
+    private static Node makeView(String texturePath) {
+        ImageView view = new ImageView(FXGL.image(texturePath));
+        view.setFitWidth(DEFAULT_WIDTH);
+        view.setFitHeight(DEFAULT_HEIGHT);
+        view.setSmooth(false);
+        view.setPreserveRatio(false);
+        return view;
+    }
+
+    private static Node makeColorView(Color color) {
+        return new Rectangle(DEFAULT_WIDTH, DEFAULT_HEIGHT, color);
+    }
 
     /**
      * Tạo mới một entity brick.
      *
-     * @param pos Vị trí
-     * @param hp HP
-     * @param view Khung nhìn
+     * @param pos        Vị trí
+     * @param hp         HP
+     * @param view       Khung nhìn
      * @param components Các components thêm vào
      * @return Entity Brick mới tạo
      */
@@ -71,41 +101,20 @@ private static Entity newBrick(Point2D pos, int hp, Node view, Component... comp
         var fixture = new FixtureDef();
         fixture.setFriction(0f);
         fixture.setRestitution(1f);
-
         physics.setFixtureDef(fixture);
         physics.setBodyType(BodyType.STATIC);
 
-        return FXGL.entityBuilder()
+        var builder = FXGL.entityBuilder()
                 .type(EntityType.BRICK)
                 .at(pos)
                 .viewWithBBox(view)
                 .collidable()
-                .with(physics, new HealthIntComponent(hp), new HealthDeath())
-                .with(components)
-                .build();
-    }
+                .with(physics, new Attributes(), new HealthIntComponent(hp), new HealthDeath());
 
-    /**
-     * Tạo mới một entity brick với khung nhìn mặc định.
-     *
-     * @param pos Vị trí
-     * @param hp HP
-     * @param components Các components thêm vào
-     * @return Entity Brick mới tạo
-     */
-    @NotNull
-    private static Entity newBrick(Point2D pos, int hp, Component... components) {
-        String randomTexture = BRICK_TEXTURES.get(RANDOM.nextInt(BRICK_TEXTURES.size()));
+        if (components != null && components.length > 0)
+            builder.with(components);
 
-        ImageView view = new ImageView(FXGL.image(randomTexture));
-        view.setFitWidth(DEFAULT_WIDTH);
-        view.setFitHeight(DEFAULT_HEIGHT);
-        view.setSmooth(false);
-        view.setPreserveRatio(false);
-        view.setOpacity(1.0);
-        view.setBlendMode(null);
-
-        return newBrick(pos, hp, view, components);
+        return builder.build();
     }
 
     /**
@@ -114,11 +123,10 @@ private static Entity newBrick(Point2D pos, int hp, Component... components) {
      * @param pos Vị trí
      * @return Entity Brick mới tạo
      */
-    @NotNull
     @Spawns("normalBrick")
-    public static Entity newNormalBrick(SpawnData pos) {
-        return newBrick(
-                new Point2D(pos.getX(), pos.getY()), DEFAULT_HP);
+    public static Entity newNormalBrick(SpawnData data) {
+        String tex = NORMAL_TEXTURES.get(RANDOM.nextInt(NORMAL_TEXTURES.size()));
+        return newBrick(new Point2D(data.getX(), data.getY()), DEFAULT_HP, makeView(tex));
     }
 
     /**
@@ -129,9 +137,8 @@ public static Entity newNormalBrick(SpawnData pos) {
      */
     @Spawns("strongBrick")
     public static Entity newStrongBrick(SpawnData data) {
-        return newBrick(
-                new Point2D(data.getX(), data.getY()),
-                DEFAULT_HP + 2);
+        String tex = STRONG_TEXTURES.get(RANDOM.nextInt(STRONG_TEXTURES.size()));
+        return newBrick(new Point2D(data.getX(), data.getY()), DEFAULT_HP + 2, makeView(tex));
     }
 
     /**
@@ -142,14 +149,12 @@ public static Entity newStrongBrick(SpawnData data) {
      */
     @NotNull
     @Spawns("shieldBrick")
-    public static Entity newShieldBrick(SpawnData pos) {
-
+    public static Entity newShieldBrick(SpawnData data) {
+        String tex = SHIELD_TEXTURES.get(RANDOM.nextInt(SHIELD_TEXTURES.size()));
         var shield = new Shield();
         shield.addSide(Side.LEFT, Side.RIGHT, Side.BOTTOM);
-
-        var brick = newBrick(new Point2D(pos.getX(), pos.getY()), DEFAULT_HP + 1);
+        var brick = newBrick(new Point2D(data.getX(), data.getY()), DEFAULT_HP + 1, makeView(tex));
         brick.addComponent(shield);
-        
         return brick;
     }
 
@@ -160,21 +165,16 @@ public static Entity newShieldBrick(SpawnData pos) {
      */
     @Spawns("explodingBrick")
     public static Entity newExplodingBrick(SpawnData data) {
+        String tex = EXPLODING_TEXTURES.get(RANDOM.nextInt(EXPLODING_TEXTURES.size()));
         var explosion = new Explosion(120);
-        return newBrick(
-                new Point2D(data.getX(), data.getY()),
-                DEFAULT_HP,
-                explosion
-        );
+        return newBrick(new Point2D(data.getX(), data.getY()), DEFAULT_HP, makeView(tex), explosion);
     }
 
     @Spawns("specialBrick")
     public static Entity newSpecialBrick(SpawnData data) {
-
-        return newBrick(
-                new Point2D(data.getX(), data.getY()),
-                DEFAULT_HP,
-                new Special()
-        );
+        String tex = SPECIAL_TEXTURES.get(RANDOM.nextInt(SPECIAL_TEXTURES.size()));
+        return newBrick(new Point2D(data.getX(), data.getY()), DEFAULT_HP, makeView(tex), new Special());
     }
+
+    
 }