Finish game and entity components

Aeltumn · Aeltumn · commit dbd061d4f963 · 2025-08-13T14:41:29.000+02:00
diff --git a/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/component/ComponentChangeContext.java b/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/component/ComponentChangeContext.java
@@ -0,0 +1,9 @@
+package com.noxcrew.noxesium.api.fabric.component;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Stores the old and new values of a component being changed along with
+ * the receiver of the new value.
+ */
+public record ComponentChangeContext<T, R>(@Nullable T oldValue, @Nullable T newValue, R receiver) {}
diff --git a/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/component/NoxesiumComponentListener.java b/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/component/NoxesiumComponentListener.java
@@ -0,0 +1,65 @@
+package com.noxcrew.noxesium.api.fabric.component;
+
+import java.lang.ref.WeakReference;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiConsumer;
+import org.apache.commons.lang3.tuple.Pair;
+
+/**
+ * An object that can be listened to when a component updates.
+ */
+public class NoxesiumComponentListener<T, R> {
+
+    /**
+     * All listeners registered to this payload type.
+     */
+    private final Set<Pair<WeakReference<?>, BiConsumer<?, ComponentChangeContext<T, R>>>> listeners =
+            ConcurrentHashMap.newKeySet();
+
+    /**
+     * Registers a new listener to a change of this component type. Garbage collection
+     * of this listener is tied to the lifetime of the reference. The reference object should
+     * only ever be referenced from within the listener using the passed instance. This prevents
+     * the listener from holding its own reference captive. If you do this the listener
+     * will never be properly garbage collected.
+     */
+    public <F> void addListener(F reference, BiConsumer<F, ComponentChangeContext<T, R>> listener) {
+        listeners.removeIf((it) -> it.getKey().get() == null);
+        listeners.add(Pair.of(new WeakReference<>(reference), listener));
+    }
+
+    /**
+     * Returns whether this type has listeners.
+     */
+    public boolean hasListeners() {
+        return !listeners.isEmpty();
+    }
+
+    /**
+     * Triggers this listener with the given receiver and values.
+     */
+    public void trigger(Object receiver, Object oldValue, Object newValue) {
+        var iterator = listeners.iterator();
+        var context = new ComponentChangeContext<T, R>((T) oldValue, (T) newValue, (R) receiver);
+        while (iterator.hasNext()) {
+            var pair = iterator.next();
+            var obj = pair.getKey().get();
+            if (obj == null) {
+                iterator.remove();
+                continue;
+            }
+            acceptAny(pair.getValue(), obj, context);
+        }
+    }
+
+    /**
+     * Casts [reference] to type [F] of [consumer].
+     */
+    private <F> void acceptAny(
+            BiConsumer<F, ComponentChangeContext<T, R>> consumer,
+            Object reference,
+            ComponentChangeContext<T, R> context) {
+        consumer.accept((F) reference, context);
+    }
+}
diff --git a/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/component/NoxesiumComponentType.java b/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/component/NoxesiumComponentType.java
@@ -21,7 +21,10 @@
  * Component types are defined in a custom registry similar to vanilla components.
  */
 public record NoxesiumComponentType<T>(
-        ResourceLocation id, Codec<T> codec, @Nullable StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec) {
+        ResourceLocation id,
+        Codec<T> codec,
+        @Nullable StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec,
+        @Nullable NoxesiumComponentListener<T, ?> listener) {
 
     /**
      * Creates a new component type automatically for the given namespace and key with the default encoder cache enabled.
@@ -30,10 +33,12 @@ public NoxesiumComponentType(
             String namespace,
             String key,
             Codec<T> codec,
-            @Nullable StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec) {
+            @Nullable StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec,
+            @Nullable NoxesiumComponentListener<T, ?> listener) {
         this(
                 ResourceLocation.fromNamespaceAndPath(namespace, key),
                 DataComponents.ENCODER_CACHE.wrap(codec),
-                streamCodec);
+                streamCodec,
+                listener);
     }
 }
diff --git a/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/network/NoxesiumPacketHandler.java b/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/network/NoxesiumPacketHandler.java
@@ -17,7 +17,9 @@ public class NoxesiumPacketHandler<T extends CustomPacketPayload>
     @Override
     public void receive(T payload, ClientPlayNetworking.Context context) {
         if (payload instanceof NoxesiumPacket noxesiumPacket) {
-            noxesiumPacket.noxesiumType().handle(new PacketContext(context.client(), context.player()), payload);
+            if (noxesiumPacket.noxesiumType().hasListeners()) {
+                noxesiumPacket.noxesiumType().handle(new PacketContext(context.client(), context.player()), payload);
+            }
             if (NoxesiumNetworking.dumpIncomingPackets) {
                 Minecraft.getInstance()
                         .player
diff --git a/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/network/NoxesiumPayloadType.java b/fabric/api/src/main/java/com/noxcrew/noxesium/api/fabric/network/NoxesiumPayloadType.java
@@ -88,6 +88,13 @@ private static void unregisterPacket(PayloadTypeRegistry<RegistryFriendlyByteBuf
         ((PayloadTypeRegistryExt) registry).getPacketTypes().remove(id);
     }
 
+    /**
+     * Returns whether this type has listeners.
+     */
+    public boolean hasListeners() {
+        return !listeners.isEmpty();
+    }
+
     /**
      * Handles a new packet [payload] of this type being received with
      * [context].
diff --git a/fabric/api/src/main/resources/noxesium.accesswidener b/fabric/api/src/main/resources/noxesium.accesswidener
@@ -20,4 +20,5 @@ accessible method net/minecraft/client/renderer/RenderPipelines register (Lcom/m
 accessible field net/minecraft/client/renderer/RenderPipelines TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 accessible field net/minecraft/client/renderer/RenderPipelines LINES_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 
-accessible field net/minecraft/core/component/DataComponents ENCODER_CACHE Lnet/minecraft/util/EncoderCache;
+accessible field net/minecraft/core/component/DataComponents ENCODER_CACHE Lnet/minecraft/util/EncoderCache;
+accessible method net/minecraft/world/entity/Entity makeBoundingBox ()Lnet/minecraft/world/phys/AABB;
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/CommonNoxesiumEntrypoint.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/CommonNoxesiumEntrypoint.java
@@ -13,6 +13,7 @@
 import com.noxcrew.noxesium.fabric.feature.sounds.NoxesiumSoundModule;
 import com.noxcrew.noxesium.fabric.network.CommonPackets;
 import com.noxcrew.noxesium.fabric.network.NoxesiumPacketHandling;
+import com.noxcrew.noxesium.fabric.registry.ComponentChangeListeners;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -50,10 +51,11 @@ public Collection<NoxesiumFeature> getAllFeatures() {
         features.add(new SkullFontModule());
         features.add(new NoxesiumSoundModule());
         features.add(new TeamGlowHotkeys());
-        features.add(new NoxesiumPacketHandling());
         features.add(new QibBehaviorModule());
         features.add(new SpatialDebuggingRenderer());
         features.add(new CustomServerCreativeItems());
+        features.add(new NoxesiumPacketHandling());
+        features.add(new ComponentChangeListeners());
         return features;
     }
 
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/mixin/rules/entity/EntityComponentMixin.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/mixin/rules/entity/EntityComponentMixin.java
@@ -33,6 +33,10 @@ public abstract class EntityComponentMixin implements NoxesiumComponentHolder {
 
     @Override
     public void noxesium$loadComponent(NoxesiumComponentType<?> component, Object value) {
+        if (value == null) {
+            noxesium$unsetComponent(component);
+            return;
+        }
         if (noxesium$components == null) noxesium$components = new ConcurrentHashMap<>();
         noxesium$components.put(component, value);
     }
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/mixin/rules/server/MinecraftComponentMixin.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/mixin/rules/server/MinecraftComponentMixin.java
@@ -34,6 +34,10 @@ public class MinecraftComponentMixin implements NoxesiumComponentHolder {
 
     @Override
     public void noxesium$loadComponent(NoxesiumComponentType<?> component, Object value) {
+        if (value == null) {
+            noxesium$unsetComponent(component);
+            return;
+        }
         if (noxesium$components == null) noxesium$components = new ConcurrentHashMap<>();
         noxesium$components.put(component, value);
     }
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/network/NoxesiumComponentPatch.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/network/NoxesiumComponentPatch.java
@@ -182,9 +182,22 @@ public void apply(NoxesiumComponentHolder holder) {
             var key = entry.getKey();
             var value = entry.getValue();
             if (value.isEmpty()) {
-                holder.noxesium$unsetComponent(key);
+                if (key.listener() != null && key.listener().hasListeners()) {
+                    var oldValue = holder.noxesium$getComponent(key);
+                    holder.noxesium$unsetComponent(key);
+                    key.listener().trigger(holder, oldValue, null);
+                } else {
+                    holder.noxesium$unsetComponent(key);
+                }
             } else {
-                holder.noxesium$loadComponent(key, value.get());
+                if (key.listener() != null && key.listener().hasListeners()) {
+                    var oldValue = holder.noxesium$getComponent(key);
+                    var newValue = value.orElse(null);
+                    holder.noxesium$loadComponent(key, newValue);
+                    key.listener().trigger(holder, oldValue, newValue);
+                } else {
+                    holder.noxesium$loadComponent(key, value.get());
+                }
             }
         }
     }
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/registry/CommonEntityComponentTypes.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/registry/CommonEntityComponentTypes.java
@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import com.noxcrew.noxesium.api.NoxesiumReferences;
+import com.noxcrew.noxesium.api.fabric.component.NoxesiumComponentListener;
 import com.noxcrew.noxesium.api.fabric.component.NoxesiumComponentType;
 import com.noxcrew.noxesium.api.fabric.registry.NoxesiumExtraCodecs;
 import com.noxcrew.noxesium.api.fabric.registry.NoxesiumExtraStreamCodecs;
@@ -13,6 +14,7 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.util.ExtraCodecs;
 import net.minecraft.util.Unit;
+import net.minecraft.world.entity.Entity;
 import org.joml.Vector3f;
 
 /**
@@ -24,47 +26,40 @@ public class CommonEntityComponentTypes {
      * If set, bubbles are removed from guardian beams shot by this entity.
      */
     public static NoxesiumComponentType<Unit> DISABLE_BUBBLES =
-            register("disable_bubbles", Unit.CODEC, Unit.STREAM_CODEC); // default: not present
+            register("disable_bubbles", Unit.CODEC, Unit.STREAM_CODEC);
 
     /**
      * Defines a color to use for a beam created by this entity. Applies to guardian beams
      * and end crystal beams.
      */
-    public static NoxesiumComponentType<Color> BEAM_COLOR = register(
-            "beam_color", NoxesiumExtraCodecs.COLOR_ARGB, NoxesiumExtraStreamCodecs.COLOR_ARGB); // default: not present
+    public static NoxesiumComponentType<Color> BEAM_COLOR =
+            register("beam_color", NoxesiumExtraCodecs.COLOR_ARGB, NoxesiumExtraStreamCodecs.COLOR_ARGB);
 
     /**
      * Defines a color used in combination with [BEAM_COLOR] to create a linear fade.
      */
-    public static NoxesiumComponentType<Color> BEAM_COLOR_FADE = register(
-            "beam_color_fade",
-            NoxesiumExtraCodecs.COLOR_ARGB,
-            NoxesiumExtraStreamCodecs.COLOR_ARGB); // default: not present
+    public static NoxesiumComponentType<Color> BEAM_COLOR_FADE =
+            register("beam_color_fade", NoxesiumExtraCodecs.COLOR_ARGB, NoxesiumExtraStreamCodecs.COLOR_ARGB);
 
     /**
      * Allows defining qib behavior for an interaction entity. You can find more information
      * about the qib system in the qib package. This can either be the identifier of a behavior
      * as found in the registry or an inlined behavior.
      */
     public static NoxesiumComponentType<String> QIB_BEHAVIOR =
-            register("qib_behavior", Codec.STRING, ByteBufCodecs.STRING_UTF8); // default: not present
+            register("qib_behavior", Codec.STRING, ByteBufCodecs.STRING_UTF8);
 
     /**
      * Defines a color to use for the glowing outline of this entity.
      */
-    public static NoxesiumComponentType<Color> GLOW_COLOR = register(
-            "glow_color", NoxesiumExtraCodecs.COLOR_ARGB, NoxesiumExtraStreamCodecs.COLOR_ARGB); // default: not present
+    public static NoxesiumComponentType<Color> GLOW_COLOR =
+            register("glow_color", NoxesiumExtraCodecs.COLOR_ARGB, NoxesiumExtraStreamCodecs.COLOR_ARGB);
 
     /**
      * Defines a hitbox to use for this entity to override the regular hitbox.
      */
     public static NoxesiumComponentType<Vector3f> HITBOX_OVERRIDE =
-            register("hitbox_override", ExtraCodecs.VECTOR3F, ByteBufCodecs.VECTOR3F); // default: not present
-    /*
-       On change listener:
-       // Update the bounding box of the entity whenever a new override is received
-       this.setBoundingBox(this.makeBoundingBox());
-    */
+            register("hitbox_override", ExtraCodecs.VECTOR3F, ByteBufCodecs.VECTOR3F);
 
     /**
      * Registers a new component type to the registry.
@@ -73,6 +68,11 @@ private static <T> NoxesiumComponentType<T> register(
             String key, Codec<T> codec, StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec) {
         return NoxesiumRegistries.ENTITY_COMPONENTS.register(
                 Key.key(NoxesiumReferences.NAMESPACE, key),
-                new NoxesiumComponentType<T>(NoxesiumReferences.NAMESPACE, key, codec, streamCodec));
+                new NoxesiumComponentType<T>(
+                        NoxesiumReferences.NAMESPACE,
+                        key,
+                        codec,
+                        streamCodec,
+                        new NoxesiumComponentListener<T, Entity>()));
     }
 }
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/registry/CommonGameComponentTypes.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/registry/CommonGameComponentTypes.java
diff --git a/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/registry/ComponentChangeListeners.java b/fabric/common/src/main/java/com/noxcrew/noxesium/fabric/registry/ComponentChangeListeners.java
