diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index ae8916bd0..969042a12 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -31,6 +31,7 @@ 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; @@ -128,9 +129,9 @@ public class GuiChemicalCrystallizer extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(renderStack, 131, 14); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index fddd8f0f5..d7ced029f 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -9,6 +9,7 @@ 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; @@ -45,9 +46,9 @@ public class GuiDictionary extends GuiMekanism if(itemType != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(itemType, 6, 6); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index ffb2d77f4..b7098f175 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -31,6 +31,7 @@ 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.minecraftforge.fml.relauncher.Side; @@ -186,7 +187,7 @@ public class GuiDigitalMiner extends GuiMekanism { GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); @@ -194,7 +195,7 @@ public class GuiDigitalMiner extends GuiMekanism drawTexturedRectFromIcon(144, 27, MekanismRenderer.getColorIcon(EnumColor.DARK_RED), 16, 16); itemRender.renderItemAndEffectIntoGUI(tileEntity.missingStack, 144, 27); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } else { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 55791173a..509c45bb1 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -30,6 +30,7 @@ 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; @@ -466,9 +467,9 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(itemFilter.itemType != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } @@ -487,9 +488,9 @@ public class GuiDigitalMinerConfig extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } @@ -503,9 +504,9 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(itemFilter.materialItem != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(itemFilter.materialItem, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } @@ -524,9 +525,9 @@ public class GuiDigitalMinerConfig extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 42d21e607..ad0d9af90 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -28,6 +28,7 @@ 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; @@ -208,12 +209,12 @@ public class GuiFormulaicAssemblicator extends GuiMekanism drawGradientRect(guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition, guiWidth + slot.xDisplayPosition + 16, guiHeight + slot.yDisplayPosition + 16, -2137456640, -2137456640); } - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); MekanismRenderer.blendOn(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); itemRender.renderItemAndEffectIntoGUI(stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); MekanismRenderer.blendOff(); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 6c6d54f8f..d5700ecd4 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -32,6 +32,7 @@ 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; @@ -473,9 +474,9 @@ public class GuiLogisticalSorter extends GuiMekanism if(itemFilter.itemType != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } @@ -495,9 +496,9 @@ public class GuiLogisticalSorter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(final Exception e) {} } @@ -512,9 +513,9 @@ public class GuiLogisticalSorter extends GuiMekanism if(itemFilter.materialItem != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(itemFilter.materialItem, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } @@ -534,9 +535,9 @@ public class GuiLogisticalSorter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(final Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 7d87b7bbd..6937b402e 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -19,6 +19,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; 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; @@ -129,18 +130,18 @@ public class GuiMItemStackFilter extends GuiMekanism if(filter.itemType != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } if(filter.replaceStack != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index a199d1efc..12fa8ee13 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -19,6 +19,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; 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; @@ -130,18 +131,18 @@ public class GuiMMaterialFilter extends GuiMekanism if(filter.materialItem != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } if(filter.replaceStack != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 7f3c952d5..c2475e106 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -23,6 +23,7 @@ import net.minecraft.block.Block; 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.Blocks; import net.minecraft.init.SoundEvents; @@ -170,9 +171,9 @@ public class GuiMModIDFilter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } @@ -180,9 +181,9 @@ public class GuiMModIDFilter extends GuiMekanism if(filter.replaceStack != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index abc0bee22..d02f25ec2 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -23,6 +23,7 @@ import net.minecraft.block.Block; 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.Blocks; import net.minecraft.init.SoundEvents; @@ -170,9 +171,9 @@ public class GuiMOreDictFilter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } @@ -180,9 +181,9 @@ public class GuiMOreDictFilter extends GuiMekanism if(filter.replaceStack != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 37f3d7e35..2c9a23c89 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -27,6 +27,7 @@ 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; @@ -134,9 +135,9 @@ public class GuiOredictionificator extends GuiMekanism if(stack != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(stack, 13, yStart + 3); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 9ec0dd3eb..6b4b7021b 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -19,6 +19,7 @@ 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; @@ -152,9 +153,9 @@ public class GuiOredictionificatorFilter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(renderStack, 45, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 18184e435..962ddec65 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -11,6 +11,7 @@ import net.minecraft.block.Block; 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.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -132,7 +133,9 @@ public class GuiSeismicReader extends GuiScreen GlStateManager.scale(0.8f, 0.8f, 0.8f); } + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(stack, 0, 0); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 460df1a14..fe4e92e6b 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -22,6 +22,7 @@ import mekanism.common.util.TransporterUtils; 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; @@ -186,9 +187,9 @@ public class GuiTItemStackFilter extends GuiMekanism if(filter.itemType != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 9a08a44e7..f62beedd1 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -22,6 +22,7 @@ import mekanism.common.util.TransporterUtils; 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; @@ -134,9 +135,9 @@ public class GuiTMaterialFilter extends GuiMekanism if(filter.materialItem != null) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 30714060e..1562eb88f 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -25,6 +25,7 @@ import mekanism.common.util.TransporterUtils; 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; @@ -171,9 +172,9 @@ public class GuiTModIDFilter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index faedb52d6..a59be58d3 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -25,6 +25,7 @@ import mekanism.common.util.TransporterUtils; 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; @@ -171,9 +172,9 @@ public class GuiTOreDictFilter extends GuiMekanism { try { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index f2ecda9c4..0ac88b8e3 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -17,6 +17,7 @@ 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.tileentity.TileEntity; @@ -147,9 +148,9 @@ public class GuiUpgradeManagement extends GuiMekanism { GlStateManager.pushMatrix(); GlStateManager.scale(size, size, size); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(type.getStack(), scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index b12d99c1d..49b136fdc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -134,7 +134,10 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.TILE_NETWORK_CAPABILITY) + { return (T)this; + } + return super.getCapability(capability, facing); } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index fcf977ccd..00dd082ab 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -17,6 +17,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter.ReactorLogic; 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.minecraftforge.fml.relauncher.Side; @@ -52,9 +53,9 @@ public class GuiReactorLogicAdapter extends GuiMekanism for(ReactorLogic type : ReactorLogic.values()) { GlStateManager.pushMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(type.getRenderStack(), 27, 35 + (22*type.ordinal())); - GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); fontRendererObj.drawString(EnumColor.WHITE + type.getLocalizedName(), 46, 34+(22*type.ordinal()), 0x404040);