diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java index 80f29a2..ff21c88 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java @@ -37,7 +37,7 @@ public class HUDHandlerCache implements IWailaDataProvider { color = name.substring(0, 2); if(storedItem != null) { - String namex = GameData.getItemRegistry().getNameForObject(storedItem.getItem()).toString(); + String namex = String.valueOf(GameData.getItemRegistry().getNameForObject(storedItem.getItem())); name += String.format(" < " + SpecialChars.getRenderString("waila.stack", "1", namex, "0", String.valueOf(storedItem.getItemDamage())) + color + " %s >", storedItem.getDisplayName()); } else diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java index 5f8c0f6..0c1f3ec 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java @@ -4,11 +4,13 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.SpecialChars; +import mcp.mobius.waila.api.impl.ModuleRegistrar; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameData; @@ -35,12 +37,12 @@ public class HUDHandlerFurnace implements IWailaDataProvider { String renderStr = ""; { ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(0)); - String name = GameData.getItemRegistry().getNameForObject(stack.getItem()).toString(); + String name = String.valueOf(GameData.getItemRegistry().getNameForObject(stack.getItem())); renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage())); } { ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(1)); - String name = GameData.getItemRegistry().getNameForObject(stack.getItem()).toString(); + String name = String.valueOf(GameData.getItemRegistry().getNameForObject(stack.getItem())); renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage())); } @@ -48,7 +50,7 @@ public class HUDHandlerFurnace implements IWailaDataProvider { { ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(2)); - String name = GameData.getItemRegistry().getNameForObject(stack.getItem()).toString(); + String name = String.valueOf(GameData.getItemRegistry().getNameForObject(stack.getItem())); renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage())); } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index c8c9d6c..b6d396b 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -125,7 +125,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider { if (block == pumpkinStem){ currenttip.set(0, SpecialChars.WHITE + "Pumpkin stem"); - } + } return currenttip; } diff --git a/src/main/java/mcp/mobius/waila/api/IWailaBlock.java b/src/main/java/mcp/mobius/waila/api/IWailaBlock.java deleted file mode 100644 index 8b4dd13..0000000 --- a/src/main/java/mcp/mobius/waila/api/IWailaBlock.java +++ /dev/null @@ -1,34 +0,0 @@ -package mcp.mobius.waila.api; - -import java.util.List; - -import net.minecraft.item.ItemStack; - -@Deprecated -public interface IWailaBlock { - /* - * Use this method to return an item stack in case the default lookup system fails. - * Return null if you want to use the default lookup system. - * You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities - */ - ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); - - /* Waila HUD is divided into 3 zones. The head corresponds to the item name, - * body to where you mostly want to put informations, and I reserve the tail for modname display - */ - - /* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD. - * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack(). - * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info. - * currenttip represents the current list of text lines in the tooltip zone. - * For example, getWailaHead() will have the current item name as currenttip. - * You can modify the tips, add more, remove some, etc. - * When you are done, just returns the currenttip and it will display in Waila. - * - * Always return the currenttip is you don't want to modify the current zone. - */ - - List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); - List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); -} diff --git a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java index c27fbb0..db214d8 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -1,7 +1,6 @@ package mcp.mobius.waila.api.impl; import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.IWailaBlock; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.cbcore.Layout; @@ -39,14 +38,6 @@ public class MetaDataProvider{ public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor) { Block block = accessor.getBlock(); int blockID = accessor.getBlockID(); - - if (IWailaBlock.class.isInstance(block)){ - try{ - return ((IWailaBlock)block).getWailaStack(accessor, ConfigHandler.instance()); - }catch (Throwable e){ - WailaExceptionHandler.handleErr(e, block.getClass().toString(), null); - } - } if(ModuleRegistrar.instance().hasStackProviders(block)){ for (List providerList : ModuleRegistrar.instance().getStackProviders(block).values()){ @@ -85,29 +76,6 @@ public class MetaDataProvider{ } } - /* Interface IWailaBlock */ - if (IWailaBlock.class.isInstance(block)){ - TileEntity entity = world.getTileEntity(mop.getBlockPos()); - if (layout == Layout.HEADER) - try{ - return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); - } - else if (layout == Layout.BODY) - try{ - return ((IWailaBlock)block).getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); - } - else if (layout == Layout.FOOTER) - try{ - return ((IWailaBlock)block).getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); - } - } - headBlockProviders.clear(); bodyBlockProviders.clear(); tailBlockProviders.clear(); @@ -169,10 +137,6 @@ public class MetaDataProvider{ if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){ accessor.resetTimer(); - HashSet keys = new HashSet(); - - if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity())) - WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(accessor.getEntity(), keys)); } else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java index 942abac..d0458bd 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -51,9 +51,7 @@ public class ModuleRegistrar implements IWailaRegistrar { public LinkedHashMap> tailFMPProviders = new LinkedHashMap>(); public LinkedHashMap> FMPClassDecorators = new LinkedHashMap>(); - - public LinkedHashMap> syncedNBTKeys = new LinkedHashMap>(); - + public LinkedHashMap>> wikiDescriptions = new LinkedHashMap>>(); public LinkedHashMap> summaryProviders = new LinkedHashMap>();