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

Detector, disk manipulator and wireless transmitter fullbright. #1860

Browse Source
This commit is contained in:
raoulvdberge
2018-07-12 03:29:07 +02:00
parent 13d6e7f2b9
commit f2d393d1f2
39 changed files with 380 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json
View File

@@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_cutout_north",
"model": "refinedstorage:cube_north_cutout",
"textures": {
"particle": "refinedstorage:blocks/side",
"north": "refinedstorage:blocks/crafter_manager/front",

2
src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json
View File

@@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_cutout_north",
"model": "refinedstorage:cube_north_cutout",
"textures": {
"particle": "refinedstorage:blocks/crafting_monitor/front",
"north": "refinedstorage:blocks/crafting_monitor/front",

12
src/main/resources/assets/refinedstorage/blockstates/detector.json
View File

@@ -2,11 +2,11 @@
"forge_marker": 1,
"defaults": {
"textures": {
"particle": "refinedstorage:blocks/detector_top",
"torch": "refinedstorage:blocks/detector_side_off",
"side": "refinedstorage:blocks/detector_side_off",
"top": "refinedstorage:blocks/detector_top",
"bottom": "refinedstorage:blocks/detector_bottom"
"side": "refinedstorage:blocks/detector/side",
"bottom": "refinedstorage:blocks/detector/bottom",
"top": "refinedstorage:blocks/detector/top",
"torch": "refinedstorage:blocks/detector/cutouts/off",
"particle": "refinedstorage:blocks/detector/side"
},
"model": "refinedstorage:detector"
},
@@ -19,7 +19,7 @@
"powered": {
"true": {
"textures": {
"torch": "refinedstorage:blocks/detector_side_on"
"torch": "refinedstorage:blocks/detector/cutouts/on"
}
},
"false": {

2
src/main/resources/assets/refinedstorage/blockstates/grid.json
View File

@@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_cutout_north",
"model": "refinedstorage:cube_north_cutout",
"textures": {
"particle": "refinedstorage:blocks/side",
"east": "refinedstorage:blocks/grid/left",

7
src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json
View File

@@ -1,9 +1,10 @@
{
"forge_marker": 1,
"defaults": {
"model": "torch",
"model": "refinedstorage:wireless_transmitter",
"textures": {
"torch": "refinedstorage:blocks/wireless_transmitter_disconnected"
"torch": "refinedstorage:blocks/wireless_transmitter/wireless_transmitter",
"cutout": "refinedstorage:blocks/wireless_transmitter/cutouts/disconnected"
}
},
"variants": {
@@ -15,7 +16,7 @@
"connected": {
"true": {
"textures": {
"torch": "refinedstorage:blocks/wireless_transmitter_connected"
"cutout": "refinedstorage:blocks/wireless_transmitter/cutouts/connected"
}
},
"false": {

0
src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json → src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json
View File

247
src/main/resources/assets/refinedstorage/models/block/detector.json
View File

@@ -1,210 +1,201 @@
{
"__comment": "Model made by CyanideX",
"credit": "Made with Blockbench",
"elements": [
{
"name": "Element",
"name": "Handle",
"from": [
7.0,
5.0,
7.0
7,
5,
7
],
"to": [
9.0,
10.0,
9.0
9,
8,
9
],
"shade": false,
"faces": {
"north": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
7,
7,
9,
11
],
"texture": "#side"
},
"east": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
7,
7,
9,
11
],
"texture": "#side"
},
"south": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
7,
7,
9,
11
],
"texture": "#side"
},
"west": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
7,
7,
9,
11
],
"texture": "#side"
},
"up": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
7.0
]
},
"down": {
"texture": "#torch",
"uv": [
7.0,
7.0,
9.0,
9.0
]
7,
7,
9,
9
],
"texture": "#side"
}
}
},
{
"name": "Element",
"name": "Torch",
"from": [
7.0,
5.0,
6.0
7,
5,
6
],
"to": [
9.0,
11.0,
10.0
9,
11,
10
],
"shade": false,
"faces": {
"east": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
6,
4,
10,
12
],
"texture": "#torch"
},
"west": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
6,
4,
10,
12
],
"texture": "#torch"
}
}
},
{
"name": "Element",
"name": "Torch",
"from": [
6.0,
5.0,
7.0
6,
5,
7
],
"to": [
10.0,
11.0,
9.0
10,
11,
9
],
"shade": false,
"faces": {
"north": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
6,
4,
10,
12
],
"texture": "#torch"
},
"south": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
6,
4,
10,
12
],
"texture": "#torch"
}
}
},
{
"name": "base",
"name": "Base",
"from": [
0.0,
0.0,
0.0
0,
0,
0
],
"to": [
16.0,
5.0,
16.0
16,
5,
16
],
"faces": {
"north": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
0,
11,
16,
16
],
"texture": "#side"
},
"east": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
0,
11,
16,
16
],
"texture": "#side"
},
"south": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
0,
11,
16,
16
],
"texture": "#side"
},
"west": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
0,
11,
16,
16
],
"texture": "#side"
},
"up": {
"texture": "#top",
"uv": [
0.0,
0.0,
16.0,
16.0
]
0,
0,
16,
16
],
"texture": "#top"
},
"down": {
"texture": "#bottom",
"uv": [
0.0,
0.0,
16.0,
16.0
]
0,
0,
16,
16
],
"texture": "#bottom"
}
}
}

57
src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected.json
View File

