From de510ba7053c00193acd93c030f95e59d1a42bb0 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 10 Aug 2016 23:32:20 +0200 Subject: [PATCH] Rename classes so they are prefixed with "item" to prepare for fluid storage --- .../api/network/INetworkMaster.java | 13 ++++--- .../api/network/NetworkUtils.java | 2 +- .../network/{ => grid}/GridExtractFlags.java | 2 +- .../IItemGridHandler.java} | 4 +- .../api/storage/IStorageProvider.java | 8 ++-- .../api/storage/{ => item}/CompareUtils.java | 2 +- .../IGroupedItemStorage.java} | 9 +++-- .../{IStorage.java => item/IItemStorage.java} | 5 ++- .../autocrafting/CraftingTaskScheduler.java | 2 +- .../autocrafting/ProcessingCraftingTask.java | 2 +- ...{GridHandler.java => ItemGridHandler.java} | 10 ++--- .../apiimpl/solderer/SoldererRegistry.java | 2 +- ...edStorage.java => GroupedItemStorage.java} | 18 ++++----- .../{NBTStorage.java => NBTItemStorage.java} | 18 ++++----- .../container/ContainerBase.java | 2 +- .../refinedstorage/gui/GuiConstructor.java | 2 +- .../refinedstorage/gui/GuiDestructor.java | 2 +- .../java/refinedstorage/gui/GuiDetector.java | 2 +- .../java/refinedstorage/gui/GuiExporter.java | 2 +- .../refinedstorage/gui/GuiGridFilter.java | 2 +- .../java/refinedstorage/gui/GuiImporter.java | 2 +- .../java/refinedstorage/gui/GuiInterface.java | 2 +- .../java/refinedstorage/gui/GuiStorage.java | 2 +- .../gui/grid/GuiCraftingSettings.java | 6 +-- .../java/refinedstorage/gui/grid/GuiGrid.java | 4 +- .../gui/sidebutton/SideButtonCompare.java | 2 +- .../refinedstorage/item/ItemBlockStorage.java | 10 ++--- .../refinedstorage/item/ItemGridFilter.java | 2 +- .../java/refinedstorage/item/ItemPattern.java | 2 +- .../refinedstorage/item/ItemStorageDisk.java | 20 +++++----- .../network/MessageGridCraftingStart.java | 4 +- .../network/MessageGridInsertHeld.java | 4 +- .../network/MessageGridPull.java | 4 +- .../refinedstorage/proxy/CommonProxy.java | 6 +-- .../java/refinedstorage/tile/ClientNode.java | 2 +- .../refinedstorage/tile/TileController.java | 37 ++++++++++--------- .../refinedstorage/tile/TileDiskDrive.java | 24 ++++++------ .../refinedstorage/tile/TileSolderer.java | 2 +- .../java/refinedstorage/tile/TileStorage.java | 20 +++++----- .../tile/config/IFilterable.java | 2 +- ...geUnitStorage.java => ItemStorageDSU.java} | 6 +-- ...werStorage.java => ItemStorageDrawer.java} | 6 +-- ...lStorage.java => ItemStorageExternal.java} | 6 +-- ...orage.java => ItemStorageItemHandler.java} | 6 +-- .../externalstorage/TileExternalStorage.java | 20 +++++----- .../java/refinedstorage/tile/grid/IGrid.java | 4 +- .../refinedstorage/tile/grid/TileGrid.java | 6 +-- .../tile/grid/WirelessGrid.java | 4 +- 48 files changed, 165 insertions(+), 159 deletions(-) rename src/main/java/refinedstorage/api/network/{ => grid}/GridExtractFlags.java (87%) rename src/main/java/refinedstorage/api/network/{IGridHandler.java => grid/IItemGridHandler.java} (95%) rename src/main/java/refinedstorage/api/storage/{ => item}/CompareUtils.java (98%) rename src/main/java/refinedstorage/api/storage/{IGroupedStorage.java => item/IGroupedItemStorage.java} (89%) rename src/main/java/refinedstorage/api/storage/{IStorage.java => item/IItemStorage.java} (93%) rename src/main/java/refinedstorage/apiimpl/network/{GridHandler.java => ItemGridHandler.java} (94%) rename src/main/java/refinedstorage/apiimpl/storage/{GroupedStorage.java => GroupedItemStorage.java} (86%) rename src/main/java/refinedstorage/apiimpl/storage/{NBTStorage.java => NBTItemStorage.java} (92%) rename src/main/java/refinedstorage/tile/externalstorage/{DeepStorageUnitStorage.java => ItemStorageDSU.java} (94%) rename src/main/java/refinedstorage/tile/externalstorage/{DrawerStorage.java => ItemStorageDrawer.java} (95%) rename src/main/java/refinedstorage/tile/externalstorage/{ExternalStorage.java => ItemStorageExternal.java} (81%) rename src/main/java/refinedstorage/tile/externalstorage/{ItemHandlerStorage.java => ItemStorageItemHandler.java} (91%) diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/refinedstorage/api/network/INetworkMaster.java index 9b783a5a3..ca30d8dd0 100755 --- a/src/main/java/refinedstorage/api/network/INetworkMaster.java +++ b/src/main/java/refinedstorage/api/network/INetworkMaster.java @@ -6,8 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.autocrafting.ICraftingTask; -import refinedstorage.api.storage.CompareUtils; -import refinedstorage.api.storage.IGroupedStorage; +import refinedstorage.api.network.grid.IItemGridHandler; +import refinedstorage.api.storage.item.CompareUtils; +import refinedstorage.api.storage.item.IGroupedItemStorage; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -43,9 +44,9 @@ public interface INetworkMaster { INetworkNodeGraph getNodeGraph(); /** - * @return The {@link IGridHandler} for this network + * @return The {@link IItemGridHandler} for this network */ - IGridHandler getGridHandler(); + IItemGridHandler getGridHandler(); /** * @return The {@link IWirelessGridHandler} for this network @@ -53,9 +54,9 @@ public interface INetworkMaster { IWirelessGridHandler getWirelessGridHandler(); /** - * @return The {@link IGroupedStorage} of this network + * @return The {@link IGroupedItemStorage} of this network */ - IGroupedStorage getStorage(); + IGroupedItemStorage getStorage(); /** * @return The crafting tasks in this network, do NOT modify this list diff --git a/src/main/java/refinedstorage/api/network/NetworkUtils.java b/src/main/java/refinedstorage/api/network/NetworkUtils.java index b5bb88a47..3a1d56e1f 100755 --- a/src/main/java/refinedstorage/api/network/NetworkUtils.java +++ b/src/main/java/refinedstorage/api/network/NetworkUtils.java @@ -2,7 +2,7 @@ package refinedstorage.api.network; import net.minecraft.item.ItemStack; import refinedstorage.api.autocrafting.ICraftingPattern; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; /** * Utilities for network manipulation. diff --git a/src/main/java/refinedstorage/api/network/GridExtractFlags.java b/src/main/java/refinedstorage/api/network/grid/GridExtractFlags.java similarity index 87% rename from src/main/java/refinedstorage/api/network/GridExtractFlags.java rename to src/main/java/refinedstorage/api/network/grid/GridExtractFlags.java index 87064d6bb..43d9466e7 100755 --- a/src/main/java/refinedstorage/api/network/GridExtractFlags.java +++ b/src/main/java/refinedstorage/api/network/grid/GridExtractFlags.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package refinedstorage.api.network.grid; /** * Flags for knowing what extract action the player is performing, these can be combined. diff --git a/src/main/java/refinedstorage/api/network/IGridHandler.java b/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java similarity index 95% rename from src/main/java/refinedstorage/api/network/IGridHandler.java rename to src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java index df97764ed..484a22dde 100755 --- a/src/main/java/refinedstorage/api/network/IGridHandler.java +++ b/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java @@ -1,4 +1,4 @@ -package refinedstorage.api.network; +package refinedstorage.api.network.grid; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -8,7 +8,7 @@ import javax.annotation.Nullable; /** * Defines the behavior of grids. */ -public interface IGridHandler { +public interface IItemGridHandler { /** * Called when a player tries to extract an item from the grid. * diff --git a/src/main/java/refinedstorage/api/storage/IStorageProvider.java b/src/main/java/refinedstorage/api/storage/IStorageProvider.java index fd10e65ea..ebc39d1da 100755 --- a/src/main/java/refinedstorage/api/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/api/storage/IStorageProvider.java @@ -1,5 +1,7 @@ package refinedstorage.api.storage; +import refinedstorage.api.storage.item.IItemStorage; + import java.util.List; /** @@ -7,9 +9,9 @@ import java.util.List; */ public interface IStorageProvider { /** - * Adds the storages that this storage provider provides. + * Adds the item storages that this storage provider provides. * - * @param storages The previously added storages + * @param storages The previously added item storages */ - void addStorages(List storages); + void addItemStorages(List storages); } diff --git a/src/main/java/refinedstorage/api/storage/CompareUtils.java b/src/main/java/refinedstorage/api/storage/item/CompareUtils.java similarity index 98% rename from src/main/java/refinedstorage/api/storage/CompareUtils.java rename to src/main/java/refinedstorage/api/storage/item/CompareUtils.java index 937e804bd..8b340c15e 100755 --- a/src/main/java/refinedstorage/api/storage/CompareUtils.java +++ b/src/main/java/refinedstorage/api/storage/item/CompareUtils.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storage; +package refinedstorage.api.storage.item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/refinedstorage/api/storage/IGroupedStorage.java b/src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java similarity index 89% rename from src/main/java/refinedstorage/api/storage/IGroupedStorage.java rename to src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java index 887f823ed..55bd1ac22 100755 --- a/src/main/java/refinedstorage/api/storage/IGroupedStorage.java +++ b/src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java @@ -1,7 +1,8 @@ -package refinedstorage.api.storage; +package refinedstorage.api.storage.item; import net.minecraft.item.ItemStack; import refinedstorage.api.network.INetworkMaster; +import refinedstorage.api.storage.IStorageProvider; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -12,10 +13,10 @@ import java.util.List; * This holds all items from all the connected storages from a {@link INetworkMaster}. *

* Refined Storage uses this class mainly for use in Grids and Detectors to avoid querying - * individual {@link IStorage} constantly (performance impact) and to send and detect storage changes + * individual {@link IItemStorage} constantly (performance impact) and to send and detect storage changes * more efficiently. */ -public interface IGroupedStorage { +public interface IGroupedItemStorage { /** * Rebuilds the storages and items for a network. Typically called when a {@link IStorageProvider} is * added or removed from the network. @@ -71,5 +72,5 @@ public interface IGroupedStorage { /** * @return The storages connected to this network */ - List getStorages(); + List getStorages(); } diff --git a/src/main/java/refinedstorage/api/storage/IStorage.java b/src/main/java/refinedstorage/api/storage/item/IItemStorage.java similarity index 93% rename from src/main/java/refinedstorage/api/storage/IStorage.java rename to src/main/java/refinedstorage/api/storage/item/IItemStorage.java index 709be751d..5ceae03f4 100755 --- a/src/main/java/refinedstorage/api/storage/IStorage.java +++ b/src/main/java/refinedstorage/api/storage/item/IItemStorage.java @@ -1,6 +1,7 @@ -package refinedstorage.api.storage; +package refinedstorage.api.storage.item; import net.minecraft.item.ItemStack; +import refinedstorage.api.storage.IStorageProvider; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,7 +11,7 @@ import java.util.List; * Represents a storage sink for the storage network. * Provide this through an {@link IStorageProvider}. */ -public interface IStorage { +public interface IItemStorage { /** * @return Items stored in this storage */ diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java b/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java index 54342d0c4..47eb86931 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; public class CraftingTaskScheduler { private static final String NBT_SCHEDULED = "CraftingTaskScheduled"; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java b/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java index 31f04b17a..f5fb0e38a 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java @@ -9,7 +9,7 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer; import refinedstorage.api.autocrafting.ICraftingTask; import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.NetworkUtils; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; public class ProcessingCraftingTask implements ICraftingTask { public static final int ID = 1; diff --git a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java b/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java similarity index 94% rename from src/main/java/refinedstorage/apiimpl/network/GridHandler.java rename to src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java index 84c91db77..96f3d8ff6 100755 --- a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java @@ -5,18 +5,18 @@ import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.autocrafting.ICraftingTask; -import refinedstorage.api.network.GridExtractFlags; -import refinedstorage.api.network.IGridHandler; import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.NetworkUtils; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.network.grid.GridExtractFlags; +import refinedstorage.api.network.grid.IItemGridHandler; +import refinedstorage.api.storage.item.CompareUtils; -public class GridHandler implements IGridHandler { +public class ItemGridHandler implements IItemGridHandler { public static final int MAX_CRAFTING_PER_REQUEST = 500; private INetworkMaster network; - public GridHandler(INetworkMaster network) { + public ItemGridHandler(INetworkMaster network) { this.network = network; } diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java index 971b5aade..04f0b5162 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java +++ b/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java @@ -3,7 +3,7 @@ package refinedstorage.apiimpl.solderer; import net.minecraftforge.items.IItemHandler; import refinedstorage.api.solderer.ISoldererRecipe; import refinedstorage.api.solderer.ISoldererRegistry; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java similarity index 86% rename from src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java rename to src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java index a2b26d99b..50c32c135 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java @@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.NetworkUtils; -import refinedstorage.api.storage.CompareUtils; -import refinedstorage.api.storage.IGroupedStorage; -import refinedstorage.api.storage.IStorage; import refinedstorage.api.storage.IStorageProvider; +import refinedstorage.api.storage.item.CompareUtils; +import refinedstorage.api.storage.item.IGroupedItemStorage; +import refinedstorage.api.storage.item.IItemStorage; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -18,12 +18,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -public class GroupedStorage implements IGroupedStorage { +public class GroupedItemStorage implements IGroupedItemStorage { private INetworkMaster network; - private List storages = new ArrayList<>(); + private List storages = new ArrayList<>(); private Multimap stacks = ArrayListMultimap.create(); - public GroupedStorage(INetworkMaster network) { + public GroupedItemStorage(INetworkMaster network) { this.network = network; } @@ -33,11 +33,11 @@ public class GroupedStorage implements IGroupedStorage { network.getNodeGraph().all().stream() .filter(node -> node.canUpdate() && node instanceof IStorageProvider) - .forEach(node -> ((IStorageProvider) node).addStorages(storages)); + .forEach(node -> ((IStorageProvider) node).addItemStorages(storages)); stacks.clear(); - for (IStorage storage : storages) { + for (IItemStorage storage : storages) { for (ItemStack stack : storage.getItems()) { add(stack, true); } @@ -124,7 +124,7 @@ public class GroupedStorage implements IGroupedStorage { } @Override - public List getStorages() { + public List getStorages() { return storages; } } diff --git a/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java b/src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java similarity index 92% rename from src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java rename to src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java index a2c0cff6d..df9508ed6 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java @@ -6,19 +6,19 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.CompareUtils; -import refinedstorage.api.storage.IStorage; +import refinedstorage.api.storage.item.CompareUtils; +import refinedstorage.api.storage.item.IItemStorage; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; /** - * A implementation of {@link IStorage} that stores storage items in NBT. + * A implementation of {@link IItemStorage} that stores storage items in NBT. */ -public abstract class NBTStorage implements IStorage { +public abstract class NBTItemStorage implements IItemStorage { /** - * The current save protocol that is used. It's set to every {@link NBTStorage} to allow for + * The current save protocol that is used. It's set to every {@link NBTItemStorage} to allow for * safe backwards compatibility breaks. */ private static final int PROTOCOL = 1; @@ -41,11 +41,11 @@ public abstract class NBTStorage implements IStorage { 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 NBTStorage#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 NBTItemStorage#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 NBTStorage(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) { + public NBTItemStorage(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) { this.tag = tag; this.capacity = capacity; this.tile = tile; @@ -243,8 +243,8 @@ public abstract class NBTStorage implements IStorage { } /** - * @param stack The {@link ItemStack} to populate with the NBT tags from {@link NBTStorage#createNBT()} - * @return The provided {@link ItemStack} with NBT tags from {@link NBTStorage#createNBT()} + * @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()} */ public static ItemStack createStackWithNBT(ItemStack stack) { stack.setTagCompound(createNBT()); diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java index 896b211e5..0a1e7f294 100755 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.slot.SlotDisabled; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.container.slot.SlotSpecimenLegacy; diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java index 50bca551c..7aed1efd5 100755 --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -1,6 +1,6 @@ package refinedstorage.gui; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerConstructor; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java index 24b62adaa..d703a3cd0 100755 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -1,6 +1,6 @@ package refinedstorage.gui; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerDestructor; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonMode; diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java index 230fa761c..10e746d6b 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -2,7 +2,7 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; import net.minecraft.client.gui.GuiTextField; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerDetector; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonDetectorMode; diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java index 387f8b612..31499faba 100755 --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -1,6 +1,6 @@ package refinedstorage.gui; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerExporter; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; diff --git a/src/main/java/refinedstorage/gui/GuiGridFilter.java b/src/main/java/refinedstorage/gui/GuiGridFilter.java index 8d6b119ed..0c8aa7f13 100755 --- a/src/main/java/refinedstorage/gui/GuiGridFilter.java +++ b/src/main/java/refinedstorage/gui/GuiGridFilter.java @@ -3,7 +3,7 @@ package refinedstorage.gui; import net.minecraft.client.gui.GuiButton; import net.minecraftforge.fml.client.config.GuiCheckBox; import refinedstorage.RefinedStorage; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerGridFilter; import refinedstorage.item.ItemGridFilter; import refinedstorage.network.MessageGridFilterUpdate; diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java index 384cbec40..61cc6b9ff 100755 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -1,6 +1,6 @@ package refinedstorage.gui; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerImporter; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonMode; diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java index 627456013..fe907e5c8 100755 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -1,6 +1,6 @@ package refinedstorage.gui; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerInterface; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index fff34ef1c..c00cef7a9 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -2,7 +2,7 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; import net.minecraft.client.gui.GuiTextField; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.container.ContainerStorage; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonMode; diff --git a/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java index 34a1cb349..09382cf51 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java +++ b/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.input.Keyboard; import refinedstorage.RefinedStorage; -import refinedstorage.apiimpl.network.GridHandler; +import refinedstorage.apiimpl.network.ItemGridHandler; import refinedstorage.container.ContainerCraftingSettings; import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageGridCraftingStart; @@ -110,7 +110,7 @@ public class GuiCraftingSettings extends GuiBase { int newAmount = Integer.parseInt(incrementButton.displayString); - newAmount = Math.min(Math.max(DEFAULT_AMOUNT, oldAmount + newAmount), GridHandler.MAX_CRAFTING_PER_REQUEST); + newAmount = Math.min(Math.max(DEFAULT_AMOUNT, oldAmount + newAmount), ItemGridHandler.MAX_CRAFTING_PER_REQUEST); amountField.setText(String.valueOf(newAmount)); @@ -123,7 +123,7 @@ public class GuiCraftingSettings extends GuiBase { private void startRequest() { Integer quantity = Ints.tryParse(amountField.getText()); - if (quantity != null && quantity > 0 && quantity <= GridHandler.MAX_CRAFTING_PER_REQUEST) { + if (quantity != null && quantity > 0 && quantity <= ItemGridHandler.MAX_CRAFTING_PER_REQUEST) { RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingStart(stack.getId(), quantity)); close(); diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java index f1e8d2994..7a0f4e4bf 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java @@ -13,8 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.FMLCommonHandler; import refinedstorage.RefinedStorage; -import refinedstorage.api.network.GridExtractFlags; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.network.grid.GridExtractFlags; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.block.EnumGridType; import refinedstorage.container.ContainerGrid; import refinedstorage.gui.GuiBase; diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java index aad6ddfda..c659fbeb2 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -1,7 +1,7 @@ package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.gui.GuiBase; import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index 1de4ade44..dc0b6b5c1 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.NBTStorage; +import refinedstorage.apiimpl.storage.NBTItemStorage; 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", NBTStorage.getStoredFromNBT(tag))); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTItemStorage.getStoredFromNBT(tag))); } else { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTStorage.getStoredFromNBT(tag), type.getCapacity())); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTItemStorage.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) && NBTStorage.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) { + if (type != null && isValid(stack) && NBTItemStorage.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, NBTStorage.createNBT()); + tag.setTag(TileStorage.NBT_STORAGE, NBTItemStorage.createNBT()); stack.setTagCompound(tag); return stack; } diff --git a/src/main/java/refinedstorage/item/ItemGridFilter.java b/src/main/java/refinedstorage/item/ItemGridFilter.java index 81048e31e..0c2dd10c3 100755 --- a/src/main/java/refinedstorage/item/ItemGridFilter.java +++ b/src/main/java/refinedstorage/item/ItemGridFilter.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageItems; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.inventory.ItemHandlerGridFilter; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java index 3ab1897aa..fb5c30c85 100755 --- a/src/main/java/refinedstorage/item/ItemPattern.java +++ b/src/main/java/refinedstorage/item/ItemPattern.java @@ -13,7 +13,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import refinedstorage.RefinedStorageItems; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java index 7decff81f..021f82122 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.NBTStorage; +import refinedstorage.apiimpl.storage.NBTItemStorage; 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(NBTStorage.createStackWithNBT(new ItemStack(item, 1, i))); + list.add(NBTItemStorage.createStackWithNBT(new ItemStack(item, 1, i))); } } @@ -53,16 +53,16 @@ public class ItemStorageDisk extends ItemBase { if (stack.getItemDamage() == TYPE_DEBUG) { applyDebugDiskData(stack); } else { - NBTStorage.createStackWithNBT(stack); + NBTItemStorage.createStackWithNBT(stack); } } } private void applyDebugDiskData(ItemStack stack) { if (debugDiskTag == null) { - debugDiskTag = NBTStorage.createNBT(); + debugDiskTag = NBTItemStorage.createNBT(); - NBTStorage storage = new NBTStorage(debugDiskTag, -1, null) { + NBTItemStorage storage = new NBTItemStorage(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 (NBTStorage.isValid(disk)) { + if (NBTItemStorage.isValid(disk)) { int capacity = EnumStorageType.getById(disk.getItemDamage()).getCapacity(); if (capacity == -1) { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTStorage.getStoredFromNBT(disk.getTagCompound()))); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTItemStorage.getStoredFromNBT(disk.getTagCompound()))); } else { - tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTStorage.getStoredFromNBT(disk.getTagCompound()), capacity)); + tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTItemStorage.getStoredFromNBT(disk.getTagCompound()), capacity)); } } } @Override public ActionResult onItemRightClick(ItemStack disk, World world, EntityPlayer player, EnumHand hand) { - if (!world.isRemote && player.isSneaking() && NBTStorage.isValid(disk) && NBTStorage.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) { + if (!world.isRemote && player.isSneaking() && NBTItemStorage.isValid(disk) && NBTItemStorage.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); - NBTStorage.createStackWithNBT(stack); + NBTItemStorage.createStackWithNBT(stack); } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java b/src/main/java/refinedstorage/network/MessageGridCraftingStart.java index e0d610f9e..023e6c832 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingStart.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.network.IGridHandler; +import refinedstorage.api.network.grid.IItemGridHandler; import refinedstorage.container.ContainerGrid; public class MessageGridCraftingStart extends MessageHandlerPlayerToServer implements IMessage { @@ -36,7 +36,7 @@ public class MessageGridCraftingStart extends MessageHandlerPlayerToServer implements IMessage { @@ -32,7 +32,7 @@ public class MessageGridInsertHeld extends MessageHandlerPlayerToServer implements IMessage { @@ -36,7 +36,7 @@ public class MessageGridPull extends MessageHandlerPlayerToServer SIZE_COMPARATOR = (left, right) -> { + private static final Comparator SIZE_COMPARATOR = (left, right) -> { if (left.getStored() == right.getStored()) { return 0; } @@ -124,7 +125,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR return (left.getStored() > right.getStored()) ? -1 : 1; }; - private static final Comparator PRIORITY_COMPARATOR = (left, right) -> { + private static final Comparator PRIORITY_COMPARATOR = (left, right) -> { if (left.getPriority() == right.getPriority()) { return 0; } @@ -132,11 +133,11 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR return (left.getPriority() > right.getPriority()) ? -1 : 1; }; - private GridHandler gridHandler = new GridHandler(this); + private ItemGridHandler gridHandler = new ItemGridHandler(this); private WirelessGridHandler wirelessGridHandler = new WirelessGridHandler(this); private INetworkNodeGraph nodeGraph = new NetworkNodeGraph(this); - private IGroupedStorage storage = new GroupedStorage(this); + private IGroupedItemStorage storage = new GroupedItemStorage(this); private List patterns = new ArrayList<>(); @@ -303,7 +304,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } @Override - public IGridHandler getGridHandler() { + public IItemGridHandler getGridHandler() { return gridHandler; } @@ -319,7 +320,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR energyEU.onChunkUnload(); } - public IGroupedStorage getStorage() { + public IGroupedItemStorage getStorage() { return storage; } @@ -469,11 +470,11 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR ItemStack remainder = stack; - for (IStorage storage : this.storage.getStorages()) { + for (IItemStorage storage : this.storage.getStorages()) { remainder = storage.insertItem(remainder, size, simulate); - if (storage instanceof ExternalStorage && !simulate) { - ((ExternalStorage) storage).updateCacheForcefully(); + if (storage instanceof ItemStorageExternal && !simulate) { + ((ItemStorageExternal) storage).updateCacheForcefully(); } if (remainder == null) { @@ -507,12 +508,12 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR ItemStack newStack = null; - for (IStorage storage : this.storage.getStorages()) { + for (IItemStorage storage : this.storage.getStorages()) { ItemStack took = storage.extractItem(stack, requested - received, flags); if (took != null) { - if (storage instanceof ExternalStorage) { - ((ExternalStorage) storage).updateCacheForcefully(); + if (storage instanceof ItemStorageExternal) { + ((ItemStorageExternal) storage).updateCacheForcefully(); } if (newStack == null) { diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index c5e6e69ba..f42b256b0 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -12,9 +12,9 @@ import net.minecraftforge.items.ItemHandlerHelper; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.IStorage; import refinedstorage.api.storage.IStorageProvider; -import refinedstorage.apiimpl.storage.NBTStorage; +import refinedstorage.api.storage.item.IItemStorage; +import refinedstorage.apiimpl.storage.NBTItemStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemValidatorBasic; @@ -30,8 +30,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag public static final TileDataParameter COMPARE = IComparable.createParameter(); public static final TileDataParameter MODE = IFilterable.createParameter(); - public class Storage extends NBTStorage { - public Storage(ItemStack disk) { + public class ItemStorage extends NBTItemStorage { + 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) && NBTStorage.isValid(disk); + return super.isValid(disk) && NBTItemStorage.isValid(disk); } }) { @Override @@ -74,7 +74,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag if (disk == null) { storages[slot] = null; } else { - storages[slot] = new Storage(disk); + storages[slot] = new ItemStorage(disk); } if (network != null) { @@ -95,7 +95,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag private ItemHandlerBasic filters = new ItemHandlerBasic(9, this); - private Storage storages[] = new Storage[8]; + private ItemStorage storages[] = new ItemStorage[8]; private int priority = 0; private int compare = 0; @@ -139,7 +139,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag } public void onBreak() { - for (Storage storage : this.storages) { + for (ItemStorage storage : this.storages) { if (storage != null) { storage.writeToNBT(); } @@ -154,8 +154,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag } @Override - public void addStorages(List storages) { - for (IStorage storage : this.storages) { + public void addItemStorages(List storages) { + for (IItemStorage storage : this.storages) { if (storage != null) { storages.add(storage); } @@ -256,7 +256,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag return 0; } - stored += NBTStorage.getStoredFromNBT(disk.getTagCompound()); + stored += NBTItemStorage.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 += NBTStorage.getStoredFromNBT(stack.getTagCompound()); + stored += NBTItemStorage.getStoredFromNBT(stack.getTagCompound()); } } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 74e4c94ff..c4049faa3 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -11,7 +11,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.api.RefinedStorageAPI; import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.solderer.ISoldererRecipe; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemHandlerSolderer; import refinedstorage.inventory.ItemHandlerUpgrade; diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index a9099c39f..e02de166d 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -8,9 +8,9 @@ import net.minecraftforge.items.ItemHandlerHelper; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.IStorage; import refinedstorage.api.storage.IStorageProvider; -import refinedstorage.apiimpl.storage.NBTStorage; +import refinedstorage.api.storage.item.IItemStorage; +import refinedstorage.apiimpl.storage.NBTItemStorage; import refinedstorage.block.BlockStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.ItemHandlerBasic; @@ -29,12 +29,12 @@ 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 NBTStorage.getStoredFromNBT(tile.storageTag); + return NBTItemStorage.getStoredFromNBT(tile.storageTag); } }); - class Storage extends NBTStorage { - public Storage() { + class ItemStorage extends NBTItemStorage { + public ItemStorage() { super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity(), TileStorage.this); } @@ -61,9 +61,9 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG private ItemHandlerBasic filters = new ItemHandlerBasic(9, this); - private NBTTagCompound storageTag = NBTStorage.createNBT(); + private NBTTagCompound storageTag = NBTItemStorage.createNBT(); - private Storage storage; + private ItemStorage storage; private EnumStorageType type; @@ -92,7 +92,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG super.update(); if (storage == null && storageTag != null) { - storage = new Storage(); + storage = new ItemStorage(); if (network != null) { network.getStorage().rebuild(); @@ -114,7 +114,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG } @Override - public void addStorages(List storages) { + public void addItemStorages(List storages) { if (storage != null) { storages.add(storage); } @@ -232,7 +232,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG this.storageTag = storageTag; } - public NBTStorage getStorage() { + public NBTItemStorage getStorage() { return storage; } diff --git a/src/main/java/refinedstorage/tile/config/IFilterable.java b/src/main/java/refinedstorage/tile/config/IFilterable.java index 6b2b7beb2..ebfcb883b 100755 --- a/src/main/java/refinedstorage/tile/config/IFilterable.java +++ b/src/main/java/refinedstorage/tile/config/IFilterable.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.tile.data.ITileDataConsumer; import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.TileDataParameter; diff --git a/src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java similarity index 94% rename from src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java rename to src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java index 77672cb07..c77a689e5 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java @@ -3,18 +3,18 @@ package refinedstorage.tile.externalstorage; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.tile.config.IFilterable; import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; -public class DeepStorageUnitStorage extends ExternalStorage { +public class ItemStorageDSU extends ItemStorageExternal { private TileExternalStorage externalStorage; private IDeepStorageUnit unit; - public DeepStorageUnitStorage(TileExternalStorage externalStorage, IDeepStorageUnit unit) { + public ItemStorageDSU(TileExternalStorage externalStorage, IDeepStorageUnit unit) { this.externalStorage = externalStorage; this.unit = unit; } diff --git a/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java similarity index 95% rename from src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java rename to src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java index 9a4127daa..71871665f 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java @@ -4,17 +4,17 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.tile.config.IFilterable; import java.util.Collections; import java.util.List; -public class DrawerStorage extends ExternalStorage { +public class ItemStorageDrawer extends ItemStorageExternal { private TileExternalStorage externalStorage; private IDrawer drawer; - public DrawerStorage(TileExternalStorage externalStorage, IDrawer drawer) { + public ItemStorageDrawer(TileExternalStorage externalStorage, IDrawer drawer) { this.externalStorage = externalStorage; this.drawer = drawer; } diff --git a/src/main/java/refinedstorage/tile/externalstorage/ExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java similarity index 81% rename from src/main/java/refinedstorage/tile/externalstorage/ExternalStorage.java rename to src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java index 6ec709ebf..71fe7d826 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java @@ -1,12 +1,12 @@ package refinedstorage.tile.externalstorage; import net.minecraft.item.ItemStack; -import refinedstorage.api.storage.CompareUtils; -import refinedstorage.api.storage.IStorage; +import refinedstorage.api.storage.item.CompareUtils; +import refinedstorage.api.storage.item.IItemStorage; import java.util.List; -public abstract class ExternalStorage implements IStorage { +public abstract class ItemStorageExternal implements IItemStorage { private List cache; public abstract int getCapacity(); diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java similarity index 91% rename from src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java rename to src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java index 09530a47a..3ea54ec06 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java @@ -3,17 +3,17 @@ package refinedstorage.tile.externalstorage; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.tile.config.IFilterable; import java.util.ArrayList; import java.util.List; -public class ItemHandlerStorage extends ExternalStorage { +public class ItemStorageItemHandler extends ItemStorageExternal { private TileExternalStorage externalStorage; private IItemHandler handler; - public ItemHandlerStorage(TileExternalStorage externalStorage, IItemHandler handler) { + public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) { this.externalStorage = externalStorage; this.handler = handler; } diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index abc96ce1f..57d14b7d2 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -10,8 +10,8 @@ import net.minecraftforge.items.IItemHandler; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import refinedstorage.RefinedStorage; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.IStorage; import refinedstorage.api.storage.IStorageProvider; +import refinedstorage.api.storage.item.IItemStorage; import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.tile.IStorageGui; import refinedstorage.tile.TileMultipartNode; @@ -34,7 +34,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr public Integer getValue(TileExternalStorage tile) { int stored = 0; - for (ExternalStorage storage : tile.storages) { + for (ItemStorageExternal storage : tile.storages) { stored += storage.getStored(); } @@ -47,7 +47,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr public Integer getValue(TileExternalStorage tile) { int capacity = 0; - for (ExternalStorage storage : tile.storages) { + for (ItemStorageExternal storage : tile.storages) { capacity += storage.getCapacity(); } @@ -65,7 +65,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr private int compare = 0; private int mode = IFilterable.WHITELIST; - private List storages = new ArrayList<>(); + private List storages = new ArrayList<>(); private int lastDrawerCount; public TileExternalStorage() { @@ -105,7 +105,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr if (ticks % (20 * 4) == 0) { boolean shouldRebuild = false; - for (ExternalStorage storage : storages) { + for (ItemStorageExternal storage : storages) { if (storage.updateCache()) { shouldRebuild = true; } @@ -204,18 +204,18 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr for (int i = 0; i < group.getDrawerCount(); ++i) { if (group.isDrawerEnabled(i)) { - storages.add(new DrawerStorage(this, group.getDrawer(i))); + storages.add(new ItemStorageDrawer(this, group.getDrawer(i))); } } } else if (facing instanceof IDrawer) { - storages.add(new DrawerStorage(this, (IDrawer) facing)); + storages.add(new ItemStorageDrawer(this, (IDrawer) facing)); } else if (facing instanceof IDeepStorageUnit) { - storages.add(new DeepStorageUnitStorage(this, (IDeepStorageUnit) facing)); + storages.add(new ItemStorageDSU(this, (IDeepStorageUnit) facing)); } else { IItemHandler handler = getItemHandler(facing, getDirection().getOpposite()); if (handler != null) { - storages.add(new ItemHandlerStorage(this, handler)); + storages.add(new ItemStorageItemHandler(this, handler)); } } @@ -223,7 +223,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr } @Override - public void addStorages(List storages) { + public void addItemStorages(List storages) { storages.addAll(this.storages); } diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/refinedstorage/tile/grid/IGrid.java index a730b8f34..a2d57de94 100755 --- a/src/main/java/refinedstorage/tile/grid/IGrid.java +++ b/src/main/java/refinedstorage/tile/grid/IGrid.java @@ -1,7 +1,7 @@ package refinedstorage.tile.grid; import net.minecraft.util.math.BlockPos; -import refinedstorage.api.network.IGridHandler; +import refinedstorage.api.network.grid.IItemGridHandler; import refinedstorage.block.EnumGridType; import refinedstorage.gui.grid.GridFilteredItem; import refinedstorage.inventory.ItemHandlerBasic; @@ -14,7 +14,7 @@ public interface IGrid { BlockPos getNetworkPosition(); - IGridHandler getGridHandler(); + IItemGridHandler getGridHandler(); int getViewType(); diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 4d4534dd6..133d10da9 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -15,9 +15,9 @@ import net.minecraftforge.items.wrapper.InvWrapper; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.api.network.IGridHandler; import refinedstorage.api.network.NetworkUtils; -import refinedstorage.api.storage.CompareUtils; +import refinedstorage.api.network.grid.IItemGridHandler; +import refinedstorage.api.storage.item.CompareUtils; import refinedstorage.block.BlockGrid; import refinedstorage.block.EnumGridType; import refinedstorage.container.ContainerGrid; @@ -195,7 +195,7 @@ public class TileGrid extends TileNode implements IGrid { } @Override - public IGridHandler getGridHandler() { + public IItemGridHandler getGridHandler() { return isConnected() ? network.getGridHandler() : null; } diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 4981e7761..7d4ee08d1 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; -import refinedstorage.api.network.IGridHandler; +import refinedstorage.api.network.grid.IItemGridHandler; import refinedstorage.block.EnumGridType; import refinedstorage.gui.grid.GridFilteredItem; import refinedstorage.gui.grid.GuiGrid; @@ -84,7 +84,7 @@ public class WirelessGrid implements IGrid { } @Override - public IGridHandler getGridHandler() { + public IItemGridHandler getGridHandler() { TileController controller = getController(); return controller != null ? controller.getGridHandler() : null;