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

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/util/AEFluidStack.java
+12 -11
View File
@@ -29,10 +29,11 @@ import javax.annotation.Nonnull;
import io.netty.buffer.ByteBuf;
import net.minecraft.fluid.Fluid;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fluids.FluidStack;
import appeng.api.AEApi;
@@ -50,7 +51,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
{
private final Fluid fluid;
private NBTTagCompound tagCompound;
private CompoundNBT tagCompound;
private AEFluidStack( final AEFluidStack fluidStack )
{
@@ -76,13 +77,13 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
throw new IllegalArgumentException( "Fluid is null." );
}
this.setStackSize( fluidStack.amount );
this.setStackSize( fluidStack.getAmount() );
this.setCraftable( false );
this.setCountRequestable( 0 );
if( fluidStack.tag != null )
if( fluidStack.getTag() != null )
{
this.tagCompound = fluidStack.tag.copy();
this.tagCompound = fluidStack.getTag().copy();
}
}
@@ -96,7 +97,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
return new AEFluidStack( input );
}
public static IAEFluidStack fromNBT( final NBTTagCompound data )
public static IAEFluidStack fromNBT( final CompoundNBT data )
{
final FluidStack fluidStack = FluidStack.loadFluidStackFromNBT( data );
@@ -127,7 +128,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
final boolean hasTagCompound = ( mask & 0x80 ) > 0;
// don't send this...
final NBTTagCompound d = new NBTTagCompound();
final CompoundNBT d = new CompoundNBT();
final byte len2 = buffer.readByte();
final byte[] name = new byte[len2];
@@ -178,7 +179,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
}
@Override
public void writeToNBT( final NBTTagCompound data )
public void writeToNBT( final CompoundNBT data )
{
data.setString( "FluidName", this.fluid.getName() );
data.setByte( "Count", (byte) 0 );
@@ -318,7 +319,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
}
@Override
public void writeToPacket( final ByteBuf buffer ) throws IOException
public void writeToPacket( final PacketBuffer buffer ) throws IOException
{
final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
@@ -331,7 +332,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
this.putPacketValue( buffer, this.getCountRequestable() );
}
private void writeToStream( final ByteBuf buffer ) throws IOException
private void writeToStream( final PacketBuffer buffer ) throws IOException
{
final byte[] name = this.fluid.getName().getBytes( "UTF-8" );
buffer.writeByte( (byte) name.length );