Add a method to get the raw output for item to energy recipes

Author: pupnewfster

src/api/java/mekanism/api/recipes/basic/BasicItemStackToEnergyRecipe.java

@@ -46,6 +46,17 @@ public FloatingLong getOutput(ItemStack input) {
         return output;
     }
 
+    /**
+     * For Serializer use. DO NOT MODIFY RETURN VALUE.
+     *
+     * @return the uncopied basic output
+     *
+     * @since 10.6.0
+     */
+    public FloatingLong getOutputRaw() {
+        return output;
+    }
+
     @Override
     public List<FloatingLong> getOutputDefinition() {
         return Collections.singletonList(output);

src/main/java/mekanism/common/lib/inventory/HashedItem.java

@@ -5,13 +5,11 @@
 import java.util.UUID;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.inventory.IHashedItem;
-import mekanism.common.attachments.OverflowAware;
 import mekanism.common.util.StackUtils;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.util.ExtraCodecs;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -24,8 +22,13 @@
 @NothingNullByDefault
 public class HashedItem implements IHashedItem {
 
-    //TODO - 1.20.5: Some sort of note that this doesn't handle the uuid based ones?
+    /**
+     * @implNote This codec does not copy any uuid information if the hashed item is a {@link UUIDAwareHashedItem}
+     */
     public static final Codec<HashedItem> CODEC = ItemStack.CODEC.xmap(HashedItem::raw, HashedItem::getInternalStack);
+    /**
+     * @implNote This codec does not copy any uuid information if the hashed item is a {@link UUIDAwareHashedItem}
+     */
     public static final StreamCodec<RegistryFriendlyByteBuf, HashedItem> STREAM_CODEC = ItemStack.STREAM_CODEC.map(HashedItem::raw, HashedItem::getInternalStack);
 
     public static HashedItem create(ItemStack stack) {

src/main/java/mekanism/common/recipe/serializer/ChemicalCrystallizerRecipeSerializer.java

@@ -30,7 +30,6 @@ public ChemicalCrystallizerRecipeSerializer(BiFunction<ChemicalStackIngredient<?
               chemicalStackIngredientMapEncoder.forGetter(BasicChemicalCrystallizerRecipe::getInput),
               ItemStack.CODEC.fieldOf(JsonConstants.OUTPUT).forGetter(BasicChemicalCrystallizerRecipe::getOutputRaw)
         ).apply(instance, factory));
-        //TODO - 1.20.5: Figure this out. I think this technically works but it is messy
         this.streamCodec = StreamCodec.composite(
               ChemicalType.STREAM_CODEC.<RegistryFriendlyByteBuf>cast().dispatch(ChemicalType::getTypeFor,
                     chemicalType -> IngredientCreatorAccess.getCreatorForType(chemicalType).streamCodec()), BasicChemicalCrystallizerRecipe::getInput,

src/main/java/mekanism/common/recipe/serializer/MekanismRecipeSerializer.java

@@ -31,6 +31,7 @@
 import mekanism.api.recipes.basic.BasicFluidSlurryToSlurryRecipe;
 import mekanism.api.recipes.basic.BasicFluidToFluidRecipe;
 import mekanism.api.recipes.basic.BasicGasToGasRecipe;
+import mekanism.api.recipes.basic.BasicItemStackToEnergyRecipe;
 import mekanism.api.recipes.basic.BasicItemStackToItemStackRecipe;
 import mekanism.api.recipes.basic.BasicNucleosynthesizingRecipe;
 import mekanism.api.recipes.basic.BasicPressurizedReactionRecipe;
@@ -94,13 +95,13 @@ public static MekanismRecipeSerializer<BasicCombinerRecipe> combining(Function3<
         ));
     }
 
-    public static <RECIPE extends ItemStackToEnergyRecipe> MekanismRecipeSerializer<RECIPE> itemToEnergy(BiFunction<ItemStackIngredient, FloatingLong, RECIPE> factory) {
+    public static <RECIPE extends BasicItemStackToEnergyRecipe> MekanismRecipeSerializer<RECIPE> itemToEnergy(BiFunction<ItemStackIngredient, FloatingLong, RECIPE> factory) {
         return new MekanismRecipeSerializer<>(RecordCodecBuilder.mapCodec(instance -> instance.group(
               IngredientCreatorAccess.item().codec().fieldOf(JsonConstants.INPUT).forGetter(ItemStackToEnergyRecipe::getInput),
-              FloatingLong.NONZERO_CODEC.fieldOf(JsonConstants.OUTPUT).forGetter(r -> r.getOutput(ItemStack.EMPTY))
+              FloatingLong.NONZERO_CODEC.fieldOf(JsonConstants.OUTPUT).forGetter(BasicItemStackToEnergyRecipe::getOutputRaw)
         ).apply(instance, factory)), StreamCodec.composite(
               IngredientCreatorAccess.item().streamCodec(), ItemStackToEnergyRecipe::getInput,
-              FloatingLong.STREAM_CODEC, r -> r.getOutput(ItemStack.EMPTY),//TODO - 1.20.5: Re-evaluate passing empty to this??
+              FloatingLong.STREAM_CODEC, BasicItemStackToEnergyRecipe::getOutputRaw,
               factory
         ));
     }

src/main/java/mekanism/common/registration/impl/DataSerializerDeferredRegister.java

@@ -16,7 +16,6 @@ public DataSerializerDeferredRegister(String modid) {
         super(NeoForgeRegistries.Keys.ENTITY_DATA_SERIALIZERS, modid);
     }
 
-    //TODO - 1.20.5: Do we need to make this lazy
     public <T> MekanismDeferredHolder<EntityDataSerializer<?>, EntityDataSerializer<T>> register(String name, StreamCodec<? super RegistryFriendlyByteBuf, T> codec) {
         return register(name, () -> EntityDataSerializer.forValueType(codec));
     }

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

@@ -234,7 +234,6 @@ private MekanismDataComponents() {
                 .networkSynchronized(ByteBufCodecs.registry(Registries.ITEM))
     );
 
-    //TODO - 1.20.5: Validate this doesn't have to be optional
     //Note: We can't directly use ItemStack as it needs to override equals and hashcode, but as our only use case converts it to a HashedItem, we just use that
     public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<HashedItem>> ITEM_TARGET = DATA_COMPONENTS.simple("item_target",
           builder -> builder.persistent(HashedItem.CODEC)

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

@@ -27,7 +27,6 @@ private MekanismRobitSkins() {
     private static final DatapackDeferredRegister<RobitSkin> ROBIT_SKINS = DatapackDeferredRegister.robitSkins(Mekanism.MODID);
 
     public static void createAndRegisterDatapack(IEventBus modEventBus) {
-        //TODO - 1.20.5: Make a PR to neo changing the datapack to maybe take a stream codec??
         ROBIT_SKINS.createAndRegisterDatapack(modEventBus, RobitSkinSerializationHelper.DIRECT_CODEC, RobitSkinSerializationHelper.NETWORK_CODEC.codec());
     }