Fix keepOneEntry

WanionCane · Jul 18, 2016 · b2e68cf · b2e68cf
1 parent eeec36d
commit b2e68cf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/wanion/unidict/common/Reference.java b/src/main/java/wanion/unidict/common/Reference.java
@@ -14,7 +14,7 @@ public final class Reference
 {
     public static final String MOD_ID = "UniDict";
     public static final String MOD_NAME = MOD_ID;
-    public static final String MOD_VERSION = "1.10.2-1.3";
+    public static final String MOD_VERSION = "1.10.2-1.3b";
     public static final char SLASH = separatorChar;
     public static final String MC_VERSION = "[1.10.2]";
 

diff --git a/src/main/java/wanion/unidict/resource/ResourceHandler.java b/src/main/java/wanion/unidict/resource/ResourceHandler.java
@@ -132,7 +132,8 @@ void populateIndividualStackAttributes()
         resources.forEach(resource -> resource.getChildrenMap().forEachValue(container -> {
             containerMap.put(container.name, container);
             UniAttributes uniAttributes = new UniAttributes(resource, container);
-            MetaItem.populateMap(container.getEntries(), individualStackAttributes, uniAttributes);
+            for (final int hash : container.getHashes())
+                individualStackAttributes.put(hash, uniAttributes);
             return true;
         }));
     }

diff --git a/src/main/java/wanion/unidict/resource/UniResourceContainer.java b/src/main/java/wanion/unidict/resource/UniResourceContainer.java
@@ -11,6 +11,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import wanion.unidict.Config;
+import wanion.unidict.MetaItem;
 import wanion.unidict.UniJEIPlugin;
 import wanion.unidict.UniOreDictionary;
 import wanion.unidict.common.SpecificKindItemStackComparator;
@@ -31,6 +32,7 @@ public final class UniResourceContainer
     private boolean updated = false;
     private Item mainEntryItem;
     private int mainEntryMeta;
+    private int[] hashes;
 
     public UniResourceContainer(String name, long kind)
     {
@@ -66,6 +68,7 @@ boolean updateEntries()
         ItemStack mainEntry = entries.get(0);
         mainEntryMeta = (mainEntryItem = mainEntry.getItem()).getDamage(mainEntry);
         if (sort) {
+            hashes = MetaItem.getArray(entries);
             if (autoHideInJEI)
                 removeBadEntriesFromNEI();
             if (keepOneEntry)
@@ -74,6 +77,11 @@ boolean updateEntries()
         return updated = true;
     }
 
+    int[] getHashes()
+    {
+        return hashes;
+    }
+
     private void keepOneEntry()
     {
         if (entries.size() == 1)

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "UniDict",
   "name": "UniDict",
   "description": "a mod about unifying all the things.",
-  "version": "1.3",
+  "version": "1.3b",
   "mcversion": "${mcversion}",
   "url": "http://minecraft.curseforge.com/projects/unidict",
   "updateUrl": "",