Continue work at applying default components to things

Author: pupnewfster

src/main/java/mekanism/common/attachments/containers/ContainerType.java

@@ -50,6 +50,7 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponentMap;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
@@ -58,6 +59,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.capabilities.ICapabilityProvider;
@@ -256,6 +258,27 @@ public boolean supports(ItemStack stack) {
         return stack.has(component) || knownDefaultCreators.containsKey(stack.getItem());
     }
 
+    public void addDefault(ItemLike item, DataComponentPatch.Builder builder) {
+        Lazy<? extends IContainerCreator<? extends CONTAINER, ATTACHED>> lazy = knownDefaultCreators.get(item);
+        if (lazy != null) {
+            //Supports the type
+            IContainerCreator<? extends CONTAINER, ATTACHED> containerCreator = lazy.get();
+            int count = containerCreator.totalContainers();
+            if (count > 0) {
+                builder.set(component.get(), containerCreator.initStorage(count));
+            }
+        }
+    }
+
+    public static boolean anySupports(ItemLike itemLike) {
+        for (ContainerType<?, ?, ?> type : TYPES) {
+            if (type.knownDefaultCreators.containsKey(itemLike.asItem())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private ListTag save(HolderLookup.Provider provider, List<CONTAINER> containers) {
         return DataHandlerUtils.writeContents(provider, containers, containerKey);
     }

src/main/java/mekanism/common/attachments/containers/chemical/gas/AttachedGases.java

@@ -2,6 +2,8 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.Collections;
 import java.util.List;
 import mekanism.api.NBTConstants;
@@ -22,13 +24,18 @@ public record AttachedGases(List<GasStack> containers) implements IAttachedConta
     public static final StreamCodec<RegistryFriendlyByteBuf, AttachedGases> STREAM_CODEC =
           GasStack.OPTIONAL_STREAM_CODEC.<List<GasStack>>apply(ByteBufCodecs.collection(NonNullList::createWithCapacity))
                       .map(AttachedGases::new, AttachedGases::containers);
+    private static final Int2ObjectMap<AttachedGases> EMPTY_DEFAULTS = new Int2ObjectOpenHashMap<>();
+
+    public static AttachedGases create(int containers) {
+        return EMPTY_DEFAULTS.computeIfAbsent(containers, AttachedGases::new);
+    }
 
     public AttachedGases {
         //Make the list unmodifiable to ensure we don't accidentally mutate it
         containers = Collections.unmodifiableList(containers);
     }
 
-    public AttachedGases(int containers) {
+    private AttachedGases(int containers) {
         this(NonNullList.withSize(containers, GasStack.EMPTY));
     }
 

src/main/java/mekanism/common/attachments/containers/chemical/gas/GasTanksBuilder.java

@@ -52,7 +52,7 @@ public BaseGasTankBuilder(List<IBasicContainerCreator<? extends ComponentBackedG
 
         @Override
         public AttachedGases initStorage(int containers) {
-            return new AttachedGases(containers);
+            return AttachedGases.create(containers);
         }
     }
 }

src/main/java/mekanism/common/attachments/containers/chemical/infuse/AttachedInfuseTypes.java

@@ -2,6 +2,8 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.Collections;
 import java.util.List;
 import mekanism.api.NBTConstants;
@@ -22,13 +24,18 @@ public record AttachedInfuseTypes(List<InfusionStack> containers) implements IAt
     public static final StreamCodec<RegistryFriendlyByteBuf, AttachedInfuseTypes> STREAM_CODEC =
           InfusionStack.OPTIONAL_STREAM_CODEC.<List<InfusionStack>>apply(ByteBufCodecs.collection(NonNullList::createWithCapacity))
                 .map(AttachedInfuseTypes::new, AttachedInfuseTypes::containers);
+    private static final Int2ObjectMap<AttachedInfuseTypes> EMPTY_DEFAULTS = new Int2ObjectOpenHashMap<>();
+
+    public static AttachedInfuseTypes create(int containers) {
+        return EMPTY_DEFAULTS.computeIfAbsent(containers, AttachedInfuseTypes::new);
+    }
 
     public AttachedInfuseTypes {
         //Make the list unmodifiable to ensure we don't accidentally mutate it
         containers = Collections.unmodifiableList(containers);
     }
 
-    public AttachedInfuseTypes(int containers) {
+    private AttachedInfuseTypes(int containers) {
         this(NonNullList.withSize(containers, InfusionStack.EMPTY));
     }
 

src/main/java/mekanism/common/attachments/containers/chemical/infuse/InfusionTanksBuilder.java

@@ -52,7 +52,7 @@ public BaseInfusionTankBuilder(List<IBasicContainerCreator<? extends ComponentBa
 
         @Override
         public AttachedInfuseTypes initStorage(int containers) {
-            return new AttachedInfuseTypes(containers);
+            return AttachedInfuseTypes.create(containers);
         }
     }
 }

src/main/java/mekanism/common/attachments/containers/chemical/pigment/AttachedPigments.java

@@ -2,6 +2,8 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.Collections;
 import java.util.List;
 import mekanism.api.NBTConstants;
@@ -22,13 +24,18 @@ public record AttachedPigments(List<PigmentStack> containers) implements IAttach
     public static final StreamCodec<RegistryFriendlyByteBuf, AttachedPigments> STREAM_CODEC =
           PigmentStack.OPTIONAL_STREAM_CODEC.<List<PigmentStack>>apply(ByteBufCodecs.collection(NonNullList::createWithCapacity))
                 .map(AttachedPigments::new, AttachedPigments::containers);
+    private static final Int2ObjectMap<AttachedPigments> EMPTY_DEFAULTS = new Int2ObjectOpenHashMap<>();
+
+    public static AttachedPigments create(int containers) {
+        return EMPTY_DEFAULTS.computeIfAbsent(containers, AttachedPigments::new);
+    }
 
     public AttachedPigments {
         //Make the list unmodifiable to ensure we don't accidentally mutate it
         containers = Collections.unmodifiableList(containers);
     }
 
-    public AttachedPigments(int containers) {
+    private AttachedPigments(int containers) {
         this(NonNullList.withSize(containers, PigmentStack.EMPTY));
     }
 

src/main/java/mekanism/common/attachments/containers/chemical/pigment/PigmentTanksBuilder.java

@@ -52,7 +52,7 @@ public BasePigmentTankBuilder(List<IBasicContainerCreator<? extends ComponentBac
 
         @Override
         public AttachedPigments initStorage(int containers) {
-            return new AttachedPigments(containers);
+            return AttachedPigments.create(containers);
         }
     }
 }

src/main/java/mekanism/common/attachments/containers/chemical/slurry/AttachedSlurries.java

@@ -2,6 +2,8 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.Collections;
 import java.util.List;
 import mekanism.api.NBTConstants;
@@ -22,13 +24,18 @@ public record AttachedSlurries(List<SlurryStack> containers) implements IAttache
     public static final StreamCodec<RegistryFriendlyByteBuf, AttachedSlurries> STREAM_CODEC =
           SlurryStack.OPTIONAL_STREAM_CODEC.<List<SlurryStack>>apply(ByteBufCodecs.collection(NonNullList::createWithCapacity))
                 .map(AttachedSlurries::new, AttachedSlurries::containers);
+    private static final Int2ObjectMap<AttachedSlurries> EMPTY_DEFAULTS = new Int2ObjectOpenHashMap<>();
+
+    public static AttachedSlurries create(int containers) {
+        return EMPTY_DEFAULTS.computeIfAbsent(containers, AttachedSlurries::new);
+    }
 
     public AttachedSlurries {
         //Make the list unmodifiable to ensure we don't accidentally mutate it
         containers = Collections.unmodifiableList(containers);
     }
 
-    public AttachedSlurries(int containers) {
+    private AttachedSlurries(int containers) {
         this(NonNullList.withSize(containers, SlurryStack.EMPTY));
     }
 

src/main/java/mekanism/common/attachments/containers/chemical/slurry/SlurryTanksBuilder.java

@@ -52,7 +52,7 @@ public BaseSlurryTankBuilder(List<IBasicContainerCreator<? extends ComponentBack
 
         @Override
         public AttachedSlurries initStorage(int containers) {
-            return new AttachedSlurries(containers);
+            return AttachedSlurries.create(containers);
         }
     }
 }

src/main/java/mekanism/common/attachments/containers/energy/AttachedEnergy.java

@@ -4,6 +4,8 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.netty.buffer.ByteBuf;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.Collections;
 import java.util.List;
 import mekanism.api.NBTConstants;
@@ -23,13 +25,18 @@ public record AttachedEnergy(List<FloatingLong> containers) implements IAttached
     public static final StreamCodec<ByteBuf, AttachedEnergy> STREAM_CODEC =
           FloatingLong.STREAM_CODEC.<List<FloatingLong>>apply(ByteBufCodecs.collection(NonNullList::createWithCapacity))
                 .map(AttachedEnergy::new, AttachedEnergy::containers);
+    private static final Int2ObjectMap<AttachedEnergy> EMPTY_DEFAULTS = new Int2ObjectOpenHashMap<>();
+
+    public static AttachedEnergy create(int containers) {
+        return EMPTY_DEFAULTS.computeIfAbsent(containers, AttachedEnergy::new);
+    }
 
     public AttachedEnergy {
         //Make the list unmodifiable to ensure we don't accidentally mutate it
         containers = Collections.unmodifiableList(containers);
     }
 
-    public AttachedEnergy(int containers) {
+    private AttachedEnergy(int containers) {
         this(NonNullList.withSize(containers, FloatingLong.ZERO));
     }