Err too much.

This commit is contained in:
AlgorithmX2
2014-01-20 10:41:37 -06:00
parent 5652ec30ec
commit 834e9c04c5
159 changed files with 7953 additions and 1541 deletions
+1 -2
View File
@@ -5,7 +5,6 @@ import java.util.List;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import appeng.api.storage.data.IAETagCompound;
import appeng.util.Platform;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -23,7 +22,7 @@ public class AEItemDef
public int dspDamage;
public int maxDamage;
public IAETagCompound tagCompound;
public AESharedNBT tagCompound;
@SideOnly(Side.CLIENT)
public String displayName;
+3 -3
View File
@@ -78,7 +78,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
NBTTagCompound tagCompound = is.getTagCompound();
if ( tagCompound != null )
def.tagCompound = (IAETagCompound) AESharedNBT.getSharedTagCompound( tagCompound, is );
def.tagCompound = (AESharedNBT) AESharedNBT.getSharedTagCompound( tagCompound, is );
stackSize = is.stackSize;
setCraftable( false );
@@ -241,8 +241,8 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
int dv = def.damageValue - b.def.damageValue;
int dspv = def.dspDamage - b.def.dspDamage;
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;
return id == 0 ? (dv == 0 ? (dspv == 0 ? ((def.tagCompound == null ? 0 : def.tagCompound.getHash()) - (b.def.tagCompound == null ? 0
: b.def.tagCompound.getHash())) : dspv) : dv) : id;
}
@SideOnly(Side.CLIENT)
+5
View File
@@ -22,6 +22,11 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound
public SharedSearchObject sso;
private IItemComparison comp;
public int getHash()
{
return hash;
}
@Override
public IItemComparison getSpecialComparison()
{