From 10c23261840fc63fa2b16a0e9b85d117b8e43999 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Tue, 4 Feb 2020 20:11:17 -0800 Subject: [PATCH] Fix the underlying problem -- Bad X! --- build/build.properties | 2 +- src/codechicken/nei/BookmarkPanel.java | 6 +++++- src/codechicken/nei/ItemPanel.java | 6 +++++- .../nei/recipe/RecipeItemInputHandler.java | 11 ----------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/build/build.properties b/build/build.properties index 4747320f..c468dfeb 100644 --- a/build/build.properties +++ b/build/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.0.0-beta-5-GTNH +mod_version=2.0.0-beta-6-GTNH diff --git a/src/codechicken/nei/BookmarkPanel.java b/src/codechicken/nei/BookmarkPanel.java index 308759a3..1dfb21e1 100644 --- a/src/codechicken/nei/BookmarkPanel.java +++ b/src/codechicken/nei/BookmarkPanel.java @@ -129,6 +129,10 @@ public class BookmarkPanel extends ItemPanel { return false; } + @Override + public int getX(GuiContainer gui) { + return 5; + } @Override public int getMarginLeft() { @@ -162,7 +166,7 @@ public class BookmarkPanel extends ItemPanel { } public int getWidth(GuiContainer gui) { - return LayoutManager.getLeftSize(gui) - x; + return LayoutManager.getLeftSize(gui) - ( (gui.xSize + gui.width) / 2 + 3 ); } diff --git a/src/codechicken/nei/ItemPanel.java b/src/codechicken/nei/ItemPanel.java index a3b2c3e8..5a1273ef 100644 --- a/src/codechicken/nei/ItemPanel.java +++ b/src/codechicken/nei/ItemPanel.java @@ -107,6 +107,10 @@ public class ItemPanel extends Widget { }; } + public int getX(GuiContainer gui) { + return (gui.xSize + gui.width) / 2 + 3; + } + public int getMarginLeft() { return x + (w % 18) / 2; } @@ -177,7 +181,7 @@ public class ItemPanel extends Widget { pageLabel.text = getLabelText(); y = prev.h + prev.y; - x = (gui.xSize + gui.width) / 2 + 3; + x = getX(gui); w = getWidth(gui); h = getHeight(gui); diff --git a/src/codechicken/nei/recipe/RecipeItemInputHandler.java b/src/codechicken/nei/recipe/RecipeItemInputHandler.java index 3021d2e8..2128dec0 100644 --- a/src/codechicken/nei/recipe/RecipeItemInputHandler.java +++ b/src/codechicken/nei/recipe/RecipeItemInputHandler.java @@ -39,17 +39,6 @@ public class RecipeItemInputHandler implements IContainerInputHandler if(stackover == null) return false; - if(mousex < ItemPanels.bookmarkPanel.w) { - if (NEIClientConfig.canCheatItem(stackover)) - NEIClientUtils.cheatItem(stackover, button, -1); - else { - if (button == 0) - return GuiCraftingRecipe.openRecipeGui("item", stackover.copy()); - if (button == 1) - return GuiUsageRecipe.openRecipeGui("item", stackover.copy()); - } - } - if (!(gui instanceof GuiRecipe)) return false;