From cf7f10d082d7cedd9dcfa6491aaacdf021ba59e2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 22:02:45 -0600 Subject: [PATCH] Fix the pump textures --- .../assets/botania/models/block/pump.json | 80 +++++++++--------- .../assets/botania/textures/model/pump.png | Bin 17895 -> 0 bytes .../textures/model/pump_axle_sides.png | Bin 0 -> 583 bytes .../textures/model/pump_axle_top_bottom.png | Bin 0 -> 471 bytes .../botania/textures/model/pump_end.png | Bin 0 -> 635 bytes .../botania/textures/model/pump_sheath.png | Bin 0 -> 363 bytes 6 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/model/pump.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_axle_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_end.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_sheath.png diff --git a/src/main/resources/assets/botania/models/block/pump.json b/src/main/resources/assets/botania/models/block/pump.json index aaf097f1b..23dd3429c 100644 --- a/src/main/resources/assets/botania/models/block/pump.json +++ b/src/main/resources/assets/botania/models/block/pump.json @@ -1,16 +1,22 @@ { + "textures": { + "axle_sides": "botania:model/pump_axle_sides", + "axle_top_bottom": "botania:model/pump_axle_top_bottom", + "end": "botania:model/pump_end", + "sheath": "botania:model/pump_sheath" + }, "elements": [ { "name": "EndNorth", "from": [ 4.0, 0.0, 0.0 ], "to": [ 12.0, 8.0, 1.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] } + "north": { "texture": "#end", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "south": { "texture": "#end", "uv": [ 8.0, 0.0, 16.0, 8.0 ] }, + "east": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "west": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "up": { "texture": "#end", "uv": [ 6.0, 9.0, 14.0, 10.0 ] }, + "down": { "texture": "#end", "uv": [ 6.0, 11.0, 14.0, 12.0 ] } } }, { @@ -18,12 +24,12 @@ "from": [ 4.0, 0.0, 15.0 ], "to": [ 12.0, 8.0, 16.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] } + "south": { "texture": "#end", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "north": { "texture": "#end", "uv": [ 8.0, 0.0, 16.0, 8.0 ] }, + "east": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "west": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "up": { "texture": "#end", "uv": [ 6.0, 9.0, 14.0, 10.0 ] }, + "down": { "texture": "#end", "uv": [ 6.0, 11.0, 14.0, 12.0 ] } } }, { @@ -31,12 +37,10 @@ "from": [ 6.0, 2.0, 1.0 ], "to": [ 10.0, 6.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 4.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 4.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 14.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 14.0 ] } + "east": { "texture": "#axle_sides", "uv": [ 1.0, 0.0, 15.0, 4.0 ] }, + "west": { "texture": "#axle_sides", "uv": [ 1.0, 5.0, 15.0, 9.0 ] }, + "down": { "texture": "#axle_top_bottom", "uv": [ 4.0, 1.0, 8.0, 15.0 ] }, + "up": { "texture": "#axle_top_bottom", "uv": [ 8.0, 1.0, 12.0, 15.0 ] } } }, { @@ -44,12 +48,11 @@ "from": [ 4.0, 7.0, 11.0 ], "to": [ 12.0, 8.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 2.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 5.0, 10.0, 6.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 6.0, 10.0, 7.0 ] }, + "up": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 5.0 ] }, + "down": { "texture": "#sheath", "uv": [ 7.0, 1.0, 15.0, 5.0 ] } } }, { @@ -57,12 +60,11 @@ "from": [ 4.0, 0.0, 11.0 ], "to": [ 12.0, 1.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 2.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 7.0, 10.0, 8.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 8.0, 10.0, 9.0 ] }, + "up": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 5.0 ] }, + "down": { "texture": "#sheath", "uv": [ 7.0, 1.0, 15.0, 5.0 ] } } }, { @@ -70,12 +72,9 @@ "from": [ 4.0, 1.0, 11.0 ], "to": [ 5.0, 7.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 6.0, 1.0, 7.0, 7.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] } } }, { @@ -83,12 +82,9 @@ "from": [ 11.0, 1.0, 11.0 ], "to": [ 12.0, 7.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 6.0, 1.0, 7.0, 7.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/pump.png b/src/main/resources/assets/botania/textures/model/pump.png deleted file mode 100644 index ee73d7d4a375fdeb928cb142917e1574cc7c2df5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17895 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 diff --git a/src/main/resources/assets/botania/textures/model/pump_axle_sides.png b/src/main/resources/assets/botania/textures/model/pump_axle_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..9f7dc48355fbedabe6dc564dcfaca6da1d0c4966 GIT binary patch literal 583 zcmV-N0=WH&P)wG<2Lusz3b*~v}-4ZQBNowp;&@gEFm<2 z-0~7uP~+*730x^S(%pe~@iUK~y#S@?+P|0JMn4Z8zQR$G3zyE4H!}bTfNaTD7e@v- zeX<8565{%`F?2n^v7TGzm4V7M|aZ99{rz$>eWxyZ&LpuLUKLD%` V?Q=S;sUrXY002ovPDHLkV1lb|{)GSl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png b/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f0fa8ee5ddbe8980d80b4a9a40f6e517cfff7fcb GIT binary patch literal 471 zcmV;|0Vw{7P)^3b|r~Czg&M$?y%1-(!_nko|fMU{r}vU>XNV96B@0%|5vZIZ*QAr* z^*|Jyg0Nr$mVZXXafe1bCf{W|^0?I%cE%!{faUm_#powWSdQX8t!FRTJDqxfuuChB z5QU+s0yg)8G;3lDA76R(EA-=I0$DOVe@il3P~u~9FzGG6n^u4)$6u=(r4Jh=Lc{<7 N002ovPDHLkV1m~@)QkWC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/pump_end.png b/src/main/resources/assets/botania/textures/model/pump_end.png new file mode 100644 index 0000000000000000000000000000000000000000..772dfb411e8d4df38de97c163db08c8d07f5d137 GIT binary patch literal 635 zcmV->0)+jEP)}z|y&Ev^pIQk2)acu!X^Tzp-Y9{VqYUM9}cr`S6BQ&47|qA&U1Y zpIxP7*N8_U&SZjLZ}M&LBg^M6L&?F`GRDI~CL;!&4omfU8h)8L+2^pmg-k<~I>fK~ zR8OCw+umocGDFFc$TVb{L3h`zZ@)C0FyePPmXdUsPluiLN5=BXc>W4Me|%v!SV7s6 zvg2YIn=4mWtv>)pOUf003b?xZ!1@;h`*(4Q9LH1B;p^^(8BTKZdUM^peeu|AZa+8U zv~LDUXx7#qPG6lG^tyeTC1(n_cl*z%N=8 VA1v7XiHm4Q4wrVG#DorO`N?%FTzXk7Tg?kG*LH$ z1o4N4RC-F!;W#+B(80JFpY{FnB=7sdFA)I4iyLcVpWIC`T2WUaVj-|zMtHnUDGT1N z$85#{jigU$B-wMy!Re830K`@e-xCD$J(NswVnv#3W`#sv-VrD32-||fG93>wxj|?H zfCO+nA7d?roe;f**jErOpGM$fy(ZFz)ZCmb^m)90A{(XXKIirpQh+Q&@6idW`=M4?+sRQb#`uT7|}?&M7wPUCxc literal 0 HcmV?d00001