From ccefe03ca55fae033111ba60d592f59a6938eadf Mon Sep 17 00:00:00 2001
From: Justin Aquadro <jaquadro@gmail.com>
Date: Wed, 24 Jun 2015 00:45:40 -0400
Subject: [PATCH] Blacklist ore dictionary keys if a given mod registers more
 than one item to it.

---
 .../config/OreDictRegistry.java               | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java
index 3bc0a33..b603f69 100644
--- a/src/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java
+++ b/src/com/jaquadro/minecraft/storagedrawers/config/OreDictRegistry.java
@@ -1,5 +1,7 @@
 package com.jaquadro.minecraft.storagedrawers.config;
 
+import cpw.mods.fml.common.registry.GameData;
+import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -132,6 +134,15 @@ public class OreDictRegistry
         return true;
     }
 
+    private String getModId (Item item) {
+        String itemId = GameData.getItemRegistry().getNameForObject(item);
+        if (itemId == null)
+            return null;
+
+        GameRegistry.UniqueIdentifier uid = new GameRegistry.UniqueIdentifier(itemId);
+        return uid.modId;
+    }
+
     private boolean isValidForEquiv (String oreName) {
         List<ItemStack> oreList = OreDictionary.getOres(oreName);
         if (oreList.size() == 0)
@@ -139,17 +150,20 @@ public class OreDictRegistry
 
         // Fail entries that have any wildcard items registered to them.
 
-        HashSet<Item> itemIds = new HashSet<Item>();
+        HashSet<String> modIds = new HashSet<String>();
         for (int i = 0, n = oreList.size(); i < n; i++) {
             if (oreList.get(i).getItemDamage() == OreDictionary.WILDCARD_VALUE)
                 return false;
-            itemIds.add(oreList.get(i).getItem());
+
+            String modId = getModId(oreList.get(i).getItem());
+            if (modId != null)
+                modIds.add(modId);
         }
 
         // Fail entries that have multiple instances of an item registered, differing by metadata or other
         // criteria.
 
-        if (itemIds.size() < oreList.size())
+        if (modIds.size() < oreList.size())
             return false;
 
         // Fail entries where the keys in at least one stack are not the super-set of all other stacks.