Provide registry access to more places where we use codecs

Author: pupnewfster

gradle.properties

@@ -37,7 +37,7 @@ yamlops_version=1.2.0
 
 #Mod dependencies
 cc_tweaked_version=1.111.0
-crafttweaker_version=19.0.7
+crafttweaker_version=19.0.8
 curios_version=8.0.0-beta.5+1.20.6
 emi_version=1.1.6
 jade_api_id=5288706

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

@@ -1,6 +1,5 @@
 package mekanism.common.integration.computer;
 
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -44,8 +43,6 @@
 import net.minecraft.core.Vec3i;
 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;
@@ -189,13 +186,8 @@ public ItemStack getItemStack(int param) throws ComputerException {
             int count = SpecialConverters.getIntFromRaw(map.get(SerializationConstants.COUNT));
             String components = (String) map.get(SerializationConstants.COMPONENTS);
             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());
-                }
+                DataComponentPatch dataComponents = SpecialConverters.unwrapComponents(components);;
+                return new ItemStack(item.builtInRegistryHolder(), count, dataComponents);
             }
             return new ItemStack(item, count);
         } catch (ClassCastException ex) {

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

@@ -56,13 +56,8 @@ private static ItemStack tryCreateFilterItem(@Nullable String rawName, @Nullable
             return ItemStack.EMPTY;
         }
         if (rawComponents != null) {
-            try {
-                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());
-            }
+            DataComponentPatch dataComponents = unwrapComponents(rawComponents);
+            return new ItemStack(item.builtInRegistryHolder(), 1, dataComponents);
         }
         return new ItemStack(item);
     }
@@ -234,6 +229,17 @@ static Map<String, Object> wrapStack(ResourceLocation name, String sizeKey, int
     }
 
     static String wrapComponents(@NotNull DataComponentPatch components) {
+        //TODO - 1.20.5: Make this and unwrapComponents take a HolderLookup.Provider
         return NbtUtils.structureToSnbt((CompoundTag) DataComponentPatch.CODEC.encodeStart(NbtOps.INSTANCE, components).getOrThrow());
     }
+
+    static DataComponentPatch unwrapComponents(@NotNull String rawComponents) throws ComputerException {
+        CompoundTag nbt;
+        try {
+            nbt = NbtUtils.snbtToStructure(rawComponents);
+        } catch (CommandSyntaxException ex) {
+            throw new ComputerException("Invalid SNBT: " + ex.getMessage());
+        }
+        return DataComponentPatch.CODEC.decode(NbtOps.INSTANCE, nbt).getOrThrow(ComputerException::new).getFirst();
+    }
 }

src/main/java/mekanism/common/integration/crafttweaker/ingredient/CrTGasStackIngredient.java

@@ -127,7 +127,7 @@ public static GasStackIngredient from(Many<KnownTag<Gas>> gasTag) {
     @ZenCodeType.Method
     @ZenCodeType.Caster(implicit = true)
     public static IData asIData(GasStackIngredient _this) {
-        return IngredientCreatorAccess.gasStack().codec().encodeStart(IDataOps.INSTANCE, _this).getOrThrow();
+        return IngredientCreatorAccess.gasStack().codec().encodeStart(IDataOps.INSTANCE.withRegistryAccess(), _this).getOrThrow();
     }
 
     /**

src/main/java/mekanism/common/integration/crafttweaker/ingredient/CrTInfusionStackIngredient.java

@@ -127,7 +127,7 @@ public static InfusionStackIngredient from(Many<KnownTag<InfuseType>> infuseType
     @ZenCodeType.Method
     @ZenCodeType.Caster(implicit = true)
     public static IData asIData(InfusionStackIngredient _this) {
-        return IngredientCreatorAccess.infusionStack().codec().encodeStart(IDataOps.INSTANCE, _this).getOrThrow();
+        return IngredientCreatorAccess.infusionStack().codec().encodeStart(IDataOps.INSTANCE.withRegistryAccess(), _this).getOrThrow();
     }
 
     /**

src/main/java/mekanism/common/integration/crafttweaker/ingredient/CrTPigmentStackIngredient.java

@@ -127,7 +127,7 @@ public static PigmentStackIngredient from(Many<KnownTag<Pigment>> pigmentTag) {
     @ZenCodeType.Method
     @ZenCodeType.Caster(implicit = true)
     public static IData asIData(PigmentStackIngredient _this) {
-        return IngredientCreatorAccess.pigmentStack().codec().encodeStart(IDataOps.INSTANCE, _this).getOrThrow();
+        return IngredientCreatorAccess.pigmentStack().codec().encodeStart(IDataOps.INSTANCE.withRegistryAccess(), _this).getOrThrow();
     }
 
     /**

src/main/java/mekanism/common/integration/crafttweaker/ingredient/CrTSlurryStackIngredient.java

@@ -127,7 +127,7 @@ public static SlurryStackIngredient from(Many<KnownTag<Slurry>> slurryTag) {
     @ZenCodeType.Method
     @ZenCodeType.Caster(implicit = true)
     public static IData asIData(SlurryStackIngredient _this) {
-        return IngredientCreatorAccess.slurryStack().codec().encodeStart(IDataOps.INSTANCE, _this).getOrThrow();
+        return IngredientCreatorAccess.slurryStack().codec().encodeStart(IDataOps.INSTANCE.withRegistryAccess(), _this).getOrThrow();
     }
 
     /**