Updates Forge to 1.7.10-10.13.4.1448-1.7.10
the public field fluidID was removed and was replaced with the public getter
This commit is contained in:
parent
2ba4f312d4
commit
e5f59e0a00
|
@ -8,7 +8,7 @@ aebasename=appliedenergistics2
|
||||||
# Versions #
|
# Versions #
|
||||||
#########################################################
|
#########################################################
|
||||||
minecraft_version=1.7.10
|
minecraft_version=1.7.10
|
||||||
forge_version=10.13.2.1291
|
forge_version=10.13.4.1448-1.7.10
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Installable #
|
# Installable #
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* This file is part of Applied Energistics 2.
|
* This file is part of Applied Energistics 2.
|
||||||
* Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
|
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
|
||||||
*
|
*
|
||||||
* Applied Energistics 2 is free software: you can redistribute it and/or modify
|
* Applied Energistics 2 is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream;
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
|
@ -47,8 +46,8 @@ import appeng.util.Platform;
|
||||||
public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack>
|
public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack>
|
||||||
{
|
{
|
||||||
|
|
||||||
public int myHash;
|
private final int myHash;
|
||||||
Fluid fluid;
|
private final Fluid fluid;
|
||||||
private IAETagCompound tagCompound;
|
private IAETagCompound tagCompound;
|
||||||
|
|
||||||
private AEFluidStack( AEFluidStack is )
|
private AEFluidStack( AEFluidStack is )
|
||||||
|
@ -303,7 +302,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
|
||||||
{
|
{
|
||||||
FluidStack is = (FluidStack) ia;
|
FluidStack is = (FluidStack) ia;
|
||||||
|
|
||||||
if( is.fluidID == this.fluid.getID() )
|
if( is.getFluidID() == this.fluid.getID() )
|
||||||
{
|
{
|
||||||
NBTTagCompound ta = (NBTTagCompound) this.tagCompound;
|
NBTTagCompound ta = (NBTTagCompound) this.tagCompound;
|
||||||
NBTTagCompound tb = is.tag;
|
NBTTagCompound tb = is.tag;
|
||||||
|
@ -337,32 +336,14 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
return this.getFluidStack().toString();
|
return this.getFluidStack().toString();
|
||||||
} @Override
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public boolean hasTagCompound()
|
public boolean hasTagCompound()
|
||||||
{
|
{
|
||||||
return this.tagCompound != null;
|
return this.tagCompound != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public FluidStack getFluidStack()
|
|
||||||
{
|
|
||||||
FluidStack is = new FluidStack( this.fluid, (int) Math.min( Integer.MAX_VALUE, this.stackSize ) );
|
|
||||||
if( this.tagCompound != null )
|
|
||||||
{
|
|
||||||
is.tag = this.tagCompound.getNBTTagCompoundCopy();
|
|
||||||
}
|
|
||||||
|
|
||||||
return is;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Fluid getFluid()
|
|
||||||
{
|
|
||||||
return this.fluid;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void writeIdentity( ByteBuf i ) throws IOException
|
void writeIdentity( ByteBuf i ) throws IOException
|
||||||
{
|
{
|
||||||
|
@ -388,4 +369,22 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
|
||||||
i.writeBytes( tagBytes );
|
i.writeBytes( tagBytes );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FluidStack getFluidStack()
|
||||||
|
{
|
||||||
|
FluidStack is = new FluidStack( this.fluid, (int) Math.min( Integer.MAX_VALUE, this.stackSize ) );
|
||||||
|
if( this.tagCompound != null )
|
||||||
|
{
|
||||||
|
is.tag = this.tagCompound.getNBTTagCompoundCopy();
|
||||||
|
}
|
||||||
|
|
||||||
|
return is;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Fluid getFluid()
|
||||||
|
{
|
||||||
|
return this.fluid;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue