diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 5f40b5caf..c49ec90e4 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -200,7 +200,7 @@ public class SubTileFunctional extends SubTileEntity { @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); - int color = 0x66000000 | getColor(); + int color = getColor(); BotaniaAPI.internalHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index fbab2d7db..0a8d4ea80 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -230,7 +230,7 @@ public class SubTileGenerating extends SubTileEntity { @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); - int color = 0x66000000 | getColor(); + int color = getColor(); BotaniaAPI.internalHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index a8289c754..4c356b968 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -303,13 +303,13 @@ public final class HUDHandler { x = res.getScaledWidth() / 2 - 51; y += 10; - renderManaBar(x, y, color, 0.5F, mana, maxMana); + renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana); if(mana < 0) { String text = StatCollector.translateToLocal("botaniamisc.statusUnknown"); x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(text) / 2; y -= 1; - mc.fontRenderer.drawStringWithShadow(text, x, y, color); + mc.fontRenderer.drawString(text, x, y, color); } GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index cbf3c0b3c..41d418efe 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -200,7 +200,7 @@ public class SubTileHopperhock extends SubTileFunctional { public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); - int color = 0x66000000 | getColor(); + int color = getColor(); String filter = StatCollector.translateToLocal("botaniamisc.filter" + filterType); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 78b000c8e..fe5d4ddf9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -135,7 +135,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { BlockData filter = getUnderlyingBlock(); ItemStack recieverStack = new ItemStack(Item.getItemFromBlock(filter.block), 1, filter.meta); - int color = 0x66000000 | getColor(); + int color = getColor(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index a94f1a594..644583a95 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -298,7 +298,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.pool, 1, getBlockMetadata()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); - int color = 0x660000FF; + int color = 0x0000FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); String power = StatCollector.translateToLocal("botaniamisc." + (outputting ? "outputtingPower" : "inputtingPower")); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index c3c481642..b0a9ed92a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -431,7 +431,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.spreader, 1, getBlockMetadata()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); - int color = isRedstone() ? 0x66FF0000 : isDreamwood() ? 0x66FF00AE : 0x6600FF00; + int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); ItemStack lens = getStackInSlot(0);