From 86c15b2e4f8974b345cfd91da6c7f7706a130893 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 10 Aug 2016 23:36:52 +0200 Subject: [PATCH] More renames --- .../api/network/INetworkMaster.java | 10 ++--- .../apiimpl/network/ItemGridHandler.java | 4 +- .../apiimpl/network/WirelessGridHandler.java | 2 +- .../{ => item}/GroupedItemStorage.java | 10 ++--- .../ItemStorageNBT.java} | 14 +++---- .../refinedstorage/item/ItemBlockStorage.java | 10 ++--- .../refinedstorage/item/ItemStorageDisk.java | 20 +++++----- .../network/MessageCraftingMonitorCancel.java | 2 +- .../network/MessageGridUpdate.java | 4 +- .../refinedstorage/proxy/CommonProxy.java | 6 +-- .../refinedstorage/tile/TileController.java | 40 +++++++++---------- .../refinedstorage/tile/TileDetector.java | 2 +- .../refinedstorage/tile/TileDiskDrive.java | 14 +++---- .../java/refinedstorage/tile/TileStorage.java | 14 +++---- .../externalstorage/TileExternalStorage.java | 6 +-- .../refinedstorage/tile/grid/TileGrid.java | 4 +- .../tile/grid/WirelessGrid.java | 2 +- 17 files changed, 82 insertions(+), 82 deletions(-) rename src/main/java/refinedstorage/apiimpl/storage/{ => item}/GroupedItemStorage.java (91%) rename src/main/java/refinedstorage/apiimpl/storage/{NBTItemStorage.java => item/ItemStorageNBT.java} (94%) diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/refinedstorage/api/network/INetworkMaster.java index ca30d8dd0..638337f03 100755 --- a/src/main/java/refinedstorage/api/network/INetworkMaster.java +++ b/src/main/java/refinedstorage/api/network/INetworkMaster.java @@ -46,7 +46,7 @@ public interface INetworkMaster { /** * @return The {@link IItemGridHandler} for this network */ - IItemGridHandler getGridHandler(); + IItemGridHandler getItemGridHandler(); /** * @return The {@link IWirelessGridHandler} for this network @@ -56,7 +56,7 @@ public interface INetworkMaster { /** * @return The {@link IGroupedItemStorage} of this network */ - IGroupedItemStorage getStorage(); + IGroupedItemStorage getItemStorage(); /** * @return The crafting tasks in this network, do NOT modify this list @@ -122,12 +122,12 @@ public interface INetworkMaster { /** * Sends a grid packet with all the items to all clients that are watching a grid. */ - void sendStorageToClient(); + void sendItemStorageToClient(); /** * Sends a grid packet with all the items to a specific player. */ - void sendStorageToClient(EntityPlayerMP player); + void sendItemStorageToClient(EntityPlayerMP player); /** * Sends a storage change to all clients that are watching a grid. @@ -135,7 +135,7 @@ public interface INetworkMaster { * @param stack The stack * @param delta The delta */ - void sendStorageDeltaToClient(ItemStack stack, int delta); + void sendItemStorageDeltaToClient(ItemStack stack, int delta); /** * Inserts an item to this network. diff --git a/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java index 96f3d8ff6..8973ab683 100755 --- a/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java @@ -22,7 +22,7 @@ public class ItemGridHandler implements IItemGridHandler { @Override public void onExtract(int hash, int flags, EntityPlayerMP player) { - ItemStack item = network.getStorage().get(hash); + ItemStack item = network.getItemStorage().get(hash); if (item == null) { return; @@ -118,7 +118,7 @@ public class ItemGridHandler implements IItemGridHandler { return; } - ItemStack stack = network.getStorage().get(hash); + ItemStack stack = network.getItemStorage().get(hash); if (stack == null) { return; diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java index aabf4d052..b203abe1d 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java @@ -59,7 +59,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, player.worldObj, hand.ordinal(), 0, 0); - network.sendStorageToClient((EntityPlayerMP) player); + network.sendItemStorageToClient((EntityPlayerMP) player); drainEnergy(player, USAGE_OPEN); diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java b/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java similarity index 91% rename from src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java rename to src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java index 50c32c135..090ca1557 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java @@ -1,4 +1,4 @@ -package refinedstorage.apiimpl.storage; +package refinedstorage.apiimpl.storage.item; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -51,7 +51,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { } } - network.sendStorageToClient(); + network.sendItemStorageToClient(); } @Override @@ -61,7 +61,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { otherStack.stackSize += stack.stackSize; if (!rebuilding) { - network.sendStorageDeltaToClient(stack, stack.stackSize); + network.sendItemStorageDeltaToClient(stack, stack.stackSize); } return; @@ -71,7 +71,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { stacks.put(stack.getItem(), stack.copy()); if (!rebuilding) { - network.sendStorageDeltaToClient(stack, stack.stackSize); + network.sendItemStorageDeltaToClient(stack, stack.stackSize); } } @@ -87,7 +87,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { } } - network.sendStorageDeltaToClient(stack, -stack.stackSize); + network.sendItemStorageDeltaToClient(stack, -stack.stackSize); return; } diff --git a/src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java b/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java similarity index 94% rename from src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java rename to src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java index df9508ed6..d8f807feb 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java @@ -1,4 +1,4 @@ -package refinedstorage.apiimpl.storage; +package refinedstorage.apiimpl.storage.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,9 +16,9 @@ import java.util.List; /** * A implementation of {@link IItemStorage} that stores storage items in NBT. */ -public abstract class NBTItemStorage implements IItemStorage { +public abstract class ItemStorageNBT implements IItemStorage { /** - * The current save protocol that is used. It's set to every {@link NBTItemStorage} to allow for + * The current save protocol that is used. It's set to every {@link ItemStorageNBT} to allow for * safe backwards compatibility breaks. */ private static final int PROTOCOL = 1; @@ -41,11 +41,11 @@ public abstract class NBTItemStorage implements IItemStorage { private List stacks = new ArrayList<>(); /** - * @param tag The NBT tag we are reading from and writing the amount stored to, has to be initialized with {@link NBTItemStorage#createNBT()} if it doesn't exist yet + * @param tag The NBT tag we are reading from and writing the amount stored to, has to be initialized with {@link ItemStorageNBT#createNBT()} if it doesn't exist yet * @param capacity The capacity of this storage, -1 for infinite capacity * @param tile A {@link TileEntity} that the NBT storage is in, will be marked dirty when the storage changes */ - public NBTItemStorage(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) { + public ItemStorageNBT(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) { this.tag = tag; this.capacity = capacity; this.tile = tile; @@ -243,8 +243,8 @@ public abstract class NBTItemStorage implements IItemStorage { } /** - * @param stack The {@link ItemStack} to populate with the NBT tags from {@link NBTItemStorage#createNBT()} - * @return The provided {@link ItemStack} with NBT tags from {@link NBTItemStorage#createNBT()} + * @param stack The {@link ItemStack} to populate with the NBT tags from {@link ItemStorageNBT#createNBT()} + * @return The provided {@link ItemStack} with NBT tags from {@link ItemStorageNBT#createNBT()} */ public static ItemStack createStackWithNBT(ItemStack stack) { stack.setTagCompound(createNBT()); diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index dc0b6b5c1..79e46babe 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -12,7 +12,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.apiimpl.storage.NBTItemStorage; +import refinedstorage.apiimpl.storage.item.ItemStorageNBT; import refinedstorage.block.EnumStorageType; import refinedstorage.tile.TileStorage; @@ -31,9 +31,9 @@ public class ItemBlockStorage extends ItemBlockBase { NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); if (type == EnumStorageType.TYPE_CREATIVE) { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTItemStorage.getStoredFromNBT(tag))); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored", ItemStorageNBT.getStoredFromNBT(tag))); } else { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTItemStorage.getStoredFromNBT(tag), type.getCapacity())); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", ItemStorageNBT.getStoredFromNBT(tag), type.getCapacity())); } } } @@ -42,7 +42,7 @@ public class ItemBlockStorage extends ItemBlockBase { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); - if (type != null && isValid(stack) && NBTItemStorage.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { + if (type != null && isValid(stack) && ItemStorageNBT.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, stack.getMetadata()); if (!player.inventory.addItemStackToInventory(storagePart.copy())) { @@ -83,7 +83,7 @@ public class ItemBlockStorage extends ItemBlockBase { public static ItemStack initNBT(ItemStack stack) { NBTTagCompound tag = new NBTTagCompound(); - tag.setTag(TileStorage.NBT_STORAGE, NBTItemStorage.createNBT()); + tag.setTag(TileStorage.NBT_STORAGE, ItemStorageNBT.createNBT()); stack.setTagCompound(tag); return stack; } diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java index 021f82122..644d4bdd8 100755 --- a/src/main/java/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -13,7 +13,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; import refinedstorage.RefinedStorageItems; -import refinedstorage.apiimpl.storage.NBTItemStorage; +import refinedstorage.apiimpl.storage.item.ItemStorageNBT; import refinedstorage.block.EnumStorageType; import java.util.ArrayList; @@ -41,7 +41,7 @@ public class ItemStorageDisk extends ItemBase { @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 5; ++i) { - list.add(NBTItemStorage.createStackWithNBT(new ItemStack(item, 1, i))); + list.add(ItemStorageNBT.createStackWithNBT(new ItemStack(item, 1, i))); } } @@ -53,16 +53,16 @@ public class ItemStorageDisk extends ItemBase { if (stack.getItemDamage() == TYPE_DEBUG) { applyDebugDiskData(stack); } else { - NBTItemStorage.createStackWithNBT(stack); + ItemStorageNBT.createStackWithNBT(stack); } } } private void applyDebugDiskData(ItemStack stack) { if (debugDiskTag == null) { - debugDiskTag = NBTItemStorage.createNBT(); + debugDiskTag = ItemStorageNBT.createNBT(); - NBTItemStorage storage = new NBTItemStorage(debugDiskTag, -1, null) { + ItemStorageNBT storage = new ItemStorageNBT(debugDiskTag, -1, null) { @Override public int getPriority() { return 0; @@ -93,20 +93,20 @@ public class ItemStorageDisk extends ItemBase { @Override public void addInformation(ItemStack disk, EntityPlayer player, List tooltip, boolean advanced) { - if (NBTItemStorage.isValid(disk)) { + if (ItemStorageNBT.isValid(disk)) { int capacity = EnumStorageType.getById(disk.getItemDamage()).getCapacity(); if (capacity == -1) { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTItemStorage.getStoredFromNBT(disk.getTagCompound()))); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored", ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()))); } else { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTItemStorage.getStoredFromNBT(disk.getTagCompound()), capacity)); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()), capacity)); } } } @Override public ActionResult onItemRightClick(ItemStack disk, World world, EntityPlayer player, EnumHand hand) { - if (!world.isRemote && player.isSneaking() && NBTItemStorage.isValid(disk) && NBTItemStorage.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) { + if (!world.isRemote && player.isSneaking() && ItemStorageNBT.isValid(disk) && ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) { ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, disk.getMetadata()); if (!player.inventory.addItemStackToInventory(storagePart.copy())) { @@ -123,6 +123,6 @@ public class ItemStorageDisk extends ItemBase { public void onCreated(ItemStack stack, World world, EntityPlayer player) { super.onCreated(stack, world, player); - NBTItemStorage.createStackWithNBT(stack); + ItemStorageNBT.createStackWithNBT(stack); } } diff --git a/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java b/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java index eb93f2ce0..48852412b 100755 --- a/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java +++ b/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java @@ -47,7 +47,7 @@ public class MessageCraftingMonitorCancel extends MessageHandlerPlayerToServer right.getPriority()) ? -1 : 1; }; - private ItemGridHandler gridHandler = new ItemGridHandler(this); + private ItemGridHandler itemGridHandler = new ItemGridHandler(this); private WirelessGridHandler wirelessGridHandler = new WirelessGridHandler(this); private INetworkNodeGraph nodeGraph = new NetworkNodeGraph(this); - private IGroupedItemStorage storage = new GroupedItemStorage(this); + private IGroupedItemStorage itemStorage = new GroupedItemStorage(this); private List patterns = new ArrayList<>(); @@ -203,8 +203,8 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR energyEU.update(); if (canRun()) { - Collections.sort(storage.getStorages(), SIZE_COMPARATOR); - Collections.sort(storage.getStorages(), PRIORITY_COMPARATOR); + Collections.sort(itemStorage.getStorages(), SIZE_COMPARATOR); + Collections.sort(itemStorage.getStorages(), PRIORITY_COMPARATOR); boolean craftingTasksChanged = !craftingTasksToAdd.isEmpty() || !craftingTasksToAddAsLast.isEmpty() || !craftingTasksToCancel.isEmpty(); @@ -304,8 +304,8 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } @Override - public IItemGridHandler getGridHandler() { - return gridHandler; + public IItemGridHandler getItemGridHandler() { + return itemGridHandler; } @Override @@ -320,8 +320,8 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR energyEU.onChunkUnload(); } - public IGroupedItemStorage getStorage() { - return storage; + public IGroupedItemStorage getItemStorage() { + return itemStorage; } @Override @@ -396,7 +396,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR int score = 0; for (ItemStack input : patterns.get(i).getInputs()) { - ItemStack stored = storage.get(input, CompareUtils.COMPARE_DAMAGE | CompareUtils.COMPARE_NBT); + ItemStack stored = itemStorage.get(input, CompareUtils.COMPARE_DAMAGE | CompareUtils.COMPARE_NBT); score += stored != null ? stored.stackSize : 0; } @@ -434,23 +434,23 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } } - storage.rebuild(); + itemStorage.rebuild(); } @Override - public void sendStorageToClient() { + public void sendItemStorageToClient() { worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream() .filter(this::isWatchingGrid) - .forEach(this::sendStorageToClient); + .forEach(this::sendItemStorageToClient); } @Override - public void sendStorageToClient(EntityPlayerMP player) { + public void sendItemStorageToClient(EntityPlayerMP player) { RefinedStorage.INSTANCE.network.sendTo(new MessageGridUpdate(this), player); } @Override - public void sendStorageDeltaToClient(ItemStack stack, int delta) { + public void sendItemStorageDeltaToClient(ItemStack stack, int delta) { worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream() .filter(this::isWatchingGrid) .forEach(player -> RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), player)); @@ -462,7 +462,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { - if (stack == null || stack.getItem() == null || storage.getStorages().isEmpty()) { + if (stack == null || stack.getItem() == null || itemStorage.getStorages().isEmpty()) { return ItemHandlerHelper.copyStackWithSize(stack, size); } @@ -470,7 +470,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR ItemStack remainder = stack; - for (IItemStorage storage : this.storage.getStorages()) { + for (IItemStorage storage : this.itemStorage.getStorages()) { remainder = storage.insertItem(remainder, size, simulate); if (storage instanceof ItemStorageExternal && !simulate) { @@ -495,7 +495,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } } - storage.add(ItemHandlerHelper.copyStackWithSize(stack, inserted), false); + itemStorage.add(ItemHandlerHelper.copyStackWithSize(stack, inserted), false); } return remainder; @@ -508,7 +508,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR ItemStack newStack = null; - for (IItemStorage storage : this.storage.getStorages()) { + for (IItemStorage storage : this.itemStorage.getStorages()) { ItemStack took = storage.extractItem(stack, requested - received, flags); if (took != null) { @@ -531,7 +531,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } if (newStack != null) { - storage.remove(newStack); + itemStorage.remove(newStack); } return newStack; diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 6e8b6e7bf..b60234436 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -97,7 +97,7 @@ public class TileDetector extends TileNode implements IComparable { ItemStack slot = filter.getStackInSlot(0); if (slot != null) { - ItemStack stack = network.getStorage().get(slot, compare); + ItemStack stack = network.getItemStorage().get(slot, compare); if (stack != null) { switch (mode) { diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index f42b256b0..fabf13437 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -14,7 +14,7 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.storage.IStorageProvider; import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.apiimpl.storage.NBTItemStorage; +import refinedstorage.apiimpl.storage.item.ItemStorageNBT; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemValidatorBasic; @@ -30,7 +30,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag public static final TileDataParameter COMPARE = IComparable.createParameter(); public static final TileDataParameter MODE = IFilterable.createParameter(); - public class ItemStorage extends NBTItemStorage { + public class ItemStorage extends ItemStorageNBT { public ItemStorage(ItemStack disk) { super(disk.getTagCompound(), EnumStorageType.getById(disk.getItemDamage()).getCapacity(), TileDiskDrive.this); } @@ -58,7 +58,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag private ItemHandlerBasic disks = new ItemHandlerBasic(8, this, new ItemValidatorBasic(RefinedStorageItems.STORAGE_DISK) { @Override public boolean isValid(ItemStack disk) { - return super.isValid(disk) && NBTItemStorage.isValid(disk); + return super.isValid(disk) && ItemStorageNBT.isValid(disk); } }) { @Override @@ -78,7 +78,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag } if (network != null) { - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } } } @@ -150,7 +150,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag public void onConnectionChange(INetworkMaster network, boolean state) { super.onConnectionChange(network, state); - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } @Override @@ -256,7 +256,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag return 0; } - stored += NBTItemStorage.getStoredFromNBT(disk.getTagCompound()); + stored += ItemStorageNBT.getStoredFromNBT(disk.getTagCompound()); storedMax += EnumStorageType.getById(disk.getItemDamage()).getCapacity(); } } @@ -322,7 +322,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag ItemStack stack = disks.getStackInSlot(i); if (stack != null) { - stored += NBTItemStorage.getStoredFromNBT(stack.getTagCompound()); + stored += ItemStorageNBT.getStoredFromNBT(stack.getTagCompound()); } } diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index e02de166d..b44830cdb 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -10,7 +10,7 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.storage.IStorageProvider; import refinedstorage.api.storage.item.IItemStorage; -import refinedstorage.apiimpl.storage.NBTItemStorage; +import refinedstorage.apiimpl.storage.item.ItemStorageNBT; import refinedstorage.block.BlockStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.ItemHandlerBasic; @@ -29,11 +29,11 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG public static final TileDataParameter STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileStorage tile) { - return NBTItemStorage.getStoredFromNBT(tile.storageTag); + return ItemStorageNBT.getStoredFromNBT(tile.storageTag); } }); - class ItemStorage extends NBTItemStorage { + class ItemStorage extends ItemStorageNBT { public ItemStorage() { super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity(), TileStorage.this); } @@ -61,7 +61,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG private ItemHandlerBasic filters = new ItemHandlerBasic(9, this); - private NBTTagCompound storageTag = NBTItemStorage.createNBT(); + private NBTTagCompound storageTag = ItemStorageNBT.createNBT(); private ItemStorage storage; @@ -95,7 +95,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG storage = new ItemStorage(); if (network != null) { - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } } } @@ -110,7 +110,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG public void onConnectionChange(INetworkMaster network, boolean state) { super.onConnectionChange(network, state); - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } @Override @@ -232,7 +232,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG this.storageTag = storageTag; } - public NBTItemStorage getStorage() { + public ItemStorageNBT getStorage() { return storage; } diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 57d14b7d2..4f96620b0 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -96,7 +96,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr updateStorage(network); - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } @Override @@ -112,7 +112,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr } if (shouldRebuild) { - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } } @@ -219,7 +219,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr } } - network.getStorage().rebuild(); + network.getItemStorage().rebuild(); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 133d10da9..2a4845557 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -190,13 +190,13 @@ public class TileGrid extends TileNode implements IGrid { public void onGridOpened(EntityPlayer player) { if (isConnected()) { - network.sendStorageToClient((EntityPlayerMP) player); + network.sendItemStorageToClient((EntityPlayerMP) player); } } @Override public IItemGridHandler getGridHandler() { - return isConnected() ? network.getGridHandler() : null; + return isConnected() ? network.getItemGridHandler() : null; } public InventoryCrafting getMatrix() { diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 7d4ee08d1..64733131b 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -87,7 +87,7 @@ public class WirelessGrid implements IGrid { public IItemGridHandler getGridHandler() { TileController controller = getController(); - return controller != null ? controller.getGridHandler() : null; + return controller != null ? controller.getItemGridHandler() : null; } @Override