From 103efe9c7bbee75c3aef886624ace1582f24ad4e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 12:54:02 -0600 Subject: [PATCH] Destitch cocoon texmap --- .../assets/botania/blockstates/cocoon.json | 7 ++++++- .../assets/botania/models/block/cocoon.json | 14 +++++++------- .../{altar.png => altar/default/original.png} | Bin .../desert/original.png} | Bin .../forest/original.png} | Bin .../fungal/original.png} | Bin .../{altarMeta7.png => altar/mesa/original.png} | Bin .../{altarMossy.png => altar/mossy/original.png} | Bin .../mountain/original.png} | Bin .../plains/original.png} | Bin .../{altarMeta4.png => altar/swamp/original.png} | Bin .../{altarMeta6.png => altar/taiga/original.png} | Bin .../assets/botania/textures/model/cocoon.png | Bin 1435 -> 0 bytes 13 files changed, 13 insertions(+), 8 deletions(-) rename src/main/resources/assets/botania/textures/model/{altar.png => altar/default/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta5.png => altar/desert/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta0.png => altar/forest/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta3.png => altar/fungal/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta7.png => altar/mesa/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMossy.png => altar/mossy/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta2.png => altar/mountain/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta1.png => altar/plains/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta4.png => altar/swamp/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta6.png => altar/taiga/original.png} (100%) delete mode 100644 src/main/resources/assets/botania/textures/model/cocoon.png diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json index 74599fbed..7d3170d3e 100644 --- a/src/main/resources/assets/botania/blockstates/cocoon.json +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -3,7 +3,12 @@ "defaults": { "model": "botania:cocoon", "textures": { - "all": "botania:model/cocoon" + "bottom": "botania:model/cocoon_bottom", + "top": "botania:model/cocoon_top", + "north": "botania:model/cocoon_north", + "south": "botania:model/cocoon_south", + "west": "botania:model/cocoon_west", + "east": "botania:model/cocoon_east" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json index ef26fab47..470827526 100644 --- a/src/main/resources/assets/botania/models/block/cocoon.json +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -1,6 +1,6 @@ { "textures": { - "particle": "#all" + "particle": "#west" }, "elements": [ { @@ -8,12 +8,12 @@ "from": [ 3.0, 0.0, 3.0 ], "to": [ 13.0, 14.0, 13.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 1.0, 0.0, 3.5, 3.5 ] }, - "north": { "texture": "#all", "uv": [ 3.5, 0.0, 6.0, 3.5 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 0.0, 8.5, 3.5 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 0.0, 11.0, 3.5 ] }, - "up": { "texture": "#all", "uv": [ 3.5, 3.5, 6.0, 6.0 ] }, - "down": { "texture": "#all", "uv": [ 6.0, 3.5, 8.5, 6.0 ], "cullface": "down" } + "west": { "texture": "#west", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "north": { "texture": "#north", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "south": { "texture": "#south", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "east": { "texture": "#east", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "up": { "texture": "#top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, + "down": { "texture": "#bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ], "cullface": "down" } } } ] diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar/default/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar.png rename to src/main/resources/assets/botania/textures/model/altar/default/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta5.png b/src/main/resources/assets/botania/textures/model/altar/desert/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta5.png rename to src/main/resources/assets/botania/textures/model/altar/desert/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta0.png b/src/main/resources/assets/botania/textures/model/altar/forest/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta0.png rename to src/main/resources/assets/botania/textures/model/altar/forest/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta3.png b/src/main/resources/assets/botania/textures/model/altar/fungal/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta3.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta7.png b/src/main/resources/assets/botania/textures/model/altar/mesa/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta7.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMossy.png b/src/main/resources/assets/botania/textures/model/altar/mossy/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMossy.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta2.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta1.png b/src/main/resources/assets/botania/textures/model/altar/plains/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta1.png rename to src/main/resources/assets/botania/textures/model/altar/plains/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta4.png b/src/main/resources/assets/botania/textures/model/altar/swamp/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta4.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta6.png b/src/main/resources/assets/botania/textures/model/altar/taiga/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta6.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/original.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon.png b/src/main/resources/assets/botania/textures/model/cocoon.png deleted file mode 100644 index 0d13b347b0d980e65eee25705a917f36756c2fc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1435 zcmV;M1!Ve(P)(y;+bLW+bz zXamTML3tjTF^rCl=f|>?Mv~aXNziBJP62uFO8GqV-1Od70OYg!{IfB}WB_=cqBarP z^OKX)TXKN^KGbA+2VUS{&1AHqqM9qJuG+t(yA@=dLC|dQ!^!Xknl-yOWdCEH5vy zw76`~Ny)cXIxvwR(>-kik{Rp|M8vQb$M%0ME{{o)`anc*{+qAXp}ZUw1Bjw(>H0>J z0N5Fo;O;kQrF`4_^10J#69%Cz_u@09ooaEs>&xJ_8qn#q?Mt=JTVl0)Js*@B!SfVn zUpr@mXe0?*o02BTGFF?2XsvXZIax3Dwp5rTRVknEE?vYA1FJnkab}6Hd)B<9Vb5MG!AW8OvW=vOk?LPcTPvMyt8Y&dAnvZX9?LQ)!HEV) z@L>?zUKWMV3dbZcxn8JEM0WPYS+-Vk(RMJ=1^+@OyFKGKk`)NO>L|d)V{rjEV!4EwgNL`c)nB{+4_8i-8mH>zz9c@i&cv9sqp# z#n*PnsI}qr+-zyP8%0&S1-@5xJV*vk!0?eH96ui0Qf@VyOx5c|QI(4q=BdRoez+-o znK7igXA>s4Rei%@TW8QoJ z6DpO%eEiY7CB@$_4h(wZ%*+Wpi{oR*s2r}~1-Y6_OZ4yfl;?3oDTarK?Rl}<`^CT& zAiXPw<(;?Qzz+kmEG5-F`#%gqv^KUKKK$TKpzI~~lfe^UOzr_DD5eEGH?RK+~}SzIY06A%F8WmQR$04FBPy?9)G6{o`4PiE?&NL zZX-ET8JRJ5DJ