diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index 3af06856c..0064fb7c6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -11,8 +11,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; import com.raoulvdberge.refinedstorage.block.*; import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; import com.raoulvdberge.refinedstorage.config.ServerConfig; @@ -85,8 +85,8 @@ public final class RS { MinecraftForge.EVENT_BUS.register(new NetworkNodeListener()); - API.instance().getStorageDiskRegistry().add(StorageDiskFactoryItem.ID, new StorageDiskFactoryItem()); - API.instance().getStorageDiskRegistry().add(StorageDiskFactoryFluid.ID, new StorageDiskFactoryFluid()); + API.instance().getStorageDiskRegistry().add(ItemStorageDiskFactory.ID, new ItemStorageDiskFactory()); + API.instance().getStorageDiskRegistry().add(FluidStorageDiskFactory.ID, new FluidStorageDiskFactory()); API.instance().getNetworkNodeRegistry().add(DiskDriveNetworkNode.ID, (tag, world, pos) -> readAndReturn(tag, new DiskDriveNetworkNode(world, pos))); API.instance().getNetworkNodeRegistry().add(CableNetworkNode.ID, (tag, world, pos) -> readAndReturn(tag, new CableNetworkNode(world, pos))); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java index 30877049e..b387429c7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java @@ -8,8 +8,8 @@ import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterManager; import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager; import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java index 193cc823e..372d4ecf2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java @@ -2,8 +2,8 @@ package com.raoulvdberge.refinedstorage.api.network.grid; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IFilter; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCache.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCache.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCache.java index 394973a16..87114e4e4 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCache.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCache.java @@ -1,6 +1,8 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.raoulvdberge.refinedstorage.api.storage.cache; import com.raoulvdberge.refinedstorage.api.network.INetwork; +import com.raoulvdberge.refinedstorage.api.storage.IStorage; +import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; import com.raoulvdberge.refinedstorage.api.util.IStackList; import javax.annotation.Nonnull; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCacheListener.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCacheListener.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCacheListener.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCacheListener.java index 08669fcb4..474185de9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageCacheListener.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/cache/IStorageCacheListener.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.raoulvdberge.refinedstorage.api.storage.cache; import com.raoulvdberge.refinedstorage.api.util.StackListResult; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java index e0c0d1190..cc9ab789f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSync.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; import java.util.UUID; /** - * Used to send requests to the server to get storage disk information ({@link IStorageDiskSyncData}). + * Used to send requests to the server to get storage disk information ({@link StorageDiskSyncData}). */ public interface IStorageDiskSync { /** @@ -15,7 +15,7 @@ public interface IStorageDiskSync { * @return the disk data, or null if there was no response from the server yet */ @Nullable - IStorageDiskSyncData getData(UUID id); + StorageDiskSyncData getData(UUID id); /** * Sends a request to the server to get information from a storage disk. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSyncData.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSyncData.java deleted file mode 100644 index 42f66920e..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskSyncData.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.raoulvdberge.refinedstorage.api.storage.disk; - -/** - * Contains storage disk data. - */ -public interface IStorageDiskSyncData { - /** - * @return the amount stored - */ - int getStored(); - - /** - * @return the capacity, or -1 if infinite capacity - */ - int getCapacity(); -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSyncData.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/StorageDiskSyncData.java similarity index 55% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSyncData.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/StorageDiskSyncData.java index 4edbfa463..3642bc27a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSyncData.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/StorageDiskSyncData.java @@ -1,8 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.raoulvdberge.refinedstorage.api.storage.disk; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData; - -public class StorageDiskSyncData implements IStorageDiskSyncData { +/** + * Contains synced info about a storage disk. + */ +public class StorageDiskSyncData { private int stored; private int capacity; @@ -11,12 +12,16 @@ public class StorageDiskSyncData implements IStorageDiskSyncData { this.capacity = capacity; } - @Override + /** + * @return the amount stored + */ public int getStored() { return stored; } - @Override + /** + * @return the capacity + */ public int getCapacity() { return capacity; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IStorageExternal.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IStorageExternal.java index 7f057b05b..2bb5cc87d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IStorageExternal.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/externalstorage/IStorageExternal.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.api.storage.externalstorage; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.storage.IStorage; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; /** * An external storage handler. @@ -10,9 +11,9 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorage; */ public interface IStorageExternal extends IStorage { /** - * For storage disks and blocks, the network detects changes and updates the {@link com.raoulvdberge.refinedstorage.api.storage.IStorageCache} accordingly. + * For storage disks and blocks, the network detects changes and updates the {@link IStorageCache} accordingly. * However, for blocks connected to an external storage the external storage itself is responsible for bookkeeping the changes - * and submitting them to the {@link com.raoulvdberge.refinedstorage.api.storage.IStorageCache}. That bookkeeping is supposed to happen in this method. + * and submitting them to the {@link IStorageCache}. That bookkeeping is supposed to happen in this method. *

* It's called every external storage tick. * diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageTracker.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/IStorageTracker.java similarity index 61% rename from src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageTracker.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/IStorageTracker.java index 2b4eb2820..5b4915c91 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/IStorageTracker.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/IStorageTracker.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.api.storage; +package com.raoulvdberge.refinedstorage.api.storage.tracker; import net.minecraft.entity.player.PlayerEntity; @@ -8,18 +8,6 @@ import javax.annotation.Nullable; * Keeps track of when a stack is changed in the system. */ public interface IStorageTracker { - interface IStorageTrackerEntry { - /** - * @return the modification time - */ - long getTime(); - - /** - * @return the name of the player who last modified the stack - */ - String getName(); - } - /** * Updates the storage tracker entry for a stack, changing it's player name and modification time. * @@ -33,5 +21,5 @@ public interface IStorageTracker { * @return the entry, or null if the stack hasn't been modified yet */ @Nullable - IStorageTrackerEntry get(T stack); + StorageTrackerEntry get(T stack); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/StorageTrackerEntry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/StorageTrackerEntry.java new file mode 100644 index 000000000..ef6c2b8e9 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/tracker/StorageTrackerEntry.java @@ -0,0 +1,28 @@ +package com.raoulvdberge.refinedstorage.api.storage.tracker; + +/** + * Represents a storage tracker entry. + */ +public class StorageTrackerEntry { + private final long time; + private final String name; + + public StorageTrackerEntry(long time, String name) { + this.time = time; + this.name = name; + } + + /** + * @return the modification time + */ + public long getTime() { + return time; + } + + /** + * @return the name of the player who modified this item + */ + public String getName() { + return name; + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java index 66df16c6f..be8bbd9f1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/StackListResult.java @@ -2,6 +2,11 @@ package com.raoulvdberge.refinedstorage.api.util; import java.util.UUID; +/** + * Contains the result of a stack list manipulation. + * + * @param the stack type + */ public class StackListResult { private T stack; private UUID id; @@ -13,14 +18,23 @@ public class StackListResult { this.change = change; } + /** + * @return the stack + */ public T getStack() { return stack; } + /** + * @return the id of the {@link StackListEntry} + */ public UUID getId() { return id; } + /** + * @return the change/delta value, is positive if this was a stack addition, or negative if it's a stack removal + */ public int getChange() { return change; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java index 0ece01d36..b1cdf18de 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java @@ -210,13 +210,13 @@ public class API implements IRSAPI { @Override @Nonnull public IStorageDisk createDefaultItemDisk(ServerWorld world, int capacity) { - return new StorageDiskItem(world, capacity); + return new ItemStorageDisk(world, capacity); } @Override @Nonnull public IStorageDisk createDefaultFluidDisk(ServerWorld world, int capacity) { - return new StorageDiskFluid(world, capacity); + return new FluidStorageDisk(world, capacity); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index e2c7c99ba..a0e4d247e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -20,10 +20,10 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.Craf import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryItem; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -103,8 +103,8 @@ public class CraftingTask implements ICraftingTask { this.quantity = quantity; this.pattern = pattern; - this.internalStorage = new StorageDiskItem(null, -1); - this.internalFluidStorage = new StorageDiskFluid(null, -1); + this.internalStorage = new ItemStorageDisk(null, -1); + this.internalFluidStorage = new FluidStorageDisk(null, -1); } public CraftingTask(INetwork network, CompoundNBT tag) throws CraftingTaskReadException { @@ -121,8 +121,8 @@ public class CraftingTask implements ICraftingTask { this.totalSteps = tag.getInt(NBT_TOTAL_STEPS); } - StorageDiskFactoryItem factoryItem = new StorageDiskFactoryItem(); - StorageDiskFactoryFluid factoryFluid = new StorageDiskFactoryFluid(); + ItemStorageDiskFactory factoryItem = new ItemStorageDiskFactory(); + FluidStorageDiskFactory factoryFluid = new FluidStorageDiskFactory(); this.internalStorage = factoryItem.createFromNbt(null, tag.getCompound(NBT_INTERNAL_STORAGE)); this.internalFluidStorage = factoryFluid.createFromNbt(null, tag.getCompound(NBT_INTERNAL_FLUID_STORAGE)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java index 66e707897..65b6b078b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -6,14 +6,14 @@ import com.raoulvdberge.refinedstorage.api.network.grid.*; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IFilter; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; import com.raoulvdberge.refinedstorage.block.NodeBlock; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; @@ -235,7 +235,7 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I @Override public IStorageCacheListener createListener(ServerPlayerEntity player) { - return getGridType() == GridType.FLUID ? new StorageCacheListenerGridFluid(player, network) : new StorageCacheListenerGridItem(player, network); + return getGridType() == GridType.FLUID ? new FluidGridStorageCacheListener(player, network) : new ItemGridStorageCacheListener(player, network); } @Nullable diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java index f7f30124f..c97058461 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java @@ -12,8 +12,8 @@ import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IStorageExter import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; @@ -245,8 +245,8 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP } } - network.getNodeGraph().runActionWhenPossible(StorageCacheItem.INVALIDATE); - network.getNodeGraph().runActionWhenPossible(StorageCacheFluid.INVALIDATE); + network.getNodeGraph().runActionWhenPossible(ItemStorageCache.INVALIDATE); + network.getNodeGraph().runActionWhenPossible(FluidStorageCache.INVALIDATE); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java index 8eddb411e..c1b04d2be 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java @@ -10,8 +10,8 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerCon import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; @@ -162,8 +162,8 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide public void onConnectedStateChange(INetwork network, boolean state) { super.onConnectedStateChange(network, state); - network.getNodeGraph().runActionWhenPossible(StorageCacheItem.INVALIDATE); - network.getNodeGraph().runActionWhenPossible(StorageCacheFluid.INVALIDATE); + network.getNodeGraph().runActionWhenPossible(ItemStorageCache.INVALIDATE); + network.getNodeGraph().runActionWhenPossible(FluidStorageCache.INVALIDATE); WorldUtils.updateBlock(world, pos); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java index e5d0a5b6e..d92fadd66 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java @@ -12,7 +12,7 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IStorageScreen; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheFluid; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; import com.raoulvdberge.refinedstorage.block.BlockFluidStorage; import com.raoulvdberge.refinedstorage.block.enums.FluidStorageType; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; @@ -69,7 +69,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageScre public void onConnectedStateChange(INetwork network, boolean state) { super.onConnectedStateChange(network, state); - network.getNodeGraph().runActionWhenPossible(StorageCacheFluid.INVALIDATE); + network.getNodeGraph().runActionWhenPossible(FluidStorageCache.INVALIDATE); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java index 542a5cd5c..e8ae14d39 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java @@ -12,7 +12,7 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IStorageScreen; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; import com.raoulvdberge.refinedstorage.block.BlockStorage; import com.raoulvdberge.refinedstorage.block.enums.ItemStorageType; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; @@ -69,7 +69,7 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I public void onConnectedStateChange(INetwork network, boolean state) { super.onConnectedStateChange(network, state); - network.getNodeGraph().runActionWhenPossible(StorageCacheItem.INVALIDATE); + network.getNodeGraph().runActionWhenPossible(ItemStorageCache.INVALIDATE); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java deleted file mode 100644 index 970659a73..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerEntry.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; - -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; -import io.netty.buffer.ByteBuf; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.common.network.ByteBufUtils; - -public class StorageTrackerEntry implements IStorageTracker.IStorageTrackerEntry { - private long time; - private String name; - - public StorageTrackerEntry(long time, String name) { - this.time = time; - this.name = name; - } - - public StorageTrackerEntry(PacketBuffer buf) { - this.time = buf.readLong(); - this.name = buf.readString(); - } - - @Override - public long getTime() { - return time; - } - - @Override - public String getName() { - return name; - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java deleted file mode 100644 index 0fdf0156e..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerFluid.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; - -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraftforge.fluids.FluidStack; - -import java.util.HashMap; -import java.util.Map; - -public class StorageTrackerFluid implements IStorageTracker { - private static final String NBT_STACK = "Stack"; - private static final String NBT_NAME = "Name"; - private static final String NBT_TIME = "Time"; - - private Map changes = new HashMap<>(); // TODO broken - /* - private Map changes = new TCustomHashMap<>(new HashingStrategy() { - @Override - public int computeHashCode(FluidStack stack) { - return API.instance().getFluidStackHashCode(stack); - } - - @Override - public boolean equals(FluidStack left, FluidStack right) { - return API.instance().getComparer().isEqual(left, right, IComparer.COMPARE_NBT); - } - });*/ - - private Runnable listener; - - public StorageTrackerFluid(Runnable listener) { - this.listener = listener; - } - - @Override - public void changed(PlayerEntity player, FluidStack stack) { - changes.put(stack, new StorageTrackerEntry(System.currentTimeMillis(), player.getName().getString())); // TODO: correct? - - listener.run(); - } - - @Override - public IStorageTrackerEntry get(FluidStack stack) { - return changes.get(stack); - } - - public void readFromNbt(ListNBT list) { - for (int i = 0; i < list.size(); ++i) { - CompoundNBT tag = list.getCompound(i); - - FluidStack stack = FluidStack.loadFluidStackFromNBT(tag.getCompound(NBT_STACK)); - - if (stack != null) { - changes.put( - stack, - new StorageTrackerEntry(tag.getLong(NBT_TIME), tag.getString(NBT_NAME)) - ); - } - } - } - - public ListNBT serializeNbt() { - ListNBT list = new ListNBT(); - - for (Map.Entry entry : changes.entrySet()) { - CompoundNBT tag = new CompoundNBT(); - - tag.putLong(NBT_TIME, entry.getValue().getTime()); - tag.putString(NBT_NAME, entry.getValue().getName()); - tag.put(NBT_STACK, entry.getKey().writeToNBT(new CompoundNBT())); - - list.add(tag); - } - - return list; - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java index bf18dc32c..a58be7a83 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/FluidStorageCache.java @@ -1,7 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.*; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.IStorage; +import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -14,7 +18,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; -public class StorageCacheFluid implements IStorageCache { +public class FluidStorageCache implements IStorageCache { public static final Consumer INVALIDATE = n -> n.getFluidStorageCache().invalidate(); private INetwork network; @@ -23,7 +27,7 @@ public class StorageCacheFluid implements IStorageCache { private List> listeners = new LinkedList<>(); private List> batchedChanges = new ArrayList<>(); - public StorageCacheFluid(INetwork network) { + public FluidStorageCache(INetwork network) { this.network = network; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java index d0075f0ed..c2af3da70 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/ItemStorageCache.java @@ -1,7 +1,11 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.*; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.IStorage; +import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -14,7 +18,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; -public class StorageCacheItem implements IStorageCache { +public class ItemStorageCache implements IStorageCache { public static final Consumer INVALIDATE = network -> network.getItemStorageCache().invalidate(); private INetwork network; @@ -23,7 +27,7 @@ public class StorageCacheItem implements IStorageCache { private List> listeners = new LinkedList<>(); private List> batchedChanges = new ArrayList<>(); - public StorageCacheItem(INetwork network) { + public ItemStorageCache(INetwork network) { this.network = network; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluidPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluidPortable.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java index 7d84ac71e..1d6bbe3e1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluidPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -14,12 +14,12 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class StorageCacheFluidPortable implements IStorageCache { +public class PortableFluidStorageCache implements IStorageCache { private IPortableGrid portableGrid; private IStackList list = API.instance().createFluidStackList(); private List> listeners = new LinkedList<>(); - public StorageCacheFluidPortable(IPortableGrid portableGrid) { + public PortableFluidStorageCache(IPortableGrid portableGrid) { this.portableGrid = portableGrid; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItemPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItemPortable.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java index 7d1df3b93..3901b984a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItemPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java @@ -1,8 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache; import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -14,12 +14,12 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class StorageCacheItemPortable implements IStorageCache { +public class PortableItemStorageCache implements IStorageCache { private IPortableGrid portableGrid; private IStackList list = API.instance().createItemStackList(); private List> listeners = new LinkedList<>(); - public StorageCacheItemPortable(IPortableGrid portableGrid) { + public PortableItemStorageCache(IPortableGrid portableGrid) { this.portableGrid = portableGrid; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java index 60b108c95..b5bf25623 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java @@ -1,18 +1,18 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fluids.FluidStack; import java.util.List; -public class StorageCacheListenerGridFluid implements IStorageCacheListener { +public class FluidGridStorageCacheListener implements IStorageCacheListener { private ServerPlayerEntity player; private INetwork network; - public StorageCacheListenerGridFluid(ServerPlayerEntity player, INetwork network) { + public FluidGridStorageCacheListener(ServerPlayerEntity player, INetwork network) { this.player = player; this.network = network; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java index 67d86cb40..a07ab4029 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java @@ -1,9 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.network.grid.GridItemDeltaMessage; import com.raoulvdberge.refinedstorage.network.grid.GridItemUpdateMessage; @@ -13,11 +13,11 @@ import net.minecraft.item.ItemStack; import java.util.ArrayList; import java.util.List; -public class StorageCacheListenerGridItem implements IStorageCacheListener { +public class ItemGridStorageCacheListener implements IStorageCacheListener { private ServerPlayerEntity player; private INetwork network; - public StorageCacheListenerGridItem(ServerPlayerEntity player, INetwork network) { + public ItemGridStorageCacheListener(ServerPlayerEntity player, INetwork network) { this.player = player; this.network = network; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java index 88a85555c..9c5810211 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortableFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.entity.player.ServerPlayerEntity; @@ -8,11 +8,11 @@ import net.minecraftforge.fluids.FluidStack; import java.util.List; -public class StorageCacheListenerGridPortableFluid implements IStorageCacheListener { +public class PortableFluidGridStorageCacheListener implements IStorageCacheListener { private IPortableGrid portableGrid; private ServerPlayerEntity player; - public StorageCacheListenerGridPortableFluid(IPortableGrid portableGrid, ServerPlayerEntity player) { + public PortableFluidGridStorageCacheListener(IPortableGrid portableGrid, ServerPlayerEntity player) { this.portableGrid = portableGrid; this.player = player; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java index 15e41ce2a..617b436a1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheListenerGridPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.StackListResult; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; import net.minecraft.entity.player.ServerPlayerEntity; @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import java.util.List; -public class StorageCacheListenerGridPortable implements IStorageCacheListener { +public class PortableItemGridStorageCacheListener implements IStorageCacheListener { private IPortableGrid portableGrid; private ServerPlayerEntity player; - public StorageCacheListenerGridPortable(IPortableGrid portableGrid, ServerPlayerEntity player) { + public PortableItemGridStorageCacheListener(IPortableGrid portableGrid, ServerPlayerEntity player) { this.portableGrid = portableGrid; this.player = player; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java index a86705f88..0e9856f10 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerCon import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.fluid.Fluid; import net.minecraft.nbt.CompoundNBT; @@ -20,11 +21,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; -public class StorageDiskFluid implements IStorageDisk { - static final String NBT_VERSION = "Version"; - static final String NBT_CAPACITY = "Capacity"; - static final String NBT_FLUIDS = "Fluids"; - static final int VERSION = 1; +public class FluidStorageDisk implements IStorageDisk { + public static final String NBT_VERSION = "Version"; + public static final String NBT_CAPACITY = "Capacity"; + public static final String NBT_FLUIDS = "Fluids"; + public static final int VERSION = 1; private ServerWorld world; private int capacity; @@ -34,7 +35,7 @@ public class StorageDiskFluid implements IStorageDisk { private IStorageDiskListener listener; private IStorageDiskContainerContext context; - public StorageDiskFluid(ServerWorld world, int capacity) { + public FluidStorageDisk(ServerWorld world, int capacity) { if (world == null) { throw new IllegalArgumentException("World cannot be null"); } @@ -184,10 +185,10 @@ public class StorageDiskFluid implements IStorageDisk { @Override public ResourceLocation getFactoryId() { - return StorageDiskFactoryFluid.ID; + return FluidStorageDiskFactory.ID; } - Multimap getRawStacks() { + public Multimap getRawStacks() { return stacks; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java index 4d0baac31..f6606a45a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerCon import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskListener; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,11 +22,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; -public class StorageDiskItem implements IStorageDisk { - static final String NBT_VERSION = "Version"; - static final String NBT_CAPACITY = "Capacity"; - static final String NBT_ITEMS = "Items"; - static final int VERSION = 1; +public class ItemStorageDisk implements IStorageDisk { + public static final String NBT_VERSION = "Version"; + public static final String NBT_CAPACITY = "Capacity"; + public static final String NBT_ITEMS = "Items"; + public static final int VERSION = 1; private ServerWorld world; private int capacity; @@ -35,7 +36,7 @@ public class StorageDiskItem implements IStorageDisk { private IStorageDiskListener listener; private IStorageDiskContainerContext context; - public StorageDiskItem(ServerWorld world, int capacity) { + public ItemStorageDisk(ServerWorld world, int capacity) { if (world == null) { throw new IllegalArgumentException("World cannot be null"); } @@ -63,7 +64,7 @@ public class StorageDiskItem implements IStorageDisk { @Override public ResourceLocation getFactoryId() { - return StorageDiskFactoryItem.ID; + return ItemStorageDiskFactory.ID; } @Override @@ -188,7 +189,7 @@ public class StorageDiskItem implements IStorageDisk { return remainder == null ? size : (size - remainder.getCount()); } - Multimap getRawStacks() { + public Multimap getRawStacks() { return stacks; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java index 874c5de01..69d2725b5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluidPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java @@ -14,11 +14,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; -public class StorageDiskFluidPortable implements IStorageDisk { +public class PortableFluidStorageDisk implements IStorageDisk { private IStorageDisk parent; private IPortableGrid portableGrid; - public StorageDiskFluidPortable(IStorageDisk parent, IPortableGrid portableGrid) { + public PortableFluidStorageDisk(IStorageDisk parent, IPortableGrid portableGrid) { this.parent = parent; this.portableGrid = portableGrid; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java index 161fa7cb1..1557f673a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItemPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java @@ -14,11 +14,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; -public class StorageDiskItemPortable implements IStorageDisk { +public class PortableItemStorageDisk implements IStorageDisk { private IStorageDisk parent; private IPortableGrid portableGrid; - public StorageDiskItemPortable(IStorageDisk parent, IPortableGrid portableGrid) { + public PortableItemStorageDisk(IStorageDisk parent, IPortableGrid portableGrid) { this.parent = parent; this.portableGrid = portableGrid; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java index acf3935e4..600f00517 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSync; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData; +import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.raoulvdberge.refinedstorage.network.disk.StorageDiskSizeRequestMessage; import javax.annotation.Nullable; @@ -13,16 +13,16 @@ import java.util.UUID; public class StorageDiskSync implements IStorageDiskSync { private static final int THROTTLE_MS = 500; - private Map data = new HashMap<>(); + private Map data = new HashMap<>(); private Map syncTime = new HashMap<>(); @Nullable @Override - public IStorageDiskSyncData getData(UUID id) { + public StorageDiskSyncData getData(UUID id) { return data.get(id); } - public void setData(UUID id, IStorageDiskSyncData data) { + public void setData(UUID id, StorageDiskSyncData data) { this.data.put(id, data); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java index 8977eacbf..e50f29db0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java @@ -1,8 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.util.ResourceLocation; @@ -10,14 +11,14 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; -public class StorageDiskFactoryFluid implements IStorageDiskFactory { +public class FluidStorageDiskFactory implements IStorageDiskFactory { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid"); @Override public IStorageDisk createFromNbt(ServerWorld world, CompoundNBT tag) { - StorageDiskFluid disk = new StorageDiskFluid(world, tag.getInt(StorageDiskFluid.NBT_CAPACITY)); + FluidStorageDisk disk = new FluidStorageDisk(world, tag.getInt(FluidStorageDisk.NBT_CAPACITY)); - ListNBT list = tag.getList(StorageDiskFluid.NBT_FLUIDS, Constants.NBT.TAG_COMPOUND); + ListNBT list = tag.getList(FluidStorageDisk.NBT_FLUIDS, Constants.NBT.TAG_COMPOUND); for (int i = 0; i < list.size(); ++i) { FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompound(i)); @@ -32,6 +33,6 @@ public class StorageDiskFactoryFluid implements IStorageDiskFactory @Override public IStorageDisk create(ServerWorld world, int capacity) { - return new StorageDiskFluid(world, capacity); + return new FluidStorageDisk(world, capacity); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java index ed5c0d8f9..50054d0fd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFactoryItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java @@ -1,8 +1,9 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; +package com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskFactory; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.ItemStorageDisk; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -11,14 +12,14 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.Constants; -public class StorageDiskFactoryItem implements IStorageDiskFactory { +public class ItemStorageDiskFactory implements IStorageDiskFactory { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "item"); @Override public IStorageDisk createFromNbt(ServerWorld world, CompoundNBT tag) { - StorageDiskItem disk = new StorageDiskItem(world, tag.getInt(StorageDiskItem.NBT_CAPACITY)); + ItemStorageDisk disk = new ItemStorageDisk(world, tag.getInt(ItemStorageDisk.NBT_CAPACITY)); - ListNBT list = tag.getList(StorageDiskItem.NBT_ITEMS, Constants.NBT.TAG_COMPOUND); + ListNBT list = tag.getList(ItemStorageDisk.NBT_ITEMS, Constants.NBT.TAG_COMPOUND); for (int i = 0; i < list.size(); ++i) { ItemStack stack = StackUtils.deserializeStackFromNbt(list.getCompound(i)); @@ -33,6 +34,6 @@ public class StorageDiskFactoryItem implements IStorageDiskFactory { @Override public IStorageDisk create(ServerWorld world, int capacity) { - return new StorageDiskItem(world, capacity); + return new ItemStorageDisk(world, capacity); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java new file mode 100644 index 000000000..6a66b273d --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java @@ -0,0 +1,84 @@ +package com.raoulvdberge.refinedstorage.apiimpl.storage.tracker; + +import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.raoulvdberge.refinedstorage.api.util.IComparer; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraftforge.fluids.FluidStack; + +import java.util.HashMap; +import java.util.Map; + +public class FluidStorageTracker implements IStorageTracker { + private static final String NBT_STACK = "Stack"; + private static final String NBT_NAME = "Name"; + private static final String NBT_TIME = "Time"; + + private final Map changes = new HashMap<>(); + private final Runnable listener; + + public FluidStorageTracker(Runnable listener) { + this.listener = listener; + } + + @Override + public void changed(PlayerEntity player, FluidStack stack) { + changes.put(new Key(stack), new StorageTrackerEntry(System.currentTimeMillis(), player.getName().getString())); + + listener.run(); + } + + @Override + public StorageTrackerEntry get(FluidStack stack) { + return changes.get(stack); + } + + public void readFromNbt(ListNBT list) { + for (int i = 0; i < list.size(); ++i) { + CompoundNBT tag = list.getCompound(i); + + FluidStack stack = FluidStack.loadFluidStackFromNBT(tag.getCompound(NBT_STACK)); + + if (stack != null) { + changes.put(new Key(stack), new StorageTrackerEntry(tag.getLong(NBT_TIME), tag.getString(NBT_NAME))); + } + } + } + + public ListNBT serializeNbt() { + ListNBT list = new ListNBT(); + + for (Map.Entry entry : changes.entrySet()) { + CompoundNBT tag = new CompoundNBT(); + + tag.putLong(NBT_TIME, entry.getValue().getTime()); + tag.putString(NBT_NAME, entry.getValue().getName()); + tag.put(NBT_STACK, entry.getKey().stack.writeToNBT(new CompoundNBT())); + + list.add(tag); + } + + return list; + } + + private class Key { + private final FluidStack stack; + + public Key(FluidStack stack) { + this.stack = stack; + } + + @Override + public boolean equals(Object other) { + return other instanceof Key && API.instance().getComparer().isEqual(stack, ((Key) other).stack, IComparer.COMPARE_NBT); + } + + @Override + public int hashCode() { + return API.instance().getFluidStackHashCode(stack); + } + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java similarity index 52% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java index 8d036e0cf..cd907e1b4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageTrackerItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java @@ -1,6 +1,8 @@ -package com.raoulvdberge.refinedstorage.apiimpl.storage; +package com.raoulvdberge.refinedstorage.apiimpl.storage.tracker; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; +import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -10,40 +12,28 @@ import net.minecraft.nbt.ListNBT; import java.util.HashMap; import java.util.Map; -public class StorageTrackerItem implements IStorageTracker { +public class ItemStorageTracker implements IStorageTracker { private static final String NBT_STACK = "Stack"; private static final String NBT_NAME = "Name"; private static final String NBT_TIME = "Time"; + private final Map changes = new HashMap<>(); + private final Runnable listener; - private Map changes = new HashMap<>(); /* TODO BROKEN new TCustomHashMap<>(new HashingStrategy() { - @Override - public int computeHashCode(ItemStack stack) { - return API.instance().getItemStackHashCode(stack); - } - - @Override - public boolean equals(ItemStack left, ItemStack right) { - return API.instance().getComparer().isEqualNoQuantity(left, right); - } - });*/ - - private Runnable listener; - - public StorageTrackerItem(Runnable listener) { + public ItemStorageTracker(Runnable listener) { this.listener = listener; } @Override public void changed(PlayerEntity player, ItemStack stack) { - changes.put(stack, new StorageTrackerEntry(System.currentTimeMillis(), player.getName().getString())); // TODO correct? + changes.put(new Key(stack), new StorageTrackerEntry(System.currentTimeMillis(), player.getName().getFormattedText())); listener.run(); } @Override - public IStorageTrackerEntry get(ItemStack stack) { - return changes.get(stack); + public StorageTrackerEntry get(ItemStack stack) { + return changes.get(new Key(stack)); } public void readFromNbt(ListNBT list) { @@ -53,10 +43,7 @@ public class StorageTrackerItem implements IStorageTracker { ItemStack stack = StackUtils.deserializeStackFromNbt(tag.getCompound(NBT_STACK)); if (!stack.isEmpty()) { - changes.put( - stack, - new StorageTrackerEntry(tag.getLong(NBT_TIME), tag.getString(NBT_NAME)) - ); + changes.put(new Key(stack), new StorageTrackerEntry(tag.getLong(NBT_TIME), tag.getString(NBT_NAME))); } } } @@ -64,16 +51,34 @@ public class StorageTrackerItem implements IStorageTracker { public ListNBT serializeNbt() { ListNBT list = new ListNBT(); - for (Map.Entry entry : changes.entrySet()) { + for (Map.Entry entry : changes.entrySet()) { CompoundNBT tag = new CompoundNBT(); tag.putLong(NBT_TIME, entry.getValue().getTime()); tag.putString(NBT_NAME, entry.getValue().getName()); - tag.put(NBT_STACK, StackUtils.serializeStackToNbt(entry.getKey())); + tag.put(NBT_STACK, StackUtils.serializeStackToNbt(entry.getKey().stack)); list.add(tag); } return list; } + + private class Key { + private final ItemStack stack; + + public Key(ItemStack stack) { + this.stack = stack; + } + + @Override + public boolean equals(Object other) { + return other instanceof Key && API.instance().getComparer().isEqualNoQuantity(stack, ((Key) other).stack); + } + + @Override + public int hashCode() { + return API.instance().getItemStackHashCode(stack); + } + } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FilterFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidFilter.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FilterFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidFilter.java index 80edffcdd..96e0fe596 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FilterFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidFilter.java @@ -3,13 +3,13 @@ package com.raoulvdberge.refinedstorage.apiimpl.util; import com.raoulvdberge.refinedstorage.api.util.IFilter; import net.minecraftforge.fluids.FluidStack; -public class FilterFluid implements IFilter { +public class FluidFilter implements IFilter { private FluidStack stack; private int compare; private int mode; private boolean modFilter; - public FilterFluid(FluidStack stack, int compare, int mode, boolean modFilter) { + public FluidFilter(FluidStack stack, int compare, int mode, boolean modFilter) { this.stack = stack; this.compare = compare; this.mode = mode; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FilterItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemFilter.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FilterItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemFilter.java index 684fc8de2..19d698ac3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FilterItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemFilter.java @@ -3,13 +3,13 @@ package com.raoulvdberge.refinedstorage.apiimpl.util; import com.raoulvdberge.refinedstorage.api.util.IFilter; import net.minecraft.item.ItemStack; -public class FilterItem implements IFilter { +public class ItemFilter implements IFilter { private ItemStack stack; private int compare; private int mode; private boolean modFilter; - public FilterItem(ItemStack stack, int compare, int mode, boolean modFilter) { + public ItemFilter(ItemStack stack, int compare, int mode, boolean modFilter) { this.stack = stack; this.compare = compare; this.mode = mode; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java index 75d6e5b4a..33588a28e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java @@ -6,8 +6,8 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.grid.IGridCraftingListener; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java index 5e77537bf..09acba1d0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java @@ -4,7 +4,8 @@ import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; import com.raoulvdberge.refinedstorage.api.util.IFilter; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridTab; -import com.raoulvdberge.refinedstorage.apiimpl.util.FilterFluid; +import com.raoulvdberge.refinedstorage.apiimpl.util.FluidFilter; +import com.raoulvdberge.refinedstorage.apiimpl.util.ItemFilter; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter; import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic; import com.raoulvdberge.refinedstorage.item.FilterItem; @@ -64,14 +65,14 @@ public class ItemHandlerFilter extends ItemHandlerBase { if (stack.getItem() == RSItems.FILTER) { addFilter(stack); } else if (!stack.isEmpty()) { - filters.add(new com.raoulvdberge.refinedstorage.apiimpl.util.FilterItem(stack, compare, mode, modFilter)); + filters.add(new ItemFilter(stack, compare, mode, modFilter)); } } FluidInventoryFilter fluids = new FluidInventoryFilter(filter); for (FluidStack stack : fluids.getFilteredFluids()) { - filters.add(new FilterFluid(stack, compare, mode, modFilter)); + filters.add(new FluidFilter(stack, compare, mode, modFilter)); } ItemStack icon = FilterItem.getIcon(filter); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java index 04f677d46..5414e2e54 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.storage.StorageType; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData; +import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; import net.minecraft.client.util.ITooltipFlag; @@ -62,7 +62,7 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { API.instance().getStorageDiskSync().sendRequest(id); - IStorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); + StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); if (data != null) { if (data.getCapacity() == -1) { tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(new Style().setColor(TextFormatting.GRAY))); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java index ebc19a8d6..e062e8abf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.storage.StorageType; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData; +import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; import net.minecraft.client.util.ITooltipFlag; @@ -62,7 +62,7 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { API.instance().getStorageDiskSync().sendRequest(id); - IStorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); + StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); if (data != null) { if (data.getCapacity() == -1) { tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(new Style().setColor(TextFormatting.GRAY))); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java b/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java index 735e30a60..42d84a622 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java @@ -1,8 +1,8 @@ package com.raoulvdberge.refinedstorage.network.disk; +import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskSync; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskSyncData; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java index e5446e4e3..d6bfe3033 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.screen.grid.stack; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.render.FluidRenderer; import com.raoulvdberge.refinedstorage.screen.BaseScreen; @@ -14,13 +14,13 @@ public class FluidGridStack implements IGridStack { private UUID id; private FluidStack stack; @Nullable - private IStorageTracker.IStorageTrackerEntry entry; + private StorageTrackerEntry entry; private boolean craftable; private boolean displayCraftText; private String modId; private String modName; - public FluidGridStack(UUID id, FluidStack stack, @Nullable IStorageTracker.IStorageTrackerEntry entry, boolean craftable, boolean displayCraftText) { + public FluidGridStack(UUID id, FluidStack stack, @Nullable StorageTrackerEntry entry, boolean craftable, boolean displayCraftText) { this.id = id; this.stack = stack; this.entry = entry; @@ -127,12 +127,12 @@ public class FluidGridStack implements IGridStack { @Nullable @Override - public IStorageTracker.IStorageTrackerEntry getTrackerEntry() { + public StorageTrackerEntry getTrackerEntry() { return entry; } @Override - public void setTrackerEntry(@Nullable IStorageTracker.IStorageTrackerEntry entry) { + public void setTrackerEntry(@Nullable StorageTrackerEntry entry) { this.entry = entry; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java index 52f7d57c9..5861448e7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.screen.grid.stack; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import javax.annotation.Nullable; @@ -28,9 +28,9 @@ public interface IGridStack { Object getIngredient(); @Nullable - IStorageTracker.IStorageTrackerEntry getTrackerEntry(); + StorageTrackerEntry getTrackerEntry(); - void setTrackerEntry(@Nullable IStorageTracker.IStorageTrackerEntry entry); + void setTrackerEntry(@Nullable StorageTrackerEntry entry); boolean isCraftable(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java index 4b98dcbdd..1c0448573 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/ItemGridStack.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.screen.grid.stack; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -19,7 +19,7 @@ public class ItemGridStack implements IGridStack { private boolean displayCraftText; private String[] oreIds = null; @Nullable - private IStorageTracker.IStorageTrackerEntry entry; + private StorageTrackerEntry entry; private String modId; private String modName; private String tooltip; @@ -28,7 +28,7 @@ public class ItemGridStack implements IGridStack { this.stack = stack; } - public ItemGridStack(UUID id, ItemStack stack, boolean craftable, boolean displayCraftText, IStorageTracker.IStorageTrackerEntry entry) { + public ItemGridStack(UUID id, ItemStack stack, boolean craftable, boolean displayCraftText, StorageTrackerEntry entry) { this.id = id; this.stack = stack; this.craftable = craftable; @@ -171,12 +171,12 @@ public class ItemGridStack implements IGridStack { @Nullable @Override - public IStorageTracker.IStorageTrackerEntry getTrackerEntry() { + public StorageTrackerEntry getTrackerEntry() { return entry; } @Override - public void setTrackerEntry(@Nullable IStorageTracker.IStorageTrackerEntry entry) { + public void setTrackerEntry(@Nullable StorageTrackerEntry entry) { this.entry = entry; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java index 37f9a28a5..ebf4d09cf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java @@ -18,9 +18,9 @@ import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterMan import com.raoulvdberge.refinedstorage.api.network.security.ISecurityManager; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.api.storage.IStorage; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; import com.raoulvdberge.refinedstorage.api.storage.externalstorage.IStorageExternal; +import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingManager; import com.raoulvdberge.refinedstorage.apiimpl.energy.Energy; @@ -31,10 +31,10 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemHandler; import com.raoulvdberge.refinedstorage.apiimpl.network.node.ICoverable; import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterManager; import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityManager; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheItem; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageTrackerFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageTrackerItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.FluidStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.ItemStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; +import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; import com.raoulvdberge.refinedstorage.block.ControllerBlock; import com.raoulvdberge.refinedstorage.integration.forgeenergy.EnergyProxy; import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable; @@ -132,11 +132,11 @@ public class ControllerTile extends BaseTile implements ITickableTileEntity, INe private ISecurityManager securityManager = new SecurityManager(this); - private IStorageCache itemStorage = new StorageCacheItem(this); - private StorageTrackerItem itemStorageTracker = new StorageTrackerItem(this::markDirty); + private IStorageCache itemStorage = new ItemStorageCache(this); + private ItemStorageTracker itemStorageTracker = new ItemStorageTracker(this::markDirty); - private IStorageCache fluidStorage = new StorageCacheFluid(this); - private StorageTrackerFluid fluidStorageTracker = new StorageTrackerFluid(this::markDirty); + private IStorageCache fluidStorage = new FluidStorageCache(this); + private FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(this::markDirty); private IReaderWriterManager readerWriterManager = new ReaderWriterManager(this); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java index 5258375a2..b4611e6c2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -4,10 +4,10 @@ import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.grid.*; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridFluid; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.FluidGridStorageCacheListener; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; @@ -104,7 +104,7 @@ public class WirelessFluidGrid implements IGridNetworkAware { @Override public IStorageCacheListener createListener(ServerPlayerEntity player) { - return new StorageCacheListenerGridFluid(player, getNetwork()); + return new FluidGridStorageCacheListener(player, getNetwork()); } @Nullable diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java index 746b0cfee..258a42089 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -4,10 +4,10 @@ import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.grid.*; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridItem; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.ItemGridStorageCacheListener; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; @@ -105,7 +105,7 @@ public class WirelessGrid implements IGridNetworkAware { @Override public IStorageCacheListener createListener(ServerPlayerEntity player) { - return new StorageCacheListenerGridItem(player, getNetwork()); + return new ItemGridStorageCacheListener(player, getNetwork()); } @Nullable diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java index 5e5d00fa1..e05c2fae4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/IPortableGrid.java @@ -1,8 +1,8 @@ package com.raoulvdberge.refinedstorage.tile.grid.portable; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; +import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java index dcae41c1c..e4fb9e196 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java @@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; -import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.storage.StorageType; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; @@ -19,9 +19,14 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.FluidGridHandlerPortable; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.ItemGridHandlerPortable; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.*; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFluidPortable; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskItemPortable; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; +import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; +import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; import com.raoulvdberge.refinedstorage.screen.BaseScreen; @@ -69,8 +74,8 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private int tabPage; private int size; - private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> stack.getTag().put(NBT_STORAGE_TRACKER, getItemStorageTracker().serializeNbt())); - private StorageTrackerFluid fluidStorageTracker = new StorageTrackerFluid(() -> stack.getTag().put(NBT_FLUID_STORAGE_TRACKER, getFluidStorageTracker().serializeNbt())); + private ItemStorageTracker storageTracker = new ItemStorageTracker(() -> stack.getTag().put(NBT_STORAGE_TRACKER, getItemStorageTracker().serializeNbt())); + private FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(() -> stack.getTag().put(NBT_FLUID_STORAGE_TRACKER, getFluidStorageTracker().serializeNbt())); private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); @@ -105,12 +110,12 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer switch (type) { case ITEM: - storage = new StorageDiskItemPortable(disk, PortableGrid.this); - cache = new StorageCacheItemPortable(PortableGrid.this); + storage = new PortableItemStorageDisk(disk, PortableGrid.this); + cache = new PortableItemStorageCache(PortableGrid.this); break; case FLUID: - storage = new StorageDiskFluidPortable(disk, PortableGrid.this); - cache = new StorageCacheFluidPortable(PortableGrid.this); + storage = new PortableFluidStorageDisk(disk, PortableGrid.this); + cache = new PortableFluidStorageCache(PortableGrid.this); break; } @@ -219,7 +224,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer @Override public IStorageCacheListener createListener(ServerPlayerEntity player) { - return getGridType() == GridType.FLUID ? new StorageCacheListenerGridPortableFluid(this, player) : new StorageCacheListenerGridPortable(this, player); + return getGridType() == GridType.FLUID ? new PortableFluidGridStorageCacheListener(this, player) : new PortableItemGridStorageCacheListener(this, player); } @Nullable @@ -364,12 +369,12 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } @Override - public StorageTrackerItem getItemStorageTracker() { + public ItemStorageTracker getItemStorageTracker() { return storageTracker; } @Override - public StorageTrackerFluid getFluidStorageTracker() { + public FluidStorageTracker getFluidStorageTracker() { return fluidStorageTracker; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index 8ae6f98a3..d28443198 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -9,19 +9,28 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGridCraftingListener; import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IFluidGridHandler; import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.raoulvdberge.refinedstorage.api.storage.*; +import com.raoulvdberge.refinedstorage.api.storage.AccessType; +import com.raoulvdberge.refinedstorage.api.storage.StorageType; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCache; +import com.raoulvdberge.refinedstorage.api.storage.cache.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.raoulvdberge.refinedstorage.api.storage.tracker.IStorageTracker; import com.raoulvdberge.refinedstorage.api.util.IFilter; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.FluidGridHandlerPortable; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.handler.ItemGridHandlerPortable; import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; -import com.raoulvdberge.refinedstorage.apiimpl.storage.*; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFluidPortable; -import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskItemPortable; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; +import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; +import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; +import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; +import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; import com.raoulvdberge.refinedstorage.block.BlockPortableGrid; import com.raoulvdberge.refinedstorage.block.enums.PortableGridDiskState; import com.raoulvdberge.refinedstorage.block.enums.PortableGridType; @@ -151,8 +160,8 @@ public class TilePortableGrid extends BaseTile implements IGrid, IPortableGrid, private PortableGridDiskState diskState = PortableGridDiskState.NONE; private boolean connected; - private StorageTrackerItem storageTracker = new StorageTrackerItem(this::markDirty); - private StorageTrackerFluid fluidStorageTracker = new StorageTrackerFluid(this::markDirty); + private ItemStorageTracker storageTracker = new ItemStorageTracker(this::markDirty); + private FluidStorageTracker fluidStorageTracker = new FluidStorageTracker(this::markDirty); private ListNBT enchants = null; public TilePortableGrid() { @@ -182,12 +191,12 @@ public class TilePortableGrid extends BaseTile implements IGrid, IPortableGrid, switch (type) { case ITEM: - this.storage = new StorageDiskItemPortable(disk, this); - this.cache = new StorageCacheItemPortable(this); + this.storage = new PortableItemStorageDisk(disk, this); + this.cache = new PortableItemStorageCache(this); break; case FLUID: - this.storage = new StorageDiskFluidPortable(disk, this); - this.cache = new StorageCacheFluidPortable(this); + this.storage = new PortableFluidStorageDisk(disk, this); + this.cache = new PortableFluidStorageCache(this); break; } @@ -319,7 +328,7 @@ public class TilePortableGrid extends BaseTile implements IGrid, IPortableGrid, @Override public IStorageCacheListener createListener(ServerPlayerEntity player) { - return getServerGridType() == GridType.FLUID ? new StorageCacheListenerGridPortableFluid(this, player) : new StorageCacheListenerGridPortable(this, player); + return getServerGridType() == GridType.FLUID ? new PortableFluidGridStorageCacheListener(this, player) : new PortableItemGridStorageCacheListener(this, player); } @Nullable diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java index db674e53d..d455f1822 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java @@ -1,11 +1,10 @@ package com.raoulvdberge.refinedstorage.util; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; +import com.raoulvdberge.refinedstorage.api.storage.tracker.StorageTrackerEntry; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageTrackerEntry; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; @@ -77,7 +76,7 @@ public final class StackUtils { } } - public static void writeItemGridStack(PacketBuffer buf, ItemStack stack, UUID id, @Nullable INetwork network, boolean displayCraftText, @Nullable IStorageTracker.IStorageTrackerEntry entry) { + public static void writeItemGridStack(PacketBuffer buf, ItemStack stack, UUID id, @Nullable INetwork network, boolean displayCraftText, @Nullable StorageTrackerEntry entry) { writeItemStack(buf, stack); buf.writeUniqueId(id); @@ -106,7 +105,7 @@ public final class StackUtils { boolean craftable = buf.readBoolean(); boolean displayCraftText = buf.readBoolean(); - IStorageTracker.IStorageTrackerEntry entry = null; + StorageTrackerEntry entry = null; if (buf.readBoolean()) { entry = new StorageTrackerEntry(buf.readLong(), buf.readString()); } @@ -114,7 +113,7 @@ public final class StackUtils { return new ItemGridStack(id, stack, craftable, displayCraftText, entry); } - public static void writeFluidGridStack(PacketBuffer buf, FluidStack stack, UUID id, @Nullable INetwork network, boolean displayCraftText, @Nullable IStorageTracker.IStorageTrackerEntry entry) { + public static void writeFluidGridStack(PacketBuffer buf, FluidStack stack, UUID id, @Nullable INetwork network, boolean displayCraftText, @Nullable StorageTrackerEntry entry) { stack.writeToPacket(buf); buf.writeUniqueId(id); @@ -143,7 +142,7 @@ public final class StackUtils { boolean craftable = buf.readBoolean(); boolean displayCraftText = buf.readBoolean(); - IStorageTracker.IStorageTrackerEntry entry = null; + StorageTrackerEntry entry = null; if (buf.readBoolean()) { entry = new StorageTrackerEntry(buf.readLong(), buf.readString()); }