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

Merge pull request #1593 from thatsIch/e-update-forge

Browse Source 
Updates Forge to 1.7.10-10.13.4.1448-1.7.10
This commit is contained in:
thatsIch
2015-06-14 14:51:36 +02:00
parent 2ba4f312d4 e5f59e0a00
commit 60aa74d19f
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -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 #
src/main/java/appeng/util/item/AEFluidStack.java
+25 -26
View File
@@ -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;
}
} }