diff --git a/dependencies.gradle b/dependencies.gradle index a88a22b6..47d19c11 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,8 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:CodeChickenCore:1.3.10:dev') + api('com.github.GTNewHorizons:CodeChickenCore:1.4.0:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.6.0:dev') + shadowImplementation('org.apache.commons:commons-csv:1.10.0') } diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 26eeb390..a6927337 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -241,7 +241,7 @@ public class NEIClientConfig { tag.getTag("inventory.history.historyColor").setComment("Color of the history area display") .getHexValue(0xee555555); - API.addOption(new OptionIntegerField("inventory.history.historyColor")); + API.addOption(new OptionIntegerField("inventory.history.historyColor", 0, OptionIntegerField.UNSIGNED_INT_MAX)); tag.getTag("inventory.history.useRows").setComment("Rows used in historical areas").getIntValue(2); API.addOption(new OptionIntegerField("inventory.history.useRows", 1, 5)); @@ -267,11 +267,19 @@ public class NEIClientConfig { tag.getTag("inventory.collapsibleItems.expandedColor") .setComment("Color of the collapsible item expanded state").getHexValue(0x335555EE); - API.addOption(new OptionIntegerField("inventory.collapsibleItems.expandedColor")); + API.addOption( + new OptionIntegerField( + "inventory.collapsibleItems.expandedColor", + 0, + OptionIntegerField.UNSIGNED_INT_MAX)); tag.getTag("inventory.collapsibleItems.collapsedColor") .setComment("Color of the collapsible item collapsed state").getHexValue(0x335555EE); - API.addOption(new OptionIntegerField("inventory.collapsibleItems.collapsedColor")); + API.addOption( + new OptionIntegerField( + "inventory.collapsibleItems.collapsedColor", + 0, + OptionIntegerField.UNSIGNED_INT_MAX)); API.addOption( new OptionButton( @@ -309,7 +317,7 @@ public class NEIClientConfig { API.addOption(new OptionToggleButton("inventory.itemzoom.showName", true)); tag.getTag("inventory.itemzoom.nameColor").getHexValue(0xFFFFFFFF); - API.addOption(new OptionIntegerField("inventory.itemzoom.nameColor")); + API.addOption(new OptionIntegerField("inventory.itemzoom.nameColor", 0, OptionIntegerField.UNSIGNED_INT_MAX)); tag.getTag("inventory.itemIDs").getIntValue(1); API.addOption(new OptionCycled("inventory.itemIDs", 3, true)); @@ -459,6 +467,7 @@ public class NEIClientConfig { } if (state()) { + NEIClientConfig.setIntSetting("inventory.search.spaceMode", 1); NEIClientConfig.setIntSetting("inventory.search.modNameSearchMode", 0); NEIClientConfig.setIntSetting("inventory.search.tooltipSearchMode", 0); NEIClientConfig.setIntSetting("inventory.search.identifierSearchMode", 0); @@ -470,6 +479,7 @@ public class NEIClientConfig { SearchField.searchParser.prefixRedefinitions.put('@', '%'); SearchField.searchParser.clearCache(); } else { + NEIClientConfig.setIntSetting("inventory.search.spaceMode", 0); NEIClientConfig.setIntSetting("inventory.search.modNameSearchMode", 1); NEIClientConfig.setIntSetting("inventory.search.tooltipSearchMode", 0); NEIClientConfig.setIntSetting("inventory.search.identifierSearchMode", 0); @@ -485,6 +495,22 @@ public class NEIClientConfig { }); + tag.getTag("inventory.search.spaceMode").setComment("Search Space Rules").getIntValue(0); + API.addOption(new OptionCycled("inventory.search.spaceMode", 3, true) { + + @Override + public boolean onClick(int button) { + // SearchField.searchParser.clearCache(); + return super.onClick(button); + } + + @Override + public boolean isEnabled() { + return !tag.getTag("inventory.search.format").getBooleanValue(); + } + + }); + tag.getTag("inventory.search.modNameSearchMode").setComment("Search mode for Mod Names (prefix: @)") .getIntValue(1); API.addOption(new OptionCycled("inventory.search.modNameSearchMode", 3, true) { diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java index dcaa933b..2e4ddea3 100644 --- a/src/main/java/codechicken/nei/NEIClientUtils.java +++ b/src/main/java/codechicken/nei/NEIClientUtils.java @@ -322,7 +322,7 @@ public class NEIClientUtils extends NEIServerUtils { } public static void sendCommand(String command, Object... args) { - if (command.length() == 0) return; + if (command.isEmpty()) return; NumberFormat numberformat = NumberFormat.getIntegerInstance(); numberformat.setGroupingUsed(false); diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index 81724b29..8e18ef02 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -1,6 +1,7 @@ package codechicken.nei; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; @@ -38,6 +39,7 @@ public class NEIModContainer extends DummyModContainer { public static LinkedList plugins = new LinkedList<>(); private static boolean gregTech5Loaded; + private static boolean gtnhLibLoaded; public NEIModContainer() { super(getModMetadata()); @@ -59,16 +61,23 @@ public class NEIModContainer extends DummyModContainer { return gregTech5Loaded; } + public static boolean isGTNHLibLoaded() { + return gtnhLibLoaded; + } + @Override public Set getRequirements() { Set deps = new HashSet<>(); - deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + CodeChickenCorePlugin.version + ",)")); + deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)")); return deps; } @Override public List getDependencies() { - return new LinkedList<>(getRequirements()); + List deps = new ArrayList<>(); + deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)")); + deps.add(VersionParser.parseVersionReference("gtnhlib@[0.6.0,)")); + return deps; } private String description; @@ -106,6 +115,7 @@ public class NEIModContainer extends DummyModContainer { @Subscribe public void preInit(FMLPreInitializationEvent event) { gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post"); + gtnhLibLoaded = Loader.isModLoaded("gtnhlib"); if (CommonUtils.isClient()) ClientHandler.preInit(); } diff --git a/src/main/java/codechicken/nei/NEIServerConfig.java b/src/main/java/codechicken/nei/NEIServerConfig.java index 9e03dfae..dae4a5e2 100644 --- a/src/main/java/codechicken/nei/NEIServerConfig.java +++ b/src/main/java/codechicken/nei/NEIServerConfig.java @@ -197,7 +197,7 @@ public class NEIServerConfig { FileReader r = new FileReader(file); int line = 0; for (String s : IOUtils.readLines(r)) { - if (s.charAt(0) == '#' || s.trim().length() == 0) continue; + if (s.charAt(0) == '#' || s.trim().isEmpty()) continue; int delim = s.lastIndexOf('='); if (delim < 0) { logger.error("line " + line + ": Missing ="); diff --git a/src/main/java/codechicken/nei/SearchTextFormatter.java b/src/main/java/codechicken/nei/SearchTextFormatter.java index 3866fca2..74705a20 100644 --- a/src/main/java/codechicken/nei/SearchTextFormatter.java +++ b/src/main/java/codechicken/nei/SearchTextFormatter.java @@ -1,12 +1,12 @@ package codechicken.nei; +import java.util.List; import java.util.StringJoiner; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import net.minecraft.util.EnumChatFormatting; import codechicken.nei.FormattedTextField.TextFormatter; +import codechicken.nei.SearchTokenParser.SearchToken; public class SearchTextFormatter implements TextFormatter { @@ -17,63 +17,50 @@ public class SearchTextFormatter implements TextFormatter { } public String format(String text) { - final String[] parts = text.split("\\|"); - final Pattern splitPattern = searchParser.getSplitPattern(); + final String[] parts = (text + "| ").split("\\|"); StringJoiner formattedText = new StringJoiner(EnumChatFormatting.GRAY + "|"); - for (String filterText : parts) { - Matcher filterMatcher = splitPattern.matcher(filterText); + for (int i = 0; i < parts.length - 1; i++) { + final String filterText = parts[i]; + final List tokens = searchParser.splitSearchText(filterText); StringBuilder formattedPart = new StringBuilder(); int startIndex = 0; - while (filterMatcher.find()) { - boolean ignore = "-".equals(filterMatcher.group(2)); - String firstChar = filterMatcher.group(3); - String token = filterMatcher.group(4); - boolean quotes = token.length() > 1 && token.startsWith("\"") && token.endsWith("\""); - - if (quotes) { - token = token.substring(1, token.length() - 1); - } - - formattedPart.append(filterText.substring(startIndex, filterMatcher.start())); + for (SearchToken token : tokens) { + formattedPart.append(filterText.substring(startIndex, token.start)); EnumChatFormatting tokenColor = EnumChatFormatting.RESET; - if (!firstChar.isEmpty()) { - tokenColor = searchParser.getProvider(firstChar.charAt(0)).getHighlightedColor(); + if (token.firstChar != null) { + tokenColor = searchParser.getProvider(token.firstChar).getHighlightedColor(); } - if (ignore) { + if (token.ignore) { formattedPart.append(EnumChatFormatting.BLUE + "-"); } - if (!firstChar.isEmpty()) { - formattedPart.append(tokenColor + firstChar); + if (token.firstChar != null) { + formattedPart.append(tokenColor + String.valueOf(token.firstChar)); } - if (quotes) { + if (token.quotes) { formattedPart.append(EnumChatFormatting.GOLD + "\""); } - if (!token.isEmpty()) { - formattedPart.append(tokenColor + token); + if (!token.rawText.isEmpty()) { + formattedPart.append(tokenColor + token.rawText); } - if (quotes) { + if (token.quotes) { formattedPart.append(EnumChatFormatting.GOLD + "\""); } - startIndex = filterMatcher.end(); + startIndex = token.end; } formattedPart.append(filterText.substring(startIndex, filterText.length())); formattedText.add(formattedPart); } - if (text.endsWith("|")) { - formattedText.add(""); - } - return formattedText.toString(); } } diff --git a/src/main/java/codechicken/nei/SearchTokenParser.java b/src/main/java/codechicken/nei/SearchTokenParser.java index 7da0c5c5..d22c1f6d 100644 --- a/src/main/java/codechicken/nei/SearchTokenParser.java +++ b/src/main/java/codechicken/nei/SearchTokenParser.java @@ -2,6 +2,7 @@ package codechicken.nei; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -21,8 +22,6 @@ import codechicken.nei.ItemList.EverythingItemFilter; import codechicken.nei.ItemList.NegatedItemFilter; import codechicken.nei.ItemList.NothingItemFilter; import codechicken.nei.api.ItemFilter; -import gnu.trove.map.TCharCharMap; -import gnu.trove.map.hash.TCharCharHashMap; public class SearchTokenParser { @@ -41,6 +40,20 @@ public class SearchTokenParser { } } + public static class SearchToken { + + public boolean ignore = false; + public boolean quotes = false; + public Character firstChar = null; + + public String[] words; + + public String rawText = ""; + public int start = 0; + public int end = 0; + + } + public static interface ISearchParserProvider { public ItemFilter getFilter(String searchText); @@ -99,7 +112,7 @@ public class SearchTokenParser { protected final List searchProviders; protected final ProvidersCache providersCache = new ProvidersCache(); - protected final TCharCharMap prefixRedefinitions = new TCharCharHashMap(); + protected final Map prefixRedefinitions = new HashMap<>(); public SearchTokenParser(List searchProviders) { this.searchProviders = searchProviders; @@ -169,7 +182,64 @@ public class SearchTokenParser { } - public Pattern getSplitPattern() { + public List splitSearchText(String filterText) { + + if (filterText.isEmpty()) { + return Collections.emptyList(); + } + + final List tokens = new ArrayList<>(); + final String prefixes = getPrefixes(); + final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode"); + // The regular expression first tries to match a string that starts with a space or the beginning of the string, + // followed by a sequence of characters that do not contain special characters -"@#$%&, and ends with a space + // and the characters -"@#$%& or the end of the string. + final String patternPart1 = "(?(^|\\s+)(?:[^" + Pattern.quote(" -\"" + prefixes) + + "]).+?(?=\\s+[" + + Pattern.quote("-\"" + prefixes) + + "]|$))"; + // If the first condition is not met, it tries to match a sequence of - characters, followed by @#$%& + // characters, then either a quoted string or non-space characters. + final String patternPart2 = "((?-*)(?[" + Pattern.quote(prefixes) + + "]*)(?\\\".*?(?:\\\"|$)|\\S+\\s*))"; + final Pattern pattern = Pattern.compile(spaceMode == 0 ? patternPart2 : (patternPart1 + "|" + patternPart2)); + final Matcher filterMatcher = pattern.matcher(filterText); + + while (filterMatcher.find()) { + String firstChar = filterMatcher.group("firstChar"); + SearchToken token = new SearchToken(); + token.start = filterMatcher.start(); + token.end = filterMatcher.end(); + token.ignore = "-".equals(filterMatcher.group("ignore")); + token.rawText = spaceMode == 0 ? null : filterMatcher.group("tokenA"); + + if (firstChar != null && !firstChar.isEmpty()) { + token.firstChar = firstChar.charAt(0); + } + + if (token.rawText == null) { // spaceMode == 0 + token.rawText = filterMatcher.group("tokenB"); + token.quotes = token.rawText.length() > 1 && token.rawText.startsWith("\"") + && token.rawText.endsWith("\""); + + if (token.quotes) { + token.rawText = token.rawText.substring(1, token.rawText.length() - 1); + } + + token.words = new String[] { token.rawText.trim() }; + } else if (spaceMode == 2) { + token.words = token.rawText.trim().split("\\s+"); + } else { + token.words = new String[] { token.rawText.trim() }; + } + + tokens.add(token); + } + + return tokens; + } + + private String getPrefixes() { StringBuilder prefixes = new StringBuilder().append('\0'); for (ISearchParserProvider provider : getProviders()) { @@ -178,14 +248,11 @@ public class SearchTokenParser { } } - return Pattern.compile("((-*)([" + Pattern.quote(prefixes.toString()) + "]*)(\\\".*?(?:\\\"|$)|\\S+))"); + return prefixes.toString(); } public char getRedefinedPrefix(char prefix) { - if (this.prefixRedefinitions.containsKey(prefix)) { - return this.prefixRedefinitions.get(prefix); - } - return prefix; + return this.prefixRedefinitions.getOrDefault(prefix, prefix); } private ItemFilter parseSearchText(String filterText) { @@ -194,28 +261,19 @@ public class SearchTokenParser { return null; } - final Matcher filterMatcher = getSplitPattern().matcher(filterText); final AllMultiItemFilter searchTokens = new AllMultiItemFilter(); + final List tokens = splitSearchText(filterText); - while (filterMatcher.find()) { - boolean ignore = "-".equals(filterMatcher.group(2)); - String firstChar = filterMatcher.group(3); - String token = filterMatcher.group(4); - boolean quotes = token.length() > 1 && token.startsWith("\"") && token.endsWith("\""); + for (SearchToken token : tokens) { + if (!token.rawText.isEmpty()) { + ItemFilter result = parseToken(token); - if (quotes) { - token = token.substring(1, token.length() - 1); - } - - if (!token.isEmpty()) { - ItemFilter result = parseToken(firstChar, token); - - if (ignore) { + if (token.ignore) { searchTokens.filters.add(new NegatedItemFilter(result)); } else { searchTokens.filters.add(result); } - } else if (!ignore) { + } else if (!token.ignore) { searchTokens.filters.add(new NothingItemFilter()); } } @@ -223,17 +281,17 @@ public class SearchTokenParser { return searchTokens; } - private ItemFilter parseToken(String firstChar, String token) { - final ISearchParserProvider provider = firstChar.isEmpty() ? null : this.getProvider(firstChar.charAt(0)); + private ItemFilter parseToken(SearchToken token) { + final ISearchParserProvider provider = token.firstChar == null ? null : this.getProvider(token.firstChar); if (provider == null || provider.getSearchMode() == SearchMode.NEVER) { final List filters = new ArrayList<>(); for (ISearchParserProvider _provider : getProviders()) { if (_provider.getSearchMode() == SearchMode.ALWAYS) { - ItemFilter filter = _provider.getFilter(token); + AllMultiItemFilter filter = generateFilters(_provider, token.words); - if (filter != null) { + if (!filter.filters.isEmpty()) { filters.add(filter); } } @@ -241,7 +299,21 @@ public class SearchTokenParser { return filters.isEmpty() ? new NothingItemFilter() : new AnyMultiItemFilter(filters); } else { - return provider.getFilter(token); + return generateFilters(provider, token.words); } } + + private AllMultiItemFilter generateFilters(ISearchParserProvider provider, String[] words) { + final AllMultiItemFilter filters = new AllMultiItemFilter(); + + for (String work : words) { + final ItemFilter filter = provider.getFilter(work); + + if (filter != null) { + filters.filters.add(filter); + } + } + + return filters; + } } diff --git a/src/main/java/codechicken/nei/config/OptionButton.java b/src/main/java/codechicken/nei/config/OptionButton.java index 46b4bc8b..40c60ca6 100644 --- a/src/main/java/codechicken/nei/config/OptionButton.java +++ b/src/main/java/codechicken/nei/config/OptionButton.java @@ -75,26 +75,25 @@ public abstract class OptionButton extends Option { } public String getTooltip() { - String tip = null; if (tooltip != null) { String s = translateN(tooltip); if (!s.equals(namespaced(tooltip))) { - tip = s; + return s; } } - if (tip == null && getPrefix() != null) { + if (getPrefix() != null) { final int width = getStringWidth(getPrefix()); final Rectangle b = buttonSize(); if (width >= b.x) { - tip = translateN(name); + return translateN(name); } } - return tip; + return null; } public void drawPrefix() { diff --git a/src/main/java/codechicken/nei/config/OptionCycled.java b/src/main/java/codechicken/nei/config/OptionCycled.java index 9574d464..3aa1a68a 100644 --- a/src/main/java/codechicken/nei/config/OptionCycled.java +++ b/src/main/java/codechicken/nei/config/OptionCycled.java @@ -29,6 +29,18 @@ public class OptionCycled extends OptionButton { return prefixed ? translateN(name) : null; } + @Override + public String getTooltip() { + String tooltip = name + "." + value() + ".tip"; + String s = translateN(tooltip); + + if (!s.equals(namespaced(tooltip))) { + return s; + } + + return super.getTooltip(); + } + @Override public boolean onClick(int button) { return cycle(); diff --git a/src/main/java/codechicken/nei/config/OptionIntegerField.java b/src/main/java/codechicken/nei/config/OptionIntegerField.java index 7504864a..d2c1e689 100644 --- a/src/main/java/codechicken/nei/config/OptionIntegerField.java +++ b/src/main/java/codechicken/nei/config/OptionIntegerField.java @@ -1,11 +1,15 @@ package codechicken.nei.config; +import codechicken.lib.gui.GuiDraw; + public class OptionIntegerField extends OptionTextField { - public final int min; - public final int max; + public static final long UNSIGNED_INT_MAX = 0xFFFFFFFFL; - public OptionIntegerField(String name, int min, int max) { + public final long min; + public final long max; + + public OptionIntegerField(String name, long min, long max) { super(name); this.min = min; this.max = max; @@ -15,13 +19,23 @@ public class OptionIntegerField extends OptionTextField { this(name, Integer.MIN_VALUE, Integer.MAX_VALUE); } + @Override + protected int getMaxInputWidth() { + + if (renderTag().getValue().startsWith("0x")) { + return GuiDraw.getStringWidth("0x" + Long.toHexString(this.max).toUpperCase()) + 32; + } + + return GuiDraw.getStringWidth(String.valueOf(this.max)) + 32; + } + @Override public boolean isValidInput(String s) { - if (s.length() == 0) return true; + if (s.isEmpty()) return true; try { if (s.startsWith("0x")) { - Long.parseLong(s.substring(2), 16); + Long.parseUnsignedLong(s.substring(2), 16); } else { Integer.parseInt(s); } @@ -33,15 +47,15 @@ public class OptionIntegerField extends OptionTextField { @Override public boolean isValidValue(String s) { - if (s.length() == 0 || !isValidInput(s)) return false; - int i = 0; + if (s.isEmpty() || !isValidInput(s)) return false; + long i = 0; if (s.startsWith("0x")) { - i = (int) Long.parseLong(s.substring(2), 16); + i = Long.parseUnsignedLong(s.substring(2), 16); } else { i = Integer.parseInt(s); } - return i >= min && i <= max; + return i >= this.min && i <= this.max; } } diff --git a/src/main/java/codechicken/nei/config/OptionTextField.java b/src/main/java/codechicken/nei/config/OptionTextField.java index dec8a649..97f89690 100644 --- a/src/main/java/codechicken/nei/config/OptionTextField.java +++ b/src/main/java/codechicken/nei/config/OptionTextField.java @@ -1,13 +1,10 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.getStringWidth; - import java.util.List; +import codechicken.lib.gui.GuiDraw; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.TextField; -import codechicken.nei.config.GuiOptionList.OptionScrollSlot; public class OptionTextField extends Option { @@ -36,11 +33,6 @@ public class OptionTextField extends Option { super(name); } - @Override - public void onAdded(OptionScrollSlot slot) { - super.onAdded(slot); - } - @Override public void update() { textField.update(); @@ -51,11 +43,16 @@ public class OptionTextField extends Option { return translateN(name); } + protected int getMaxInputWidth() { + return slot.slotWidth(); + } + @Override public void draw(int mousex, int mousey, float frame) { - drawString(getPrefix(), 10, 6, -1); + GuiDraw.drawString(getPrefix(), 10, 6, -1); - textField.w = slot.slotWidth() - getStringWidth(getPrefix()) - 16; + textField.w = Math + .max(60, Math.min(getMaxInputWidth(), slot.slotWidth() - GuiDraw.getStringWidth(getPrefix())) - 16); textField.x = slot.slotWidth() - textField.w; textField.draw(mousex, mousey); } diff --git a/src/main/java/codechicken/nei/config/OptionToggleButton.java b/src/main/java/codechicken/nei/config/OptionToggleButton.java index a218a2d9..b7c48ba9 100644 --- a/src/main/java/codechicken/nei/config/OptionToggleButton.java +++ b/src/main/java/codechicken/nei/config/OptionToggleButton.java @@ -17,6 +17,7 @@ public class OptionToggleButton extends OptionButton { return renderTag().getBooleanValue(); } + @Override public String getButtonText() { return translateN(name + (state() ? ".true" : ".false")); } diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 555d7499..acb73825 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.Map; import java.util.StringJoiner; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.function.Consumer; import java.util.regex.Pattern; import javax.annotation.Nullable; @@ -24,6 +25,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.IResourceManager; @@ -38,15 +40,18 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemStackSet; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; +import codechicken.nei.NEIModContainer; import codechicken.nei.SearchField; import codechicken.nei.recipe.StackInfo; import codechicken.nei.search.TooltipFilter; import codechicken.nei.util.ReadableNumberConverter; +import codechicken.nei.util.RenderTooltipEventHelper; public class GuiContainerManager { @@ -552,8 +557,8 @@ public class GuiContainerManager { tooltip = handler.handleTooltip(window, mousex, mousey, tooltip); } + ItemStack stack = getStackMouseOver(window); if (tooltip.isEmpty() && shouldShowTooltip(window)) { // mouseover tip, not holding an item - ItemStack stack = getStackMouseOver(window); font = getFontRenderer(stack); if (stack != null) { tooltip = itemDisplayNameMultiline(stack, window, true); @@ -600,7 +605,32 @@ public class GuiContainerManager { } } - drawPagedTooltip(font, mousex + 12, mousey - 12, tooltip); + if (NEIModContainer.isGTNHLibLoaded() && !tooltip.isEmpty()) { + if (RenderTooltipEventHelper.post(stack, this.window, mousex, mousey, font)) { + return; + } + Consumer> alternativeRenderer = RenderTooltipEventHelper.getAlternativeRenderer(); + if (alternativeRenderer == null) { + drawPagedTooltip( + RenderTooltipEventHelper.getFont(), + RenderTooltipEventHelper.getX() + 12, + RenderTooltipEventHelper.getY() - 12, + tooltip); + } else { + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GuiDraw.gui.incZLevel(300.0f); + alternativeRenderer.accept(tooltip); + GuiDraw.gui.incZLevel(-300.0f); + GL11.glEnable(GL11.GL_DEPTH_TEST); + RenderHelper.enableStandardItemLighting(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + } + RenderTooltipEventHelper.flush(); + } else { + drawPagedTooltip(font, mousex + 12, mousey - 12, tooltip); + } for (IContainerDrawHandler drawHandler : drawHandlers) { drawHandler.postRenderTooltips(window, mousex, mousey, tooltip); @@ -625,6 +655,18 @@ public class GuiContainerManager { tooltips.size(), NEIClientConfig.getKeyName("gui.next_tooltip"))); } + if (NEIModContainer.isGTNHLibLoaded()) { + drawMultilineTip( + font, + x, + y, + tooltips.get(tooltipPage), + RenderTooltipEventHelper.getBackgroundStart(), + RenderTooltipEventHelper.getBackgroundEnd(), + RenderTooltipEventHelper.getBorderStart(), + RenderTooltipEventHelper.getBorderEnd()); + return; + } drawMultilineTip(font, x, y, tooltips.get(tooltipPage)); } @@ -713,7 +755,7 @@ public class GuiContainerManager { if (Keyboard.getEventKeyState() || (k == 0 && Character.isDefined(c))) { try { keyTyped(c, k); - } catch (java.lang.IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { System.err.println("Caught out of bounds exception pressing " + c + " " + k); e.printStackTrace(); } diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index da8428f9..498229a9 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -29,6 +29,7 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.gui.GuiDraw; import codechicken.nei.Button; import codechicken.nei.GuiNEIButton; +import codechicken.nei.ItemStackSet; import codechicken.nei.ItemsTooltipLineHandler; import codechicken.nei.LayoutManager; import codechicken.nei.NEICPH; @@ -135,7 +136,13 @@ public abstract class GuiRecipe extends GuiContainer i items = Arrays.asList(pStack.items); } - return new PermutationTooltipLineHandler(pStack, items); + items = new ItemStackSet().addAll(items).keys(); + + if (items.size() > 1) { + return new PermutationTooltipLineHandler(pStack, items); + } + + return null; } } @@ -869,41 +876,40 @@ public abstract class GuiRecipe extends GuiContainer i public List handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List currenttip) { - try (CompatibilityHacks compatibilityHacks = new CompatibilityHacks()) { - List indices = getRecipeIndices(); + List indices = getRecipeIndices(); + try (CompatibilityHacks compatibilityHacks = new CompatibilityHacks()) { for (int recipeIndex : indices) { currenttip = handler.original.handleItemTooltip(this, itemstack, currenttip, recipeIndex); } + } - if (NEIClientConfig.showCycledIngredientsTooltip()) { - PositionedStack focused = null; + if (NEIClientConfig.showCycledIngredientsTooltip()) { + PositionedStack focused = null; - for (int refIndex = 0; refIndex < indices.size(); refIndex++) { - final int recipeIndex = indices.get(refIndex); + for (int refIndex = 0; refIndex < indices.size(); refIndex++) { + final int recipeIndex = indices.get(refIndex); - if (itemstack != null && focused == null) { - final List stacks = handler.original.getIngredientStacks(recipeIndex); + if (itemstack != null && focused == null) { + final List stacks = handler.original.getIngredientStacks(recipeIndex); - for (PositionedStack pStack : stacks) { - if (isMouseOver(pStack, refIndex)) { - focused = pStack; - break; - } + for (PositionedStack pStack : stacks) { + if (isMouseOver(pStack, refIndex)) { + focused = pStack; + break; } } } - - if (focused == null || focused.items.length <= 1) { - this.permutationTooltipLineHandler = null; - } else if (this.permutationTooltipLineHandler == null - || this.permutationTooltipLineHandler.pStack != focused) { - this.permutationTooltipLineHandler = PermutationTooltipLineHandler.getInstance(focused); - } - } else if (this.permutationTooltipLineHandler != null) { - this.permutationTooltipLineHandler = null; } + if (focused == null || focused.items.length <= 1) { + this.permutationTooltipLineHandler = null; + } else if (this.permutationTooltipLineHandler == null + || this.permutationTooltipLineHandler.pStack != focused) { + this.permutationTooltipLineHandler = PermutationTooltipLineHandler.getInstance(focused); + } + } else if (this.permutationTooltipLineHandler != null) { + this.permutationTooltipLineHandler = null; } if (this.permutationTooltipLineHandler != null) { diff --git a/src/main/java/codechicken/nei/util/RenderTooltipEventHelper.java b/src/main/java/codechicken/nei/util/RenderTooltipEventHelper.java new file mode 100644 index 00000000..c48fe8ee --- /dev/null +++ b/src/main/java/codechicken/nei/util/RenderTooltipEventHelper.java @@ -0,0 +1,78 @@ +package codechicken.nei.util; + +import static com.gtnewhorizon.gtnhlib.client.event.RenderTooltipEvent.*; + +import java.util.List; +import java.util.function.Consumer; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + +import com.gtnewhorizon.gtnhlib.client.event.RenderTooltipEvent; + +public class RenderTooltipEventHelper { + + private static RenderTooltipEvent event; + + /** + * @return {@code true} if the event has been canceled + */ + public static boolean post(ItemStack stack, GuiScreen gui, int x, int y, FontRenderer font) { + event = new RenderTooltipEvent( + stack, + gui, + ORIGINAL_BG_START, + ORIGINAL_BG_END, + ORIGINAL_BORDER_START, + ORIGINAL_BORDER_END, + x, + y, + font); + if (stack != null) { + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) { + flush(); + return true; + } + } + return false; + } + + public static void flush() { + event = null; + } + + public static int getBackgroundStart() { + return event == null ? ORIGINAL_BG_START : event.backgroundStart; + } + + public static int getBackgroundEnd() { + return event == null ? ORIGINAL_BG_END : event.backgroundEnd; + } + + public static int getBorderStart() { + return event == null ? ORIGINAL_BORDER_START : event.borderStart; + } + + public static int getBorderEnd() { + return event == null ? ORIGINAL_BORDER_END : event.borderEnd; + } + + public static int getX() { + return event.x; + } + + public static int getY() { + return event.y; + } + + public static FontRenderer getFont() { + return event.font; + } + + public static Consumer> getAlternativeRenderer() { + return event.alternativeRenderer; + } +} diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 284503f0..5b0c2b08 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -224,6 +224,13 @@ nei.options.inventory.search.patternMode=Search Mode nei.options.inventory.search.patternMode.0=Plain nei.options.inventory.search.patternMode.1=Extended nei.options.inventory.search.patternMode.2=Regex +nei.options.inventory.search.spaceMode=Space Works like +nei.options.inventory.search.spaceMode.0=AND +nei.options.inventory.search.spaceMode.0.tip=Space between non-prefixed tokens works like "AND" +nei.options.inventory.search.spaceMode.1=Space +nei.options.inventory.search.spaceMode.1.tip=Space between non-prefixed tokens works like "space" +nei.options.inventory.search.spaceMode.2=AND-X +nei.options.inventory.search.spaceMode.2.tip=Space between non-prefixed tokens works like "AND" but all tokens must be within the same category nei.options.inventory.search.quoteDropItemName=Quote Drop Item Name nei.options.inventory.search.quoteDropItemName.true=Yes nei.options.inventory.search.quoteDropItemName.false=No