fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typo OreRefrence

Browse Source
This commit is contained in:
thatsIch
2014-09-20 23:35:55 +02:00
parent 63331d8d49
commit cc717a2491
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/Platform.java
+3 -3
View File
@@ -13,6 +13,7 @@ import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import appeng.util.item.OreReference;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
@@ -107,7 +108,6 @@ import appeng.me.helpers.AENetworkProxy;
import appeng.util.item.AEItemStack; import appeng.util.item.AEItemStack;
import appeng.util.item.AESharedNBT; import appeng.util.item.AESharedNBT;
import appeng.util.item.OreHelper; import appeng.util.item.OreHelper;
import appeng.util.item.OreRefrence;
import appeng.util.prioitylist.IPartitionList; import appeng.util.prioitylist.IPartitionList;
import buildcraft.api.tools.IToolWrench; import buildcraft.api.tools.IToolWrench;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
@@ -1185,8 +1185,8 @@ public class Platform
} }
} }
OreRefrence aOR = OreHelper.instance.isOre( a ); OreReference aOR = OreHelper.instance.isOre( a );
OreRefrence bOR = OreHelper.instance.isOre( b ); OreReference bOR = OreHelper.instance.isOre( b );
if ( OreHelper.instance.sameOre( aOR, bOR ) ) if ( OreHelper.instance.sameOre( aOR, bOR ) )
return true; return true;
util/item/AEItemDef.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class AEItemDef
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public UniqueIdentifier uniqueID; public UniqueIdentifier uniqueID;
public OreRefrence isOre; public OreReference isOre;
static AESharedNBT lowTag = new AESharedNBT( Integer.MIN_VALUE ); static AESharedNBT lowTag = new AESharedNBT( Integer.MIN_VALUE );
static AESharedNBT highTag = new AESharedNBT( Integer.MAX_VALUE ); static AESharedNBT highTag = new AESharedNBT( Integer.MAX_VALUE );
util/item/ItemList.java
+1 -1
View File
@@ -206,7 +206,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
AEItemStack ais = (AEItemStack) filter; AEItemStack ais = (AEItemStack) filter;
if ( ais.isOre() ) if ( ais.isOre() )
{ {
OreRefrence or = ais.def.isOre; OreReference or = ais.def.isOre;
if ( or.getAEEquivilients().size() == 1 ) if ( or.getAEEquivilients().size() == 1 )
{ {
IAEItemStack is = or.getAEEquivilients().get( 0 ); IAEItemStack is = or.getAEEquivilients().get( 0 );
util/item/OreHelper.java
+7 -7
View File
@@ -49,13 +49,13 @@ public class OreHelper
class OreResult class OreResult
{ {
public OreRefrence oreValue = null; public OreReference oreValue = null;
}; };
HashMap<ItemRef, OreResult> refrences = new HashMap(); HashMap<ItemRef, OreResult> refrences = new HashMap();
public OreRefrence isOre(ItemStack ItemStack) public OreReference isOre(ItemStack ItemStack)
{ {
ItemRef ir = new ItemRef( ItemStack ); ItemRef ir = new ItemRef( ItemStack );
OreResult or = refrences.get( ir ); OreResult or = refrences.get( ir );
@@ -65,7 +65,7 @@ public class OreHelper
or = new OreResult(); or = new OreResult();
refrences.put( ir, or ); refrences.put( ir, or );
OreRefrence ref = new OreRefrence(); OreReference ref = new OreReference();
Collection<Integer> ores = ref.getOres(); Collection<Integer> ores = ref.getOres();
Collection<ItemStack> set = ref.getEquivilients(); Collection<ItemStack> set = ref.getEquivilients();
@@ -100,8 +100,8 @@ public class OreHelper
public boolean sameOre(AEItemStack aeItemStack, IAEItemStack is) public boolean sameOre(AEItemStack aeItemStack, IAEItemStack is)
{ {
OreRefrence a = aeItemStack.def.isOre; OreReference a = aeItemStack.def.isOre;
OreRefrence b = ((AEItemStack) aeItemStack).def.isOre; OreReference b = ((AEItemStack) aeItemStack).def.isOre;
if ( a == b ) if ( a == b )
return true; return true;
@@ -119,7 +119,7 @@ public class OreHelper
return false; return false;
} }
public boolean sameOre(OreRefrence a, OreRefrence b) public boolean sameOre(OreReference a, OreReference b)
{ {
if ( a == null || b == null ) if ( a == null || b == null )
return false; return false;
@@ -139,7 +139,7 @@ public class OreHelper
public boolean sameOre(AEItemStack aeItemStack, ItemStack o) public boolean sameOre(AEItemStack aeItemStack, ItemStack o)
{ {
OreRefrence a = aeItemStack.def.isOre; OreReference a = aeItemStack.def.isOre;
if ( a == null ) if ( a == null )
return false; return false;
util/item/OreRefrence.java → util/item/OreReference.java
+1 -1
View File
@@ -9,7 +9,7 @@ import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
public class OreRefrence public class OreReference
{ {
private LinkedList<ItemStack> otherOptions = new LinkedList(); private LinkedList<ItemStack> otherOptions = new LinkedList();