From 6ff12aa0fe3c840967f333d84ba562aa289f441c Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 18 Jan 2017 19:39:08 -0800 Subject: [PATCH] Update Blood Tank model and texture Thanks @InsomniaKitten Need to rewrite inventory model handler because you *cannot* use GL there. --- .../models/block/BlockBloodTank.json | 204 ++++++++++++------ .../bloodmagic/textures/blocks/BloodTank.png | Bin 911 -> 1064 bytes 2 files changed, 140 insertions(+), 64 deletions(-) diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodTank.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodTank.json index 679b2ac7..3553778f 100644 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodTank.json +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodTank.json @@ -1,10 +1,12 @@ { - "__comment": "Copyright © InsomniaKitten 2016", + "__comment": "Copyright © InsomniaKitten 2017", "textures": { + "particle": "bloodmagic:blocks/BlankRune", "texture": "bloodmagic:blocks/BloodTank" }, "elements": [ { + "__comment": "Voxels-80FF00", "from": [ 3, 0, 3 ], "to": [ 13, 1, 13 ], "faces": { @@ -17,25 +19,30 @@ } }, { + "__comment": "Voxels-FF00FF", "from": [ 3, 1, 3 ], "to": [ 4, 14, 4 ], "faces": { "up": { "uv": [ 4.5, 11.5, 5, 12 ], "texture": "#texture" }, "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } + "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF0000", "from": [ 3, 1, 4 ], - "to": [ 4, 14, 5 ], + "to": [ 4, 12, 5 ], "faces": { "up": { "uv": [ 4.5, 11, 5, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" } + "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-71FFFF", "from": [ 3, 1, 5 ], "to": [ 4, 2, 11 ], "faces": { @@ -45,65 +52,73 @@ } }, { + "__comment": "Voxels-FF0000", "from": [ 3, 1, 11 ], - "to": [ 4, 14, 12 ], + "to": [ 4, 12, 12 ], "faces": { "up": { "uv": [ 4.5, 7.5, 5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" } + "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF00FF", "from": [ 3, 1, 12 ], "to": [ 4, 14, 13 ], "faces": { "up": { "uv": [ 4.5, 7, 5, 7.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 0.5, 7 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 0.5, 7 ], "texture": "#texture" } + "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FFFF00", "from": [ 3, 10, 5 ], "to": [ 4, 12, 11 ], "faces": { - "down": { "uv": [ 4.5, 8, 5, 11 ], "texture": "#texture" }, "up": { "uv": [ 4.5, 8, 5, 11.5 ], "texture": "#texture" }, "west": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" }, "east": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" } } }, { - "from": [ 3, 13, 5 ], - "to": [ 4, 14, 11 ], + "__comment": "Voxels-FF8000", + "from": [ 3, 13, 4 ], + "to": [ 4, 14, 12 ], "faces": { - "down": { "uv": [ 1, 11.5, 4, 12 ], "texture": "#texture" }, - "up": { "uv": [ 1, 7, 4, 7.5 ], "texture": "#texture" }, - "west": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 0, 7.5, 0.5, 11.5 ], "texture": "#texture" }, + "up": { "uv": [ 4.5, 7.5, 5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, + "east": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF0000", "from": [ 4, 1, 3 ], - "to": [ 5, 14, 4 ], + "to": [ 5, 12, 4 ], "faces": { "up": { "uv": [ 4, 11.5, 4.5, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" } + "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF0000", "from": [ 4, 1, 12 ], - "to": [ 5, 14, 13 ], + "to": [ 5, 12, 13 ], "faces": { "up": { "uv": [ 4, 7, 4.5, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" } + "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-3AC6FF", "from": [ 4, 11, 4 ], "to": [ 12, 12, 12 ], "faces": { @@ -116,6 +131,7 @@ } }, { + "__comment": "Voxels-71FFFF", "from": [ 5, 1, 3 ], "to": [ 11, 2, 4 ], "faces": { @@ -125,6 +141,7 @@ } }, { + "__comment": "Voxels-71FFFF", "from": [ 5, 1, 12 ], "to": [ 11, 2, 13 ], "faces": { @@ -134,6 +151,7 @@ } }, { + "__comment": "Voxels-FFFF00", "from": [ 5, 10, 3 ], "to": [ 11, 12, 4 ], "faces": { @@ -144,6 +162,7 @@ } }, { + "__comment": "Voxels-FFFF00", "from": [ 5, 10, 12 ], "to": [ 11, 12, 13 ], "faces": { @@ -154,6 +173,7 @@ } }, { + "__comment": "Voxels-FF9571", "from": [ 5, 12, 5 ], "to": [ 11, 13, 11 ], "faces": { @@ -165,16 +185,18 @@ } }, { - "from": [ 5, 13, 3 ], - "to": [ 11, 14, 4 ], + "__comment": "Voxels-FF8000", + "from": [ 4, 13, 3 ], + "to": [ 12, 14, 4 ], "faces": { - "down": { "uv": [ 1, 11.5, 4, 12 ], "texture": "#texture" }, - "up": { "uv": [ 1, 7, 4, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 0.5, 11.5, 4.5, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0.5, 7, 4.5, 7.5 ], "texture": "#texture" }, + "north": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, + "south": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-EBAAFF", "from": [ 5, 13, 6 ], "to": [ 6, 14, 10 ], "faces": { @@ -185,16 +207,18 @@ } }, { - "from": [ 5, 13, 12 ], - "to": [ 11, 14, 13 ], + "__comment": "Voxels-FF8000", + "from": [ 4, 13, 12 ], + "to": [ 12, 14, 13 ], "faces": { - "down": { "uv": [ 1, 11.5, 4, 12 ], "texture": "#texture" }, - "up": { "uv": [ 1, 7, 4, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 0.5, 11.5, 4.5, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0.5, 7, 4.5, 7.5 ], "texture": "#texture" }, + "north": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, + "south": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-EBAAFF", "from": [ 6, 13, 5 ], "to": [ 10, 14, 6 ], "faces": { @@ -205,6 +229,7 @@ } }, { + "__comment": "Voxels-5595FF", "from": [ 6, 13, 6 ], "to": [ 10, 14, 10 ], "faces": { @@ -212,6 +237,7 @@ } }, { + "__comment": "Voxels-EBAAFF", "from": [ 6, 13, 10 ], "to": [ 10, 14, 11 ], "faces": { @@ -222,6 +248,7 @@ } }, { + "__comment": "Voxels-EBAAFF", "from": [ 10, 13, 6 ], "to": [ 11, 14, 10 ], "faces": { @@ -232,45 +259,52 @@ } }, { + "__comment": "Voxels-FF0000", "from": [ 11, 1, 3 ], - "to": [ 12, 14, 4 ], + "to": [ 12, 12, 4 ], "faces": { "up": { "uv": [ 0.5, 11.5, 1, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" } + "north": { "uv": [ 0.5, 1, 1, 6.499999 ], "texture": "#texture" }, + "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF0000", "from": [ 11, 1, 12 ], - "to": [ 12, 14, 13 ], + "to": [ 12, 12, 13 ], "faces": { "up": { "uv": [ 0.5, 7, 1, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" } + "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF00FF", "from": [ 12, 1, 3 ], "to": [ 13, 14, 4 ], "faces": { "up": { "uv": [ 0, 11.5, 0.5, 12 ], "texture": "#texture" }, "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF0000", "from": [ 12, 1, 4 ], - "to": [ 13, 14, 5 ], + "to": [ 13, 12, 5 ], "faces": { "up": { "uv": [ 0, 11, 0.5, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" } + "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-71FFFF", "from": [ 12, 1, 5 ], "to": [ 13, 2, 11 ], "faces": { @@ -280,25 +314,30 @@ } }, { + "__comment": "Voxels-FF0000", "from": [ 12, 1, 11 ], - "to": [ 13, 14, 12 ], + "to": [ 13, 12, 12 ], "faces": { "up": { "uv": [ 0, 7.5, 0.5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 0, 4.5, 6.5 ], "texture": "#texture" } + "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FF00FF", "from": [ 12, 1, 12 ], "to": [ 13, 14, 13 ], "faces": { "up": { "uv": [ 0, 7, 0.5, 7.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 0.5, 7 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 0.5, 7 ], "texture": "#texture" } + "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } } }, { + "__comment": "Voxels-FFFF00", "from": [ 12, 10, 5 ], "to": [ 13, 12, 11 ], "faces": { @@ -309,13 +348,50 @@ } }, { - "from": [ 12, 13, 5 ], - "to": [ 13, 14, 11 ], + "__comment": "Voxels-FF8000", + "from": [ 12, 13, 4 ], + "to": [ 13, 14, 12 ], "faces": { - "down": { "uv": [ 1, 11.5, 4, 12 ], "texture": "#texture" }, - "up": { "uv": [ 1, 7, 4, 7.5 ], "texture": "#texture" }, - "west": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 1, 0, 4, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 4.5, 7.5, 5, 11.5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 7.5, 0.5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, + "east": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube33", + "from": [ 5, 2, 3 ], + "to": [ 11, 10, 4 ], + "faces": { + "north": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, + "south": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube33", + "from": [ 3, 2, 5 ], + "to": [ 4, 10, 11 ], + "faces": { + "west": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, + "east": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube33", + "from": [ 12, 2, 5 ], + "to": [ 13, 10, 11 ], + "faces": { + "west": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, + "east": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube33", + "from": [ 5, 2, 12 ], + "to": [ 11, 10, 13 ], + "faces": { + "north": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, + "south": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } } } ], @@ -354,4 +430,4 @@ "scale": [ 0.5, 0.5, 0.5 ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/BloodTank.png b/src/main/resources/assets/bloodmagic/textures/blocks/BloodTank.png index 7c0348df62e99a88804c7510cee39157e10b3901..053e8280aa457c0f4fc20c1c963f995dc526ff01 100644 GIT binary patch delta 1043 zcmV+u1nm2d2dD^;B!BNoL_t(oh3%HRjvQ4GhQD*`%k0iB*ek;l7>S4g*`agGa$rY< zBs_oY{GkxFJd@ishU+dlr<^t6#;_r_Tr>V2nXTsOuW%9H*zJG=EKl_a194M@L8RoL#_d zN|6{NT5Beg3EpR#re;2$le3@{7-NYs()T?%XRNi%=X12yXszkG4iRB8nQRjK48YZ^ zpRR6&7!%GpmdhnoRk63X&tfrWcXyZL<71RkSZhfsVT>WAgw`4n!5G6jlNSb%bLQpC z=V)y)M&q0##(&7k$!p%cc|+g#93Fl`+qQV`M~QOIIOj$%IcG#`d6--y?*8h!A5W z=SR843d<*li@3&zCF~3*e0U_26|~tG&G`vI5vN4FHqLgiDt$vA@61bUI}^opNw+ zK;QQp1Anlkv`WDB-~b^6y!U+3&$wJUcBVD+6lvp<=Y!|B7bhcQBC_#0&?U2V>eug$ zu_&duTse$VEK;IUiXg&=?!4w(H6rgl%Vo#)>(?a&PhHnkt|H}3-*+q)3&Kjq%!-9o1t_Hy#+Y%A zY-_rz&bn6!k;P)k+qZw=eZaYjoHL8XlD;2EBJ8Z1R>{81fKmwx(;Iu zMk$^SfnQ&~=9d>I9CtmMchm3av(MFf&6j}d3~VJqIrTngoPsQZRtl{YUIg#`ICkNT z_A-jgdbSPqBY?6@09>gYUw(X;LB z51d5-ry*jkWj33g`=|sfR{^$_1SutAjNJR-=dlT`Z#p?=c6WCPA#m%~Egn63G|Ew! zEB#;_Q#Wtkl&<$X$t$B!RhD7|f1cyI6Rz5T!KZw9+b`(T~`@(cg~ N002ovPDHLkV1hiP|3Lr% delta 888 zcmV-;1Bd*m2#*JlB!5;(L_t(oh3%G2P9#SVg};c*>=q+++XfHv9WWLWS3pRH&Ftq0 zv$2H4Az1qYBjyNRvSiDT#0}UW4IYFLKhsr}8D7wlF7Q~Q+g|ddma6|UUc7h_k+QnF zY5*bvfSHkV#>@~ALI{*nxVgE(%urPTa?ZpU5fMr$s4Art&VSF(9}jvVB0$qLsH*tk zF-Dx!!^4C5=XZB^lv0Q>(sdoGimFz^8}_gIp?a3 zs}@3-Iruc$$ap+vGMS*N^&k&oW?Wrep{ke}rIadrO6duiN6s@6D5cPK9k;i)a(sMj zr4(6PTLWM)7=N(1xM)DlHpW;<K`xNEKryBm zSQY5Hj#5fB9#EBWk~0zLF|Y1DJUldi??K&kULyB`ca1ADE8;h5XX2Xj*dbwK}`&y85iD z+}_^u%YWz3d}&)geEi68IP{VsB5ZDMx^gpYBZQHi~&JFB?YGwiedwY8|bKnUH5n*R%ha|$? zv}L!qx9b7@i8zl3qNDqCAy|LXdAMsf6g zzMK--j6bK+FAoO9sS-f_?s=B~S%I$W2qB;%oKGekTwPJj_;qQCp9TYBjKmn(zqt6v z>Cz)OHv!)TZ7C!XiWw?`iqM$RG|iJG<5#u*ePJHyD*?aD0W7D)ySH!Y%=j)w!Z$MV zEOGm;_Y28f%gEdCOV?3=A5-G{7!lxRI*^{jgY`@Byc{n@^zHWH)2AoP#iyE=Xk%jo zfP;gBYP$dBPADSm?(Wv$Ap|Cq3B%#A27lgaE`R?<