From 96c361bc031773346a5715b89038624ca9096de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Wed, 15 Jun 2016 13:32:54 +0200 Subject: [PATCH] Side textures for granite/diorite/andesite slabs --- TODO.txt | 1 - .../models/block/deco/slabs/andesite/bottom.json | 2 +- .../models/block/deco/slabs/andesite/double.json | 2 +- .../mmm/models/block/deco/slabs/andesite/top.json | 2 +- .../models/block/deco/slabs/diorite/bottom.json | 2 +- .../models/block/deco/slabs/diorite/double.json | 2 +- .../mmm/models/block/deco/slabs/diorite/top.json | 2 +- .../models/block/deco/slabs/granite/bottom.json | 2 +- .../models/block/deco/slabs/granite/double.json | 2 +- .../mmm/models/block/deco/slabs/granite/top.json | 2 +- .../textures/blocks/deco/slabs/andesite_side.png | Bin 0 -> 746 bytes .../textures/blocks/deco/slabs/diorite_side.png | Bin 0 -> 608 bytes .../textures/blocks/deco/slabs/granite_side.png | Bin 0 -> 473 bytes 13 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png create mode 100644 src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png diff --git a/TODO.txt b/TODO.txt index a22d2b0..34674bf 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,6 +1,5 @@ Part ASM? Description ------------------------------------------------------------------------------------------------------- -deco No Granite/diorite/andesite slab textures deco No Armchairs deco No Thrones ------------------------------------------------------------------------------------------------------- diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json index 4361a8e..0523df6 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_andesite_smooth", "top": "minecraft:blocks/stone_andesite_smooth", - "side": "minecraft:blocks/stone_andesite_smooth" + "side": "mmm:blocks/deco/slabs/andesite_side" } } diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json index 28f0d36..40ada33 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cube_column", "textures": { "end": "minecraft:blocks/stone_andesite_smooth", - "side": "minecraft:blocks/stone_andesite_smooth" + "side": "mmm:blocks/deco/slabs/andesite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json index e0c29a8..caa36db 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_andesite_smooth", "top": "minecraft:blocks/stone_andesite_smooth", - "side": "minecraft:blocks/stone_andesite_smooth" + "side": "mmm:blocks/deco/slabs/andesite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json index 8db4067..a15608f 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_diorite_smooth", "top": "minecraft:blocks/stone_diorite_smooth", - "side": "minecraft:blocks/stone_diorite_smooth" + "side": "mmm:blocks/deco/slabs/diorite_side" } } diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json index 99fba90..f0d9b78 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cube_column", "textures": { "end": "minecraft:blocks/stone_diorite_smooth", - "side": "minecraft:blocks/stone_diorite_smooth" + "side": "mmm:blocks/deco/slabs/diorite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json index 6a5e706..27f90f2 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_diorite_smooth", "top": "minecraft:blocks/stone_diorite_smooth", - "side": "minecraft:blocks/stone_diorite_smooth" + "side": "mmm:blocks/deco/slabs/diorite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json index 6cc3717..09e68b4 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_granite_smooth", "top": "minecraft:blocks/stone_granite_smooth", - "side": "minecraft:blocks/stone_granite_smooth" + "side": "mmm:blocks/deco/slabs/granite_side" } } diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json index b6fef9f..6e3ce26 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cube_column", "textures": { "end": "minecraft:blocks/stone_granite_smooth", - "side": "minecraft:blocks/stone_granite_smooth" + "side": "mmm:blocks/deco/slabs/granite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json index 89d4f73..c8856bb 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_granite_smooth", "top": "minecraft:blocks/stone_granite_smooth", - "side": "minecraft:blocks/stone_granite_smooth" + "side": "mmm:blocks/deco/slabs/granite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png new file mode 100644 index 0000000000000000000000000000000000000000..4e87b249e32e8e6ca6fba1094e3f602ad631a237 GIT binary patch literal 746 zcmVHhO4Uu+wB2sJ->Xd2+p$Gz4GJ7KNzCn_Vbdy_Z+&O{k}zOp{h#isw5(Od^9Mf z&>Ggy9ciZd_<$H^m|+-sdfFj!Aj>muZc;>quA7K4A|hy`P$+z`^v8ib&sZ)Cng%3I z4SAM;su+hENpi((c1@n=gaAruhJFGx)#ZxSYQ-?5Op_pzVV28^VLT%OCQ0dsp7m=> zUDbdhgori?)*fjOXQs0yMn#ecRaIbiyFG2&@#*Fotvh0Xn@<_qOvDf<%ZhQlr0)+{ z8_?RLl*2h;x7%axzkQ==Hni;y(TXfh>H85Sj^G7tBHjhG)=ZPddvMNE6c=o_ADG{N z`;{+W?wIA8U2`CWfKrBI*He}$N)%}_V>U}T97eKiVzOrd{`>bD6Qbkk@fDFs2nz25 z`7FgwmT9tRt#E#ih(L_Q7|8RCESvH8_=ISIy1wLa7;yfC;*7H$<)Wmn=d^9hu{#k1 zY&H!d3F8=Onmt*TV6sez@jzXBLRfG-_7rJBe>&m3qbLfjwZ!PS{d~>xYQd?ubO#H7 z={n1L-EepJm2uQ)9f`qFFDsn$c<&KW?Dt28@yy#>gNS0aDtUgfm^8g$K40?uvY{+I zMh7sOpYI!tXq3{3L{6uks$MY5GupP};bF(=C>ZYtVmu)VjJc)n8#bF3V}!b{Da#9- z3s~zQDw^g*p66s)NuKAJ@82JJe}7||9P9N9-cN)eXsv16cbxN_&u6O25TmE>Eomw^ cr}0knKRXVGw|0w85PkoyxGe6Aiy|~2ln|m&B+sOIT8oreNEOng2Bo-Y9~f%W=%OH{sYx+0p9a&k zO=3QXTH~s?IKDGs9>&FR@7z0c?m07ajpO5w=ytzhJpPS-e<&7<#W5U?aCP-d{L$zK zYPCA5)w&x)v+WcN0vsNGKrZ)5R@&a)f%t{OXYB7EpkDtXt7!(Yz8*z7ox$?5gaFZGhG(5lS3m^d;-W1{?RLivQUFRjJuSM-_&R+W?-v)n zFi6ek^Gjkjn-}Cpl;)UGt#d5jg>`RiUa-|0G_!eeoZ(?=ziL@^e2qGM|ob`dM$>d8! zqtD>=`b0t~WMO0DIXs>_n47yb>B4CAQ*1C8I)&>wGw>a));X@P|2VTSc74X|?%HzB zeJ1mM0zjI*UQZ-!Z@(7(tcA|T+FC?>wvfg+o{NM=qv;L}SM7in?&v5B%A{^>p#sd$ z--bcm4CD*!f+lLv|A1_rPU_OqeHi=$bVxg&FG!(CGnsrfHR1}WXZ`*Fmi2Hl2Rx*9 zzDBy2m+h$$R)BwJfNV`OG$|qjR#qNMg3{A*CjDl!g<`Sn)~ZyhVqw7}gJ$qcvYOOJ uo0+*GK8<^y@2-Gb)+5&s1WYL)WBvlX*d&O|x?Ir!0000;2hrG9X5fqJ9g$ z)!d^!G(nCT44o(Lri9dHm%Jb-G&5+OpHLwhW>}Fa#@TMvTgSa<&WF5wCa!8wuQV7u zH)+tU(C5n|$G1|Jde=p&9;G-Ur{LBik99t_=#Jo;MZ~&FEc?Wh`7sv1M8F&QotVb} zo4R@GdmHLo`C{|}q6^OO2(YUD_Fxe-jV`7xB#Q_JI(2ykpN#`KfzL>=rubcM)ZJI! zTJre?O<6?wnecN2-G?Z4)<==X%pe_};J*sko*d)3&>2910E$ZuqU8SoEdp@1Wla}1 P00000NkvXXu0mjf&_vdd literal 0 HcmV?d00001