From 400f38d9198ff622ddb9ca996f9dde01fe524b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Gris?= Date: Mon, 22 Mar 2021 21:58:27 +0100 Subject: [PATCH] impr(tab): user creative inventory tab asset and layout This allow proprely textured GUI without the need to update a resourcepack. --- .../nei/textures/nei_tabbed_sprites.png | Bin 3334 -> 2861 bytes src/codechicken/nei/recipe/GuiRecipeTab.java | 14 +++---- src/codechicken/nei/recipe/GuiRecipeTabs.java | 36 ++++++++++-------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/resources/assets/nei/textures/nei_tabbed_sprites.png b/resources/assets/nei/textures/nei_tabbed_sprites.png index 803f876e4253dd38532540b6ba11d7e7a1c5c3fe..60c131b03b2d8d23dcdbbd459af960cf2e02f6dc 100644 GIT binary patch delta 2540 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 imageMap = new HashMap<>(); public static HashMap> stackMap = new HashMap<>(); - public static final int TAB_WIDTH = 24; - public static final int TAB_HEIGHT = 24; - private static final DrawableResource selectedIcon = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 16, 24, 24).build(); - private static final DrawableResource unselectedIcon = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 24, 16, 24, 24).build(); + public static final int TAB_WIDTH = 28; + public static final int TAB_HEIGHT = 31; + private static final DrawableResource selectedIcon = new DrawableBuilder("minecraft:textures/gui/container/creative_inventory/tabs.png", 28, 32, 28, 32).build(); + private static final DrawableResource unselectedIcon = new DrawableBuilder("minecraft:textures/gui/container/creative_inventory/tabs.png", 28, 0, 28, 30).build(); private final GuiRecipe guiRecipe; private final IRecipeHandler handler; @@ -66,13 +66,13 @@ public class GuiRecipeTab extends Widget { else image = unselectedIcon; final int iconX = x + (w - image.getWidth()) / 2; - final int iconY = y + (h - image.getHeight()) / 2; + final int iconY = y; image.draw(iconX, iconY); } public void drawForeground(int mouseX, int mouseY) { - final int iconX = x + 4; - final int iconY = y + 4; + final int iconX = x + (w - 16) / 2; + final int iconY = y + h - 22; final FontRenderer fontRenderer = GuiDraw.fontRenderer; final DrawableResource icon = getImage(handlerName); diff --git a/src/codechicken/nei/recipe/GuiRecipeTabs.java b/src/codechicken/nei/recipe/GuiRecipeTabs.java index 0aa88e78..d20659c5 100644 --- a/src/codechicken/nei/recipe/GuiRecipeTabs.java +++ b/src/codechicken/nei/recipe/GuiRecipeTabs.java @@ -2,8 +2,9 @@ package codechicken.nei.recipe; import codechicken.nei.Button; import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIClientUtils; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -38,7 +39,7 @@ public class GuiRecipeTabs { area.width = totalWidth; area.height = GuiRecipeTab.TAB_HEIGHT; - area.x = guiRecipe.guiLeft + 2; + area.x = guiRecipe.guiLeft + 4; area.y = guiRecipe.guiTop - GuiRecipeTab.TAB_HEIGHT + 3; pageCount = (int) Math.ceil((float) numHandlers / categoriesPerPage); @@ -56,51 +57,54 @@ public class GuiRecipeTabs { tabs.clear(); buttons.clear(); - int tabX = area.x; - final int startIndex = pageNumber * categoriesPerPage; for (int i = 0 ; i < categoriesPerPage ; i++) { final int index = i + startIndex; if (index >= numHandlers) break; IRecipeHandler handler = guiRecipe.currenthandlers.get(index); + int tabX = area.x + (i * GuiRecipeTab.TAB_WIDTH); tabs.add(new GuiRecipeTab(guiRecipe, handler, tabX, area.y)); - tabX += GuiRecipeTab.TAB_WIDTH; } // Maybe add buttons if (numHandlers > categoriesPerPage) { + Button prevTab = new Button("prevTab") { @Override - public boolean onButtonPress(boolean rightclick) { - if (!rightclick) return previousPage(); - else return false; + public boolean onButtonPress(boolean rightClick) { + if (!rightClick) { + NEIClientUtils.playClickSound(); + return previousPage(); + } else return false; } @Override public String getRenderLabel() { return "<"; } }; - prevTab.x = area.x - 7; - prevTab.y = area.y + 2; - prevTab.h = 20; prevTab.w = 8; + prevTab.h = GuiRecipeTab.TAB_HEIGHT - 4; + prevTab.x = area.x - prevTab.w; + prevTab.y = area.y + 4; buttons.add(prevTab); Button nextTab = new Button("nextTab") { @Override public boolean onButtonPress(boolean rightclick) { - if(!rightclick) return nextPage(); - else return false; + if (!rightclick) { + NEIClientUtils.playClickSound(); + return nextPage(); + } else return false; } @Override public String getRenderLabel() { return ">"; } }; + nextTab.w = prevTab.w; + nextTab.h = prevTab.h; nextTab.x = area.x + area.width; - nextTab.y = area.y + 2; - nextTab.h = 20; - nextTab.w = 8; + nextTab.y = prevTab.y; buttons.add(nextTab); } }