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
@@ -22,7 +22,6 @@ package appeng.items.contents;
import net.minecraft.item.ItemStack;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
public class CellConfig extends AppEngInternalInventory
@@ -34,12 +33,12 @@ public class CellConfig extends AppEngInternalInventory
{
super( null, 63 );
this.is = is;
this.readFromNBT( Platform.openNbtData( is ), "list" );
this.readFromNBT(is.getOrCreateTag(), "list" );
}
@Override
protected void onContentsChanged( int slot )
{
this.writeToNBT( Platform.openNbtData( this.is ), "list" );
this.writeToNBT(this.is.getOrCreateTag(), "list" );
}
}
@@ -22,7 +22,6 @@ package appeng.items.contents;
import net.minecraft.item.ItemStack;
import appeng.parts.automation.StackUpgradeInventory;
import appeng.util.Platform;
public final class CellUpgrades extends StackUpgradeInventory
@@ -33,12 +32,12 @@ public final class CellUpgrades extends StackUpgradeInventory
{
super( is, null, upgrades );
this.is = is;
this.readFromNBT( Platform.openNbtData( is ), "upgrades" );
this.readFromNBT(is.getOrCreateTag(), "upgrades" );
}
@Override
protected void onContentsChanged( int slot )
{
this.writeToNBT( Platform.openNbtData( this.is ), "upgrades" );
this.writeToNBT(this.is.getOrCreateTag(), "upgrades" );
}
}
@@ -26,7 +26,6 @@ import appeng.api.implementations.guiobjects.INetworkTool;
import appeng.api.implementations.items.IUpgradeModule;
import appeng.api.networking.IGridHost;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
import appeng.util.inv.filter.IAEItemFilter;
@@ -45,16 +44,16 @@ public class NetworkToolViewer implements INetworkTool, IAEAppEngInventory
this.gh = gHost;
this.inv = new AppEngInternalInventory( this, 9 );
this.inv.setFilter( new NetworkToolInventoryFilter() );
if( is.hasTagCompound() ) // prevent crash when opening network status screen.
if( is.hasTag() ) // prevent crash when opening network status screen.
{
this.inv.readFromNBT( Platform.openNbtData( is ), "inv" );
this.inv.readFromNBT(is.getOrCreateTag(), "inv" );
}
}
@Override
public void saveChanges()
{
this.inv.writeToNBT( Platform.openNbtData( this.is ), "inv" );
this.inv.writeToNBT(this.is.getOrCreateTag(), "inv" );
}
@Override
@@ -40,7 +40,6 @@ import appeng.api.util.IConfigManager;
import appeng.container.interfaces.IInventorySlotAware;
import appeng.me.helpers.MEMonitorHandler;
import appeng.util.ConfigManager;
import appeng.util.Platform;
public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implements IPortableCell, IInventorySlotAware
@@ -98,7 +97,7 @@ public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implement
{
final ConfigManager out = new ConfigManager( ( manager, settingName, newValue ) ->
{
final CompoundNBT data = Platform.openNbtData( PortableCellViewer.this.target );
final CompoundNBT data = this.target.getOrCreateTag();
manager.writeToNBT( data );
} );
@@ -106,7 +105,7 @@ public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implement
out.registerSetting( Settings.VIEW_MODE, ViewItems.ALL );
out.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING );
out.readFromNBT( Platform.openNbtData( this.target ).copy() );
out.readFromNBT( this.target.getOrCreateTag().copy() );
return out;
}
}