diff --git a/build.properties b/build.properties index de778dba..e62aba87 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.1.12-GTNH +mod_version=2.1.13-GTNH diff --git a/src/codechicken/nei/recipe/GuiRecipe.java b/src/codechicken/nei/recipe/GuiRecipe.java index 2e519e88..8029ee53 100644 --- a/src/codechicken/nei/recipe/GuiRecipe.java +++ b/src/codechicken/nei/recipe/GuiRecipe.java @@ -36,6 +36,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.IntStream; public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler { // Background image calculations @@ -172,6 +173,18 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve initOverlayButtons(); } + public IRecipeHandler getHandler() { + return handler; + } + + public List getRecipeIndices() { + final int recipesPerPage = getRecipesPerPage(); + int minIndex = page * recipesPerPage; + int maxIndex = Math.min(handler.numRecipes(), (page + 1) * recipesPerPage); + + return IntStream.range(minIndex, maxIndex).boxed().collect(Collectors.toList()); + } + @Override public void keyTyped(char c, int i) { @@ -183,8 +196,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve if (GuiContainerManager.getManager(this).lastKeyTyped(i, c)) return; - final int recipesPerPage = getRecipesPerPage(); - for (int recipe = page * recipesPerPage; recipe < handler.numRecipes() && recipe < (page + 1) * recipesPerPage; recipe++) + for (int recipe : getRecipeIndices()) if (handler.keyTyped(this, c, i, recipe)) return; @@ -205,8 +217,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve @Override protected void mouseClicked(int x, int y, int button) { - final int recipesPerPage = getRecipesPerPage(); - for (int recipe = page * recipesPerPage; recipe < handler.numRecipes() && recipe < (page + 1) * recipesPerPage; recipe++) + for (int recipe : getRecipeIndices()) if (handler.mouseClicked(this, button, recipe)) return; if (recipeTabs.mouseClicked(x, y, button)) @@ -214,10 +225,21 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve super.mouseClicked(x, y, button); } + @Override + public void mouseScrolled(int i) { + for (int recipe : getRecipeIndices()) + if (handler.mouseScrolled(this, i, recipe)) + return; + + if (new Rectangle(guiLeft, guiTop, xSize, ySize).contains(GuiDraw.getMousePosition())) { + if (i > 0) prevPage(); + else nextPage(); + } + } + @Override protected void actionPerformed(GuiButton guibutton) { super.actionPerformed(guibutton); - final int recipesPerPage = getRecipesPerPage(); switch (guibutton.id) { case 0: prevType(); @@ -233,7 +255,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve return; } if (overlayButtons != null && guibutton.id >= OVERLAY_BUTTON_ID_START && guibutton.id < OVERLAY_BUTTON_ID_START + overlayButtons.length) { - overlayRecipe(page * recipesPerPage + guibutton.id - OVERLAY_BUTTON_ID_START); + overlayRecipe(page * getRecipesPerPage() + guibutton.id - OVERLAY_BUTTON_ID_START); } } @@ -246,8 +268,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve @Override public List handleTooltip(GuiContainer gui, int mousex, int mousey, List currenttip) { - final int recipesPerPage = getRecipesPerPage(); - /* + /* * Several mods try to figure out the relative mouse position for fluid tooltips. This worked fine * when it was a static 166.. however now that we're scaling it this no longer works. Rather than * patching the individual mods (so that we can be as compatible as possible), we'll just fake @@ -257,9 +278,8 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve // Begin Hax final int oldHeight = this.height; this.height = 166 + handlerInfo.getHeight() + 18 + (guiTop - 44) * 2; - for (int i = page * recipesPerPage; i < handler.numRecipes() && i < (page + 1) * recipesPerPage; i++) { + for (int i : getRecipeIndices()) currenttip = handler.handleTooltip(this, currenttip, i); - } recipeTabs.handleTooltip(mousex, mousey, currenttip); this.height = oldHeight; // End Hax @@ -269,8 +289,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve @Override public List handleItemTooltip(GuiContainer gui, ItemStack stack, int mousex, int mousey, List currenttip) { - final int recipesPerPage = getRecipesPerPage(); - for (int i = page * recipesPerPage; i < handler.numRecipes() && i < (page + 1) * recipesPerPage; i++) + for (int i : getRecipeIndices()) currenttip = handler.handleItemTooltip(this, stack, currenttip, i); return currenttip; @@ -532,14 +551,6 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve return new Point(5, 32 + yShift + ((recipe % getRecipesPerPage()) * handlerInfo.getHeight())); } - @Override - public void mouseScrolled(int i) { - if (new Rectangle(guiLeft, guiTop, xSize, ySize).contains(GuiDraw.getMousePosition())) { - if (i > 0) prevPage(); - else nextPage(); - } - } - public abstract ArrayList getCurrentRecipeHandlers(); @Override diff --git a/src/codechicken/nei/recipe/IRecipeHandler.java b/src/codechicken/nei/recipe/IRecipeHandler.java index 1d0dbd65..36d57653 100644 --- a/src/codechicken/nei/recipe/IRecipeHandler.java +++ b/src/codechicken/nei/recipe/IRecipeHandler.java @@ -120,6 +120,7 @@ public interface IRecipeHandler * @return true to terminate further processing of this event. */ public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe); + /** * * @param gui An instance of the currentscreen @@ -127,4 +128,15 @@ public interface IRecipeHandler * @return true to terminate further processing of this event. */ public boolean mouseClicked(GuiRecipe gui, int button, int recipe); + + /** + * For legacy compatibility reasons, this method has a do-nothing default implementation. + * + * @param gui An instance of the currentscreen + * @param scroll The scroll direction, {> 0 = Up, < 0 = Down} + * @return true to terminate further processing of this event. + */ + default boolean mouseScrolled(GuiRecipe gui, int scroll, int recipe) { + return false; + } } diff --git a/src/codechicken/nei/recipe/RecipeItemInputHandler.java b/src/codechicken/nei/recipe/RecipeItemInputHandler.java index 2128dec0..094d0f15 100644 --- a/src/codechicken/nei/recipe/RecipeItemInputHandler.java +++ b/src/codechicken/nei/recipe/RecipeItemInputHandler.java @@ -16,13 +16,13 @@ public class RecipeItemInputHandler implements IContainerInputHandler ItemStack stackover = GuiContainerManager.getStackMouseOver(gui); if(stackover == null) return false; - - if(keyCode == NEIClientConfig.getKeyBinding("gui.usage") || (keyCode == NEIClientConfig.getKeyBinding("gui.recipe") && NEIClientUtils.shiftKey())) - return GuiUsageRecipe.openRecipeGui("item", stackover.copy()); - + if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) return GuiCraftingRecipe.openRecipeGui("item", stackover.copy()); + if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) + return GuiUsageRecipe.openRecipeGui("item", stackover.copy()); + if(keyCode == NEIClientConfig.getKeyBinding("gui.bookmark")) { NEIClientConfig.logger.debug("Adding or removing {} from bookmarks", stackover.getDisplayName()); ItemPanels.bookmarkPanel.addOrRemoveItem(stackover.copy()); diff --git a/src/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/codechicken/nei/recipe/TemplateRecipeHandler.java index cda0791c..c614d936 100644 --- a/src/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -639,6 +639,11 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH return false; } + @Override + public boolean mouseScrolled(GuiRecipe gui, int scroll, int recipe) { + return false; + } + private boolean transferRect(GuiRecipe gui, int recipe, boolean usage) { Point offset = gui.getRecipePosition(recipe); return transferRect(gui, transferRects, offset.x, offset.y, usage);