From 54c3158690cae1c4fdc14bd64d17cfc8c5510e92 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 16 Jun 2017 00:55:34 +0200 Subject: [PATCH] Added disk and storage part recipes --- .../apiimpl/storage/StorageDiskFluid.java | 6 - .../apiimpl/storage/StorageDiskItem.java | 6 - .../refinedstorage/proxy/ProxyCommon.java | 124 +----------------- .../recipes/128k_fluid_storage_disk.json | 34 +++++ ...uid_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/128k_fluid_storage_part.json | 27 ++++ .../recipes/16k_storage_disk.json | 34 +++++ ...16k_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/16k_storage_part.json | 27 ++++ .../recipes/1k_storage_disk.json | 34 +++++ .../1k_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/1k_storage_part.json | 28 ++++ .../recipes/256k_fluid_storage_disk.json | 34 +++++ ...uid_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/256k_fluid_storage_part.json | 27 ++++ .../recipes/4k_storage_disk.json | 34 +++++ .../4k_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/4k_storage_part.json | 27 ++++ .../recipes/512k_fluid_storage_disk.json | 34 +++++ ...uid_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/512k_fluid_storage_part.json | 27 ++++ .../recipes/64k_fluid_storage_disk.json | 34 +++++ ...uid_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/64k_fluid_storage_part.json | 28 ++++ .../recipes/64k_storage_disk.json | 34 +++++ ...64k_storage_disk_from_storage_housing.json | 22 ++++ .../recipes/64k_storage_part.json | 27 ++++ 27 files changed, 667 insertions(+), 135 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/16k_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/16k_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/1k_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/1k_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/4k_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/4k_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_part.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/64k_storage_disk.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json create mode 100644 src/main/resources/assets/refinedstorage/recipes/64k_storage_part.json diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskFluid.java index 36d5b3301..b85e92d1d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskFluid.java @@ -250,10 +250,4 @@ public class StorageDiskFluid implements IStorageDisk { return tag; } - - public static ItemStack initDisk(ItemStack stack) { - stack.setTagCompound(getTag()); - - return stack; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskItem.java index fc98dd54b..01fb588a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskItem.java @@ -304,10 +304,4 @@ public class StorageDiskItem implements IStorageDisk { return tag; } - - public static ItemStack initDisk(ItemStack stack) { - stack.setTagCompound(getTag()); - - return stack; - } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index df07eb80d..254696aba 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -252,129 +252,7 @@ public class ProxyCommon { NonNullList.withSize(1, new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId())) )); - /* - // Storage Parts - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - "SES", - "GRG", - "SGS", - 'R', new ItemStack(Items.REDSTONE), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'S', "itemSilicon", - 'G', "blockGlass" - )); - - GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - "PEP", - "SRS", - "PSP", - 'R', new ItemStack(Items.REDSTONE), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - 'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) - ); - - GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - "PEP", - "SRS", - "PSP", - 'R', new ItemStack(Items.REDSTONE), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) - ); - - GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - "PEP", - "SRS", - "PSP", - 'R', new ItemStack(Items.REDSTONE), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) - ); - - // Fluid Storage Parts - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K), - "SES", - "GRG", - "SGS", - 'R', new ItemStack(Items.BUCKET), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'S', "itemSilicon", - 'G', "blockGlass" - )); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K), - "PEP", - "SRS", - "PSP", - 'R', new ItemStack(Items.BUCKET), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - 'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K) - )); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K), - "PEP", - "SRS", - "PSP", - 'R', new ItemStack(Items.BUCKET), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K) - )); - - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_512K), - "PEP", - "SRS", - "PSP", - 'R', new ItemStack(Items.BUCKET), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K) - )); - - // Storage Disks - for (int type = 0; type <= 3; ++type) { - ItemStack disk = StorageDiskItem.initDisk(new ItemStack(RSItems.STORAGE_DISK, 1, type)); - - GameRegistry.addRecipe(new ShapedOreRecipe(disk, - "GRG", - "RPR", - "EEE", - 'G', "blockGlass", - 'R', new ItemStack(Items.REDSTONE), - 'P', new ItemStack(RSItems.STORAGE_PART, 1, type), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON) - )); - - GameRegistry.addShapelessRecipe(disk, - new ItemStack(RSItems.STORAGE_HOUSING), - new ItemStack(RSItems.STORAGE_PART, 1, type) - ); - } - - // Fluid Storage Disks - for (int type = 0; type <= 3; ++type) { - ItemStack disk = StorageDiskFluid.initDisk(new ItemStack(RSItems.FLUID_STORAGE_DISK, 1, type)); - - GameRegistry.addRecipe(new ShapedOreRecipe(disk, - "GRG", - "RPR", - "EEE", - 'G', "blockGlass", - 'R', new ItemStack(Items.REDSTONE), - 'P', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type), - 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON) - )); - - GameRegistry.addShapelessRecipe(disk, - new ItemStack(RSItems.STORAGE_HOUSING), - new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type) - ); - }*/ - + // Upgrades API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE)); API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED)); API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL)); diff --git a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json new file mode 100644 index 000000000..1325e50ab --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:fluid_storage_part", + "data": 1 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 1, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..1bc12e793 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:fluid_storage_part", + "data": 1 + } + ], + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 1, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json new file mode 100644 index 000000000..01aee1eb1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "#basic_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:fluid_storage_part", + "data": 0 + }, + "R": { + "item": "minecraft:bucket" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_part", + "data": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/16k_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/16k_storage_disk.json new file mode 100644 index 000000000..0154e02b8 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/16k_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:storage_part", + "data": 2 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:storage_disk", + "data": 2, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..56d8c190d --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:storage_part", + "data": 2 + } + ], + "result": { + "item": "refinedstorage:storage_disk", + "data": 2, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/16k_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/16k_storage_part.json new file mode 100644 index 000000000..9fbdf4b71 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/16k_storage_part.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "#improved_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:storage_part", + "data": 1 + }, + "R": { + "item": "minecraft:redstone" + } + }, + "result": { + "item": "refinedstorage:storage_part", + "data": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/1k_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/1k_storage_disk.json new file mode 100644 index 000000000..e27c74045 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/1k_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:storage_part", + "data": 0 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:storage_disk", + "data": 0, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..8635e8f20 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:storage_part", + "data": 0 + } + ], + "result": { + "item": "refinedstorage:storage_disk", + "data": 0, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/1k_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/1k_storage_part.json new file mode 100644 index 000000000..c9751bff0 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/1k_storage_part.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SES", + "GRG", + "SGS" + ], + "key": { + "S": { + "type": "forge:ore_dict", + "ore": "itemSilicon" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + } + }, + "result": { + "item": "refinedstorage:storage_part", + "data": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json new file mode 100644 index 000000000..198b4bf9c --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:fluid_storage_part", + "data": 2 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 2, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..29943d213 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:fluid_storage_part", + "data": 2 + } + ], + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 2, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json new file mode 100644 index 000000000..d741f82a3 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "#improved_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:fluid_storage_part", + "data": 1 + }, + "R": { + "item": "minecraft:bucket" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_part", + "data": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/4k_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/4k_storage_disk.json new file mode 100644 index 000000000..c470e720a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/4k_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:storage_part", + "data": 1 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:storage_disk", + "data": 1, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..ff6aa653a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:storage_part", + "data": 1 + } + ], + "result": { + "item": "refinedstorage:storage_disk", + "data": 1, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/4k_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/4k_storage_part.json new file mode 100644 index 000000000..ed3b9bb5a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/4k_storage_part.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "#basic_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:storage_part", + "data": 0 + }, + "R": { + "item": "minecraft:redstone" + } + }, + "result": { + "item": "refinedstorage:storage_part", + "data": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json new file mode 100644 index 000000000..6a501139a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:fluid_storage_part", + "data": 3 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 3, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..487dc5f3b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:fluid_storage_part", + "data": 3 + } + ], + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 3, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json new file mode 100644 index 000000000..d7ad3601f --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "#advanced_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:fluid_storage_part", + "data": 2 + }, + "R": { + "item": "minecraft:bucket" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_part", + "data": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk.json new file mode 100644 index 000000000..ae69898ba --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:fluid_storage_part", + "data": 0 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 0, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..fb5947386 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:fluid_storage_part", + "data": 0 + } + ], + "result": { + "item": "refinedstorage:fluid_storage_disk", + "data": 0, + "nbt": { + "Fluids": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_part.json new file mode 100644 index 000000000..a42970622 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_part.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SES", + "GRG", + "SGS" + ], + "key": { + "S": { + "type": "forge:ore_dict", + "ore": "itemSilicon" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:bucket" + } + }, + "result": { + "item": "refinedstorage:fluid_storage_part", + "data": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/64k_storage_disk.json new file mode 100644 index 000000000..f893dde82 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/64k_storage_disk.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "type": "forge:ore_dict", + "ore": "blockGlass" + }, + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "refinedstorage:storage_part", + "data": 3 + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "item": "refinedstorage:storage_disk", + "data": 3, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..61e5e68a1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:storage_part", + "data": 3 + } + ], + "result": { + "item": "refinedstorage:storage_disk", + "data": 3, + "nbt": { + "Items": [ + ], + "Stored": 0, + "Protocol": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/64k_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/64k_storage_part.json new file mode 100644 index 000000000..13b85afa0 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/64k_storage_part.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "#advanced_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:storage_part", + "data": 2 + }, + "R": { + "item": "minecraft:redstone" + } + }, + "result": { + "item": "refinedstorage:storage_part", + "data": 3 + } +} \ No newline at end of file