Simplified impl. of syncing command tags

src/main/java/io/github/eggohito/eggolib/condition/bientity/HasMatchingTagCondition.java

@@ -3,7 +3,6 @@
 import io.github.apace100.apoli.power.factory.condition.ConditionFactory;
 import io.github.apace100.calio.data.SerializableData;
 import io.github.eggohito.eggolib.Eggolib;
-import io.github.eggohito.eggolib.component.EggolibComponents;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Pair;
 
@@ -14,8 +13,8 @@ public class HasMatchingTagCondition {
 
 	public static boolean condition(SerializableData.Instance data, Pair<Entity, Entity> actorAndTarget) {
 
-		Set<String> actorCommandTags = EggolibComponents.MISC.get(actorAndTarget.getLeft()).getCommandTags();
-		Set<String> targetCommandTags = EggolibComponents.MISC.get(actorAndTarget.getRight()).getCommandTags();
+		Set<String> actorCommandTags = actorAndTarget.getLeft().getCommandTags();
+		Set<String> targetCommandTags = actorAndTarget.getRight().getCommandTags();
 
 		return !Collections.disjoint(actorCommandTags, targetCommandTags);
 

src/main/java/io/github/eggohito/eggolib/condition/entity/HasTagCondition.java

@@ -4,7 +4,6 @@
 import io.github.apace100.calio.data.SerializableData;
 import io.github.apace100.calio.data.SerializableDataTypes;
 import io.github.eggohito.eggolib.Eggolib;
-import io.github.eggohito.eggolib.component.EggolibComponents;
 import net.minecraft.entity.Entity;
 
 import java.util.Collections;
@@ -16,7 +15,7 @@ public class HasTagCondition {
 	public static boolean condition(SerializableData.Instance data, Entity entity) {
 
 		Set<String> specifiedCommandTags = new HashSet<>();
-		Set<String> commandTags = EggolibComponents.MISC.get(entity).getCommandTags();
+		Set<String> commandTags = entity.getCommandTags();
 
 		data.ifPresent("tag", specifiedCommandTags::add);
 		data.ifPresent("tags", specifiedCommandTags::addAll);

src/main/java/io/github/eggohito/eggolib/data/EggolibDataHandlers.java

@@ -0,0 +1,21 @@
+package io.github.eggohito.eggolib.data;
+
+import net.minecraft.entity.data.TrackedDataHandler;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.network.PacketByteBuf;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class EggolibDataHandlers {
+
+	public static final TrackedDataHandler<Set<String>> STRING_SET = TrackedDataHandler.of(
+		(buf, strings) -> buf.writeCollection(strings, PacketByteBuf::writeString),
+		buf -> buf.readCollection(value -> new HashSet<>(), PacketByteBuf::readString)
+	);
+
+	public static void register() {
+		TrackedDataHandlerRegistry.register(STRING_SET);
+	}
+
+}

src/main/java/io/github/eggohito/eggolib/loot/condition/HasTagLootCondition.java

@@ -3,7 +3,6 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.eggohito.eggolib.Eggolib;
-import io.github.eggohito.eggolib.component.EggolibComponents;
 import net.minecraft.entity.Entity;
 import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.condition.LootConditionType;
@@ -35,7 +34,7 @@ public boolean test(LootContext lootContext) {
 			return false;
 		}
 
-		Set<String> commandTags = EggolibComponents.MISC.get(entity).getCommandTags();
+		Set<String> commandTags = entity.getCommandTags();
 		Set<String> specifiedCommandTags = new HashSet<>();
 
 		this.commandTag.ifPresent(specifiedCommandTags::add);

src/main/java/io/github/eggohito/eggolib/mixin/EntityMixin.java

@@ -1,51 +1,91 @@
 package io.github.eggohito.eggolib.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import io.github.eggohito.eggolib.component.EggolibComponents;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import io.github.eggohito.eggolib.Eggolib;
+import io.github.eggohito.eggolib.data.EggolibDataHandlers;
 import io.github.eggohito.eggolib.power.ModifyPassengerPositionPower;
 import io.github.eggohito.eggolib.power.ModifyRidingPositionPower;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
 import net.minecraft.world.World;
 import org.joml.Vector3f;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Set;
 
 @Mixin(Entity.class)
 public abstract class EntityMixin {
 
 	@Shadow
-	private World world;
+	@Final
+	protected DataTracker dataTracker;
 
-	@Inject(method = "addCommandTag", at = @At("TAIL"))
-	private void eggolib$onAddCommandTag(String tag, CallbackInfoReturnable<Boolean> cir) {
-		if (cir.getReturnValue()) {
-			EggolibComponents.MISC.get(this).addCommandTag(tag);
+	@Shadow
+	protected boolean firstUpdate;
+
+	@Shadow
+	public abstract World getWorld();
+
+	@Shadow
+	@Final
+	public Set<String> commandTags;
+
+	@Unique
+	private static final TrackedData<Set<String>> COMMAND_TAGS = DataTracker.registerData(Entity.class, EggolibDataHandlers.STRING_SET);
+
+	@Unique
+	private boolean eggolib$dirtiedCommandTags;
+
+	@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;initDataTracker()V"))
+	private void eggolib$registerCommandTagsDataTracker(EntityType<?> type, World world, CallbackInfo ci) {
+
+		try {
+			this.dataTracker.startTracking(COMMAND_TAGS, Set.of());
 		}
-	}
 
-	@Inject(method = "removeScoreboardTag", at = @At("TAIL"))
-	private void eggolib$onRemoveCommandTag(String tag, CallbackInfoReturnable<Boolean> cir) {
-		EggolibComponents.MISC.get(this).removeCommandTag(tag);
-	}
+		catch (Exception e) {
+			Eggolib.LOGGER.warn("Couldn't register data tracker for command tags", e);
+		}
 
-	@Inject(method = "getCommandTags", at = @At("RETURN"))
-	private void eggolib$onGetCommandTag(CallbackInfoReturnable<Set<String>> cir) {
-		EggolibComponents.MISC.get(this).setCommandTags(cir.getReturnValue());
+	}
+
+	@ModifyReturnValue(method = "addCommandTag", at = @At("RETURN"))
+	private boolean eggolib$trackAddedCommandTag(boolean original) {
+		return original 
+			&& (this.eggolib$dirtiedCommandTags = true);
+	}
+
+	@ModifyReturnValue(method = "removeScoreboardTag", at = @At("RETURN"))
+	private boolean eggolib$trackRemovedCommandTag(boolean original) {
+		return original
+			&& (this.eggolib$dirtiedCommandTags = true);
+	}
+
+	@ModifyReturnValue(method = "getCommandTags", at = @At("RETURN"))
+	private Set<String> eggolib$queryTrackedCommandTags(Set<String> original) {
+		return this.dataTracker.containsKey(COMMAND_TAGS)
+			? this.dataTracker.get(COMMAND_TAGS)
+			: original;
 	}
 
-	@Inject(method = "baseTick", at = @At("TAIL"))
-	private void eggolib$syncCommandTags(CallbackInfo ci) {
+	@Inject(method = "baseTick", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/Entity;firstUpdate:Z"))
+	private void eggolib$updateTrackedCommandTags(CallbackInfo ci) {
 
-		if (!this.world.isClient) {
-			EggolibComponents.MISC.get(this).sync(false);
+		if (this.dataTracker.containsKey(COMMAND_TAGS) && ((this.firstUpdate && !this.getWorld().isClient) || this.eggolib$dirtiedCommandTags)) {
+			this.dataTracker.set(COMMAND_TAGS, Set.copyOf(this.commandTags));
 		}
 
+		this.eggolib$dirtiedCommandTags = false;
+
 	}
 
 	@ModifyExpressionValue(method = "getPassengerRidingPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getPassengerAttachmentPos(Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EntityDimensions;F)Lorg/joml/Vector3f;"))

src/main/resources/fabric.mod.json

@@ -22,9 +22,6 @@
 		"client": [
 			"io.github.eggohito.eggolib.EggolibClient"
 		],
-		"cardinal-components-entity": [
-			"io.github.eggohito.eggolib.registry.factory.EggolibEntityComponents"
-		],
 		"modmenu": [
 			"io.github.eggohito.eggolib.integration.EggolibModMenuIntegration"
 		],