Replace scenes with tags, simplify API, rewrite internals

Author: 56738

build-logic/src/main/kotlin/bundlescenes.base.gradle.kts

@@ -3,10 +3,8 @@ plugins {
 }
 
 repositories {
-    maven("https://repo.bundlegroup.gg/repository/maven-public/") {
-        name = "bundlegroup"
-        credentials(PasswordCredentials::class)
-    }
+    mavenCentral()
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://maven.enginehub.org/repo/")
 }
 

bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/BundleScenes.java

@@ -1,35 +1,40 @@
 package gg.bundlegroup.bundlescenes.api;
 
-import gg.bundlegroup.bundlescenes.api.controller.Controller;
-import gg.bundlegroup.bundlescenes.api.scene.ChunkSceneProvider;
-import gg.bundlegroup.bundlescenes.api.scene.Scene;
-import net.kyori.adventure.key.Key;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
+import org.bukkit.entity.Entity;
 import org.bukkit.plugin.Plugin;
-import org.jspecify.annotations.NullMarked;
 
-import java.util.Collection;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
-@NullMarked
 public interface BundleScenes {
-    Controller createController(Plugin plugin, Key key);
+    Controller createController(Plugin plugin);
 
-    Scene scene(Key key);
+    Element createElement(Plugin plugin, Viewable viewable);
 
-    Collection<Scene> scenes();
+    Set<String> getTags();
 
-    default ChunkSceneProvider chunk(Location location) {
-        return chunk(location.getChunk());
-    }
+    Set<String> getEntityTags(Entity entity);
+
+    void setEntityTags(Entity entity, Set<String> tags);
 
-    default ChunkSceneProvider chunk(Chunk chunk) {
-        return chunk(chunk.getWorld(), chunk.getX(), chunk.getZ());
+    default boolean addEntityTag(Entity entity, String tag) {
+        Set<String> tags = new HashSet<>(getEntityTags(entity));
+        boolean added = tags.add(tag);
+        if (added) {
+            setEntityTags(entity, tags);
+        }
+        return added;
     }
 
-    ChunkSceneProvider chunk(World world, int x, int z);
+    default boolean removeEntityTag(Entity entity, String tag) {
+        Set<String> tags = new HashSet<>(getEntityTags(entity));
+        boolean removed = tags.remove(tag);
+        if (removed) {
+            setEntityTags(entity, tags);
+        }
+        return removed;
+    }
 
     static BundleScenes get() {
         return Objects.requireNonNull(BundleScenesProvider.instance);

bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/BundleScenesProvider.java

@@ -1,9 +1,9 @@
 package gg.bundlegroup.bundlescenes.api;
 
-import org.jspecify.annotations.NullMarked;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.Nullable;
 
-@NullMarked
+@ApiStatus.Internal
 public final class BundleScenesProvider {
     public BundleScenesProvider() {
     }

bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/Controller.java

@@ -0,0 +1,43 @@
+package gg.bundlegroup.bundlescenes.api;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.io.Closeable;
+
+/**
+ * Used to control which tags are visible.
+ */
+@ApiStatus.NonExtendable
+public interface Controller extends Closeable {
+    /**
+     * Start showing elements with the specified tag to the player.
+     *
+     * @param player the player
+     * @param tag    the tag to show
+     */
+    void showTag(Player player, String tag);
+
+    /**
+     * Stop showing elements with the specified tag to the player.
+     *
+     * @param player the player
+     * @param tag    the tag to hide
+     */
+    void hideTag(Player player, String tag);
+
+    /**
+     * Returns whether this controller is showing the tag to the player.
+     *
+     * @param player the player
+     * @param tag    the tag
+     * @return true if this controller is showing the tag to the player
+     */
+    boolean isShowingTag(Player player, String tag);
+
+    /**
+     * Closes this controller.
+     */
+    @Override
+    void close();
+}

bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/Element.java

@@ -0,0 +1,13 @@
+package gg.bundlegroup.bundlescenes.api;
+
+import java.util.Set;
+
+public interface Element {
+    Set<String> getTags();
+
+    void addTag(String tag);
+
+    void removeTag(String tag);
+
+    void remove();
+}

…/bundlescenes/api/viewable/Viewable.java …ndlegroup/bundlescenes/api/Viewable.javabundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/viewable/Viewable.java renamed to bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/Viewable.java bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/viewable/Viewable.java renamed to bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/Viewable.java

@@ -1,11 +1,9 @@
-package gg.bundlegroup.bundlescenes.api.viewable;
+package gg.bundlegroup.bundlescenes.api;
 
 import org.bukkit.entity.Player;
-import org.jspecify.annotations.NullMarked;
 
 import java.util.Collection;
 
-@NullMarked
 public interface Viewable {
     void addViewer(Player player);
 

bundlescenes-api/src/main/java/gg/bundlegroup/bundlescenes/api/controller/Controller.java

@@ -0,0 +1,4 @@
+@NullMarked
+package gg.bundlegroup.bundlescenes.api;
+
+import org.jspecify.annotations.NullMarked;