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

Storage Disk/Fluid Storage Disk

Browse Source
This commit is contained in:
raoulvdberge
2019-09-15 14:07:22 +02:00
parent 26321e797d
commit a93cf426ec
74 changed files with 623 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/resources/assets/refinedstorage/lang/en_us.json
View File

@@ -88,11 +88,11 @@
"misc.refinedstorage:energy_stored": "%d / %d FE",
"misc.refinedstorage:energy_usage": "Usage: %d FE/t",
"misc.refinedstorage:energy_usage_minimal": "%d FE/t",
"misc.refinedstorage:storage.stored": "Stored: %s",
"misc.refinedstorage:storage.stored_capacity": "Stored: %s / %s",
"misc.refinedstorage:storage.stored_minimal": "%s",
"misc.refinedstorage:storage.stored_capacity_minimal": "%s / %s",
"misc.refinedstorage:storage.full": "%d%% full",
"misc.refinedstorage.storage.stored": "Stored: %s",
"misc.refinedstorage.storage.stored_capacity": "Stored: %s / %s",
"misc.refinedstorage.storage.stored_minimal": "%s",
"misc.refinedstorage.storage.stored_capacity_minimal": "%s / %s",
"misc.refinedstorage.storage.full": "%d%% full",
"misc.refinedstorage:network_item.tooltip": "Linked to %d, %d, %d.",
"misc.refinedstorage:network_item.out_of_range": "There is no Wireless Transmitter in range.",
"misc.refinedstorage:network_item.not_found": "Controller not found.",
@@ -221,18 +221,16 @@
"block.refinedstorage:portable_grid.1": "Creative Portable Grid",
"block.refinedstorage:portable_grid.tooltip": "Sneak to place in the world.",
"block.refinedstorage:crafter_manager": "Crafter Manager",
"item.refinedstorage:storage_disk.0": "1k Storage Disk",
"item.refinedstorage:storage_disk.1": "4k Storage Disk",
"item.refinedstorage:storage_disk.2": "16k Storage Disk",
"item.refinedstorage:storage_disk.3": "64k Storage Disk",
"item.refinedstorage:storage_disk.4": "Creative Storage Disk",
"item.refinedstorage:storage_disk.5": "Debug Storage Disk",
"item.refinedstorage:fluid_storage_disk.0": "64k Fluid Storage Disk",
"item.refinedstorage:fluid_storage_disk.1": "256k Fluid Storage Disk",
"item.refinedstorage:fluid_storage_disk.2": "1024k Fluid Storage Disk",
"item.refinedstorage:fluid_storage_disk.3": "4096k Fluid Storage Disk",
"item.refinedstorage:fluid_storage_disk.4": "Creative Fluid Storage Disk",
"item.refinedstorage:fluid_storage_disk.5": "Debug Fluid Storage Disk",
"item.refinedstorage.1k_storage_disk": "1k Storage Disk",
"item.refinedstorage.4k_storage_disk": "4k Storage Disk",
"item.refinedstorage.16k_storage_disk": "16k Storage Disk",
"item.refinedstorage.64k_storage_disk": "64k Storage Disk",
"item.refinedstorage.creative_storage_disk": "Creative Storage Disk",
"item.refinedstorage.64k_fluid_storage_disk": "64k Fluid Storage Disk",
"item.refinedstorage.256k_fluid_storage_disk": "256k Fluid Storage Disk",
"item.refinedstorage.1024k_fluid_storage_disk": "1024k Fluid Storage Disk",
"item.refinedstorage.4096k_fluid_storage_disk": "4096k Fluid Storage Disk",
"item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk",
"item.refinedstorage:wireless_grid.0": "Wireless Grid",
"item.refinedstorage:wireless_grid.1": "Creative Wireless Grid",
"item.refinedstorage:wireless_fluid_grid.0": "Wireless Fluid Grid",

28
src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk.json
View File

@@ -1,28 +0,0 @@
{
"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
}
}

16
src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk_from_storage_housing.json
View File

@@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:fluid_storage_part",
"data": 2
}
],
"result": {
"item": "refinedstorage:fluid_storage_disk",
"data": 2
}
}

28
src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json
View File

@@ -1,28 +0,0 @@
{
"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
}
}

16
src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json
View File

@@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:fluid_storage_part",
"data": 1
}
],
"result": {
"item": "refinedstorage:fluid_storage_disk",
"data": 1
}
}

28
src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_disk.json
View File

@@ -1,28 +0,0 @@
{
"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
}
}

16
src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_disk_from_storage_housing.json
View File

@@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:fluid_storage_part",
"data": 3
}
],
"result": {
"item": "refinedstorage:fluid_storage_disk",
"data": 3
}
}

28
src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk.json
View File

@@ -1,28 +0,0 @@
{
"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
}
}

16
src/main/resources/assets/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json
View File

@@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:fluid_storage_part",
"data": 0
}
],
"result": {
"item": "refinedstorage:fluid_storage_disk",
"data": 0
}
}

BIN
src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_disk.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 508 B

BIN
src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 514 B

BIN
src/main/resources/assets/refinedstorage/textures/items/4096k_fluid_storage_disk.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 508 B

BIN
src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 509 B