@@ -1,50 +1,13 @@
{
"parent": "block/block",
"parent": "refinedstorage:block/cube_north_cutout",
"textures": {
"particle": "refinedstorage:blocks/disk_manipulator_connected",
"front": "refinedstorage:blocks/disk_manipulator_connected",
"bottom": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side",
"side": "refinedstorage:blocks/side"
},
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"down": {
"texture": "#bottom",
"cullface": "down"
},
"up": {
"texture": "#top",
"cullface": "up"
},
"north": {
"texture": "#front",
"cullface": "north"
},
"south": {
"texture": "#side",
"cullface": "south"
},
"west": {
"texture": "#side",
"cullface": "west"
},
"east": {
"texture": "#side",
"cullface": "east"
}
}
}
]
"particle": "refinedstorage:blocks/disk_manipulator/disk_manipulator",
"north": "refinedstorage:blocks/disk_manipulator/disk_manipulator",
"east": "refinedstorage:blocks/side",
"south": "refinedstorage:blocks/side",
"west": "refinedstorage:blocks/side",
"up": "refinedstorage:blocks/side",
"down": "refinedstorage:blocks/side",
"cutout": "refinedstorage:blocks/disk_manipulator/cutouts/connected"
}
}

57
src/main/resources/assets/refinedstorage/models/block/disk_manipulator_disconnected.json
View File

@@ -1,50 +1,13 @@
{
"parent": "block/block",
"parent": "refinedstorage:block/cube_north_cutout",
"textures": {
"particle": "refinedstorage:blocks/disk_manipulator_disconnected",
"front": "refinedstorage:blocks/disk_manipulator_disconnected",
"bottom": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side",
"side": "refinedstorage:blocks/side"
},
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"down": {
"texture": "#bottom",
"cullface": "down"
},
"up": {
"texture": "#top",
"cullface": "up"
},
"north": {
"texture": "#front",
"cullface": "north"
},
"south": {
"texture": "#side",
"cullface": "south"
},
"west": {
"texture": "#side",
"cullface": "west"
},
"east": {
"texture": "#side",
"cullface": "east"
}
}
}
]
"particle": "refinedstorage:blocks/disk_manipulator/disk_manipulator",
"north": "refinedstorage:blocks/disk_manipulator/disk_manipulator",
"east": "refinedstorage:blocks/side",
"south": "refinedstorage:blocks/side",
"west": "refinedstorage:blocks/side",
"up": "refinedstorage:blocks/side",
"down": "refinedstorage:blocks/side",
"cutout": "refinedstorage:blocks/disk_manipulator/cutouts/disconnected"
}
}

206
src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json Normal file
View File

@@ -0,0 +1,206 @@
{
"ambientocclusion": false,
"textures": {
"particle": "#torch"
},
"elements": [
{
"from": [
7,
0,
7
],
"to": [
9,
10,
9
],
"shade": false,
"faces": {
"down": {
"uv": [
7,
13,
9,
15
],
"texture": "#torch"
},
"up": {
"uv": [
7,
6,
9,
8
],
"texture": "#torch"
}
}
},
{
"from": [
7,
0,
0
],
"to": [
9,
16,
16
],
"shade": false,
"faces": {
"west": {
"uv": [
0,
0,
16,
16
],
"texture": "#torch"
},
"east": {
"uv": [
0,
0,
16,
16
],
"texture": "#torch"
}
}
},
{
"from": [
0,
0,
7
],
"to": [
16,
16,
9
],
"shade": false,
"faces": {
"north": {
"uv": [
0,
0,
16,
16
],
"texture": "#torch"
},
"south": {
"uv": [
0,
0,
16,
16
],
"texture": "#torch"
}
}
},
{
"from": [
7,
0,
7
],
"to": [
9,
10,
9
],
"shade": false,
"faces": {
"down": {
"uv": [
7,
13,
9,
15
],
"texture": "#cutout"
},
"up": {
"uv": [
7,
6,
9,
8
],
"texture": "#cutout"
}
}
},
{
"from": [
7,
0,
0
],
"to": [
9,
16,
16
],
"shade": false,
"faces": {
"west": {
"uv": [
0,
0,
16,
16
],
"texture": "#cutout"
},
"east": {
"uv": [
0,
0,
16,
16
],
"texture": "#cutout"
}
}
},
{
"from": [
0,
0,
7
],
"to": [
16,
16,
9
],
"shade": false,
"faces": {
"north": {
"uv": [
0,
0,
16,
16
],
"texture": "#cutout"
},
"south": {
"uv": [
0,
0,
16,
16
],
"texture": "#cutout"
}
}
}
]
}

6
src/main/resources/assets/refinedstorage/recipes/detector.json
View File

@@ -1,8 +1,8 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"RMR",
"ERE",
"CMC",
"EPE"
],
"key": {
@@ -13,7 +13,7 @@
"item": "minecraft:comparator"
},
"R": {
"item": "minecraft:redstone"
"item": "minecraft:redstone_torch"
},
"M": {
"item": "refinedstorage:machine_casing"

BIN
src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

0
src/main/resources/assets/refinedstorage/textures/blocks/detector_bottom.png → src/main/resources/assets/refinedstorage/textures/blocks/detector/bottom.png Executable file → Normal file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

0
src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png → src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/on.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 262 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector/side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 433 B

0
src/main/resources/assets/refinedstorage/textures/blocks/detector_top.png → src/main/resources/assets/refinedstorage/textures/blocks/detector/top.png Executable file → Normal file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

9
src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png.mcmeta
View File

@@ -1,9 +0,0 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}

0
src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png → src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/connected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 255 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/disconnected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/disk_manipulator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 625 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

9
src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png.mcmeta
View File

@@ -1,9 +0,0 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

0
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png → src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/connected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 257 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/disconnected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/wireless_transmitter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

9
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png.mcmeta
View File

@@ -1,9 +0,0 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB