diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java index a98b92093..1aa30a08a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java @@ -9,7 +9,6 @@ import com.raoulvdberge.refinedstorage.integration.ic2.IntegrationIC2; import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla; import com.raoulvdberge.refinedstorage.integration.tesla.NetworkItemEnergyTesla; import com.raoulvdberge.refinedstorage.tile.TileController; -import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; import net.darkhax.tesla.capability.TeslaCapabilities; @@ -149,10 +148,8 @@ public abstract class ItemNetworkItem extends ItemEnergyContainer implements INe tag.setInteger(NBT_CONTROLLER_Y, pos.getY()); tag.setInteger(NBT_CONTROLLER_Z, pos.getZ()); tag.setInteger(NBT_DIMENSION_ID, player.dimension); - tag.setInteger(TileGrid.NBT_VIEW_TYPE, TileGrid.VIEW_TYPE_NORMAL); - tag.setInteger(TileGrid.NBT_SORTING_DIRECTION, TileGrid.SORTING_DIRECTION_DESCENDING); - tag.setInteger(TileGrid.NBT_SORTING_TYPE, TileGrid.SORTING_TYPE_NAME); - tag.setInteger(TileGrid.NBT_SEARCH_BOX_MODE, TileGrid.SEARCH_BOX_MODE_NORMAL); + + initializeDefaults(tag); stack.setTagCompound(tag); @@ -162,6 +159,10 @@ public abstract class ItemNetworkItem extends ItemEnergyContainer implements INe return EnumActionResult.PASS; } + public void initializeDefaults(NBTTagCompound tag) { + // NO OP + } + public static int getDimensionId(ItemStack stack) { return stack.getTagCompound().getInteger(NBT_DIMENSION_ID); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java index a2f9bf394..ec2767d96 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java @@ -6,12 +6,37 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessG import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class ItemWirelessGrid extends ItemNetworkItem { public ItemWirelessGrid() { super("wireless_grid"); } + @Override + public void initializeDefaults(NBTTagCompound tag) { + super.initializeDefaults(tag); + + tag.setInteger(TileGrid.NBT_VIEW_TYPE, TileGrid.VIEW_TYPE_NORMAL); + tag.setInteger(TileGrid.NBT_SORTING_DIRECTION, TileGrid.SORTING_DIRECTION_DESCENDING); + tag.setInteger(TileGrid.NBT_SORTING_TYPE, TileGrid.SORTING_TYPE_NAME); + tag.setInteger(TileGrid.NBT_SEARCH_BOX_MODE, TileGrid.SEARCH_BOX_MODE_NORMAL); + } + + @Override + public boolean isValid(ItemStack stack) { + return super.isValid(stack) + && stack.getTagCompound().hasKey(TileGrid.NBT_VIEW_TYPE) + && stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_DIRECTION) + && stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_TYPE) + && stack.getTagCompound().hasKey(TileGrid.NBT_SEARCH_BOX_MODE); + } + + @Override + public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { + return new NetworkItemWirelessGrid(handler, player, stack); + } + public static int getViewType(ItemStack stack) { return stack.getTagCompound().getInteger(TileGrid.NBT_VIEW_TYPE); } @@ -27,17 +52,4 @@ public class ItemWirelessGrid extends ItemNetworkItem { public static int getSearchBoxMode(ItemStack stack) { return stack.getTagCompound().getInteger(TileGrid.NBT_SEARCH_BOX_MODE); } - - public boolean isValid(ItemStack stack) { - return super.isValid(stack) - && stack.getTagCompound().hasKey(TileGrid.NBT_VIEW_TYPE) - && stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_DIRECTION) - && stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_TYPE) - && stack.getTagCompound().hasKey(TileGrid.NBT_SEARCH_BOX_MODE); - } - - @Override - public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) { - return new NetworkItemWirelessGrid(handler, player, stack); - } }