diff --git a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java index c73822b..68768f8 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java @@ -5,7 +5,6 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public interface IWailaEntityProvider { diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java index 19e01fa..be44b7b 100644 --- a/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java @@ -1,7 +1,6 @@ package mcp.mobius.waila.api; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java index 29bc326..37e2d18 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java @@ -4,11 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagInt; -import net.minecraft.nbt.NBTTagShort; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java index a2a69cd..878ff02 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java @@ -3,11 +3,7 @@ package mcp.mobius.waila.api.impl; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagInt; -import net.minecraft.nbt.NBTTagShort; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java index 2890378..d017282 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java @@ -1,8 +1,6 @@ package mcp.mobius.waila.api.impl; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/mcp/mobius/waila/api/impl/TipList.java b/src/main/java/mcp/mobius/waila/api/impl/TipList.java index e84fc0e..5d2f7fb 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/TipList.java +++ b/src/main/java/mcp/mobius/waila/api/impl/TipList.java @@ -1,7 +1,158 @@ package mcp.mobius.waila.api.impl; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; -public class TipList extends ArrayList { +public class TipList extends ArrayList { + Map> tags = new HashMap(); + + public Set getTags(E e){ + Set ret = tags.get(e); + if (ret == null && this.contains(e)){ + tags.put(e, new HashSet()); + ret = tags.get(e); + } + return ret; + } + + public Set getTags(int index){ + return this.getTags(this.get(index)); + } + + public void addTag(E e, String tag){ + if (this.contains(e) && !tags.containsKey(e)) + tags.put(e, new HashSet()); + + tags.get(e).add(tag); + } + + public void addTag(int index, String tag){ + this.addTag(this.get(index), tag); + } + + public void removeTag(E e, String tag){ + if (this.contains(e) && !tags.containsKey(e)) + tags.put(e, new HashSet()); + tags.get(e).remove(tag); + } + + public void removeTag(int index, String tag){ + this.removeTag(this.get(index), tag); + } + + public Set getEntries(String tag){ + Set ret = new HashSet(); + for (Entry> s : tags.entrySet()){ + if (s.getValue().contains(tag)) + ret.add(s.getKey()); + } + return ret; + } + + public String getTagsAsString(E e){ + String ret = ""; + for (String s : tags.get(e)) + ret += s + ","; + + if (ret.length() > 0) + ret = ret.substring(0, ret.length()-1); + + return ret; + } + + /* + public boolean add(E e){ + this.setInitialTag(e); + return super.add(e); + } + + public void add(int index, E element){ + this.setInitialTag(element); + super.add(index, element); + } + + public boolean addAll(Collection c){ + if (c instanceof TipList){ + for (E e : c) + tags.put(e, ((TipList)c).getTags(e)); + } else { + for (E e : c) + this.setInitialTag(e); + } + + return super.addAll(c); + } + + public boolean addAll(int index, Collection c){ + if (c instanceof TipList){ + for (E e : c) + tags.put(e, ((TipList)c).getTags(e)); + } else { + for (E e : c) + this.setInitialTag(e); + } + + return super.addAll(index, c); + } + + public void clear(){ + tags.clear(); + super.clear(); + } + + public Object clone(){ + return super.clone(); + } + + public E remove(int index){ + tags.remove(this.get(index)); + return super.remove(index); + } + + public boolean remove(Object o){ + tags.remove(o); + return super.remove(o); + } + + public boolean removeAll(Collection c){ + for (Object o : c) + tags.remove(o); + + return super.removeAll(c); + } + + protected void removeRange(int fromIndex, int toIndex){ + for (int i = fromIndex; i < toIndex; i++) + tags.remove(this.get(i)); + + super.removeRange(fromIndex, toIndex); + } + + public boolean retainAll(Collection c){ + for (E e : tags.keySet()) + if (!c.contains(e)) + tags.remove(e); + + return super.retainAll(c); + } + + public E set(int index, E element){ + tags.remove(this.get(index)); + this.setInitialTag(element); + return super.set(index, element); + } + + private void setInitialTag(E key){ + tags.put(key, new ArrayList()); + } + + private String getCallerClassName(int callStackDepth) { + return sun.reflect.Reflection.getCallerClass(callStackDepth).getName(); + } + */ } diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 51731c3..99c49d1 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -80,7 +80,7 @@ public class HUDHandlerBlocks implements IWailaDataProvider { public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { String modName = ModIdentification.nameFromStack(itemStack); if (modName != null && !modName.equals("")){ - currenttip.add(BLUE + ITALIC + modName ); + currenttip.add(BLUE + ITALIC + modName); } return currenttip;