From 6b61229d58bdee33535688317a021cb9434ae1fb Mon Sep 17 00:00:00 2001 From: Girafi Date: Wed, 12 Aug 2015 06:03:36 +0200 Subject: [PATCH] And the rest of it.. --- .../waila/api/impl/MetaDataProvider.java | 9 ------ .../waila/api/impl/ModuleRegistrar.java | 31 ++----------------- 2 files changed, 2 insertions(+), 38 deletions(-) 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 2828dca..c27fbb0 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -71,12 +71,6 @@ public class MetaDataProvider{ accessor.resetTimer(); HashSet keys = new HashSet(); - if (ModuleRegistrar.instance().hasSyncedNBTKeys(block)) - keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block)); - - if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity())) - keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity())); - if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block) || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity())) WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys)); @@ -176,9 +170,6 @@ public class MetaDataProvider{ if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){ accessor.resetTimer(); HashSet keys = new HashSet(); - - if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity())) - keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity())); if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity())) WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(accessor.getEntity(), keys)); 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 50c96e2..942abac 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -212,16 +212,7 @@ public class ModuleRegistrar implements IWailaRegistrar { if (providers.contains(dataProvider)) return; target.get(clazz).add(dataProvider); - } - - @Deprecated - @Override - public void registerSyncedNBTKey(String key, Class target){ - if (!this.syncedNBTKeys.containsKey(target)) - this.syncedNBTKeys.put(target, new HashSet()); - - this.syncedNBTKeys.get(target).add(key); - } + } @Override public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer){ @@ -319,16 +310,6 @@ public class ModuleRegistrar implements IWailaRegistrar { Map> returnList = new TreeMap>(); returnList.put(0, target.get(name)); return returnList; - } - - @Deprecated - public HashSet getSyncedNBTKeys(Object target){ - HashSet returnList = new HashSet(); - for (Class clazz : this.syncedNBTKeys.keySet()) - if (clazz.isInstance(target)) - returnList.addAll(this.syncedNBTKeys.get(clazz)); - - return returnList; } /* HAS METHODS */ @@ -406,15 +387,7 @@ public class ModuleRegistrar implements IWailaRegistrar { public boolean hasSummaryProvider(Class item){ return this.summaryProviders.containsKey(item); - } - - @Deprecated - public boolean hasSyncedNBTKeys(Object target){ - for (Class clazz : this.syncedNBTKeys.keySet()) - if (clazz.isInstance(target)) - return true; - return false; - } + } /* ----------------- */ /*