tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

isFluid/isItem

Browse source
This commit is contained in:
AlgorithmX2 2014-01-05 02:45:29 -06:00
parent d6066fd9b9
commit ef4efd5ce0
3 changed files with 67 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
util/item/AEFluidStack.java
View file

@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagString;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import appeng.api.config.FuzzyMode;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAETagCompound;
import appeng.util.Platform;
@ -316,4 +317,22 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
return false;
}
@Override
public boolean isItem()
{
return false;
}
@Override
public boolean isFluid()
{
return true;
}
@Override
public StorageChannel getChannel()
{
return StorageChannel.FLUIDS;
}
}

48
util/item/AEItemStack.java
View file

@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagLong;
import net.minecraft.nbt.NBTTagShort;
import appeng.api.config.FuzzyMode;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAETagCompound;
import appeng.util.Platform;
@ -108,7 +109,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
{
if ( ia instanceof AEItemStack )
{
return ((AEItemStack) ia).def == def && def.tagCompound == ((AEItemStack) ia).def.tagCompound;
return ((AEItemStack) ia).def.equals( def ) && def.tagCompound == ((AEItemStack) ia).def.tagCompound;
}
else if ( ia instanceof ItemStack )
{
@ -242,6 +243,9 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
int dv = def.damageValue - b.def.damageValue;
int dspv = def.dspDamage - b.def.dspDamage;
int dif = id == 0 ? (dv == 0 ? (dspv == 0 ? ((def.tagCompound == null ? 0 : def.tagCompound.hashCode()) - (b.def.tagCompound == null ? 0
: b.def.tagCompound.hashCode())) : dspv) : dv) : id;
return id == 0 ? (dv == 0 ? (dspv == 0 ? ((def.tagCompound == null ? 0 : def.tagCompound.hashCode()) - (b.def.tagCompound == null ? 0
: b.def.tagCompound.hashCode())) : dspv) : dv) : id;
}
@ -474,8 +478,18 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
AEItemStack bottom = new AEItemStack( this );
bottom.def = bottom.def.copy();
if ( fuzzy == FuzzyMode.IGNORE_ALL )
{
bottom.def.dspDamage = 0;
}
else
{
int low = fuzzy.calculateBreakPoint( def.maxDamage );
bottom.def.dspDamage = low < def.dspDamage ? low : 0;
}
if ( bottom.def.item.isDamageable() )
bottom.def.damageValue = bottom.def.dspDamage;
return bottom;
}
@ -485,8 +499,18 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
AEItemStack top = new AEItemStack( this );
top.def = top.def.copy();
int high = fuzzy.calculateBreakPoint( def.maxDamage );
top.def.dspDamage = high > def.dspDamage ? high : def.maxDamage;
if ( fuzzy == FuzzyMode.IGNORE_ALL )
{
top.def.dspDamage = def.maxDamage + 1;
}
else
{
int high = fuzzy.calculateBreakPoint( def.maxDamage ) + 1;
top.def.dspDamage = high > def.dspDamage ? high : def.maxDamage + 1;
}
if ( top.def.item.isDamageable() )
top.def.damageValue = top.def.dspDamage;
return top;
}
@ -514,4 +538,22 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
return def.isItem( otherStack );
}
@Override
public boolean isItem()
{
return true;
}
@Override
public boolean isFluid()
{
return false;
}
@Override
public StorageChannel getChannel()
{
return StorageChannel.ITEMS;
}
}

2
util/item/OreHelper.java
View file

@ -6,7 +6,7 @@ import appeng.api.storage.data.IAEItemStack;
public class OreHelper
{
public static OreHelper instance;
public static OreHelper instance = new OreHelper();
public boolean isOre(IAEItemStack is)
{