diff --git a/build.gradle b/build.gradle index b48bc9e..3ea9c90 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.8b_dev1_1.7.10" +version = "1.5.9b_dev2_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" 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 41ef222..7ebd647 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -3,6 +3,8 @@ package mcp.mobius.waila.api.impl; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.TreeMap; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaBlock; @@ -24,13 +26,13 @@ import net.minecraft.world.World; public class MetaDataProvider{ - private ArrayList headBlockProviders = new ArrayList(); - private ArrayList bodyBlockProviders = new ArrayList(); - private ArrayList tailBlockProviders = new ArrayList(); + private Map> headBlockProviders = new TreeMap>(); + private Map> bodyBlockProviders = new TreeMap>(); + private Map> tailBlockProviders = new TreeMap>(); - private ArrayList headEntityProviders = new ArrayList(); - private ArrayList bodyEntityProviders = new ArrayList(); - private ArrayList tailEntityProviders = new ArrayList(); + private Map> headEntityProviders = new TreeMap>(); + private Map> bodyEntityProviders = new TreeMap>(); + private Map> tailEntityProviders = new TreeMap>(); private Class prevBlock = null; private Class prevTile = null; @@ -48,14 +50,16 @@ public class MetaDataProvider{ } if(ModuleRegistrar.instance().hasStackProviders(block)){ - for (IWailaDataProvider dataProvider : ModuleRegistrar.instance().getStackProviders(block)){ - try{ - ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance()); - if (retval != null) - return retval; - }catch (Throwable e){ - WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null); - } + for (List providerList : ModuleRegistrar.instance().getStackProviders(block).values()){ + for (IWailaDataProvider dataProvider : providerList){ + try{ + ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance()); + if (retval != null) + return retval; + }catch (Throwable e){ + WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null); + } + } } } return null; @@ -117,50 +121,54 @@ public class MetaDataProvider{ /* Lookup by class (for blocks)*/ if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block)) - headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block)); + headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(block)); else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block)) - bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block)); + bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(block)); else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block)) - tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(block)); + tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(block)); /* Lookup by class (for tileentities)*/ if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity())) - headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity())); + headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity())); else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity())) - bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity())); + bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity())); else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity())) - tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity())); + tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity())); /* Apply all collected providers */ if (layout == Layout.HEADER) - for (IWailaDataProvider dataProvider : headBlockProviders) - try{ - currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } + for (List providersList : headBlockProviders.values()){ + for (IWailaDataProvider dataProvider : providersList) + try{ + currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } - if (layout == Layout.BODY) - for (IWailaDataProvider dataProvider : bodyBlockProviders) - try{ - currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - + if (layout == Layout.BODY) + for (List providersList : bodyBlockProviders.values()){ + for (IWailaDataProvider dataProvider : providersList) + try{ + currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } if (layout == Layout.FOOTER) - for (IWailaDataProvider dataProvider : tailBlockProviders) - try{ - currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } - + for (List providersList : tailBlockProviders.values()){ + for (IWailaDataProvider dataProvider : providersList) + try{ + currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } return currenttip; } @@ -193,38 +201,44 @@ public class MetaDataProvider{ /* Lookup by class (for entities)*/ if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity)) - headEntityProviders.addAll(ModuleRegistrar.instance().getHeadEntityProviders(entity)); + headEntityProviders.putAll(ModuleRegistrar.instance().getHeadEntityProviders(entity)); else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity)) - bodyEntityProviders.addAll(ModuleRegistrar.instance().getBodyEntityProviders(entity)); + bodyEntityProviders.putAll(ModuleRegistrar.instance().getBodyEntityProviders(entity)); else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity)) - tailEntityProviders.addAll(ModuleRegistrar.instance().getTailEntityProviders(entity)); + tailEntityProviders.putAll(ModuleRegistrar.instance().getTailEntityProviders(entity)); /* Apply all collected providers */ if (layout == Layout.HEADER) - for (IWailaEntityProvider dataProvider : headEntityProviders) - try{ - currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } + for (List providersList : headEntityProviders.values()){ + for (IWailaEntityProvider dataProvider : providersList) + try{ + currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } if (layout == Layout.BODY) - for (IWailaEntityProvider dataProvider : bodyEntityProviders) - try{ - currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } + for (List providersList : bodyEntityProviders.values()){ + for (IWailaEntityProvider dataProvider : providersList) + try{ + currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } if (layout == Layout.FOOTER) - for (IWailaEntityProvider dataProvider : tailEntityProviders) - try{ - currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance()); - } catch (Throwable e){ - currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); - } + for (List providersList : tailEntityProviders.values()){ + for (IWailaEntityProvider dataProvider : providersList) + try{ + currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + } return currenttip; } 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 77ca199..50c96e2 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -5,10 +5,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.TreeMap; import org.apache.logging.log4j.Level; @@ -230,67 +233,67 @@ public class ModuleRegistrar implements IWailaRegistrar { /* PROVIDER GETTERS */ - public ArrayList getHeadProviders(Object block) { + public Map> getHeadProviders(Object block) { return getProviders(block, this.headBlockProviders); } - public ArrayList getBodyProviders(Object block) { + public Map> getBodyProviders(Object block) { return getProviders(block, this.bodyBlockProviders); } - public ArrayList getTailProviders(Object block) { + public Map> getTailProviders(Object block) { return getProviders(block, this.tailBlockProviders); } - public ArrayList getStackProviders(Object block) { + public Map> getStackProviders(Object block) { return getProviders(block, this.stackBlockProviders); } - public ArrayList getNBTProviders(Object block) { + public Map> getNBTProviders(Object block) { return getProviders(block, this.NBTDataProviders); } - public ArrayList getHeadEntityProviders(Object entity) { + public Map> getHeadEntityProviders(Object entity) { return getProviders(entity, this.headEntityProviders); } - public ArrayList getBodyEntityProviders(Object entity) { + public Map> getBodyEntityProviders(Object entity) { return getProviders(entity, this.bodyEntityProviders); } - public ArrayList getTailEntityProviders(Object entity) { + public Map> getTailEntityProviders(Object entity) { return getProviders(entity, this.tailEntityProviders); } - public ArrayList getOverrideEntityProviders(Object entity) { + public Map> getOverrideEntityProviders(Object entity) { return getProviders(entity, this.overrideEntityProviders); } - public ArrayList getNBTEntityProviders(Object entity) { + public Map> getNBTEntityProviders(Object entity) { return getProviders(entity, this.NBTEntityProviders); } - public ArrayList getHeadFMPProviders(String name) { + public Map> getHeadFMPProviders(String name) { return getProviders(name, this.headFMPProviders); } - public ArrayList getBodyFMPProviders(String name) { + public Map> getBodyFMPProviders(String name) { return getProviders(name, this.bodyFMPProviders); } - public ArrayList getTailFMPProviders(String name) { + public Map> getTailFMPProviders(String name) { return getProviders(name, this.tailFMPProviders); } - public ArrayList getSummaryProvider(Object item){ + public Map> getSummaryProvider(Object item){ return getProviders(item, this.summaryProviders); } - public ArrayList getBlockDecorators(Object block){ + public Map> getBlockDecorators(Object block){ return getProviders(block, this.blockClassDecorators); } - public ArrayList getFMPDecorators(String name){ + public Map> getFMPDecorators(String name){ return getProviders(name, this.FMPClassDecorators); } @@ -298,17 +301,24 @@ public class ModuleRegistrar implements IWailaRegistrar { return this.tooltipRenderers.get(name); } - private ArrayList getProviders(Object obj, LinkedHashMap> target){ - ArrayList returnList = new ArrayList(); - for (Class clazz : target.keySet()) + private Map> getProviders(Object obj, LinkedHashMap> target){ + Map> returnList = new TreeMap>(); + Integer index = 0; + + for (Class clazz : target.keySet()){ if (clazz.isInstance(obj)) - returnList.addAll(target.get(clazz)); - + returnList.put(index, target.get(clazz)); + + index++; + } + return returnList; } - private ArrayList getProviders(String name, LinkedHashMap> target){ - return target.get(name); + private Map> getProviders(String name, LinkedHashMap> target){ + Map> returnList = new TreeMap>(); + returnList.put(0, target.get(name)); + return returnList; } @Deprecated diff --git a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java index a0493e6..9f5091c 100644 --- a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.handlers; +import java.util.List; + import org.apache.logging.log4j.Level; import net.minecraft.item.ItemStack; @@ -25,8 +27,9 @@ public class DecoratorFMP implements IWailaBlockDecorator { if (ModuleRegistrar.instance().hasFMPDecorator(id)){ DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id, accessor.getRenderingPosition(), accessor.getPartialFrame()); - for (IWailaFMPDecorator provider : ModuleRegistrar.instance().getFMPDecorators(id)) - provider.decorateBlock(itemStack, DataAccessorFMP.instance, config); + for (List providersList : ModuleRegistrar.instance().getFMPDecorators(id).values()) + for (IWailaFMPDecorator provider : providersList) + provider.decorateBlock(itemStack, DataAccessorFMP.instance, config); } } } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java index 6970735..049d1e7 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -36,8 +36,10 @@ public class HUDHandlerFMP implements IWailaDataProvider { if (ModuleRegistrar.instance().hasHeadFMPProviders(id)){ DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - for (IWailaFMPProvider provider : ModuleRegistrar.instance().getHeadFMPProviders(id)) - currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config); + for (List providersList : ModuleRegistrar.instance().getHeadFMPProviders(id).values()){ + for (IWailaFMPProvider provider : providersList) + currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config); + } } } @@ -54,8 +56,10 @@ public class HUDHandlerFMP implements IWailaDataProvider { if (ModuleRegistrar.instance().hasBodyFMPProviders(id)){ DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - for (IWailaFMPProvider provider : ModuleRegistrar.instance().getBodyFMPProviders(id)) - currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config); + for (List providersList : ModuleRegistrar.instance().getBodyFMPProviders(id).values()){ + for (IWailaFMPProvider provider : providersList) + currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config); + } } } @@ -72,8 +76,10 @@ public class HUDHandlerFMP implements IWailaDataProvider { if (ModuleRegistrar.instance().hasTailFMPProviders(id)){ DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); - for (IWailaFMPProvider provider : ModuleRegistrar.instance().getTailFMPProviders(id)) - currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config); + for (List providersList : ModuleRegistrar.instance().getTailFMPProviders(id).values()){ + for (IWailaFMPProvider provider : providersList) + currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config); + } } } diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index ca0a091..a50dfdd 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -3,6 +3,7 @@ package mcp.mobius.waila.network; import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.NetworkRegistry; @@ -112,25 +113,30 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler providersList : ModuleRegistrar.instance().getNBTProviders(block).values()){ + for (IWailaDataProvider provider : providersList){ + try{ + tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } catch (AbstractMethodError ame){ + tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } catch (NoSuchMethodError nsm){ + tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } + } + } - for (IWailaDataProvider provider : ModuleRegistrar.instance().getNBTProviders(entity)){ - try{ - tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } catch (AbstractMethodError ame){ - tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } catch (NoSuchMethodError nsm){ - tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); - } - } + + for (List providersList : ModuleRegistrar.instance().getNBTProviders(entity).values()){ + for (IWailaDataProvider provider : providersList){ + try{ + tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } catch (AbstractMethodError ame){ + tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } catch (NoSuchMethodError nsm){ + tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ); + } + } + } } else { entity.writeToNBT(tag); diff --git a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java index 161af30..6fee735 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java @@ -1,6 +1,7 @@ package mcp.mobius.waila.network; import java.util.HashSet; +import java.util.List; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.NetworkRegistry; @@ -76,12 +77,14 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler providersList : ModuleRegistrar.instance().getNBTEntityProviders(entity).values()){ + for (IWailaEntityProvider provider : providersList){ + try{ + tag = provider.getNBTData(player, entity, tag, world); + } catch (AbstractMethodError ame){ + tag = AccessHelper.getNBTData(provider, entity, tag); + } + } } } else { diff --git a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java index c171f2d..155ad63 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.overlay; +import java.util.List; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -46,15 +48,17 @@ public class DecoratorRenderer { GL11.glDepthMask(false); if (ModuleRegistrar.instance().hasBlockDecorator(block)){ - for (IWailaBlockDecorator decorator : ModuleRegistrar.instance().getBlockDecorators(block)) - try{ - GL11.glPushMatrix(); - decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance()); - GL11.glPopMatrix(); - } catch (Throwable e){ - GL11.glPopMatrix(); - WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null); - } + for (List decoratorsList : ModuleRegistrar.instance().getBlockDecorators(block).values()){ + for (IWailaBlockDecorator decorator : decoratorsList) + try{ + GL11.glPushMatrix(); + decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance()); + GL11.glPopMatrix(); + } catch (Throwable e){ + GL11.glPopMatrix(); + WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null); + } + } } GL11.glEnable(GL11.GL_TEXTURE_2D); diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java index dcffac4..5a5efd4 100644 --- a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -3,8 +3,10 @@ package mcp.mobius.waila.overlay; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.List; import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; @@ -115,8 +117,13 @@ public class RayTracing { if (this.target == null) return null; - if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit)) - ents.add(ModuleRegistrar.instance().getOverrideEntityProviders(this.target.entityHit).get(0).getWailaOverride(DataAccessorCommon.instance, ConfigHandler.instance())); + if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit)){ + for (List listProviders : ModuleRegistrar.instance().getOverrideEntityProviders(this.target.entityHit).values()){ + for (IWailaEntityProvider provider : listProviders){ + ents.add(provider.getWailaOverride(DataAccessorCommon.instance, ConfigHandler.instance())); + } + } + } if(ents.size() > 0) return ents.get(0); @@ -144,29 +151,34 @@ public class RayTracing { if (mouseoverBlock == null) return items; if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock)){ - for(IWailaDataProvider provider : ModuleRegistrar.instance().getStackProviders(mouseoverBlock)){ - ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); - if (providerStack != null){ - - if (providerStack.getItem() == null) - return new ArrayList(); - - items.add(providerStack); - } + for (List providersList : ModuleRegistrar.instance().getStackProviders(mouseoverBlock).values()){ + for(IWailaDataProvider provider : providersList){ + ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); + if (providerStack != null){ + + if (providerStack.getItem() == null) + return new ArrayList(); + + items.add(providerStack); + } + } } } if (tileEntity != null && ModuleRegistrar.instance().hasStackProviders(tileEntity)){ - for(IWailaDataProvider provider : ModuleRegistrar.instance().getStackProviders(tileEntity)){ - ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); - if (providerStack != null){ - - if (providerStack.getItem() == null) - return new ArrayList(); - - items.add(providerStack); - } - } + for (List providersList : ModuleRegistrar.instance().getStackProviders(tileEntity).values()){ + + for(IWailaDataProvider provider : providersList){ + ItemStack providerStack = provider.getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); + if (providerStack != null){ + + if (providerStack.getItem() == null) + return new ArrayList(); + + items.add(providerStack); + } + } + } } if(items.size() > 0) diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java index fc2417c..deeb90a 100644 --- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -4,6 +4,7 @@ import java.util.List; import org.lwjgl.input.Keyboard; +import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.MetaDataProvider; @@ -75,10 +76,10 @@ public class WailaTickHandler{ ItemStack targetStack = RayTracing.instance().getTargetStack(); // Here we get either the proper stack or the override if (targetStack != null){ - this.currenttip.clear(); - this.currenttipHead.clear(); - this.currenttipBody.clear(); - this.currenttipTail.clear(); + this.currenttip = new TipList(); + this.currenttipHead = new TipList(); + this.currenttipBody = new TipList(); + this.currenttipTail = new TipList(); //this.identifiedHighlight = handler.identifyHighlight(world, player, target); @@ -105,10 +106,10 @@ public class WailaTickHandler{ Entity targetEnt = RayTracing.instance().getTargetEntity(); // This need to be replaced by the override check. if (targetEnt != null){ - this.currenttip.clear(); - this.currenttipHead.clear(); - this.currenttipBody.clear(); - this.currenttipTail.clear(); + this.currenttip = new TipList(); + this.currenttipHead = new TipList(); + this.currenttipBody = new TipList(); + this.currenttipTail = new TipList(); this.currenttipHead = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipHead, Layout.HEADER); this.currenttipBody = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipBody, Layout.BODY);