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

Fuzzy now supports the ore dictionary again.

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-12 23:24:07 -06:00
parent 0a3474291c
commit 7f773f0d2b
6 changed files with 217 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/item/AEItemStack.java
+18 -4
View File
@@ -82,7 +82,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
setCountRequestable( 0 );
def.reHash();
def.isOre = OreHelper.instance.isOre( this );
def.isOre = OreHelper.instance.isOre( is );
}
public static AEItemStack create(Object a)
@@ -460,11 +460,18 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
return false;
}
public IAEItemStack getLow(FuzzyMode fuzzy)
public IAEItemStack getLow(FuzzyMode fuzzy, boolean ignoreMeta)
{
AEItemStack bottom = new AEItemStack( this );
AEItemDef newDef = bottom.def = bottom.def.copy();
if ( ignoreMeta )
{
newDef.dspDamage = newDef.damageValue = 0;
newDef.reHash();
return bottom;
}
if ( fuzzy == FuzzyMode.IGNORE_ALL )
{
newDef.dspDamage = 0;
@@ -482,11 +489,18 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
return bottom;
}
public IAEItemStack getHigh(FuzzyMode fuzzy)
public IAEItemStack getHigh(FuzzyMode fuzzy, boolean ignoreMeta)
{
AEItemStack top = new AEItemStack( this );
AEItemDef newDef = top.def = top.def.copy();
if ( ignoreMeta )
{
newDef.dspDamage = newDef.damageValue = Integer.MAX_VALUE;
newDef.reHash();
return top;
}
if ( fuzzy == FuzzyMode.IGNORE_ALL )
{
newDef.dspDamage = def.maxDamage + 1;
@@ -548,6 +562,6 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
public boolean isOre()
{
return def.isOre;
return def.isOre != null;
}
}