From 512884729e916f977dada3bbd1c3108c3e186202 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 21:54:11 -0600 Subject: [PATCH] Tweak mossy apothecary break texture, fix lexicon crash again --- .../java/vazkii/botania/api/wiki/IWikiProvider.java | 7 ++++--- .../vazkii/botania/api/wiki/SimpleWikiProvider.java | 11 ++++++----- .../botania/client/core/handler/HUDHandler.java | 6 +++--- .../vazkii/botania/client/core/proxy/ClientProxy.java | 2 +- .../resources/assets/botania/blockstates/altar.json | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java index 285c1549e..48c9fb4f4 100644 --- a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.wiki; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -23,16 +24,16 @@ public interface IWikiProvider { /** * Gets the name of the block being looked at for display. */ - public String getBlockName(World world, MovingObjectPosition pos); + public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player); /** * Gets the URL to open when the block is clicked. */ - public String getWikiURL(World world, MovingObjectPosition pos); + public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player); /** * Gets the name of the wiki for display. */ - public String getWikiName(World world, MovingObjectPosition pos); + public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player); } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 590d3ddc5..132182269 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -11,6 +11,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; @@ -46,14 +47,14 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getBlockName(World world, MovingObjectPosition pos) { + public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player) { BlockPos bPos = pos.getBlockPos(); Block block = world.getBlockState(bPos).getBlock(); if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, bPos, null); + ItemStack stack = block.getPickBlock(pos, world, bPos, player); if(stack == null || stack.getItem() == null) stack = new ItemStack(block, 1, block.getDamageValue(world, bPos)); @@ -69,8 +70,8 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getWikiURL(World world, MovingObjectPosition pos) { - String name = getBlockName(world, pos); + public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player) { + String name = getBlockName(world, pos, player); if(name == null) return null; @@ -82,7 +83,7 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getWikiName(World world, MovingObjectPosition pos) { + public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player) { return name; } 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 964488d61..e915394ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -363,10 +363,10 @@ public final class HUDHandler { profiler.startSection("wikiLookup"); if(!block.isAir(mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { IWikiProvider provider = WikiHooks.getWikiFor(block); - String url = provider.getWikiURL(mc.theWorld, pos); + String url = provider.getWikiURL(mc.theWorld, pos, mc.thePlayer); if(url != null && !url.isEmpty()) { - String name = provider.getBlockName(mc.theWorld, pos); - String wikiName = provider.getWikiName(mc.theWorld, pos); + String name = provider.getBlockName(mc.theWorld, pos, mc.thePlayer); + String wikiName = provider.getWikiName(mc.theWorld, pos, mc.thePlayer); drawStr = name + " @ " + EnumChatFormatting.AQUA + wikiName; draw = true; } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 0406e080d..5f89fbdf5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -339,7 +339,7 @@ public class ClientProxy extends CommonProxy { @Override public boolean openWikiPage(World world, Block block, MovingObjectPosition pos) { IWikiProvider wiki = WikiHooks.getWikiFor(block); - String url = wiki.getWikiURL(world, pos); + String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().thePlayer); if(url != null && !url.isEmpty()) { try { Desktop.getDesktop().browse(new URI(url)); diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 207c7c165..1438c5ac9 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -205,7 +205,7 @@ "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top", "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom", "kelkwall": "botania:model/altar/mossy/kelkWall", - "particle": "minecraft:blocks/cobblestone" + "particle": "minecraft:blocks/cobblestone_mossy" }} } }