Merge pull request #59 from CodeMonkeysMods/Andy/test-inventory-display-items

Implement ingredient list rendering in workbench screen

Author: The-Code-Monkey

.github/workflows/build.yml

@@ -4,7 +4,7 @@
 # against bad commits.
 
 name: build
-on: [pull_request, push]
+on: [push]
 
 jobs:
   build:

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

@@ -35,7 +35,7 @@
 import net.minecraft.world.item.crafting.display.SlotDisplayContext;
 import net.minecraft.network.chat.Component;
 
-public class ArmorersWorkbenchScreen extends AbstractRecipeBookScreen<ArmorersWorkbenchMenu> {
+public class ArmorersWorkbenchScreen extends ModAbstractContainerScreen<ArmorersWorkbenchMenu> {
     private static final Identifier TEXTURE = 
         Identifier.fromNamespaceAndPath(MineTale.MOD_ID, "textures/gui/container/workbench_workbench.png");
 
@@ -190,6 +190,9 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             this.craftOneBtn.active = canCraftOne;
             this.craftTenBtn.active = canCraftTen;
             this.craftAllBtn.active = canCraftMoreThanOne;
+
+            // NEW: Render the Ingredients List
+            this.renderIngredientList(graphics, selectedEntry, mouseX, mouseY);
         } else {
             this.craftOneBtn.active = false;
             this.craftTenBtn.active = false;

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

@@ -20,7 +20,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.navigation.ScreenPosition;
-import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.core.Holder;
@@ -34,8 +33,9 @@
 import net.minecraft.world.item.crafting.display.RecipeDisplayId;
 import net.minecraft.world.item.crafting.display.SlotDisplayContext;
 import net.minecraft.network.chat.Component;
+import org.jspecify.annotations.NonNull;
 
-public class BuildersWorkbenchScreen extends AbstractRecipeBookScreen<BuildersWorkbenchMenu> {
+public class BuildersWorkbenchScreen extends ModAbstractContainerScreen<BuildersWorkbenchMenu> {
     private static final Identifier TEXTURE = 
         Identifier.fromNamespaceAndPath(MineTale.MOD_ID, "textures/gui/container/workbench_workbench.png");
 
@@ -159,35 +159,33 @@ protected void renderBg(GuiGraphics guiGraphics, float f, int i, int j) {
    }
 
     @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+    public void render(@NonNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         renderBackground(graphics, mouseX, mouseY, delta);
         super.render(graphics, mouseX, mouseY, delta);
 
-        // 1. Get the current selection from the book
         RecipeDisplayId currentId = this.mineTaleRecipeBook.getSelectedRecipeId();
-        
-        // 2. If it's NOT null, remember it!
         if (currentId != null) {
             this.lastKnownSelectedId = currentId;
         }
 
-        // 3. Use the remembered ID to find the entry for button activation
         RecipeDisplayEntry selectedEntry = null;
         if (this.lastKnownSelectedId != null && this.minecraft.level != null) {
             ClientRecipeBook book = this.minecraft.player.getRecipeBook();
             selectedEntry = ((ClientRecipeBookAccessor) book).getKnown().get(this.lastKnownSelectedId);
         }
 
-        // 2. Button Activation Logic
         if (selectedEntry != null) {
-            // We use the entry directly. It contains the 15 ingredients needed!
+            // Existing Button Logic
             boolean canCraftOne = canCraft(this.minecraft.player, selectedEntry, 1);
             boolean canCraftMoreThanOne = canCraft(this.minecraft.player, selectedEntry, 2);
             boolean canCraftTen = canCraft(this.minecraft.player, selectedEntry, 10);
 
             this.craftOneBtn.active = canCraftOne;
             this.craftTenBtn.active = canCraftTen;
             this.craftAllBtn.active = canCraftMoreThanOne;
+
+            // NEW: Render the Ingredients List
+            this.renderIngredientList(graphics, selectedEntry, mouseX, mouseY);
         } else {
             this.craftOneBtn.active = false;
             this.craftTenBtn.active = false;
@@ -296,4 +294,4 @@ protected ScreenPosition getRecipeBookButtonPosition() {
         // Usually 5 pixels in from the left and 49 pixels up from the center
         return new ScreenPosition(guiLeft + 5, guiTop + this.imageHeight / 2 - 49);
     }
-}
+}

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

@@ -35,7 +35,7 @@
 import net.minecraft.world.item.crafting.display.SlotDisplayContext;
 import net.minecraft.network.chat.Component;
 
-public class FarmersWorkbenchScreen extends AbstractRecipeBookScreen<FarmersWorkbenchMenu> {
+public class FarmersWorkbenchScreen extends ModAbstractContainerScreen<FarmersWorkbenchMenu> {
     private static final Identifier TEXTURE = 
         Identifier.fromNamespaceAndPath(MineTale.MOD_ID, "textures/gui/container/workbench_workbench.png");
 
@@ -198,6 +198,9 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             this.craftOneBtn.active = canCraftOne;
             this.craftTenBtn.active = canCraftTen;
             this.craftAllBtn.active = canCraftMoreThanOne;
+
+            // NEW: Render the Ingredients List
+            this.renderIngredientList(graphics, selectedEntry, mouseX, mouseY);
         } else {
             this.craftOneBtn.active = false;
             this.craftTenBtn.active = false;

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

@@ -0,0 +1,96 @@
+package com.tcm.MineTale.block.workbenches.screen;
+
+import com.tcm.MineTale.block.workbenches.menu.AbstractWorkbenchContainerMenu;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen;
+import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
+import net.minecraft.core.Holder;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.display.RecipeDisplayEntry;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+
+public abstract class ModAbstractContainerScreen<T extends AbstractWorkbenchContainerMenu> extends AbstractRecipeBookScreen<T> {
+
+    public ModAbstractContainerScreen(T recipeBookMenu, RecipeBookComponent<?> recipeBookComponent, Inventory inventory, Component component) {
+        super(recipeBookMenu, recipeBookComponent, inventory, component);
+    }
+
+    protected void renderIngredientList(GuiGraphics graphics, RecipeDisplayEntry entry, int mouseX, int mouseY) {
+        Optional<List<Ingredient>> reqs = entry.craftingRequirements();
+        if (reqs.isEmpty()) return;
+
+        // Group requirements to avoid duplicate rows for the same item type
+        Map<List<Holder<Item>>, Integer> aggregated = new HashMap<>();
+        Map<List<Holder<Item>>, Ingredient> holderToIng = new HashMap<>();
+
+        for (Ingredient ing : reqs.get()) {
+            List<Holder<Item>> key = ing.items().toList();
+            aggregated.put(key, aggregated.getOrDefault(key, 0) + 1);
+            holderToIng.putIfAbsent(key, ing);
+        }
+
+        int startX = this.leftPos + 8; // Adjust to fit your texture's empty space
+        int startY = this.topPos + 20;
+        int rowHeight = 20;
+        int index = 0;
+
+        for (Map.Entry<List<Holder<Item>>, Integer> reqEntry : aggregated.entrySet()) {
+            Ingredient ing = holderToIng.get(reqEntry.getKey());
+            int amountNeeded = reqEntry.getValue();
+            int currentY = startY + (index * rowHeight);
+
+            // Calculate total available (Inv + Nearby)
+            int available = getAvailableCount(ing);
+
+            // Draw Item Icon
+            // Inside your loop
+            ItemStack[] variants = ing.items().map(ItemStack::new).toArray(ItemStack[]::new);
+            if (variants.length > 0) {
+                long time = System.currentTimeMillis() / 1000;
+                ItemStack displayStack = variants[(int) (time % variants.length)];
+
+                graphics.renderFakeItem(displayStack, startX, currentY);
+
+                int color = (available < amountNeeded) ? 0xFFFF5555 : 0xFFFFFFFF; // Added alpha channel
+                String progress = available + "/" + amountNeeded;
+                graphics.drawString(this.font, progress, startX + 22, currentY + 4, color);
+
+                if (mouseX >= startX && mouseX <= startX + 16 && mouseY >= currentY && mouseY <= currentY + 16) {
+                    graphics.setTooltipForNextFrame(this.font, displayStack, mouseX, mouseY);
+                }
+            }
+            index++;
+        }
+    }
+
+    private int getAvailableCount(Ingredient ingredient) {
+        int found = 0;
+        // Check Player Inventory
+        // Use getContainerSize() and getItem(i) for safe access
+        Inventory inv = this.minecraft.player.getInventory();
+        for (int i = 0; i < inv.getContainerSize(); i++) {
+            ItemStack stack = inv.getItem(i);
+            if (ingredient.test(stack)) {
+                found += stack.getCount();
+            }
+        }
+
+        // Check Networked Nearby Items
+        if (this.menu instanceof AbstractWorkbenchContainerMenu workbenchMenu) {
+            for (ItemStack stack : workbenchMenu.getNetworkedNearbyItems()) {
+                if (ingredient.test(stack)) found += stack.getCount();
+            }
+        }
+        return found;
+    }
+}

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

@@ -35,7 +35,7 @@
 import net.minecraft.world.item.crafting.display.SlotDisplayContext;
 import net.minecraft.network.chat.Component;
 
-public class WorkbenchWorkbenchScreen extends AbstractRecipeBookScreen<WorkbenchWorkbenchMenu> {
+public class WorkbenchWorkbenchScreen extends ModAbstractContainerScreen<WorkbenchWorkbenchMenu> {
     private static final Identifier TEXTURE = 
         Identifier.fromNamespaceAndPath(MineTale.MOD_ID, "textures/gui/container/workbench_workbench.png");
 
@@ -197,6 +197,9 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             this.craftOneBtn.active = canCraftOne;
             this.craftTenBtn.active = canCraftTen;
             this.craftAllBtn.active = canCraftMoreThanOne;
+
+            // NEW: Render the Ingredients List
+            this.renderIngredientList(graphics, selectedEntry, mouseX, mouseY);
         } else {
             this.craftOneBtn.active = false;
             this.craftTenBtn.active = false;

src/main/java/com/tcm/MineTale/block/workbenches/menu/AbstractWorkbenchContainerMenu.java

@@ -1,7 +1,6 @@
 package com.tcm.MineTale.block.workbenches.menu;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import org.jspecify.annotations.Nullable;