From d3c1b1d0a3b41ecee107805707758f9b68d5bca9 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 12 Jul 2018 15:01:16 +0200 Subject: [PATCH] Fullbright portable grid disks. #1860 --- .../block/BlockPortableGrid.java | 6 + .../blockstates/portable_grid.json | 24 +-- .../block/disks/portable_grid_disk.json | 150 ++++++++++++++++++ .../portable_grid_disk_disconnected.json} | 32 ++-- .../block/disks/portable_grid_disk_full.json | 150 ++++++++++++++++++ .../portable_grid_disk_near_capacity.json | 150 ++++++++++++++++++ .../textures/blocks/disks/disk.png | Bin 306 -> 291 bytes .../blocks/disks/portable_grid_disk.png | Bin 0 -> 320 bytes .../blocks/disks/portable_grid_leds.png | Bin 0 -> 209 bytes .../textures/blocks/portable_grid_disk.png | Bin 1079 -> 0 bytes .../portable_grid_disk_disconnected.png | Bin 1081 -> 0 bytes .../blocks/portable_grid_disk_full.png | Bin 1089 -> 0 bytes .../portable_grid_disk_near_capacity.png | Bin 1082 -> 0 bytes 13 files changed, 478 insertions(+), 34 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json rename src/main/resources/assets/refinedstorage/models/block/{portable_grid_disk.json => disks/portable_grid_disk_disconnected.json} (74%) create mode 100644 src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json create mode 100644 src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_disk.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disks/portable_grid_leds.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_disconnected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_full.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_near_capacity.png 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 c7bee58104fc29883f13b1cd4b59b7f7799a26fa..0288cdb8783d07742b83fd322f89900458bf543e 100644 GIT binary patch delta 206 zcmdnQw3umv%0xp6u0sqAe1{lCHM|-o25ZzW@N{tuvGAXI#*wSpK%g~|KT}Mv*X^LP ziUP;Y76(0ngNyf>G2arqw`lW^89$EuusgH}TzE1k&}-t(_tty9Tl77iY3R0d_kCOL zImH>%QV&}6eL8I7TeR(3(!BJX+ij(>srTN`WA(iqmwmJ}*5bUd=F;+icZ}`j4;vhi yXg2%3&useV@3zj1*?Of+vM#J}L}&c4FVS!5dr^G;!t-zjAnkh>GZx^prwCn`#F9cEzQJIr`Ie?`hfH;wv5o-U3d7XDMuIC3=` z2(%`ipR)Od(&-Ez1@{gCjvbs$;sGC4toL28ZE60+$QqwN?8})i=$vlKx^4F6_q{YP zPD8gRbKdVg(f$4|eIz zdEOax%6R|xGuPX%NgXy=aL!`i``f>Z&tK4RT+GrdWa5Rv_{V>j*?aGEZi%c(iy45x M)78&qol`;+05T|KLI3~& 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 0000000000000000000000000000000000000000..f6e8885bd145a9505c1d503f90d0c6f2c0a0663d GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-ZiZ*z(Bi0iXW@~mYu5^qX0KXA^wEf$QYEqNg))judnErD y@CY~^S-LIvae1cUMALi)Rra7FRKkw^sCd8r6Z6+g6+?k;XYh3Ob6Mw<&;$Ug6m(Vq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cafe25392bc2680aa601cd2eee575f74dbafb52c GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-ZiX1&%978Ppr=Hj-$e_S;_`sPbf6I+SF0AP2vY&67J71;z-~9s_2_^>>qbo)t*oQe!X}8AC1-2ck`t3t+f5PX z1+Rz?J_%kygdskN`Z7_5D2k%s%Ro_7^hE`c2@WRcNo}VO)4<6&=jZ$W|NAfJXs&xx zQ)5db!!S*m&03!B&EZw?!ej0RJNz%P!EAA&{!$(ZY!hML%IK}|VBf}cr^$4{y z%)GUBp_lY#yA%^Uyb)sfisMl>!?br+Ji{DBgzZBEwwvU>jNj#0+e&gh@vM;bR8+J# zkN9ZoNO!>;88o5Ab#}1r6@@x*5HZ+_Gvo$JCCOF&D)bzh0moJ$WH8D77S)^0u`2cv z8|T|1rWlpk1mwjyl%-fJD+yv75Fij^5kXW0s0bok`#2iSxB8X5rq^Q8Taqgh;wb=> z%VoYC<*`2iLy?1m{%1YkUaV$V@`BX81@jzqX3tDllG&3O`S|@_y0g4kg8EM zY?d74l8lz*sD-y|OHl<~N<%#rOQ^CarV~(taTt@tgs!VPlw);n#tn$!nyAjT|8U`d zxr*u|gJ8da@ld^cxgsVwC}NLQ)v#L$c3qF{TDTmn56fFqi+p=GvUDFiY_&d$J%^4_x}P_T4l5V 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 e70a25007b538029537fd1fe919bcac41ccbdc00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1081 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