From dfd0b003d935c18938283f6c04be3d7b613c8902 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Fri, 15 May 2015 21:40:32 -1000 Subject: [PATCH] Display aspect icons for empty, labeled jars. --- .../storagedrawers/integration/Thaumcraft.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java b/src/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java index 7e014d3..9b2918a 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java @@ -77,7 +77,12 @@ public class Thaumcraft extends IntegrationModule NBTTagCompound tag = itemStack.getTagCompound(); if (tag == null) return; - + + if (tag.hasKey("AspectFilter")) { + setDrawerAspectName(drawer, tag.getString("AspectFilter")); + return; + } + NBTTagList tagAspects = tag.getTagList("Aspects", Constants.NBT.TAG_COMPOUND); if (tagAspects == null || tagAspects.tagCount() == 0) return; @@ -86,10 +91,13 @@ public class Thaumcraft extends IntegrationModule if (tagAspect == null || !tagAspect.hasKey("key")) return; - String key = tagAspect.getString("key"); + setDrawerAspectName(drawer, tagAspect.getString("key")); + } + + private void setDrawerAspectName (IDrawer drawer, String aspectName) { AspectList allAspects = ThaumcraftApiHelper.getAllAspects(1); for (Aspect a : allAspects.aspects.keySet()) { - if (a.getTag().equals(key)) { + if (a.getTag().equals(aspectName)) { drawer.setExtendedData("aspect", a); return; }