From 156e672dbcfe03bc0a1665f721d213e312f06fd1 Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sun, 4 Jan 2015 00:46:14 +0100 Subject: [PATCH] Restored getBlockID to the accessors Added getBlockQualifiedName to return a block domain:name str Restored the id display (along with the new qualified name) --- .../java/mcp/mobius/waila/api/IWailaCommonAccessor.java | 1 + .../java/mcp/mobius/waila/api/IWailaDataAccessor.java | 1 + .../java/mcp/mobius/waila/api/IWailaTooltipRenderer.java | 1 - .../mcp/mobius/waila/api/impl/DataAccessorCommon.java | 9 +++++++++ .../java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java | 9 +++++---- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java index e49fc89..982f50b 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaCommonAccessor.java @@ -23,6 +23,7 @@ public interface IWailaCommonAccessor { EntityPlayer getPlayer(); Block getBlock(); int getBlockID(); + String getBlockQualifiedName(); int getMetadata(); TileEntity getTileEntity(); Entity getEntity(); diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java index 15c1224..7b87217 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java @@ -24,6 +24,7 @@ public interface IWailaDataAccessor{ EntityPlayer getPlayer(); Block getBlock(); int getBlockID(); + String getBlockQualifiedName(); int getMetadata(); TileEntity getTileEntity(); MovingObjectPosition getPosition(); diff --git a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java index 3669f4d..700a278 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java @@ -16,7 +16,6 @@ public interface IWailaTooltipRenderer { /** * Draw method for the renderer. The GL matrice is automatically moved to the top left of the reserved zone.
* All calls should be relative to (0,0) - * * * @param params Array of string parameters as passed to the RENDER arg in the tooltip ({rendername,param1,param2,...}) * @param accessor A global accessor for TileEntities and Entities diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java index f141ab4..544cae0 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java @@ -1,5 +1,6 @@ package mcp.mobius.waila.api.impl; +import cpw.mods.fml.common.registry.GameData; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -25,6 +26,7 @@ public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAcces public Vec3 renderingvec = null; public Block block; public int blockID; + public String blockResource; public int metadata; public TileEntity tileEntity; public Entity entity; @@ -49,6 +51,8 @@ public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAcces this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ); this.tileEntity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ); this.entity = null; + this.blockID = Block.getIdFromBlock(this.block); + this.blockResource = GameData.getBlockRegistry().getNameForObject(this.block); try{ this.stack = new ItemStack(this.block, 1, this.metadata); } catch (Exception e) {} } else if (this.mop.typeOfHit == MovingObjectType.ENTITY){ @@ -184,6 +188,11 @@ public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAcces public void resetTimer(){ this.timeLastUpdate = System.currentTimeMillis(); + } + + @Override + public String getBlockQualifiedName() { + return this.blockResource; } } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 33617da..6b12026 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -2,7 +2,7 @@ package mcp.mobius.waila.handlers; import java.util.List; - +import cpw.mods.fml.common.registry.GameData; import static mcp.mobius.waila.api.SpecialChars.*; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -11,11 +11,14 @@ import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.ModIdentification; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.config.Configuration; @@ -56,9 +59,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider { currenttip.add("< Unnamed >"); else{ if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true)){ - name = currenttip.get(0); - //currenttip.set(0, name + String.format(" %s:%s", accessor.getBlockID(), accessor.getMetadata())); - //currenttip.set(0, name + String.format(" %s:%s", itemStack.itemID, itemStack.getItemDamage())); + currenttip.add(String.format(ITALIC + "[%d:%d] | %s", accessor.getBlockID(), accessor.getMetadata(), accessor.getBlockQualifiedName())); } } return currenttip;