Moved Sorting Config Into the World.

items/contents/PortableCellViewer.java

@@ -1,15 +1,24 @@
 package appeng.items.contents;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
+import appeng.api.config.Settings;
+import appeng.api.config.SortDir;
+import appeng.api.config.SortOrder;
+import appeng.api.config.ViewItems;
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.MEMonitorHandler;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
+import appeng.api.util.IConfigManager;
 import appeng.me.storage.CellInventory;
+import appeng.util.ConfigManager;
+import appeng.util.IConfigManagerHost;
+import appeng.util.Platform;
 
 public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implements IPortableCell
 {
@@ -51,4 +60,25 @@ public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implement
 		return null;
 	}
 
+	@Override
+	public IConfigManager getConfigManager()
+	{
+		final ConfigManager out = new ConfigManager( new IConfigManagerHost() {
+
+			@Override
+			public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue)
+			{
+				NBTTagCompound data = Platform.openNbtData( target );
+				manager.writeToNBT( data );
+			}
+		} );
+
+		out.registerSetting( Settings.SORT_BY, SortOrder.NAME );
+		out.registerSetting( Settings.VIEW_MODE, ViewItems.ALL );
+		out.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING );
+
+		out.readFromNBT( (NBTTagCompound) Platform.openNbtData( target ).copy() );
+		return out;
+	}
+
 }

items/materials/ItemMaterial.java

@@ -81,6 +81,10 @@ public class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgr
 	{
 		super.addInformation( par1ItemStack, par2EntityPlayer, par3List, par4 );
 
+		MaterialType mt = getTypeByStack( par1ItemStack );
+		if ( mt == null )
+			return;
+
 		Upgrades u = getType( par1ItemStack );
 		if ( u != null )
 		{
@@ -156,7 +160,14 @@ public class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgr
 
 	private String nameOf(ItemStack is)
 	{
-		return AEFeatureHandler.getName( ItemMaterial.class, getTypeByStack( is ).name() );
+		if ( is == null )
+			return "null";
+
+		MaterialType mt = getTypeByStack( is );
+		if ( mt == null )
+			return "null";
+
+		return AEFeatureHandler.getName( ItemMaterial.class, mt.name() );
 	}
 
 	@Override

items/tools/powered/ToolWirelessTerminal.java

@@ -9,11 +9,18 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import appeng.api.AEApi;
+import appeng.api.config.Settings;
+import appeng.api.config.SortDir;
+import appeng.api.config.SortOrder;
+import appeng.api.config.ViewItems;
 import appeng.api.features.IWirelessTermHandler;
+import appeng.api.util.IConfigManager;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
 import appeng.items.tools.powered.powersink.AEBasePoweredItem;
+import appeng.util.ConfigManager;
+import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
 
 public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler
@@ -87,4 +94,26 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
 		tag.setString( "name", name );
 	}
 
+	@Override
+	public IConfigManager getConfigManager(final ItemStack target)
+	{
+		final ConfigManager out = new ConfigManager( new IConfigManagerHost() {
+
+			@Override
+			public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue)
+			{
+				NBTTagCompound data = Platform.openNbtData( target );
+				manager.writeToNBT( data );
+			}
+
+		} );
+
+		out.registerSetting( Sewttings.SORT_BY, SortOrder.NAME );
+		out.registerSetting( Settings.VIEW_MODE, ViewItems.ALL );
+		out.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING );
+
+		out.readFromNBT( (NBTTagCompound) Platform.openNbtData( target ).copy() );
+		return out;
+	}
+
 }