simplify item render

don't draw item amount

Author: ghzdude

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

@@ -33,6 +33,7 @@
 import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
 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;
 
@@ -165,7 +166,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);
@@ -174,7 +175,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();
     }
 
@@ -379,14 +380,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
@@ -634,10 +635,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,
@@ -716,6 +717,14 @@ 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();

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java

@@ -42,6 +42,7 @@
 import codechicken.lib.render.pipeline.ColourMultiplier;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
@@ -316,10 +317,9 @@ protected void createWidgets(ModularPanel mainPanel, PanelSyncManager syncManage
                 () -> virtualItemStack.getDisplayName(),
                 textWidget -> !virtualItemStack.isEmpty(),
                 () -> TextFormattingUtil.formatNumbers(itemsStoredInside)))
-                // todo make and use GT item slot for special behavior
                 .child(new GTItemSlot()
                         .showTooltip(false)
-                        // todo disable tooltip
+                        .background(IDrawable.NONE)
                         .slot(new ModularSlot(itemInventory, 0)
                                 .accessibility(false, false))
                         .pos(148, 41));

src/main/java/gregtech/common/mui/widget/GTItemSlot.java

@@ -3,7 +3,6 @@
 import gregtech.client.utils.RenderUtil;
 
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandlerModifiable;
@@ -131,12 +130,9 @@ public void drawForeground(ModularGuiContext context) {
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
         if (this.syncHandler == null) return;
-        RenderHelper.enableGUIStandardItemLighting();
-        // todo draw slot
-        RenderUtil.drawItemStack(getSlot().getStack(), 0, 0, null);
-        // drawSlot(getSlot());
-        RenderHelper.enableStandardItemLighting();
-        GlStateManager.disableLighting();
+
+        RenderUtil.drawItemStack(getSlot().getStack(), 1, 1, false);
+
         if (isHovering()) {
             GlStateManager.colorMask(true, true, true, false);
             GuiDraw.drawRect(1, 1, 16, 16, getSlotHoverColor());