Merge remote-tracking branch 'origin/recipe-catalyst' into test

This commit is contained in:
Martin Robertz committed 2022-01-15 14:00:03 +01:00
commit 2fa641c2aa
2 files changed
+3 -1

No files matched your search

@@ -193,6 +193,7 @@ public class GuiContainerManager
private static final HashSet<String> stackTraces = new HashSet<>();
public static void drawItem(int i, int j, ItemStack itemstack, FontRenderer fontRenderer, boolean smallAmount) {
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
enable3DRender();
float zLevel = drawItems.zLevel += 100F;
try {
@@ -228,6 +229,7 @@ public class GuiContainerManager
enable2DRender();
drawItems.zLevel = zLevel - 100;
GL11.glPopAttrib();
}
//copy from appeng.client.render.AppEngRenderItem
@@ -36,7 +36,7 @@ public class GuiRecipeCatalyst extends INEIGuiAdapter {
height = (ingredientBorder * 2) + (tabBorder * 2) + (rowCount * ingredientSize);
xPos = guiRecipe.guiLeft - width + tabBorder + 1;
yPos = guiRecipe.guiTop;
drawBordered("nei:textures/catalyst_tab.png", xPos, yPos, width, height, 28, 28, 6, 7, 6, 6);
drawBordered("nei:textures/catalyst_tab.png", xPos, yPos, width, height, 28, 28, 6, 6, 6, 6);
width = (ingredientBorder * 2) + (columnCount * ingredientSize);
height = (ingredientBorder * 2) + (rowCount * ingredientSize);