From 30bf6851755bf086715787be01d1f4114089b9be Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 11 Apr 2015 16:40:15 +0100 Subject: [PATCH] Fixed the Lexicon's lookup feature picking up liquids and fake air blocks. --- .../botania/client/core/handler/HUDHandler.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 900617e3b..e416dbf6f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.handler; import java.awt.Color; import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -282,13 +283,15 @@ public final class HUDHandler { if(!draw && pos.entityHit == null) { profiler.startSection("wikiLookup"); - IWikiProvider provider = WikiHooks.getWikiFor(block); - String url = provider.getWikiURL(mc.theWorld, pos); - if(url != null && !url.isEmpty()) { - String name = provider.getBlockName(mc.theWorld, pos); - String wikiName = provider.getWikiName(mc.theWorld, pos); - drawStr = name + " @ " + EnumChatFormatting.AQUA + wikiName; - draw = true; + if(!block.isAir(mc.theWorld, pos.blockX, pos.blockY, pos.blockZ) && !(block instanceof BlockLiquid)) { + IWikiProvider provider = WikiHooks.getWikiFor(block); + String url = provider.getWikiURL(mc.theWorld, pos); + if(url != null && !url.isEmpty()) { + String name = provider.getBlockName(mc.theWorld, pos); + String wikiName = provider.getWikiName(mc.theWorld, pos); + drawStr = name + " @ " + EnumChatFormatting.AQUA + wikiName; + draw = true; + } } profiler.endSection(); }