Port Quantum Storage to MUI2

src/main/java/gregtech/api/gui/Widget.java

@@ -23,7 +23,6 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import com.google.common.base.Preconditions;
-import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
@@ -311,28 +310,6 @@ public static void drawText(String text, float x, float y, float scale, int colo
         GlStateManager.enableBlend();
     }
 
-    @SideOnly(Side.CLIENT)
-    public static void drawItemStack(ItemStack itemStack, int x, int y, @Nullable String altTxt) {
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(0.0F, 0.0F, 32.0F);
-        GlStateManager.color(1F, 1F, 1F, 1F);
-        GlStateManager.enableDepth();
-        GlStateManager.enableRescaleNormal();
-        GlStateManager.enableLighting();
-        RenderHelper.enableGUIStandardItemLighting();
-        OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
-        Minecraft mc = Minecraft.getMinecraft();
-        RenderItem itemRender = mc.getRenderItem();
-        itemRender.renderItemAndEffectIntoGUI(itemStack, x, y);
-        itemRender.renderItemOverlayIntoGUI(mc.fontRenderer, itemStack, x, y, altTxt);
-        GlStateManager.disableRescaleNormal();
-        GlStateManager.disableLighting();
-        GlStateManager.color(1F, 1F, 1F, 1F);
-        GlStateManager.popMatrix();
-        GlStateManager.enableBlend();
-        GlStateManager.disableDepth();
-    }
-
     @SideOnly(Side.CLIENT)
     public static List<String> getItemToolTip(ItemStack itemStack) {
         Minecraft mc = Minecraft.getMinecraft();

src/main/java/gregtech/api/mui/GTGuiTextures.java

@@ -283,6 +283,10 @@ private static String id(String path) {
     public static final UITexture PRIMITIVE_BLAST_FURNACE_PROGRESS_BAR = fullImage(
             "textures/gui/primitive/progress_bar_primitive_blast_furnace.png");
 
+    public static final UITexture FLUID_VOID_OVERLAY = fullImage("textures/gui/widget/button_fluid_void.png", true);
+    public static final UITexture ITEM_VOID_OVERLAY = fullImage("textures/gui/widget/button_item_void.png", true);
+    public static final UITexture FLUID_LOCK_OVERLAY = fullImage("textures/gui/widget/button_lock.png", true);
+
     // todo bronze/steel/primitive fluid slots?
 
     // SLOT OVERLAYS

src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java

@@ -153,9 +153,16 @@ public boolean isPhantom() {
         return phantom;
     }
 
+    public GTFluidSyncHandler showAmount(boolean inSlot, boolean inTooltip) {
+        return showAmount(() -> inSlot, () -> inTooltip);
+    }
+
+    public GTFluidSyncHandler showAmount(BooleanSupplier inSlot, BooleanSupplier inTooltip) {
+        return showAmountOnSlot(inSlot).showAmountInTooltip(inTooltip);
+    }
+
     public GTFluidSyncHandler showAmountInTooltip(boolean showAmount) {
-        this.showAmountInTooltip = () -> showAmount;
-        return this;
+        return showAmountInTooltip(() -> showAmount);
     }
 
     public GTFluidSyncHandler showAmountInTooltip(BooleanSupplier showAmount) {
@@ -170,8 +177,7 @@ public boolean showAmountInTooltip() {
     }
 
     public GTFluidSyncHandler showAmountOnSlot(boolean showAmount) {
-        this.showAmountOnSlot = () -> showAmount;
-        return this;
+        return showAmountOnSlot(() -> showAmount);
     }
 
     public GTFluidSyncHandler showAmountOnSlot(BooleanSupplier showAmount) {
@@ -237,6 +243,7 @@ public int getFluidAmount() {
 
     public void handleTooltip(@NotNull RichTooltip tooltip) {
         IKey nameKey = getFluidNameKey();
+
         if (nameKey != IKey.EMPTY) {
             tooltip.addLine(nameKey);
         }
@@ -323,8 +330,7 @@ public void tryClickPhantom(MouseData data) {
         EntityPlayer player = getSyncManager().getPlayer();
         ItemStack currentStack = player.inventory.getItemStack();
         FluidStack currentFluid = this.tank.getFluid();
-        if (currentStack.getCount() > 1) currentStack = GTUtility.copy(1, currentStack);
-        var fluidHandlerItem = FluidUtil.getFluidHandler(currentStack);
+        IFluidHandlerItem fluidHandlerItem = FluidUtil.getFluidHandler(currentStack);
 
         switch (data.mouseButton) {
             case 0 -> {

src/main/java/gregtech/client/utils/RenderUtil.java

@@ -36,6 +36,7 @@
 import com.cleanroommc.modularui.utils.Color;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.lwjgl.opengl.EXTFramebufferObject;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL30;
 
@@ -169,7 +170,7 @@ public static void useStencil(Runnable mask, Runnable renderInMask, boolean shou
     public static void useLightMap(float x, float y, Runnable codeBlock) {
         /* hack the lightmap */
         GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
-        net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+        RenderHelper.disableStandardItemLighting();
         float lastBrightnessX = OpenGlHelper.lastBrightnessX;
         float lastBrightnessY = OpenGlHelper.lastBrightnessY;
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, x, y);
@@ -178,7 +179,7 @@ public static void useLightMap(float x, float y, Runnable codeBlock) {
         }
         /* restore the lightmap */
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lastBrightnessX, lastBrightnessY);
-        net.minecraft.client.renderer.RenderHelper.enableStandardItemLighting();
+        RenderHelper.enableStandardItemLighting();
         GL11.glPopAttrib();
     }
 
@@ -383,14 +384,14 @@ public static void renderText(float x, float y, float z, float scale, int color,
     }
 
     public static void renderItemOverLay(float x, float y, float z, float scale, ItemStack itemStack) {
-        net.minecraft.client.renderer.RenderHelper.enableStandardItemLighting();
+        RenderHelper.enableStandardItemLighting();
         GlStateManager.pushMatrix();
         GlStateManager.scale(scale, scale, 0.0001f);
         GlStateManager.translate(x * 16, y * 16, z * 16);
         RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
         renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0);
         GlStateManager.popMatrix();
-        net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+        RenderHelper.disableStandardItemLighting();
     }
 
     // adapted from com.cleanroommc.modularui.drawable.GuiDraw.java
@@ -638,10 +639,10 @@ public static void hookDepthBuffer(Framebuffer fbo, int depthBuffer) {
         OpenGlHelper.glBindFramebuffer(OpenGlHelper.GL_FRAMEBUFFER, fbo.framebufferObject);
         if (fbo.isStencilEnabled()) {
             OpenGlHelper.glFramebufferRenderbuffer(OpenGlHelper.GL_FRAMEBUFFER,
-                    org.lwjgl.opengl.EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, OpenGlHelper.GL_RENDERBUFFER,
+                    EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, OpenGlHelper.GL_RENDERBUFFER,
                     depthBuffer);
             OpenGlHelper.glFramebufferRenderbuffer(OpenGlHelper.GL_FRAMEBUFFER,
-                    org.lwjgl.opengl.EXTFramebufferObject.GL_STENCIL_ATTACHMENT_EXT, OpenGlHelper.GL_RENDERBUFFER,
+                    EXTFramebufferObject.GL_STENCIL_ATTACHMENT_EXT, OpenGlHelper.GL_RENDERBUFFER,
                     depthBuffer);
         } else {
             OpenGlHelper.glFramebufferRenderbuffer(OpenGlHelper.GL_FRAMEBUFFER, OpenGlHelper.GL_DEPTH_ATTACHMENT,
@@ -720,6 +721,36 @@ public void put(int element, float @NotNull... data) {
         return getTextureMap().getMissingSprite();
     }
 
+    @SideOnly(Side.CLIENT)
+    public static void drawItemStack(ItemStack itemStack, int x, int y, boolean drawCount) {
+        int cache = itemStack.getCount();
+        if (!drawCount) itemStack.setCount(1);
+        drawItemStack(itemStack, x, y, null);
+        if (!drawCount) itemStack.setCount(cache);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static void drawItemStack(ItemStack itemStack, int x, int y, @Nullable String altTxt) {
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(0.0F, 0.0F, 32.0F);
+        GlStateManager.color(1F, 1F, 1F, 1F);
+        GlStateManager.enableDepth();
+        GlStateManager.enableRescaleNormal();
+        GlStateManager.enableLighting();
+        RenderHelper.enableGUIStandardItemLighting();
+        OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
+        Minecraft mc = Minecraft.getMinecraft();
+        RenderItem itemRender = mc.getRenderItem();
+        itemRender.renderItemAndEffectIntoGUI(itemStack, x, y);
+        itemRender.renderItemOverlayIntoGUI(mc.fontRenderer, itemStack, x, y, altTxt);
+        GlStateManager.disableRescaleNormal();
+        GlStateManager.disableLighting();
+        GlStateManager.color(1F, 1F, 1F, 1F);
+        GlStateManager.popMatrix();
+        GlStateManager.enableBlend();
+        GlStateManager.disableDepth();
+    }
+
     public static void drawSlotOverlay(@NotNull IWidget slot, int overlayColor) {
         GlStateManager.colorMask(true, true, true, false);
         GuiDraw.drawRect(1, 1, slot.getArea().w() - 2, slot.getArea().h() - 2, overlayColor);

src/main/java/gregtech/common/gui/widget/appeng/slot/AEItemConfigSlot.java

@@ -5,6 +5,7 @@
 import gregtech.api.util.Position;
 import gregtech.api.util.Size;
 import gregtech.api.util.TextFormattingUtil;
+import gregtech.client.utils.RenderUtil;
 import gregtech.common.gui.widget.appeng.AEItemConfigWidget;
 import gregtech.common.metatileentities.multi.multiblockpart.appeng.slot.IConfigurableSlot;
 import gregtech.common.metatileentities.multi.multiblockpart.appeng.stack.WrappedItemStack;
@@ -53,7 +54,7 @@ public void drawInBackground(int mouseX, int mouseY, float partialTicks, IRender
         if (config != null) {
             ItemStack stack = config.createItemStack();
             stack.setCount(1);
-            drawItemStack(stack, stackX, stackY, null);
+            RenderUtil.drawItemStack(stack, stackX, stackY, null);
 
             // Only draw the config amount if not stocking, as its meaningless when stocking
             if (!pw.isStocking()) {
@@ -64,7 +65,7 @@ public void drawInBackground(int mouseX, int mouseY, float partialTicks, IRender
         if (stock != null) {
             ItemStack stack = stock.createItemStack();
             stack.setCount(1);
-            drawItemStack(stack, stackX + DISPLAY_X_OFFSET, stackY, null);
+            RenderUtil.drawItemStack(stack, stackX + DISPLAY_X_OFFSET, stackY, null);
             String amountStr = TextFormattingUtil.formatLongToCompactString(stock.getStackSize(), 4);
             drawStringFixedCorner(amountStr, stackX + DISPLAY_X_OFFSET + 17, stackY + 17, 16777215, true, 0.5f);
         }

src/main/java/gregtech/common/gui/widget/appeng/slot/AEItemDisplayWidget.java

@@ -5,6 +5,7 @@
 import gregtech.api.gui.Widget;
 import gregtech.api.util.Position;
 import gregtech.api.util.Size;
+import gregtech.client.utils.RenderUtil;
 import gregtech.common.gui.widget.appeng.AEListGridWidget;
 
 import net.minecraft.item.ItemStack;
@@ -39,7 +40,7 @@ public void drawInBackground(int mouseX, int mouseY, float partialTicks, IRender
         if (item != null) {
             ItemStack realStack = item.createItemStack();
             realStack.setCount(1);
-            drawItemStack(realStack, stackX, stackY, null);
+            RenderUtil.drawItemStack(realStack, stackX, stackY, null);
             String amountStr = String.format("x%,d", item.getStackSize());
             drawText(amountStr, stackX + 20, stackY + 5, 1, 0xFFFFFFFF);
         }