diff --git a/util/Platform.java b/util/Platform.java index e34fffab0..160330763 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -13,6 +13,7 @@ import java.util.Random; import java.util.Set; import java.util.WeakHashMap; +import appeng.util.item.OreReference; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; @@ -107,7 +108,6 @@ import appeng.me.helpers.AENetworkProxy; import appeng.util.item.AEItemStack; import appeng.util.item.AESharedNBT; import appeng.util.item.OreHelper; -import appeng.util.item.OreRefrence; import appeng.util.prioitylist.IPartitionList; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.FMLCommonHandler; @@ -1185,8 +1185,8 @@ public class Platform } } - OreRefrence aOR = OreHelper.instance.isOre( a ); - OreRefrence bOR = OreHelper.instance.isOre( b ); + OreReference aOR = OreHelper.instance.isOre( a ); + OreReference bOR = OreHelper.instance.isOre( b ); if ( OreHelper.instance.sameOre( aOR, bOR ) ) return true; diff --git a/util/item/AEItemDef.java b/util/item/AEItemDef.java index 4b5a308af..d87a98b6a 100644 --- a/util/item/AEItemDef.java +++ b/util/item/AEItemDef.java @@ -36,7 +36,7 @@ public class AEItemDef @SideOnly(Side.CLIENT) public UniqueIdentifier uniqueID; - public OreRefrence isOre; + public OreReference isOre; static AESharedNBT lowTag = new AESharedNBT( Integer.MIN_VALUE ); static AESharedNBT highTag = new AESharedNBT( Integer.MAX_VALUE ); diff --git a/util/item/ItemList.java b/util/item/ItemList.java index 023196129..18a93da26 100644 --- a/util/item/ItemList.java +++ b/util/item/ItemList.java @@ -206,7 +206,7 @@ public final class ItemList implements IItemList refrences = new HashMap(); - public OreRefrence isOre(ItemStack ItemStack) + public OreReference isOre(ItemStack ItemStack) { ItemRef ir = new ItemRef( ItemStack ); OreResult or = refrences.get( ir ); @@ -65,7 +65,7 @@ public class OreHelper or = new OreResult(); refrences.put( ir, or ); - OreRefrence ref = new OreRefrence(); + OreReference ref = new OreReference(); Collection ores = ref.getOres(); Collection set = ref.getEquivilients(); @@ -100,8 +100,8 @@ public class OreHelper public boolean sameOre(AEItemStack aeItemStack, IAEItemStack is) { - OreRefrence a = aeItemStack.def.isOre; - OreRefrence b = ((AEItemStack) aeItemStack).def.isOre; + OreReference a = aeItemStack.def.isOre; + OreReference b = ((AEItemStack) aeItemStack).def.isOre; if ( a == b ) return true; @@ -119,7 +119,7 @@ public class OreHelper return false; } - public boolean sameOre(OreRefrence a, OreRefrence b) + public boolean sameOre(OreReference a, OreReference b) { if ( a == null || b == null ) return false; @@ -139,7 +139,7 @@ public class OreHelper public boolean sameOre(AEItemStack aeItemStack, ItemStack o) { - OreRefrence a = aeItemStack.def.isOre; + OreReference a = aeItemStack.def.isOre; if ( a == null ) return false; diff --git a/util/item/OreRefrence.java b/util/item/OreReference.java similarity index 97% rename from util/item/OreRefrence.java rename to util/item/OreReference.java index 44ff451a7..d3f56290e 100644 --- a/util/item/OreRefrence.java +++ b/util/item/OreReference.java @@ -9,7 +9,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import appeng.api.storage.data.IAEItemStack; -public class OreRefrence +public class OreReference { private LinkedList otherOptions = new LinkedList();