From a69d5f093eb6c296416f5b828f0f1f28690c7659 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 8 Nov 2014 17:01:10 +0000 Subject: [PATCH] Trying to infuse an item that isn't a Diluted Mana Pool in a Diluted Mana Pool will show a yellow check with a line rather than just a green check. --- .../client/core/handler/HUDHandler.java | 3 +++ .../assets/botania/textures/gui/manaHud.png | Bin 7421 -> 6828 bytes 2 files changed, 3 insertions(+) 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 695a8ebd2..8cc800490 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -47,6 +47,7 @@ import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; @@ -199,6 +200,8 @@ public final class HUDHandler { int y = res.getScaledHeight() / 2 + 10; int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; + if(u == 0 && tile.getBlockMetadata() == 2 && recipe.getOutput().getItem() != Item.getItemFromBlock(ModBlocks.pool)) + u = 44; int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/resources/assets/botania/textures/gui/manaHud.png b/src/main/resources/assets/botania/textures/gui/manaHud.png index 7a5fe90c5b38ef104b3f564ac66088ddf29c85af..f368c1182cd4bd673b2bea8d0a3b5354ca7c23a3 100644 GIT binary patch delta 3557 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