diff --git a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java index d2aa589c..f9ae8765 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java @@ -11,6 +11,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; + import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor; import com.glodblock.github.client.me.EssentiaRepo; @@ -21,16 +23,13 @@ import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.network.CPacketFluidUpdate; -import com.glodblock.github.util.Ae2ReflectClient; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.client.me.SlotME; -import appeng.client.render.AppEngRenderItem; public class GuiEssentiaTerminal extends GuiFluidMonitor { - private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this); protected EntityPlayer player; public GuiEssentiaTerminal(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { @@ -64,13 +63,15 @@ public class GuiEssentiaTerminal extends GuiFluidMonitor { AspectUtil.getAspectFromGas(fluidStack), fluidStack.amount); IAEItemStack gas = stack.copy().setStackSize(stack.getStackSize() / AspectUtil.R); - stackSizeRenderer.setAeStack(gas); - stackSizeRenderer.renderItemOverlayIntoGUI( + aeRenderItem.setAeStack(gas); + GL11.glTranslatef(0.0f, 0.0f, 200.0f); + aeRenderItem.renderItemOverlayIntoGUI( fontRendererObj, mc.getTextureManager(), gas.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition); + GL11.glTranslatef(0.0f, 0.0f, -200.0f); return false; } return true; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java index 5ef14952..ad58d53f 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java @@ -7,7 +7,6 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter; import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.network.CPacketValueConfig; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.NameConst; import appeng.api.config.RedstoneMode; @@ -16,7 +15,6 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.client.gui.implementations.GuiUpgradeable; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiNumberBox; -import appeng.client.render.AppEngRenderItem; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.localization.GuiColors; @@ -25,7 +23,6 @@ import appeng.core.localization.GuiText; public class GuiFluidLevelEmitter extends GuiUpgradeable { private GuiNumberBox level; - private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this); private GuiButton plus1; private GuiButton plus10; private GuiButton plus100; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java index dd1211a9..7ca1fdd1 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java @@ -13,6 +13,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; + import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder; import com.glodblock.github.common.item.ItemFluidPacket; @@ -21,12 +23,10 @@ import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.slot.ISlotFluid; import com.glodblock.github.inventory.slot.SlotSingleItem; import com.glodblock.github.network.CPacketEncodePattern; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.NameConst; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.AEBaseGui; -import appeng.client.render.AppEngRenderItem; import appeng.core.localization.GuiText; public class GuiFluidPatternEncoder extends AEBaseGui { @@ -35,7 +35,6 @@ public class GuiFluidPatternEncoder extends AEBaseGui { private final ContainerFluidPatternEncoder cont; private final MouseRegionManager mouseRegions = new MouseRegionManager(this); - private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this); public GuiFluidPatternEncoder(InventoryPlayer ipl, TileFluidPatternEncoder tile) { super(new ContainerFluidPatternEncoder(ipl, tile)); @@ -95,13 +94,15 @@ public class GuiFluidPatternEncoder extends AEBaseGui { if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0) fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount); } - stackSizeRenderer.setAeStack(fake); - stackSizeRenderer.renderItemOverlayIntoGUI( + aeRenderItem.setAeStack(fake); + GL11.glTranslatef(0.0f, 0.0f, 200.0f); + aeRenderItem.renderItemOverlayIntoGUI( fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition); + GL11.glTranslatef(0.0f, 0.0f, -200.0f); } else { super.func_146977_a(slot); } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java index 31209e17..76a866d2 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java @@ -22,7 +22,6 @@ import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.network.CPacketFluidUpdate; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.Util; import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite; @@ -31,12 +30,10 @@ import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.client.me.SlotME; -import appeng.client.render.AppEngRenderItem; import appeng.container.slot.AppEngSlot; public class GuiFluidTerminal extends GuiFluidMonitor { - private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this); protected EntityPlayer player; public ContainerFluidMonitor container; @@ -84,13 +81,15 @@ public class GuiFluidTerminal extends GuiFluidMonitor { if (stack == null) return true; FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack()); this.drawWidget(slot.xDisplayPosition, slot.yDisplayPosition, fluidStack.getFluid()); - stackSizeRenderer.setAeStack(stack); - stackSizeRenderer.renderItemOverlayIntoGUI( + aeRenderItem.setAeStack(stack); + GL11.glTranslatef(0.0f, 0.0f, 200.0f); + aeRenderItem.renderItemOverlayIntoGUI( fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition); + GL11.glTranslatef(0.0f, 0.0f, -200.0f); return false; } return true; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java index 099f7f15..047ac54b 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java @@ -67,6 +67,7 @@ import appeng.integration.IntegrationType; import appeng.items.misc.ItemEncodedPattern; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; +import appeng.util.item.AEItemStack; import cpw.mods.fml.common.Loader; public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillTextField, IInterfaceTerminalPostUpdate { @@ -202,7 +203,7 @@ public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillText guiButtonAssemblersOnly.xPosition = guiLeft - 18; guiButtonAssemblersOnly.yPosition = guiButtonHideFull.yPosition + 18; - offsetY = 103; + offsetY = guiButtonAssemblersOnly.yPosition + 18; this.setScrollBar(); this.repositionSlots(); @@ -493,17 +494,19 @@ public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillText if (viewY + entry.optionsButton.height > 0 && viewY < viewHeight) { entry.optionsButton.yPosition = viewY + 5; entry.renameButton.yPosition = viewY + 5; + GuiFCImgButton toRender; if (isShiftKeyDown()) { - entry.renameButton.drawButton(mc, relMouseX, relMouseY); + toRender = entry.renameButton; } else { - entry.optionsButton.drawButton(mc, relMouseX, relMouseY); + toRender = entry.optionsButton; } - if (entry.optionsButton.getMouseIn() + toRender.drawButton(mc, relMouseX, relMouseY); + if (toRender.getMouseIn() && relMouseY >= Math.max(IfaceSection.TITLE_HEIGHT, entry.optionsButton.yPosition)) { // draw a tooltip GL11.glTranslatef(0f, 0f, TOOLTIP_Z); GL11.glDisable(GL11.GL_SCISSOR_TEST); - drawHoveringText(extraOptionsText, relMouseX, relMouseY); + drawHoveringText(Arrays.asList(toRender.getMessage()), relMouseX, relMouseY); GL11.glTranslatef(0f, 0f, -TOOLTIP_Z); GL11.glEnable(GL11.GL_SCISSOR_TEST); } @@ -542,6 +545,7 @@ public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillText translatedRenderItem .renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), toRender, 0, 0); GL11.glTranslatef(0.0f, 0.0f, ITEMSTACK_OVERLAY_Z - ITEMSTACK_Z); + aeRenderItem.setAeStack(AEItemStack.create(toRender)); aeRenderItem.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), toRender, 0, 0); aeRenderItem.zLevel = 0.0f; RenderHelper.disableStandardItemLighting(); @@ -1150,7 +1154,7 @@ public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillText String dispName; AppEngInternalInventory inv; - GuiImgButton optionsButton; + GuiFCImgButton optionsButton; GuiFCImgButton renameButton; /** Nullable - icon that represents the interface */ @@ -1187,7 +1191,7 @@ public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillText this.rows = rows; this.rowSize = rowSize; this.online = online; - this.optionsButton = new GuiImgButton(2, 0, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE); + this.optionsButton = new GuiFCImgButton(2, 0, "HIGHLIGHT", "YES"); this.optionsButton.setHalfSize(true); this.renameButton = new GuiFCImgButton(2, 0, "EDIT", "YES"); this.renameButton.setHalfSize(true); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index 8b7b01db..16a7cb0b 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -224,8 +224,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler { } else { fake.setStackSize(0); } - float lastZLevel = this.zLevel; - this.zLevel = 0f; GL11.glTranslatef(0.0f, 0.0f, 200.0f); aeRenderItem.renderItemOverlayIntoGUI( fontRendererObj, @@ -234,7 +232,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler { slot.xDisplayPosition, slot.yDisplayPosition); GL11.glTranslatef(0.0f, 0.0f, -200.0f); - this.zLevel = lastZLevel; return false; } return true; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java index 64a2f69e..98db8ce3 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -582,6 +582,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel GL11.glTranslatef(colLeft, viewY + rowYTop + 1, ITEM_STACK_Z); GL11.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); + aeRenderItem.setAeStack(null); aeRenderItem.zLevel = 3.0f - 50.0f; aeRenderItem.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemStack, 0, 0); aeRenderItem.zLevel = 0.0f; diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java index f2a9e918..13cdac56 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.GuiFCImgButton; @@ -15,7 +16,6 @@ import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.slot.SlotSingleItem; import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; import appeng.api.storage.ITerminalHost; @@ -23,7 +23,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiScrollbar; import appeng.client.gui.widgets.GuiTabButton; -import appeng.client.render.AppEngRenderItem; import appeng.container.slot.AppEngSlot; import appeng.container.slot.SlotFake; import appeng.util.item.AEItemStack; @@ -54,7 +53,6 @@ public abstract class FCGuiEncodeTerminal extends GuiItemMonitor { protected GuiFCImgButton autoFillPatternEnableBtn; protected GuiFCImgButton autoFillPatternDisableBtn; protected final GuiScrollbar processingScrollBar = new GuiScrollbar(); - protected final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this); public FCGuiEncodeTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCContainerEncodeTerminal c) { @@ -184,13 +182,15 @@ public abstract class FCGuiEncodeTerminal extends GuiItemMonitor { if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0) fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount); } else return true; - stackSizeRenderer.setAeStack(fake); - stackSizeRenderer.renderItemOverlayIntoGUI( + aeRenderItem.setAeStack(fake); + GL11.glTranslatef(0.0f, 0.0f, 200.0f); + aeRenderItem.renderItemOverlayIntoGUI( fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition); + GL11.glTranslatef(0.0f, 0.0f, -200.0f); return false; } return true;