Work on applying default components for items so that they don't end up in the component patch

Author: pupnewfster

src/additions/java/mekanism/additions/common/item/ItemWalkieTalkie.java

@@ -27,7 +27,7 @@
 public class ItemWalkieTalkie extends Item implements IModeItem {
 
     public ItemWalkieTalkie(Item.Properties properties) {
-        super(properties.stacksTo(1));
+        super(properties.stacksTo(1).component(AdditionsDataComponents.WALKIE_DATA, WalkieData.DEFAULT));
     }
 
     @Override

src/api/java/mekanism/api/MekanismAPI.java

@@ -1,7 +1,6 @@
 package mekanism.api;
 
 import com.mojang.logging.LogUtils;
-import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.Gas;
@@ -30,7 +29,7 @@ private MekanismAPI() {
     /**
      * The version of the api classes - may not always match the mod's version
      */
-    public static final String API_VERSION = "10.5.20";
+    public static final String API_VERSION = "10.6.0";
     /**
      * Mekanism's Mod ID
      */

src/api/java/mekanism/api/MekanismIMC.java

@@ -20,6 +20,8 @@ private MekanismIMC() {
      * {@link #addModuleContainer(ModuleContainerTarget)} can be used as a helper to send properly structured messages of this type.
      *
      * @since 10.5.0
+     * 
+     * @see mekanism.api.gear.IModuleHelper#applyModuleContainerProperties(Item.Properties) 
      */
     public static final String ADD_MODULE_CONTAINER = "add_module_container";
     /**

src/api/java/mekanism/api/gear/IModuleHelper.java

@@ -52,6 +52,17 @@ public interface IModuleHelper {
      */
     Item createModuleItem(IModuleDataProvider<?> moduleDataProvider, Item.Properties properties);
 
+    /**
+     * Helper method to add an empty component to represent an empty module container.
+     *
+     * @param properties Properties for the item.
+     *
+     * @return The properties with the component for no stored modules in place
+     *
+     * @since 10.6.0
+     */
+    Item.Properties applyModuleContainerProperties(Item.Properties properties);
+
     /**
      * Helper to drop any modules stored in a custom module container. Call this from {@link Item#onDestroyed(ItemEntity, DamageSource)}.
      *

src/generators/java/mekanism/generators/common/item/ItemBlockFissionLogicAdapter.java

@@ -11,14 +11,12 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class ItemBlockFissionLogicAdapter extends ItemBlockTooltip<BlockBasicMultiblock<TileEntityFissionReactorLogicAdapter>> {
 
     public ItemBlockFissionLogicAdapter(BlockBasicMultiblock<TileEntityFissionReactorLogicAdapter> block, Item.Properties properties) {
-        super(block, true, properties);
+        super(block, true, properties.component(GeneratorsDataComponents.FISSION_LOGIC_TYPE, FissionReactorLogic.DISABLED));
     }
 
     @Override

src/generators/java/mekanism/generators/common/item/ItemBlockFusionLogicAdapter.java

@@ -13,14 +13,12 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class ItemBlockFusionLogicAdapter extends ItemBlockTooltip<BlockBasicMultiblock<TileEntityFusionReactorLogicAdapter>> {
 
     public ItemBlockFusionLogicAdapter(BlockBasicMultiblock<TileEntityFusionReactorLogicAdapter> block, Properties properties) {
-        super(block, true, properties);
+        super(block, true, properties.component(GeneratorsDataComponents.FUSION_LOGIC_TYPE, FusionReactorLogic.DISABLED));
     }
 
     @Override

src/generators/java/mekanism/generators/common/registries/GeneratorsDataComponents.java

@@ -23,5 +23,5 @@ private GeneratorsDataComponents() {
                 .networkSynchronized(FusionReactorLogic.STREAM_CODEC)
     );
 
-    public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> ACTIVE_COOLED = DATA_COMPONENTS.registerBoolean("active_cooled", false);
+    public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> ACTIVE_COOLED = DATA_COMPONENTS.registerBoolean("active_cooled");
 }

src/main/java/mekanism/client/model/baked/DriveArrayBakedModel.java

@@ -123,26 +123,29 @@ public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLev
                     } else {
                         driveStack = ItemStack.EMPTY;
                     }
-                    if (driveStack.isEmpty() || !(driveStack.getItem() instanceof IQIODriveItem driveItem) || !driveStack.has(MekanismDataComponents.DRIVE_METADATA)) {
+                    if (driveStack.isEmpty() || !(driveStack.getItem() instanceof IQIODriveItem driveItem)) {
                         status = DriveStatus.NONE;
-                    } else if (hasFrequency) {
-                        allEmpty = false;
-                        //Note: Should never be able to get here if it isn't present
+                    } else {
                         DriveMetadata metadata = driveStack.getOrDefault(MekanismDataComponents.DRIVE_METADATA, DriveMetadata.EMPTY);
-                        long countCapacity = driveItem.getCountCapacity(driveStack);
-                        if (metadata.count() == countCapacity) {
-                            //If we are at max item capacity: Full
-                            status = DriveStatus.FULL;
-                        } else if (metadata.types() == driveItem.getTypeCapacity(driveStack) || metadata.count() >= countCapacity * 0.75) {
-                            //If we are at max type capacity OR we are at 75% or more capacity: Near full
-                            status = DriveStatus.NEAR_FULL;
+                        if (metadata.isEmpty()) {
+                            status = DriveStatus.NONE;
+                        } else if (hasFrequency) {
+                            allEmpty = false;
+                            long countCapacity = driveItem.getCountCapacity(driveStack);
+                            if (metadata.count() == countCapacity) {
+                                //If we are at max item capacity: Full
+                                status = DriveStatus.FULL;
+                            } else if (metadata.types() == driveItem.getTypeCapacity(driveStack) || metadata.count() >= countCapacity * 0.75) {
+                                //If we are at max type capacity OR we are at 75% or more capacity: Near full
+                                status = DriveStatus.NEAR_FULL;
+                            } else {
+                                //Otherwise: Ready
+                                status = DriveStatus.READY;
+                            }
                         } else {
-                            //Otherwise: Ready
-                            status = DriveStatus.READY;
+                            allEmpty = false;
+                            status = DriveStatus.OFFLINE;
                         }
-                    } else {
-                        allEmpty = false;
-                        status = DriveStatus.OFFLINE;
                     }
                     driveStatus[i] = status.status();
                 }

src/main/java/mekanism/client/recipe_viewer/jei/MekanismJEI.java

@@ -153,7 +153,7 @@ public static RecipeType<?>[] recipeType(IRecipeViewerRecipeType<?>... recipeTyp
 
     private static final IIngredientSubtypeInterpreter<ItemStack> MEKANISM_NBT_INTERPRETER = (stack, context) -> {
         //TODO - 1.20.5: Re-evaluate if we want the components check or if it should check it slightly differently?
-        if (context == UidContext.Ingredient && !stack.getComponents().isEmpty()) {
+        if (context == UidContext.Ingredient && !stack.getComponentsPatch().isEmpty()) {
             String representation = getChemicalComponent(stack, ContainerType.GAS, Capabilities.GAS.item());
             representation = addInterpretation(representation, getChemicalComponent(stack, ContainerType.INFUSION, Capabilities.INFUSION.item()));
             representation = addInterpretation(representation, getChemicalComponent(stack, ContainerType.PIGMENT, Capabilities.PIGMENT.item()));

src/main/java/mekanism/common/attachments/StabilizedChunks.java

@@ -14,6 +14,7 @@
 public record StabilizedChunks(byte[] chunks) {
 
     private static final int ARRAY_SIZE = TileEntityDimensionalStabilizer.MAX_LOAD_DIAMETER * TileEntityDimensionalStabilizer.MAX_LOAD_DIAMETER;
+    public static final StabilizedChunks NONE = new StabilizedChunks(new byte[ARRAY_SIZE]);
 
     public static final Codec<StabilizedChunks> CODEC = Codec.BYTE.listOf(ARRAY_SIZE, ARRAY_SIZE).xmap(bytes -> {
         byte[] chunks = new byte[ARRAY_SIZE];