Use registry ops if possible for computer converters

Author: pupnewfster

src/main/java/mekanism/common/config/StorageConfig.java

@@ -20,7 +20,7 @@ public class StorageConfig extends BaseMekanismConfig {
     public final CachedFloatingLongValue electricPump;
     public final CachedFloatingLongValue chargePad;
     public final CachedFloatingLongValue rotaryCondensentrator;
-    public final CachedFloatingLongValue oxidationChamber;
+    public final CachedFloatingLongValue chemicalOxidizer;
     public final CachedFloatingLongValue chemicalInfuser;
     public final CachedFloatingLongValue chemicalInjectionChamber;
     public final CachedFloatingLongValue electrolyticSeparator;
@@ -71,7 +71,7 @@ public class StorageConfig extends BaseMekanismConfig {
         chargePad = CachedFloatingLongValue.define(this, builder, "Base energy storage (Joules).", "chargePad", FloatingLong.createConst(2_048_000));
         rotaryCondensentrator = CachedFloatingLongValue.define(this, builder, "Base energy storage (Joules).", "rotaryCondensentrator",
               FloatingLong.createConst(20_000));
-        oxidationChamber = CachedFloatingLongValue.define(this, builder, "Base energy storage (Joules).", "oxidationChamber",
+        chemicalOxidizer = CachedFloatingLongValue.define(this, builder, "Base energy storage (Joules).", "chemicalOxidizer",
               FloatingLong.createConst(80_000));
         chemicalInfuser = CachedFloatingLongValue.define(this, builder, "Base energy storage (Joules).", "chemicalInfuser",
               FloatingLong.createConst(80_000));

src/main/java/mekanism/common/config/UsageConfig.java

@@ -22,7 +22,7 @@ public class UsageConfig extends BaseMekanismConfig {
     public final CachedFloatingLongValue electricPump;
     public final CachedFloatingLongValue chargePad;
     public final CachedFloatingLongValue rotaryCondensentrator;
-    public final CachedFloatingLongValue oxidationChamber;
+    public final CachedFloatingLongValue chemicalOxidizer;
     public final CachedFloatingLongValue chemicalInfuser;
     public final CachedFloatingLongValue chemicalInjectionChamber;
     public final CachedFloatingLongValue precisionSawmill;
@@ -71,7 +71,7 @@ public class UsageConfig extends BaseMekanismConfig {
               FloatingLong.createConst(1_024_000));
         rotaryCondensentrator = CachedFloatingLongValue.define(this, builder, "Energy per operation tick (Joules).", "rotaryCondensentrator",
               FloatingLong.createConst(50));
-        oxidationChamber = CachedFloatingLongValue.define(this, builder, "Energy per operation tick (Joules).", "oxidationChamber",
+        chemicalOxidizer = CachedFloatingLongValue.define(this, builder, "Energy per operation tick (Joules).", "chemicalOxidizer",
               FloatingLong.createConst(200));
         chemicalInfuser = CachedFloatingLongValue.define(this, builder, "Energy per operation tick (Joules).", "chemicalInfuser",
               FloatingLong.createConst(200));

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

@@ -1,6 +1,7 @@
 package mekanism.common.integration.computer;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.serialization.DynamicOps;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -26,10 +27,13 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.neoforged.neoforge.server.ServerLifecycleHooks;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -229,8 +233,7 @@ 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());
+        return NbtUtils.structureToSnbt((CompoundTag) DataComponentPatch.CODEC.encodeStart(getRegistryNbtOps(), components).getOrThrow());
     }
 
     static DataComponentPatch unwrapComponents(@NotNull String rawComponents) throws ComputerException {
@@ -240,6 +243,15 @@ static DataComponentPatch unwrapComponents(@NotNull String rawComponents) throws
         } catch (CommandSyntaxException ex) {
             throw new ComputerException("Invalid SNBT: " + ex.getMessage());
         }
-        return DataComponentPatch.CODEC.decode(NbtOps.INSTANCE, nbt).getOrThrow(ComputerException::new).getFirst();
+        return DataComponentPatch.CODEC.decode(getRegistryNbtOps(), nbt).getOrThrow(ComputerException::new).getFirst();
+    }
+
+    private static DynamicOps<Tag> getRegistryNbtOps() {
+        //TODO: Can we pass the registry access in from the tiles rather than having to look it up from the current server?
+        MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
+        if (server != null) {
+            return server.registryAccess().createSerializationContext(NbtOps.INSTANCE);
+        }
+        return NbtOps.INSTANCE;
     }
 }

src/main/java/mekanism/common/registries/MekanismBlockTypes.java

@@ -289,7 +289,7 @@ private MekanismBlockTypes() {
           .createMachine(() -> MekanismTileEntityTypes.CHEMICAL_OXIDIZER, MekanismLang.DESCRIPTION_CHEMICAL_OXIDIZER)
           .withGui(() -> MekanismContainerTypes.CHEMICAL_OXIDIZER)
           .withSound(MekanismSounds.CHEMICAL_OXIDIZER)
-          .withEnergyConfig(MekanismConfig.usage.oxidationChamber, MekanismConfig.storage.oxidationChamber)
+          .withEnergyConfig(MekanismConfig.usage.chemicalOxidizer, MekanismConfig.storage.chemicalOxidizer)
           .withSideConfig(TransmissionType.ITEM, TransmissionType.GAS, TransmissionType.ENERGY)
           .withCustomShape(BlockShapes.CHEMICAL_OXIDIZER)
           .withComputerSupport("chemicalOxidizer")