25
src/main/resources/data/refinedstorage/recipes/1024k_fluid_storage_disk.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GRG",
"RPR",
"EEE"
],
"key": {
"G": {
"tag": "forge:glass"
},
"R": {
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:1024k_fluid_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:1024k_fluid_storage_disk"
}
}

14
src/main/resources/data/refinedstorage/recipes/1024k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:1024k_fluid_storage_part"
}
],
"result": {
"item": "refinedstorage:1024k_fluid_storage_disk"
}
}

9
src/main/resources/assets/refinedstorage/recipes/16k_storage_disk.json → src/main/resources/data/refinedstorage/recipes/16k_storage_disk.json
View File

@@ -7,22 +7,19 @@
],
"key": {
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
"tag": "forge:glass"
},
"R": {
"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_disk",
"data": 2
"item": "refinedstorage:16k_storage_disk"
}
}

6
src/main/resources/assets/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json → src/main/resources/data/refinedstorage/recipes/16k_storage_disk_from_storage_housing.json
View File

@@ -5,12 +5,10 @@
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:storage_part",
"data": 2
"item": "refinedstorage:16k_storage_part"
}
],
"result": {
"item": "refinedstorage:storage_disk",
"data": 2
"item": "refinedstorage:16k_storage_disk"
}
}

9
src/main/resources/assets/refinedstorage/recipes/1k_storage_disk.json → src/main/resources/data/refinedstorage/recipes/1k_storage_disk.json
View File

@@ -7,22 +7,19 @@
],
"key": {
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
"tag": "forge:glass"
},
"R": {
"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_disk",
"data": 0
"item": "refinedstorage:1k_storage_disk"
}
}

6
src/main/resources/assets/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json → src/main/resources/data/refinedstorage/recipes/1k_storage_disk_from_storage_housing.json
View File

@@ -5,12 +5,10 @@
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:storage_part",
"data": 0
"item": "refinedstorage:1k_storage_part"
}
],
"result": {
"item": "refinedstorage:storage_disk",
"data": 0
"item": "refinedstorage:1k_storage_disk"
}
}

25
src/main/resources/data/refinedstorage/recipes/256k_fluid_storage_disk.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GRG",
"RPR",
"EEE"
],
"key": {
"G": {
"tag": "forge:glass"
},
"R": {
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:256k_fluid_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:256k_fluid_storage_disk"
}
}

14
src/main/resources/data/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:256k_fluid_storage_part"
}
],
"result": {
"item": "refinedstorage:256k_fluid_storage_disk"
}
}

25
src/main/resources/data/refinedstorage/recipes/4096k_fluid_storage_disk.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GRG",
"RPR",
"EEE"
],
"key": {
"G": {
"tag": "forge:glass"
},
"R": {
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:4096k_fluid_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:4096k_fluid_storage_disk"
}
}

14
src/main/resources/data/refinedstorage/recipes/4096k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:4096k_fluid_storage_part"
}
],
"result": {
"item": "refinedstorage:4096k_fluid_storage_disk"
}
}

9
src/main/resources/assets/refinedstorage/recipes/4k_storage_disk.json → src/main/resources/data/refinedstorage/recipes/4k_storage_disk.json
View File

@@ -7,22 +7,19 @@
],
"key": {
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
"tag": "forge:glass"
},
"R": {
"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_disk",
"data": 1
"item": "refinedstorage:4k_storage_disk"
}
}

6
src/main/resources/assets/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json → src/main/resources/data/refinedstorage/recipes/4k_storage_disk_from_storage_housing.json
View File

@@ -5,12 +5,10 @@
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:storage_part",
"data": 1
"item": "refinedstorage:4k_storage_part"
}
],
"result": {
"item": "refinedstorage:storage_disk",
"data": 1
"item": "refinedstorage:4k_storage_disk"
}
}

25
src/main/resources/data/refinedstorage/recipes/64k_fluid_storage_disk.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GRG",
"RPR",
"EEE"
],
"key": {
"G": {
"tag": "forge:glass"
},
"R": {
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:64k_fluid_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:64k_fluid_storage_disk"
}
}

14
src/main/resources/data/refinedstorage/recipes/64k_fluid_storage_disk_from_storage_housing.json Normal file
View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:64k_fluid_storage_part"
}
],
"result": {
"item": "refinedstorage:64k_fluid_storage_disk"
}
}

9
src/main/resources/assets/refinedstorage/recipes/64k_storage_disk.json → src/main/resources/data/refinedstorage/recipes/64k_storage_disk.json
View File

@@ -7,22 +7,19 @@
],
"key": {
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
"tag": "forge:glass"
},
"R": {
"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_disk",
"data": 3
"item": "refinedstorage:64k_storage_disk"
}
}

6
src/main/resources/assets/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json → src/main/resources/data/refinedstorage/recipes/64k_storage_disk_from_storage_housing.json
View File

@@ -5,12 +5,10 @@
"item": "refinedstorage:storage_housing"
},
{
"item": "refinedstorage:storage_part",
"data": 3
"item": "refinedstorage:64k_storage_part"
}
],
"result": {
"item": "refinedstorage:storage_disk",
"data": 3
"item": "refinedstorage:64k_storage_disk"
}
}