From a2322d3915040b193f103f41b4b2f80ddd24e444 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 12 Jul 2014 23:42:07 +0100 Subject: [PATCH] Cleanup. --- .../vazkii/botania/api/mana/IKeyLocked.java | 4 +-- .../core/handler/BoundTileRenderer.java | 1 - .../core/handler/ClientTickHandler.java | 3 +- .../InventoryBaublesButtonHandler.java | 10 +++---- .../client/core/helper/RenderHelper.java | 2 +- .../client/core/helper/ShaderHelper.java | 6 ++-- .../helper/TransientScaledResolution.java | 30 +++++++++---------- .../client/render/item/RenderLexicon.java | 4 +-- .../render/tile/RenderTileEnchanter.java | 2 +- .../botania/common/block/BlockBifrost.java | 2 +- .../botania/common/block/BlockPool.java | 13 ++++---- .../common/block/tile/mana/TilePool.java | 14 ++++----- .../common/core/handler/ConfigHandler.java | 2 +- .../common/crafting/ModCrafingRecipes.java | 6 ++-- .../botania/common/item/ItemBottledMana.java | 6 ++-- .../vazkii/botania/common/item/ItemLens.java | 1 - .../botania/common/item/ItemManaResource.java | 4 +-- .../botania/common/item/ItemTwigWand.java | 11 ++++--- .../lexicon/page/PageManaInfusionRecipe.java | 12 ++++---- .../common/lexicon/page/PageRuneRecipe.java | 10 +++---- .../botania/common/lib/LibObfuscation.java | 2 +- 21 files changed, 69 insertions(+), 76 deletions(-) diff --git a/MODSRC/vazkii/botania/api/mana/IKeyLocked.java b/MODSRC/vazkii/botania/api/mana/IKeyLocked.java index 38d10859b..a7870e6bf 100644 --- a/MODSRC/vazkii/botania/api/mana/IKeyLocked.java +++ b/MODSRC/vazkii/botania/api/mana/IKeyLocked.java @@ -24,7 +24,7 @@ package vazkii.botania.api.mana; public interface IKeyLocked { public String getInputKey(); - + public String getOutputKey(); - + } diff --git a/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java b/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java index 5c2f3031a..92038ab35 100644 --- a/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -42,7 +42,6 @@ public final class BoundTileRenderer { Tessellator.renderingWorldRenderer = false; EntityPlayer player = Minecraft.getMinecraft().thePlayer; - World world = player.worldObj; ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() instanceof ICoordBoundItem) { ChunkCoordinates coords = ((ICoordBoundItem) stack.getItem()).getBinding(stack); diff --git a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java index 7618ec38f..a52f95e2b 100644 --- a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -30,7 +30,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Type; public class ClientTickHandler { @@ -85,7 +84,7 @@ public class ClientTickHandler { } } } - + @SubscribeEvent public void renderTickEnd(RenderTickEvent event) { if(event.phase == Phase.END && ConfigHandler.baublesInventoryButton) diff --git a/MODSRC/vazkii/botania/client/core/handler/InventoryBaublesButtonHandler.java b/MODSRC/vazkii/botania/client/core/handler/InventoryBaublesButtonHandler.java index 360ac5ca1..e228e113e 100644 --- a/MODSRC/vazkii/botania/client/core/handler/InventoryBaublesButtonHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/InventoryBaublesButtonHandler.java @@ -36,7 +36,7 @@ public final class InventoryBaublesButtonHandler { static ResourceLocation icon = new ResourceLocation(LibResources.GUI_BAUBLES); static boolean mouseDown = false; - + public static void renderBaublesIcon() { Minecraft mc = Minecraft.getMinecraft(); if(mc.currentScreen != null && (mc.currentScreen instanceof GuiInventory || mc.currentScreen instanceof GuiContainerCreative || mc.currentScreen instanceof GuiPlayerExpanded)) { @@ -54,10 +54,10 @@ public final class InventoryBaublesButtonHandler { y += 13; } else return; } - + if(!mc.thePlayer.getActivePotionEffects().isEmpty()) x += 60; - + RenderHelper.disableStandardItemLighting(); GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glScalef(0.5F, 0.5F, 0.5F); @@ -90,8 +90,8 @@ public final class InventoryBaublesButtonHandler { mouseDown = true; } } - } - + } + if(mouseDown && !Mouse.isButtonDown(0)) mouseDown = false; } diff --git a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java index 98c2cd10f..4d021ebd0 100644 --- a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java @@ -136,7 +136,7 @@ public final class RenderHelper { public static void renderStar(int color, float xScale, float yScale, float zScale, long seed) { Tessellator tessellator = Tessellator.instance; - int ticks = (int) (ClientTickHandler.ticksInGame % 200); + int ticks = ClientTickHandler.ticksInGame % 200; if (ticks >= 100) ticks = 200 - ticks - 1; diff --git a/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java b/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java index dd57f1143..00b0895b4 100644 --- a/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java @@ -57,12 +57,12 @@ public final class ShaderHelper { if(shader != 0) { int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time"); ARBShaderObjects.glUniform1iARB(time, ClientTickHandler.ticksInGame); - + if(callback != null) callback.call(shader); } } - + public static void useShader(int shader) { useShader(shader, null); } @@ -184,7 +184,7 @@ public final class ShaderHelper { return source.toString(); } - + public static abstract class ShaderCallback { public abstract void call(int shader); } diff --git a/MODSRC/vazkii/botania/client/core/helper/TransientScaledResolution.java b/MODSRC/vazkii/botania/client/core/helper/TransientScaledResolution.java index 329a441c5..1438ab9cc 100644 --- a/MODSRC/vazkii/botania/client/core/helper/TransientScaledResolution.java +++ b/MODSRC/vazkii/botania/client/core/helper/TransientScaledResolution.java @@ -16,7 +16,7 @@ import net.minecraft.util.MathHelper; // Copy of ScaledResolution with 1.7.2 and 1.7.10 support. Will drop once 1.7.10 is in full use public class TransientScaledResolution { - + private int scaledWidth; private int scaledHeight; private double scaledWidthD; @@ -24,40 +24,40 @@ public class TransientScaledResolution { private int scaleFactor; public TransientScaledResolution(GameSettings par1GameSettings, int par2, int par3) { - this.scaledWidth = par2; - this.scaledHeight = par3; - this.scaleFactor = 1; + scaledWidth = par2; + scaledHeight = par3; + scaleFactor = 1; int k = par1GameSettings.guiScale; if (k == 0) k = 1000; - while (this.scaleFactor < k && this.scaledWidth / (this.scaleFactor + 1) >= 320 && this.scaledHeight / (this.scaleFactor + 1) >= 240) - ++this.scaleFactor; + while (scaleFactor < k && scaledWidth / (scaleFactor + 1) >= 320 && scaledHeight / (scaleFactor + 1) >= 240) + ++scaleFactor; - this.scaledWidthD = (double)this.scaledWidth / (double)this.scaleFactor; - this.scaledHeightD = (double)this.scaledHeight / (double)this.scaleFactor; - this.scaledWidth = MathHelper.ceiling_double_int(this.scaledWidthD); - this.scaledHeight = MathHelper.ceiling_double_int(this.scaledHeightD); + scaledWidthD = (double)scaledWidth / (double)scaleFactor; + scaledHeightD = (double)scaledHeight / (double)scaleFactor; + scaledWidth = MathHelper.ceiling_double_int(scaledWidthD); + scaledHeight = MathHelper.ceiling_double_int(scaledHeightD); } public int getScaledWidth() { - return this.scaledWidth; + return scaledWidth; } public int getScaledHeight() { - return this.scaledHeight; + return scaledHeight; } public double getScaledWidth_double() { - return this.scaledWidthD; + return scaledWidthD; } public double getScaledHeight_double() { - return this.scaledHeightD; + return scaledHeightD; } public int getScaleFactor() { - return this.scaleFactor; + return scaleFactor; } } \ No newline at end of file diff --git a/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java b/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java index 8d6076838..f063ac6ff 100644 --- a/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java +++ b/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java @@ -66,7 +66,7 @@ public class RenderLexicon implements IItemRenderer { GL11.glScalef(0.0035F, 0.0035F, 0.0035F); boolean bevo = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("BevoLJ"); boolean saice = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("saice"); - + String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; @@ -76,7 +76,7 @@ public class RenderLexicon implements IItemRenderer { title = StatCollector.translateToLocal("item.botania:lexicon.bevo"); if(title.equals(origTitle) && saice) title = StatCollector.translateToLocal("item.botania:lexicon.saice"); - + font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); GL11.glTranslatef(0F, 10F, 0F); GL11.glScalef(0.6F, 0.6F, 0.6F); diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 7ba7165e3..da2e98019 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -51,7 +51,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { if(item == null) item = new EntityItem(enchanter.getWorldObj(), enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant); - item.age = (int) ClientTickHandler.ticksInGame; + item.age = ClientTickHandler.ticksInGame; item.setEntityItemStack(enchanter.itemToEnchant); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/MODSRC/vazkii/botania/common/block/BlockBifrost.java b/MODSRC/vazkii/botania/common/block/BlockBifrost.java index 8408720f2..a70256dac 100644 --- a/MODSRC/vazkii/botania/common/block/BlockBifrost.java +++ b/MODSRC/vazkii/botania/common/block/BlockBifrost.java @@ -43,7 +43,7 @@ public class BlockBifrost extends BlockModContainer { public boolean isOpaqueCube() { return false; } - + @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return new ItemStack(ModItems.rainbowRod); diff --git a/MODSRC/vazkii/botania/common/block/BlockPool.java b/MODSRC/vazkii/botania/common/block/BlockPool.java index 5167b17fa..15390c26a 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPool.java +++ b/MODSRC/vazkii/botania/common/block/BlockPool.java @@ -33,7 +33,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; @@ -43,7 +42,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable { boolean lastFragile = false; - + protected BlockPool() { super(Material.rock); setHardness(2.0F); @@ -68,25 +67,25 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, public void registerBlockIcons(IIconRegister par1IconRegister) { // NO-OP } - + @Override public int damageDropped(int meta) { return meta; } - + @Override public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { TilePool pool = (TilePool) par1World.getTileEntity(par2, par3, par4); lastFragile = pool.fragile; } - + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList drops = new ArrayList(); - + if(!lastFragile) drops.add(new ItemStack(this, 1, metadata)); - + return drops; } diff --git a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java index 9899548d3..328299d14 100644 --- a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java @@ -67,7 +67,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked { int mana; int knownMana = -1; int craftCooldown = 20; - + public int manaCap = MAX_MANA; boolean canAccept = true; boolean canSpare = true; @@ -75,7 +75,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked { String inputKey = ""; String outputKey = ""; - + @Override public boolean isFull() { Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); @@ -233,12 +233,12 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked { cmp.setInteger(TAG_MANA, mana); cmp.setBoolean(TAG_OUTPUTTING, outputting); cmp.setInteger(TAG_COLOR, color); - + cmp.setInteger(TAG_MANA_CAP, manaCap); cmp.setBoolean(TAG_CAN_ACCEPT, canAccept); cmp.setBoolean(TAG_CAN_SPARE, canSpare); cmp.setBoolean(TAG_FRAGILE, fragile); - + cmp.setString(TAG_INPUT_KEY, inputKey); cmp.setString(TAG_OUTPUT_KEY, outputKey); } @@ -248,7 +248,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked { mana = cmp.getInteger(TAG_MANA); outputting = cmp.getBoolean(TAG_OUTPUTTING); color = cmp.getInteger(TAG_COLOR); - + if(cmp.hasKey(TAG_MANA_CAP)) manaCap = cmp.getInteger(TAG_MANA_CAP); if(cmp.hasKey(TAG_CAN_ACCEPT)) @@ -256,12 +256,12 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked { if(cmp.hasKey(TAG_CAN_SPARE)) canSpare = cmp.getBoolean(TAG_CAN_SPARE); fragile = cmp.getBoolean(TAG_FRAGILE); - + if(cmp.hasKey(TAG_INPUT_KEY)) inputKey = cmp.getString(TAG_INPUT_KEY); if(cmp.hasKey(TAG_OUTPUT_KEY)) inputKey = cmp.getString(TAG_OUTPUT_KEY); - + if(cmp.hasKey(TAG_KNOWN_MANA)) knownMana = cmp.getInteger(TAG_KNOWN_MANA); } diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index b96f68661..918369421 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -111,7 +111,7 @@ public final class ConfigHandler { desc = "Set to false to disable the inventory button to open the Baubles menu."; baublesInventoryButton = loadPropBool("baublesButton.enabled", desc, baublesInventoryButton); - + desc = "Set to false to disable checking and alerting when new Botania versions come out."; versionCheckEnabled = loadPropBool("versionChecking.enabled", desc, versionCheckEnabled); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index e1e27fe88..bbf6a4403 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -964,15 +964,15 @@ public final class ModCrafingRecipes { 'S', new ItemStack(ModItems.grassSeeds), 'D', new ItemStack(Blocks.dirt)); recipesMiniIsland = BotaniaAPI.getLatestAddedRecipes(16); - + // Gaia Pylon Recipe - addOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 2), + addOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 2), " D ", "EPE", " D ", 'D', LibOreDict.PIXIE_DUST, 'E', LibOreDict.ELEMENTIUM, 'P', new ItemStack(ModBlocks.pylon)); recipeGaiaPylon = BotaniaAPI.getLatestAddedRecipe(); - + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/item/ItemBottledMana.java b/MODSRC/vazkii/botania/common/item/ItemBottledMana.java index adee6cf3d..511b1bd09 100644 --- a/MODSRC/vazkii/botania/common/item/ItemBottledMana.java +++ b/MODSRC/vazkii/botania/common/item/ItemBottledMana.java @@ -178,7 +178,7 @@ public class ItemBottledMana extends ItemMod { } } } - + @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { getSeed(par1ItemStack); @@ -187,14 +187,14 @@ public class ItemBottledMana extends ItemMod { public void randomEffect(EntityPlayer player, ItemStack stack) { effect(player, new Random(getSeed(stack)).nextInt(16)); } - + long getSeed(ItemStack stack) { long seed = ItemNBTHelper.getLong(stack, TAG_SEED, -1); if(seed == -1) return randomSeed(stack); return seed; } - + long randomSeed(ItemStack stack) { long seed = Math.abs(itemRand.nextLong()); ItemNBTHelper.setLong(stack, TAG_SEED, seed); diff --git a/MODSRC/vazkii/botania/common/item/ItemLens.java b/MODSRC/vazkii/botania/common/item/ItemLens.java index 17dedb8ba..0c926ce85 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLens.java +++ b/MODSRC/vazkii/botania/common/item/ItemLens.java @@ -41,7 +41,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 21bd489d4..219d92757 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -13,11 +13,9 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -44,7 +42,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4) return EntityDoppleganger.spawn(par1ItemStack, par3World, par4, par5, par6); - + return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); } diff --git a/MODSRC/vazkii/botania/common/item/ItemTwigWand.java b/MODSRC/vazkii/botania/common/item/ItemTwigWand.java index df8ec2da6..27083e980 100644 --- a/MODSRC/vazkii/botania/common/item/ItemTwigWand.java +++ b/MODSRC/vazkii/botania/common/item/ItemTwigWand.java @@ -42,7 +42,6 @@ import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @@ -70,25 +69,25 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { TileEntity tile = par3World.getTileEntity(boundSpreader.posX, boundSpreader.posY, boundSpreader.posZ); if(tile instanceof TileSpreader) { TileSpreader spreader = (TileSpreader) tile; - + Vector3 spreaderVec = Vector3.fromTileEntityCenter(spreader); Vector3 blockVec = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); Vector3 diffVec = blockVec.sub(spreaderVec); Vector3 diffVec2D = new Vector3(diffVec.x, diffVec.z, 0); Vector3 rotVec = new Vector3(0, 1, 0); double angle = rotVec.angle(diffVec2D) / Math.PI * 180.0; - + if(par4 < spreader.xCoord) angle = -angle; - + spreader.rotationX = (float) angle + 90; - + rotVec = new Vector3(diffVec.x, 0, diffVec.z); angle = diffVec.angle(rotVec) * 180F / Math.PI; if(par5 < boundSpreader.posY) angle = -angle; spreader.rotationY = (float) angle; - + spreader.checkForReceiver(); par3World.markBlockForUpdate(boundSpreader.posX, boundSpreader.posY, boundSpreader.posZ); return true; diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 710d7f5c9..23f16cb41 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -84,21 +84,21 @@ public class PageManaInfusionRecipe extends PageRecipe { font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 105, 0x66000000); int ratio = 10; - int x = gui.getLeft() + gui.getWidth() / 2 - 50; + int x = gui.getLeft() + gui.getWidth() / 2 - 50; int y = gui.getTop() + 115; - if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) + if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) ratio = 1; - + HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / ratio); - + String ratioString = String.format(StatCollector.translateToLocal("botaniamisc.ratio"), ratio); - + boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); font.drawString(ratioString, x + 100 - font.getStringWidth(ratioString), y + 5, 0x50000000); font.setUnicodeFlag(unicode); - + GL11.glDisable(GL11.GL_BLEND); render.bindTexture(manaInfusionOverlay); diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 2c5218f60..75e783681 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -53,16 +53,16 @@ public class PageRuneRecipe extends PagePetalRecipe { font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 115, 0x66000000); int ratio = 10; - int x = gui.getLeft() + gui.getWidth() / 2 - 50; + int x = gui.getLeft() + gui.getWidth() / 2 - 50; int y = gui.getTop() + 125; - if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) + if(mx > x + 1 && mx <= x + 101 && my > y - 14 && my <= y + 11) ratio = 1; - + HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); - + String ratioString = String.format(StatCollector.translateToLocal("botaniamisc.ratio"), ratio); - + boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); font.drawString(ratioString, x + 100 - font.getStringWidth(ratioString), y + 5, 0x50000000); diff --git a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java index 39e0e6123..4c435d32d 100644 --- a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java +++ b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java @@ -44,7 +44,7 @@ public final class LibObfuscation { // EntityPlayer public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "f" }; - + // Potion public static final String[] IS_BAD_EFFECT = new String[] { "isBadEffect", "field_76418_K", "J" }; }