#204 Fix render when multiple items are registered for crafting category

mezz · Apr 29, 2016 · 1ecbad6 · 1ecbad6
1 parent 3ee67d3
commit 1ecbad6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/src/main/java/mezz/jei/gui/Focus.java b/src/main/java/mezz/jei/gui/Focus.java
@@ -5,8 +5,11 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
+import mezz.jei.util.StackHelper;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
@@ -158,6 +161,20 @@ public List<Object> getRecipes(@Nonnull IRecipeCategory recipeCategory) {
 		}
 	}
 
+	@Nonnull
+	public Collection<ItemStack> getRecipeCategoryCraftingItems(@Nonnull IRecipeCategory recipeCategory) {
+		IRecipeRegistry recipeRegistry = Internal.getRuntime().getRecipeRegistry();
+		Collection<ItemStack> craftingItems = recipeRegistry.getCraftingItems(recipeCategory);
+		if (stack != null && mode == Mode.INPUT) {
+			StackHelper stackHelper = Internal.getStackHelper();
+			ItemStack matchingStack = stackHelper.containsStack(craftingItems, stack);
+			if (matchingStack != null) {
+				return Collections.singletonList(matchingStack);
+			}
+		}
+		return craftingItems;
+	}
+
 	@Nonnull
 	private List<Object> getInputRecipes(@Nonnull IRecipeRegistry recipeRegistry, @Nonnull IRecipeCategory recipeCategory) {
 		if (stack != null && fluid != null) {

diff --git a/src/main/java/mezz/jei/gui/RecipeGuiLogic.java b/src/main/java/mezz/jei/gui/RecipeGuiLogic.java
@@ -202,9 +202,9 @@ private void updateRecipes() {
 			recipes = Collections.emptyList();
 			recipeCategoryCraftingItems = Collections.emptyList();
 		} else {
-			recipes = state.focus.getRecipes(recipeCategory);
-			IRecipeRegistry recipeRegistry = Internal.getRuntime().getRecipeRegistry();
-			recipeCategoryCraftingItems = recipeRegistry.getCraftingItems(recipeCategory);
+			Focus focus = state.focus;
+			recipes = focus.getRecipes(recipeCategory);
+			recipeCategoryCraftingItems = focus.getRecipeCategoryCraftingItems(recipeCategory);
 		}
 	}
 

diff --git a/src/main/java/mezz/jei/gui/RecipesGui.java b/src/main/java/mezz/jei/gui/RecipesGui.java
@@ -57,6 +57,7 @@ public class RecipesGui extends GuiScreen implements IRecipesGui, IShowsRecipeFo
 	private String title;
 	private ResourceLocation backgroundTexture;
 	private IDrawable recipeCategoryCraftItemBox;
+	private final GuiItemStackGroup recipeCategoryCraftingItem = new GuiItemStackGroup();
 	private HoverChecker titleHoverChecker;
 
 	private GuiButton nextRecipeCategory;
@@ -180,10 +181,6 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 				recipeCategoryCraftItemBox.draw(mc, recipeCraftingItemArea.x, recipeCraftingItemArea.y);
 				GlStateManager.disableAlpha();
 
-				GuiItemStackGroup recipeCategoryCraftingItem = new GuiItemStackGroup();
-				recipeCategoryCraftingItem.init(0, true, recipeCraftingItemArea.x + 5, recipeCraftingItemArea.y + 5);
-				recipeCategoryCraftingItem.set(0, recipeCategoryCraftingItems);
-
 				RenderHelper.enableGUIStandardItemLighting();
 				hoveredItemStack = recipeCategoryCraftingItem.draw(mc, 0, 0, mouseX, mouseY);
 				RenderHelper.disableStandardItemLighting();
@@ -235,15 +232,9 @@ public boolean isMouseOver(int mouseX, int mouseY) {
 	public Focus getFocusUnderMouse(int mouseX, int mouseY) {
 		Rectangle recipeCraftingItemArea = getRecipeCraftingItemArea();
 		if (recipeCraftingItemArea != null && recipeCraftingItemArea.contains(mouseX, mouseY)) {
-			Collection<ItemStack> recipeCategoryCraftingItems = logic.getRecipeCategoryCraftingItems();
-			if (!recipeCategoryCraftingItems.isEmpty()) {
-				GuiItemStackGroup recipeCategoryCraftingItem = new GuiItemStackGroup();
-				recipeCategoryCraftingItem.init(0, true, recipeCraftingItemArea.x + 5, recipeCraftingItemArea.y + 5);
-				recipeCategoryCraftingItem.set(0, recipeCategoryCraftingItems);
-				Focus focus = recipeCategoryCraftingItem.getFocusUnderMouse(0, 0, mouseX, mouseY);
-				if (focus != null) {
-					return focus;
-				}
+			Focus focus = recipeCategoryCraftingItem.getFocusUnderMouse(0, 0, mouseX, mouseY);
+			if (focus != null) {
+				return focus;
 			}
 		}
 
@@ -466,6 +457,15 @@ private void updateLayout() {
 		nextRecipeCategory.enabled = previousRecipeCategory.enabled = logic.hasMultipleCategories();
 
 		pageString = logic.getPageString();
+
+		Collection<ItemStack> recipeCategoryCraftingItems = logic.getRecipeCategoryCraftingItems();
+		if (!recipeCategoryCraftingItems.isEmpty()) {
+			Rectangle recipeCraftingItemArea = getRecipeCraftingItemArea();
+			if (recipeCraftingItemArea != null) {
+				recipeCategoryCraftingItem.init(0, true, recipeCraftingItemArea.x + 5, recipeCraftingItemArea.y + 5);
+				recipeCategoryCraftingItem.set(0, recipeCategoryCraftingItems);
+			}
+		}
 	}
 
 	private void addRecipeTransferButtons(List<RecipeLayout> recipeLayouts) {