diff --git a/build.gradle b/build.gradle index eb94cff..2e13237 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.7_dev1_1.7.10" +version = "1.5.7_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/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java index 5f075b1..c065ced 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -11,8 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.impl.TipList; import mcp.mobius.waila.utils.WailaExceptionHandler; +import mcp.mobius.waila.api.ITaggedList; public class HUDHandlerIEnergyHandler implements IWailaDataProvider { @@ -35,8 +35,8 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider { int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy"); int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage"); try { - if ((maxEnergy != 0) && (((TipList)currenttip).getEntries("RFEnergyStorage").size() == 0)){ - ((TipList)currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage"); + if ((maxEnergy != 0) && (((ITaggedList)currenttip).getEntries("RFEnergyStorage").size() == 0)){ + ((ITaggedList)currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage"); } } catch (Exception e){ currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); diff --git a/src/main/java/mcp/mobius/waila/api/ITaggedList.java b/src/main/java/mcp/mobius/waila/api/ITaggedList.java new file mode 100644 index 0000000..7413c28 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/ITaggedList.java @@ -0,0 +1,21 @@ +package mcp.mobius.waila.api; + +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.Map.Entry; + +public interface ITaggedList extends List { + public boolean add(E e, T tag); + public boolean add(E e, Collection taglst); + public Set getTags(E e); + public Set getTags(int index); + public void addTag(E e, T tag); + public void addTag(int index, T tag); + public void removeTag(E e, T tag); + public void removeTag(int index, T tag); + public Set getEntries(T tag); + public void removeEntries(T tag); + public String getTagsAsString(E e); +} 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 7d861d8..ea3a06a 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/TipList.java +++ b/src/main/java/mcp/mobius/waila/api/impl/TipList.java @@ -9,77 +9,90 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -public class TipList extends ArrayList { - Map> tags = new HashMap(); +import mcp.mobius.waila.api.ITaggedList; + +public class TipList extends ArrayList implements ITaggedList { + Map> tags = new HashMap(); - public boolean add(E e, String tag){ + @Override + public boolean add(E e, T tag){ if (!tags.containsKey(e)) - tags.put(e, new HashSet()); + tags.put(e, new HashSet()); tags.get(e).add(tag); return super.add(e); } - - public boolean add(E e, List taglst){ + + @Override + public boolean add(E e, Collection taglst){ if (!tags.containsKey(e)) - tags.put(e, new HashSet()); + tags.put(e, new HashSet()); tags.get(e).addAll(taglst); return super.add(e); } - public Set getTags(E e){ - Set ret = tags.get(e); + @Override + public Set getTags(E e){ + Set ret = tags.get(e); if (ret == null && this.contains(e)){ - tags.put(e, new HashSet()); + tags.put(e, new HashSet()); ret = tags.get(e); } return ret; } - public Set getTags(int index){ + @Override + public Set getTags(int index){ return this.getTags(this.get(index)); } - public void addTag(E e, String tag){ + @Override + public void addTag(E e, T tag){ if (this.contains(e) && !tags.containsKey(e)) - tags.put(e, new HashSet()); + tags.put(e, new HashSet()); tags.get(e).add(tag); } - public void addTag(int index, String tag){ + @Override + public void addTag(int index, T tag){ this.addTag(this.get(index), tag); } - public void removeTag(E e, String tag){ + @Override + public void removeTag(E e, T tag){ if (this.contains(e) && !tags.containsKey(e)) - tags.put(e, new HashSet()); + tags.put(e, new HashSet()); tags.get(e).remove(tag); } - public void removeTag(int index, String tag){ + @Override + public void removeTag(int index, T tag){ this.removeTag(this.get(index), tag); } - public Set getEntries(String tag){ + @Override + public Set getEntries(T tag){ Set ret = new HashSet(); - for (Entry> s : tags.entrySet()){ + for (Entry> s : tags.entrySet()){ if (s.getValue().contains(tag)) ret.add(s.getKey()); } return ret; } - public void removeEntries(String tag){ + @Override + public void removeEntries(T tag){ for (E e : this.getEntries(tag)) this.remove(e); } + @Override public String getTagsAsString(E e){ String ret = ""; - for (String s : tags.get(e)) - ret += s + ","; + for (T s : tags.get(e)) + ret += s.toString() + ","; if (ret.length() > 0) ret = ret.substring(0, ret.length()-1); @@ -87,26 +100,31 @@ public class TipList extends ArrayList { return ret; } + @Override public void clear(){ tags.clear(); super.clear(); } + @Override public E set(int index, E element){ tags.remove(this.get(index)); return super.set(index, element); } + @Override public E remove(int index){ tags.remove(this.get(index)); return super.remove(index); } + @Override public boolean remove(Object o){ tags.remove(o); return super.remove(o); } + @Override public boolean removeAll(Collection c){ for (Object o : c) tags.remove(o); @@ -114,6 +132,7 @@ public class TipList extends ArrayList { return super.removeAll(c); } + @Override protected void removeRange(int fromIndex, int toIndex){ for (int i = fromIndex; i < toIndex; i++) tags.remove(this.get(i)); @@ -121,6 +140,7 @@ public class TipList extends ArrayList { super.removeRange(fromIndex, toIndex); } + @Override public boolean retainAll(Collection c){ for (E e : tags.keySet()) if (!c.contains(e)) diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java index 7905650..58a7b2d 100644 --- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -32,10 +32,10 @@ public class WailaTickHandler{ private int ticks = 0; public ItemStack identifiedHighlight = new ItemStack(Blocks.dirt); - private List currenttip = new TipList(); - private List currenttipHead = new TipList(); - private List currenttipBody = new TipList(); - private List currenttipTail = new TipList(); + private List currenttip = new TipList(); + private List currenttipHead = new TipList(); + private List currenttipBody = new TipList(); + private List currenttipTail = new TipList(); public Tooltip tooltip = null; public MetaDataProvider handler = new MetaDataProvider(); private Minecraft mc = Minecraft.getMinecraft();