diff --git a/resources/assets/nei/lang/en_US.lang b/resources/assets/nei/lang/en_US.lang index c93c8049..6267d226 100644 --- a/resources/assets/nei/lang/en_US.lang +++ b/resources/assets/nei/lang/en_US.lang @@ -1,6 +1,13 @@ nei.load=Load nei.save=Save + +# PC/Linux Control Key +nei.key.ctrl=CTRL +# Mac Command Key +nei.key.ctrl.mac=CMD + nei.bookmark.toggle=Bookmarks +nei.bookmark.toggle.tip=Toggle visibility of the Bookmark Panel nei.enchant=Enchant nei.enchant.level=Level @@ -12,6 +19,11 @@ nei.potion.duration=Duration nei.potion.level=Level nei.inventory.options=Options +nei.inventory.options.tip=NEI Config +nei.inventory.options.tip.cheatmode.0=Recipe Mode +nei.inventory.options.tip.cheatmode.1=Utility Mode +nei.inventory.options.tip.cheatmode.2=Cheat Mode +nei.inventory.options.tip.cheatmode.disable=%s-click here to cycle between Recipe, Utility, and Cheat Mode. nei.inventory.prev=Prev nei.inventory.next=Next nei.inventory.item_subsets=Item Subsets diff --git a/resources/assets/nei/textures/nei_sprites.png b/resources/assets/nei/textures/nei_sprites.png index 1fec7bd1..1221b877 100644 Binary files a/resources/assets/nei/textures/nei_sprites.png and b/resources/assets/nei/textures/nei_sprites.png differ diff --git a/src/codechicken/nei/Button.java b/src/codechicken/nei/Button.java index 13e4dfb0..5a970440 100644 --- a/src/codechicken/nei/Button.java +++ b/src/codechicken/nei/Button.java @@ -42,15 +42,20 @@ public abstract class Button extends Widget if (!contains(mx, my)) return tooltip; - String tip = getButtonTip(); + final String tip = getButtonTip(); if (tip != null) tooltip.add(tip); + + addTooltips(tooltip); + return tooltip; } public String getButtonTip() { return null; } + + public void addTooltips(List tooltip) {} public String getRenderLabel() { return label; diff --git a/src/codechicken/nei/ButtonCycled.java b/src/codechicken/nei/ButtonCycled.java index eb1c5736..9d976de7 100644 --- a/src/codechicken/nei/ButtonCycled.java +++ b/src/codechicken/nei/ButtonCycled.java @@ -2,6 +2,11 @@ package codechicken.nei; public abstract class ButtonCycled extends Button { + public ButtonCycled() {} + + public ButtonCycled(int num) { + icons = new Image[num]; + } @Override public Image getRenderIcon() { diff --git a/src/codechicken/nei/LayoutManager.java b/src/codechicken/nei/LayoutManager.java index 70bbfef3..dc61b641 100644 --- a/src/codechicken/nei/LayoutManager.java +++ b/src/codechicken/nei/LayoutManager.java @@ -22,6 +22,8 @@ import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import java.util.HashMap; @@ -82,8 +84,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public static SubsetWidget dropDown; public static TextField searchField; - public static Button options; - public static Button bookmarks; + public static ButtonCycled options; + public static ButtonCycled bookmarks; public static Button more; public static Button less; @@ -330,24 +332,43 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH dropDown = new SubsetWidget(); searchField = new SearchField("search"); - options = new Button("Options") + options = new ButtonCycled(3) { @Override public boolean onButtonPress(boolean rightclick) { if (!rightclick) { - getOptionList().openGui(getGuiContainer(), false); + if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LCONTROL || Keyboard.getEventKey() == Keyboard.KEY_RCONTROL)) { + NEIClientConfig.cycleSetting("inventory.cheatmode", 3); + } else { + getOptionList().openGui(getGuiContainer(), false); + } return true; } return false; } - + + @Override + public void addTooltips(List tooltip) { + tooltip.add(translate("inventory.options.tip")); + String modeColor = ""; + final int cheatMode = NEIClientConfig.getCheatMode(); + if (cheatMode == 1) + modeColor = EnumChatFormatting.GOLD.toString(); + else if (cheatMode == 2) + modeColor = EnumChatFormatting.RED.toString(); + String controlKeyLocalization = translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl"); + tooltip.add(modeColor + translate("inventory.options.tip.cheatmode." + cheatMode)); + tooltip.add(modeColor + translate("inventory.options.tip.cheatmode.disable", controlKeyLocalization)); + + } + @Override public String getRenderLabel() { return translate("inventory.options"); } }; - bookmarks = new Button("Bookmarks") + bookmarks = new ButtonCycled(2) { @Override public boolean onButtonPress(boolean rightclick) { @@ -355,6 +376,10 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return true; } + public String getButtonTip() { + return translate("bookmark.toggle.tip"); + } + @Override public String getRenderLabel() { return translate("bookmark.toggle"); @@ -437,7 +462,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH GuiDraw.drawTip(mousex + 9, mousey, translate("inventory.delete." + (shiftKey() ? "all" : "one"), GuiContainerManager.itemDisplayNameShort(getHeldItem()))); } }; - gamemode = new ButtonCycled() + gamemode = new ButtonCycled(3) { @Override public boolean onButtonPress(boolean rightclick) { @@ -452,7 +477,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return translate("inventory.gamemode." + getNextGamemode()); } }; - gamemode.icons = new Image[3]; rain = new Button() { @Override @@ -751,39 +775,39 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH } public static void drawButtonBackground(int x, int y, int w, int h, boolean edges, int type) { - int wtiles = 0; + int wTiles = 0; int ew = w;//end width if (w / 2 > 100) { - wtiles = (w - 200) / 50 + 1; + wTiles = (w - 200) / 50 + 1; ew = 200; } - int w1 = ew / 2; - int h1 = h / 2; - int w2 = (ew + 1) / 2; - int h2 = (h + 1) / 2; + final int w1 = ew / 2; + final int h1 = h / 2; + final int w2 = (ew + 1) / 2; + final int h2 = (h + 1) / 2; - int x2 = x + w - w2; - int y2 = y + h - h2; + final int x2 = x + w - w2; + final int y2 = y + h - h2; - int ty = 46 + type * 20; - int te = (edges ? 0 : 1);//tex edges + final int ty = 46 + type * 20; + final int te = (edges ? 0 : 1);//tex edges - int ty1 = ty + te; - int tx1 = te; - int tx3 = 75; + final int ty1 = ty + te; + final int tx1 = te; + final int tx3 = 75; //halfway the 1 is for odd number adjustment - int ty2 = ty + 20 - h2 - te; - int tx2 = 200 - w2 - te; + final int ty2 = ty + 20 - h2 - te; + final int tx2 = 200 - w2 - te; changeTexture("textures/gui/widgets.png"); drawTexturedModalRect(x, y, tx1, ty1, w1, h1);//top left drawTexturedModalRect(x, y2, tx1, ty2, w1, h2);//bottom left - for (int tile = 0; tile < wtiles; tile++) { - int tilex = x + w1 + 50 * tile; - drawTexturedModalRect(tilex, y, tx3, ty1, 50, h1);//top - drawTexturedModalRect(tilex, y2, tx3, ty2, 50, h2);//bottom + for (int tile = 0; tile < wTiles; tile++) { + final int tileX = x + w1 + 50 * tile; + drawTexturedModalRect(tileX, y, tx3, ty1, 50, h1);//top + drawTexturedModalRect(tileX, y2, tx3, ty2, 50, h2);//bottom } drawTexturedModalRect(x2, y, tx2, ty1, w2, h1);//top right diff --git a/src/codechicken/nei/LayoutStyleMinecraft.java b/src/codechicken/nei/LayoutStyleMinecraft.java index fd0af28c..58b6257c 100644 --- a/src/codechicken/nei/LayoutStyleMinecraft.java +++ b/src/codechicken/nei/LayoutStyleMinecraft.java @@ -49,6 +49,11 @@ public class LayoutStyleMinecraft extends LayoutStyle timeButtons[2].icon = new Image(144, 24, 12, 12); timeButtons[3].icon = new Image(156, 24, 12, 12); heal.icon = new Image(168, 24, 12, 12); + bookmarks.icons[0] = new Image(0, 36, 16, 16); + bookmarks.icons[1] = new Image(16, 36, 16, 16); + options.icons[0] = new Image(32, 36, 16, 16); + options.icons[1] = new Image(48, 36, 16, 16); + options.icons[2] = new Image(64, 36, 16, 16); } @Override @@ -60,7 +65,6 @@ public class LayoutStyleMinecraft extends LayoutStyle public void layout(GuiContainer gui, VisiblityData visiblity) { reset(); - //leftSize = ((gui.width - gui.xSize) / 2) - 3; leftSize = ItemPanels.bookmarkPanel.getWidth(gui); numButtons = Math.max(leftSize / 18, 1); @@ -88,6 +92,8 @@ public class LayoutStyleMinecraft extends LayoutStyle else if (NEIClientUtils.isValidGamemode("adventure")) gamemode.index = 2; } + bookmarks.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1; + options.index = NEIClientConfig.getCheatMode(); magnet.state = 0x4 | (getMagnetMode() ? 1 : 0); @@ -125,12 +131,12 @@ public class LayoutStyleMinecraft extends LayoutStyle options.x = isEnabled() ? 0 : 6; options.y = isEnabled() ? gui.height - 22 : gui.height - 28; - options.w = 80; + options.w = 22; options.h = 22; - bookmarks.x = 82 + (isEnabled() ? 0 : 6); + bookmarks.x = 24 + (isEnabled() ? 0 : 6); bookmarks.y = isEnabled() ? gui.height - 22 : gui.height - 28; - bookmarks.w = 80; + bookmarks.w = 22; bookmarks.h = 22; searchField.y = gui.height - searchField.h - 2; @@ -175,16 +181,15 @@ public class LayoutStyleMinecraft extends LayoutStyle Image icon = b.getRenderIcon(); if (icon == null) { - int colour = tex == 2 ? 0xffffa0 : - tex == 0 ? 0x601010 : 0xe0e0e0; + int colour = tex == 2 ? 0xffffa0 : tex == 0 ? 0x601010 : 0xe0e0e0; drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour); } else { GL11.glColor4f(1, 1, 1, 1); - int iconx = b.x + (b.w - icon.width) / 2; - int icony = b.y + (b.h - icon.height) / 2; - LayoutManager.drawIcon(iconx, icony, icon); + final int iconX = b.x + (b.w - icon.width) / 2; + final int iconY = b.y + (b.h - icon.height) / 2; + LayoutManager.drawIcon(iconX, iconY, icon); } }