diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java index 249c8499f..339833352 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java @@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockPortableGrid; import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsPortableGrid; import com.raoulvdberge.refinedstorage.render.meshdefinition.ItemMeshDefinitionPortableGrid; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; @@ -47,6 +48,11 @@ public class BlockPortableGrid extends BlockBase { public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setStateMapper(this, new StateMap.Builder().ignore(TYPE).build()); modelRegistration.setModelMeshDefinition(this, new ItemMeshDefinitionPortableGrid()); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright( + base, + RS.ID + ":blocks/disks/leds" + )); } @Override diff --git a/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json b/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json index d57789073..a4d7bc877 100644 --- a/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json @@ -18,32 +18,16 @@ "variants": { "disk_state": { "normal": { - "textures": { - "disk0": "refinedstorage:blocks/portable_grid_disk", - "disk1": "refinedstorage:blocks/portable_grid_disk" - }, - "submodel": "refinedstorage:portable_grid_disk" + "submodel": "refinedstorage:disks/portable_grid_disk" }, "near_capacity": { - "textures": { - "disk0": "refinedstorage:blocks/portable_grid_disk_near_capacity", - "disk1": "refinedstorage:blocks/portable_grid_disk_near_capacity" - }, - "submodel": "refinedstorage:portable_grid_disk" + "submodel": "refinedstorage:disks/portable_grid_disk_near_capacity" }, "full": { - "textures": { - "disk0": "refinedstorage:blocks/portable_grid_disk_full", - "disk1": "refinedstorage:blocks/portable_grid_disk_full" - }, - "submodel": "refinedstorage:portable_grid_disk" + "submodel": "refinedstorage:disks/portable_grid_disk_full" }, "disconnected": { - "textures": { - "disk0": "refinedstorage:blocks/portable_grid_disk_disconnected", - "disk1": "refinedstorage:blocks/portable_grid_disk_disconnected" - }, - "submodel": "refinedstorage:portable_grid_disk" + "submodel": "refinedstorage:disks/portable_grid_disk_disconnected" }, "none": { } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json new file mode 100644 index 000000000..7174f1884 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json @@ -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" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/portable_grid_disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json similarity index 74% rename from src/main/resources/assets/refinedstorage/models/block/portable_grid_disk.json rename to src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json index c3f5223d4..7d4f56672 100644 --- a/src/main/resources/assets/refinedstorage/models/block/portable_grid_disk.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json @@ -1,4 +1,8 @@ { + "textures": { + "disk": "refinedstorage:blocks/disks/portable_grid_disk", + "led": "refinedstorage:blocks/disks/portable_grid_leds" + }, "elements": [ { "name": "disk", @@ -21,7 +25,7 @@ 6, 7 ], - "texture": "#disk1" + "texture": "#disk" }, "east": { "uv": [ @@ -30,7 +34,7 @@ 5, 7 ], - "texture": "#disk1" + "texture": "#disk" }, "south": { "uv": [ @@ -39,7 +43,7 @@ 12, 7 ], - "texture": "#disk1" + "texture": "#disk" }, "west": { "uv": [ @@ -48,7 +52,7 @@ 11, 7 ], - "texture": "#disk1" + "texture": "#disk" }, "up": { "uv": [ @@ -57,7 +61,7 @@ 6, 5 ], - "texture": "#disk1", + "texture": "#disk", "rotation": 180 }, "down": { @@ -67,7 +71,7 @@ 7, 5 ], - "texture": "#disk1", + "texture": "#disk", "rotation": 180 } } @@ -88,21 +92,21 @@ "faces": { "east": { "uv": [ - 2, - 1, 3, - 2 + 0, + 3, + 0 ], - "texture": "#disk1" + "texture": "#led" }, "west": { "uv": [ - 2, - 1, 3, - 2 + 0, + 3, + 0 ], - "texture": "#disk0" + "texture": "#led" } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json new file mode 100644 index 000000000..06601183e --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json @@ -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" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json new file mode 100644 index 000000000..c44a0ee16 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json @@ -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" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disks/disk.png b/src/main/resources/assets/refinedstorage/textures/blocks/disks/disk.png index c7bee5810..0288cdb87 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disks/disk.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disks/disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_disk.png b/src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_disk.png new file mode 100644 index 000000000..f6e8885bd Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_leds.png b/src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_leds.png new file mode 100644 index 000000000..cafe25392 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_leds.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk.png b/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk.png deleted file mode 100644 index 2545c5710..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_disconnected.png deleted file mode 100644 index e70a25007..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_full.png b/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_full.png deleted file mode 100644 index 61d56f146..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_full.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_near_capacity.png b/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_near_capacity.png deleted file mode 100644 index 8ea9c1357..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_near_capacity.png and /dev/null differ