Crucible Fuel Tank

Quarris · Quarris · commit 99fa8919a7d0 · 2025-05-06T06:14:53.000+01:00
diff --git a/src/main/java/dev/quarris/fireandflames/FireAndFlames.java b/src/main/java/dev/quarris/fireandflames/FireAndFlames.java
@@ -10,6 +10,7 @@
 public class FireAndFlames {
 
     public FireAndFlames(ModContainer container, IEventBus modBus) {
+        DataComponentSetup.init(modBus);
         BlockSetup.init(modBus);
         ItemSetup.init(modBus);
         FluidSetup.init(modBus);
diff --git a/src/main/java/dev/quarris/fireandflames/client/event/handler/ClientSetupEvents.java b/src/main/java/dev/quarris/fireandflames/client/event/handler/ClientSetupEvents.java
@@ -1,23 +1,18 @@
 package dev.quarris.fireandflames.client.event.handler;
 
 import dev.quarris.fireandflames.ModRef;
-import dev.quarris.fireandflames.client.renderer.blockentity.CastingBasinRenderer;
-import dev.quarris.fireandflames.client.renderer.blockentity.CastingTableRenderer;
-import dev.quarris.fireandflames.client.renderer.blockentity.CrucibleControllerRenderer;
-import dev.quarris.fireandflames.client.renderer.blockentity.CrucibleFawsitRenderer;
+import dev.quarris.fireandflames.client.renderer.blockentity.*;
 import dev.quarris.fireandflames.client.screen.CrucibleScreen;
 import dev.quarris.fireandflames.setup.BlockEntitySetup;
 import dev.quarris.fireandflames.setup.FluidSetup;
 import dev.quarris.fireandflames.setup.MenuSetup;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
 import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
-import net.neoforged.neoforge.common.NeoForgeMod;
 
 @EventBusSubscriber(modid = ModRef.ID, bus = EventBusSubscriber.Bus.MOD)
 public class ClientSetupEvents {
@@ -51,6 +46,7 @@ public static void registerRenderers(EntityRenderersEvent.RegisterRenderers even
         event.registerBlockEntityRenderer(BlockEntitySetup.CRUCIBLE_FAWSIT.get(), CrucibleFawsitRenderer::new);
         event.registerBlockEntityRenderer(BlockEntitySetup.CASTING_BASIN.get(), CastingBasinRenderer::new);
         event.registerBlockEntityRenderer(BlockEntitySetup.CASTING_TABLE.get(), CastingTableRenderer::new);
+        event.registerBlockEntityRenderer(BlockEntitySetup.CRUCIBLE_TANK.get(), FluidStorageRenderer::new);
     }
 
 }
diff --git a/src/main/java/dev/quarris/fireandflames/client/renderer/blockentity/FluidStorageRenderer.java b/src/main/java/dev/quarris/fireandflames/client/renderer/blockentity/FluidStorageRenderer.java
@@ -0,0 +1,79 @@
+package dev.quarris.fireandflames.client.renderer.blockentity;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import dev.quarris.fireandflames.client.util.FluidRenderer;
+import dev.quarris.fireandflames.world.block.entity.FluidStorageBlockEntity;
+import net.minecraft.client.renderer.ItemBlockRenderTypes;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.Vec3;
+import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.capability.templates.FluidTank;
+
+public class FluidStorageRenderer implements BlockEntityRenderer<FluidStorageBlockEntity> {
+
+    public FluidStorageRenderer(BlockEntityRendererProvider.Context context) {
+    }
+
+    @Override
+    public void render(FluidStorageBlockEntity pStorage, float pPartialTick, PoseStack pPoseStack, MultiBufferSource pBufferSource, int pLight, int pOverlay) {
+        FluidTank tank = pStorage.getFluidTank();
+        FluidStack fluidStack = tank.getFluid();
+        if (!fluidStack.isEmpty()) {
+            assert pStorage.getLevel() != null;
+            BlockPos blockPos = pStorage.getBlockPos();
+            FluidState state = fluidStack.getFluid().defaultFluidState();
+            VertexConsumer spriteBuffer = FluidRenderer.getFluidSpriteBuffer(pStorage.getLevel(), blockPos, fluidStack, pBufferSource, ItemBlockRenderTypes.getRenderLayer(state), FluidRenderer.FluidSpriteType.STILL, FluidRenderer.FluidSpriteType.FLOWING).getRight();
+            IClientFluidTypeExtensions attributes = IClientFluidTypeExtensions.of(state);
+            int color = attributes.getTintColor(state, pStorage.getLevel(), blockPos);
+
+            double height = Math.min(1, fluidStack.getAmount() / (double) tank.getCapacity());
+
+            // Top
+            FluidRenderer.renderFluidFace(spriteBuffer, pPoseStack, new Vec3[]{
+                new Vec3(0, height, 1),
+                new Vec3(1, height, 1),
+                new Vec3(1, height, 0),
+                new Vec3(0, height, 0)
+            }, color, pLight);
+
+            // North
+            FluidRenderer.renderFluidFace(spriteBuffer, pPoseStack, new Vec3[]{
+                new Vec3(1, 0, 0.01),
+                new Vec3(0, 0, 0.01),
+                new Vec3(0, height, 0.01),
+                new Vec3(1, height, 0.01)
+            }, color, pLight);
+
+            // South
+            FluidRenderer.renderFluidFace(spriteBuffer, pPoseStack, new Vec3[]{
+                new Vec3(0, 0, 0.99),
+                new Vec3(1, 0, 0.99),
+                new Vec3(1, height, 0.99),
+                new Vec3(0, height, 0.99)
+            }, color, pLight);
+
+            // East
+            FluidRenderer.renderFluidFace(spriteBuffer, pPoseStack, new Vec3[]{
+                new Vec3(0.99, 0, 1),
+                new Vec3(0.99, 0, 0),
+                new Vec3(0.99, height, 0),
+                new Vec3(0.99, height, 1)
+            }, color, pLight);
+
+            // West
+            FluidRenderer.renderFluidFace(spriteBuffer, pPoseStack, new Vec3[]{
+                new Vec3(0.01, 0, 0),
+                new Vec3(0.01, 0, 1),
+                new Vec3(0.01, height, 1),
+                new Vec3(0.01, height, 0)
+            }, color, pLight);
+
+        }
+    }
+}
diff --git a/src/main/java/dev/quarris/fireandflames/datagen/client/BlockStateGen.java b/src/main/java/dev/quarris/fireandflames/datagen/client/BlockStateGen.java
@@ -23,6 +23,7 @@ protected void registerStatesAndModels() {
         this.simpleBlockWithItem(BlockSetup.FIRE_BRICKS.get(), this.models().cubeAll("fire_bricks", blockTexture(BlockSetup.FIRE_BRICKS.get())));
         this.simpleBlockWithItem(BlockSetup.CRUCIBLE_WINDOW.get(), this.models().cubeColumn("crucible_window", blockTexture(BlockSetup.CRUCIBLE_WINDOW.get()), blockTexture(BlockSetup.FIRE_BRICKS.get())).renderType(RenderType.cutout().name));
         this.simpleBlockWithItem(BlockSetup.CRUCIBLE_DRAIN.get(), this.models().cubeAll("crucible_drain", blockTexture(BlockSetup.CRUCIBLE_DRAIN.get())));
+        this.simpleBlockWithItem(BlockSetup.CRUCIBLE_TANK.get(), this.models().cubeColumn("crucible_tank", blockTexture(BlockSetup.CRUCIBLE_TANK.get()), blockTexture(BlockSetup.FIRE_BRICKS.get())).renderType(RenderType.cutout().name));
 
         var faucetModel = this.models().withExistingParent("crucible_faucet", ModRef.res("block/crucible_faucet_base")).texture("texture", blockTexture(BlockSetup.FIRE_BRICKS.get()));
         this.horizontalBlock(BlockSetup.CRUCIBLE_FAWSIT.get(), faucetModel);
diff --git a/src/main/java/dev/quarris/fireandflames/datagen/client/EnUsLanguageGen.java b/src/main/java/dev/quarris/fireandflames/datagen/client/EnUsLanguageGen.java
@@ -25,6 +25,7 @@ protected void addTranslations() {
         this.addBlock(BlockSetup.CRUCIBLE_CONTROLLER, "Crucible Controller");
         this.addBlock(BlockSetup.CRUCIBLE_WINDOW, "Crucible Window");
         this.addBlock(BlockSetup.CRUCIBLE_DRAIN, "Crucible Drain");
+        this.addBlock(BlockSetup.CRUCIBLE_TANK, "Crucible Fuel Tank");
         this.addBlock(BlockSetup.CRUCIBLE_FAWSIT, "Crucible Fawsit (Faucet)");
         this.addBlock(BlockSetup.CASTING_BASIN, "Casting Basin");
         this.addBlock(BlockSetup.CASTING_TABLE, "Casting Table");
@@ -35,6 +36,8 @@ protected void addTranslations() {
 
         this.add("container.fireandflames.crucible.title", "Crucible");
         this.add("container.fireandflames.crucible.fluid_tank.empty", "Empty");
+        this.add("container.fireandflames.fluid_storage.fluid_amount", "%s - %s mb");
+        this.add("container.fireandflames.fluid_storage.more", "and %s more...");
         this.add("creative_tabs.fireandflames.creative_tab", "Fire and Flames");
         this.add("death.attack.crucible_melting", "%1$s was melted by the heat of the crucible");
         this.add("death.attack.crucible_melting.player", "%1$s was thrown to the pits of the crucible by %2$s");
diff --git a/src/main/java/dev/quarris/fireandflames/datagen/server/BlockTagGen.java b/src/main/java/dev/quarris/fireandflames/datagen/server/BlockTagGen.java
@@ -26,7 +26,8 @@ public BlockTagGen(PackOutput output, CompletableFuture<HolderLookup.Provider> l
     protected void addTags(HolderLookup.Provider pLookup) {
         this.tag(TagSetup.BlockTags.VALID_CRUCIBLE_BLOCKS).add(
             BlockSetup.FIRE_BRICKS.get(),
-            BlockSetup.CRUCIBLE_WINDOW.get()
+            BlockSetup.CRUCIBLE_WINDOW.get(),
+            BlockSetup.CRUCIBLE_TANK.get()
         );
 
         this.tag(BlockTags.MINEABLE_WITH_PICKAXE)
@@ -35,6 +36,7 @@ protected void addTags(HolderLookup.Provider pLookup) {
                 BlockSetup.CRUCIBLE_CONTROLLER.get(),
                 BlockSetup.CRUCIBLE_WINDOW.get(),
                 BlockSetup.CRUCIBLE_DRAIN.get(),
+                BlockSetup.CRUCIBLE_TANK.get(),
                 BlockSetup.CRUCIBLE_FAWSIT.get(),
                 BlockSetup.CASTING_BASIN.get(),
                 BlockSetup.CASTING_TABLE.get()
diff --git a/src/main/java/dev/quarris/fireandflames/datagen/server/ItemTagGen.java b/src/main/java/dev/quarris/fireandflames/datagen/server/ItemTagGen.java
@@ -1,8 +1,6 @@
 package dev.quarris.fireandflames.datagen.server;
 
 import dev.quarris.fireandflames.ModRef;
-import dev.quarris.fireandflames.setup.BlockSetup;
-import dev.quarris.fireandflames.setup.TagSetup;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
diff --git a/src/main/java/dev/quarris/fireandflames/datagen/server/RecipesGen.java b/src/main/java/dev/quarris/fireandflames/datagen/server/RecipesGen.java
@@ -159,6 +159,16 @@ public static void shapedRecipes(RecipeOutput pOutput) {
             .unlockedBy("has_fire_brick", has(ItemSetup.FIRE_BRICK.get()))
             .save(pOutput);
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, BlockSetup.CRUCIBLE_TANK.get())
+            .pattern("BBB")
+            .pattern("BGB")
+            .pattern("BBB")
+            .define('B', ItemSetup.FIRE_BRICK.get())
+            .define('G', Tags.Items.GLASS_BLOCKS)
+            .unlockedBy("has_fire_brick", has(ItemSetup.FIRE_BRICK.get()))
+            .unlockedBy("has_glass", has(Tags.Items.GLASS_BLOCKS))
+            .save(pOutput);
+
         ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, BlockSetup.CRUCIBLE_FAWSIT.get())
             .pattern("B B")
             .pattern(" B ")
diff --git a/src/main/java/dev/quarris/fireandflames/datagen/server/loot/BlockLoot.java b/src/main/java/dev/quarris/fireandflames/datagen/server/loot/BlockLoot.java
@@ -1,11 +1,17 @@
 package dev.quarris.fireandflames.datagen.server.loot;
 
 import dev.quarris.fireandflames.setup.BlockSetup;
+import dev.quarris.fireandflames.setup.DataComponentSetup;
 import dev.quarris.fireandflames.setup.ItemSetup;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.data.loot.BlockLootSubProvider;
 import net.minecraft.world.flag.FeatureFlags;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.storage.loot.LootPool;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.world.level.storage.loot.entries.LootItem;
+import net.minecraft.world.level.storage.loot.functions.CopyComponentsFunction;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 
 import java.util.Set;
@@ -24,10 +30,29 @@ protected void generate() {
         this.dropSelf(BlockSetup.CRUCIBLE_FAWSIT.get());
         this.dropSelf(BlockSetup.CASTING_BASIN.get());
         this.dropSelf(BlockSetup.CASTING_TABLE.get());
+        this.add(BlockSetup.CRUCIBLE_TANK.get(), this::createFluidStorageDrop);
 
         this.add(BlockSetup.FIRE_CLAY.get(), block -> this.createSingleItemTableWithSilkTouch(block, ItemSetup.FIRE_CLAY_BALL, ConstantValue.exactly(4.0F)));
     }
 
+    protected LootTable.Builder createFluidStorageDrop(Block block) {
+        return LootTable.lootTable()
+            .withPool(
+                this.applyExplosionCondition(
+                    block,
+                    LootPool.lootPool()
+                        .setRolls(ConstantValue.exactly(1.0F))
+                        .add(
+                            LootItem.lootTableItem(block)
+                                .apply(
+                                    CopyComponentsFunction.copyComponents(CopyComponentsFunction.Source.BLOCK_ENTITY)
+                                        .include(DataComponentSetup.FLUID_CONTAINER.get())
+                                )
+                        )
+                )
+            );
+    }
+
     @Override
     protected Iterable<Block> getKnownBlocks() {
         return BlockSetup.REGISTRY.getEntries()
diff --git a/src/main/java/dev/quarris/fireandflames/event/handler/SetupEvents.java b/src/main/java/dev/quarris/fireandflames/event/handler/SetupEvents.java
@@ -21,6 +21,7 @@ private static void registerCapabilities(RegisterCapabilitiesEvent event) {
         event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CRUCIBLE_DRAIN.get(), (be, dir) -> be.getCrucibleTank().orElse(null));
         event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CASTING_BASIN.get(), (be, dir) -> be.getTank());
         event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CASTING_TABLE.get(), (be, dir) -> be.getTank());
+        event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CRUCIBLE_TANK.get(), (be, dir) -> be.getFluidTank());
     }
 
 }
diff --git a/src/main/java/dev/quarris/fireandflames/setup/BlockEntitySetup.java b/src/main/java/dev/quarris/fireandflames/setup/BlockEntitySetup.java
@@ -25,6 +25,13 @@ public class BlockEntitySetup {
                 BlockSetup.CRUCIBLE_DRAIN.get()
             ).build(null));
 
+    public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<CrucibleTankBlockEntity>> CRUCIBLE_TANK =
+        REGISTRY.register("crucible_tank",
+            () -> BlockEntityType.Builder.of(
+                CrucibleTankBlockEntity::new,
+                BlockSetup.CRUCIBLE_TANK.get()
+            ).build(null));
+
     public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<CrucibleFawsitBlockEntity>> CRUCIBLE_FAWSIT =
         REGISTRY.register("crucible_fawsit",
             () -> BlockEntityType.Builder.of(
diff --git a/src/main/java/dev/quarris/fireandflames/setup/BlockSetup.java b/src/main/java/dev/quarris/fireandflames/setup/BlockSetup.java
@@ -2,6 +2,7 @@
 
 import dev.quarris.fireandflames.ModRef;
 import dev.quarris.fireandflames.world.block.*;
+import dev.quarris.fireandflames.world.fluid.component.FluidContainerContents;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -15,6 +16,7 @@
 import net.neoforged.neoforge.registries.DeferredRegister;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class BlockSetup {
 
@@ -41,7 +43,7 @@ public class BlockSetup {
             .lightLevel(state -> state.getValue(CrucibleControllerBlock.LIT) ? 15 : 0)
             .sound(SoundType.STONE));
 
-    public static final DeferredBlock<Block> CRUCIBLE_WINDOW = registerBlock("crucible_window", CrucibleWindowBlock::new,
+    public static final DeferredBlock<CrucibleWindowBlock> CRUCIBLE_WINDOW = registerBlock("crucible_window", CrucibleWindowBlock::new,
         BlockBehaviour.Properties.of()
             .mapColor(MapColor.COLOR_ORANGE)
             .requiresCorrectToolForDrops()
@@ -57,6 +59,16 @@ public class BlockSetup {
             .strength(1.0F, 2.0F)
             .sound(SoundType.STONE));
 
+    public static final DeferredBlock<CrucibleTankBlock> CRUCIBLE_TANK = registerBlock("crucible_tank", CrucibleTankBlock::new,
+        BlockBehaviour.Properties.of()
+            .mapColor(MapColor.COLOR_ORANGE)
+            .requiresCorrectToolForDrops()
+            .strength(1.0F, 2.0F)
+            .noOcclusion()
+            .sound(SoundType.STONE)
+            .isViewBlocking(((state, level, pos) -> false)),
+        () -> new Item.Properties().component(DataComponentSetup.FLUID_CONTAINER, FluidContainerContents.EMPTY));
+
     public static final DeferredBlock<CrucibleFawsitBlock> CRUCIBLE_FAWSIT = registerBlock("crucible_faucet", CrucibleFawsitBlock::new,
         BlockBehaviour.Properties.of()
             .forceSolidOn()
@@ -102,6 +114,12 @@ private static <T extends Block> DeferredBlock<T> registerBlock(String name, Fun
         return block;
     }
 
+    private static <T extends Block> DeferredBlock<T> registerBlock(String name, Function<BlockBehaviour.Properties, T> blockSupplier, BlockBehaviour.Properties blockProps, Supplier<Item.Properties> itemProps) {
+        DeferredBlock<T> block = REGISTRY.registerBlock(name, blockSupplier, blockProps);
+        ItemSetup.registerItem(name, () -> new BlockItem(block.get(), itemProps.get()));
+        return block;
+    }
+
     private static <T extends Block> DeferredBlock<T> registerBlockNoItem(String name, Function<BlockBehaviour.Properties, T> blockSupplier, BlockBehaviour.Properties blockProps) {
         return REGISTRY.registerBlock(name, blockSupplier, blockProps);
     }
diff --git a/src/main/java/dev/quarris/fireandflames/setup/DataComponentSetup.java b/src/main/java/dev/quarris/fireandflames/setup/DataComponentSetup.java
@@ -0,0 +1,22 @@
+package dev.quarris.fireandflames.setup;
+
+import dev.quarris.fireandflames.ModRef;
+import dev.quarris.fireandflames.world.fluid.component.FluidContainerContents;
+import net.minecraft.core.component.DataComponentType;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredHolder;
+import net.neoforged.neoforge.registries.DeferredRegister;
+
+public class DataComponentSetup {
+
+    public static final DeferredRegister.DataComponents REGISTRY = DeferredRegister.createDataComponents(ModRef.ID);
+
+    public static final DeferredHolder<DataComponentType<?>, DataComponentType<FluidContainerContents>> FLUID_CONTAINER = REGISTRY.registerComponentType(
+        "fluid_container", builder -> builder.persistent(FluidContainerContents.CODEC).networkSynchronized(FluidContainerContents.STREAM_CODEC).cacheEncoding()
+    );
+
+    public static void init(IEventBus modBus) {
+        REGISTRY.register(modBus);
+    }
+
+}
diff --git a/src/main/java/dev/quarris/fireandflames/setup/ItemSetup.java b/src/main/java/dev/quarris/fireandflames/setup/ItemSetup.java
@@ -9,6 +9,7 @@
 import net.neoforged.neoforge.registries.DeferredRegister;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class ItemSetup {
     public static final DeferredRegister.Items REGISTRY = DeferredRegister.Items.createItems(ModRef.ID);
@@ -20,6 +21,10 @@ public class ItemSetup {
     public static final DeferredItem<BucketItem> MOLTEN_IRON_BUCKET = registerItem("molten_iron_bucket", props -> new BucketItem(FluidSetup.MOLTEN_IRON.get(), props), bucketProperties());
 
     // Helper method
+    public static <T extends Item> DeferredItem<T> registerItem(String name, Supplier<T> itemSupplier) {
+        return REGISTRY.register(name, itemSupplier);
+    }
+
     public static <T extends Item> DeferredItem<T> registerItem(String name, Function<Item.Properties, T> itemSupplier) {
         return REGISTRY.registerItem(name, itemSupplier);
     }
diff --git a/src/main/java/dev/quarris/fireandflames/util/recipe/IFluidOutput.java b/src/main/java/dev/quarris/fireandflames/util/recipe/IFluidOutput.java
@@ -42,7 +42,7 @@ public interface IFluidOutput {
 
     record Stack(FluidStack stack) implements IFluidOutput {
 
-        public static final Codec<Stack> CODEC = FluidStack.CODEC.xmap(Stack::new, Stack::createFluid);
+        public static final Codec<Stack> CODEC = FluidStack.CODEC.xmap(Stack::new, Stack::stack);
 
         public Stack(Fluid fluid, int amount) {
             this(new FluidStack(fluid, amount));
@@ -63,7 +63,7 @@ record Tag(TagKey<Fluid> tag, int amount) implements IFluidOutput {
 
         public static final Codec<Tag> CODEC = RecordCodecBuilder.create(instance -> instance.group(
             TagKey.codec(Registries.FLUID).fieldOf("tag").forGetter(Tag::tag),
-            Codec.INT.fieldOf("count").forGetter(Tag::amount)
+            Codec.INT.fieldOf("amount").forGetter(Tag::amount)
         ).apply(instance, Tag::new));
 
         @Override
diff --git a/src/main/java/dev/quarris/fireandflames/world/block/CrucibleTankBlock.java b/src/main/java/dev/quarris/fireandflames/world/block/CrucibleTankBlock.java
diff --git a/src/main/java/dev/quarris/fireandflames/world/block/FluidStorageBlock.java b/src/main/java/dev/quarris/fireandflames/world/block/FluidStorageBlock.java
diff --git a/src/main/java/dev/quarris/fireandflames/world/block/entity/CrucibleTankBlockEntity.java b/src/main/java/dev/quarris/fireandflames/world/block/entity/CrucibleTankBlockEntity.java
diff --git a/src/main/java/dev/quarris/fireandflames/world/block/entity/FluidStorageBlockEntity.java b/src/main/java/dev/quarris/fireandflames/world/block/entity/FluidStorageBlockEntity.java
diff --git a/src/main/java/dev/quarris/fireandflames/world/crucible/crafting/CastingRecipeSerializer.java b/src/main/java/dev/quarris/fireandflames/world/crucible/crafting/CastingRecipeSerializer.java
diff --git a/src/main/java/dev/quarris/fireandflames/world/fluid/component/FluidContainerContents.java b/src/main/java/dev/quarris/fireandflames/world/fluid/component/FluidContainerContents.java
diff --git a/src/main/resources/assets/fireandflames/textures/block/crucible_fuel_tank.png b/src/main/resources/assets/fireandflames/textures/block/crucible_fuel_tank.png

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ private static void registerCapabilities(RegisterCapabilitiesEvent event) {`
`21`	`21`	`event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CRUCIBLE_DRAIN.get(), (be, dir) -> be.getCrucibleTank().orElse(null));`
`22`	`22`	`event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CASTING_BASIN.get(), (be, dir) -> be.getTank());`
`23`	`23`	`event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CASTING_TABLE.get(), (be, dir) -> be.getTank());`
	`24`	`+ event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, BlockEntitySetup.CRUCIBLE_TANK.get(), (be, dir) -> be.getFluidTank());`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`}`