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

Added disk and storage part recipes

Browse Source
This commit is contained in:
raoulvdberge
2017-06-16 00:55:34 +02:00
parent d12078d921
commit 54c3158690
27 changed files with 667 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskFluid.java
View File

@@ -250,10 +250,4 @@ public class StorageDiskFluid implements IStorageDisk<FluidStack> {
return tag; return tag;
} }
public static ItemStack initDisk(ItemStack stack) {
stack.setTagCompound(getTag());
return stack;
}
} }

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskItem.java
View File

@@ -304,10 +304,4 @@ public class StorageDiskItem implements IStorageDisk<ItemStack> {
return tag; return tag;
} }
public static ItemStack initDisk(ItemStack stack) {
stack.setTagCompound(getTag());
return stack;
}
} }

124
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
View File

@@ -252,129 +252,7 @@ public class ProxyCommon {
NonNullList.withSize(1, new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId())) NonNullList.withSize(1, new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()))
)); ));
/* // Upgrades
// 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)
);
}*/
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE)); 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_SPEED));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL)); API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL));

34
src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

27
src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/16k_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

27
src/main/resources/assets/refinedstorage/recipes/16k_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/1k_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

28
src/main/resources/assets/refinedstorage/recipes/1k_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

27
src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/4k_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

27
src/main/resources/assets/refinedstorage/recipes/4k_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

27
src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

28
src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_part.json Normal file
View File

@@ -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
}
}

34
src/main/resources/assets/refinedstorage/recipes/64k_storage_disk.json Normal file
View File

@@ -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
}
}
}

22
src/main/resources/assets/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json Normal file
View File

@@ -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
}
}
}

27
src/main/resources/assets/refinedstorage/recipes/64k_storage_part.json Normal file
View File

@@ -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
}
}