fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial Fluid Integration (#3510)

Browse Source 
* Added Fluid Storage Cells

* Added Fluid Import Bus

* Added Fluid Export Bus

* Added Fluid Storage Bus

* Added Fluid Terminal.
While holding a item with the FLUID_HANDLER_ITEM_CAPABILITY, such as a tank
Left click on a fluid to extract the fluid
Right click to insert the fluid
This commit is contained in:
Brock
2018-06-12 03:55:33 +10:00
committed by yueh
parent 89bebc4385
commit d16677224a
126 changed files with 8031 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json
+28
View File
@@ -0,0 +1,28 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_16k"
},
"type": "forge:ore_shaped",
"pattern": [
"aba",
"bcb",
"ddd"
],
"key": {
"a": {
"item": "appliedenergistics2:quartz_glass"
},
"d": {
"type": "forge:ore_dict",
"ore": "ingotIron"
},
"b": {
"type": "forge:ore_dict",
"ore": "dustRedstone"
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell16k_part"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json
+16
View File
@@ -0,0 +1,16 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_16k"
},
"type": "forge:ore_shapeless",
"ingredients": [
{
"type": "appliedenergistics2:part",
"part": "material.empty_storage_cell"
},
{
"type": "appliedenergistics2:part",
"part": "material.fluid_cell16k_part"
}
]
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json
+28
View File
@@ -0,0 +1,28 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_1k"
},
"type": "forge:ore_shaped",
"pattern": [
"aba",
"bcb",
"ddd"
],
"key": {
"a": {
"item": "appliedenergistics2:quartz_glass"
},
"d": {
"type": "forge:ore_dict",
"ore": "ingotIron"
},
"b": {
"type": "forge:ore_dict",
"ore": "dustRedstone"
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell1k_part"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json
+16
View File
@@ -0,0 +1,16 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_1k"
},
"type": "forge:ore_shapeless",
"ingredients": [
{
"type": "appliedenergistics2:part",
"part": "material.empty_storage_cell"
},
{
"type": "appliedenergistics2:part",
"part": "material.fluid_cell1k_part"
}
]
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json
+28
View File
@@ -0,0 +1,28 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_4k"
},
"type": "forge:ore_shaped",
"pattern": [
"aba",
"bcb",
"ddd"
],
"key": {
"a": {
"item": "appliedenergistics2:quartz_glass"
},
"d": {
"type": "forge:ore_dict",
"ore": "ingotIron"
},
"b": {
"type": "forge:ore_dict",
"ore": "dustRedstone"
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell4k_part"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json
+16
View File
@@ -0,0 +1,16 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_4k"
},
"type": "forge:ore_shapeless",
"ingredients": [
{
"type": "appliedenergistics2:part",
"part": "material.empty_storage_cell"
},
{
"type": "appliedenergistics2:part",
"part": "material.fluid_cell4k_part"
}
]
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json
+28
View File
@@ -0,0 +1,28 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_64k"
},
"type": "forge:ore_shaped",
"pattern": [
"aba",
"bcb",
"ddd"
],
"key": {
"a": {
"item": "appliedenergistics2:quartz_glass"
},
"d": {
"type": "forge:ore_dict",
"ore": "ingotIron"
},
"b": {
"type": "forge:ore_dict",
"ore": "dustRedstone"
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell64k_part"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json
+16
View File
@@ -0,0 +1,16 @@
{
"result": {
"item": "appliedenergistics2:fluid_storage_cell_64k"
},
"type": "forge:ore_shapeless",
"ingredients": [
{
"type": "appliedenergistics2:part",
"part": "material.empty_storage_cell"
},
{
"type": "appliedenergistics2:part",
"part": "material.fluid_cell64k_part"
}
]
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
+29
View File
@@ -0,0 +1,29 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell16k_part"
},
"type": "appliedenergistics2:part_shaped",
"pattern": [
"aba",
"cdc",
"aca"
],
"key": {
"d": {
"item": "appliedenergistics2:quartz_glass"
},
"a": {
"item": "minecraft:dye",
"data": 4
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell4k_part"
},
"b": {
"type": "appliedenergistics2:part",
"part": "material.calculation_processor"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
+25
View File
@@ -0,0 +1,25 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell1k_part"
},
"type": "appliedenergistics2:part_shaped",
"pattern": [
"aba",
"bcb",
"aba"
],
"key": {
"a": {
"item": "minecraft:dye",
"data": 4
},
"b": {
"item": "#appliedenergistics2:certusCrystal"
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.logic_processor"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
+29
View File
@@ -0,0 +1,29 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell4k_part"
},
"type": "appliedenergistics2:part_shaped",
"pattern": [
"aba",
"cdc",
"aca"
],
"key": {
"d": {
"item": "appliedenergistics2:quartz_glass"
},
"a": {
"item": "minecraft:dye",
"data": 4
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell1k_part"
},
"b": {
"type": "appliedenergistics2:part",
"part": "material.calculation_processor"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
+29
View File
@@ -0,0 +1,29 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell64k_part"
},
"type": "appliedenergistics2:part_shaped",
"pattern": [
"aba",
"cdc",
"aca"
],
"key": {
"d": {
"item": "appliedenergistics2:quartz_glass"
},
"a": {
"item": "minecraft:dye",
"data": 4
},
"c": {
"type": "appliedenergistics2:part",
"part": "material.fluid_cell16k_part"
},
"b": {
"type": "appliedenergistics2:part",
"part": "material.calculation_processor"
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/parts/export_bus_fluid.json
+28
View File
@@ -0,0 +1,28 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "part.export_bus_fluid"
},
"type": "appliedenergistics2:part_shaped",
"pattern": [
"aba",
"lcl"
],
"key": {
"b": {
"type": "appliedenergistics2:part",
"part": "material.formation_core"
},
"a": {
"type": "forge:ore_dict",
"ore": "ingotIron"
},
"c": {
"item": "minecraft:piston"
},
"l": {
"item": "minecraft:dye",
"data": 4
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/parts/import_bus_fluid.json
+28
View File
@@ -0,0 +1,28 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "part.import_bus_fluid"
},
"type": "appliedenergistics2:part_shaped",
"pattern": [
"lal",
"bcb"
],
"key": {
"c": {
"item": "minecraft:sticky_piston"
},
"b": {
"type": "forge:ore_dict",
"ore": "ingotIron"
},
"a": {
"type": "appliedenergistics2:part",
"part": "material.annihilation_core"
},
"l": {
"item": "minecraft:dye",
"data": 4
}
}
}
src/main/resources/assets/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json
+22
View File
@@ -0,0 +1,22 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "part.storage_bus_fluid"
},
"type": "appliedenergistics2:part_shapeless",
"ingredients": [
{
"item": "minecraft:sticky_piston"
},
{
"item": "#appliedenergistics2:interface"
},
{
"item": "minecraft:piston"
},
{
"item": "minecraft:dye",
"data": 4
}
]
}
src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json
+21
View File
@@ -0,0 +1,21 @@
{
"result": {
"type": "appliedenergistics2:part",
"part": "part.fluid_terminal"
},
"type": "appliedenergistics2:part_shapeless",
"ingredients": [
{
"type": "appliedenergistics2:part",
"part": "part.terminal"
},
{
"item": "minecraft:dye",
"data": 4
},
{
"type": "appliedenergistics2:part",
"part": "material.logic_processor"
}
]
}