common.lexicon

This commit is contained in:
Vincent Lee committed 2015-11-16 13:40:19 -06:00
1 parent 9da9d61880
commit bbbe93a8de
9 files changed
+17 -17

No files matched your search

@@ -11,7 +11,7 @@
package vazkii.botania.common.lexicon;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.stats.Achievement;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
@@ -33,7 +33,7 @@ public class RLexiconEntry extends BLexiconEntry {
@Override
@SideOnly(Side.CLIENT)
public boolean isVisible() {
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
return a == null || player.capabilities.isCreativeMode || player.getStatFileWriter().hasAchievementUnlocked(a);
}
@@ -48,7 +48,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage {
int y = gui.getTop() + 12;
Brew brew = recipe.getBrew();
FontRenderer renderer = Minecraft.getMinecraft().fontRenderer;
FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj;
boolean unicode = renderer.getUnicodeFlag();
renderer.setUnicodeFlag(true);
String s = EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName()));
@@ -91,9 +91,9 @@ public class PageEntity extends LexiconPage{
GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
RenderHelper.enableStandardItemLighting();
GL11.glTranslatef(0.0F, entity.yOffset, 0.0F);
RenderManager.instance.playerViewY = 180.0F;
RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
GL11.glTranslatef(0.0F, 0.0F, 0.0F); // todo 1.8 yOffset gone
Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F;
Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
GL11.glPopMatrix();
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -68,7 +68,7 @@ public class PageManaInfusionRecipe extends PageRecipe {
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
RecipeManaInfusion recipe = recipes.get(recipeAt);
TextureManager render = Minecraft.getMinecraft().renderEngine;
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
Object input = recipe.getInput();
if(input instanceof String)
@@ -85,7 +85,7 @@ public class PageMultiblock extends LexiconPage {
GL11.glPopMatrix();
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
boolean unicode = font.getUnicodeFlag();
String s = EnumChatFormatting.BOLD + StatCollector.translateToLocal(getUnlocalizedName());
font.setUnicodeFlag(true);
@@ -96,7 +96,7 @@ public class PageMultiblock extends LexiconPage {
RenderHelper.enableGUIStandardItemLighting();
int x = gui.getLeft() + 15;
int y = gui.getTop() + 25;
RenderItem.getInstance().renderItemIntoGUI(font, render, new ItemStack(Blocks.stonebrick), x, y);
Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(new ItemStack(Blocks.stonebrick), x, y);
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -136,7 +136,7 @@ public class PageRecipe extends LexiconPage {
@SideOnly(Side.CLIENT)
public void renderItem(IGuiLexiconEntry gui, double xPos, double yPos, ItemStack stack, boolean accountForContainer) {
RenderItem render = new RenderItem();
RenderItem render = Minecraft.getMinecraft().getRenderManager();
boolean mouseDown = Mouse.isButtonDown(0);
GL11.glPushMatrix();
@@ -147,8 +147,8 @@ public class PageRecipe extends LexiconPage {
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glPushMatrix();
GL11.glTranslated(xPos, yPos, 0);
render.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, 0, 0);
render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, 0, 0);
render.renderItemAndEffectIntoGUI(stack, 0, 0);
render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0);
GL11.glPopMatrix();
RenderHelper.disableStandardItemLighting();
GL11.glPopMatrix();
@@ -45,7 +45,7 @@ public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
@Override
@SideOnly(Side.CLIENT)
public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) {
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage");
@@ -113,7 +113,7 @@ public class PageShedding extends PageEntity {
@SideOnly(Side.CLIENT)
public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack) {
RenderItem render = new RenderItem();
RenderItem render = Minecraft.getMinecraft().getRenderItem();
boolean mouseDown = Mouse.isButtonDown(0);
GL11.glPushMatrix();
@@ -122,8 +122,8 @@ public class PageShedding extends PageEntity {
RenderHelper.enableGUIStandardItemLighting();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glEnable(GL11.GL_DEPTH_TEST);
render.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, xPos, yPos);
render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, xPos, yPos);
render.renderItemAndEffectIntoGUI(stack, xPos, yPos);
render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos);
RenderHelper.disableStandardItemLighting();
GL11.glPopMatrix();
@@ -51,7 +51,7 @@ public class PageText extends LexiconPage {
y += 10;
width -= 4;
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
FontRenderer font = Minecraft.getMinecraft().fontRendererObj;
boolean unicode = font.getUnicodeFlag();
font.setUnicodeFlag(true);
String text = StatCollector.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7");