dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename classes so they are prefixed with "item" to prepare for fluid storage

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-10 23:32:20 +02:00
parent 11b429e28c
commit de510ba705
48 changed files with 165 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/refinedstorage/api/network/INetworkMaster.java
View File

@@ -6,8 +6,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IGroupedStorage;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.item.IGroupedItemStorage;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -43,9 +44,9 @@ public interface INetworkMaster {
INetworkNodeGraph getNodeGraph();
/**
* @return The {@link IGridHandler} for this network
* @return The {@link IItemGridHandler} for this network
*/
IGridHandler getGridHandler();
IItemGridHandler getGridHandler();
/**
* @return The {@link IWirelessGridHandler} for this network
@@ -53,9 +54,9 @@ public interface INetworkMaster {
IWirelessGridHandler getWirelessGridHandler();
/**
* @return The {@link IGroupedStorage} of this network
* @return The {@link IGroupedItemStorage} of this network
*/
IGroupedStorage getStorage();
IGroupedItemStorage getStorage();
/**
* @return The crafting tasks in this network, do NOT modify this list

2
src/main/java/refinedstorage/api/network/NetworkUtils.java
View File

@@ -2,7 +2,7 @@ package refinedstorage.api.network;
import net.minecraft.item.ItemStack;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
/**
* Utilities for network manipulation.

2
src/main/java/refinedstorage/api/network/GridExtractFlags.java → src/main/java/refinedstorage/api/network/grid/GridExtractFlags.java
View File

@@ -1,4 +1,4 @@
package refinedstorage.api.network;
package refinedstorage.api.network.grid;
/**
* Flags for knowing what extract action the player is performing, these can be combined.

4
src/main/java/refinedstorage/api/network/IGridHandler.java → src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java
View File

@@ -1,4 +1,4 @@
package refinedstorage.api.network;
package refinedstorage.api.network.grid;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
/**
* Defines the behavior of grids.
*/
public interface IGridHandler {
public interface IItemGridHandler {
/**
* Called when a player tries to extract an item from the grid.
*

8
src/main/java/refinedstorage/api/storage/IStorageProvider.java
View File

@@ -1,5 +1,7 @@
package refinedstorage.api.storage;
import refinedstorage.api.storage.item.IItemStorage;
import java.util.List;
/**
@@ -7,9 +9,9 @@ import java.util.List;
*/
public interface IStorageProvider {
/**
* Adds the storages that this storage provider provides.
* Adds the item storages that this storage provider provides.
*
* @param storages The previously added storages
* @param storages The previously added item storages
*/
void addStorages(List<IStorage> storages);
void addItemStorages(List<IItemStorage> storages);
}

2
src/main/java/refinedstorage/api/storage/CompareUtils.java → src/main/java/refinedstorage/api/storage/item/CompareUtils.java
View File

@@ -1,4 +1,4 @@
package refinedstorage.api.storage;
package refinedstorage.api.storage.item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;

9
src/main/java/refinedstorage/api/storage/IGroupedStorage.java → src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java
View File

@@ -1,7 +1,8 @@
package refinedstorage.api.storage;
package refinedstorage.api.storage.item;
import net.minecraft.item.ItemStack;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorageProvider;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -12,10 +13,10 @@ import java.util.List;
* This holds all items from all the connected storages from a {@link INetworkMaster}.
* <p>
* Refined Storage uses this class mainly for use in Grids and Detectors to avoid querying
* individual {@link IStorage} constantly (performance impact) and to send and detect storage changes
* individual {@link IItemStorage} constantly (performance impact) and to send and detect storage changes
* more efficiently.
*/
public interface IGroupedStorage {
public interface IGroupedItemStorage {
/**
* Rebuilds the storages and items for a network. Typically called when a {@link IStorageProvider} is
* added or removed from the network.
@@ -71,5 +72,5 @@ public interface IGroupedStorage {
/**
* @return The storages connected to this network
*/
List<IStorage> getStorages();
List<IItemStorage> getStorages();
}

5
src/main/java/refinedstorage/api/storage/IStorage.java → src/main/java/refinedstorage/api/storage/item/IItemStorage.java
View File

@@ -1,6 +1,7 @@
package refinedstorage.api.storage;
package refinedstorage.api.storage.item;
import net.minecraft.item.ItemStack;
import refinedstorage.api.storage.IStorageProvider;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -10,7 +11,7 @@ import java.util.List;
* Represents a storage sink for the storage network.
* Provide this through an {@link IStorageProvider}.
*/
public interface IStorage {
public interface IItemStorage {
/**
* @return Items stored in this storage
*/

2
src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java
View File

@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
public class CraftingTaskScheduler {
private static final String NBT_SCHEDULED = "CraftingTaskScheduled";

2
src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
View File

@@ -9,7 +9,7 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
public class ProcessingCraftingTask implements ICraftingTask {
public static final int ID = 1;

10
src/main/java/refinedstorage/apiimpl/network/GridHandler.java → src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java
View File

@@ -5,18 +5,18 @@ import net.minecraft.inventory.InventoryHelper;
import net.minecraft.item.ItemStack;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.GridExtractFlags;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.network.grid.GridExtractFlags;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
public class GridHandler implements IGridHandler {
public class ItemGridHandler implements IItemGridHandler {
public static final int MAX_CRAFTING_PER_REQUEST = 500;
private INetworkMaster network;
public GridHandler(INetworkMaster network) {
public ItemGridHandler(INetworkMaster network) {
this.network = network;
}

2
src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.apiimpl.solderer;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.api.solderer.ISoldererRecipe;
import refinedstorage.api.solderer.ISoldererRegistry;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

18
src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java → src/main/java/refinedstorage/apiimpl/storage/GroupedItemStorage.java
View File

@@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IGroupedStorage;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.item.IGroupedItemStorage;
import refinedstorage.api.storage.item.IItemStorage;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -18,12 +18,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public class GroupedStorage implements IGroupedStorage {
public class GroupedItemStorage implements IGroupedItemStorage {
private INetworkMaster network;
private List<IStorage> storages = new ArrayList<>();
private List<IItemStorage> storages = new ArrayList<>();
private Multimap<Item, ItemStack> stacks = ArrayListMultimap.create();
public GroupedStorage(INetworkMaster network) {
public GroupedItemStorage(INetworkMaster network) {
this.network = network;
}
@@ -33,11 +33,11 @@ public class GroupedStorage implements IGroupedStorage {
network.getNodeGraph().all().stream()
.filter(node -> node.canUpdate() && node instanceof IStorageProvider)
.forEach(node -> ((IStorageProvider) node).addStorages(storages));
.forEach(node -> ((IStorageProvider) node).addItemStorages(storages));
stacks.clear();
for (IStorage storage : storages) {
for (IItemStorage storage : storages) {
for (ItemStack stack : storage.getItems()) {
add(stack, true);
}
@@ -124,7 +124,7 @@ public class GroupedStorage implements IGroupedStorage {
}
@Override
public List<IStorage> getStorages() {
public List<IItemStorage> getStorages() {
return storages;
}
}

18
src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java → src/main/java/refinedstorage/apiimpl/storage/NBTItemStorage.java
View File

@@ -6,19 +6,19 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.item.IItemStorage;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
/**
* A implementation of {@link IStorage} that stores storage items in NBT.
* A implementation of {@link IItemStorage} that stores storage items in NBT.
*/
public abstract class NBTStorage implements IStorage {
public abstract class NBTItemStorage implements IItemStorage {
/**
* The current save protocol that is used. It's set to every {@link NBTStorage} to allow for
* The current save protocol that is used. It's set to every {@link NBTItemStorage} to allow for
* safe backwards compatibility breaks.
*/
private static final int PROTOCOL = 1;
@@ -41,11 +41,11 @@ public abstract class NBTStorage implements IStorage {
private List<ItemStack> stacks = new ArrayList<>();
/**
* @param tag The NBT tag we are reading from and writing the amount stored to, has to be initialized with {@link NBTStorage#createNBT()} if it doesn't exist yet
* @param tag The NBT tag we are reading from and writing the amount stored to, has to be initialized with {@link NBTItemStorage#createNBT()} if it doesn't exist yet
* @param capacity The capacity of this storage, -1 for infinite capacity
* @param tile A {@link TileEntity} that the NBT storage is in, will be marked dirty when the storage changes
*/
public NBTStorage(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) {
public NBTItemStorage(NBTTagCompound tag, int capacity, @Nullable TileEntity tile) {
this.tag = tag;
this.capacity = capacity;
this.tile = tile;
@@ -243,8 +243,8 @@ public abstract class NBTStorage implements IStorage {
}
/**
* @param stack The {@link ItemStack} to populate with the NBT tags from {@link NBTStorage#createNBT()}
* @return The provided {@link ItemStack} with NBT tags from {@link NBTStorage#createNBT()}
* @param stack The {@link ItemStack} to populate with the NBT tags from {@link NBTItemStorage#createNBT()}
* @return The provided {@link ItemStack} with NBT tags from {@link NBTItemStorage#createNBT()}
*/
public static ItemStack createStackWithNBT(ItemStack stack) {
stack.setTagCompound(createNBT());

2
src/main/java/refinedstorage/container/ContainerBase.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.slot.SlotDisabled;
import refinedstorage.container.slot.SlotSpecimen;
import refinedstorage.container.slot.SlotSpecimenLegacy;

2
src/main/java/refinedstorage/gui/GuiConstructor.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerConstructor;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;

2
src/main/java/refinedstorage/gui/GuiDestructor.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerDestructor;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;

2
src/main/java/refinedstorage/gui/GuiDetector.java
View File

@@ -2,7 +2,7 @@ package refinedstorage.gui;
import com.google.common.primitives.Ints;
import net.minecraft.client.gui.GuiTextField;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerDetector;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonDetectorMode;

2
src/main/java/refinedstorage/gui/GuiExporter.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerExporter;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;

2
src/main/java/refinedstorage/gui/GuiGridFilter.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.gui;
import net.minecraft.client.gui.GuiButton;
import net.minecraftforge.fml.client.config.GuiCheckBox;
import refinedstorage.RefinedStorage;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerGridFilter;
import refinedstorage.item.ItemGridFilter;
import refinedstorage.network.MessageGridFilterUpdate;

2
src/main/java/refinedstorage/gui/GuiImporter.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerImporter;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;

2
src/main/java/refinedstorage/gui/GuiInterface.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerInterface;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;

2
src/main/java/refinedstorage/gui/GuiStorage.java
View File

@@ -2,7 +2,7 @@ package refinedstorage.gui;
import com.google.common.primitives.Ints;
import net.minecraft.client.gui.GuiTextField;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.container.ContainerStorage;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;

6
src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.client.FMLClientHandler;
import org.lwjgl.input.Keyboard;
import refinedstorage.RefinedStorage;
import refinedstorage.apiimpl.network.GridHandler;
import refinedstorage.apiimpl.network.ItemGridHandler;
import refinedstorage.container.ContainerCraftingSettings;
import refinedstorage.gui.GuiBase;
import refinedstorage.network.MessageGridCraftingStart;
@@ -110,7 +110,7 @@ public class GuiCraftingSettings extends GuiBase {
int newAmount = Integer.parseInt(incrementButton.displayString);
newAmount = Math.min(Math.max(DEFAULT_AMOUNT, oldAmount + newAmount), GridHandler.MAX_CRAFTING_PER_REQUEST);
newAmount = Math.min(Math.max(DEFAULT_AMOUNT, oldAmount + newAmount), ItemGridHandler.MAX_CRAFTING_PER_REQUEST);
amountField.setText(String.valueOf(newAmount));
@@ -123,7 +123,7 @@ public class GuiCraftingSettings extends GuiBase {
private void startRequest() {
Integer quantity = Ints.tryParse(amountField.getText());
if (quantity != null && quantity > 0 && quantity <= GridHandler.MAX_CRAFTING_PER_REQUEST) {
if (quantity != null && quantity > 0 && quantity <= ItemGridHandler.MAX_CRAFTING_PER_REQUEST) {
RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingStart(stack.getId(), quantity));
close();

4
src/main/java/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -13,8 +13,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.FMLCommonHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.api.network.GridExtractFlags;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.network.grid.GridExtractFlags;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.block.EnumGridType;
import refinedstorage.container.ContainerGrid;
import refinedstorage.gui.GuiBase;

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.gui.sidebutton;
import net.minecraft.util.text.TextFormatting;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.gui.GuiBase;
import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter;

10
src/main/java/refinedstorage/item/ItemBlockStorage.java
View File

@@ -12,7 +12,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageItems;
import refinedstorage.apiimpl.storage.NBTStorage;
import refinedstorage.apiimpl.storage.NBTItemStorage;
import refinedstorage.block.EnumStorageType;
import refinedstorage.tile.TileStorage;
@@ -31,9 +31,9 @@ public class ItemBlockStorage extends ItemBlockBase {
NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE);
if (type == EnumStorageType.TYPE_CREATIVE) {
tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTStorage.getStoredFromNBT(tag)));
tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTItemStorage.getStoredFromNBT(tag)));
} else {
tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTStorage.getStoredFromNBT(tag), type.getCapacity()));
tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTItemStorage.getStoredFromNBT(tag), type.getCapacity()));
}
}
}
@@ -42,7 +42,7 @@ public class ItemBlockStorage extends ItemBlockBase {
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
EnumStorageType type = EnumStorageType.getById(stack.getMetadata());
if (type != null && isValid(stack) && NBTStorage.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) {
if (type != null && isValid(stack) && NBTItemStorage.getStoredFromNBT(stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE)) == 0 && stack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE && !world.isRemote && player.isSneaking()) {
ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, stack.getMetadata());
if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
@@ -83,7 +83,7 @@ public class ItemBlockStorage extends ItemBlockBase {
public static ItemStack initNBT(ItemStack stack) {
NBTTagCompound tag = new NBTTagCompound();
tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.createNBT());
tag.setTag(TileStorage.NBT_STORAGE, NBTItemStorage.createNBT());
stack.setTagCompound(tag);
return stack;
}

2
src/main/java/refinedstorage/item/ItemGridFilter.java
View File

@@ -10,7 +10,7 @@ import net.minecraft.world.World;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.inventory.ItemHandlerGridFilter;
import java.util.List;

2
src/main/java/refinedstorage/item/ItemPattern.java
View File

@@ -13,7 +13,7 @@ import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import java.util.HashSet;
import java.util.List;

20
src/main/java/refinedstorage/item/ItemStorageDisk.java
View File

@@ -13,7 +13,7 @@ import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import refinedstorage.RefinedStorageItems;
import refinedstorage.apiimpl.storage.NBTStorage;
import refinedstorage.apiimpl.storage.NBTItemStorage;
import refinedstorage.block.EnumStorageType;
import java.util.ArrayList;
@@ -41,7 +41,7 @@ public class ItemStorageDisk extends ItemBase {
@Override
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (int i = 0; i < 5; ++i) {
list.add(NBTStorage.createStackWithNBT(new ItemStack(item, 1, i)));
list.add(NBTItemStorage.createStackWithNBT(new ItemStack(item, 1, i)));
}
}
@@ -53,16 +53,16 @@ public class ItemStorageDisk extends ItemBase {
if (stack.getItemDamage() == TYPE_DEBUG) {
applyDebugDiskData(stack);
} else {
NBTStorage.createStackWithNBT(stack);
NBTItemStorage.createStackWithNBT(stack);
}
}
}
private void applyDebugDiskData(ItemStack stack) {
if (debugDiskTag == null) {
debugDiskTag = NBTStorage.createNBT();
debugDiskTag = NBTItemStorage.createNBT();
NBTStorage storage = new NBTStorage(debugDiskTag, -1, null) {
NBTItemStorage storage = new NBTItemStorage(debugDiskTag, -1, null) {
@Override
public int getPriority() {
return 0;
@@ -93,20 +93,20 @@ public class ItemStorageDisk extends ItemBase {
@Override
public void addInformation(ItemStack disk, EntityPlayer player, List<String> tooltip, boolean advanced) {
if (NBTStorage.isValid(disk)) {
if (NBTItemStorage.isValid(disk)) {
int capacity = EnumStorageType.getById(disk.getItemDamage()).getCapacity();
if (capacity == -1) {
tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTStorage.getStoredFromNBT(disk.getTagCompound())));
tooltip.add(I18n.format("misc.refinedstorage:storage.stored", NBTItemStorage.getStoredFromNBT(disk.getTagCompound())));
} else {
tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTStorage.getStoredFromNBT(disk.getTagCompound()), capacity));
tooltip.add(I18n.format("misc.refinedstorage:storage.stored_capacity", NBTItemStorage.getStoredFromNBT(disk.getTagCompound()), capacity));
}
}
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack disk, World world, EntityPlayer player, EnumHand hand) {
if (!world.isRemote && player.isSneaking() && NBTStorage.isValid(disk) && NBTStorage.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) {
if (!world.isRemote && player.isSneaking() && NBTItemStorage.isValid(disk) && NBTItemStorage.getStoredFromNBT(disk.getTagCompound()) == 0 && disk.getMetadata() != TYPE_CREATIVE) {
ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, disk.getMetadata());
if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
@@ -123,6 +123,6 @@ public class ItemStorageDisk extends ItemBase {
public void onCreated(ItemStack stack, World world, EntityPlayer player) {
super.onCreated(stack, world, player);
NBTStorage.createStackWithNBT(stack);
NBTItemStorage.createStackWithNBT(stack);
}
}

4
src/main/java/refinedstorage/network/MessageGridCraftingStart.java
View File

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.container.ContainerGrid;
public class MessageGridCraftingStart extends MessageHandlerPlayerToServer<MessageGridCraftingStart> implements IMessage {
@@ -36,7 +36,7 @@ public class MessageGridCraftingStart extends MessageHandlerPlayerToServer<Messa
Container container = player.openContainer;
if (container instanceof ContainerGrid) {
IGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
if (handler != null) {
handler.onCraftingRequested(message.id, message.quantity);

4
src/main/java/refinedstorage/network/MessageGridInsertHeld.java
View File

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.container.ContainerGrid;
public class MessageGridInsertHeld extends MessageHandlerPlayerToServer<MessageGridInsertHeld> implements IMessage {
@@ -32,7 +32,7 @@ public class MessageGridInsertHeld extends MessageHandlerPlayerToServer<MessageG
Container container = player.openContainer;
if (container instanceof ContainerGrid) {
IGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
if (handler != null) {
handler.onInsertHeldItem(message.single, player);

4
src/main/java/refinedstorage/network/MessageGridPull.java
View File

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.container.ContainerGrid;
public class MessageGridPull extends MessageHandlerPlayerToServer<MessageGridPull> implements IMessage {
@@ -36,7 +36,7 @@ public class MessageGridPull extends MessageHandlerPlayerToServer<MessageGridPul
Container container = player.openContainer;
if (container instanceof ContainerGrid) {
IGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
if (handler != null) {
handler.onExtract(message.id, message.flags, player);

6
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -20,7 +20,7 @@ import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.RefinedStorageAPI;
import refinedstorage.apiimpl.solderer.*;
import refinedstorage.apiimpl.storage.NBTStorage;
import refinedstorage.apiimpl.storage.NBTItemStorage;
import refinedstorage.block.*;
import refinedstorage.gui.GuiHandler;
import refinedstorage.item.*;
@@ -386,7 +386,7 @@ public class CommonProxy {
);
// Storage Housing
GameRegistry.addRecipe(new ShapedOreRecipe(NBTStorage.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_HOUSING)),
GameRegistry.addRecipe(new ShapedOreRecipe(NBTItemStorage.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_HOUSING)),
"GRG",
"R R",
"EEE",
@@ -397,7 +397,7 @@ public class CommonProxy {
// Storage Disks
for (int type = 0; type <= 3; ++type) {
ItemStack disk = NBTStorage.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, type));
ItemStack disk = NBTItemStorage.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, type));
GameRegistry.addRecipe(new ShapedOreRecipe(disk,
"GRG",

2
src/main/java/refinedstorage/tile/ClientNode.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.tile;
import net.minecraft.item.ItemStack;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
public class ClientNode {
private ItemStack stack;

37
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -21,16 +21,17 @@ import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.*;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IGroupedStorage;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.item.IGroupedItemStorage;
import refinedstorage.api.storage.item.IItemStorage;
import refinedstorage.apiimpl.autocrafting.BasicCraftingTask;
import refinedstorage.apiimpl.autocrafting.CraftingPattern;
import refinedstorage.apiimpl.autocrafting.ProcessingCraftingTask;
import refinedstorage.apiimpl.network.GridHandler;
import refinedstorage.apiimpl.network.ItemGridHandler;
import refinedstorage.apiimpl.network.NetworkNodeGraph;
import refinedstorage.apiimpl.network.WirelessGridHandler;
import refinedstorage.apiimpl.storage.GroupedStorage;
import refinedstorage.apiimpl.storage.GroupedItemStorage;
import refinedstorage.block.BlockController;
import refinedstorage.block.EnumControllerType;
import refinedstorage.container.ContainerGrid;
@@ -48,7 +49,7 @@ import refinedstorage.tile.config.RedstoneMode;
import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.RefinedStorageSerializers;
import refinedstorage.tile.data.TileDataParameter;
import refinedstorage.tile.externalstorage.ExternalStorage;
import refinedstorage.tile.externalstorage.ItemStorageExternal;
import java.util.*;
@@ -116,7 +117,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
private static final String NBT_CRAFTING_TASKS = "CraftingTasks";
private static final Comparator<IStorage> SIZE_COMPARATOR = (left, right) -> {
private static final Comparator<IItemStorage> SIZE_COMPARATOR = (left, right) -> {
if (left.getStored() == right.getStored()) {
return 0;
}
@@ -124,7 +125,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
return (left.getStored() > right.getStored()) ? -1 : 1;
};
private static final Comparator<IStorage> PRIORITY_COMPARATOR = (left, right) -> {
private static final Comparator<IItemStorage> PRIORITY_COMPARATOR = (left, right) -> {
if (left.getPriority() == right.getPriority()) {
return 0;
}
@@ -132,11 +133,11 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
return (left.getPriority() > right.getPriority()) ? -1 : 1;
};
private GridHandler gridHandler = new GridHandler(this);
private ItemGridHandler gridHandler = new ItemGridHandler(this);
private WirelessGridHandler wirelessGridHandler = new WirelessGridHandler(this);
private INetworkNodeGraph nodeGraph = new NetworkNodeGraph(this);
private IGroupedStorage storage = new GroupedStorage(this);
private IGroupedItemStorage storage = new GroupedItemStorage(this);
private List<ICraftingPattern> patterns = new ArrayList<>();
@@ -303,7 +304,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
}
@Override
public IGridHandler getGridHandler() {
public IItemGridHandler getGridHandler() {
return gridHandler;
}
@@ -319,7 +320,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
energyEU.onChunkUnload();
}
public IGroupedStorage getStorage() {
public IGroupedItemStorage getStorage() {
return storage;
}
@@ -469,11 +470,11 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
ItemStack remainder = stack;
for (IStorage storage : this.storage.getStorages()) {
for (IItemStorage storage : this.storage.getStorages()) {
remainder = storage.insertItem(remainder, size, simulate);
if (storage instanceof ExternalStorage && !simulate) {
((ExternalStorage) storage).updateCacheForcefully();
if (storage instanceof ItemStorageExternal && !simulate) {
((ItemStorageExternal) storage).updateCacheForcefully();
}
if (remainder == null) {
@@ -507,12 +508,12 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
ItemStack newStack = null;
for (IStorage storage : this.storage.getStorages()) {
for (IItemStorage storage : this.storage.getStorages()) {
ItemStack took = storage.extractItem(stack, requested - received, flags);
if (took != null) {
if (storage instanceof ExternalStorage) {
((ExternalStorage) storage).updateCacheForcefully();
if (storage instanceof ItemStorageExternal) {
((ItemStorageExternal) storage).updateCacheForcefully();
}
if (newStack == null) {

24
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -12,9 +12,9 @@ import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
import refinedstorage.apiimpl.storage.NBTStorage;
import refinedstorage.api.storage.item.IItemStorage;
import refinedstorage.apiimpl.storage.NBTItemStorage;
import refinedstorage.block.EnumStorageType;
import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.inventory.ItemValidatorBasic;
@@ -30,8 +30,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
public class Storage extends NBTStorage {
public Storage(ItemStack disk) {
public class ItemStorage extends NBTItemStorage {
public ItemStorage(ItemStack disk) {
super(disk.getTagCompound(), EnumStorageType.getById(disk.getItemDamage()).getCapacity(), TileDiskDrive.this);
}
@@ -58,7 +58,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
private ItemHandlerBasic disks = new ItemHandlerBasic(8, this, new ItemValidatorBasic(RefinedStorageItems.STORAGE_DISK) {
@Override
public boolean isValid(ItemStack disk) {
return super.isValid(disk) && NBTStorage.isValid(disk);
return super.isValid(disk) && NBTItemStorage.isValid(disk);
}
}) {
@Override
@@ -74,7 +74,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
if (disk == null) {
storages[slot] = null;
} else {
storages[slot] = new Storage(disk);
storages[slot] = new ItemStorage(disk);
}
if (network != null) {
@@ -95,7 +95,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
private Storage storages[] = new Storage[8];
private ItemStorage storages[] = new ItemStorage[8];
private int priority = 0;
private int compare = 0;
@@ -139,7 +139,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
}
public void onBreak() {
for (Storage storage : this.storages) {
for (ItemStorage storage : this.storages) {
if (storage != null) {
storage.writeToNBT();
}
@@ -154,8 +154,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
}
@Override
public void addStorages(List<IStorage> storages) {
for (IStorage storage : this.storages) {
public void addItemStorages(List<IItemStorage> storages) {
for (IItemStorage storage : this.storages) {
if (storage != null) {
storages.add(storage);
}
@@ -256,7 +256,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
return 0;
}
stored += NBTStorage.getStoredFromNBT(disk.getTagCompound());
stored += NBTItemStorage.getStoredFromNBT(disk.getTagCompound());
storedMax += EnumStorageType.getById(disk.getItemDamage()).getCapacity();
}
}
@@ -322,7 +322,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
ItemStack stack = disks.getStackInSlot(i);
if (stack != null) {
stored += NBTStorage.getStoredFromNBT(stack.getTagCompound());
stored += NBTItemStorage.getStoredFromNBT(stack.getTagCompound());
}
}

2
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -11,7 +11,7 @@ import refinedstorage.RefinedStorage;
import refinedstorage.api.RefinedStorageAPI;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.solderer.ISoldererRecipe;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.inventory.ItemHandlerSolderer;
import refinedstorage.inventory.ItemHandlerUpgrade;

20
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -8,9 +8,9 @@ import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
import refinedstorage.apiimpl.storage.NBTStorage;
import refinedstorage.api.storage.item.IItemStorage;
import refinedstorage.apiimpl.storage.NBTItemStorage;
import refinedstorage.block.BlockStorage;
import refinedstorage.block.EnumStorageType;
import refinedstorage.inventory.ItemHandlerBasic;
@@ -29,12 +29,12 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
public static final TileDataParameter<Integer> STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileStorage>() {
@Override
public Integer getValue(TileStorage tile) {
return NBTStorage.getStoredFromNBT(tile.storageTag);
return NBTItemStorage.getStoredFromNBT(tile.storageTag);
}
});
class Storage extends NBTStorage {
public Storage() {
class ItemStorage extends NBTItemStorage {
public ItemStorage() {
super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity(), TileStorage.this);
}
@@ -61,9 +61,9 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
private NBTTagCompound storageTag = NBTStorage.createNBT();
private NBTTagCompound storageTag = NBTItemStorage.createNBT();
private Storage storage;
private ItemStorage storage;
private EnumStorageType type;
@@ -92,7 +92,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
super.update();
if (storage == null && storageTag != null) {
storage = new Storage();
storage = new ItemStorage();
if (network != null) {
network.getStorage().rebuild();
@@ -114,7 +114,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
}
@Override
public void addStorages(List<IStorage> storages) {
public void addItemStorages(List<IItemStorage> storages) {
if (storage != null) {
storages.add(storage);
}
@@ -232,7 +232,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
this.storageTag = storageTag;
}
public NBTStorage getStorage() {
public NBTItemStorage getStorage() {
return storage;
}

2
src/main/java/refinedstorage/tile/config/IFilterable.java
View File

@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.tile.data.ITileDataConsumer;
import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.TileDataParameter;

6
src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java → src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java
View File

@@ -3,18 +3,18 @@ package refinedstorage.tile.externalstorage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.tile.config.IFilterable;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
public class DeepStorageUnitStorage extends ExternalStorage {
public class ItemStorageDSU extends ItemStorageExternal {
private TileExternalStorage externalStorage;
private IDeepStorageUnit unit;
public DeepStorageUnitStorage(TileExternalStorage externalStorage, IDeepStorageUnit unit) {
public ItemStorageDSU(TileExternalStorage externalStorage, IDeepStorageUnit unit) {
this.externalStorage = externalStorage;
this.unit = unit;
}

6
src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java → src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java
View File

@@ -4,17 +4,17 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.tile.config.IFilterable;
import java.util.Collections;
import java.util.List;
public class DrawerStorage extends ExternalStorage {
public class ItemStorageDrawer extends ItemStorageExternal {
private TileExternalStorage externalStorage;
private IDrawer drawer;
public DrawerStorage(TileExternalStorage externalStorage, IDrawer drawer) {
public ItemStorageDrawer(TileExternalStorage externalStorage, IDrawer drawer) {
this.externalStorage = externalStorage;
this.drawer = drawer;
}

6
src/main/java/refinedstorage/tile/externalstorage/ExternalStorage.java → src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java
View File

@@ -1,12 +1,12 @@
package refinedstorage.tile.externalstorage;
import net.minecraft.item.ItemStack;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.item.IItemStorage;
import java.util.List;
public abstract class ExternalStorage implements IStorage {
public abstract class ItemStorageExternal implements IItemStorage {
private List<ItemStack> cache;
public abstract int getCapacity();

6
src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java → src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
View File

@@ -3,17 +3,17 @@ package refinedstorage.tile.externalstorage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.tile.config.IFilterable;
import java.util.ArrayList;
import java.util.List;
public class ItemHandlerStorage extends ExternalStorage {
public class ItemStorageItemHandler extends ItemStorageExternal {
private TileExternalStorage externalStorage;
private IItemHandler handler;
public ItemHandlerStorage(TileExternalStorage externalStorage, IItemHandler handler) {
public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) {
this.externalStorage = externalStorage;
this.handler = handler;
}

20
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -10,8 +10,8 @@ import net.minecraftforge.items.IItemHandler;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import refinedstorage.RefinedStorage;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
import refinedstorage.api.storage.item.IItemStorage;
import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.tile.IStorageGui;
import refinedstorage.tile.TileMultipartNode;
@@ -34,7 +34,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr
public Integer getValue(TileExternalStorage tile) {
int stored = 0;
for (ExternalStorage storage : tile.storages) {
for (ItemStorageExternal storage : tile.storages) {
stored += storage.getStored();
}
@@ -47,7 +47,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr
public Integer getValue(TileExternalStorage tile) {
int capacity = 0;
for (ExternalStorage storage : tile.storages) {
for (ItemStorageExternal storage : tile.storages) {
capacity += storage.getCapacity();
}
@@ -65,7 +65,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr
private int compare = 0;
private int mode = IFilterable.WHITELIST;
private List<ExternalStorage> storages = new ArrayList<>();
private List<ItemStorageExternal> storages = new ArrayList<>();
private int lastDrawerCount;
public TileExternalStorage() {
@@ -105,7 +105,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr
if (ticks % (20 * 4) == 0) {
boolean shouldRebuild = false;
for (ExternalStorage storage : storages) {
for (ItemStorageExternal storage : storages) {
if (storage.updateCache()) {
shouldRebuild = true;
}
@@ -204,18 +204,18 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr
for (int i = 0; i < group.getDrawerCount(); ++i) {
if (group.isDrawerEnabled(i)) {
storages.add(new DrawerStorage(this, group.getDrawer(i)));
storages.add(new ItemStorageDrawer(this, group.getDrawer(i)));
}
}
} else if (facing instanceof IDrawer) {
storages.add(new DrawerStorage(this, (IDrawer) facing));
storages.add(new ItemStorageDrawer(this, (IDrawer) facing));
} else if (facing instanceof IDeepStorageUnit) {
storages.add(new DeepStorageUnitStorage(this, (IDeepStorageUnit) facing));
storages.add(new ItemStorageDSU(this, (IDeepStorageUnit) facing));
} else {
IItemHandler handler = getItemHandler(facing, getDirection().getOpposite());
if (handler != null) {
storages.add(new ItemHandlerStorage(this, handler));
storages.add(new ItemStorageItemHandler(this, handler));
}
}
@@ -223,7 +223,7 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr
}
@Override
public void addStorages(List<IStorage> storages) {
public void addItemStorages(List<IItemStorage> storages) {
storages.addAll(this.storages);
}

4
src/main/java/refinedstorage/tile/grid/IGrid.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.tile.grid;
import net.minecraft.util.math.BlockPos;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.block.EnumGridType;
import refinedstorage.gui.grid.GridFilteredItem;
import refinedstorage.inventory.ItemHandlerBasic;
@@ -14,7 +14,7 @@ public interface IGrid {
BlockPos getNetworkPosition();
IGridHandler getGridHandler();
IItemGridHandler getGridHandler();
int getViewType();

6
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -15,9 +15,9 @@ import net.minecraftforge.items.wrapper.InvWrapper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.block.BlockGrid;
import refinedstorage.block.EnumGridType;
import refinedstorage.container.ContainerGrid;
@@ -195,7 +195,7 @@ public class TileGrid extends TileNode implements IGrid {
}
@Override
public IGridHandler getGridHandler() {
public IItemGridHandler getGridHandler() {
return isConnected() ? network.getGridHandler() : null;
}

4
src/main/java/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import refinedstorage.RefinedStorage;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.block.EnumGridType;
import refinedstorage.gui.grid.GridFilteredItem;
import refinedstorage.gui.grid.GuiGrid;
@@ -84,7 +84,7 @@ public class WirelessGrid implements IGrid {
}
@Override
public IGridHandler getGridHandler() {
public IItemGridHandler getGridHandler() {
TileController controller = getController();
return controller != null ? controller.getGridHandler() : null;