1.15 port

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
@@ -4,7 +4,7 @@ package appeng.fluids.util;
import java.util.Objects;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -277,20 +277,20 @@ public class AEFluidInventory implements IAEFluidTank
return totalDrained;
}
public void writeToNBT( final NBTTagCompound data, final String name )
public void writeToNBT( final CompoundNBT data, final String name )
{
final NBTTagCompound c = new NBTTagCompound();
final CompoundNBT c = new CompoundNBT();
this.writeToNBT( c );
data.setTag( name, c );
}
private void writeToNBT( final NBTTagCompound target )
private void writeToNBT( final CompoundNBT target )
{
for( int x = 0; x < this.fluids.length; x++ )
{
try
{
final NBTTagCompound c = new NBTTagCompound();
final CompoundNBT c = new CompoundNBT();
if( this.fluids[x] != null )
{
@@ -305,22 +305,22 @@ public class AEFluidInventory implements IAEFluidTank
}
}
public void readFromNBT( final NBTTagCompound data, final String name )
public void readFromNBT( final CompoundNBT data, final String name )
{
final NBTTagCompound c = data.getCompoundTag( name );
final CompoundNBT c = data.getCompoundTag( name );
if( c != null )
{
this.readFromNBT( c );
}
}
private void readFromNBT( final NBTTagCompound target )
private void readFromNBT( final CompoundNBT target )
{
for( int x = 0; x < this.fluids.length; x++ )
{
try
{
final NBTTagCompound c = target.getCompoundTag( "#" + x );
final CompoundNBT c = target.getCompoundTag( "#" + x );
if( c != null )
{