Fix some missing glstatemanager substitutions. Fixes #307

This commit is contained in:
Vincent Lee committed 2016-06-01 20:19:40 -05:00
1 parent 78f296d0cf
commit d2aa4e0ebc
4 files changed
+19 -17

No files matched your search

@@ -56,12 +56,12 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
par1Minecraft.renderEngine.bindTexture(dogResource);
float f = 1F / 64F;
GL11.glTranslated(dogPos, 0, 0);
GL11.glColor4f(1F, 1F, 1F, 1F);
GlStateManager.translate(dogPos, 0, 0);
GlStateManager.color(1F, 1F, 1F, 1F);
vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, (dogPos % 100 < 50) ? 23 : 0, 0, 23, 19, f, f);
xPosition = (int) Math.max(xPosition, dogPos + 10);
GL11.glTranslated(-dogPos, 0, 0);
GlStateManager.translate(-dogPos, 0, 0);
}
hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height;
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -335,7 +336,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary {
for(RecipePetals recipe : BotaniaAPI.petalRecipes)
if(recipe.matches(itemHandler)) {
GL11.glColor4f(1F, 1F, 1F, 1F);
GlStateManager.color(1F, 1F, 1F, 1F);
mc.renderEngine.bindTexture(HUDHandler.manaBar);
RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15);
@@ -352,9 +353,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary {
for(int i = 0; i < amt; i++) {
double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8;
double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8;
GL11.glTranslated(xPos, yPos, 0);
GlStateManager.translate(xPos, yPos, 0);
mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0);
GL11.glTranslated(-xPos, -yPos, 0);
GlStateManager.translate(-xPos, -yPos, 0);
angle += anglePer;
}
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -345,23 +346,23 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
float anglePer = 360F / amt;
for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes)
if(recipe.matches(itemHandler)) {
GL11.glEnable(GL11.GL_BLEND);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.enableBlend();
GlStateManager.enableRescaleNormal();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
recipe.getOutput();
float progress = (float) mana / (float) manaToGet;
mc.renderEngine.bindTexture(HUDHandler.manaBar);
GL11.glColor4f(1F, 1F, 1F, 1F);
GlStateManager.color(1F, 1F, 1F, 1F);
RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, progress == 1F ? 0 : 22, 8, 22, 15);
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
if(progress == 1F) {
mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModBlocks.livingrock), xc + radius + 16, yc + 8);
GL11.glTranslatef(0F, 0F, 100F);
GlStateManager.translate(0F, 0F, 100F);
mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.twigWand), xc + radius + 24, yc + 8);
GL11.glTranslatef(0F, 0F, -100F);
GlStateManager.translate(0F, 0F, -100F);
}
RenderHelper.renderProgressPie(xc + radius + 32, yc - 8, progress, recipe.getOutput());
@@ -375,9 +376,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
for(int i = 0; i < amt; i++) {
double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8;
double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8;
GL11.glTranslated(xPos, yPos, 0);
GlStateManager.translate(xPos, yPos, 0);
mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0);
GL11.glTranslated(-xPos, -yPos, 0);
GlStateManager.translate(-xPos, -yPos, 0);
angle += anglePer;
}
@@ -99,8 +99,8 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
@SideOnly(Side.CLIENT)
public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) {
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
int x = gui.getLeft() + gui.getWidth() / 2 - 50;
int y = gui.getTop() + 120;
@@ -111,7 +111,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000);
font.setUnicodeFlag(unicode);
GL11.glDisable(GL11.GL_BLEND);
GlStateManager.disableBlend();
}
@Override