diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 3aca8fc3..92f78af3 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -157,6 +157,7 @@ enderio.gui.tooltip.redstoneControlMode.on=Active with signal enderio.gui.tooltip.redstoneControlMode.off=Active without signal enderio.gui.tooltip.redstoneControlMode.never=Never active +enderio.gui.machine.ioMode.overlay.tooltip=Configure IO enderio.gui.machine.ioMode.none=None enderio.gui.machine.ioMode.pull=Pull enderio.gui.machine.ioMode.push=Push diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgets.png index 70a0748a..8133bbfd 100644 Binary files a/resources/assets/enderio/textures/gui/widgets.png and b/resources/assets/enderio/textures/gui/widgets.png differ diff --git a/src/main/java/crazypants/enderio/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/farm/GuiFarmStation.java index 9fb31b86..c1968dc8 100644 --- a/src/main/java/crazypants/enderio/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/farm/GuiFarmStation.java @@ -25,5 +25,10 @@ public class GuiFarmStation extends GuiMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); } + @Override + protected boolean showRecipeButton() { + return false; + } + } diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 9a04d44a..6ffa5938 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -82,6 +82,8 @@ public final class IconEIO { public static final IconEIO IO_WHATSIT = new IconEIO(192, 148, 13,13); + public static final IconEIO RECIPE = new IconEIO(128, 116, 24,24); + private static final int TEX_SIZE = 256; diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index 14f413dd..ad70a04f 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -17,6 +17,7 @@ import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; +import crazypants.util.Lang; import crazypants.vecmath.Vector4f; public abstract class GuiMachineBase extends GuiContainerBase { @@ -61,9 +62,9 @@ public abstract class GuiMachineBase extends GuiContainerBase { int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); - y += 20; + y += 19; configB = new IconButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); - configB.setToolTip("Toggles the IO config overlay."); + configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); configOverlay = new GuiOverlayIoConfig(machine) { @@ -77,6 +78,10 @@ public abstract class GuiMachineBase extends GuiContainerBase { addOverlay(configOverlay); } + protected boolean showRecipeButton() { + return true; + } + public void renderSlotHighlights(IoMode mode) { SlotDefinition slotDef = tileEntity.getSlotDefinition(); @@ -149,6 +154,11 @@ public abstract class GuiMachineBase extends GuiContainerBase { guibutton.drawButton(this.mc, 0, 0); } + if(showRecipeButton()) { + IconEIO.RECIPE.renderIcon(k + 155, l + 43,16,16,0, true); + //IconEIO.RECIPE.renderIcon(0,0,0,16,16,true); + } + SelectedFace sel = configOverlay.getSelection(); if(sel != null) { IoMode mode = sel.config.getIoMode(sel.face); diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index 0d36f104..caea1322 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -58,7 +58,7 @@ public class GuiAlloySmelter extends GuiMachineBase { super.initGui(); int x = guiLeft + xSize - 5 - BUTTON_SIZE; - int y = guiTop + 60; + int y = guiTop + 62; vanillaFurnaceButton = new IconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, x, y, getIconForMode(), RenderUtil.BLOCK_TEX); vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); diff --git a/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java index 3d86a7ba..4830d64d 100644 --- a/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java @@ -59,6 +59,11 @@ public class GuiCombustionGenerator extends GuiMachineBase { } + @Override + protected boolean showRecipeButton() { + return false; + } + @Override public void renderSlotHighlights(IoMode mode) { super.renderSlotHighlights(mode); diff --git a/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java index 77df15b5..3c50d7bc 100644 --- a/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java @@ -25,6 +25,10 @@ public class GuiStirlingGenerator extends GuiMachineBase { this.entity = te; } + @Override + protected boolean showRecipeButton() { + return false; + } @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index 4eacaa21..3f5663bf 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -39,4 +39,10 @@ public class GuiPainter extends GuiMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); } + + @Override + protected boolean showRecipeButton() { + return false; + } + } diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index cbd4bbc3..5fb3b6e1 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -46,8 +46,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @Override public void loadTransferRects() { - //Set this up later to show all alloy recipes - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(77-5, 26-3, 19, 25), "EnderIOAlloySmelter", new Object[0])); + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOAlloySmelter", new Object[0])); } @Override diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index dda51baf..992fe280 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -56,7 +56,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { @Override public void loadTransferRects() { //Set this up later to show all alloy recipes - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(81-5, 32-11, 15, 23), "EnderIOSagMill", new Object[0])); + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOSagMill", new Object[0])); } @Override diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index 6c9dc546..66916423 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -63,8 +63,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { @Override public void loadTransferRects() { - //Set this up later to show all alloy recipes - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(81-5, 32-11, 15, 23), "EnderIOVat", new Object[0])); + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOVat", new Object[0])); } @Override