Skip to content

Commit

Permalink
Wrap calls to RenderHelper through MekanismRenderHelper
Browse files Browse the repository at this point in the history
  • Loading branch information
@pupnewfster
pupnewfster committed Jul 8, 2019
1 parent d687abd commit 0ea90e9
Show file tree
Hide file tree
Showing 17 changed files with 58 additions and 133 deletions.
8 changes: 2 additions & 6 deletions src/main/java/mekanism/client/gui/GuiDictionary.java
View file
Expand Up @@ -9,8 +9,6 @@
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.Slot;
Expand All @@ -37,11 +35,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
fontRenderer.drawString(LangUtils.localize("item.Dictionary.name"), 64, 5, 0x404040);
fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
if (!itemType.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(itemType, 6, 6);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
Expand Down
26 changes: 8 additions & 18 deletions src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java
View file
Expand Up @@ -30,8 +30,6 @@
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -355,11 +353,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
if (filter instanceof MItemStackFilter) {
MItemStackFilter itemFilter = (MItemStackFilter) filter;
if (!itemFilter.itemType.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}

fontRenderer.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
Expand All @@ -371,23 +367,19 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
ItemStack renderStack = oreDictStacks.get(filter).renderStack;
if (!renderStack.isEmpty()) {
try {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
} catch (Exception ignored) {
}
}
fontRenderer.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
} else if (filter instanceof MMaterialFilter) {
MMaterialFilter itemFilter = (MMaterialFilter) filter;
if (!itemFilter.getMaterialItem().isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(itemFilter.getMaterialItem(), 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
fontRenderer.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040);
} else if (filter instanceof MModIDFilter) {
Expand All @@ -398,11 +390,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
ItemStack renderStack = modIDStacks.get(filter).renderStack;
if (!renderStack.isEmpty()) {
try {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
} catch (Exception ignored) {
}
}
Expand Down
26 changes: 8 additions & 18 deletions src/main/java/mekanism/client/gui/GuiLogisticalSorter.java
View file
Expand Up @@ -33,8 +33,6 @@
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -366,11 +364,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
final TItemStackFilter itemFilter = (TItemStackFilter) filter;

if (!itemFilter.itemType.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}

fontRenderer.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
Expand All @@ -384,11 +380,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
ItemStack renderStack = oreDictStacks.get(filter).renderStack;
if (!renderStack.isEmpty()) {
try {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
} catch (final Exception ignored) {
}
}
Expand All @@ -398,11 +392,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
} else if (filter instanceof TMaterialFilter) {
final TMaterialFilter itemFilter = (TMaterialFilter) filter;
if (!itemFilter.getMaterialItem().isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(itemFilter.getMaterialItem(), 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}

fontRenderer.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040);
Expand All @@ -418,11 +410,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {

if (!renderStack.isEmpty()) {
try {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
} catch (final Exception ignored) {
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/mekanism/client/gui/GuiOredictionificator.java
View file
Expand Up @@ -25,8 +25,6 @@
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -100,11 +98,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
}
ItemStack stack = renderStacks.get(filter);
if (!stack.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(stack, 13, yStart + 3);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
fontRenderer.drawString(LangUtils.localize("gui.filter"), 32, yStart + 2, 0x404040);
renderScaledText(filter.filter, 32, yStart + 2 + 9, 0x404040, 117);
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/mekanism/client/gui/GuiSeismicReader.java
View file
Expand Up @@ -12,7 +12,6 @@
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
Expand Down Expand Up @@ -94,7 +93,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTick) {
if (0 <= layer && layer < blockList.size()) {
ItemStack stack = new ItemStack(blockList.get(layer).getRight(), 1, blockList.get(layer).getLeft());

GlStateManager.pushMatrix();
MekanismRenderHelper stackRenderHelper = new MekanismRenderHelper(true);
GlStateManager.translate(centralX - 2, centralY - i * 16 + (22 * 2), 0);

if (i < 4) {
Expand All @@ -106,10 +105,9 @@ public void drawScreen(int mouseX, int mouseY, float partialTick) {
GlStateManager.scale(0.8f, 0.8f, 0.8f);
}

RenderHelper.enableGUIStandardItemLighting();
stackRenderHelper.enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(stack, 0, 0);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
stackRenderHelper.cleanup();
}
}

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/mekanism/client/gui/GuiUpgradeManagement.java
View file
Expand Up @@ -104,12 +104,11 @@ private void renderText(String text, int x, int y, float size, boolean scale) {
}

private void renderUpgrade(Upgrade type, int x, int y, float size, boolean scale) {
GlStateManager.pushMatrix();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true);
GlStateManager.scale(size, size, size);
RenderHelper.enableGUIStandardItemLighting();
renderHelper.enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(type.getStack(), scale ? (int) ((1F / size) * x) : x, scale ? (int) ((1F / size) * y) : y);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}

@Override
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/mekanism/client/gui/chemical/GuiChemicalCrystallizer.java
View file
Expand Up @@ -21,14 +21,13 @@
import mekanism.client.gui.element.GuiSlot.SlotType;
import mekanism.client.gui.element.GuiTransporterConfigTab;
import mekanism.client.gui.element.GuiUpgradeTab;
import mekanism.client.render.MekanismRenderHelper;
import mekanism.common.inventory.container.ContainerChemicalCrystallizer;
import mekanism.common.recipe.machines.CrystallizerRecipe;
import mekanism.common.tile.TileEntityChemicalCrystallizer;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -90,11 +89,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
}
if (!renderStack.isEmpty()) {
try {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(renderStack, 131, 14);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
} catch (Exception ignored) {
}
}
Expand Down
13 changes: 4 additions & 9 deletions src/main/java/mekanism/client/gui/filter/GuiMItemStackFilter.java
View file
Expand Up @@ -18,7 +18,6 @@
import net.minecraft.block.Block;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents;
Expand Down Expand Up @@ -79,18 +78,14 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
fontRenderer.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00);
if (!filter.itemType.isEmpty()) {
renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 107);
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
if (!filter.replaceStack.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
int xAxis = mouseX - (width - xSize) / 2;
int yAxis = mouseY - (height - ySize) / 2;
Expand Down
13 changes: 4 additions & 9 deletions src/main/java/mekanism/client/gui/filter/GuiMMaterialFilter.java
View file
Expand Up @@ -15,7 +15,6 @@
import net.minecraft.block.Block;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents;
Expand Down Expand Up @@ -60,18 +59,14 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
fontRenderer.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00);
if (!filter.getMaterialItem().isEmpty()) {
renderScaledText(filter.getMaterialItem().getDisplayName(), 35, 41, 0x00CD00, 107);
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(filter.getMaterialItem(), 12, 19);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
if (!filter.replaceStack.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
int xAxis = mouseX - (width - xSize) / 2;
int yAxis = mouseY - (height - ySize) / 2;
Expand Down
13 changes: 4 additions & 9 deletions src/main/java/mekanism/client/gui/filter/GuiMModIDFilter.java
View file
Expand Up @@ -16,7 +16,6 @@
import net.minecraft.block.Block;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents;
Expand Down Expand Up @@ -51,20 +50,16 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
renderScaledText(LangUtils.localize("gui.id") + ": " + filter.getModID(), 35, 32, 0x00CD00, 107);
if (!renderStack.isEmpty()) {
try {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
} catch (Exception ignored) {
}
}
if (!filter.replaceStack.isEmpty()) {
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
renderHelper.cleanup();
}
int xAxis = mouseX - (width - xSize) / 2;
int yAxis = mouseY - (height - ySize) / 2;
Expand Down

0 comments on commit 0ea90e9

Please sign in to comment.