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/models/item/dummy_fluid_item_base.json
+5
View File
@@ -0,0 +1,5 @@
{
"parent": "item/generated",
"textures": {
}
}
src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_16k.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/fluid_storage_cell_16k"
}
}
src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_1k.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/fluid_storage_cell_1k"
}
}
src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_4k.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/fluid_storage_cell_4k"
}
}
src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_64k.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/fluid_storage_cell_64k"
}
}
src/main/resources/assets/appliedenergistics2/models/item/material_fluid_cell16k_part.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/material_fluid_cell16k_part"
}
}
src/main/resources/assets/appliedenergistics2/models/item/material_fluid_cell1k_part.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/material_fluid_cell1k_part"
}
}
src/main/resources/assets/appliedenergistics2/models/item/material_fluid_cell4k_part.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/material_fluid_cell4k_part"
}
}
src/main/resources/assets/appliedenergistics2/models/item/material_fluid_cell64k_part.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "appliedenergistics2:items/material_fluid_cell64k_part"
}
}
src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json
+106
View File
@@ -0,0 +1,106 @@
{
"parent": "appliedenergistics2:item/part/part",
"textures": {
"sides": "appliedenergistics2:parts/export_bus_sides",
"back": "appliedenergistics2:parts/monitor_back",
"front": "appliedenergistics2:items/part/export_bus"
},
"elements": [
{
"from": [
4,
4,
8
],
"to": [
12,
12,
10
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
7
],
"to": [
11,
11,
8
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
},
{
"from": [
6,
6,
6
],
"to": [
10,
10,
7
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json
+106
View File
@@ -0,0 +1,106 @@
{
"parent": "appliedenergistics2:item/part/part",
"textures": {
"sides": "appliedenergistics2:parts/import_bus_sides",
"back": "appliedenergistics2:parts/monitor_back",
"front": "appliedenergistics2:items/part/import_bus"
},
"elements": [
{
"from": [
3,
3,
8
],
"to": [
13,
13,
9
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
},
{
"from": [
4,
4,
9
],
"to": [
12,
12,
10
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
10
],
"to": [
11,
11,
11
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json
+106
View File
@@ -0,0 +1,106 @@
{
"parent": "appliedenergistics2:item/part/part",
"textures": {
"sides": "appliedenergistics2:parts/storage_bus_sides",
"back": "appliedenergistics2:parts/storage_bus_back",
"front": "appliedenergistics2:items/part/storage_bus"
},
"elements": [
{
"from": [
3,
3,
6
],
"to": [
13,
13,
7
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
},
{
"from": [
2,
2,
7
],
"to": [
14,
14,
8
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
8
],
"to": [
11,
11,
10
],
"faces": {
"north": {
"texture": "#front"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"down": {
"texture": "#sides"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/item/part/fluid_terminal.json
+9
View File
@@ -0,0 +1,9 @@
{
"parent": "appliedenergistics2:item/part/display",
"textures": {
"front": "appliedenergistics2:items/part/terminal",
"front_bright": "appliedenergistics2:parts/terminal_bright",
"front_medium": "appliedenergistics2:parts/terminal_medium",
"front_dark": "appliedenergistics2:parts/terminal_dark"
}
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json
+136
View File
@@ -0,0 +1,136 @@
{
"textures": {
"sides": "appliedenergistics2:parts/export_bus_sides",
"sidesStatus": "appliedenergistics2:parts/monitor_sides_status",
"back": "appliedenergistics2:parts/monitor_back",
"front": "appliedenergistics2:items/part/export_bus",
"particle": "appliedenergistics2:parts/monitor_back"
},
"elements": [
{
"from": [
4,
4,
2
],
"to": [
12,
12,
4
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
1
],
"to": [
11,
11,
2
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
6,
6,
0
],
"to": [
10,
10,
1
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#sidesStatus"
},
"up": {
"texture": "#sidesStatus"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sidesStatus"
},
"west": {
"texture": "#sidesStatus"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json
+54
View File
@@ -0,0 +1,54 @@
{
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},
"elements": [
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json
+33
View File
@@ -0,0 +1,33 @@
{
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_off"
},
"elements": [
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#indicator"
},
"up": {
"texture": "#indicator"
},
"east": {
"texture": "#indicator"
},
"west": {
"texture": "#indicator"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json
+54
View File
@@ -0,0 +1,54 @@
{
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},
"elements": [
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json
+136
View File
@@ -0,0 +1,136 @@
{
"textures": {
"sides": "appliedenergistics2:parts/import_bus_sides",
"sidesStatus": "appliedenergistics2:parts/monitor_sides_status",
"back": "appliedenergistics2:parts/monitor_back",
"front": "appliedenergistics2:items/part/import_bus",
"particle": "appliedenergistics2:parts/monitor_back"
},
"elements": [
{
"from": [
4,
4,
0
],
"to": [
12,
12,
2
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
2
],
"to": [
11,
11,
3
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
6,
6,
3
],
"to": [
10,
10,
4
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#sidesStatus"
},
"up": {
"texture": "#sidesStatus"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sidesStatus"
},
"west": {
"texture": "#sidesStatus"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json
+54
View File
@@ -0,0 +1,54 @@
{
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},
"elements": [
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json
+33
View File
@@ -0,0 +1,33 @@
{
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_off"
},
"elements": [
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#indicator"
},
"up": {
"texture": "#indicator"
},
"east": {
"texture": "#indicator"
},
"west": {
"texture": "#indicator"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json
+54
View File
@@ -0,0 +1,54 @@
{
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},
"elements": [
{
"from": [
6,
6,
4
],
"to": [
10,
10,
5
],
"faces": {
"down": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json
+130
View File
@@ -0,0 +1,130 @@
{
"textures": {
"sides": "appliedenergistics2:parts/storage_bus_sides",
"sidesStatus": "appliedenergistics2:parts/monitor_sides_status",
"back": "appliedenergistics2:parts/storage_bus_back",
"front": "appliedenergistics2:items/part/storage_bus",
"particle": "appliedenergistics2:parts/storage_bus_back"
},
"elements": [
{
"from": [
3,
3,
0
],
"to": [
13,
13,
1
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
2,
2,
1
],
"to": [
14,
14,
2
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"north": {
"texture": "#front"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
3
],
"to": [
11,
11,
4
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"south": {
"texture": "#back"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
}
}
},
{
"from": [
5,
5,
2
],
"to": [
11,
11,
3
],
"faces": {
"down": {
"texture": "#sides"
},
"up": {
"texture": "#sides"
},
"east": {
"texture": "#sides"
},
"west": {
"texture": "#sides"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json
+54
View File
@@ -0,0 +1,54 @@
{
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},
"elements": [
{
"from": [
5,
5,
2
],
"to": [
11,
11,
3
],
"faces": {
"down": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#indicator",
"tintindex": 1,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json
+33
View File
@@ -0,0 +1,33 @@
{
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_off"
},
"elements": [
{
"from": [
5,
5,
2
],
"to": [
11,
11,
3
],
"faces": {
"down": {
"texture": "#indicator"
},
"up": {
"texture": "#indicator"
},
"east": {
"texture": "#indicator"
},
"west": {
"texture": "#indicator"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json
+54
View File
@@ -0,0 +1,54 @@
{
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},
"elements": [
{
"from": [
5,
5,
2
],
"to": [
11,
11,
3
],
"faces": {
"down": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#indicator",
"tintindex": 3,
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}