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

Re-add the Importer

Browse Source
This commit is contained in:
raoulvdberge
2019-10-17 16:41:01 +02:00
parent a3fd30bec5
commit f893122b98
38 changed files with 810 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/main/resources/assets/refinedstorage/blockstates/importer.json Executable file → Normal file
View File

@@ -1,87 +1,115 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"cable": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable",
"border": "refinedstorage:blocks/cable_part_border"
"multipart": [
{
"apply": {
"model": "refinedstorage:block/cable_core"
}
},
"model": "refinedstorage:cable_core",
"uvlock": false,
"transform": "forge:default-block"
},
"variants": {
"direction": {
"north": {
"submodel": "refinedstorage:importer"
{
"when": {
"north": true
},
"east": {
"submodel": "refinedstorage:importer",
"apply": {
"model": "refinedstorage:block/cable_extension"
}
},
{
"when": {
"east": true
},
"apply": {
"model": "refinedstorage:block/cable_extension",
"y": 90
}
},
{
"when": {
"south": true
},
"south": {
"submodel": "refinedstorage:importer",
"apply": {
"model": "refinedstorage:block/cable_extension",
"x": 180
}
},
{
"when": {
"west": true
},
"west": {
"submodel": "refinedstorage:importer",
"apply": {
"model": "refinedstorage:block/cable_extension",
"y": 270
}
},
{
"when": {
"up": true
},
"up": {
"submodel": "refinedstorage:importer",
"apply": {
"model": "refinedstorage:block/cable_extension",
"x": 270
}
},
{
"when": {
"down": true
},
"down": {
"submodel": "refinedstorage:importer",
"apply": {
"model": "refinedstorage:block/cable_extension",
"x": 90
}
},
"north": {
"true": {
"submodel": "refinedstorage:cable_extension"
{
"when": {
"direction": "north"
},
"false": {
"apply": {
"model": "refinedstorage:block/importer"
}
},
"east": {
"true": {
"submodel": "refinedstorage:cable_extension",
{
"when": {
"direction": "east"
},
"apply": {
"model": "refinedstorage:block/importer",
"y": 90
},
"false": {
}
},
"south": {
"true": {
"submodel": "refinedstorage:cable_extension",
{
"when": {
"direction": "south"
},
"apply": {
"model": "refinedstorage:block/importer",
"x": 180
},
"false": {
}
},
"west": {
"true": {
"submodel": "refinedstorage:cable_extension",
{
"when": {
"direction": "west"
},
"apply": {
"model": "refinedstorage:block/importer",
"y": 270
},
"false": {
}
},
"up": {
"true": {
"submodel": "refinedstorage:cable_extension",
{
"when": {
"direction": "up"
},
"apply": {
"model": "refinedstorage:block/importer",
"x": 270
},
"false": {
}
},
"down": {
"true": {
"submodel": "refinedstorage:cable_extension",
"x": 90
{
"when": {
"direction": "down"
},
"false": {
"apply": {
"model": "refinedstorage:block/importer",
"x": 90
}
}
}
]
}

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

@@ -21,7 +21,7 @@
"gui.refinedstorage.disk_drive": "Disk Drive",
"gui.refinedstorage.disk_drive.disks": "Disks",
"gui.refinedstorage.external_storage": "External Storage",
"gui.refinedstorage:importer": "Importer",
"gui.refinedstorage.importer": "Importer",
"gui.refinedstorage:exporter": "Exporter",
"gui.refinedstorage:detector": "Detector",
"gui.refinedstorage:destructor": "Destructor",
@@ -187,7 +187,7 @@
"block.refinedstorage.disk_drive": "Disk Drive",
"block.refinedstorage:disk_manipulator": "Disk Manipulator",
"block.refinedstorage.external_storage": "External Storage",
"block.refinedstorage:importer": "Importer",
"block.refinedstorage.importer": "Importer",
"block.refinedstorage:exporter": "Exporter",
"block.refinedstorage:detector": "Detector",
"block.refinedstorage.machine_casing": "Machine Casing",

3
src/main/resources/assets/refinedstorage/models/block/importer.json
View File

@@ -1,5 +1,8 @@
{
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"border": "refinedstorage:block/cable_part_border"
},
"elements": [
{
"name": "Line1",

441
src/main/resources/assets/refinedstorage/models/item/importer.json Normal file
View File

@@ -0,0 +1,441 @@
{
"parent": "block/block",
"textures": {
"cable": "refinedstorage:block/cable",
"border": "refinedstorage:block/cable_part_border"
},
"elements": [
{
"name": "Core",
"from": [
6,
6,
6
],
"to": [
10,
10,
10
],
"faces": {
"north": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"east": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"south": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"west": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"up": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"down": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
}
}
},
{
"name": "Part1",
"from": [
10,
6,
6
],
"to": [
16,
10,
10
],
"rotation": {
"angle": 0,
"axis": "y",
"origin": [
16,
8,
9
]
},
"faces": {
"north": {
"uv": [
0,
6,
6,
10
],
"texture": "#cable"
},
"east": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"south": {
"uv": [
10,
6,
16,
10
],
"texture": "#cable"
},
"west": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"up": {
"uv": [
10,
6,
16,
10
],
"texture": "#cable"
},
"down": {
"uv": [
10,
6,
16,
10
],
"texture": "#cable"
}
}
},
{
"name": "Part2",
"from": [
0,
6,
6
],
"to": [
6,
10,
10
],
"rotation": {
"angle": 0,
"axis": "y",
"origin": [
6,
8,
9
]
},
"faces": {
"north": {
"uv": [
10,
6,
16,
10
],
"texture": "#cable"
},
"east": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"south": {
"uv": [
0,
6,
6,
10
],
"texture": "#cable"
},
"west": {
"uv": [
6,
6,
10,
10
],
"texture": "#cable"
},
"up": {
"uv": [
0,
6,
6,
10
],
"texture": "#cable"
},
"down": {
"uv": [
0,
6,
6,
10
],
"texture": "#cable"
}
}
},
{
"name": "Line1",
"from": [
6.0,
6.0,
4.0
],
"to": [
10.0,
10.0,
6.0
],
"faces": {
"north": {
"texture": "#border",
"uv": [
0.0,
0.0,
4.0,
4.0
]
},
"east": {
"texture": "#border",
"uv": [
0.0,
0.0,
2.0,
4.0
]
},
"south": {
"texture": "#border",
"uv": [
0.0,
0.0,
4.0,
4.0
]
},
"west": {
"texture": "#border",
"uv": [
0.0,
0.0,
2.0,
4.0
]
},
"up": {
"texture": "#border",
"uv": [
0.0,
0.0,
4.0,
2.0
]
},
"down": {
"texture": "#border",
"uv": [
0.0,
0.0,
4.0,
2.0
]
}
}
},
{
"name": "Line2",
"from": [
5.0,
5.0,
2.0
],
"to": [
11.0,
11.0,
4.0
],
"faces": {
"north": {
"texture": "#border",
"uv": [
0.0,
0.0,
6.0,
6.0
]
},
"east": {
"texture": "#border",
"uv": [
0.0,
0.0,
2.0,
6.0
]
},
"south": {
"texture": "#border",
"uv": [
0.0,
0.0,
6.0,
6.0
]
},
"west": {
"texture": "#border",
"uv": [
0.0,
0.0,
2.0,
6.0
]
},
"up": {
"texture": "#border",
"uv": [
0.0,
0.0,
6.0,
2.0
]
},
"down": {
"texture": "#border",
"uv": [
0.0,
0.0,
6.0,
2.0
]
}
}
},
{
"name": "Line3",
"from": [
3.0,
3.0,
0.0
],
"to": [
13.0,
13.0,
2.0
],
"faces": {
"north": {
"texture": "#border",
"uv": [
0.0,
0.0,
10.0,
10.0
]
},
"east": {
"texture": "#border",
"uv": [
0.0,
0.0,
2.0,
10.0
]
},
"south": {
"texture": "#border",
"uv": [
0.0,
0.0,
10.0,
10.0
]
},
"west": {
"texture": "#border",
"uv": [
0.0,
0.0,
2.0,
10.0
]
},
"up": {
"texture": "#border",
"uv": [
0.0,
0.0,
10.0,
2.0
]
},
"down": {
"texture": "#border",
"uv": [
0.0,
0.0,
10.0,
2.0
]
}
}
}
]
}

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

@@ -5,10 +5,10 @@
"item": "refinedstorage:cable"
},
{
"item": "#destruction_core"
"item": "refinedstorage:destruction_core"
},
{
"item": "#improved_processor"
"item": "refinedstorage:improved_processor"
}
],
"result": {