use mui2 methods to draw item

cleanup

Author: ghzdude

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

@@ -384,21 +384,6 @@ public static void renderItemOverLay(float x, float y, float z, float scale, Ite
         net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
     }
 
-    public static void renderItemInGUI(ItemStack stack, int x, int y, @Nullable String text) {
-        RenderHelper.enableGUIStandardItemLighting();
-        GlStateManager.pushMatrix();
-        RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
-        renderItem.renderItemAndEffectIntoGUI(stack, x, y);
-        renderItem.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, stack, x, y, text);
-        GlStateManager.popMatrix();
-        RenderHelper.enableStandardItemLighting();
-        GlStateManager.disableLighting();
-    }
-
-    public static void renderItemInGUI(ItemStack stack, int x, int y) {
-        renderItemInGUI(stack, x, y, null);
-    }
-
     public static void renderFluidOverLay(float x, float y, float width, float height, float z, FluidStack fluidStack,
                                           float alpha) {
         if (fluidStack != null) {

src/main/java/gregtech/common/mui/widget/workbench/CraftingInputSlot.java

@@ -8,7 +8,9 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemHandlerHelper;
 
+import com.cleanroommc.modularui.api.MCHelper;
 import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
 import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
 import com.cleanroommc.modularui.screen.RichTooltip;
@@ -77,16 +79,16 @@ public Result onMousePressed(int mouseButton) {
 
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
-        // GuiScreen guiScreen = getScreen().getScreenWrapper().getGuiScreen();
         ItemStack itemstack = this.syncHandler.getStack();
         if (itemstack.isEmpty()) return;
-        // guiScreen.getItemRenderer().zLevel = 0.0F;
-        // guiScreen.setZ(0f);
-        RenderUtil.renderItemInGUI(itemstack, 1, 1);
 
         if (!this.hasIngredients) {
             RenderUtil.renderRect(0, 0, 18, 18, 200, 0x80FF0000);
         }
+
+        GuiDraw.drawItem(itemstack, 1, 1, 16, 16);
+        var renderer = MCHelper.getMc().getRenderItem();
+        renderer.renderItemOverlayIntoGUI(MCHelper.getFontRenderer(), itemstack, 1, 1, null);
     }
 
     @Override

src/main/java/gregtech/common/mui/widget/workbench/CraftingOutputSlot.java

@@ -1,7 +1,6 @@
 package gregtech.common.mui.widget.workbench;
 
 import gregtech.api.util.GTLog;
-import gregtech.client.utils.RenderUtil;
 import gregtech.common.metatileentities.storage.CraftingRecipeLogic;
 import gregtech.common.metatileentities.storage.CraftingRecipeMemory;
 import gregtech.common.metatileentities.storage.MetaTileEntityWorkbench;
@@ -16,6 +15,7 @@
 import net.minecraftforge.items.ItemHandlerHelper;
 
 import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
@@ -72,17 +72,10 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
 
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
-        // GuiScreenWrapper guiScreen = getScreen().getScreenWrapper();
         ItemStack itemstack = this.syncHandler.getOutputStack();
         if (itemstack.isEmpty()) return;
 
-        // guiScreen.setZ(100f);
-        // guiScreen.getItemRenderer().zLevel = 100.0F;
-
-        RenderUtil.renderItemInGUI(itemstack, 1, 1);
-
-        // guiScreen.getItemRenderer().zLevel = 0.0F;
-        // guiScreen.setZ(0f);
+        GuiDraw.drawItem(itemstack, 1, 1, 16, 16);
     }
 
     @Override

src/main/java/gregtech/common/mui/widget/workbench/RecipeMemorySlot.java

@@ -1,7 +1,6 @@
 package gregtech.common.mui.widget.workbench;
 
 import gregtech.api.mui.GTGuiTextures;
-import gregtech.client.utils.RenderUtil;
 import gregtech.common.metatileentities.storage.CraftingRecipeMemory;
 
 import net.minecraft.client.renderer.GlStateManager;
@@ -10,6 +9,7 @@
 import com.cleanroommc.modularui.api.MCHelper;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -26,38 +26,31 @@ public RecipeMemorySlot(CraftingRecipeMemory memory, int index) {
         this.memory = memory;
         this.index = index;
         tooltip().setAutoUpdate(true);
-        // .setHasTitleMargin(true);
         tooltipBuilder(tooltip -> {
             var recipe = memory.getRecipeAtIndex(this.index);
             if (recipe == null) return;
             var list = MCHelper.getItemToolTip(recipe.getRecipeResult());
+            // todo lang
             list.add(1, IKey.lang("Times Used: " + recipe.timesUsed).get());
             tooltip.addStringLines(list);
         });
     }
 
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
-        // GuiScreenWrapper guiScreen = getScreen().getScreenWrapper();
         ItemStack itemstack = this.memory.getRecipeOutputAtIndex(this.index);
         if (itemstack.isEmpty()) return;
 
-        // guiScreen.setZ(100f);
-        // guiScreen.getItemRenderer().zLevel = 100.0F;
-
         int cachedCount = itemstack.getCount();
         itemstack.setCount(1); // required to not render the amount overlay
-        RenderUtil.renderItemInGUI(itemstack, 1, 1);
+        GuiDraw.drawItem(itemstack, 1, 1, 16, 16);
         itemstack.setCount(cachedCount);
 
         if (this.memory.getRecipeAtIndex(this.index).isRecipeLocked()) {
             GlStateManager.disableDepth();
             GTGuiTextures.RECIPE_LOCK.draw(context, 10, 1, 8, 8, widgetTheme);
             GlStateManager.enableDepth();
         }
-
-        // guiScreen.getItemRenderer().zLevel = 0.0F;
-        // guiScreen.setZ(0f);
     }
 
     @Override