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

Fullbright portable grid disks. #1860

Browse Source
This commit is contained in:
raoulvdberge
2018-07-12 15:01:16 +02:00
parent cca8f6752b
commit d3c1b1d0a3
13 changed files with 478 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
View File

@@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockPortableGrid;
import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.render.IModelRegistration;
import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsPortableGrid; import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsPortableGrid;
import com.raoulvdberge.refinedstorage.render.meshdefinition.ItemMeshDefinitionPortableGrid; import com.raoulvdberge.refinedstorage.render.meshdefinition.ItemMeshDefinitionPortableGrid;
import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid;
import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyEnum;
@@ -47,6 +48,11 @@ public class BlockPortableGrid extends BlockBase {
public void registerModels(IModelRegistration modelRegistration) { public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setStateMapper(this, new StateMap.Builder().ignore(TYPE).build()); modelRegistration.setStateMapper(this, new StateMap.Builder().ignore(TYPE).build());
modelRegistration.setModelMeshDefinition(this, new ItemMeshDefinitionPortableGrid()); modelRegistration.setModelMeshDefinition(this, new ItemMeshDefinitionPortableGrid());
modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(
base,
RS.ID + ":blocks/disks/leds"
));
} }
@Override @Override

24
src/main/resources/assets/refinedstorage/blockstates/portable_grid.json
View File

@@ -18,32 +18,16 @@
"variants": { "variants": {
"disk_state": { "disk_state": {
"normal": { "normal": {
"textures": { "submodel": "refinedstorage:disks/portable_grid_disk"
"disk0": "refinedstorage:blocks/portable_grid_disk",
"disk1": "refinedstorage:blocks/portable_grid_disk"
},
"submodel": "refinedstorage:portable_grid_disk"
}, },
"near_capacity": { "near_capacity": {
"textures": { "submodel": "refinedstorage:disks/portable_grid_disk_near_capacity"
"disk0": "refinedstorage:blocks/portable_grid_disk_near_capacity",
"disk1": "refinedstorage:blocks/portable_grid_disk_near_capacity"
},
"submodel": "refinedstorage:portable_grid_disk"
}, },
"full": { "full": {
"textures": { "submodel": "refinedstorage:disks/portable_grid_disk_full"
"disk0": "refinedstorage:blocks/portable_grid_disk_full",
"disk1": "refinedstorage:blocks/portable_grid_disk_full"
},
"submodel": "refinedstorage:portable_grid_disk"
}, },
"disconnected": { "disconnected": {
"textures": { "submodel": "refinedstorage:disks/portable_grid_disk_disconnected"
"disk0": "refinedstorage:blocks/portable_grid_disk_disconnected",
"disk1": "refinedstorage:blocks/portable_grid_disk_disconnected"
},
"submodel": "refinedstorage:portable_grid_disk"
}, },
"none": { "none": {
} }

150
src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json Normal file
View File

@@ -0,0 +1,150 @@
{
"textures": {
"disk": "refinedstorage:blocks/disks/portable_grid_disk",
"led": "refinedstorage:blocks/disks/leds"
},
"elements": [
{
"name": "disk",
"from": [
-1,
2,
9
],
"to": [
0,
4,
14
],
"shade": true,
"faces": {
"north": {
"uv": [
5,
5,
6,
7
],
"texture": "#disk"
},
"east": {
"uv": [
0,
5,
5,
7
],
"texture": "#disk"
},
"south": {
"uv": [
11,
5,
12,
7
],
"texture": "#disk"
},
"west": {
"uv": [
6,
5,
11,
7
],
"texture": "#disk"
},
"up": {
"uv": [
5,
0,
6,
5
],
"texture": "#disk",
"rotation": 180
},
"down": {
"uv": [
6,
0,
7,
5
],
"texture": "#disk",
"rotation": 180
}
}
},
{
"name": "disk_led",
"from": [
-1.05,
2,
12
],
"to": [
-0.050000000000000044,
3,
13
],
"shade": true,
"faces": {
"east": {
"uv": [
2,
0,
2,
0
],
"texture": "#led"
},
"west": {
"uv": [
2,
0,
2,
0
],
"texture": "#led"
},
"north": {
"uv": [
2,
0,
2,
0
],
"texture": "#led"
},
"south": {
"uv": [
2,
0,
2,
0
],
"texture": "#led"
},
"up": {
"uv": [
2,
0,
2,
0
],
"texture": "#led"
},
"down": {
"uv": [
2,
0,
2,
0
],
"texture": "#led"
}
}
}
]
}

32
src/main/resources/assets/refinedstorage/models/block/portable_grid_disk.json → src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json
View File

@@ -1,4 +1,8 @@
{ {
"textures": {
"disk": "refinedstorage:blocks/disks/portable_grid_disk",
"led": "refinedstorage:blocks/disks/portable_grid_leds"
},
"elements": [ "elements": [
{ {
"name": "disk", "name": "disk",
@@ -21,7 +25,7 @@
6, 6,
7 7
], ],
"texture": "#disk1" "texture": "#disk"
}, },
"east": { "east": {
"uv": [ "uv": [
@@ -30,7 +34,7 @@
5, 5,
7 7
], ],
"texture": "#disk1" "texture": "#disk"
}, },
"south": { "south": {
"uv": [ "uv": [
@@ -39,7 +43,7 @@
12, 12,
7 7
], ],
"texture": "#disk1" "texture": "#disk"
}, },
"west": { "west": {
"uv": [ "uv": [
@@ -48,7 +52,7 @@
11, 11,
7 7
], ],
"texture": "#disk1" "texture": "#disk"
}, },
"up": { "up": {
"uv": [ "uv": [
@@ -57,7 +61,7 @@
6, 6,
5 5
], ],
"texture": "#disk1", "texture": "#disk",
"rotation": 180 "rotation": 180
}, },
"down": { "down": {
@@ -67,7 +71,7 @@
7, 7,
5 5
], ],
"texture": "#disk1", "texture": "#disk",
"rotation": 180 "rotation": 180
} }
} }
@@ -88,21 +92,21 @@
"faces": { "faces": {
"east": { "east": {
"uv": [ "uv": [
2,
1,
3, 3,
2 0,
3,
0
], ],
"texture": "#disk1" "texture": "#led"
}, },
"west": { "west": {
"uv": [ "uv": [
2,
1,
3, 3,
2 0,
3,
0
], ],
"texture": "#disk0" "texture": "#led"
} }
} }
} }

