Revert data attachment merge

This reverts commit 10a3861, reversing
changes made to eddefee.

Author: emilyoram

gradle.properties

@@ -18,18 +18,17 @@ minecraft_version=1.21.1
 # as they do not follow standard versioning conventions.
 minecraft_version_range=[1.21.1]
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.1.200
+neo_version=21.1.186
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.1.200,)
+neo_version_range=[21.1.186,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[1,)
 
 ## Mod Properties
 
 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
 # Must match the String constant located in the main mod class annotated with @Mod.
-mod_id=7\
-  /.*-+****************************rainbowsheep
+mod_id=rainbowsheep
 # The human-readable display name for the mod.
 mod_name=Rainbow Sheep
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.

src/main/java/com/gmail/sheepingtoninc/rainbowsheep/RainbowSheep.java

@@ -4,7 +4,6 @@
 import com.gmail.sheepingtoninc.rainbowsheep.block.FlagCarpetBlock;
 import com.gmail.sheepingtoninc.rainbowsheep.block.FlagWoolBlock;
 import com.gmail.sheepingtoninc.rainbowsheep.item.RainbowDyeItem;
-import com.mojang.serialization.Codec;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -15,28 +14,19 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.attachment.AttachmentType;
 import net.neoforged.neoforge.registries.DeferredBlock;
 import net.neoforged.neoforge.registries.DeferredItem;
 import net.neoforged.neoforge.registries.DeferredRegister;
-import net.neoforged.neoforge.registries.NeoForgeRegistries;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import java.util.function.Supplier;
 
 @Mod(RainbowSheep.MODID)
 public class RainbowSheep {
     public static final String MODID = "rainbowsheep";
 
-    public static final Logger LOGGER = LogManager.getLogger(MODID);
-
     public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MODID);
 
     public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID);
 
