diff --git a/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java b/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java index 71326bcd2..483a38fdd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java @@ -11,6 +11,7 @@ import com.raoulvdberge.refinedstorage.render.model.baked.PatternBakedModel; import com.raoulvdberge.refinedstorage.screen.ControllerScreen; import com.raoulvdberge.refinedstorage.screen.DiskDriveScreen; import com.raoulvdberge.refinedstorage.screen.FilterScreen; +import com.raoulvdberge.refinedstorage.screen.StorageBlockScreen; import com.raoulvdberge.refinedstorage.screen.factory.GridScreenFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScreenManager; @@ -119,6 +120,7 @@ public class ClientSetup { ScreenManager.registerFactory(RSContainers.CONTROLLER, ControllerScreen::new); ScreenManager.registerFactory(RSContainers.DISK_DRIVE, DiskDriveScreen::new); ScreenManager.registerFactory(RSContainers.GRID, new GridScreenFactory()); + ScreenManager.registerFactory(RSContainers.STORAGE_BLOCK, StorageBlockScreen::new); ClientRegistry.registerKeyBinding(RSKeyBindings.FOCUS_SEARCH_BAR); ClientRegistry.registerKeyBinding(RSKeyBindings.CLEAR_GRID_CRAFTING_MATRIX); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index cafb982cd..4b2e4c684 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -9,6 +9,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.CableNetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; +import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory; @@ -20,17 +21,16 @@ import com.raoulvdberge.refinedstorage.config.ServerConfig; import com.raoulvdberge.refinedstorage.container.ControllerContainer; import com.raoulvdberge.refinedstorage.container.DiskDriveContainer; import com.raoulvdberge.refinedstorage.container.FilterContainer; +import com.raoulvdberge.refinedstorage.container.StorageContainer; import com.raoulvdberge.refinedstorage.container.factory.GridContainerFactory; import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerFactory; import com.raoulvdberge.refinedstorage.item.*; import com.raoulvdberge.refinedstorage.item.blockitem.ControllerBlockItem; +import com.raoulvdberge.refinedstorage.item.blockitem.StorageBlockItem; import com.raoulvdberge.refinedstorage.item.group.MainItemGroup; import com.raoulvdberge.refinedstorage.network.NetworkHandler; import com.raoulvdberge.refinedstorage.recipe.UpgradeWithEnchantedBookRecipeSerializer; -import com.raoulvdberge.refinedstorage.tile.BaseTile; -import com.raoulvdberge.refinedstorage.tile.CableTile; -import com.raoulvdberge.refinedstorage.tile.ControllerTile; -import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; +import com.raoulvdberge.refinedstorage.tile.*; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.tile.grid.GridTile; import com.raoulvdberge.refinedstorage.util.BlockUtils; @@ -98,6 +98,12 @@ public final class RS { API.instance().getNetworkNodeRegistry().add(GridNetworkNode.PATTERN_ID, (tag, world, pos) -> readAndReturn(tag, new GridNetworkNode(world, pos, GridType.PATTERN))); API.instance().getNetworkNodeRegistry().add(GridNetworkNode.FLUID_ID, (tag, world, pos) -> readAndReturn(tag, new GridNetworkNode(world, pos, GridType.FLUID))); + API.instance().getNetworkNodeRegistry().add(StorageNetworkNode.ONE_K_STORAGE_BLOCK_ID, (tag, world, pos) -> readAndReturn(tag, new StorageNetworkNode(world, pos, ItemStorageType.ONE_K))); + API.instance().getNetworkNodeRegistry().add(StorageNetworkNode.FOUR_K_STORAGE_BLOCK_ID, (tag, world, pos) -> readAndReturn(tag, new StorageNetworkNode(world, pos, ItemStorageType.FOUR_K))); + API.instance().getNetworkNodeRegistry().add(StorageNetworkNode.SIXTEEN_K_STORAGE_BLOCK_ID, (tag, world, pos) -> readAndReturn(tag, new StorageNetworkNode(world, pos, ItemStorageType.SIXTEEN_K))); + API.instance().getNetworkNodeRegistry().add(StorageNetworkNode.SIXTY_FOUR_K_STORAGE_BLOCK_ID, (tag, world, pos) -> readAndReturn(tag, new StorageNetworkNode(world, pos, ItemStorageType.SIXTY_FOUR_K))); + API.instance().getNetworkNodeRegistry().add(StorageNetworkNode.CREATIVE_STORAGE_BLOCK_ID, (tag, world, pos) -> readAndReturn(tag, new StorageNetworkNode(world, pos, ItemStorageType.CREATIVE))); + API.instance().getGridManager().add(GridBlockGridFactory.ID, new GridBlockGridFactory()); } @@ -124,6 +130,12 @@ public final class RS { e.getRegistry().register(new GridBlock(GridType.CRAFTING)); e.getRegistry().register(new GridBlock(GridType.PATTERN)); e.getRegistry().register(new GridBlock(GridType.FLUID)); + + e.getRegistry().register(new StorageBlock(ItemStorageType.ONE_K)); + e.getRegistry().register(new StorageBlock(ItemStorageType.FOUR_K)); + e.getRegistry().register(new StorageBlock(ItemStorageType.SIXTEEN_K)); + e.getRegistry().register(new StorageBlock(ItemStorageType.SIXTY_FOUR_K)); + e.getRegistry().register(new StorageBlock(ItemStorageType.CREATIVE)); } @SubscribeEvent @@ -136,6 +148,12 @@ public final class RS { e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.CRAFTING), RSBlocks.CRAFTING_GRID).build(null).setRegistryName(RS.ID, "crafting_grid"))); e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.PATTERN), RSBlocks.PATTERN_GRID).build(null).setRegistryName(RS.ID, "pattern_grid"))); e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.FLUID), RSBlocks.FLUID_GRID).build(null).setRegistryName(RS.ID, "fluid_grid"))); + + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.ONE_K), RSBlocks.ONE_K_STORAGE_BLOCK).build(null).setRegistryName(RS.ID, "1k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.FOUR_K), RSBlocks.FOUR_K_STORAGE_BLOCK).build(null).setRegistryName(RS.ID, "4k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.SIXTEEN_K), RSBlocks.SIXTEEN_K_STORAGE_BLOCK).build(null).setRegistryName(RS.ID, "16k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.SIXTY_FOUR_K), RSBlocks.SIXTY_FOUR_K_STORAGE_BLOCK).build(null).setRegistryName(RS.ID, "64k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.CREATIVE), RSBlocks.CREATIVE_STORAGE_BLOCK).build(null).setRegistryName(RS.ID, "creative_storage_block"))); } private TileEntityType registerTileDataParameters(TileEntityType t) { @@ -152,6 +170,7 @@ public final class RS { e.getRegistry().register(IForgeContainerType.create(((windowId, inv, data) -> new ControllerContainer(null, inv.player, windowId))).setRegistryName(RS.ID, "controller")); e.getRegistry().register(IForgeContainerType.create(new PositionalTileContainerFactory((windowId, inv, tile) -> new DiskDriveContainer(tile, inv.player, windowId))).setRegistryName(RS.ID, "disk_drive")); e.getRegistry().register(IForgeContainerType.create(new GridContainerFactory()).setRegistryName(RS.ID, "grid")); + e.getRegistry().register(IForgeContainerType.create(new PositionalTileContainerFactory((windowId, inv, tile) -> new StorageContainer(tile, inv.player, windowId))).setRegistryName(RS.ID, "storage_block")); } @SubscribeEvent @@ -207,6 +226,12 @@ public final class RS { e.getRegistry().register(BlockUtils.createBlockItemFor(RSBlocks.CRAFTING_GRID)); e.getRegistry().register(BlockUtils.createBlockItemFor(RSBlocks.PATTERN_GRID)); e.getRegistry().register(BlockUtils.createBlockItemFor(RSBlocks.FLUID_GRID)); + + e.getRegistry().register(new StorageBlockItem(RSBlocks.ONE_K_STORAGE_BLOCK)); + e.getRegistry().register(new StorageBlockItem(RSBlocks.FOUR_K_STORAGE_BLOCK)); + e.getRegistry().register(new StorageBlockItem(RSBlocks.SIXTEEN_K_STORAGE_BLOCK)); + e.getRegistry().register(new StorageBlockItem(RSBlocks.SIXTY_FOUR_K_STORAGE_BLOCK)); + e.getRegistry().register(new StorageBlockItem(RSBlocks.CREATIVE_STORAGE_BLOCK)); } /* TODO diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java b/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java index fdc86af5c..88618ddb4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java @@ -10,7 +10,6 @@ public final class RSBlocks { public static final BlockDetector DETECTOR = new BlockDetector(); public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); public static final BlockConstructor CONSTRUCTOR = new BlockConstructor(); - public static final BlockStorage STORAGE = new BlockStorage(); public static final BlockRelay RELAY = new BlockRelay(); public static final BlockInterface INTERFACE = new BlockInterface(); public static final BlockCraftingMonitor CRAFTING_MONITOR = new BlockCraftingMonitor(); @@ -51,6 +50,17 @@ public final class RSBlocks { @ObjectHolder(RS.ID + ":fluid_grid") public static final GridBlock FLUID_GRID = null; + @ObjectHolder(RS.ID + ":1k_storage_block") + public static final StorageBlock ONE_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":4k_storage_block") + public static final StorageBlock FOUR_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":16k_storage_block") + public static final StorageBlock SIXTEEN_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":64k_storage_block") + public static final StorageBlock SIXTY_FOUR_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":creative_storage_block") + public static final StorageBlock CREATIVE_STORAGE_BLOCK = null; + public static final BlockStorageMonitor STORAGE_MONITOR = new BlockStorageMonitor(); public static final BlockPortableGrid PORTABLE_GRID = new BlockPortableGrid(); public static final BlockCrafterManager CRAFTER_MANAGER = new BlockCrafterManager(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java b/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java index 0c24e17e4..0a1ee1bd2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java @@ -56,6 +56,9 @@ public final class RSContainers { @ObjectHolder(RS.ID + ":disk_drive") public static final ContainerType DISK_DRIVE = null; + @ObjectHolder(RS.ID + ":storage_block") + public static final ContainerType STORAGE_BLOCK = null; + //@ObjectHolder(RS.ID + ":storage_monitor") public static final ContainerType STORAGE_MONITOR = null; //@ObjectHolder(RS.ID + ":wireless_transmitter") diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java b/src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java index cf6a56ff7..890b86c5a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSTiles.java @@ -67,8 +67,6 @@ public class RSTiles { public static final TileEntityType RELAY = null; //@ObjectHolder(RS.ID + ":security_manager") public static final TileEntityType SECURITY_MANAGER = null; - //@ObjectHolder(RS.ID + ":storage") - public static final TileEntityType STORAGE = null; //@ObjectHolder(RS.ID + ":storage_monitor") public static final TileEntityType STORAGE_MONITOR = null; //@ObjectHolder(RS.ID + ":wireless_transmitter") @@ -77,6 +75,17 @@ public class RSTiles { @ObjectHolder(RS.ID + ":cable") public static final TileEntityType CABLE = null; + @ObjectHolder(RS.ID + ":1k_storage_block") + public static final TileEntityType ONE_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":4k_storage_block") + public static final TileEntityType FOUR_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":16k_storage_block") + public static final TileEntityType SIXTEEN_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":64k_storage_block") + public static final TileEntityType SIXTY_FOUR_K_STORAGE_BLOCK = null; + @ObjectHolder(RS.ID + ":creative_storage_block") + public static final TileEntityType CREATIVE_STORAGE_BLOCK = null; + //@ObjectHolder(RS.ID + ":portable_grid") public static final TileEntityType PORTABLE_GRID = null; } 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 07e62c8b9..df2ed5de8 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 @@ -17,10 +17,10 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.cache.listener.FluidGridS 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; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.PatternItem; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; @@ -92,12 +92,12 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I private ICraftingRecipe currentRecipe; private CraftingInventory matrix = new CraftingInventory(craftingContainer, 3, 3); private CraftResultInventory result = new CraftResultInventory(); - private ItemHandlerBase processingMatrix = new ItemHandlerBase(9 * 2, new ListenerNetworkNode(this)); - private FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64, new ListenerNetworkNode(this)); + private BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2, new NetworkNodeListener(this)); + private FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64, new NetworkNodeListener(this)); private Set craftingListeners = new HashSet<>(); - private ItemHandlerBase patterns = new ItemHandlerBase(2, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.PATTERN)) { + private BaseItemHandler patterns = new BaseItemHandler(2, new NetworkNodeListener(this), new ItemValidatorBasic(RSItems.PATTERN)) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -146,7 +146,7 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I }; private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); - private ItemHandlerFilter filter = new ItemHandlerFilter(filters, tabs, new ListenerNetworkNode(this)); + private FilterItemHandler filter = new FilterItemHandler(filters, tabs, new NetworkNodeListener(this)); private final GridType type; @@ -310,7 +310,7 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I return result; } - public ItemHandlerBase getProcessingMatrix() { + public BaseItemHandler getProcessingMatrix() { return processingMatrix; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java index 08ed960e1..768bebf3a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IStorageScreen.java @@ -2,9 +2,10 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.util.text.ITextComponent; public interface IStorageScreen { - String getGuiTitle(); + ITextComponent getTitle(); TileDataParameter getTypeParameter(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index 50fda6fca..eca2c82d9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -7,9 +7,9 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.UpgradeItem; import com.raoulvdberge.refinedstorage.tile.TileConstructor; import com.raoulvdberge.refinedstorage.tile.config.IComparable; @@ -55,10 +55,10 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, private static final int BASE_SPEED = 20; - private ItemHandlerBase itemFilters = new ItemHandlerBase(1, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(1, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(1, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(1, new NetworkNodeListener(this)); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK*/); private int compare = IComparer.COMPARE_NBT; private int type = IType.ITEMS; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java index a1934a8d3..402a85a87 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java @@ -7,9 +7,9 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.UpgradeItem; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; @@ -58,7 +58,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC private static final String NBT_LOCKED = "Locked"; private static final String NBT_WAS_POWERED = "WasPowered"; - private ItemHandlerBase patternsInventory = new ItemHandlerBase(9, new ListenerNetworkNode(this), s -> isValidPatternInSlot(world, s)) { + private BaseItemHandler patternsInventory = new BaseItemHandler(9, new NetworkNodeListener(this), s -> isValidPatternInSlot(world, s)) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -86,7 +86,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC private List patterns = new ArrayList<>(); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED*/); // Used to prevent infinite recursion on getRootContainer() when there's e.g. two crafters facing each other. private boolean visited = false; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java index 49f9f7698..8a2b75a41 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java @@ -6,9 +6,9 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.TileDestructor; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -57,10 +57,10 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I private static final int BASE_SPEED = 20; - private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(9, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(9, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(9, new NetworkNodeListener(this)); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_SILK_TOUCH, ItemUpgrade.TYPE_FORTUNE_1, ItemUpgrade.TYPE_FORTUNE_2, ItemUpgrade.TYPE_FORTUNE_3*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_SILK_TOUCH, ItemUpgrade.TYPE_FORTUNE_1, ItemUpgrade.TYPE_FORTUNE_2, ItemUpgrade.TYPE_FORTUNE_3*/); private int compare = IComparer.COMPARE_NBT; private int mode = IWhitelistBlacklist.BLACKLIST; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java index 9d0a2c6d0..0fea45d02 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java @@ -5,8 +5,8 @@ import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.TileDetector; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -37,8 +37,8 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy private static final String NBT_TYPE = "Type"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private ItemHandlerBase itemFilters = new ItemHandlerBase(1, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(1, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(1, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(1, new NetworkNodeListener(this)); private int compare = IComparer.COMPARE_NBT; private int type = IType.ITEMS; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java index 070c30c48..062aece78 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java @@ -5,9 +5,9 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.UpgradeItem; import com.raoulvdberge.refinedstorage.tile.TileExporter; import com.raoulvdberge.refinedstorage.tile.config.IComparable; @@ -39,10 +39,10 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy private static final String NBT_COVERS = "Covers"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(9, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(9, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(9, new NetworkNodeListener(this)); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK*/); private int compare = IComparer.COMPARE_NBT; private int type = IType.ITEMS; 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 99757eff2..93c34a0e6 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 @@ -15,8 +15,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; 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; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.TileExternalStorage; import com.raoulvdberge.refinedstorage.tile.config.*; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; @@ -28,6 +28,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.FluidStack; @@ -48,8 +50,8 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP private static final String NBT_COVERS = "Covers"; private static final String NBT_FLUID_FILTERS = "FluidFilters"; - private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(9, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(9, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(9, new NetworkNodeListener(this)); private int priority = 0; private int compare = IComparer.COMPARE_NBT; @@ -261,8 +263,8 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP } @Override - public String getGuiTitle() { - return "gui.refinedstorage:external_storage"; + public ITextComponent getTitle() { + return new TranslationTextComponent("gui.refinedstorage:external_storage"); } @Override @@ -277,7 +279,7 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP @Override public TileDataParameter getWhitelistBlacklistParameter() { - return TileExternalStorage.MODE; + return TileExternalStorage.WHITELIST_BLACKLIST; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java index 9c77510cb..c71a80922 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java @@ -6,11 +6,11 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.StorageExternalFluid; -import com.raoulvdberge.refinedstorage.inventory.fluid.FluidHandlerProxy; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.fluid.ProxyFluidHandler; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.UpgradeItem; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -53,12 +53,12 @@ public class NetworkNodeFluidInterface extends NetworkNode { }; private FluidTank tankOut = new FluidTank(TANK_CAPACITY); - private FluidHandlerProxy tank = new FluidHandlerProxy(tankIn, tankOut); + private ProxyFluidHandler tank = new ProxyFluidHandler(tankIn, tankOut); - private ItemHandlerBase in = new ItemHandlerBase(1, new ListenerNetworkNode(this), stack -> !StackUtils.getFluid(stack, true).getValue().isEmpty()); - private FluidInventory out = new FluidInventory(1, TANK_CAPACITY, new ListenerNetworkNode(this)); + private BaseItemHandler in = new BaseItemHandler(1, new NetworkNodeListener(this), stack -> !StackUtils.getFluid(stack, true).getValue().isEmpty()); + private FluidInventory out = new FluidInventory(1, TANK_CAPACITY, new NetworkNodeListener(this)); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING*/); public NetworkNodeFluidInterface(World world, BlockPos pos) { super(world, pos); @@ -230,11 +230,11 @@ public class NetworkNodeFluidInterface extends NetworkNode { } } - public ItemHandlerUpgrade getUpgrades() { + public UpgradeItemHandler getUpgrades() { return upgrades; } - public ItemHandlerBase getIn() { + public BaseItemHandler getIn() { return in; } @@ -242,7 +242,7 @@ public class NetworkNodeFluidInterface extends NetworkNode { return out; } - public FluidHandlerProxy getTank() { + public ProxyFluidHandler getTank() { return tank; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java index 690238b06..6edcd44ee 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java @@ -5,9 +5,9 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; import com.raoulvdberge.refinedstorage.tile.TileImporter; import com.raoulvdberge.refinedstorage.tile.config.IComparable; @@ -41,10 +41,10 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IWh private static final String NBT_COVERS = "Covers"; private static final String NBT_FLUID_FILTERS = "FLuidFilters"; - private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(9, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(9, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(9, new NetworkNodeListener(this)); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK*/); private int compare = IComparer.COMPARE_NBT; private int mode = IWhitelistBlacklist.BLACKLIST; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java index db5497a65..9b725af4a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java @@ -6,10 +6,10 @@ import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.StorageExternalItem; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerProxy; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.ProxyItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.UpgradeItem; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -29,14 +29,14 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable { private static final String NBT_COMPARE = "Compare"; - private ItemHandlerBase importItems = new ItemHandlerBase(9, new ListenerNetworkNode(this)); + private BaseItemHandler importItems = new BaseItemHandler(9, new NetworkNodeListener(this)); - private ItemHandlerBase exportFilterItems = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private ItemHandlerBase exportItems = new ItemHandlerBase(9, new ListenerNetworkNode(this)); + private BaseItemHandler exportFilterItems = new BaseItemHandler(9, new NetworkNodeListener(this)); + private BaseItemHandler exportItems = new BaseItemHandler(9, new NetworkNodeListener(this)); - private IItemHandler items = new ItemHandlerProxy(importItems, exportItems); + private IItemHandler items = new ProxyItemHandler(importItems, exportItems); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING*/); private int compare = IComparer.COMPARE_NBT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java index b098775df..4d9bac315 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java @@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.util.Action; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -19,7 +19,7 @@ import javax.annotation.Nullable; public class NetworkNodeNetworkTransmitter extends NetworkNode { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "network_transmitter"); - private ItemHandlerBase networkCard = new ItemHandlerBase(1, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.NETWORK_CARD)) { + private BaseItemHandler networkCard = new BaseItemHandler(1, new NetworkNodeListener(this), new ItemValidatorBasic(RSItems.NETWORK_CARD)) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -72,7 +72,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { return RS.INSTANCE.config.networkTransmitterUsage; } - public ItemHandlerBase getNetworkCard() { + public BaseItemHandler getNetworkCard() { return networkCard; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java index b107c72ba..335b46605 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java @@ -7,9 +7,9 @@ import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCard; import com.raoulvdberge.refinedstorage.api.network.security.ISecurityCardContainer; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityCard; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -30,7 +30,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity private List cards = new ArrayList<>(); private ISecurityCard globalCard; - private ItemHandlerBase cardsInv = new ItemHandlerBase(9 * 2, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.SECURITY_CARD)) { + private BaseItemHandler cardsInv = new BaseItemHandler(9 * 2, new NetworkNodeListener(this), new ItemValidatorBasic(RSItems.SECURITY_CARD)) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -44,7 +44,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity } } }; - private ItemHandlerBase editCard = new ItemHandlerBase(1, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.SECURITY_CARD)); + private BaseItemHandler editCard = new BaseItemHandler(1, new NetworkNodeListener(this), new ItemValidatorBasic(RSItems.SECURITY_CARD)); public NetworkNodeSecurityManager(World world, BlockPos pos) { super(world, pos); @@ -134,11 +134,11 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity network.getSecurityManager().invalidate(); } - public ItemHandlerBase getCardsItems() { + public BaseItemHandler getCardsItems() { return cardsInv; } - public ItemHandlerBase getEditCard() { + public BaseItemHandler getEditCard() { return editCard; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java index 6338cca89..b3989ebd8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java @@ -5,8 +5,8 @@ import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; import com.raoulvdberge.refinedstorage.util.StackUtils; @@ -31,7 +31,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl private static final String NBT_COMPARE = "Compare"; - private ItemHandlerBase itemFilter = new ItemHandlerBase(1, new ListenerNetworkNode(this)) { + private BaseItemHandler itemFilter = new BaseItemHandler(1, new NetworkNodeListener(this)) { @Override public void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -202,7 +202,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl return stored != null ? stored.getCount() : 0; } - public ItemHandlerBase getItemFilters() { + public BaseItemHandler getItemFilters() { return itemFilter; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java index 810c0b3b7..cd25025eb 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java @@ -2,9 +2,9 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.IWirelessTransmitter; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.item.UpgradeItem; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.nbt.CompoundNBT; @@ -19,7 +19,7 @@ import javax.annotation.Nullable; public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWirelessTransmitter { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "wireless_transmitter"); - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO , ItemUpgrade.TYPE_RANGE*/); + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO , ItemUpgrade.TYPE_RANGE*/); public NetworkNodeWirelessTransmitter(World world, BlockPos pos) { super(world, pos); @@ -66,7 +66,7 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire return world.getDimension().getType().getId(); } - public ItemHandlerBase getUpgrades() { + public BaseItemHandler getUpgrades() { return upgrades; } 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 bda75b9aa..2a7027c66 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 @@ -13,8 +13,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; 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; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; import com.raoulvdberge.refinedstorage.tile.config.*; import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; @@ -69,7 +69,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide private int ticksSinceBlockUpdateRequested; private boolean blockUpdateRequested; - private ItemHandlerBase disks = new ItemHandlerBase(8, new ListenerNetworkNode(this), VALIDATOR_STORAGE_DISK) { + private BaseItemHandler disks = new BaseItemHandler(8, new NetworkNodeListener(this), VALIDATOR_STORAGE_DISK) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -95,8 +95,8 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide } }; - private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(9, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(9, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(9, new NetworkNodeListener(this)); private IStorageDisk[] itemDisks = new IStorageDisk[8]; private IStorageDisk[] fluidDisks = new IStorageDisk[8]; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java index 2894e4d92..63037c127 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java @@ -10,10 +10,10 @@ import com.raoulvdberge.refinedstorage.api.util.StackListEntry; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerProxy; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.ProxyItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.UpgradeItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -58,7 +58,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab private IStorageDisk[] itemDisks = new IStorageDisk[6]; private IStorageDisk[] fluidDisks = new IStorageDisk[6]; - private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK*/) { + private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, new NetworkNodeListener(this)/* TODO, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK*/) { @Override public int getItemInteractCount() { int count = super.getItemInteractCount(); @@ -71,7 +71,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab } }; - private ItemHandlerBase inputDisks = new ItemHandlerBase(3, new ListenerNetworkNode(this), DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { + private BaseItemHandler inputDisks = new BaseItemHandler(3, new NetworkNodeListener(this), DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -92,7 +92,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab } }; - private ItemHandlerBase outputDisks = new ItemHandlerBase(3, new ListenerNetworkNode(this), DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { + private BaseItemHandler outputDisks = new BaseItemHandler(3, new NetworkNodeListener(this), DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -113,14 +113,14 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab } }; - private ItemHandlerProxy disks = new ItemHandlerProxy(inputDisks, outputDisks); + private ProxyItemHandler disks = new ProxyItemHandler(inputDisks, outputDisks); public NetworkNodeDiskManipulator(World world, BlockPos pos) { super(world, pos); } - private ItemHandlerBase itemFilters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); - private FluidInventory fluidFilters = new FluidInventory(9, new ListenerNetworkNode(this)); + private BaseItemHandler itemFilters = new BaseItemHandler(9, new NetworkNodeListener(this)); + private FluidInventory fluidFilters = new FluidInventory(9, new NetworkNodeListener(this)); @Override public int getEnergyUsage() { @@ -444,7 +444,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab return outputDisks; } - public ItemHandlerProxy getDisks() { + public ProxyItemHandler getDisks() { return disks; } 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 7e1371fc1..099d4f610 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 @@ -16,7 +16,7 @@ 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; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; import com.raoulvdberge.refinedstorage.tile.config.IAccessType; import com.raoulvdberge.refinedstorage.tile.config.IComparable; @@ -29,6 +29,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.fluids.FluidStack; @@ -45,7 +47,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageScre private static final String NBT_FILTERS = "Filters"; public static final String NBT_ID = "Id"; - private FluidInventory filters = new FluidInventory(9, new ListenerNetworkNode(this)); + private FluidInventory filters = new FluidInventory(9, new NetworkNodeListener(this)); private FluidStorageType type; @@ -215,8 +217,8 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageScre } @Override - public String getGuiTitle() { - return "block.refinedstorage:fluid_storage." + getType().getId() + ".name"; + public ITextComponent getTitle() { + return new TranslationTextComponent("block.refinedstorage:fluid_storage." + getType().getId() + ".name"); } @Override @@ -236,7 +238,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageScre @Override public TileDataParameter getWhitelistBlacklistParameter() { - return TileFluidStorage.MODE; + return TileFluidStorage.WHITELIST_BLACKLIST; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java index 15513e77b..b6a2499cc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageDiskItemStorageWrapper.java @@ -16,10 +16,10 @@ import javax.annotation.Nullable; import java.util.Collection; public class StorageDiskItemStorageWrapper implements IStorageDisk { - private NetworkNodeStorage storage; + private StorageNetworkNode storage; private IStorageDisk parent; - public StorageDiskItemStorageWrapper(NetworkNodeStorage storage, IStorageDisk parent) { + public StorageDiskItemStorageWrapper(StorageNetworkNode storage, IStorageDisk parent) { this.storage = storage; this.parent = parent; this.setSettings(null, storage); 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/StorageNetworkNode.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java index 8fab49e99..366976215 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/StorageNetworkNode.java @@ -1,7 +1,6 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node.storage; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.api.storage.IStorage; @@ -12,12 +11,11 @@ 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.ItemStorageType; 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; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; -import com.raoulvdberge.refinedstorage.tile.TileStorage; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; +import com.raoulvdberge.refinedstorage.tile.StorageTile; import com.raoulvdberge.refinedstorage.tile.config.IAccessType; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; @@ -25,11 +23,13 @@ import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; -import net.minecraft.block.BlockState; +import com.raoulvdberge.refinedstorage.util.StorageBlockUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.fluids.FluidStack; @@ -37,17 +37,21 @@ import net.minecraftforge.fluids.FluidStack; import java.util.List; import java.util.UUID; -public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, IStorageProvider, IComparable, IWhitelistBlacklist, IPrioritizable, IAccessType, IStorageDiskContainerContext { - public static final ResourceLocation ID = new ResourceLocation(RS.ID, "storage"); +public class StorageNetworkNode extends NetworkNode implements IStorageScreen, IStorageProvider, IComparable, IWhitelistBlacklist, IPrioritizable, IAccessType, IStorageDiskContainerContext { + public static final ResourceLocation ONE_K_STORAGE_BLOCK_ID = new ResourceLocation(RS.ID, "1k_storage_block"); + public static final ResourceLocation FOUR_K_STORAGE_BLOCK_ID = new ResourceLocation(RS.ID, "4k_storage_block"); + public static final ResourceLocation SIXTEEN_K_STORAGE_BLOCK_ID = new ResourceLocation(RS.ID, "16k_storage_block"); + public static final ResourceLocation SIXTY_FOUR_K_STORAGE_BLOCK_ID = new ResourceLocation(RS.ID, "64k_storage_block"); + public static final ResourceLocation CREATIVE_STORAGE_BLOCK_ID = new ResourceLocation(RS.ID, "creative_storage_block"); private static final String NBT_PRIORITY = "Priority"; private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; public static final String NBT_ID = "Id"; - private ItemHandlerBase filters = new ItemHandlerBase(9, new ListenerNetworkNode(this)); + private BaseItemHandler filters = new BaseItemHandler(9, new NetworkNodeListener(this)); - private ItemStorageType type; + private final ItemStorageType type; private AccessType accessType = AccessType.INSERT_EXTRACT; private int priority = 0; @@ -57,13 +61,15 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I private UUID storageId = UUID.randomUUID(); private IStorageDisk storage; - public NetworkNodeStorage(World world, BlockPos pos) { + public StorageNetworkNode(World world, BlockPos pos, ItemStorageType type) { super(world, pos); + + this.type = type; } @Override public int getEnergyUsage() { - return RS.INSTANCE.config.storageUsage; + return 0; } @Override @@ -89,7 +95,7 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I @Override public ResourceLocation getId() { - return ID; + return StorageBlockUtils.getNetworkNodeId(type); } @Override @@ -116,7 +122,7 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).get(storageId); if (disk == null) { - API.instance().getStorageDiskManager((ServerWorld) world).set(storageId, disk = API.instance().createDefaultItemDisk((ServerWorld) world, getType().getCapacity())); + API.instance().getStorageDiskManager((ServerWorld) world).set(storageId, disk = API.instance().createDefaultItemDisk((ServerWorld) world, type.getCapacity())); API.instance().getStorageDiskManager((ServerWorld) world).markForSaving(); } @@ -173,18 +179,6 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I accessType = AccessTypeUtils.readAccessType(tag); } - public ItemStorageType getType() { - if (type == null && world != null) { - BlockState state = world.getBlockState(pos); - - if (state.getBlock() == RSBlocks.STORAGE) { - type = (ItemStorageType) state.get(BlockStorage.TYPE); - } - } - - return type == null ? ItemStorageType.TYPE_1K : type; - } - @Override public int getCompare() { return compare; @@ -209,13 +203,13 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I markDirty(); } - public ItemHandlerBase getFilters() { + public BaseItemHandler getFilters() { return filters; } @Override - public String getGuiTitle() { - return "block.refinedstorage:storage." + getType().getId() + ".name"; + public ITextComponent getTitle() { + return new TranslationTextComponent("block.refinedstorage." + type.getName() + "_storage_block"); } @Override @@ -225,37 +219,37 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I @Override public TileDataParameter getRedstoneModeParameter() { - return TileStorage.REDSTONE_MODE; + return StorageTile.REDSTONE_MODE; } @Override public TileDataParameter getCompareParameter() { - return TileStorage.COMPARE; + return StorageTile.COMPARE; } @Override public TileDataParameter getWhitelistBlacklistParameter() { - return TileStorage.MODE; + return StorageTile.WHITELIST_BLACKLIST; } @Override public TileDataParameter getPriorityParameter() { - return TileStorage.PRIORITY; + return StorageTile.PRIORITY; } @Override public TileDataParameter getAccessTypeParameter() { - return TileStorage.ACCESS_TYPE; + return StorageTile.ACCESS_TYPE; } @Override public long getStored() { - return TileStorage.STORED.getValue(); + return StorageTile.STORED.getValue(); } @Override public long getCapacity() { - return getType().getCapacity(); + return type.getCapacity(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java index 545ae397e..03870828f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BaseBlock.java @@ -16,6 +16,7 @@ public abstract class BaseBlock extends Block { } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rot) { BlockDirection dir = getDirection(); if (dir != BlockDirection.NONE) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java index 92f2acf9c..c32aa4fca 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java @@ -100,6 +100,7 @@ public abstract class BlockBase extends Block { } @Override + @SuppressWarnings("deprecation") public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { worldIn.updateComparatorOutputLevel(pos, this); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java deleted file mode 100755 index bc0d0c28f..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.raoulvdberge.refinedstorage.block; - -import com.raoulvdberge.refinedstorage.block.enums.ItemStorageType; -import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; -import com.raoulvdberge.refinedstorage.tile.TileStorage; -import net.minecraft.state.EnumProperty; - -public class BlockStorage extends BlockNode { - public static final EnumProperty TYPE = EnumProperty.create("type", ItemStorageType.class); - - public BlockStorage() { - super(BlockInfoBuilder.forId("storage").tileEntity(TileStorage::new).hardness(5.8F).create()); - } - - /* - @Override - @OnlyIn(Dist.CLIENT) - public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, ItemStorageType.TYPE_1K.getId(), new ModelResourceLocation(info.getId(), "type=1k")); - modelRegistration.setModel(this, ItemStorageType.TYPE_4K.getId(), new ModelResourceLocation(info.getId(), "type=4k")); - modelRegistration.setModel(this, ItemStorageType.TYPE_16K.getId(), new ModelResourceLocation(info.getId(), "type=16k")); - modelRegistration.setModel(this, ItemStorageType.TYPE_64K.getId(), new ModelResourceLocation(info.getId(), "type=64k")); - modelRegistration.setModel(this, ItemStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation(info.getId(), "type=creative")); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList items) { - for (int i = 0; i <= 4; ++i) { - items.add(new ItemStack(this, 1, i)); - } - } - - @Override - protected BlockStateContainer createBlockState() { - return createBlockStateBuilder() - .add(TYPE) - .build(); - } - - @Override - public BlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, ItemStorageType.getById(meta)); - } - - @Override - public int getMetaFromState(BlockState state) { - return ((ItemStorageType) state.getValue(TYPE)).getId(); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, EnumHand hand, Direction side, float hitX, float hitY, float hitZ) { - return openNetworkGui(RSGui.STORAGE, player, world, pos, side); - } - - @Override - public Item createItem() { - return new ItemBlockStorage(this); - } - - @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - if (!world.isRemote) { - NetworkNodeStorage storage = ((TileStorage) world.getTileEntity(pos)).getNode(); - - if (stack.hasTagCompound() && stack.getTagCompound().hasUniqueId(NetworkNodeStorage.NBT_ID)) { - storage.setStorageId(stack.getTagCompound().getUniqueId(NetworkNodeStorage.NBT_ID)); - } - - storage.loadStorage(); - } - - // Call this after loading the storage, so the network discovery can use the loaded storage. - super.onBlockPlacedBy(world, pos, state, player, stack); - } - - @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, BlockState state, int fortune) { - TileStorage storage = (TileStorage) world.getTileEntity(pos); - - ItemStack stack = new ItemStack(this, 1, getMetaFromState(state)); - - stack.setTagCompound(new CompoundNBT()); - stack.getTagCompound().setUniqueId(NetworkNodeStorage.NBT_ID, storage.getNode().getStorageId()); - - drops.add(stack); - }*/ -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java index 67c6c4bf1..601273c6b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java @@ -60,25 +60,11 @@ public class GridBlock extends NodeBlock { @Override @SuppressWarnings("deprecation") - public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!worldIn.isRemote) { - return NetworkUtils.attemptModify(worldIn, pos, hit.getFace(), player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayerEntity) player, pos)); + public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isRemote) { + return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayerEntity) player, pos)); } return true; } - - /* - @Override - @OnlyIn(Dist.CLIENT) - public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, GridType.PATTERN.getId(), new ModelResourceLocation(info.getId(), "connected=false,direction=north,type=pattern")); - modelRegistration.setModel(this, GridType.FLUID.getId(), new ModelResourceLocation(info.getId(), "connected=false,direction=north,type=fluid")); - - modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright( - base, - RS.ID + ":blocks/grid/cutouts/pattern_front_connected", - RS.ID + ":blocks/grid/cutouts/fluid_front_connected" - )); - }*/ } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/NodeBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/NodeBlock.java index edbbbee46..536254f8a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/NodeBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/NodeBlock.java @@ -49,6 +49,7 @@ public abstract class NodeBlock extends BaseBlock { } @Override + @SuppressWarnings("deprecation") public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { TileEntity tile = worldIn.getTileEntity(pos); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java new file mode 100644 index 000000000..3f8dfea39 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/StorageBlock.java @@ -0,0 +1,105 @@ +package com.raoulvdberge.refinedstorage.block; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; +import com.raoulvdberge.refinedstorage.container.StorageContainer; +import com.raoulvdberge.refinedstorage.container.factory.PositionalTileContainerProvider; +import com.raoulvdberge.refinedstorage.tile.StorageTile; +import com.raoulvdberge.refinedstorage.util.BlockUtils; +import com.raoulvdberge.refinedstorage.util.NetworkUtils; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Hand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import net.minecraftforge.fml.network.NetworkHooks; + +import javax.annotation.Nullable; + +public class StorageBlock extends NodeBlock { + private final ItemStorageType type; + + public StorageBlock(ItemStorageType type) { + super(BlockUtils.DEFAULT_ROCK_PROPERTIES); + + this.type = type; + + this.setRegistryName(RS.ID, type.getName() + "_storage_block"); + } + + public ItemStorageType getType() { + return type; + } + + @Override + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { + if (!world.isRemote) { + StorageNetworkNode storage = ((StorageTile) world.getTileEntity(pos)).getNode(); + + if (stack.hasTag() && stack.getTag().hasUniqueId(StorageNetworkNode.NBT_ID)) { + storage.setStorageId(stack.getTag().getUniqueId(StorageNetworkNode.NBT_ID)); + } + + storage.loadStorage(); + } + + // Call this after loading the storage, so the network discovery can use the loaded storage. + super.onBlockPlacedBy(world, pos, state, entity, stack); + } + + // TODO Improve this dropping mechanism + @Override + public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + if (state.getBlock() != newState.getBlock()) { + TileEntity tile = world.getTileEntity(pos); + + if (tile instanceof StorageTile) { + @SuppressWarnings("deprecation") + ItemStack drop = new ItemStack(Item.getItemFromBlock(this)); + + drop.setTag(new CompoundNBT()); + drop.getTag().putUniqueId(StorageNetworkNode.NBT_ID, ((StorageTile) tile).getNode().getStorageId()); + + InventoryHelper.dropItems(world, pos, NonNullList.from(ItemStack.EMPTY, drop)); + } + + super.onReplaced(state, world, pos, newState, isMoving); + } + } + + @Override + public boolean hasTileEntity(BlockState state) { + return true; + } + + @Nullable + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) { + return new StorageTile(type); + } + + @Override + @SuppressWarnings("deprecation") + public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isRemote) { + return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( + ((StorageTile) world.getTileEntity(pos)).getNode().getTitle(), + (tile, windowId, inventory, p) -> new StorageContainer(tile, player, windowId), + pos + ), pos)); + } + + return true; + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/enums/ItemStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/enums/ItemStorageType.java deleted file mode 100644 index b4d90d8ac..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/enums/ItemStorageType.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.raoulvdberge.refinedstorage.block.enums; - -import net.minecraft.util.IStringSerializable; - -public enum ItemStorageType implements IStringSerializable { - TYPE_1K(0, 1_000, "1k"), - TYPE_4K(1, 4_000, "4k"), - TYPE_16K(2, 16_000, "16k"), - TYPE_64K(3, 64_000, "64k"), - TYPE_CREATIVE(4, -1, "creative"); - - private int id; - private int capacity; - private String name; - - ItemStorageType(int id, int capacity, String name) { - this.id = id; - this.capacity = capacity; - this.name = name; - } - - @Override - public String getName() { - return name; - } - - public int getId() { - return id; - } - - public int getCapacity() { - return capacity; - } - - @Override - public String toString() { - return name; - } - - public static ItemStorageType getById(int id) { - for (ItemStorageType type : ItemStorageType.values()) { - if (type.getId() == id) { - return type; - } - } - - return TYPE_CREATIVE; - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java index da5d0fdb8..ee79bfae5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafter; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager; import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; import com.raoulvdberge.refinedstorage.screen.IScreenInfoProvider; import com.raoulvdberge.refinedstorage.screen.grid.filtering.GridFilterParser; import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack; @@ -134,7 +134,7 @@ public class CrafterManagerContainer extends BaseContainer { if (newContainerData == null) { // We're only resizing, get the previous inventory... dummy = dummyInventories.get(category.getKey()); } else { - dummyInventories.put(category.getKey(), dummy = new ItemHandlerBase(category.getValue()) { + dummyInventories.put(category.getKey(), dummy = new BaseItemHandler(category.getValue()) { @Override public int getSlotLimit(int slot) { return 1; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java index 65c7fb489..1a92c28e5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java @@ -6,8 +6,8 @@ import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilterIcon; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterIcon; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems; +import com.raoulvdberge.refinedstorage.inventory.item.FilterIconItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemsItemHandler; import com.raoulvdberge.refinedstorage.item.FilterItem; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; @@ -24,7 +24,7 @@ public class FilterContainer extends BaseContainer { int y = 20; int x = 8; - ItemHandlerFilterItems filter = new ItemHandlerFilterItems(stack); + FilterItemsItemHandler filter = new FilterItemsItemHandler(stack); FluidInventory fluidFilter = new FluidInventoryFilter(stack); for (int i = 0; i < 27; ++i) { @@ -39,7 +39,7 @@ public class FilterContainer extends BaseContainer { } } - addSlot(new FilterSlot(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS)); + addSlot(new FilterSlot(new FilterIconItemHandler(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS)); addSlot(new FluidFilterSlot(new FluidInventoryFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS)); addPlayerInventory(8, 149); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java index 2173b4a18..ba0783ca3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java @@ -1,12 +1,13 @@ package com.raoulvdberge.refinedstorage.container; +import com.raoulvdberge.refinedstorage.RSContainers; import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; -import com.raoulvdberge.refinedstorage.tile.TileStorage; +import com.raoulvdberge.refinedstorage.tile.StorageTile; import net.minecraft.entity.player.PlayerEntity; public class StorageContainer extends BaseContainer { - public StorageContainer(TileStorage storage, PlayerEntity player, int windowId) { - super(/*RSContainers.STORAGE*/null, storage, player, windowId); + public StorageContainer(StorageTile storage, PlayerEntity player, int windowId) { + super(RSContainers.STORAGE_BLOCK, storage, player, windowId); for (int i = 0; i < 9; ++i) { addSlot(new FilterSlot(storage.getNode().getFilters(), i, 8 + (18 * i), 20)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidHandlerProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/ProxyFluidHandler.java similarity index 92% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidHandlerProxy.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/ProxyFluidHandler.java index 5ec851cdb..1ab255082 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidHandlerProxy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/ProxyFluidHandler.java @@ -6,11 +6,11 @@ import net.minecraftforge.fluids.capability.templates.FluidTank; import javax.annotation.Nonnull; -public class FluidHandlerProxy implements IFluidHandler { +public class ProxyFluidHandler implements IFluidHandler { private FluidTank insertHandler; private FluidTank extractHandler; - public FluidHandlerProxy(FluidTank insertHandler, FluidTank extractHandler) { + public ProxyFluidHandler(FluidTank insertHandler, FluidTank extractHandler) { this.insertHandler = insertHandler; this.extractHandler = extractHandler; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/BaseItemHandler.java similarity index 90% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/item/BaseItemHandler.java index 6b4905175..5b7ff53d6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/BaseItemHandler.java @@ -9,7 +9,7 @@ import javax.annotation.Nullable; import java.util.function.Consumer; import java.util.function.Predicate; -public class ItemHandlerBase extends ItemStackHandler { +public class BaseItemHandler extends ItemStackHandler { @Nullable private Consumer listener; @@ -19,14 +19,14 @@ public class ItemHandlerBase extends ItemStackHandler { private boolean reading; - public ItemHandlerBase(int size, @Nullable Consumer listener, Predicate... validators) { + public BaseItemHandler(int size, @Nullable Consumer listener, Predicate... validators) { super(size); this.listener = listener; this.validators = validators; } - public ItemHandlerBase(int size, Predicate... validators) { + public BaseItemHandler(int size, Predicate... validators) { this(size, null, validators); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterIcon.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterIconItemHandler.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterIcon.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterIconItemHandler.java index 7a602e6c5..1f49ee4d6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterIcon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterIconItemHandler.java @@ -4,10 +4,10 @@ import com.raoulvdberge.refinedstorage.item.FilterItem; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemStackHandler; -public class ItemHandlerFilterIcon extends ItemStackHandler { +public class FilterIconItemHandler extends ItemStackHandler { private ItemStack stack; - public ItemHandlerFilterIcon(ItemStack stack) { + public FilterIconItemHandler(ItemStack stack) { super(1); this.stack = stack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemHandler.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemHandler.java index 09acba1d0..6c330d3b8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemHandler.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -public class ItemHandlerFilter extends ItemHandlerBase { +public class FilterItemHandler extends BaseItemHandler { private List filters; private List tabs; - public ItemHandlerFilter(List filters, List tabs, @Nullable Consumer listener) { + public FilterItemHandler(List filters, List tabs, @Nullable Consumer listener) { super(4, listener, new ItemValidatorBasic(RSItems.FILTER)); this.filters = filters; @@ -59,7 +59,7 @@ public class ItemHandlerFilter extends ItemHandlerBase { List filters = new ArrayList<>(); - ItemHandlerFilterItems items = new ItemHandlerFilterItems(filter); + FilterItemsItemHandler items = new FilterItemsItemHandler(filter); for (ItemStack stack : items.getFilteredItems()) { if (stack.getItem() == RSItems.FILTER) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemsItemHandler.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemsItemHandler.java index 6cab01a7b..edf5e786d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/FilterItemsItemHandler.java @@ -6,10 +6,10 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraftforge.items.ItemStackHandler; -public class ItemHandlerFilterItems extends ItemStackHandler { +public class FilterItemsItemHandler extends ItemStackHandler { private ItemStack stack; - public ItemHandlerFilterItems(ItemStack stack) { + public FilterItemsItemHandler(ItemStack stack) { super(27); this.stack = stack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ProxyItemHandler.java similarity index 93% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerProxy.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ProxyItemHandler.java index 0ccb80b54..3496a0e70 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerProxy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ProxyItemHandler.java @@ -5,11 +5,11 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; -public class ItemHandlerProxy implements IItemHandler { +public class ProxyItemHandler implements IItemHandler { private IItemHandler insertHandler; private IItemHandler extractHandler; - public ItemHandlerProxy(IItemHandler insertHandler, IItemHandler extractHandler) { + public ProxyItemHandler(IItemHandler insertHandler, IItemHandler extractHandler) { this.insertHandler = insertHandler; this.extractHandler = extractHandler; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/UpgradeItemHandler.java similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerUpgrade.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/item/UpgradeItemHandler.java index 93270d678..bc0dcef71 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerUpgrade.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/item/UpgradeItemHandler.java @@ -8,8 +8,8 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; import java.util.function.Consumer; -public class ItemHandlerUpgrade extends ItemHandlerBase { - public ItemHandlerUpgrade(int size, @Nullable Consumer listener, UpgradeItem.Type... supportedUpgrades) { +public class UpgradeItemHandler extends BaseItemHandler { + public UpgradeItemHandler(int size, @Nullable Consumer listener, UpgradeItem.Type... supportedUpgrades) { super(size, listener, new ItemValidatorBasic[supportedUpgrades.length]); for (int i = 0; i < supportedUpgrades.length; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/ListenerNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeListener.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/ListenerNetworkNode.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeListener.java index e02958549..6919a180c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/ListenerNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/NetworkNodeListener.java @@ -4,10 +4,10 @@ import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import java.util.function.Consumer; -public class ListenerNetworkNode implements Consumer { +public class NetworkNodeListener implements Consumer { private INetworkNode node; - public ListenerNetworkNode(INetworkNode node) { + public NetworkNodeListener(INetworkNode node) { this.node = node; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/ListenerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/TileListener.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/ListenerTile.java rename to src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/TileListener.java index 87f3bec2b..b769cfcca 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/ListenerTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/listener/TileListener.java @@ -4,10 +4,10 @@ import net.minecraft.tileentity.TileEntity; import java.util.function.Consumer; -public class ListenerTile implements Consumer { +public class TileListener implements Consumer { private TileEntity tile; - public ListenerTile(TileEntity tile) { + public TileListener(TileEntity tile) { this.tile = tile; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java index 780927ddf..b79ac1783 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IFilter; import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemsItemHandler; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.util.ITooltipFlag; @@ -85,7 +85,7 @@ public class FilterItem extends Item { tooltip.add(new TranslationTextComponent("gui.refinedstorage.filter.mod_filter").setStyle(new Style().setColor(TextFormatting.BLUE))); } - ItemHandlerFilterItems items = new ItemHandlerFilterItems(stack); + FilterItemsItemHandler items = new FilterItemsItemHandler(stack); RenderUtils.addCombinedItemsToTooltip(tooltip, false, items.getFilteredItems()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/ItemBlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/ItemBlockStorage.java deleted file mode 100644 index a62ab11e8..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/ItemBlockStorage.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.raoulvdberge.refinedstorage.item.blockitem; - -import com.raoulvdberge.refinedstorage.block.BlockStorage; - -public class ItemBlockStorage extends ItemBlockBase { - public ItemBlockStorage(BlockStorage storage) { - super(storage); - } -/* TODO - @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); - - if (isValid(stack)) { - UUID id = getId(stack); - - API.instance().getStorageDiskSync().sendRequest(id); - - IStorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); - if (data != null) { - if (data.getCapacity() == -1) { - tooltip.add(I18n.format("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored()))); - } else { - tooltip.add(I18n.format("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity()))); - } - } - - if (flag.isAdvanced()) { - tooltip.add(id.toString()); - } - } - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, EnumHand hand) { - ItemStack storageStack = player.getHeldItem(hand); - - if (!world.isRemote && player.isSneaking() && storageStack.getMetadata() != ItemStorageDisk.TYPE_CREATIVE) { - UUID diskId = null; - IStorageDisk disk = null; - - if (isValid(storageStack)) { - diskId = getId(storageStack); - disk = API.instance().getStorageDiskManager(world).get(diskId); - } - - // Newly created storages won't have a tag yet, so allow invalid disks as well. - if (disk == null || disk.getStored() == 0) { - ItemStack storagePart = new ItemStack(RSItems.STORAGE_PART, storageStack.getCount(), storageStack.getMetadata()); - - if (!player.inventory.addItemStackToInventory(storagePart.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart); - } - - ItemStack processor = new ItemStack(RSItems.PROCESSOR, storageStack.getCount(), ItemProcessor.TYPE_BASIC); - - if (!player.inventory.addItemStackToInventory(processor.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor); - } - - if (disk != null) { - API.instance().getStorageDiskManager(world).remove(diskId); - API.instance().getStorageDiskManager(world).markForSaving(); - } - - return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING)); - } - } - - return new ActionResult<>(EnumActionResult.PASS, storageStack); - } - - @Override - public int getEntityLifespan(ItemStack stack, World world) { - return Integer.MAX_VALUE; - } - - private UUID getId(ItemStack disk) { - return disk.getTagCompound().getUniqueId(NetworkNodeStorage.NBT_ID); - } - - private boolean isValid(ItemStack disk) { - return disk.hasTagCompound() && disk.getTagCompound().hasUniqueId(NetworkNodeStorage.NBT_ID); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { - super.onUpdate(stack, world, entity, itemSlot, isSelected); - - if (!world.isRemote) { - OneSixMigrationHelper.migrateItemStorageBlockItem(world, stack); - } - }*/ -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java new file mode 100644 index 000000000..7587fdcd1 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java @@ -0,0 +1,115 @@ +package com.raoulvdberge.refinedstorage.item.blockitem; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.RSItems; +import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; +import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; +import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; +import com.raoulvdberge.refinedstorage.block.StorageBlock; +import com.raoulvdberge.refinedstorage.item.StoragePartItem; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; +import net.minecraft.util.text.*; +import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.UUID; + +public class StorageBlockItem extends BaseBlockItem { + private final ItemStorageType type; + + public StorageBlockItem(StorageBlock block) { + super(block, new Item.Properties().group(RS.MAIN_GROUP)); + + this.type = block.getType(); + + this.setRegistryName(block.getRegistryName()); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + + if (isValid(stack)) { + UUID id = getId(stack); + + API.instance().getStorageDiskSync().sendRequest(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))); + } else { + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(new Style().setColor(TextFormatting.GRAY))); + } + } + + if (flag.isAdvanced()) { + tooltip.add(new StringTextComponent(id.toString()).setStyle(new Style().setColor(TextFormatting.GRAY))); + } + } + } + + @Override + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { + ItemStack storageStack = player.getHeldItem(hand); + + if (!world.isRemote && player.isSneaking() && type != ItemStorageType.CREATIVE) { + UUID diskId = null; + IStorageDisk disk = null; + + if (isValid(storageStack)) { + diskId = getId(storageStack); + disk = API.instance().getStorageDiskManager((ServerWorld) world).get(diskId); + } + + // Newly created storages won't have a tag yet, so allow invalid disks as well. + if (disk == null || disk.getStored() == 0) { + ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type)); + + if (!player.inventory.addItemStackToInventory(storagePart.copy())) { + InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart); + } + + ItemStack processor = new ItemStack(RSItems.BASIC_PROCESSOR); + + if (!player.inventory.addItemStackToInventory(processor.copy())) { + InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor); + } + + if (disk != null) { + API.instance().getStorageDiskManager((ServerWorld) world).remove(diskId); + API.instance().getStorageDiskManager((ServerWorld) world).markForSaving(); + } + + return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING)); + } + } + + return new ActionResult<>(ActionResultType.PASS, storageStack); + } + + @Override + public int getEntityLifespan(ItemStack stack, World world) { + return Integer.MAX_VALUE; + } + + private UUID getId(ItemStack disk) { + return disk.getTag().getUniqueId(StorageNetworkNode.NBT_ID); + } + + private boolean isValid(ItemStack disk) { + return disk.hasTag() && disk.getTag().hasUniqueId(StorageNetworkNode.NBT_ID); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/DiskDriveBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/DiskDriveBakedModel.java index 2f7f4e0eb..ef826ba7c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/DiskDriveBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/DiskDriveBakedModel.java @@ -68,6 +68,7 @@ public class DiskDriveBakedModel extends DelegateBakedModel { private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override + @SuppressWarnings("deprecation") public List load(CacheKey key) { Direction facing = key.state.get(RSBlocks.DISK_DRIVE.getDirection().getProperty()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/TRSRBakedModel.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/TRSRBakedModel.java index caaee77cf..da7a713ff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/TRSRBakedModel.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/TRSRBakedModel.java @@ -67,6 +67,7 @@ public class TRSRBakedModel implements IBakedModel { @Nonnull @Override + @SuppressWarnings("deprecation") public List getQuads(BlockState state, Direction side, Random rand) { // transform quads obtained from parent @@ -108,12 +109,14 @@ public class TRSRBakedModel implements IBakedModel { @Nonnull @Override + @SuppressWarnings("deprecation") public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); } @Nonnull @Override + @SuppressWarnings("deprecation") public ItemCameraTransforms getItemCameraTransforms() { return original.getItemCameraTransforms(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java index 083e3a9ef..3bd766ab2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.ControllerContainer; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.ClientNode; import com.raoulvdberge.refinedstorage.tile.ControllerTile; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -33,7 +33,7 @@ public class ControllerScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, ControllerTile.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, ControllerTile.REDSTONE_MODE)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java index 7226ae5fb..d0a8f628f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java @@ -3,10 +3,10 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ConstructorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonConstuctorDrop; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CompareSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.ConstructorDropSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; import com.raoulvdberge.refinedstorage.tile.TileConstructor; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -18,12 +18,12 @@ public class GuiConstructor extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileConstructor.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileConstructor.REDSTONE_MODE)); - addSideButton(new SideButtonType(this, TileConstructor.TYPE)); + addSideButton(new TypeSideButton(this, TileConstructor.TYPE)); - addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonConstuctorDrop(this)); + addSideButton(new CompareSideButton(this, TileConstructor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new ConstructorDropSideButton(this)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java index 4008e4712..4ff3016bc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java @@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCrafterManagerSearchBoxMode; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonGridSize; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CrafterManagerSearchBoxModeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.GridSizeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -97,9 +97,9 @@ public class GuiCrafterManager extends BaseScreen imple @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileCrafterManager.REDSTONE_MODE)); - addSideButton(new SideButtonCrafterManagerSearchBoxMode(this)); - addSideButton(new SideButtonGridSize(this, () -> crafterManager.getSize(), size -> TileDataManager.setParameter(TileCrafterManager.SIZE, size))); + addSideButton(new RedstoneModeSideButton(this, TileCrafterManager.REDSTONE_MODE)); + addSideButton(new CrafterManagerSearchBoxModeSideButton(this)); + addSideButton(new GridSizeSideButton(this, () -> crafterManager.getSize(), size -> TileDataManager.setParameter(TileCrafterManager.SIZE, size))); this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); this.scrollbar.addListener((oldOffset, newOffset) -> { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java index 983ed8111..a31b93b12 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java @@ -15,7 +15,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers; import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.FontRenderer; @@ -157,7 +157,7 @@ public class GuiCraftingMonitor extends BaseScreen { this.scrollbar = new ScrollbarWidget(this, 235, 20, 12, 149); if (craftingMonitor.getRedstoneModeParameter() != null) { - addSideButton(new SideButtonRedstoneMode(this, craftingMonitor.getRedstoneModeParameter())); + addSideButton(new RedstoneModeSideButton(this, craftingMonitor.getRedstoneModeParameter())); } String cancel = I18n.format("gui.cancel"); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java index bbc1c87a1..1f8e634ea 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java @@ -15,15 +15,15 @@ public class GuiDestructor extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileDestructor.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileDestructor.REDSTONE_MODE)); - addSideButton(new SideButtonType(this, TileDestructor.TYPE)); + addSideButton(new TypeSideButton(this, TileDestructor.TYPE)); - addSideButton(new SideButtonMode(this, TileDestructor.MODE)); + addSideButton(new WhitelistBlacklistSideButton(this, TileDestructor.WHITELIST_BLACKLIST)); - addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, TileDestructor.COMPARE, IComparer.COMPARE_NBT)); - addSideButton(new SideButtonDestructorPickup(this)); + addSideButton(new DestructorPickupSideButton(this)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java index 54ca97e04..0610c5297 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java @@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.DetectorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonDetectorMode; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CompareSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.DetectorModeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; import com.raoulvdberge.refinedstorage.tile.TileDetector; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.resources.I18n; @@ -20,11 +20,11 @@ public class GuiDetector extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonType(this, TileDetector.TYPE)); + addSideButton(new TypeSideButton(this, TileDetector.TYPE)); - addSideButton(new SideButtonDetectorMode(this)); + addSideButton(new DetectorModeSideButton(this)); - addSideButton(new SideButtonCompare(this, TileDetector.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, TileDetector.COMPARE, IComparer.COMPARE_NBT)); amount = new TextFieldWidget(font, x + 41 + 1, y + 23 + 1, 50, font.FONT_HEIGHT, ""); amount.setText(String.valueOf(TileDetector.AMOUNT.getValue())); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java index 0d9cba648..76a7e6409 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java @@ -15,11 +15,11 @@ public class GuiDiskManipulator extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileDiskManipulator.REDSTONE_MODE)); - addSideButton(new SideButtonIOMode(this)); - addSideButton(new SideButtonType(this, TileDiskManipulator.TYPE)); - addSideButton(new SideButtonMode(this, TileDiskManipulator.MODE)); - addSideButton(new SideButtonCompare(this, TileDiskManipulator.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new RedstoneModeSideButton(this, TileDiskManipulator.REDSTONE_MODE)); + addSideButton(new IoModeSideButton(this)); + addSideButton(new TypeSideButton(this, TileDiskManipulator.TYPE)); + addSideButton(new WhitelistBlacklistSideButton(this, TileDiskManipulator.WHITELIST_BLACKLIST)); + addSideButton(new CompareSideButton(this, TileDiskManipulator.COMPARE, IComparer.COMPARE_NBT)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java index 84e70719e..ccedf8150 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java @@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ExporterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CompareSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; import com.raoulvdberge.refinedstorage.tile.TileExporter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -17,11 +17,11 @@ public class GuiExporter extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileExporter.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileExporter.REDSTONE_MODE)); - addSideButton(new SideButtonType(this, TileExporter.TYPE)); + addSideButton(new TypeSideButton(this, TileExporter.TYPE)); - addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, TileExporter.COMPARE, IComparer.COMPARE_NBT)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java index 443311185..a717dd0c4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidInterface; import com.raoulvdberge.refinedstorage.container.FluidInterfaceContainer; import com.raoulvdberge.refinedstorage.render.FluidRenderer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; @@ -21,7 +21,7 @@ public class GuiFluidInterface extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileFluidInterface.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileFluidInterface.REDSTONE_MODE)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java index 3b8e08f88..9982a47b0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java @@ -3,10 +3,10 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ImporterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonMode; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CompareSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.TypeSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.WhitelistBlacklistSideButton; import com.raoulvdberge.refinedstorage.tile.TileImporter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -18,13 +18,13 @@ public class GuiImporter extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileImporter.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileImporter.REDSTONE_MODE)); - addSideButton(new SideButtonType(this, TileImporter.TYPE)); + addSideButton(new TypeSideButton(this, TileImporter.TYPE)); - addSideButton(new SideButtonMode(this, TileImporter.MODE)); + addSideButton(new WhitelistBlacklistSideButton(this, TileImporter.WHITELIST_BLACKLIST)); - addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, TileImporter.COMPARE, IComparer.COMPARE_NBT)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java index 3e846dabe..73d0c1785 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java @@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.InterfaceContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CompareSideButton; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileInterface; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -16,9 +16,9 @@ public class GuiInterface extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileInterface.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileInterface.REDSTONE_MODE)); - addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, TileInterface.COMPARE, IComparer.COMPARE_NBT)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java index 7d2ed343b..21b0fab1a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.NetworkTransmitterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -18,7 +18,7 @@ public class GuiNetworkTransmitter extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, readerWriter.getRedstoneModeParameter())); + addSideButton(new RedstoneModeSideButton(this, readerWriter.getRedstoneModeParameter())); add = addButton(x + 128, y + 15, 20, 20, "+", true, true, btn -> { }); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java index bc88d1707..f2e9eb6eb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.RelayContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileRelay; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -14,7 +14,7 @@ public class GuiRelay extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileRelay.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileRelay.REDSTONE_MODE)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java index ba5465a55..43cca0564 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.container.SecurityManagerContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; @@ -23,7 +23,7 @@ public class GuiSecurityManager extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonRedstoneMode(this, TileSecurityManager.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, TileSecurityManager.REDSTONE_MODE)); int padding = 15; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java index 570c748bb..78c555b77 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.StorageMonitorContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CompareSideButton; import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -15,7 +15,7 @@ public class GuiStorageMonitor extends BaseScreen { @Override public void onPostInit(int x, int y) { - addSideButton(new SideButtonCompare(this, TileStorageMonitor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, TileStorageMonitor.COMPARE, IComparer.COMPARE_NBT)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java index 46f02a580..c3b7bd9e9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.container.WirelessTransmitterContainer; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; @@ -14,7 +14,7 @@ public class GuiWirelessTransmitter extends BaseScreen { + public StorageBlockScreen(StorageContainer container, PlayerInventory inventory, ITextComponent title) { + super( + container, + inventory, + title, + "gui/storage.png", + null, + StorageTile.REDSTONE_MODE, + StorageTile.COMPARE, + StorageTile.WHITELIST_BLACKLIST, + StorageTile.PRIORITY, + StorageTile.ACCESS_TYPE, + StorageTile.STORED::getValue, + () -> (long) ((StorageTile) container.getTile()).getItemStorageType().getCapacity() + ); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java index 8657c29ee..0ba7e5ef9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/StorageScreen.java @@ -27,7 +27,7 @@ public class StorageScreen extends BaseScreen { private TileDataParameter typeParameter; private TileDataParameter redstoneModeParameter; private TileDataParameter compareParameter; - private TileDataParameter filterParameter; + private TileDataParameter whitelistBlacklistParameter; private TileDataParameter priorityParameter; private TileDataParameter accessTypeParameter; private Supplier storedSupplier; @@ -42,7 +42,7 @@ public class StorageScreen extends BaseScreen { @Nullable TileDataParameter typeParameter, @Nullable TileDataParameter redstoneModeParameter, @Nullable TileDataParameter compareParameter, - @Nullable TileDataParameter filterParameter, + @Nullable TileDataParameter whitelistBlacklistParameter, TileDataParameter priorityParameter, @Nullable TileDataParameter accessTypeParameter, Supplier storedSupplier, Supplier capacitySupplier) { @@ -52,7 +52,7 @@ public class StorageScreen extends BaseScreen { this.typeParameter = typeParameter; this.redstoneModeParameter = redstoneModeParameter; this.compareParameter = compareParameter; - this.filterParameter = filterParameter; + this.whitelistBlacklistParameter = whitelistBlacklistParameter; this.priorityParameter = priorityParameter; this.accessTypeParameter = accessTypeParameter; this.storedSupplier = storedSupplier; @@ -62,23 +62,23 @@ public class StorageScreen extends BaseScreen { @Override public void onPostInit(int x, int y) { if (redstoneModeParameter != null) { - addSideButton(new SideButtonRedstoneMode(this, redstoneModeParameter)); + addSideButton(new RedstoneModeSideButton(this, redstoneModeParameter)); } if (typeParameter != null) { - addSideButton(new SideButtonType(this, typeParameter)); + addSideButton(new TypeSideButton(this, typeParameter)); } - if (filterParameter != null) { - addSideButton(new SideButtonMode(this, filterParameter)); + if (whitelistBlacklistParameter != null) { + addSideButton(new WhitelistBlacklistSideButton(this, whitelistBlacklistParameter)); } if (compareParameter != null) { - addSideButton(new SideButtonCompare(this, compareParameter, IComparer.COMPARE_NBT)); + addSideButton(new CompareSideButton(this, compareParameter, IComparer.COMPARE_NBT)); } if (accessTypeParameter != null) { - addSideButton(new SideButtonAccessType(this, accessTypeParameter)); + addSideButton(new AccessTypeSideButton(this, accessTypeParameter)); } int buttonWidth = 10 + font.getStringWidth(I18n.format("misc.refinedstorage.priority")); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/TileDataParameterClientListenerCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/TileDataParameterClientListenerCrafter.java index 17da4e575..55b1bb38e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/TileDataParameterClientListenerCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/TileDataParameterClientListenerCrafter.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.screen; -import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCrafterMode; +import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.CrafterModeSideButton; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameterClientListener; public class TileDataParameterClientListenerCrafter implements TileDataParameterClientListener { @@ -8,7 +8,7 @@ public class TileDataParameterClientListenerCrafter implements TileDataParameter public void onChanged(boolean initial, Boolean hasRoot) { if (!hasRoot) { BaseScreen.executeLater(GuiCrafter.class, gui -> { - gui.addSideButton(new SideButtonCrafterMode(gui)); + gui.addSideButton(new CrafterModeSideButton(gui)); }); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java index 9f6e654d0..63c2d3126 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java @@ -95,7 +95,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); if (grid instanceof GridNetworkNode || grid instanceof TilePortableGrid) { - addSideButton(new SideButtonRedstoneMode(this, grid instanceof GridNetworkNode ? GridTile.REDSTONE_MODE : TilePortableGrid.REDSTONE_MODE)); + addSideButton(new RedstoneModeSideButton(this, grid instanceof GridNetworkNode ? GridTile.REDSTONE_MODE : TilePortableGrid.REDSTONE_MODE)); } int sx = x + 80 + 1; @@ -115,13 +115,13 @@ public class GridScreen extends BaseScreen implements IScreenInfo addButton(searchField); if (grid.getGridType() != GridType.FLUID && grid.getViewType() != -1) { - addSideButton(new SideButtonGridViewType(this, grid)); + addSideButton(new GridViewTypeSideButton(this, grid)); } - addSideButton(new SideButtonGridSortingDirection(this, grid)); - addSideButton(new SideButtonGridSortingType(this, grid)); - addSideButton(new SideButtonGridSearchBoxMode(this)); - addSideButton(new SideButtonGridSize(this, () -> grid.getSize(), size -> grid.onSizeChanged(size))); + addSideButton(new GridSortingDirectionSideButton(this, grid)); + addSideButton(new GridSortingTypeSideButton(this, grid)); + addSideButton(new GridSearchBoxModeSideButton(this)); + addSideButton(new GridSizeSideButton(this, () -> grid.getSize(), size -> grid.onSizeChanged(size))); if (grid.getGridType() == GridType.PATTERN) { processingPattern = addCheckBox(x + 7, y + getTopHeight() + (getVisibleRows() * 18) + 60, I18n.format("misc.refinedstorage.processing"), GridTile.PROCESSING_PATTERN.getValue(), btn -> { @@ -144,7 +144,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo }); } - addSideButton(new SideButtonType(this, GridTile.PROCESSING_TYPE)); + addSideButton(new TypeSideButton(this, GridTile.PROCESSING_TYPE)); } updateScrollbar(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java index 385a9717a..1f59d1971 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IdGridSorter.java @@ -14,6 +14,7 @@ public class IdGridSorter implements IGridSorter { } @Override + @SuppressWarnings("deprecation") public int compare(IGridStack left, IGridStack right, SortingDirection sortingDirection) { int leftId = 0; int rightId = 0; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonAccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonAccessType.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java index 096fa8468..c2fa843a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonAccessType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java @@ -8,11 +8,11 @@ import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonAccessType extends SideButton { +public class AccessTypeSideButton extends SideButton { private TileDataParameter parameter; - public SideButtonAccessType(BaseScreen gui, TileDataParameter parameter) { - super(gui); + public AccessTypeSideButton(BaseScreen screen, TileDataParameter parameter) { + super(screen); this.parameter = parameter; } @@ -24,7 +24,7 @@ public class SideButtonAccessType extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:access_type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:access_type." + parameter.getValue().getId()); + return I18n.format("sidebutton.refinedstorage.access_type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.access_type." + parameter.getValue().getId()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCompare.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CompareSideButton.java similarity index 84% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCompare.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CompareSideButton.java index c27f1966a..8f21f0501 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCompare.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CompareSideButton.java @@ -7,12 +7,12 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonCompare extends SideButton { +public class CompareSideButton extends SideButton { private TileDataParameter parameter; private int mask; - public SideButtonCompare(BaseScreen gui, TileDataParameter parameter, int mask) { - super(gui); + public CompareSideButton(BaseScreen screen, TileDataParameter parameter, int mask) { + super(screen); this.parameter = parameter; this.mask = mask; @@ -20,7 +20,7 @@ public class SideButtonCompare extends SideButton { @Override public String getTooltip() { - String tooltip = I18n.format("sidebutton.refinedstorage:compare." + mask) + "\n" + TextFormatting.GRAY; + String tooltip = I18n.format("sidebutton.refinedstorage.compare." + mask) + "\n" + TextFormatting.GRAY; if ((parameter.getValue() & mask) == mask) { tooltip += I18n.format("gui.yes"); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonConstuctorDrop.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonConstuctorDrop.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index 28bfeb25a..687cee471 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonConstuctorDrop.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -6,9 +6,9 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonConstuctorDrop extends SideButton { - public SideButtonConstuctorDrop(BaseScreen gui) { - super(gui); +public class ConstructorDropSideButton extends SideButton { + public ConstructorDropSideButton(BaseScreen screen) { + super(screen); } @Override @@ -18,7 +18,7 @@ public class SideButtonConstuctorDrop extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:constructor.drop") + "\n" + TextFormatting.GRAY + I18n.format(TileConstructor.DROP.getValue() ? "gui.yes" : "gui.no"); + return I18n.format("sidebutton.refinedstorage.constructor.drop") + "\n" + TextFormatting.GRAY + I18n.format(TileConstructor.DROP.getValue() ? "gui.yes" : "gui.no"); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterManagerSearchBoxMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterManagerSearchBoxMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java index 51babe870..8a9c3eefb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterManagerSearchBoxMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java @@ -7,14 +7,14 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonCrafterManagerSearchBoxMode extends SideButton { - public SideButtonCrafterManagerSearchBoxMode(GuiCrafterManager gui) { - super(gui); +public class CrafterManagerSearchBoxModeSideButton extends SideButton { + public CrafterManagerSearchBoxModeSideButton(GuiCrafterManager screen) { + super(screen); } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiCrafterManager) screen).getCrafterManager().getSearchBoxMode()); + return I18n.format("sidebutton.refinedstorage.grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.search_box_mode." + ((GuiCrafterManager) screen).getCrafterManager().getSearchBoxMode()); } @Override @@ -34,7 +34,7 @@ public class SideButtonCrafterManagerSearchBoxMode extends SideButton { //TODO if (IntegrationJEI.isLoaded()) { // mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED; //} else { - mode = IGrid.SEARCH_BOX_MODE_NORMAL; + mode = IGrid.SEARCH_BOX_MODE_NORMAL; //} } else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index 3313eec70..5b55a250b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -6,14 +6,14 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonCrafterMode extends SideButton { - public SideButtonCrafterMode(BaseScreen gui) { - super(gui); +public class CrafterModeSideButton extends SideButton { + public CrafterModeSideButton(BaseScreen screen) { + super(screen); } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:crafter_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:crafter_mode." + TileCrafter.MODE.getValue()); + return I18n.format("sidebutton.refinedstorage.crafter_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.crafter_mode." + TileCrafter.MODE.getValue()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDestructorPickup.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java similarity index 79% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDestructorPickup.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index 1f29e6ee0..173c2f685 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDestructorPickup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -6,9 +6,9 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonDestructorPickup extends SideButton { - public SideButtonDestructorPickup(BaseScreen gui) { - super(gui); +public class DestructorPickupSideButton extends SideButton { + public DestructorPickupSideButton(BaseScreen screen) { + super(screen); } @Override @@ -18,7 +18,7 @@ public class SideButtonDestructorPickup extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:destructor.pickup") + "\n" + TextFormatting.GRAY + I18n.format(TileDestructor.PICKUP.getValue() ? "gui.yes" : "gui.no"); + return I18n.format("sidebutton.refinedstorage.destructor.pickup") + "\n" + TextFormatting.GRAY + I18n.format(TileDestructor.PICKUP.getValue() ? "gui.yes" : "gui.no"); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDetectorMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDetectorMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index 67dcafaf8..2e23c5178 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -7,14 +7,14 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonDetectorMode extends SideButton { - public SideButtonDetectorMode(BaseScreen gui) { - super(gui); +public class DetectorModeSideButton extends SideButton { + public DetectorModeSideButton(BaseScreen screen) { + super(screen); } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:detector.mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:detector.mode." + TileDetector.MODE.getValue()); + return I18n.format("sidebutton.refinedstorage.detector.mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.detector.mode." + TileDetector.MODE.getValue()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java index d09180e7e..4d87eff14 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java @@ -16,7 +16,7 @@ public class FilterTypeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:type." + screen.getType()); + return I18n.format("sidebutton.refinedstorage.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.type." + screen.getType()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSearchBoxMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java index 08e0f7ad1..58d47b80f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSearchBoxMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSearchBoxModeSideButton.java @@ -5,14 +5,14 @@ import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonGridSearchBoxMode extends SideButton { - public SideButtonGridSearchBoxMode(GridScreen gui) { - super(gui); +public class GridSearchBoxModeSideButton extends SideButton { + public GridSearchBoxModeSideButton(GridScreen screen) { + super(screen); } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.search_box_mode." + ((GridScreen) screen).getGrid().getSearchBoxMode()); + return I18n.format("sidebutton.refinedstorage.grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.search_box_mode." + ((GridScreen) screen).getGrid().getSearchBoxMode()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSize.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSize.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java index 201c69ca4..63c2d5526 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSize.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java @@ -8,24 +8,24 @@ import net.minecraft.util.text.TextFormatting; import java.util.function.Consumer; import java.util.function.Supplier; -public class SideButtonGridSize extends SideButton { - private Supplier size; - private Consumer handler; +public class GridSizeSideButton extends SideButton { + private Supplier sizeSupplier; + private Consumer listener; - public SideButtonGridSize(BaseScreen gui, Supplier size, Consumer handler) { - super(gui); - this.size = size; - this.handler = handler; + public GridSizeSideButton(BaseScreen screen, Supplier sizeSupplier, Consumer listener) { + super(screen); + this.sizeSupplier = sizeSupplier; + this.listener = listener; } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:grid.size") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.size." + this.size.get()); + return I18n.format("sidebutton.refinedstorage.grid.size") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.size." + this.sizeSupplier.get()); } @Override protected void renderButtonIcon(int x, int y) { - int size = this.size.get(); + int size = this.sizeSupplier.get(); int tx = 0; @@ -44,7 +44,7 @@ public class SideButtonGridSize extends SideButton { @Override public void onPress() { - int size = this.size.get(); + int size = this.sizeSupplier.get(); if (size == IGrid.SIZE_STRETCH) { size = IGrid.SIZE_SMALL; @@ -56,6 +56,6 @@ public class SideButtonGridSize extends SideButton { size = IGrid.SIZE_STRETCH; } - this.handler.accept(size); + this.listener.accept(size); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingDirection.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index 460d649f7..eac802f31 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -5,18 +5,18 @@ import com.raoulvdberge.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonGridSortingDirection extends SideButton { +public class GridSortingDirectionSideButton extends SideButton { private IGrid grid; - public SideButtonGridSortingDirection(BaseScreen gui, IGrid grid) { - super(gui); + public GridSortingDirectionSideButton(BaseScreen screen, IGrid grid) { + super(screen); this.grid = grid; } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:grid.sorting.direction") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection()); + return I18n.format("sidebutton.refinedstorage.grid.sorting.direction") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.sorting.direction." + grid.getSortingDirection()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingType.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java similarity index 87% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingType.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index 937e729cd..43f06e34a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -7,18 +7,18 @@ import com.raoulvdberge.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonGridSortingType extends SideButton { +public class GridSortingTypeSideButton extends SideButton { private IGrid grid; - public SideButtonGridSortingType(BaseScreen gui, IGrid grid) { - super(gui); + public GridSortingTypeSideButton(BaseScreen screen, IGrid grid) { + super(screen); this.grid = grid; } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:grid.sorting.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType()); + return I18n.format("sidebutton.refinedstorage.grid.sorting.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.sorting.type." + grid.getSortingType()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridViewType.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridViewType.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index 3d38ad32c..a2f378a4f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridViewType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -5,18 +5,18 @@ import com.raoulvdberge.refinedstorage.screen.BaseScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonGridViewType extends SideButton { +public class GridViewTypeSideButton extends SideButton { private IGrid grid; - public SideButtonGridViewType(BaseScreen gui, IGrid grid) { - super(gui); + public GridViewTypeSideButton(BaseScreen screen, IGrid grid) { + super(screen); this.grid = grid; } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:grid.view_type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:grid.view_type." + grid.getViewType()); + return I18n.format("sidebutton.refinedstorage.grid.view_type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.view_type." + grid.getViewType()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonIOMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonIOMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index 4537d415f..817c16c55 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonIOMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -7,14 +7,14 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonIOMode extends SideButton { - public SideButtonIOMode(BaseScreen gui) { - super(gui); +public class IoModeSideButton extends SideButton { + public IoModeSideButton(BaseScreen screen) { + super(screen); } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:iomode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:iomode." + (TileDiskManipulator.IO_MODE.getValue() == NetworkNodeDiskManipulator.IO_MODE_INSERT ? "insert" : "extract")); + return I18n.format("sidebutton.refinedstorage.iomode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.iomode." + (TileDiskManipulator.IO_MODE.getValue() == NetworkNodeDiskManipulator.IO_MODE_INSERT ? "insert" : "extract")); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonRedstoneMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonRedstoneMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java index 036ced738..bfc6f7014 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java @@ -6,18 +6,18 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonRedstoneMode extends SideButton { +public class RedstoneModeSideButton extends SideButton { private TileDataParameter parameter; - public SideButtonRedstoneMode(BaseScreen gui, TileDataParameter parameter) { - super(gui); + public RedstoneModeSideButton(BaseScreen screen, TileDataParameter parameter) { + super(screen); this.parameter = parameter; } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:redstone_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:redstone_mode." + parameter.getValue()); + return I18n.format("sidebutton.refinedstorage.redstone_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.redstone_mode." + parameter.getValue()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonType.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/TypeSideButton.java similarity index 78% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonType.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/TypeSideButton.java index fecb171e2..f6a2b97d2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/TypeSideButton.java @@ -7,18 +7,18 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonType extends SideButton { +public class TypeSideButton extends SideButton { private TileDataParameter type; - public SideButtonType(BaseScreen gui, TileDataParameter type) { - super(gui); + public TypeSideButton(BaseScreen screen, TileDataParameter type) { + super(screen); this.type = type; } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage:type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage:type." + type.getValue()); + return I18n.format("sidebutton.refinedstorage.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.type." + type.getValue()); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonMode.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java index 1927db010..c70562715 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java @@ -7,11 +7,11 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -public class SideButtonMode extends SideButton { +public class WhitelistBlacklistSideButton extends SideButton { private TileDataParameter parameter; - public SideButtonMode(BaseScreen gui, TileDataParameter parameter) { - super(gui); + public WhitelistBlacklistSideButton(BaseScreen screen, TileDataParameter parameter) { + super(screen); this.parameter = parameter; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java index 3c4b28116..faafd25d2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java @@ -623,6 +623,7 @@ public class ControllerTile extends BaseTile implements ITickableTileEntity, INe public ItemStack getItemStack() { BlockState state = world.getBlockState(pos); + @SuppressWarnings("deprecation") Item item = Item.getItemFromBlock(state.getBlock()); return new ItemStack(item, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/StorageTile.java old mode 100755 new mode 100644 similarity index 54% rename from src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/tile/StorageTile.java index fd8fb673c..617a68e63 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/StorageTile.java @@ -1,39 +1,48 @@ package com.raoulvdberge.refinedstorage.tile; -import com.raoulvdberge.refinedstorage.RSTiles; import com.raoulvdberge.refinedstorage.api.storage.AccessType; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeStorage; +import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; import com.raoulvdberge.refinedstorage.tile.config.IAccessType; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; import com.raoulvdberge.refinedstorage.tile.config.IWhitelistBlacklist; import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import com.raoulvdberge.refinedstorage.util.StorageBlockUtils; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import javax.annotation.Nonnull; -public class TileStorage extends NetworkNodeTile { - public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); - public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IWhitelistBlacklist.createParameter(); - public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); - public static final TileDataParameter STORED = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> t.getNode().getStorage() != null ? (long) t.getNode().getStorage().getStored() : 0); +public class StorageTile extends NetworkNodeTile { + public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); + public static final TileDataParameter COMPARE = IComparable.createParameter(); + public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); + public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); + public static final TileDataParameter STORED = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> t.getNode().getStorage() != null ? (long) t.getNode().getStorage().getStored() : 0); - public TileStorage() { - super(RSTiles.STORAGE); + private final ItemStorageType type; + + public StorageTile(ItemStorageType type) { + super(StorageBlockUtils.getTileEntityType(type)); + + this.type = type; dataManager.addWatchedParameter(PRIORITY); dataManager.addWatchedParameter(COMPARE); - dataManager.addWatchedParameter(MODE); + dataManager.addWatchedParameter(WHITELIST_BLACKLIST); dataManager.addWatchedParameter(STORED); dataManager.addWatchedParameter(ACCESS_TYPE); } + public ItemStorageType getItemStorageType() { + return type; + } + @Override @Nonnull - public NetworkNodeStorage createNode(World world, BlockPos pos) { - return new NetworkNodeStorage(world, pos); + public StorageNetworkNode createNode(World world, BlockPos pos) { + return new StorageNetworkNode(world, pos, type); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java index f48336172..cf69bf27a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java @@ -14,7 +14,7 @@ import javax.annotation.Nonnull; public class TileDestructor extends NetworkNodeTile { public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IWhitelistBlacklist.createParameter(); + public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); public static final TileDataParameter PICKUP = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isPickupItem(), (t, v) -> { t.getNode().setPickupItem(v); @@ -25,7 +25,7 @@ public class TileDestructor extends NetworkNodeTile { super(RSTiles.DESTRUCTOR); dataManager.addWatchedParameter(COMPARE); - dataManager.addWatchedParameter(MODE); + dataManager.addWatchedParameter(WHITELIST_BLACKLIST); dataManager.addWatchedParameter(TYPE); dataManager.addWatchedParameter(PICKUP); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java index 7444cf089..0822b4c7a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java @@ -15,7 +15,7 @@ import javax.annotation.Nonnull; public class TileDiskManipulator extends NetworkNodeTile { public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IWhitelistBlacklist.createParameter(); + public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); public static final TileDataParameter IO_MODE = new TileDataParameter<>(DataSerializers.VARINT, NetworkNodeDiskManipulator.IO_MODE_INSERT, t -> t.getNode().getIoMode(), (t, v) -> { t.getNode().setIoMode(v); @@ -28,7 +28,7 @@ public class TileDiskManipulator extends NetworkNodeTile { public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IWhitelistBlacklist.createParameter(); + public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); public static final TileDataParameter STORED = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> { @@ -52,7 +52,7 @@ public class TileExternalStorage extends NetworkNodeTile { public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IWhitelistBlacklist.createParameter(); + public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); public static final TileDataParameter STORED = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> t.getNode().getStorage() != null ? (long) t.getNode().getStorage().getStored() : 0); @@ -26,7 +26,7 @@ public class TileFluidStorage extends NetworkNodeTile { dataManager.addWatchedParameter(PRIORITY); dataManager.addWatchedParameter(COMPARE); - dataManager.addWatchedParameter(MODE); + dataManager.addWatchedParameter(WHITELIST_BLACKLIST); dataManager.addWatchedParameter(STORED); dataManager.addWatchedParameter(ACCESS_TYPE); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java index 9ae5f23d4..11e773baf 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java @@ -13,14 +13,14 @@ import javax.annotation.Nonnull; public class TileImporter extends NetworkNodeTile { public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = IWhitelistBlacklist.createParameter(); + public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); public TileImporter() { super(RSTiles.IMPORTER); dataManager.addWatchedParameter(COMPARE); - dataManager.addWatchedParameter(MODE); + dataManager.addWatchedParameter(WHITELIST_BLACKLIST); dataManager.addWatchedParameter(TYPE); } 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 9d1607bc0..6b53e448a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -8,7 +8,7 @@ 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.cache.listener.FluidGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; import com.raoulvdberge.refinedstorage.util.StackUtils; @@ -47,7 +47,7 @@ public class WirelessFluidGrid implements IGridNetworkAware { private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); - private ItemHandlerFilter filter = new ItemHandlerFilter(filters, tabs, null) { + private FilterItemHandler filter = new FilterItemHandler(filters, tabs, null) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); 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 02291264c..2335e1663 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -8,7 +8,7 @@ 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.cache.listener.ItemGridStorageCacheListener; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; import com.raoulvdberge.refinedstorage.util.StackUtils; @@ -47,7 +47,7 @@ public class WirelessGrid implements IGridNetworkAware { private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); - private ItemHandlerFilter filter = new ItemHandlerFilter(filters, tabs, null) { + private FilterItemHandler filter = new FilterItemHandler(filters, tabs, null) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); 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 e05c2fae4..19f70886c 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 @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.tile.grid.portable; 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 com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandlerModifiable; @@ -47,7 +47,7 @@ public interface IPortableGrid { int getEnergy(); - ItemHandlerBase getDisk(); + BaseItemHandler getDisk(); IItemHandlerModifiable getFilter(); 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 8d69dc00a..9098b64a1 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 @@ -27,8 +27,8 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.PortableFluidStorage 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.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; import com.raoulvdberge.refinedstorage.util.StackUtils; @@ -79,7 +79,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); - private ItemHandlerFilter filter = new ItemHandlerFilter(filters, tabs, null) { + private FilterItemHandler filter = new FilterItemHandler(filters, tabs, null) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -91,7 +91,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer StackUtils.writeItems(this, 0, stack.getTag()); } }; - private ItemHandlerBase disk = new ItemHandlerBase(1, DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { + private BaseItemHandler disk = new BaseItemHandler(1, DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -203,7 +203,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } @Override - public ItemHandlerBase getDisk() { + public BaseItemHandler getDisk() { return disk; } 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 acf496bfa..b27db3b1c 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 @@ -34,9 +34,9 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.tracker.ItemStorageTracke import com.raoulvdberge.refinedstorage.block.BlockPortableGrid; import com.raoulvdberge.refinedstorage.block.enums.PortableGridDiskState; import com.raoulvdberge.refinedstorage.block.enums.PortableGridType; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; -import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter; -import com.raoulvdberge.refinedstorage.inventory.listener.ListenerTile; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; +import com.raoulvdberge.refinedstorage.inventory.item.FilterItemHandler; +import com.raoulvdberge.refinedstorage.inventory.listener.TileListener; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.grid.GridScreen; import com.raoulvdberge.refinedstorage.tile.BaseTile; @@ -138,8 +138,8 @@ public class TilePortableGrid extends BaseTile implements IGrid, IPortableGrid, private List filters = new ArrayList<>(); private List tabs = new ArrayList<>(); - private ItemHandlerFilter filter = new ItemHandlerFilter(filters, tabs, new ListenerTile(this)); - private ItemHandlerBase disk = new ItemHandlerBase(1, new ListenerTile(this), DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { + private FilterItemHandler filter = new FilterItemHandler(filters, tabs, new TileListener(this)); + private BaseItemHandler disk = new BaseItemHandler(1, new TileListener(this), DiskDriveNetworkNode.VALIDATOR_STORAGE_DISK) { @Override protected void onContentsChanged(int slot) { super.onContentsChanged(slot); @@ -609,7 +609,7 @@ public class TilePortableGrid extends BaseTile implements IGrid, IPortableGrid, } @Override - public ItemHandlerBase getDisk() { + public BaseItemHandler getDisk() { return disk; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java index c9386afdd..4816b4570 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java @@ -275,6 +275,7 @@ public final class RenderUtils { return format; } + @SuppressWarnings("deprecation") public static TextureAtlasSprite getSprite(IBakedModel coverModel, BlockState coverState, Direction facing, Random rand) { TextureAtlasSprite sprite = null; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java index d455f1822..7cb35a34a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java @@ -5,7 +5,7 @@ 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.inventory.item.ItemHandlerBase; +import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; import com.raoulvdberge.refinedstorage.screen.grid.stack.FluidGridStack; import com.raoulvdberge.refinedstorage.screen.grid.stack.ItemGridStack; import net.minecraft.inventory.IInventory; @@ -225,7 +225,7 @@ public final class StackUtils { readItems(handler, id, tag, ItemStack::read); } - public static void readItems(ItemHandlerBase handler, int id, CompoundNBT tag) { + public static void readItems(BaseItemHandler handler, int id, CompoundNBT tag) { handler.setReading(true); readItems(handler, id, tag, ItemStack::read); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StorageBlockUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/StorageBlockUtils.java new file mode 100644 index 000000000..6253871e7 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/StorageBlockUtils.java @@ -0,0 +1,44 @@ +package com.raoulvdberge.refinedstorage.util; + +import com.raoulvdberge.refinedstorage.RSTiles; +import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; +import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; +import com.raoulvdberge.refinedstorage.tile.StorageTile; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.ResourceLocation; + +public class StorageBlockUtils { + public static ResourceLocation getNetworkNodeId(ItemStorageType type) { + switch (type) { + case ONE_K: + return StorageNetworkNode.ONE_K_STORAGE_BLOCK_ID; + case FOUR_K: + return StorageNetworkNode.FOUR_K_STORAGE_BLOCK_ID; + case SIXTEEN_K: + return StorageNetworkNode.SIXTEEN_K_STORAGE_BLOCK_ID; + case SIXTY_FOUR_K: + return StorageNetworkNode.SIXTY_FOUR_K_STORAGE_BLOCK_ID; + case CREATIVE: + return StorageNetworkNode.CREATIVE_STORAGE_BLOCK_ID; + default: + throw new IllegalArgumentException("Unknown storage type " + type); + } + } + + public static TileEntityType getTileEntityType(ItemStorageType type) { + switch (type) { + case ONE_K: + return RSTiles.ONE_K_STORAGE_BLOCK; + case FOUR_K: + return RSTiles.FOUR_K_STORAGE_BLOCK; + case SIXTEEN_K: + return RSTiles.SIXTEEN_K_STORAGE_BLOCK; + case SIXTY_FOUR_K: + return RSTiles.SIXTY_FOUR_K_STORAGE_BLOCK; + case CREATIVE: + return RSTiles.CREATIVE_STORAGE_BLOCK; + default: + throw new IllegalArgumentException("Unknown storage type " + type); + } + } +} diff --git a/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json b/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json new file mode 100644 index 000000000..b237b3b25 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/16k_storage_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json b/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json new file mode 100644 index 000000000..cdeb1fbcc --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/1k_storage_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json b/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json new file mode 100644 index 000000000..dc30007c2 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/4k_storage_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json b/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json new file mode 100644 index 000000000..ffdb312a7 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/64k_storage_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json b/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json new file mode 100644 index 000000000..1743a9b62 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/creative_storage_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage.json b/src/main/resources/assets/refinedstorage/blockstates/storage.json deleted file mode 100755 index 9d6bc5795..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/storage.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "transform": "forge:default-block" - }, - "variants": { - "type": { - "1k": { - "textures": { - "all": "refinedstorage:blocks/1k_storage_block" - } - }, - "4k": { - "textures": { - "all": "refinedstorage:blocks/4k_storage_block" - } - }, - "16k": { - "textures": { - "all": "refinedstorage:blocks/16k_storage_block" - } - }, - "64k": { - "textures": { - "all": "refinedstorage:blocks/64k_storage_block" - } - }, - "creative": { - "textures": { - "all": "refinedstorage:blocks/creative_storage_block" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json index 6c94985ba..7a3d8a6f2 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -123,58 +123,58 @@ "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", - "sidebutton.refinedstorage:compare.1": "Use NBT", - "sidebutton.refinedstorage:redstone_mode": "Redstone mode", - "sidebutton.refinedstorage:redstone_mode.0": "Ignore redstone signal", - "sidebutton.refinedstorage:redstone_mode.1": "Only work with redstone signal", - "sidebutton.refinedstorage:redstone_mode.2": "Only work without redstone signal", - "sidebutton.refinedstorage:crafter_mode": "Crafter mode", - "sidebutton.refinedstorage:crafter_mode.0": "Ignore redstone signal", - "sidebutton.refinedstorage:crafter_mode.1": "Redstone signal unlocks autocrafting", - "sidebutton.refinedstorage:crafter_mode.2": "Redstone signal locks autocrafting", - "sidebutton.refinedstorage:crafter_mode.3": "Redstone pulse inserts next set", - "sidebutton.refinedstorage:grid.view_type": "Display", - "sidebutton.refinedstorage:grid.view_type.0": "Normal", - "sidebutton.refinedstorage:grid.view_type.1": "No craftables", - "sidebutton.refinedstorage:grid.view_type.2": "Only craftables", - "sidebutton.refinedstorage:grid.sorting.direction": "Sorting direction", - "sidebutton.refinedstorage:grid.sorting.direction.0": "Ascending", - "sidebutton.refinedstorage:grid.sorting.direction.1": "Descending", - "sidebutton.refinedstorage:grid.sorting.type": "Sorting type", - "sidebutton.refinedstorage:grid.sorting.type.0": "Quantity", - "sidebutton.refinedstorage:grid.sorting.type.1": "Name", - "sidebutton.refinedstorage:grid.sorting.type.2": "ID", - "sidebutton.refinedstorage:grid.sorting.type.3": "InventoryTweaks", - "sidebutton.refinedstorage:grid.sorting.type.4": "Last modified", - "sidebutton.refinedstorage:grid.search_box_mode": "Search box mode", - "sidebutton.refinedstorage:grid.search_box_mode.0": "Normal", - "sidebutton.refinedstorage:grid.search_box_mode.1": "Normal (autoselected)", - "sidebutton.refinedstorage:grid.search_box_mode.2": "JEI synchronized", - "sidebutton.refinedstorage:grid.search_box_mode.3": "JEI synchronized (autoselected)", - "sidebutton.refinedstorage:grid.size": "Size", - "sidebutton.refinedstorage:grid.size.0": "Stretch", - "sidebutton.refinedstorage:grid.size.1": "Small", - "sidebutton.refinedstorage:grid.size.2": "Medium", - "sidebutton.refinedstorage:grid.size.3": "Large", + "sidebutton.refinedstorage.compare.1": "Use NBT", + "sidebutton.refinedstorage.redstone_mode": "Redstone mode", + "sidebutton.refinedstorage.redstone_mode.0": "Ignore redstone signal", + "sidebutton.refinedstorage.redstone_mode.1": "Only work with redstone signal", + "sidebutton.refinedstorage.redstone_mode.2": "Only work without redstone signal", + "sidebutton.refinedstorage.crafter_mode": "Crafter mode", + "sidebutton.refinedstorage.crafter_mode.0": "Ignore redstone signal", + "sidebutton.refinedstorage.crafter_mode.1": "Redstone signal unlocks autocrafting", + "sidebutton.refinedstorage.crafter_mode.2": "Redstone signal locks autocrafting", + "sidebutton.refinedstorage.crafter_mode.3": "Redstone pulse inserts next set", + "sidebutton.refinedstorage.grid.view_type": "Display", + "sidebutton.refinedstorage.grid.view_type.0": "Normal", + "sidebutton.refinedstorage.grid.view_type.1": "No craftables", + "sidebutton.refinedstorage.grid.view_type.2": "Only craftables", + "sidebutton.refinedstorage.grid.sorting.direction": "Sorting direction", + "sidebutton.refinedstorage.grid.sorting.direction.0": "Ascending", + "sidebutton.refinedstorage.grid.sorting.direction.1": "Descending", + "sidebutton.refinedstorage.grid.sorting.type": "Sorting type", + "sidebutton.refinedstorage.grid.sorting.type.0": "Quantity", + "sidebutton.refinedstorage.grid.sorting.type.1": "Name", + "sidebutton.refinedstorage.grid.sorting.type.2": "ID", + "sidebutton.refinedstorage.grid.sorting.type.3": "InventoryTweaks", + "sidebutton.refinedstorage.grid.sorting.type.4": "Last modified", + "sidebutton.refinedstorage.grid.search_box_mode": "Search box mode", + "sidebutton.refinedstorage.grid.search_box_mode.0": "Normal", + "sidebutton.refinedstorage.grid.search_box_mode.1": "Normal (autoselected)", + "sidebutton.refinedstorage.grid.search_box_mode.2": "JEI synchronized", + "sidebutton.refinedstorage.grid.search_box_mode.3": "JEI synchronized (autoselected)", + "sidebutton.refinedstorage.grid.size": "Size", + "sidebutton.refinedstorage.grid.size.0": "Stretch", + "sidebutton.refinedstorage.grid.size.1": "Small", + "sidebutton.refinedstorage.grid.size.2": "Medium", + "sidebutton.refinedstorage.grid.size.3": "Large", "sidebutton.refinedstorage.mode": "Mode", "sidebutton.refinedstorage.mode.whitelist": "Whitelist", "sidebutton.refinedstorage.mode.blacklist": "Blacklist", - "sidebutton.refinedstorage:iomode": "IO mode", - "sidebutton.refinedstorage:iomode.insert": "Insert into network", - "sidebutton.refinedstorage:iomode.extract": "Extract from network", - "sidebutton.refinedstorage:type": "Type", - "sidebutton.refinedstorage:type.0": "Items", - "sidebutton.refinedstorage:type.1": "Fluids", - "sidebutton.refinedstorage:detector.mode": "Mode", - "sidebutton.refinedstorage:detector.mode.0": "Emit signal when under the amount", - "sidebutton.refinedstorage:detector.mode.1": "Emit signal when on the amount", - "sidebutton.refinedstorage:detector.mode.2": "Emit signal when above the amount", - "sidebutton.refinedstorage:constructor.drop": "Drop blocks instead of placing", - "sidebutton.refinedstorage:destructor.pickup": "Pickup items instead of breaking", - "sidebutton.refinedstorage:access_type": "Access type", - "sidebutton.refinedstorage:access_type.0": "Insert and extract", - "sidebutton.refinedstorage:access_type.1": "Insert only", - "sidebutton.refinedstorage:access_type.2": "Extract only", + "sidebutton.refinedstorage.iomode": "IO mode", + "sidebutton.refinedstorage.iomode.insert": "Insert into network", + "sidebutton.refinedstorage.iomode.extract": "Extract from network", + "sidebutton.refinedstorage.type": "Type", + "sidebutton.refinedstorage.type.0": "Items", + "sidebutton.refinedstorage.type.1": "Fluids", + "sidebutton.refinedstorage.detector.mode": "Mode", + "sidebutton.refinedstorage.detector.mode.0": "Emit signal when under the amount", + "sidebutton.refinedstorage.detector.mode.1": "Emit signal when on the amount", + "sidebutton.refinedstorage.detector.mode.2": "Emit signal when above the amount", + "sidebutton.refinedstorage.constructor.drop": "Drop blocks instead of placing", + "sidebutton.refinedstorage.destructor.pickup": "Pickup items instead of breaking", + "sidebutton.refinedstorage.access_type": "Access type", + "sidebutton.refinedstorage.access_type.0": "Insert and extract", + "sidebutton.refinedstorage.access_type.1": "Insert only", + "sidebutton.refinedstorage.access_type.2": "Extract only", "block.refinedstorage.controller": "Controller", "block.refinedstorage.creative_controller": "Creative Controller", "block.refinedstorage.cable": "Cable", @@ -191,11 +191,11 @@ "block.refinedstorage.machine_casing": "Machine Casing", "block.refinedstorage:destructor": "Destructor", "block.refinedstorage:constructor": "Constructor", - "block.refinedstorage:storage.0": "1k Storage Block", - "block.refinedstorage:storage.1": "4k Storage Block", - "block.refinedstorage:storage.2": "16k Storage Block", - "block.refinedstorage:storage.3": "64k Storage Block", - "block.refinedstorage:storage.4": "Creative Storage Block", + "block.refinedstorage.1k_storage_block": "1k Storage Block", + "block.refinedstorage.4k_storage_block": "4k Storage Block", + "block.refinedstorage.16k_storage_block": "16k Storage Block", + "block.refinedstorage.64k_storage_block": "64k Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", "block.refinedstorage:relay": "Relay", "block.refinedstorage:interface": "Interface", "block.refinedstorage:crafting_monitor": "Crafting Monitor", diff --git a/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json b/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json new file mode 100644 index 000000000..a387ebbab --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/16k_storage_block" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json b/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json new file mode 100644 index 000000000..9c91cf91a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/1k_storage_block" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json b/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json new file mode 100644 index 000000000..0e0880460 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/4k_storage_block" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json b/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json new file mode 100644 index 000000000..a39097a9d --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/64k_storage_block" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json b/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json new file mode 100644 index 000000000..6e25b2b2b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/creative_storage_block" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json new file mode 100644 index 000000000..96e34f7af --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/16k_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json new file mode 100644 index 000000000..8658d4c48 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/1k_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json new file mode 100644 index 000000000..e891d785e --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/4k_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json new file mode 100644 index 000000000..1924e4c40 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/64k_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json new file mode 100644 index 000000000..ee0399664 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/creative_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/16k_storage_block.json b/src/main/resources/data/refinedstorage/recipes/16k_storage_block.json similarity index 74% rename from src/main/resources/assets/refinedstorage/recipes/16k_storage_block.json rename to src/main/resources/data/refinedstorage/recipes/16k_storage_block.json index 382d07438..3dc65a882 100644 --- a/src/main/resources/assets/refinedstorage/recipes/16k_storage_block.json +++ b/src/main/resources/data/refinedstorage/recipes/16k_storage_block.json @@ -13,15 +13,13 @@ "item": "minecraft:redstone" }, "P": { - "item": "refinedstorage:storage_part", - "data": 2 + "item": "refinedstorage:16k_storage_part" }, "E": { "item": "refinedstorage:quartz_enriched_iron" } }, "result": { - "item": "refinedstorage:storage", - "data": 2 + "item": "refinedstorage:16k_storage_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/1k_storage_block.json b/src/main/resources/data/refinedstorage/recipes/1k_storage_block.json similarity index 74% rename from src/main/resources/assets/refinedstorage/recipes/1k_storage_block.json rename to src/main/resources/data/refinedstorage/recipes/1k_storage_block.json index 877d429e9..3268966fb 100644 --- a/src/main/resources/assets/refinedstorage/recipes/1k_storage_block.json +++ b/src/main/resources/data/refinedstorage/recipes/1k_storage_block.json @@ -13,15 +13,13 @@ "item": "minecraft:redstone" }, "P": { - "item": "refinedstorage:storage_part", - "data": 0 + "item": "refinedstorage:1k_storage_part" }, "E": { "item": "refinedstorage:quartz_enriched_iron" } }, "result": { - "item": "refinedstorage:storage", - "data": 0 + "item": "refinedstorage:1k_storage_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/4k_storage_block.json b/src/main/resources/data/refinedstorage/recipes/4k_storage_block.json similarity index 74% rename from src/main/resources/assets/refinedstorage/recipes/4k_storage_block.json rename to src/main/resources/data/refinedstorage/recipes/4k_storage_block.json index 6e10e23b5..00c85c03f 100644 --- a/src/main/resources/assets/refinedstorage/recipes/4k_storage_block.json +++ b/src/main/resources/data/refinedstorage/recipes/4k_storage_block.json @@ -13,15 +13,13 @@ "item": "minecraft:redstone" }, "P": { - "item": "refinedstorage:storage_part", - "data": 1 + "item": "refinedstorage:4k_storage_part" }, "E": { "item": "refinedstorage:quartz_enriched_iron" } }, "result": { - "item": "refinedstorage:storage", - "data": 1 + "item": "refinedstorage:4k_storage_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_storage_block.json b/src/main/resources/data/refinedstorage/recipes/64k_storage_block.json similarity index 74% rename from src/main/resources/assets/refinedstorage/recipes/64k_storage_block.json rename to src/main/resources/data/refinedstorage/recipes/64k_storage_block.json index 577fcf3f8..91e0dfd7d 100644 --- a/src/main/resources/assets/refinedstorage/recipes/64k_storage_block.json +++ b/src/main/resources/data/refinedstorage/recipes/64k_storage_block.json @@ -13,15 +13,13 @@ "item": "minecraft:redstone" }, "P": { - "item": "refinedstorage:storage_part", - "data": 3 + "item": "refinedstorage:64k_storage_part" }, "E": { "item": "refinedstorage:quartz_enriched_iron" } }, "result": { - "item": "refinedstorage:storage", - "data": 3 + "item": "refinedstorage:64k_storage_block" } } \ No newline at end of file