fix: abstracted furnace logic to an abstract

Author: The-Code-Monkey

src/main/java/com/tcm/MineTale/MineTale.java

@@ -34,12 +34,21 @@ public class MineTale implements ModInitializer {
 	 */
 	@Override
 	public void onInitialize() {
+		// 1. Blocks first - They are the foundation
 		ModBlocks.initialize();
-		ModRecipes.initialize();
+
+		// 2. Items second - Many blocks have associated BlockItems
+		ModItems.initialize();
+
+		// 3. Block Entities third - They now have non-null Blocks to reference
 		ModBlockEntities.initialize();
-		ModMenuTypes.initialize();
+
+		// 4. Entities & Menus - These depend on the objects above
 		ModEntities.initialize();
-		ModItems.initialize();
+		ModMenuTypes.initialize();
+
+		// 5. Recipes last - These depend on Items, Blocks, and Entities existing
+		ModRecipes.initialize();
 
 		Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, MINETALE_CREATIVE_TAB_KEY, MINETALE_CREATIVE_TAB);
 

src/main/java/com/tcm/MineTale/block/workbenches/AbstractWorkbench.java

@@ -37,18 +37,24 @@ public abstract class AbstractWorkbench<E extends AbstractWorkbenchEntity> exten
     protected final Supplier<BlockEntityType<? extends E>> blockEntityType;
     protected final boolean isWide;
     protected final boolean isTall;
+    protected int tier;
 
-    protected AbstractWorkbench(Properties properties, Supplier<BlockEntityType<? extends E>> supplier, boolean isWide, boolean isTall) {
+    protected AbstractWorkbench(Properties properties, Supplier<BlockEntityType<? extends E>> supplier, boolean isWide, boolean isTall, int tier) {
         super(properties);
         this.blockEntityType = supplier;
         this.isWide = isWide;
         this.isTall = isTall;
+        this.tier = tier;
         this.registerDefaultState(this.stateDefinition.any()
                 .setValue(FACING, Direction.NORTH)
                 .setValue(HALF, DoubleBlockHalf.LOWER)
                 .setValue(TYPE, ChestType.SINGLE));
     }
 
+    public int getTier() {
+        return this.tier;
+    }
+
     @Override
     @Nullable
     public BlockState getStateForPlacement(BlockPlaceContext context) {
@@ -144,29 +150,17 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
         builder.add(FACING, HALF, TYPE);
     }
 
-    /**
-     * Create the block entity for the primary anchor of a multipart workbench.
-     *
-     * @param pos   the position where the block entity would be created
-     * @param state the block state at the position
-     * @return the new block entity when this block is the primary anchor (lower half with TYPE `LEFT` or `SINGLE`), or `null` if this block is a secondary part
-     */
     @Nullable
     @Override
     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
-        // We only want a Block Entity at the 'primary' anchor point of the structure.
-        // For 1x1: HALF=LOWER, TYPE=SINGLE
-        // For 2x1: HALF=LOWER, TYPE=LEFT
-        // For 2x2: HALF=LOWER, TYPE=LEFT
-        
         boolean isLower = state.getValue(HALF) == DoubleBlockHalf.LOWER;
         ChestType type = state.getValue(TYPE);
 
-        // If it's the RIGHT side of a wide block, or the UPPER half of a tall block, return null.
+        // Only the Master block gets the entity
         if (isLower && (type == ChestType.LEFT || type == ChestType.SINGLE)) {
+            // We call create() on the supplier we were given in the constructor
             return this.blockEntityType.get().create(pos, state);
         }
-        
         return null;
     }
 

src/main/java/com/tcm/MineTale/block/workbenches/CampfireWorkbench.java

@@ -39,7 +39,7 @@ public class CampfireWorkbench extends AbstractWorkbench<CampfireWorkbenchEntity
      */
     public CampfireWorkbench(Properties properties) {
         // Hardcode the supplier and sounds here if they never change
-        super(properties, () -> ModBlockEntities.CAMPFIRE_WORKBENCH_BE, IS_WIDE, IS_TALL);
+        super(properties, () -> ModBlockEntities.CAMPFIRE_WORKBENCH_BE, IS_WIDE, IS_TALL, 1);
     }
 
     /**
@@ -50,7 +50,7 @@ public CampfireWorkbench(Properties properties) {
      */
     public CampfireWorkbench(Properties properties, Supplier<BlockEntityType<? extends CampfireWorkbenchEntity>> supplier) {
         // isWide = false, isTall = false (1x1 footprint)
-        super(properties, supplier, IS_WIDE, IS_TALL);
+        super(properties, supplier, IS_WIDE, IS_TALL, 1);
     }
 
     /**

src/main/java/com/tcm/MineTale/block/workbenches/FurnaceWorkbench.java

@@ -1,12 +1,13 @@
 package com.tcm.MineTale.block.workbenches;
 
-import java.util.function.Supplier;
-
 import org.jetbrains.annotations.Nullable;
 
+import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.tcm.MineTale.block.workbenches.entity.FurnaceWorkbenchEntity;
-import com.tcm.MineTale.registry.ModBlockEntities;
+import com.tcm.MineTale.registry.ModTiers;
+import com.tcm.MineTale.registry.ModTiers.FurnaceTier;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
@@ -21,26 +22,33 @@ public class FurnaceWorkbench extends AbstractWorkbench<FurnaceWorkbenchEntity>
     private static final boolean IS_WIDE = true;
     private static final boolean IS_TALL = true;
 
-    public static final MapCodec<FurnaceWorkbench> CODEC = simpleCodec(FurnaceWorkbench::new);
+    public static final MapCodec<FurnaceWorkbench> CODEC = RecordCodecBuilder.mapCodec(instance -> 
+        instance.group(
+            // This handles the standard block properties
+            propertiesCodec(), 
+            // This handles the tier (assuming FurnaceTier is a record/enum with its own codec)
+            Codec.INT.fieldOf("tier").forGetter(block -> block.getTier())
+        ).apply(instance, (props, id) -> new FurnaceWorkbench(props, ModTiers.getTierFromInt(id)))
+    );
 
     /**
      * Creates a FurnaceWorkbench using the default furnace workbench block entity type and a 2×2 footprint.
      *
      * @param properties block properties for this workbench
      */
-    public FurnaceWorkbench(Properties properties) {
-        super(properties, () -> ModBlockEntities.FURNACE_WORKBENCH_BE, IS_WIDE, IS_TALL);
+    public FurnaceWorkbench(Properties properties, FurnaceTier tier) {
+        super(properties, () -> ModTiers.TIER_MAP.get(tier), IS_WIDE, IS_TALL, tier.id());
     }
 
-    /**
-     * Creates a FurnaceWorkbench that uses a custom BlockEntityType supplier and a 2x2 footprint.
-     *
-     * @param properties block properties for this workbench
-     * @param supplier supplies the BlockEntityType to use for the workbench's master block entity
-     */
-    public FurnaceWorkbench(Properties properties, Supplier<BlockEntityType<? extends FurnaceWorkbenchEntity>> supplier) {
-        super(properties, supplier, IS_WIDE, IS_TALL);
-    }
+    // /**
+    //  * Creates a FurnaceWorkbench that uses a custom BlockEntityType supplier and a 2x2 footprint.
+    //  *
+    //  * @param properties block properties for this workbench
+    //  * @param supplier supplies the BlockEntityType to use for the workbench's master block entity
+    //  */
+    // public FurnaceWorkbench(Properties properties, Supplier<BlockEntityType<? extends FurnaceWorkbenchEntity>> supplier) {
+    //     super(properties, supplier, IS_WIDE, IS_TALL, 1);
+    // }
 
     /**
      * Ensures the block is rendered using its model so the 2x2 workbench model is visible.
@@ -72,26 +80,13 @@ public RenderShape getRenderShape(BlockState state) {
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> type) {
         // Only the Master block (Lower-Left) should tick to process smelting
         // This helper ensures the logic only runs on the Server side for our specific BE
-        return createTickerHelper(type, ModBlockEntities.FURNACE_WORKBENCH_BE, (lvl, pos, st, be) -> {
+        return createTickerHelper(type, ModTiers.TIER_MAP.get(ModTiers.getTierFromInt(this.tier)), (lvl, pos, st, be) -> {
             if (be instanceof FurnaceWorkbenchEntity furnace) {
                 furnace.tick(lvl, pos, st);
             }
         });
     }
 
-    /**
-     * Create the block entity for this block; only the master block of the multi-block workbench receives an entity.
-     *
-     * @return the created {@link BlockEntity} for the master block, or `null` if this position does not host an entity
-     */
-    @Nullable
-    @Override
-    public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
-        // AbstractWorkbench logic ensures only the Master block gets the entity.
-        // We override it here to point specifically to our Furnace entity.
-        return super.newBlockEntity(pos, state);
-    }
-
 	/**
      * Supply the codec used to serialize and deserialize this FurnaceWorkbench.
      *