Some additional fixes from other branch.

This commit is contained in:
Sebastian Hartte
2020-05-30 22:18:26 +02:00
parent 16d6d55d7f
commit ec3b464655
139 changed files with 1489 additions and 1485 deletions
@@ -93,7 +93,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
if( data.hasKey( "paintedColor" ) )
if( data.contains("paintedColor") )
{
this.paintedColor = AEColor.values()[data.getByte( "paintedColor" )];
}
@@ -201,7 +201,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
data.setBoolean( "core", this.isCoreBlock() );
data.putBoolean("core", this.isCoreBlock());
if( this.isCoreBlock() && this.cluster != null )
{
this.cluster.writeToNBT( data );
@@ -222,7 +222,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
if( !pattern.isEmpty() )
{
final CompoundNBT compound = new CompoundNBT();
pattern.writeToNBT( compound );
pattern.write(compound);
data.setTag( "myPlan", compound );
data.setInteger( "pushDirection", this.pushDirection.ordinal() );
}
@@ -237,7 +237,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
if( data.hasKey( "myPlan" ) )
if( data.contains("myPlan") )
{
final ItemStack myPat = new ItemStack( data.getCompoundTag( "myPlan" ) );