fix: adding some more logic around recipes and books

Author: The-Code-Monkey

src/client/java/com/tcm/MineTale/block/workbenches/screen/CampfireWorkbenchScreen.java

@@ -7,6 +7,7 @@
 import com.tcm.MineTale.recipe.MineTaleRecipeBookComponent;
 import com.tcm.MineTale.registry.ModBlocks;
 import com.tcm.MineTale.registry.ModRecipeDisplay;
+import com.tcm.MineTale.registry.ModRecipes;
 
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.navigation.ScreenPosition;
@@ -44,7 +45,7 @@ private static MineTaleRecipeBookComponent createRecipeBookComponent(CampfireWor
             new RecipeBookComponent.TabInfo(tabIcon.getItem(), ModRecipeDisplay.CAMPFIRE_SEARCH)
         );
 
-        return new MineTaleRecipeBookComponent(menu, tabs);
+        return new MineTaleRecipeBookComponent(menu, tabs, ModRecipes.CAMPFIRE_TYPE);
     }
 
     /**

src/client/java/com/tcm/MineTale/block/workbenches/screen/FurnaceWorkbenchScreen.java

@@ -6,6 +6,7 @@
 import com.tcm.MineTale.block.workbenches.menu.FurnaceWorkbenchMenu;
 import com.tcm.MineTale.recipe.MineTaleRecipeBookComponent;
 import com.tcm.MineTale.registry.ModBlocks;
+import com.tcm.MineTale.registry.ModRecipes;
 
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.navigation.ScreenPosition;
@@ -41,7 +42,7 @@ private static MineTaleRecipeBookComponent createRecipeBookComponent(FurnaceWork
             new RecipeBookComponent.TabInfo(tabIcon.getItem(), RecipeBookCategories.CRAFTING_MISC)
         );
 
-        return new MineTaleRecipeBookComponent(menu, tabs);
+        return new MineTaleRecipeBookComponent(menu, tabs, ModRecipes.FURNACE_TYPE);
     }
 
     @Override

src/client/java/com/tcm/MineTale/datagen/builders/WorkbenchRecipeBuilder.java

@@ -190,6 +190,9 @@ public void save(RecipeOutput recipeOutput, ResourceKey<Recipe<?>> resourceKey)
                 .requirements(AdvancementRequirements.Strategy.OR);
 
         // Add your criteria here (omitted for brevity)
+        for (Map.Entry<String, Criterion<?>> entry : this.criteria.entrySet()) {
+            advancement.addCriterion(entry.getKey(), entry.getValue());
+        }
 
         // 3. Create the Recipe Instance
         WorkbenchRecipe recipe = new WorkbenchRecipe(

src/client/java/com/tcm/MineTale/recipe/MineTaleRecipeBookComponent.java

@@ -15,9 +15,11 @@
 import net.minecraft.world.entity.player.StackedItemContents;
 import net.minecraft.world.inventory.RecipeBookMenu;
 import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.crafting.display.RecipeDisplay;
 
 public class MineTaleRecipeBookComponent extends RecipeBookComponent<RecipeBookMenu> {
+    private final RecipeType<?> filterType; // The specific machine type
 
     // Standard button sprites (the "Filter" checkmark button)
     protected static final WidgetSprites FILTER_BUTTON_SPRITES = new WidgetSprites(
@@ -27,19 +29,31 @@ public class MineTaleRecipeBookComponent extends RecipeBookComponent<RecipeBookM
         Identifier.withDefaultNamespace("recipe_book/filter_disabled_focused")
     );
 
-    public MineTaleRecipeBookComponent(RecipeBookMenu recipeBookMenu, List<TabInfo> list) {
+    public MineTaleRecipeBookComponent(RecipeBookMenu recipeBookMenu, List<TabInfo> list, RecipeType<?> filterType) {
         super(recipeBookMenu, list);
+        this.filterType = filterType;
     }
 
     @Override
     protected void selectMatchingRecipes(RecipeCollection recipeCollection, StackedItemContents stackedItemContents) {
         // Force everything to be "selected"
         // recipeCollection.selectRecipes(stackedItemContents, (recipeDisplay) -> true);
 
+        // recipeCollection.selectRecipes(stackedItemContents, (recipeDisplay) -> {
+        // // Only allow recipes that use your custom Workbench display type
+        // // This effectively filters out vanilla CraftingRecipeDisplays (the boats)
+        //     return recipeDisplay.type() == ModRecipeDisplay.WORKBENCH_TYPE;
+        // });
+
         recipeCollection.selectRecipes(stackedItemContents, (recipeDisplay) -> {
-        // Only allow recipes that use your custom Workbench display type
-        // This effectively filters out vanilla CraftingRecipeDisplays (the boats)
-            return recipeDisplay.type() == ModRecipeDisplay.WORKBENCH_TYPE;
+            // 1. Check if the display matches your custom type
+            if (recipeDisplay.type() != ModRecipeDisplay.WORKBENCH_TYPE) return false;
+
+            // 2. We need to verify if the underlying recipe matches the current block's type
+            // Note: In 1.21+, you may need to cast the display or check the recipe's origin
+            // Here is the logic to ensure we only show recipes meant for THIS specific machine:
+            return recipeDisplay instanceof WorkbenchRecipeDisplay wbDisplay && 
+                   wbDisplay.getRecipeType() == this.filterType;
         });
     }
 

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

@@ -6,27 +6,39 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.tcm.MineTale.registry.ModBlocks;
 import com.tcm.MineTale.registry.ModRecipeDisplay;
+import com.tcm.MineTale.registry.ModRecipes;
 
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.crafting.display.RecipeDisplay;
 import net.minecraft.world.item.crafting.display.SlotDisplay;
 
-public record WorkbenchRecipeDisplay(List<SlotDisplay> ingredients, 
+public record WorkbenchRecipeDisplay(
+    List<SlotDisplay> ingredients, 
     SlotDisplay result, 
-    SlotDisplay craftingStation) implements RecipeDisplay {
+    SlotDisplay craftingStation,
+    RecipeType<?> recipeType
+) implements RecipeDisplay {
 
     public static final MapCodec<WorkbenchRecipeDisplay> CODEC = RecordCodecBuilder.mapCodec(inst -> inst.group(
         SlotDisplay.CODEC.listOf().fieldOf("ingredients").forGetter(WorkbenchRecipeDisplay::ingredients),
         SlotDisplay.CODEC.fieldOf("result").forGetter(WorkbenchRecipeDisplay::result),
-        SlotDisplay.CODEC.fieldOf("crafting_station").forGetter(WorkbenchRecipeDisplay::craftingStation) // Just one fieldOf
+        SlotDisplay.CODEC.fieldOf("crafting_station").forGetter(WorkbenchRecipeDisplay::craftingStation),
+        BuiltInRegistries.RECIPE_TYPE.byNameCodec().fieldOf("recipe_type").forGetter(WorkbenchRecipeDisplay::recipeType)
     ).apply(inst, WorkbenchRecipeDisplay::new));
 
+    // Updated Helper Constructor
     public WorkbenchRecipeDisplay(WorkbenchRecipe recipe) {
         this(
             recipe.ingredients().stream().map(Ingredient::display).toList(),
             new SlotDisplay.ItemStackSlotDisplay(recipe.results().isEmpty() ? ItemStack.EMPTY : recipe.results().get(0)),
-            new SlotDisplay.ItemStackSlotDisplay(new ItemStack(ModBlocks.FURNACE_WORKBENCH_BLOCK_T1))
+            // Dynamic icon: If it's a campfire recipe, show the campfire item in the book
+            new SlotDisplay.ItemStackSlotDisplay(new ItemStack(
+                recipe.getType() == ModRecipes.CAMPFIRE_TYPE ? ModBlocks.CAMPFIRE_WORKBENCH_BLOCK : ModBlocks.FURNACE_WORKBENCH_BLOCK_T1
+            )),
+            recipe.getType()
         );
     }
 
@@ -46,6 +58,10 @@ public RecipeDisplay.Type<WorkbenchRecipeDisplay> type() {
         return ModRecipeDisplay.WORKBENCH_TYPE;
     }
 
+    public RecipeType<?> getRecipeType() {
+        return this.recipeType;
+    }
+
     @Override
     public SlotDisplay craftingStation() {
         // Replace 'ModBlocks.YOUR_WORKBENCH' with your actual block item

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

@@ -5,6 +5,7 @@
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.Identifier;
@@ -17,8 +18,10 @@ public class ModRecipeDisplay {
 		SlotDisplay.STREAM_CODEC.apply(ByteBufCodecs.list()), WorkbenchRecipeDisplay::ingredients,
 		SlotDisplay.STREAM_CODEC, WorkbenchRecipeDisplay::result,
 		SlotDisplay.STREAM_CODEC, WorkbenchRecipeDisplay::craftingStation,
+        ByteBufCodecs.registry(Registries.RECIPE_TYPE), WorkbenchRecipeDisplay::recipeType,
 		// Explicitly define the constructor mapping to avoid the Function3 error
-		(ingredients, result, craftingStation) -> new WorkbenchRecipeDisplay(ingredients, result, craftingStation)
+		(ingredients, result, craftingStation, recipeType) -> 
+            new WorkbenchRecipeDisplay(ingredients, result, craftingStation, recipeType)
 	);
 
     public static final RecipeDisplay.Type<WorkbenchRecipeDisplay> WORKBENCH_TYPE =