mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
Some of client.core.handler. Most of this will need to be migrated to layerrenderers
This commit is contained in:
1 parent
7ad1820fcb
commit
b22e485217
24 files changed
+127
-134
No files matched your search
@@ -47,14 +47,14 @@ public final class BossBarHandler {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Rectangle bgRect = currentBoss.getBossBarTextureRect();
|
||||
Rectangle fgRect = currentBoss.getBossBarHPTextureRect();
|
||||
String name = currentBoss.func_145748_c_().getFormattedText();
|
||||
String name = currentBoss.getDisplayName().getFormattedText();
|
||||
int c = res.getScaledWidth() / 2;
|
||||
int x = c - bgRect.width / 2;
|
||||
int y = 20;
|
||||
int xf = x + (bgRect.width - fgRect.width) / 2;
|
||||
int yf = y + (bgRect.height - fgRect.height) / 2;
|
||||
int fw = (int) ((double) fgRect.width * (currentBoss.getHealth() / currentBoss.getMaxHealth()));
|
||||
int tx = c - mc.fontRenderer.getStringWidth(name) / 2;
|
||||
int tx = c - mc.fontRendererObj.getStringWidth(name) / 2;
|
||||
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
currentBoss.bossBarRenderCallback(res, x, y);
|
||||
@@ -63,7 +63,7 @@ public final class BossBarHandler {
|
||||
mc.renderEngine.bindTexture(currentBoss.getBossBarTexture());
|
||||
drawBar(x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true);
|
||||
drawBar(xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false);
|
||||
mc.fontRenderer.drawStringWithShadow(name, tx, y - 10, 0xA2018C);
|
||||
mc.fontRendererObj.drawStringWithShadow(name, tx, y - 10, 0xA2018C);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
|
||||
Entity e = (Entity) currentBoss;
|
||||
|
||||
@@ -76,7 +76,7 @@ public final class BoundTileRenderer {
|
||||
|
||||
if(stackInSlot.getItem() instanceof IExtendedWireframeCoordinateListProvider) {
|
||||
BlockPos coords = ((IExtendedWireframeCoordinateListProvider) stackInSlot.getItem()).getSourceWireframe(player, stackInSlot);
|
||||
if(coords != null && coords.posY > -1)
|
||||
if(coords != null && coords.getY() > -1)
|
||||
renderBlockOutlineAt(coords, color, 5F);
|
||||
}
|
||||
}
|
||||
@@ -94,29 +94,24 @@ public final class BoundTileRenderer {
|
||||
|
||||
private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(pos.posX - RenderManager.renderPosX, pos.posY - RenderManager.renderPosY, pos.posZ - RenderManager.renderPosZ + 1);
|
||||
GL11.glTranslated(pos.getX() - RenderManager.renderPosX, pos.getY() - RenderManager.renderPosY, pos.getZ() - RenderManager.renderPosZ + 1);
|
||||
Color colorRGB = new Color(color);
|
||||
GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255);
|
||||
|
||||
World world = Minecraft.getMinecraft().theWorld;
|
||||
Block block = world.getBlock(pos.posX, pos.posY, pos.posZ);
|
||||
Block block = world.getBlockState(pos).getBlock();
|
||||
drawWireframe : {
|
||||
if(block != null) {
|
||||
AxisAlignedBB axis;
|
||||
|
||||
if(block instanceof IWireframeAABBProvider)
|
||||
axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, , pos.posX);
|
||||
else axis = block.getSelectedBoundingBoxFromPool(world, pos.posX, pos.posY, pos.posZ);
|
||||
axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, pos);
|
||||
else axis = block.getSelectedBoundingBox(world, pos);
|
||||
|
||||
if(axis == null)
|
||||
break drawWireframe;
|
||||
|
||||
axis.minX -= pos.posX;
|
||||
axis.maxX -= pos.posX;
|
||||
axis.minY -= pos.posY;
|
||||
axis.maxY -= pos.posY;
|
||||
axis.minZ -= pos.posZ + 1;
|
||||
axis.maxZ -= pos.posZ + 1;
|
||||
axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1));
|
||||
|
||||
GL11.glScalef(1F, 1F, 1F);
|
||||
|
||||
@@ -142,7 +137,7 @@ public final class BoundTileRenderer {
|
||||
double ay = aabb.maxY;
|
||||
double az = aabb.maxZ;
|
||||
|
||||
tessellator.startDrawing(GL11.GL_LINES);
|
||||
tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES);
|
||||
tessellator.getWorldRenderer().addVertex(ix, iy, iz);
|
||||
tessellator.getWorldRenderer().addVertex(ix, ay, iz);
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.settings.GameSettings.Options;
|
||||
import net.minecraft.entity.player.EnumPlayerModelParts;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
|
||||
@@ -45,7 +46,7 @@ public final class ContributorFancinessHandler {
|
||||
private static boolean phi = true;
|
||||
|
||||
public static void render(RenderPlayerEvent.Specials event) {
|
||||
String name = event.entityPlayer.getDisplayName();
|
||||
String name = event.entityPlayer.getDisplayName().getUnformattedText();
|
||||
|
||||
if(name.equals("Vazkii") || name.equals("_phi")) {
|
||||
if(phi)
|
||||
@@ -55,7 +56,7 @@ public final class ContributorFancinessHandler {
|
||||
renderGoldfish(event);
|
||||
|
||||
name = name.toLowerCase();
|
||||
if(Minecraft.getMinecraft().gameSettings.getOptionOrdinalValue(Options.SHOW_CAPE) && flowerMap != null && flowerMap.containsKey(name))
|
||||
if(event.entityPlayer.isWearing(EnumPlayerModelParts.CAPE) && flowerMap != null && flowerMap.containsKey(name))
|
||||
renderFlower(event, flowerMap.get(name));
|
||||
}
|
||||
|
||||
|
||||
@@ -100,8 +100,8 @@ public final class HUDHandler {
|
||||
MovingObjectPosition pos = mc.objectMouseOver;
|
||||
|
||||
if(pos != null) {
|
||||
Block block = mc.theWorld.getBlock(pos.blockX, pos.blockY, pos.blockZ);
|
||||
TileEntity tile = mc.theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ);
|
||||
Block block = mc.theWorld.getBlockState(pos.getBlockPos()).getBlock();
|
||||
TileEntity tile = mc.theWorld.getTileEntity(pos.getBlockPos());
|
||||
|
||||
if(equippedStack != null) {
|
||||
if(pos != null && equippedStack.getItem() == ModItems.twigWand) {
|
||||
@@ -109,7 +109,7 @@ public final class HUDHandler {
|
||||
|
||||
if(block instanceof IWandHUD) {
|
||||
profiler.startSection("wandItem");
|
||||
((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, , pos.blockX);
|
||||
((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.getBlockPos());
|
||||
profiler.endSection();
|
||||
}
|
||||
}
|
||||
@@ -131,7 +131,7 @@ public final class HUDHandler {
|
||||
if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) {
|
||||
profiler.startSection("multiblockRightClick");
|
||||
String s = StatCollector.translateToLocal("botaniamisc.rightClickToAnchor");
|
||||
mc.fontRenderer.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF);
|
||||
profiler.endSection();
|
||||
}
|
||||
|
||||
@@ -222,12 +222,12 @@ public final class HUDHandler {
|
||||
int color = 0x00CC00 + (alpha << 24);
|
||||
String disp = StatCollector.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem()));
|
||||
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(disp) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2;
|
||||
int y = res.getScaledHeight() - 70;
|
||||
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.fontRenderer.drawStringWithShadow(disp, x, y, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(disp, x, y, color);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
}
|
||||
profiler.endSection();
|
||||
@@ -288,14 +288,14 @@ public final class HUDHandler {
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x - 20, y);
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y);
|
||||
RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y);
|
||||
mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, mc.renderEngine, recipe.getOutput(), x + 26, y);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
if(diluted) {
|
||||
String s = StatCollector.translateToLocal("botaniamisc.pay2win");
|
||||
mc.fontRenderer.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, y + 20, 0xFF8888);
|
||||
mc.fontRendererObj.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, y + 20, 0xFF8888);
|
||||
}
|
||||
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
@@ -317,17 +317,17 @@ public final class HUDHandler {
|
||||
if(target != null) {
|
||||
String s1 = target.getDisplayName();
|
||||
String s2 = tile.getItemCount() + "x";
|
||||
int strlen = Math.max(mc.fontRenderer.getStringWidth(s1), mc.fontRenderer.getStringWidth(s2));
|
||||
int strlen = Math.max(mc.fontRendererObj.getStringWidth(s1), mc.fontRendererObj.getStringWidth(s2));
|
||||
int w = res.getScaledWidth();
|
||||
int h = res.getScaledHeight();
|
||||
Gui.drawRect(w / 2 + 8, h / 2 - 12, w / 2 + strlen + 32, h / 2 + 10, 0x44000000);
|
||||
Gui.drawRect(w / 2 + 6, h / 2 - 14, w / 2 + strlen + 34, h / 2 + 12, 0x44000000);
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF);
|
||||
mc.fontRenderer.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF);
|
||||
mc.fontRendererObj.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF);
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, target, w / 2 + 10, h / 2 - 10);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(target, w / 2 + 10, h / 2 - 10);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
}
|
||||
|
||||
@@ -339,7 +339,7 @@ public final class HUDHandler {
|
||||
Profiler profiler = mc.mcProfiler;
|
||||
|
||||
profiler.startSection("lexicon");
|
||||
FontRenderer font = mc.fontRenderer;
|
||||
FontRenderer font = mc.fontRendererObj;
|
||||
boolean draw = false;
|
||||
String drawStr = "";
|
||||
String secondLine = "";
|
||||
@@ -350,7 +350,7 @@ public final class HUDHandler {
|
||||
int sy = res.getScaledHeight() / 2 + 2;
|
||||
|
||||
if(block instanceof ILexiconable) {
|
||||
LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, , pos.blockX, mc.thePlayer, mc.thePlayer.getCurrentEquippedItem());
|
||||
LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, mc.thePlayer.getCurrentEquippedItem());
|
||||
if(entry != null) {
|
||||
if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType()))
|
||||
font = mc.standardGalacticFontRenderer;
|
||||
@@ -363,7 +363,7 @@ public final class HUDHandler {
|
||||
|
||||
if(!draw && pos.entityHit == null) {
|
||||
profiler.startSection("wikiLookup");
|
||||
if(!block.isAir(mc.theWorld, pos.blockX, pos.blockY, pos.blockZ) && !(block instanceof BlockLiquid)) {
|
||||
if(!block.isAir(mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) {
|
||||
IWikiProvider provider = WikiHooks.getWikiFor(block);
|
||||
String url = provider.getWikiURL(mc.theWorld, pos);
|
||||
if(url != null && !url.isEmpty()) {
|
||||
@@ -380,17 +380,17 @@ public final class HUDHandler {
|
||||
if(!mc.thePlayer.isSneaking()) {
|
||||
drawStr = "?";
|
||||
secondLine = "";
|
||||
font = mc.fontRenderer;
|
||||
font = mc.fontRendererObj;
|
||||
}
|
||||
|
||||
RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModItems.lexicon), sx, sy);
|
||||
mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), sx, sy);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
font.drawStringWithShadow(drawStr, sx + 10, sy + 8, 0xFFFFFFFF);
|
||||
font.drawStringWithShadow(secondLine, sx + 10, sy + 18, 0xFFAAAAAA);
|
||||
|
||||
if(!mc.thePlayer.isSneaking()) {
|
||||
GL11.glScalef(0.5F, 0.5F, 1F);
|
||||
mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF);
|
||||
GL11.glScalef(2F, 2F, 1F);
|
||||
}
|
||||
}
|
||||
@@ -406,7 +406,7 @@ public final class HUDHandler {
|
||||
String txt1 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex1");
|
||||
String txt2 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex2");
|
||||
|
||||
int l = Math.max(mc.fontRenderer.getStringWidth(txt0), Math.max(mc.fontRenderer.getStringWidth(txt1), mc.fontRenderer.getStringWidth(txt2))) + 20;
|
||||
int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20;
|
||||
int x = res.getScaledWidth() - l - 20;
|
||||
int y = res.getScaledHeight() - 60;
|
||||
|
||||
@@ -414,22 +414,22 @@ public final class HUDHandler {
|
||||
Gui.drawRect(x - 4, y - 4, x + l + 4, y + 35, 0x44000000);
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModBlocks.corporeaIndex), x, y + 10);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(new ItemStack(ModBlocks.corporeaIndex), x, y + 10);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(txt1, x + 20, y + 14, 0xFFFFFF);
|
||||
mc.fontRenderer.drawStringWithShadow(txt2, x + 20, y + 24, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(txt1, x + 20, y + 14, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(txt2, x + 20, y + 24, 0xFFFFFF);
|
||||
}
|
||||
|
||||
public static void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) {
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(name) / 2;
|
||||
int y = res.getScaledHeight() / 2 + 10;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(name, x, y, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(name, x, y, color);
|
||||
|
||||
x = res.getScaledWidth() / 2 - 51;
|
||||
y += 10;
|
||||
@@ -438,9 +438,9 @@ public final class HUDHandler {
|
||||
|
||||
if(mana < 0) {
|
||||
String text = StatCollector.translateToLocal("botaniamisc.statusUnknown");
|
||||
x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(text) / 2;
|
||||
x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2;
|
||||
y -= 1;
|
||||
mc.fontRenderer.drawString(text, x, y, color);
|
||||
mc.fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
@@ -456,16 +456,16 @@ public final class HUDHandler {
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, bindDisplay, x, y);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(bindDisplay, x, y);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
if(properlyBound) {
|
||||
mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D);
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00);
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D);
|
||||
} else {
|
||||
mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D);
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000);
|
||||
mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D);
|
||||
}
|
||||
GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ public final class ItemsRemainingRenderHandler {
|
||||
int xp = x + (int) (16F * (1F - alpha));
|
||||
GL11.glTranslatef(xp, y, 0F);
|
||||
GL11.glScalef(alpha, 1F, 1F);
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, 0);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, 0, 0);
|
||||
GL11.glScalef(1F / alpha,1F, 1F);
|
||||
GL11.glTranslatef(-xp, -y, 0F);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
@@ -75,7 +75,7 @@ public final class ItemsRemainingRenderHandler {
|
||||
text = "\u221E";
|
||||
|
||||
int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
|
||||
mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 6, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 6, color);
|
||||
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
@@ -52,7 +52,7 @@ public class LightningHandler {
|
||||
static double interpPosZ;
|
||||
|
||||
private static Vector3 getRelativeViewVector(Vector3 pos) {
|
||||
Entity renderEntity = Minecraft.getMinecraft().renderViewEntity;
|
||||
Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity();
|
||||
return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z);
|
||||
}
|
||||
|
||||
@@ -87,16 +87,16 @@ public class LightningHandler {
|
||||
|
||||
render.bindTexture(outsideResource);
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
tessellator.setBrightness(0xF000F0);
|
||||
tessellator.getWorldRenderer().setBrightness(0xF000F0);
|
||||
for(LightningBolt bolt : LightningBolt.boltlist)
|
||||
renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 0, false);
|
||||
renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 0, false);
|
||||
tessellator.draw();
|
||||
|
||||
render.bindTexture(insideResource);
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
tessellator.setBrightness(0xF000F0);
|
||||
tessellator.getWorldRenderer().setBrightness(0xF000F0);
|
||||
for(LightningBolt bolt : LightningBolt.boltlist)
|
||||
renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 1, true);
|
||||
renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true);
|
||||
tessellator.draw();
|
||||
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
@@ -145,7 +145,7 @@ public class LightningHandler {
|
||||
Vector3 endvec = rendersegment.endpoint.point;
|
||||
|
||||
int color = inner ? bolt.colorInner : bolt.colorOuter;
|
||||
tessellator.setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()));
|
||||
tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()));
|
||||
|
||||
tessellator.getWorldRenderer().addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0);
|
||||
tessellator.getWorldRenderer().addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0);
|
||||
@@ -324,7 +324,7 @@ public class LightningHandler {
|
||||
particleAge = -(int) (length * speed);
|
||||
|
||||
boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
|
||||
boundingBox.setBB(new AxisAlignedBB(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2));
|
||||
boundingBox = new AxisAlignedBB(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2);
|
||||
|
||||
segments.add(new Segment(start, end));
|
||||
}
|
||||
@@ -335,7 +335,7 @@ public class LightningHandler {
|
||||
|
||||
public LightningBolt(World world, Vector3 sourcevec, TileEntity target, float ticksPerMeter, long seed, int colorOuter, int colorInner) {
|
||||
this(world, sourcevec, getFocalPoint(target), ticksPerMeter, seed, colorOuter, colorInner);
|
||||
this.target = new BlockPos(target.xCoord, target.yCoord, target.zCoord);
|
||||
this.target = target.getPos();
|
||||
}
|
||||
|
||||
public void setWrapper(Entity entity) {
|
||||
@@ -418,9 +418,9 @@ public class LightningHandler {
|
||||
return prevresistance;
|
||||
|
||||
if(mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
|
||||
Block block = world.getBlock(mop.blockX, mop.blockY, mop.blockZ);
|
||||
Block block = world.getBlockState(mop.getBlockPos()).getBlock();
|
||||
|
||||
if(world.isAirBlock(mop.blockX, mop.blockY, mop.blockZ))
|
||||
if(world.isAirBlock(mop.getBlockPos()))
|
||||
return prevresistance;
|
||||
|
||||
return prevresistance + block.getExplosionResistance(source) + 0.3F;
|
||||
|
||||
@@ -98,7 +98,7 @@ public final class PersistentVariableHelper {
|
||||
|
||||
if(cmp.hasKey(TAG_LEXICON_NOTES)) {
|
||||
NBTTagCompound notesCmp = cmp.getCompoundTag(TAG_LEXICON_NOTES);
|
||||
Set<String> keys = notesCmp.func_150296_c();
|
||||
Set<String> keys = notesCmp.getKeySet();
|
||||
GuiLexicon.notes.clear();
|
||||
for(String key : keys)
|
||||
GuiLexicon.notes.put(key, notesCmp.getString(key));
|
||||
|
||||
@@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -67,13 +68,13 @@ public final class RedStringRenderer {
|
||||
}
|
||||
|
||||
private static void renderTile(TileRedString tile) {
|
||||
ForgeDirection dir = ForgeDirection.getOrientation(tile.getBlockMetadata());
|
||||
EnumFacing dir = tile.getOrientation();
|
||||
BlockPos bind = tile.getBinding();
|
||||
|
||||
if(bind != null) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(tile.xCoord + 0.5 - RenderManager.renderPosX, tile.yCoord + 0.5 - RenderManager.renderPosY, tile.zCoord + 0.5 - RenderManager.renderPosZ);
|
||||
Vector3 vecOrig = new Vector3(bind.posX - tile.xCoord, bind.posY - tile.yCoord, bind.posZ - tile.zCoord);
|
||||
GL11.glTranslated(tile.getPos().getX() + 0.5 - RenderManager.renderPosX, tile.getPos().getY() + 0.5 - RenderManager.renderPosY, tile.getPos().getZ() + 0.5 - RenderManager.renderPosZ);
|
||||
Vector3 vecOrig = new Vector3(bind.getX() - tile.getPos().getX(), bind.getY() - tile.getPos().getY(), bind.getZ() - tile.getPos().getZ());
|
||||
Vector3 vecNorm = vecOrig.copy().normalize();
|
||||
Vector3 vecMag = vecNorm.copy().multiply(0.025);
|
||||
Vector3 vecApply = vecMag.copy();
|
||||
@@ -82,9 +83,9 @@ public final class RedStringRenderer {
|
||||
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
GL11.glLineWidth(1F);
|
||||
tessellator.startDrawing(GL11.GL_LINES);
|
||||
tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES);
|
||||
|
||||
double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.xCoord ^ tile.yCoord ^ tile.zCoord).nextInt(10000);
|
||||
double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().toLong()).nextInt(10000);
|
||||
double add = vecMag.mag();
|
||||
double rand = Math.random() - 0.5;
|
||||
for(int i = 0; i < stages; i++) {
|
||||
@@ -101,15 +102,15 @@ public final class RedStringRenderer {
|
||||
}
|
||||
}
|
||||
|
||||
private static void addVertexAtWithTranslation(Tessellator tess, ForgeDirection dir, double xpos, double ypos, double zpos, double rand, double l) {
|
||||
private static void addVertexAtWithTranslation(Tessellator tess, EnumFacing dir, double xpos, double ypos, double zpos, double rand, double l) {
|
||||
double freq = 20;
|
||||
double ampl = (0.15 * (Math.sin(l * 2F) * 0.5 + 0.5) + 0.1) * sizeAlpha;
|
||||
double randMul = 0.05;
|
||||
double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.offsetX) - 1) + rand * randMul;
|
||||
double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.offsetY) - 1) + rand * randMul;
|
||||
double z = zpos + (dir.offsetY == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.offsetZ) - 1) + rand * randMul;
|
||||
double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetX()) - 1) + rand * randMul;
|
||||
double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetY()) - 1) + rand * randMul;
|
||||
double z = zpos + (dir.getFrontOffsetY() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getFrontOffsetZ()) - 1) + rand * randMul;
|
||||
|
||||
tess.addVertex(x, y, z);
|
||||
tess.getWorldRenderer().addVertex(x, y, z);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -41,21 +41,17 @@ public final class SubTileRadiusRenderHandler {
|
||||
|
||||
if(!Botania.proxy.isClientPlayerWearingMonocle() || pos == null || pos.entityHit != null)
|
||||
return;
|
||||
int x = pos.blockX;
|
||||
int y = pos.blockY;
|
||||
int z = pos.blockZ;
|
||||
BlockPos bPos = pos.getBlockPos();
|
||||
|
||||
ItemStack stackHeld = mc.thePlayer.getCurrentEquippedItem();
|
||||
if(stackHeld != null && stackHeld.getItem() == ModItems.twigWand && ItemTwigWand.getBindMode(stackHeld)) {
|
||||
BlockPos coords = ItemTwigWand.getBoundTile(stackHeld);
|
||||
if(coords.posY != -1) {
|
||||
x = coords.posX;
|
||||
y = coords.posY;
|
||||
z = coords.posZ;
|
||||
if(coords.getY() != -1) {
|
||||
bPos = coords;
|
||||
}
|
||||
}
|
||||
|
||||
TileEntity tile = mc.theWorld.getTileEntity(x, y, z);
|
||||
TileEntity tile = mc.theWorld.getTileEntity(bPos);
|
||||
if(tile == null || !(tile instanceof ISubTileContainer))
|
||||
return;
|
||||
ISubTileContainer container = (ISubTileContainer) tile;
|
||||
@@ -118,9 +114,9 @@ public final class SubTileRadiusRenderHandler {
|
||||
|
||||
public void renderCircle(BlockPos center, double radius) {
|
||||
GL11.glPushMatrix();
|
||||
double x = center.posX + 0.5;
|
||||
double y = center.posY;
|
||||
double z = center.posZ + 0.5;
|
||||
double x = center.getX() + 0.5;
|
||||
double y = center.getY();
|
||||
double z = center.getZ() + 0.5;
|
||||
GL11.glTranslated(x - RenderManager.renderPosX, y - RenderManager.renderPosY, z - RenderManager.renderPosZ);
|
||||
int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F);
|
||||
|
||||
@@ -135,7 +131,7 @@ public final class SubTileRadiusRenderHandler {
|
||||
|
||||
radius -= f;
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.startDrawing(GL11.GL_TRIANGLE_FAN);
|
||||
tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN);
|
||||
tessellator.getWorldRenderer().addVertex(0, f, 0);
|
||||
for(int i = 0; i < totalAngles + 1; i += step) {
|
||||
double rad = (totalAngles - i) * Math.PI / 180.0;
|
||||
@@ -149,7 +145,7 @@ public final class SubTileRadiusRenderHandler {
|
||||
radius += f;
|
||||
double f1 = f + f / 4F;
|
||||
GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64);
|
||||
tessellator.startDrawing(GL11.GL_TRIANGLE_FAN);
|
||||
tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN);
|
||||
tessellator.getWorldRenderer().addVertex(0, f1, 0);
|
||||
for(int i = 0; i < totalAngles + 1; i += step) {
|
||||
double rad = (totalAngles - i) * Math.PI / 180.0;
|
||||
|
||||
@@ -164,11 +164,11 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12);
|
||||
} else {
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
String s = StatCollector.translateToLocal("botaniamisc.typeToSearch");
|
||||
mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
}
|
||||
|
||||
float animationTime = 4F;
|
||||
@@ -185,9 +185,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
x = currentButton.xPosition - 20;
|
||||
y = currentButton.yPosition;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow("?", x, y, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow("?", x, y, 0xFFFFFF);
|
||||
GL11.glScalef(0.5F, 0.5F, 1F);
|
||||
mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF);
|
||||
GL11.glScalef(2F, 2F, 1F);
|
||||
}
|
||||
}
|
||||
@@ -198,9 +198,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
int x = currentButton.xPosition;
|
||||
int y = currentButton.yPosition;
|
||||
String s = StatCollector.translateToLocal(currentEntry.getTagline());
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
int width = mc.fontRenderer.getStringWidth(s);
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
int width = mc.fontRendererObj.getStringWidth(s);
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef(x, y, 0);
|
||||
@@ -208,7 +208,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
Gui.drawRect(12, -30, width + 20, -2, 0x44000000);
|
||||
Gui.drawRect(10, -32, width + 22, -2, 0x44000000);
|
||||
drawBookmark(width / 2 + 16, -8, s, true, 0xFFFFFF);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
@@ -46,8 +46,8 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon {
|
||||
|
||||
if(challenge.complete) {
|
||||
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00);
|
||||
par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D);
|
||||
par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00);
|
||||
par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D);
|
||||
GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||
}
|
||||
|
||||
|
||||
@@ -72,10 +72,10 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
|
||||
drawRect(xPosition - 5, yPosition, (int) (xPosition - 5 + timeHover * 24), yPosition + height, alpha << 24 | color);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
boolean unicode = par1Minecraft.fontRenderer.getUnicodeFlag();
|
||||
par1Minecraft.fontRenderer.setUnicodeFlag(true);
|
||||
par1Minecraft.fontRenderer.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0);
|
||||
par1Minecraft.fontRenderer.setUnicodeFlag(unicode);
|
||||
boolean unicode = par1Minecraft.fontRendererObj.getUnicodeFlag();
|
||||
par1Minecraft.fontRendererObj.setUnicodeFlag(true);
|
||||
par1Minecraft.fontRendererObj.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0);
|
||||
par1Minecraft.fontRendererObj.setUnicodeFlag(unicode);
|
||||
|
||||
if(showStack) {
|
||||
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
||||
|
||||
@@ -46,7 +46,7 @@ public class GuiButtonNotes extends GuiButtonLexicon {
|
||||
else {
|
||||
tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.showNotes"));
|
||||
if(parent.note != null && !parent.note.isEmpty())
|
||||
Minecraft.getMinecraft().fontRenderer.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000);
|
||||
Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000);
|
||||
}
|
||||
|
||||
int tooltipY = (tooltip.size() - 1) * 10;
|
||||
|
||||
@@ -94,16 +94,16 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer {
|
||||
float s = 1F / 64F;
|
||||
GL11.glScalef(s, s, s);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
int l = mc.fontRenderer.getStringWidth(countStr);
|
||||
int l = mc.fontRendererObj.getStringWidth(countStr);
|
||||
|
||||
GL11.glTranslatef(0F, 55F, 0F);
|
||||
float tr = -16.5F;
|
||||
for(int i = 0; i < 4; i++) {
|
||||
GL11.glRotatef(90F, 0F, 1F, 0F);
|
||||
GL11.glTranslatef(0F, 0F, tr);
|
||||
mc.fontRenderer.drawString(countStr, -l / 2, 0, color);
|
||||
mc.fontRendererObj.drawString(countStr, -l / 2, 0, color);
|
||||
GL11.glTranslatef(0F, 0F, 0.1F);
|
||||
mc.fontRenderer.drawString(countStr, -l / 2 + 1, 1, colorShade);
|
||||
mc.fontRendererObj.drawString(countStr, -l / 2 + 1, 1, colorShade);
|
||||
GL11.glTranslatef(0F, 0F, -tr - 0.1F);
|
||||
}
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
|
||||
@@ -350,7 +350,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
int i = mc.fontRenderer.getStringWidth(potato.name) / 2;
|
||||
int i = mc.fontRendererObj.getStringWidth(potato.name) / 2;
|
||||
tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F);
|
||||
tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D);
|
||||
tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D);
|
||||
@@ -359,7 +359,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
|
||||
tessellator.draw();
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
GL11.glDepthMask(true);
|
||||
mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawString(potato.name, -mc.fontRendererObj.getStringWidth(potato.name) / 2, 0, 0xFFFFFF);
|
||||
if(name.equals("pahimar") || name.equals("soaryn")) {
|
||||
GL11.glTranslatef(0F, 14F, 0F);
|
||||
String s = name.equals("pahimar") ? "[WIP]" : "(soon)";
|
||||
@@ -368,7 +368,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
tessellator.getWorldRenderer().startDrawingQuads();
|
||||
i = mc.fontRenderer.getStringWidth(s) / 2;
|
||||
i = mc.fontRendererObj.getStringWidth(s) / 2;
|
||||
tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F);
|
||||
tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D);
|
||||
tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D);
|
||||
@@ -377,7 +377,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
|
||||
tessellator.draw();
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
GL11.glDepthMask(true);
|
||||
mc.fontRenderer.drawString(s, -mc.fontRenderer.getStringWidth(s) / 2, 0, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawString(s, -mc.fontRendererObj.getStringWidth(s) / 2, 0, 0xFFFFFF);
|
||||
}
|
||||
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
|
||||
@@ -230,10 +230,10 @@ public class SubTileHopperhock extends SubTileFunctional {
|
||||
String filter = StatCollector.translateToLocal("botaniamisc.filter" + filterType);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(filter, x, y, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(filter, x, y, color);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -165,11 +165,11 @@ public class SubTileRannuncarpus extends SubTileFunctional {
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(recieverStack != null && recieverStack.getItem() != null) {
|
||||
String stackName = recieverStack.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
@@ -93,11 +93,11 @@ public class SubTileSpectrolus extends SubTileGenerating {
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(stack != null && stack.getItem() != null) {
|
||||
String stackName = stack.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
@@ -156,7 +156,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
|
||||
int time = getTotalTime();
|
||||
String timeStr = StringUtils.ticksToElapsedTime(time);
|
||||
mc.fontRenderer.drawStringWithShadow(timeStr, x + 20, y, getColor());
|
||||
mc.fontRendererObj.drawStringWithShadow(timeStr, x + 20, y, getColor());
|
||||
|
||||
String status = "";
|
||||
if(lock)
|
||||
@@ -164,7 +164,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
if(!move)
|
||||
status = status.isEmpty() ? "stopped" : "lockedStopped";
|
||||
if(!status.isEmpty())
|
||||
mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor());
|
||||
mc.fontRendererObj.drawStringWithShadow(StatCollector.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -515,11 +515,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
String lensName = lens.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(lensName) / 2;
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(lensName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 50;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(lensName, x + 20, y + 5, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(lensName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, lens, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
@@ -534,11 +534,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(recieverStack != null && recieverStack.getItem() != null) {
|
||||
String stackName = recieverStack.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2;
|
||||
int x = res.getScaledWidth() / 2 - width;
|
||||
int y = res.getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
@@ -84,11 +84,11 @@ public class TileTurntable extends TileMod {
|
||||
for(int i = 0; i < this.speed; i++)
|
||||
speed = speed + motion;
|
||||
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2;
|
||||
int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(speed) / 2;
|
||||
int y = res.getScaledHeight() / 2 - 15;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.fontRenderer.drawStringWithShadow(speed, x, y, color);
|
||||
mc.fontRendererObj.drawStringWithShadow(speed, x, y, color);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
}
|
||||
|
||||
|
||||
@@ -826,10 +826,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
|
||||
RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, px, py);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
mc.fontRenderer.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
boolean unicode = mc.fontRendererObj.getUnicodeFlag();
|
||||
mc.fontRendererObj.setUnicodeFlag(true);
|
||||
mc.fontRendererObj.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF);
|
||||
mc.fontRendererObj.setUnicodeFlag(unicode);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -527,7 +527,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
|
||||
if(slot == 0) {
|
||||
String name = craftingTable.getDisplayName();
|
||||
int l = mc.fontRenderer.getStringWidth(name);
|
||||
int l = mc.fontRendererObj.getStringWidth(name);
|
||||
int x = resolution.getScaledWidth() / 2 - l / 2;
|
||||
int y = resolution.getScaledHeight() / 2 - 65;
|
||||
|
||||
@@ -538,7 +538,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, craftingTable, resolution.getScaledWidth() / 2 - 8, resolution.getScaledHeight() / 2 - 52);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(name, x, y, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF);
|
||||
} else {
|
||||
ItemStack[] recipe = getCraftingItems(stack, slot);
|
||||
String label = StatCollector.translateToLocal("botaniamisc.unsetRecipe");
|
||||
@@ -591,11 +591,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
|
||||
int yoff = 110;
|
||||
if(setRecipe && !canCraft(player, recipe, getFakeInv(player))) {
|
||||
String warning = EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.cantCraft");
|
||||
mc.fontRenderer.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
yoff += 12;
|
||||
}
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(label, resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(label) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(label, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(label) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -100,7 +100,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
|
||||
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, dispStack, x, y);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF);
|
||||
mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF);
|
||||
}
|
||||
|
||||
public static boolean hasMonocle(EntityPlayer player) {
|
||||
|
||||
Reference in new issue
Block a user