-    public static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, MODID);
-
     public static final DeferredBlock<Block> RAINBOW_WOOL_BLOCK = BLOCKS.register("rainbow_wool", registryName -> new FlagWoolBlock(BlockBehaviour.Properties.of()
             .mapColor(MapColor.COLOR_RED)
             .instrument(NoteBlockInstrument.GUITAR)
@@ -136,14 +126,9 @@ public class RainbowSheep {
     public static final DeferredItem<RainbowDyeItem> ASEXUAL_DYE_ITEM = ITEMS.register("asexual_dye", () -> new RainbowDyeItem(new Item.Properties(), FlagWool.ASEXUAL));
     public static final DeferredItem<RainbowDyeItem> NONBINARY_DYE_ITEM = ITEMS.register("nonbinary_dye", () -> new RainbowDyeItem(new Item.Properties(), FlagWool.NONBINARY));
 
-    public static final Supplier<AttachmentType<Integer>> FLAG = ATTACHMENT_TYPES.register(
-            "flag", () ->  AttachmentType.builder(() -> 0).serialize(Codec.INT).build()
-    );
-
 
     public RainbowSheep(IEventBus modBus, ModContainer container) {
         BLOCKS.register(modBus);
         ITEMS.register(modBus);
-        ATTACHMENT_TYPES.register(modBus);
     }
 }

src/main/java/com/gmail/sheepingtoninc/rainbowsheep/item/ModCreativeModeTabs.java

@@ -6,7 +6,7 @@
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
 
-@EventBusSubscriber (modid = RainbowSheep.MODID)
+@EventBusSubscriber
 public class ModCreativeModeTabs {
     @SubscribeEvent
     public static void buildContents(BuildCreativeModeTabContentsEvent event) {

src/main/java/com/gmail/sheepingtoninc/rainbowsheep/item/RainbowDyeItem.java

@@ -1,6 +1,5 @@
 package com.gmail.sheepingtoninc.rainbowsheep.item;
 
-import com.gmail.sheepingtoninc.rainbowsheep.RainbowSheep;
 import com.gmail.sheepingtoninc.rainbowsheep.api.FlagWool;
 import com.gmail.sheepingtoninc.rainbowsheep.api.IFlagSheep;
 import net.minecraft.sounds.SoundEvents;
@@ -25,9 +24,8 @@ public RainbowDyeItem(Properties properties, FlagWool flagWool) {
     public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity target, InteractionHand hand) {
         if (target instanceof Sheep sheep && sheep.isAlive() && !sheep.isSheared() && this.flagWool.ordinal() != ((IFlagSheep) sheep).rainbowSheep$getFlagWool()) {
             sheep.level().playSound(player, sheep, SoundEvents.DYE_USE, SoundSource.PLAYERS, 1.0F, 1.0F);
-            ((IFlagSheep) sheep).rainbowSheep$setFlagWool(flagWool.ordinal());
             if (!player.level().isClientSide) {
-                RainbowSheep.LOGGER.info("Current flag int is " + sheep.getData(RainbowSheep.FLAG));
+                ((IFlagSheep) sheep).rainbowSheep$setFlagWool(flagWool.ordinal());
                 stack.shrink(1);
             }
 

src/main/java/com/gmail/sheepingtoninc/rainbowsheep/mixin/SheepMixin.java

@@ -3,7 +3,9 @@
 import com.gmail.sheepingtoninc.rainbowsheep.RainbowSheep;
 import com.gmail.sheepingtoninc.rainbowsheep.api.IFlagSheep;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -13,21 +15,20 @@
 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.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import static com.gmail.sheepingtoninc.rainbowsheep.RainbowSheep.FLAG;
-import static com.gmail.sheepingtoninc.rainbowsheep.RainbowSheep.LOGGER;
-
 
 @Mixin(Sheep.class)
 public abstract class SheepMixin implements IFlagSheep {
     @Shadow public abstract boolean isSheared();
 
     @Shadow @Final private static EntityDataAccessor<Byte> DATA_WOOL_ID;
+    private static final EntityDataAccessor<Integer> FLAG = SynchedEntityData.defineId(Sheep.class, EntityDataSerializers.INT);
 
     private static final ResourceLocation RAINBOW_LOOT_LOCATION = ResourceLocation.fromNamespaceAndPath("rainbowsheep", "entities/sheep/rainbow");
     private static final ResourceKey<LootTable> RAINBOW_LOOT_KEY = ResourceKey.create(Registries.LOOT_TABLE, RAINBOW_LOOT_LOCATION);
@@ -48,19 +49,35 @@ public abstract class SheepMixin implements IFlagSheep {
     private static final ResourceKey<LootTable> NONBINARY_LOOT_KEY = ResourceKey.create(Registries.LOOT_TABLE, NONBINARY_LOOT_LOCATION);
 
 
+    @Unique
+    private SynchedEntityData rainbowSheep$getData() {
+        return ((Sheep)(Object)this).getEntityData();
+    }
+
     @Override
     public void rainbowSheep$setFlagWool(int flag) {
-        SynchedEntityData data = ((Sheep)(Object)this).getEntityData();
+        SynchedEntityData data = this.rainbowSheep$getData();
         byte woolByte = data.get(DATA_WOOL_ID);
         data.set(DATA_WOOL_ID, (byte)(woolByte & 240));
-        ((Sheep)(Object)this).setData(FLAG, flag);
+        data.set(FLAG, flag);
     }
 
     @Override
     public int rainbowSheep$getFlagWool() {
-        return ((Sheep)(Object) this).getData(FLAG);
+        return rainbowSheep$getData().get(FLAG);
     }
 
+    @Inject(method = "defineSynchedData(Lnet/minecraft/network/syncher/SynchedEntityData$Builder;)V", at = @At("TAIL"))
+    private void defineFlagSynchedData (SynchedEntityData.Builder builder, CallbackInfo ci) {
+        builder.define(FLAG, 0);
+    }
+
+    @Inject(method = "addAdditionalSaveData(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("TAIL"))
+    private void addFlagSaveData(CompoundTag compound, CallbackInfo ci) { compound.putInt("Flag", rainbowSheep$getFlagWool()); }
+
+    @Inject(method = "readAdditionalSaveData(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("TAIL"))
+    private void readFlagSaveData(CompoundTag compound, CallbackInfo ci) { rainbowSheep$setFlagWool(compound.getInt("Flag")); }
+
     @ModifyArg(method = "shear", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/animal/Sheep;spawnAtLocation(Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/world/entity/item/ItemEntity;"))
     private ItemLike shearFlagWool(ItemLike original) {
         return switch (rainbowSheep$getFlagWool()) {