Switch to using a List

Author: TrigamDev

src/main/java/dev/trigam/field/component/GlowingLayersComponent.java

@@ -1,55 +1,62 @@
 package dev.trigam.field.component;
 
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
+import dev.trigam.field.Field;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.entity.BannerBlockEntity;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.codec.PacketCodecs;
 import net.minecraft.registry.RegistryWrapper;
 import org.ladysnake.cca.api.v3.component.sync.AutoSyncedComponent;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 public class GlowingLayersComponent implements AutoSyncedComponent {
 
-    public Set<Integer> glowingLayers = new TreeSet<>();
+    public List<Integer> glowingLayers = new ArrayList<>();
     private BannerBlockEntity banner;
 
-    public GlowingLayersComponent( BannerBlockEntity banner ) {
+    public GlowingLayersComponent () {}
+    public GlowingLayersComponent ( BannerBlockEntity banner ) {
         this.banner = banner;
     }
-    public GlowingLayersComponent(Set<Integer> glowingLayers) {
+    public GlowingLayersComponent ( List<Integer> glowingLayers ) {
         this.glowingLayers = glowingLayers;
     }
 
     // Codecs
-    public static final Codec<GlowingLayersComponent> CODEC = RecordCodecBuilder.create(instance ->
-        instance.group(
-            Codec.list( Codec.INT ).optionalFieldOf( "glowing_layers", List.of() )
-                .xmap(Set::copyOf, List::copyOf )
-                .forGetter( GlowingLayersComponent::getGlowingLayers )
-        ).apply( instance, GlowingLayersComponent::new )
-    );
+    public static final Codec<GlowingLayersComponent> CODEC = Codec.INT
+        .listOf()
+        .xmap( GlowingLayersComponent::new, GlowingLayersComponent::getGlowingLayers );
+    public static final PacketCodec<ByteBuf, GlowingLayersComponent> PACKET_CODEC = PacketCodecs.INTEGER
+        .collect( PacketCodecs.toList() )
+        .xmap( GlowingLayersComponent::new, GlowingLayersComponent::getGlowingLayers );
 
-    public Set<Integer> getGlowingLayers() { return this.glowingLayers; }
+    public List<Integer> getGlowingLayers() { return this.glowingLayers; }
 
     public boolean isLayerGlowing( int layerIndex ) {
         return this.glowingLayers.contains( layerIndex );
     }
 
     public void setLayerGlowing( int layerIndex, boolean glowing ) {
-        if ( glowing ) this.glowingLayers.add( layerIndex );
-        else this.glowingLayers.remove( layerIndex );
+        Field.LOGGER.info( "Current: {}", this.glowingLayers );
+        Field.LOGGER.info( "Setting layer {} to {}", layerIndex, glowing ? "glowing" : "not glowing" );
 
+        List<Integer> layers = new ArrayList<>( this.glowingLayers );
+
+        if ( glowing ) layers.add( layerIndex );
+        else layers.remove( Integer.valueOf( layerIndex ) );
+
+        this.glowingLayers = layers;
         ComponentInit.GLOWING_LAYERS.sync( this.banner );
     }
 
     @Override
     public void readFromNbt( NbtCompound tag, RegistryWrapper.WrapperLookup wrapperLookup ) {
         int[] nbtLayers = tag.getIntArray("glowing_layers");
-        this.glowingLayers = Arrays.stream( nbtLayers ).boxed().collect( Collectors.toSet() );
+        this.glowingLayers = Arrays.stream( nbtLayers ).boxed().toList();
     }
 
     @Override

src/main/java/dev/trigam/field/event/ToggleBannerGlow.java

@@ -29,6 +29,7 @@ public static ActionResult toggleBannerGlow( PlayerEntity player, World world, H
         ItemStack usedItem = player.getStackInHand( hand );
         BlockPos pos = result.getBlockPos();
         BlockEntity blockEntity = world.getBlockEntity( pos );
+
         // Used item
         boolean addGlowing = usedItem.isOf( Items.GLOW_INK_SAC );
         boolean removeGlowing = usedItem.isOf( Items.INK_SAC );