From f282be75f413ae4bb33fdcb3185afb36673b63ff Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Mon, 17 Feb 2014 21:10:45 +0100 Subject: [PATCH] FMPHandler registers itself properly when FMP is found. --- .../waila/api/impl/ModuleRegistrar.java | 20 ++----- mcp/mobius/waila/client/ProxyClient.java | 5 ++ mcp/mobius/waila/handlers/HUDHandlerFMP.java | 55 +++++++++++++++++++ 3 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 mcp/mobius/waila/handlers/HUDHandlerFMP.java diff --git a/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/mcp/mobius/waila/api/impl/ModuleRegistrar.java index 0691427..bb9881b 100644 --- a/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -185,18 +185,6 @@ public class ModuleRegistrar implements IWailaRegistrar { target.get(clazz).add(dataProvider); } - /* - private void registerProvider(T dataProvider, String name, LinkedHashMap> target) { - if (!target.containsKey(name)) - target.put(name, new ArrayList()); - - ArrayList providers =target.get(name); - if (providers.contains(dataProvider)) return; - - target.get(name).add(dataProvider); - } - */ - @Override public void registerSyncedNBTKey(String key, Class target){ if (!this.syncedNBTKeys.containsKey(target)) @@ -312,6 +300,10 @@ public class ModuleRegistrar implements IWailaRegistrar { public boolean hasTailEntityProviders(Object entity){ return hasProviders(entity, this.tailEntityProviders); } + + public boolean hasOverrideEntityProviders(Object entity){ + return hasProviders(entity, this.overrideEntityProviders); + } public boolean hasHeadFMPProviders(String name){ return hasProviders(name, this.headFMPProviders); @@ -324,10 +316,6 @@ public class ModuleRegistrar implements IWailaRegistrar { public boolean hasTailFMPProviders(String name){ return hasProviders(name, this.tailFMPProviders); } - - public boolean hasOverrideEntityProviders(Object entity){ - return hasProviders(entity, this.overrideEntityProviders); - } public boolean hasBlockDecorator(Object block){ return hasProviders(block, this.blockClassDecorators); diff --git a/mcp/mobius/waila/client/ProxyClient.java b/mcp/mobius/waila/client/ProxyClient.java index fc78484..5fbfc29 100644 --- a/mcp/mobius/waila/client/ProxyClient.java +++ b/mcp/mobius/waila/client/ProxyClient.java @@ -24,6 +24,7 @@ import mcp.mobius.waila.gui.truetyper.FontLoader; import mcp.mobius.waila.gui.truetyper.TrueTypeFont; import mcp.mobius.waila.handlers.HUDHandlerBlocks; import mcp.mobius.waila.handlers.HUDHandlerEntities; +import mcp.mobius.waila.handlers.HUDHandlerFMP; import mcp.mobius.waila.handlers.SummaryProviderDefault; import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila; import mcp.mobius.waila.overlay.WailaTickHandler; @@ -41,6 +42,7 @@ import codechicken.lib.lang.LangUtil; import codechicken.nei.NEIClientConfig; import codechicken.nei.forge.GuiContainerManager; import cpw.mods.fml.client.registry.KeyBindingRegistry; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; @@ -144,6 +146,9 @@ public class ProxyClient extends ProxyServer { /* Carpenter's Blocks */ CarpentersModule.register(); + if(Loader.isModLoaded("ForgeMultipart")) + HUDHandlerFMP.register(); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), Block.class); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), TileEntity.class); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEntities(), Entity.class); diff --git a/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/mcp/mobius/waila/handlers/HUDHandlerFMP.java new file mode 100644 index 0000000..357b69f --- /dev/null +++ b/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -0,0 +1,55 @@ +package mcp.mobius.waila.handlers; + +import java.util.List; +import java.util.logging.Level; + +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class HUDHandlerFMP implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + public static void register(){ + Class BlockMultipart = null; + try{ + BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[FMP] Class not found. " + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[FMP] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart); + + Waila.log.log(Level.INFO, "Forge Multipart found and dedicated handler registered"); + + } +}