Fuzzy now supports the ore dictionary again.

2014-02-12 23:24:07 -06:00
parent 0a3474291c
commit 7f773f0d2b
6 changed files with 217 additions and 16 deletions
@@ -1,6 +1,11 @@
 package appeng.util.item;

+import java.util.Collection;
+import java.util.HashMap;
+
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
 import appeng.api.storage.data.IAEItemStack;

 public class OreHelper
@@ -8,22 +13,144 @@ public class OreHelper

 	public static OreHelper instance = new OreHelper();

-	public boolean isOre(IAEItemStack is)
+	class ItemRef
 	{
-		// TODO Auto-generated method stub
-		return false;
+
+		ItemRef(ItemStack stack) {
+			ref = stack.getItem();
+
+			if ( stack.getItem().isDamageable() )
+				damage = 0; // IGNORED
+			else
+				damage = stack.getItemDamage(); // might be important...
+
+			hash = ref.hashCode() ^ damage;
+		}
+
+		Item ref;
+		int damage;
+		int hash;
+
+		@Override
+		public boolean equals(Object o)
+		{
+			ItemRef obj = (ItemRef) o;
+			return damage == obj.damage && ref == obj.ref;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return hash;
+		}
+
+	};
+
+	class OreResult
+	{
+
+		public OreRefrence oreValue = null;
+
+	};
+
+	HashMap<ItemRef, OreResult> refrences = new HashMap();
+
+	public OreRefrence isOre(ItemStack ItemStack)
+	{
+		ItemRef ir = new ItemRef( ItemStack );
+		OreResult or = refrences.get( ir );
+
+		if ( or == null )
+		{
+			or = new OreResult();
+			refrences.put( ir, or );
+
+			OreRefrence ref = new OreRefrence();
+			Collection<Integer> ores = ref.getOres();
+			Collection<ItemStack> set = ref.getEquivilients();
+			Collection<IAEItemStack> aeset = ref.getAEEquivilients();
+
+			for (String ore : OreDictionary.getOreNames())
+			{
+				boolean add = false;
+
+				for (ItemStack oreItem : OreDictionary.getOres( ore ))
+				{
+					if ( OreDictionary.itemMatches( oreItem, ItemStack, false ) )
+					{
+						add = true;
+						set.add( oreItem.copy() );
+					}
+				}
+
+				if ( add )
+					ores.add( OreDictionary.getOreID( ore ) );
+			}
+
+			if ( !set.isEmpty() )
+			{
+				or.oreValue = ref;
+
+				// SUMMON AE STACKS!
+				for (ItemStack is : set)
+					aeset.add( AEItemStack.create( is ) );
+			}
+		}
+
+		return or.oreValue;
 	}

 	public boolean sameOre(AEItemStack aeItemStack, IAEItemStack is)
 	{
-		// TODO Auto-generated method stub
+		OreRefrence a = aeItemStack.def.isOre;
+		OreRefrence b = ((AEItemStack) aeItemStack).def.isOre;
+
+		if ( a == b )
+			return true;
+
+		if ( a == null || b == null )
+			return false;
+
+		Collection<Integer> bOres = b.getOres();
+		for (Integer ore : a.ores)
+		{
+			if ( bOres.contains( ore ) )
+				return true;
+		}
+
 		return false;
 	}

-	public void sameOre(AEItemStack aeItemStack, ItemStack o)
+	public boolean sameOre(OreRefrence a, OreRefrence b)
 	{
-		// TODO Auto-generated method stub
+		if ( a == b )
+			return true;

+		if ( a == null || b == null )
+			return false;
+
+		Collection<Integer> bOres = b.getOres();
+		for (Integer ore : a.ores)
+		{
+			if ( bOres.contains( ore ) )
+				return true;
+		}
+
+		return false;
 	}

+	public boolean sameOre(AEItemStack aeItemStack, ItemStack o)
+	{
+		OreRefrence a = aeItemStack.def.isOre;
+		if ( a == null )
+			return false;
+
+		for (ItemStack oreItem : a.getEquivilients())
+		{
+			if ( OreDictionary.itemMatches( oreItem, o, false ) )
+				return true;
+		}
+
+		return false;
+	}
 }