diff --git a/dependencies.gradle b/dependencies.gradle index bc1b969d..47d19c11 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,5 +2,7 @@ dependencies { 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 9fb05729..65a0d05f 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -247,7 +247,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)); @@ -273,11 +273,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( @@ -315,7 +323,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)); 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/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 da6f5065..029be47b 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,14 +40,17 @@ 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.ItemList; import codechicken.nei.ItemStackSet; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; +import codechicken.nei.NEIModContainer; import codechicken.nei.recipe.StackInfo; import codechicken.nei.util.ReadableNumberConverter; +import codechicken.nei.util.RenderTooltipEventHelper; public class GuiContainerManager { @@ -550,8 +555,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); @@ -598,7 +603,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); @@ -623,6 +653,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)); } @@ -711,7 +753,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/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; + } +}