From 8c029eab281e8612da2dd12f8b0d61ee8c8417a2 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Fri, 3 Dec 2021 14:29:00 +0800 Subject: Make machine reconfiguration interface a little nicer also tweaked the API a little for GT++ conf circuits and bartworks circuit programmer Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --- .../java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java | 2 +- .../java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/api/gui') diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java index df02d219fd..f9580aa5fd 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java @@ -50,7 +50,7 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin private void openSelectCircuitDialog() { mc.displayGuiScreen(new GT_GUIDialogSelectItem( StatCollector.translateToLocal("GT5U.machines.select_circuit"), - null, + mContainer.mTileEntity.getMetaTileEntity().getStackForm(0), this, this::onCircuitSelected, getMachine().getConfigurationCircuits(), diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java index 2c1d8aa886..045730dd7f 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java @@ -4,8 +4,10 @@ import codechicken.lib.gui.GuiDraw; import gregtech.api.interfaces.IGuiScreen; import gregtech.api.util.GT_UtilityClient; import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import java.awt.*; import java.util.List; @@ -108,9 +110,17 @@ public class GT_GuiFakeItemButton implements IGuiScreen.IGuiElement { GT_GuiIcon.render(bgIcon, xPosition-1, yPosition-1, 18, 18,0,true); } - if (item != null) + if (item != null) { + if (item.getItem() instanceof ItemBlock) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + } gui.getItemRenderer().renderItemAndEffectIntoGUI(gui.getFontRenderer(), Minecraft.getMinecraft().getTextureManager(), item, xPosition, yPosition); + if (item.getItem() instanceof ItemBlock) + GL11.glPopAttrib(); + } + if (getMimicSlot()) if (getBounds().contains(mouseX - gui.getGuiLeft(), mouseY - gui.getGuiTop())) { GL11.glDisable(GL11.GL_LIGHTING); -- cgit