150
src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json Normal file
View File

@@ -0,0 +1,150 @@
{
"textures": {
"disk": "refinedstorage:blocks/disks/portable_grid_disk",
"led": "refinedstorage:blocks/disks/leds"
},
"elements": [
{
"name": "disk",
"from": [
-1,
2,
9
],
"to": [
0,
4,
14
],
"shade": true,
"faces": {
"north": {
"uv": [
5,
5,
6,
7
],
"texture": "#disk"
},
"east": {
"uv": [
0,
5,
5,
7
],
"texture": "#disk"
},
"south": {
"uv": [
11,
5,
12,
7
],
"texture": "#disk"
},
"west": {
"uv": [
6,
5,
11,
7
],
"texture": "#disk"
},
"up": {
"uv": [
5,
0,
6,
5
],
"texture": "#disk",
"rotation": 180
},
"down": {
"uv": [
6,
0,
7,
5
],
"texture": "#disk",
"rotation": 180
}
}
},
{
"name": "disk_led",
"from": [
-1.05,
2,
12
],
"to": [
-0.050000000000000044,
3,
13
],
"shade": true,
"faces": {
"east": {
"uv": [
1,
0,
1,
0
],
"texture": "#led"
},
"west": {
"uv": [
1,
0,
1,
0
],
"texture": "#led"
},
"north": {
"uv": [
1,
0,
1,
0
],
"texture": "#led"
},
"south": {
"uv": [
1,
0,
1,
0
],
"texture": "#led"
},
"up": {
"uv": [
1,
0,
1,
0
],
"texture": "#led"
},
"down": {
"uv": [
1,
0,
1,
0
],
"texture": "#led"
}
}
}
]
}

150
src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json Normal file
View File

@@ -0,0 +1,150 @@
{
"textures": {
"disk": "refinedstorage:blocks/disks/portable_grid_disk",
"led": "refinedstorage:blocks/disks/leds"
},
"elements": [
{
"name": "disk",
"from": [
-1,
2,
9
],
"to": [
0,
4,
14
],
"shade": true,
"faces": {
"north": {
"uv": [
5,
5,
6,
7
],
"texture": "#disk"
},
"east": {
"uv": [
0,
5,
5,
7
],
"texture": "#disk"
},
"south": {
"uv": [
11,
5,
12,
7
],
"texture": "#disk"
},
"west": {
"uv": [
6,
5,
11,
7
],
"texture": "#disk"
},
"up": {
"uv": [
5,
0,
6,
5
],
"texture": "#disk",
"rotation": 180
},
"down": {
"uv": [
6,
0,
7,
5
],
"texture": "#disk",
"rotation": 180
}
}
},
{
"name": "disk_led",
"from": [
-1.05,
2,
12
],
"to": [
-0.050000000000000044,
3,
13
],
"shade": true,
"faces": {
"east": {
"uv": [
0,
0,
0,
0
],
"texture": "#led"
},
"west": {
"uv": [
0,
0,
0,
0
],
"texture": "#led"
},
"north": {
"uv": [
0,
0,
0,
0
],
"texture": "#led"
},
"south": {
"uv": [
0,
0,
0,
0
],
"texture": "#led"
},
"up": {
"uv": [
0,
0,
0,
0
],
"texture": "#led"
},
"down": {
"uv": [
0,
0,
0,
0
],
"texture": "#led"
}
}
}
]
}

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 291 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 320 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB