wip porting recipes

Author: mrh0

src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/ModularAccumulatorBlockEntity.java

@@ -8,6 +8,7 @@
 import com.mrh0.createaddition.energy.IMultiTileEnergyContainer;
 import com.mrh0.createaddition.energy.InternalEnergyStorage;
 import com.mrh0.createaddition.index.CABlockEntities;
+import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
 import com.mrh0.createaddition.network.IObserveTileEntity;
 import com.mrh0.createaddition.network.ObservePacketPayload;
 import com.mrh0.createaddition.sound.CASoundScapes;
@@ -122,7 +123,7 @@ protected void updateConnectivity() {
 	public void tick() {
 		super.tick();
 		if(!invalidSides.isEmpty()) {
-			invalidSides.forEach(this::updateCache);
+			updateCache();
 			invalidSides.clear();
 		}
 
@@ -489,7 +490,7 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
 		tooltip.add(Component.literal(spacing)
 				.append(Component.translatable(CreateAddition.MODID + ".tooltip.energy.stored").withStyle(ChatFormatting.GRAY)));
 		tooltip.add(Component.literal(spacing).append(Component.literal(" "))
-				.append(Util.format((int)EnergyNetworkPacket.clientBuff)).append("fe").withStyle(ChatFormatting.AQUA));
+				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("fe").withStyle(ChatFormatting.AQUA));
 
 		tooltip.add(Component.literal(spacing)
 				.append(Component.translatable(CreateAddition.MODID + ".tooltip.energy.capacity").withStyle(ChatFormatting.GRAY)));
@@ -505,7 +506,7 @@ public void onObserved(ServerPlayer player, ObservePacketPayload pack) {
 		ModularAccumulatorBlockEntity controllerTE = getControllerBE();
 		if (controllerTE == null) return;
 
-		EnergyNetworkPacket.send(worldPosition, 0, controllerTE.energyStorage.getEnergyStored(), player);
+		EnergyNetworkPacketPayload.send(worldPosition, 0, controllerTE.energyStorage.getEnergyStored(), player);
 	}
 
 	public boolean hasAccumulator() {

src/main/java/com/mrh0/createaddition/recipe/CARecipeSerializer.java

@@ -1,45 +1,48 @@
 package com.mrh0.createaddition.recipe.charging;
 
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.mrh0.createaddition.CreateAddition;
 import com.mrh0.createaddition.index.CARecipes;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.items.wrapper.RecipeWrapper;
 import org.jetbrains.annotations.NotNull;
 
-public class ChargingRecipe implements Recipe<RecipeWrapper> {
+public class ChargingRecipe implements Recipe<CraftingInput> {
 
-	public final ResourceLocation id;
 	public Ingredient ingredient;
 	public ItemStack output;
 	public int energy;
 	public int maxChargeRate;
 
-	public ChargingRecipe(ResourceLocation id, Ingredient ingredient, ItemStack output, int energy, int maxChargeRate) {
-		this.id = id;
+	public ChargingRecipe(String group, Ingredient ingredient, ItemStack output, int energy, int maxChargeRate) {
 		this.ingredient = ingredient;
 		this.output = output;
 		this.energy = energy;
 		this.maxChargeRate = maxChargeRate;
 	}
 
+	public CraftingBookCategory category() {
+		return CraftingBookCategory.MISC;
+	}
 
 	@Override
-	public boolean matches(@NotNull RecipeWrapper wrapper, @NotNull Level world) {
+	public boolean matches(@NotNull CraftingInput wrapper, @NotNull Level world) {
 		if(ingredient == null) return false;
 		return ingredient.test(wrapper.getItem(0));
 	}
 
 	@Override
-	public @NotNull ItemStack assemble(@NotNull RecipeWrapper recipeWrapper, HolderLookup.@NotNull Provider provider) {
+	public @NotNull ItemStack assemble(@NotNull CraftingInput recipeWrapper, HolderLookup.@NotNull Provider provider) {
 		return output;
 	}
 
@@ -76,4 +79,48 @@ public int getMaxChargeRate() {
 		return maxChargeRate;
 	}
 
+	public static class Serializer implements RecipeSerializer<ChargingRecipe> {
+		private static final MapCodec<ChargingRecipe> CODEC = RecordCodecBuilder.mapCodec(
+				builder -> builder.group(
+								Codec.STRING.optionalFieldOf("group", "").forGetter(ChargingRecipe::getGroup),
+								//CraftingBookCategory.CODEC.fieldOf("category").orElse(CraftingBookCategory.MISC).forGetter(ChargingRecipe::category),
+								Ingredient.CODEC.fieldOf("ingredient").forGetter(r -> r.ingredient),
+								ItemStack.STRICT_CODEC.fieldOf("result").forGetter(r -> r.output),
+								Codec.INT.optionalFieldOf("energy", 0).forGetter(r -> r.energy),
+						Codec.INT.optionalFieldOf("max_charge_rate", 0).forGetter(r -> r.maxChargeRate)
+						).apply(builder, ChargingRecipe::new)
+		);
+
+		public static final StreamCodec<RegistryFriendlyByteBuf, ChargingRecipe> STREAM_CODEC = StreamCodec.of(
+				Serializer::toNetwork, Serializer::fromNetwork
+		);
+
+		@Override
+		public MapCodec<ChargingRecipe> codec() {
+			return CODEC;
+		}
+
+		@Override
+		public StreamCodec<RegistryFriendlyByteBuf, ChargingRecipe> streamCodec() {
+			return STREAM_CODEC;
+		}
+
+		private static ChargingRecipe fromNetwork(RegistryFriendlyByteBuf buffer) {
+			String group = buffer.readUtf();
+			int maxChargeRate = buffer.readInt();
+			int energy = buffer.readInt();
+			ItemStack output = ItemStack.STREAM_CODEC.decode(buffer);
+			Ingredient input = Ingredient.CONTENTS_STREAM_CODEC.decode(buffer);
+			return new ChargingRecipe(group, input, output, energy, maxChargeRate);
+		}
+
+		private static void toNetwork(RegistryFriendlyByteBuf buffer, ChargingRecipe recipe) {
+			buffer.writeUtf(recipe.getGroup());
+			buffer.writeInt(recipe.maxChargeRate);
+			buffer.writeInt(recipe.energy);
+			ItemStack.STREAM_CODEC.encode(buffer, recipe.output);
+			Ingredient.CONTENTS_STREAM_CODEC.encode(buffer, recipe.ingredient);
+		}
+	}
+
 }