diff --git a/dependencies.gradle b/dependencies.gradle index 235582cf..cff32445 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev') - implementation('com.github.GTNewHorizons:GTNHLib:0.8.0:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.9.6:dev') shadowImplementation('org.apache.commons:commons-csv:1.10.0') diff --git a/settings.gradle b/settings.gradle index 3739e17e..82928f76 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49' } diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index c6cf4fa0..dfe92f91 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -104,7 +104,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public static Button delete; public static ButtonCycled gamemode; public static Button rain; - public static Button magnet; + public static ButtonCycled magnet; public static Button[] timeButtons = new Button[4]; public static Button heal; @@ -600,7 +600,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return getStateTip("rain", state); } }; - magnet = new Button() { + magnet = new ButtonCycled(2) { @Override public boolean onButtonPress(boolean rightclick) { diff --git a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java index 0c0f1bdf..521dc64e 100644 --- a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java +++ b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java @@ -31,7 +31,8 @@ public class LayoutStyleMinecraft extends LayoutStyle { LayoutManager.gamemode.icons[0] = new Image(132, 12, 12, 12); LayoutManager.gamemode.icons[1] = new Image(156, 12, 12, 12); LayoutManager.gamemode.icons[2] = new Image(168, 12, 12, 12); - LayoutManager.magnet.icon = new Image(180, 24, 12, 12); + LayoutManager.magnet.icons[0] = new Image(180, 24, 12, 12); + LayoutManager.magnet.icons[1] = new Image(180, 36, 12, 12); LayoutManager.timeButtons[0].icon = new Image(132, 24, 12, 12); LayoutManager.timeButtons[1].icon = new Image(120, 24, 12, 12); LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12); @@ -86,6 +87,7 @@ public class LayoutStyleMinecraft extends LayoutStyle { LayoutManager.options.index = NEIClientConfig.getCheatMode(); LayoutManager.magnet.state = 0x4 | (NEIClientConfig.getMagnetMode() ? 1 : 0); + LayoutManager.magnet.index = (LayoutManager.magnet.state & 0x1) != 0 ? 1 : 0; if (NEIClientConfig.canPerformAction("delete")) { layoutButton(LayoutManager.delete); diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java index b11a5c14..ea236100 100644 --- a/src/main/java/codechicken/nei/NEIClientUtils.java +++ b/src/main/java/codechicken/nei/NEIClientUtils.java @@ -11,7 +11,6 @@ import static codechicken.nei.NEIClientConfig.world; import java.awt.Color; import java.io.PrintWriter; import java.io.StringWriter; -import java.math.BigInteger; import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -126,18 +125,6 @@ public class NEIClientUtils extends NEIServerUtils { }); } - public static String formatNumbers(BigInteger aNumber) { - return getDecimalFormat().format(aNumber); - } - - public static String formatNumbers(long aNumber) { - return getDecimalFormat().format(aNumber); - } - - public static String formatNumbers(double aNumber) { - return getDecimalFormat().format(aNumber); - } - public static void deleteHeldItem() { deleteSlotStack(-999); } @@ -413,18 +400,11 @@ public class NEIClientUtils extends NEIServerUtils { if (textWidth > containerWidth) { int dots = fontRenderer.getStringWidth("..."); - if (containerWidth > dots) { - textWidth += dots; - - while (textWidth > containerWidth) { - textWidth -= fontRenderer.getCharWidth(text.charAt(text.length() - 1)); - text = text.substring(0, text.length() - 1); - } - - return text + "..."; + if (containerWidth <= dots) { + return "..."; } - return "..."; + return fontRenderer.trimStringToWidth(text, containerWidth - dots) + "..."; } return text; diff --git a/src/main/java/codechicken/nei/SearchField.java b/src/main/java/codechicken/nei/SearchField.java index b35e0f33..62bf8790 100644 --- a/src/main/java/codechicken/nei/SearchField.java +++ b/src/main/java/codechicken/nei/SearchField.java @@ -315,6 +315,9 @@ public class SearchField extends TextField implements ItemFilterProvider { public static String getEscapedSearchText(String text) { text = EnumChatFormatting.getTextWithoutFormattingCodes(text); + boolean addQuotes = text.contains(" ") + && NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName"); + switch (NEIClientConfig.getIntSetting("inventory.search.patternMode")) { case 1: text = text.replaceAll("[\\?|\\*]", "\\\\$0"); @@ -323,14 +326,19 @@ public class SearchField extends TextField implements ItemFilterProvider { text = text.replaceAll("[{}()\\[\\].+*?^$\\\\|]", "\\\\$0"); break; case 3: - text = text.replaceAll("\"", "\\\\$0"); - text = "\"" + text + "\""; - return text; + // In extended+ quotes require only quotes to be escaped + if (addQuotes) { + text = text.replaceAll("\"", "\\\\$0"); + } else { + String prefixes = searchParser.getPrefixes(); + text = text.replaceAll("[-<>^{}|/\\\\\"" + Pattern.quote(prefixes) + "]", "\\\\$0"); + } + break; default: break; } - if (text.contains(" ") && NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName")) { + if (addQuotes) { text = "\"" + text + "\""; } diff --git a/src/main/java/codechicken/nei/SearchTokenParser.java b/src/main/java/codechicken/nei/SearchTokenParser.java index 9d60bb8e..43d485dd 100644 --- a/src/main/java/codechicken/nei/SearchTokenParser.java +++ b/src/main/java/codechicken/nei/SearchTokenParser.java @@ -468,7 +468,7 @@ public class SearchTokenParser { return tokens; } - private String getPrefixes() { + public String getPrefixes() { if (this.prefixes == null) { final StringBuilder builder = new StringBuilder(); diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java index f7b33789..40642210 100644 --- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java +++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java @@ -234,12 +234,12 @@ public abstract class ShortcutInputHandler { if (recipe != null) { math = RecipeChainMath.of(recipe, 1); } - } else if (slot.getRecipeId() != null && slot.getType() == BookmarkItemType.RESULT) { + } else if (slot.getRecipeId() != null && slot.getType() != BookmarkItemType.INGREDIENT) { if (slot.getGroup().crafting == null) { final Recipe recipe = Recipe.of(slot.getRecipeId()); if (recipe != null) { - math = RecipeChainMath.of(recipe, slot != null ? slot.getMultiplier() : 1); + math = RecipeChainMath.of(recipe, Math.max(1, slot != null ? slot.getMultiplier() : 1)); } } else { math = ItemPanels.bookmarkPanel.getGrid() diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 788087d5..663deaec 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -5,6 +5,7 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer; import static codechicken.lib.gui.GuiDraw.getMousePosition; import static codechicken.lib.gui.GuiDraw.renderEngine; import static codechicken.nei.NEIClientUtils.translate; +import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber; import java.awt.Point; import java.util.ArrayList; @@ -16,6 +17,7 @@ import java.util.Map; import java.util.StringJoiner; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; +import java.util.function.IntFunction; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -42,6 +44,8 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.ItemStackSet; @@ -164,7 +168,7 @@ public class GuiContainerManager { * @return A list of Strings representing the text to be displayed on each line of the tool tip. */ public static List itemDisplayNameMultiline(ItemStack stack, GuiContainer gui, boolean includeHandlers) { - List namelist = null; + List namelist; try { namelist = stack.getTooltip( Minecraft.getMinecraft().thePlayer, @@ -199,26 +203,27 @@ public class GuiContainerManager { } @Nullable - public static String countDetails(int stackSize, int maxStackSize, String fullPattern, String shortPattern) { + public static String countDetails(int stackSize, int maxStackSize, String fullPattern, String shortPattern, + IntFunction valueFormatter) { if (maxStackSize > 1 && stackSize > maxStackSize) { final int remainder = stackSize % maxStackSize; + final int units = stackSize / maxStackSize; if (remainder > 0) { return String.format( fullPattern, - NEIClientUtils.formatNumbers(stackSize), - NEIClientUtils.formatNumbers(stackSize / maxStackSize), - NEIClientUtils.formatNumbers(maxStackSize), - NEIClientUtils.formatNumbers(remainder)); + valueFormatter.apply(stackSize), + formatNumber(units), + valueFormatter.apply(maxStackSize), + valueFormatter.apply(remainder)); } else { return String.format( shortPattern, - NEIClientUtils.formatNumbers(stackSize), - NEIClientUtils.formatNumbers(stackSize / maxStackSize), - NEIClientUtils.formatNumbers(maxStackSize)); + valueFormatter.apply(stackSize), + formatNumber(units), + valueFormatter.apply(maxStackSize)); } } - return null; } @@ -232,7 +237,8 @@ public class GuiContainerManager { stack.stackSize, stack.getMaxStackSize(), translate("inventory.tooltip.count.item", "%s = %s * %s + %s"), - translate("inventory.tooltip.count.item", "%s = %s * %s")); + translate("inventory.tooltip.count.item", "%s = %s * %s"), + NumberFormatUtil::formatNumber); } } @@ -247,8 +253,9 @@ public class GuiContainerManager { return countDetails( amount, 144, - translate("inventory.tooltip.count.fluid", "%s L = %s * %s L + %s L"), - translate("inventory.tooltip.count.fluid", "%s L = %s * %s L")); + translate("inventory.tooltip.count.fluid", "%s = %s * %s + %s"), + translate("inventory.tooltip.count.fluid", "%s = %s * %s"), + NumberFormatUtil::formatFluid); } /** diff --git a/src/main/java/codechicken/nei/recipe/DebugHandlerWidget.java b/src/main/java/codechicken/nei/recipe/DebugHandlerWidget.java index 07b58ef2..0c624ba9 100644 --- a/src/main/java/codechicken/nei/recipe/DebugHandlerWidget.java +++ b/src/main/java/codechicken/nei/recipe/DebugHandlerWidget.java @@ -132,8 +132,13 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler public boolean showWidget = false; private static final int BORDER_PADDING = 6; - private final DrawableResource BG_TEXTURE = new DrawableBuilder("nei:textures/gui/recipebg.png", 0, 0, 176, 166) - .build(); + private static final int TRANSPARENCY_BORDER = 4; + private final DrawableResource BG_TEXTURE = new DrawableBuilder( + "nei:textures/gui/recipebg.png", + 0, + 0, + 176 + TRANSPARENCY_BORDER * 2, + 166 + TRANSPARENCY_BORDER * 2).build(); public DebugHandlerWidget() { GuiContainerManager.addInputHandler(this); @@ -312,14 +317,14 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler GL11.glScaled(1, 1, 2f); GL11.glDisable(GL11.GL_DEPTH_TEST); BG_TEXTURE.draw( - this.x, - this.y, - this.w, - this.h, - BORDER_PADDING, - BORDER_PADDING, - BORDER_PADDING, - BORDER_PADDING); + this.x - TRANSPARENCY_BORDER, + this.y - TRANSPARENCY_BORDER, + this.w + TRANSPARENCY_BORDER * 2, + this.h + TRANSPARENCY_BORDER * 2, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER); GuiDraw.drawRect( this.x + INLINE_PADDING, this.y + BORDER_PADDING, diff --git a/src/main/java/codechicken/nei/recipe/InformationHandler.java b/src/main/java/codechicken/nei/recipe/InformationHandler.java index 87550521..0cb818ea 100644 --- a/src/main/java/codechicken/nei/recipe/InformationHandler.java +++ b/src/main/java/codechicken/nei/recipe/InformationHandler.java @@ -10,6 +10,9 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; + +import codechicken.lib.gui.GuiDraw; import codechicken.nei.ClientHandler; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; @@ -81,6 +84,13 @@ public class InformationHandler extends TemplateRecipeHandler { return "nei:textures/gui/recipebg.png"; } + @Override + public void drawBackground(int recipe) { + GL11.glColor4f(1, 1, 1, 1); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 7, 13, 166, 65); + } + @Override public int getRecipeHeight(int recipe) { final CachedInfoPage page = (CachedInfoPage) this.arecipes.get(recipe); diff --git a/src/main/java/codechicken/nei/recipe/RecipePageManager.java b/src/main/java/codechicken/nei/recipe/RecipePageManager.java index ca9b4e21..995c8bf6 100644 --- a/src/main/java/codechicken/nei/recipe/RecipePageManager.java +++ b/src/main/java/codechicken/nei/recipe/RecipePageManager.java @@ -143,7 +143,7 @@ public class RecipePageManager { for (Widget widget : currentWidgets) { if (widget instanceof NEIRecipeWidget recipeWidget) { - recipeWidget.setLocation(0, shiftY); + recipeWidget.setLocation(2, shiftY); } shiftY += widget.h; } diff --git a/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java b/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java index 49039dd3..8e69de7d 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java +++ b/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java @@ -17,12 +17,13 @@ import codechicken.nei.scroll.GuiHelper; public class RecipeTooltipLineHandler implements ITooltipLineHandler { private static final int BG_PADDING = 5; - private static final DrawableResource BG_TEXTURE = new DrawableBuilder( + private static final int TRANSPARENCY_BORDER = 4; + private final DrawableResource BG_TEXTURE = new DrawableBuilder( "nei:textures/gui/recipebg.png", 0, 0, - 176, - 166).build(); + 176 + TRANSPARENCY_BORDER * 2, + 166 + TRANSPARENCY_BORDER * 2).build(); protected long lastUpdate = System.currentTimeMillis(); protected String recipeName = ""; @@ -88,7 +89,15 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler { GuiContainerManager.enable2DRender(); GL11.glColor4f(1, 1, 1, 1); - BG_TEXTURE.draw(0, 0, size.width, size.height, BG_PADDING, BG_PADDING, BG_PADDING, BG_PADDING); + BG_TEXTURE.draw( + -TRANSPARENCY_BORDER, + -TRANSPARENCY_BORDER, + size.width + TRANSPARENCY_BORDER * 2, + size.height + TRANSPARENCY_BORDER * 2, + BG_PADDING + TRANSPARENCY_BORDER, + BG_PADDING + TRANSPARENCY_BORDER, + BG_PADDING + TRANSPARENCY_BORDER, + BG_PADDING + TRANSPARENCY_BORDER); GL11.glEnable(GL11.GL_ALPHA_TEST); diff --git a/src/main/resources/assets/nei/textures/nei_sprites.png b/src/main/resources/assets/nei/textures/nei_sprites.png index 0e5365fb..f10796e3 100644 Binary files a/src/main/resources/assets/nei/textures/nei_sprites.png and b/src/main/resources/assets/nei/textures/nei_sprites.png differ