refactor: merge boss bar implementation into api

Author: smartcmd

CHANGELOG.md

@@ -12,6 +12,10 @@ Unless otherwise specified, any version comparison below is the comparison of th
 
 <small>[Compare with 0.12.0](https://github.com/AllayMC/Allay/compare/0.12.0...HEAD)</small>
 
+### Changed
+
+- (API) Merged `org.allaymc.server.bossbar.AllayBossBar` into the concrete `org.allaymc.api.bossbar.BossBar` class, so boss bars no longer use separate API interface and server implementation types.
+
 # 0.12.0 (API 0.27.0) - 2026/3/29
 
 <small>[Compare with 0.11.1](https://github.com/AllayMC/Allay/compare/0.11.1...0.12.0)</small>

api/src/main/java/org/allaymc/api/AllayAPI.java

@@ -4,7 +4,6 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.StandardException;
 import lombok.extern.slf4j.Slf4j;
-import org.allaymc.api.bossbar.BossBar;
 import org.allaymc.api.command.selector.EntitySelectorAPI;
 import org.allaymc.api.command.tree.CommandNodeFactory;
 import org.allaymc.api.command.tree.CommandTree;
@@ -172,7 +171,6 @@ private void registerDefaultAPIRequirements() {
         requireImpl(CommandNodeFactory.class, CommandNodeFactory.FACTORY::set);
 
         // Misc
-        requireImpl(BossBar.Factory.class, BossBar.FACTORY::set);
         requireImpl(NBTIO.class, NBTIO.API::set);
         requireImpl(FakeContainerFactory.class, FakeContainerFactory.FACTORY::set);
     }

api/src/main/java/org/allaymc/api/bossbar/BossBar.java

@@ -1,48 +1,76 @@
 package org.allaymc.api.bossbar;
 
-import org.allaymc.api.AllayAPI;
+import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.Range;
 import org.jetbrains.annotations.UnmodifiableView;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Represents a boss bar, a visual element often used in games to display progress, health, or status.
  * It supports customization options such as color, style, title, progress, and visibility behavior.
  *
  * @author daoge_cmd
  */
-public interface BossBar {
+public class BossBar {
 
-    AllayAPI.APIInstanceHolder<Factory> FACTORY = AllayAPI.APIInstanceHolder.create();
+    protected Set<BossBarViewer> viewers;
+    protected String title;
+    protected float progress;
+    protected BossBarColor color;
+    protected BossBarStyle style;
+    protected boolean darkenSky;
+
+    /**
+     * Create a new boss bar.
+     */
+    public BossBar() {
+        this.viewers = new HashSet<>();
+        this.title = "";
+        this.progress = 1.0f;
+        this.color = BossBarColor.PINK;
+        this.style = BossBarStyle.SOLID;
+        this.darkenSky = false;
+    }
 
     /**
      * Create a new boss bar.
      *
      * @return the boss bar
      */
-    static BossBar create() {
-        return FACTORY.get().create();
+    public static BossBar create() {
+        return new BossBar();
     }
 
     /**
      * Add a viewer to the boss bar.
      *
      * @param viewer the viewer to add
      */
-    void addViewer(BossBarViewer viewer);
+    public void addViewer(BossBarViewer viewer) {
+        if (viewers.add(viewer)) {
+            viewer.viewBossBar(this);
+        }
+    }
 
     /**
      * Remove a viewer from the boss bar.
      *
      * @param viewer the viewer to remove
      */
-    void removeViewer(BossBarViewer viewer);
+    public void removeViewer(BossBarViewer viewer) {
+        if (viewers.remove(viewer)) {
+            viewer.clearBossBar();
+        }
+    }
 
     /**
      * Remove all viewers from the boss bar.
      */
-    default void removeAllViewers() {
+    public void removeAllViewers() {
         getViewers().forEach(this::removeViewer);
     }
 
@@ -52,80 +80,108 @@ default void removeAllViewers() {
      * @return the viewers of the boss bar
      */
     @UnmodifiableView
-    Collection<BossBarViewer> getViewers();
+    public Collection<BossBarViewer> getViewers() {
+        return Collections.unmodifiableSet(viewers);
+    }
 
     /**
      * Get the color of the boss bar.
      *
      * @return the color of the boss bar
      */
-    BossBarColor getColor();
+    public BossBarColor getColor() {
+        return color;
+    }
 
     /**
      * Set the color of the boss bar.
      *
      * @param color the color to set
      */
-    void setColor(BossBarColor color);
+    public void setColor(BossBarColor color) {
+        this.color = color;
+        update();
+    }
 
     /**
      * Get the style of the boss bar.
      *
      * @return the style of the boss bar
      */
-    BossBarStyle getStyle();
+    public BossBarStyle getStyle() {
+        return style;
+    }
 
     /**
      * Set the style of the boss bar.
      *
      * @param style the style to set
      */
-    void setStyle(BossBarStyle style);
+    public void setStyle(BossBarStyle style) {
+        this.style = style;
+        update();
+    }
 
     /**
      * Check if the boss bar will darken the sky
      *
      * @return {@code true} if the boss bar will darken the sky, otherwise {@code false}.
      */
-    boolean isDarkenSky();
+    public boolean isDarkenSky() {
+        return darkenSky;
+    }
 
     /**
      * Set if the boss bar will darken the sky.
      *
      * @param darkenSky {@code true} if the boss bar will darken the sky, otherwise {@code false}
      */
-    void setDarkenSky(boolean darkenSky);
+    public void setDarkenSky(boolean darkenSky) {
+        this.darkenSky = darkenSky;
+        update();
+    }
 
     /**
      * Get the progress of the boss bar.
      *
      * @return the progress of the boss bar, between 0 and 1
      */
     @Range(from = 0, to = 1)
-    float getProgress();
+    public float getProgress() {
+        return progress;
+    }
 
     /**
      * Set the progress of the boss bar.
      *
      * @param progress the progress to set, between 0 and 1
      */
-    void setProgress(@Range(from = 0, to = 1) float progress);
+    public void setProgress(@Range(from = 0, to = 1) float progress) {
+        Preconditions.checkArgument(progress >= 0 && progress <= 1, "Progress must be between 0 and 1");
+        this.progress = progress;
+        update();
+    }
 
     /**
      * Get the title of the boss bar.
      *
      * @return the title of the boss bar
      */
-    String getTitle();
+    public String getTitle() {
+        return title;
+    }
 
     /**
      * Set the title of the boss bar.
      *
      * @param name the title to set
      */
-    void setTitle(String name);
+    public void setTitle(String name) {
+        this.title = name;
+        update();
+    }
 
-    interface Factory {
-        BossBar create();
+    protected void update() {
+        viewers.forEach(viewer -> viewer.viewBossBar(this));
     }
 }

server/src/main/java/org/allaymc/server/Allay.java

@@ -7,7 +7,6 @@
 import org.allaymc.api.AllayAPI;
 import org.allaymc.api.block.type.BlockType;
 import org.allaymc.api.blockentity.type.BlockEntityType;
-import org.allaymc.api.bossbar.BossBar;
 import org.allaymc.api.command.selector.EntitySelectorAPI;
 import org.allaymc.api.command.tree.CommandNodeFactory;
 import org.allaymc.api.command.tree.CommandTree;
@@ -28,8 +27,6 @@
 import org.allaymc.api.utils.identifier.Identifier;
 import org.allaymc.api.world.biome.BiomeType;
 import org.allaymc.api.world.feature.WorldFeature;
-import org.allaymc.server.bossbar.AllayBossBar;
-import org.allaymc.server.world.biome.CustomBiomeIdAllocator;
 import org.allaymc.server.command.selector.AllayEntitySelectorAPI;
 import org.allaymc.server.command.tree.AllayCommandNodeFactory;
 import org.allaymc.server.command.tree.AllayCommandTree;
@@ -50,6 +47,7 @@
 import org.allaymc.server.utils.AllayNBTIO;
 import org.allaymc.server.utils.DynamicURLClassLoader;
 import org.allaymc.server.utils.GitProperties;
+import org.allaymc.server.world.biome.CustomBiomeIdAllocator;
 import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
 import org.jetbrains.annotations.VisibleForTesting;
 
@@ -163,7 +161,6 @@ private static void initAllayAPI() {
         api.bind(CommandNodeFactory.class, AllayCommandNodeFactory::new);
 
         // Misc
-        api.bind(BossBar.Factory.class, () -> AllayBossBar::new);
         api.bind(NBTIO.class, AllayNBTIO::new);
         api.bind(FakeContainerFactory.class, AllayFakeContainerFactory::new);