Add support to the Computer wrappers for data components

Author: pupnewfster

src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09

@@ -85,7 +85,7 @@ protected boolean canBeReplaced(@NotNull BlockState state, @NotNull Fluid fluid)
     @NotNull
     @Override
     public ItemStack getCloneItemStack(@NotNull BlockState state, @NotNull HitResult target, @NotNull LevelReader world, @NotNull BlockPos pos, @NotNull Player player) {
-        ItemStack stack = new ItemStack(this);
+        ItemStack stack = super.getCloneItemStack(state, target, world, pos, player);
         //TODO - 1.20.5: Figure this out, we want to make sure we copy components
         /*TileEntityUpdateable tile = WorldUtils.getTileEntity(TileEntityUpdateable.class, world, pos);
         if (tile != null) {

src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md

@@ -865,7 +865,7 @@ private boolean testEquivalentItem(Level world, @NotNull QIOFrequency frequency,
                         if (!stack.isEmpty()) {
                             //Note: This should never happen as we pre-validate attempting to insert, but in case it does, log it
                             Mekanism.logger.error("Failed to insert item ({} with components: {}) into crafting window: {}.", removed.getItem(),
-                                  removed.getComponents(), windowIndex);
+                                  removed.getComponentsPatch(), windowIndex);
                         }
                         //TODO - 1.18: Debate potentially briefly highlighting the slot to make it more evident to the player
                         // that something about the slot changed.

src/main/java/mekanism/common/block/BlockMekanism.java

@@ -1,5 +1,6 @@
 package mekanism.common.integration.computer;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -39,8 +40,10 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.GlobalPos;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.component.DataComponentMap;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.NbtUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -181,18 +184,20 @@ public ItemStack getItemStack(int param) throws ComputerException {
         try {
             Item item = getItemFromResourceLocation(ResourceLocation.tryParse((String) map.get("name")));
             int count = SpecialConverters.getIntFromRaw(map.get("count"));
-            ItemStack stack = new ItemStack(item, count);
-            //TODO - 1.20.5: Add support for Components
             String components = (String) map.get("components");
-            /*if (components != null) {
-                stack.setTag(NbtUtils.snbtToStructure(components));
-            }*/
-            return stack;
+            if (components != null) {
+                try {
+                    DataComponentPatch dataComponents = DataComponentPatch.CODEC.decode(NbtOps.INSTANCE, NbtUtils.snbtToStructure(components))
+                          .getOrThrow(ComputerException::new).getFirst();
+                    return new ItemStack(item.builtInRegistryHolder(), count, dataComponents);
+                } catch (CommandSyntaxException ex) {
+                    throw new ComputerException("Invalid SNBT: " + ex.getMessage());
+                }
+            }
+            return new ItemStack(item, count);
         } catch (ClassCastException ex) {
             throw new ComputerException("Invalid ItemStack at index " + param);
-        }/* catch (CommandSyntaxException e) {
-            throw new ComputerException("Invalid NBT or Attachment data");
-        }*/
+        }
     }
 
     /**
@@ -266,14 +271,14 @@ public Object convert(@Nullable FluidStack stack) {
         if (stack == null) {
             return null;
         }
-        return SpecialConverters.wrapStack(RegistryUtils.getName(stack.getFluid()), "amount", stack.getAmount(), stack.getComponents());
+        return SpecialConverters.wrapStack(RegistryUtils.getName(stack.getFluid()), "amount", stack.getAmount(), stack.getComponentsPatch());
     }
 
     public Object convert(@Nullable ItemStack stack) {
         if (stack == null) {
             return null;
         }
-        return SpecialConverters.wrapStack(RegistryUtils.getName(stack.getItem()), "count", stack.getCount(), stack.getComponents());
+        return SpecialConverters.wrapStack(RegistryUtils.getName(stack.getItem()), "count", stack.getCount(), stack.getComponentsPatch());
     }
 
     public Object convert(@Nullable BlockState state) {
@@ -349,7 +354,7 @@ protected Map<String, Object> convertFilterCommon(IFilter<?> result) {
                 ItemStack stack = itemFilter.getItemStack();
                 wrapped.put("item", convert(stack.getItem()));
                 if (!stack.isEmpty()) {
-                    DataComponentMap components = stack.getComponents();
+                    DataComponentPatch components = stack.getComponentsPatch();
                     if (!components.isEmpty()) {
                         wrapped.put("itemComponents", SpecialConverters.wrapComponents(components));
                     }
@@ -507,15 +512,13 @@ private static Map<Class<?>, TableType> getBuiltInTables() {
         TableType.builder(ItemStack.class, "A stack of Item(s)")
               .addField("name", Item.class, "The Item's registered name")
               .addField("count", int.class, "The count of items in the stack")
-              //TODO - 1.20.5: Update the description
-              .addField("components", String.class, "Any NBT of the item, in Command JSON format")
+              .addField("components", String.class, "Any non default components of the item, in Command JSON format")
               .build(types);
 
         TableType.builder(FluidStack.class, "An amount of fluid")
               .addField("name", ResourceLocation.class, "The Fluid's registered name, e.g. minecraft:water")
               .addField("amount", int.class, "The amount in mB")
-              //TODO - 1.20.5: Update the description
-              .addField("components", String.class, "Any NBT of the fluid, in Command JSON format")
+              .addField("components", String.class, "Any non default components of the fluid, in Command JSON format")
               .build(types);
 
         TableType.builder(ChemicalStack.class, "An amount of Gas/Fluid/Slurry/Pigment")

src/main/java/mekanism/common/content/qio/QIOCraftingWindow.java

@@ -1,5 +1,6 @@
 package mekanism.common.integration.computer;
 
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -19,8 +20,11 @@
 import mekanism.common.content.transporter.SorterItemStackFilter;
 import mekanism.common.tile.machine.TileEntityOredictionificator;
 import mekanism.common.util.text.InputValidator;
-import net.minecraft.core.component.DataComponentMap;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.NbtUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -50,16 +54,16 @@ private static ItemStack tryCreateFilterItem(@Nullable String rawName, @Nullable
         if (item == Items.AIR) {
             return ItemStack.EMPTY;
         }
-        ItemStack stack = new ItemStack(item);
-        //TODO - 1.20.5: Add support for components
-        /*if (rawComponents != null) {
+        if (rawComponents != null) {
             try {
-                stack.setTag(NbtUtils.snbtToStructure(rawComponents));
+                DataComponentPatch dataComponents = DataComponentPatch.CODEC.decode(NbtOps.INSTANCE, NbtUtils.snbtToStructure(rawComponents))
+                      .getOrThrow(ComputerException::new).getFirst();
+                return new ItemStack(item.builtInRegistryHolder(), 1, dataComponents);
             } catch (CommandSyntaxException ex) {
                 throw new ComputerException("Invalid SNBT: " + ex.getMessage());
             }
-        }*/
-        return stack;
+        }
+        return new ItemStack(item);
     }
 
     private static Item tryCreateItem(@Nullable Object rawName) {
@@ -212,7 +216,7 @@ private static void decodeItemStackFilter(@NotNull Map<?, ?> map, IItemStackFilt
         itemFilter.setItemStack(stack);
     }
 
-    static Map<String, Object> wrapStack(ResourceLocation name, String sizeKey, int amount, @NotNull DataComponentMap components) {
+    static Map<String, Object> wrapStack(ResourceLocation name, String sizeKey, int amount, @NotNull DataComponentPatch components) {
         int elements = 2;
         boolean hasComponents = !components.isEmpty() && amount > 0;
         if (hasComponents) {
@@ -227,9 +231,7 @@ static Map<String, Object> wrapStack(ResourceLocation name, String sizeKey, int
         return wrapped;
     }
 
-    static String wrapComponents(@NotNull DataComponentMap components) {
-        //TODO - 1.20.5: Add support for components
-        //return NbtUtils.structureToSnbt(components);
-        return "";
+    static String wrapComponents(@NotNull DataComponentPatch components) {
+        return NbtUtils.structureToSnbt((CompoundTag) DataComponentPatch.CODEC.encodeStart(NbtOps.INSTANCE, components).getOrThrow());
     }
 }

src/main/java/mekanism/common/integration/computer/BaseComputerHelper.java

@@ -138,7 +138,7 @@ private void setStack(ItemStack stack, boolean validateStack) {
         } else {
             //Throws a RuntimeException as IItemHandlerModifiable specifies is allowed when something unexpected happens
             // As setStack is more meant to be used as an internal method
-            throw new RuntimeException("Invalid stack for slot: " + stack + " " + stack.getComponents());
+            throw new RuntimeException("Invalid stack for slot: " + stack + " " + stack.getComponentsPatch());
         }
         onContentsChanged();
     }