diff --git a/assets/hbm/models/barrel.obj b/assets/hbm/models/barrel.obj new file mode 100644 index 000000000..3a2fb7ec7 --- /dev/null +++ b/assets/hbm/models/barrel.obj @@ -0,0 +1,43 @@ +# Blender v2.76 (sub 0) OBJ File: 'barrel.blend' +# www.blender.org +o Cube_Cube.001 +v -0.375000 0.000000 0.375000 +v -0.375000 1.000000 0.375000 +v -0.375000 0.000000 -0.375000 +v -0.375000 1.000000 -0.375000 +v 0.375000 0.000000 0.375000 +v 0.375000 1.000000 0.375000 +v 0.375000 0.000000 -0.375000 +v 0.375000 1.000000 -0.375000 +vt 0.000000 0.750000 +vt 0.000000 0.416667 +vt 0.250000 0.416667 +vt 0.750000 0.750000 +vt 0.750000 0.416667 +vt 1.000000 0.416667 +vt 0.500000 0.750000 +vt 0.500000 0.416667 +vt 0.250000 0.750000 +vt 0.750000 1.000000 +vt 0.500000 1.000000 +vt 0.250000 1.000000 +vt 1.000000 0.750000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +s off +f 4/1/1 3/2/1 1/3/1 +f 8/4/2 7/5/2 3/6/2 +f 6/7/3 5/8/3 7/5/3 +f 2/9/4 1/3/4 5/8/4 +f 3/4/5 7/10/5 5/11/5 +f 8/7/6 4/11/6 2/12/6 +f 2/9/1 4/1/1 1/3/1 +f 4/13/2 8/4/2 3/6/2 +f 8/4/3 6/7/3 7/5/3 +f 6/7/4 2/9/4 5/8/4 +f 1/7/5 3/4/5 5/11/5 +f 6/9/6 8/7/6 2/12/6 diff --git a/assets/hbm/models/pole.obj b/assets/hbm/models/pole.obj new file mode 100644 index 000000000..abe952f60 --- /dev/null +++ b/assets/hbm/models/pole.obj @@ -0,0 +1,188 @@ +# Blender v2.76 (sub 0) OBJ File: 'pole.blend' +# www.blender.org +o Cube_Cube.001 +v -0.031250 0.875000 -0.312500 +v 0.031250 0.875000 -0.312500 +v 0.343750 0.062500 0.312500 +v 0.281250 0.062500 0.312500 +v 0.281250 0.125000 0.312500 +v 0.343750 0.125000 0.312500 +v 0.031250 0.937500 -0.312500 +v -0.031250 0.937500 -0.312500 +v -0.062500 0.000000 -0.375000 +v -0.062500 1.000000 -0.375000 +v 0.062500 0.000000 -0.375000 +v 0.062500 1.000000 -0.375000 +v -0.062500 0.000000 -0.250000 +v -0.062500 1.000000 -0.250000 +v 0.062500 0.000000 -0.250000 +v 0.062500 1.000000 -0.250000 +v 0.250000 0.000000 0.250000 +v 0.250000 1.000000 0.250000 +v 0.375000 0.000000 0.250000 +v 0.375000 1.000000 0.250000 +v 0.250000 0.000000 0.375000 +v 0.250000 1.000000 0.375000 +v 0.375000 0.000000 0.375000 +v 0.375000 1.000000 0.375000 +v -0.375000 0.000000 0.250000 +v -0.375000 1.000000 0.250000 +v -0.250000 0.000000 0.250000 +v -0.250000 1.000000 0.250000 +v -0.375000 0.000000 0.375000 +v -0.375000 1.000000 0.375000 +v -0.250000 0.000000 0.375000 +v -0.250000 1.000000 0.375000 +v -0.031250 0.875000 -0.312500 +v 0.031250 0.875000 -0.312500 +v -0.281250 0.062500 0.312500 +v -0.343750 0.062500 0.312500 +v -0.343750 0.125000 0.312500 +v -0.281250 0.125000 0.312500 +v 0.031250 0.937500 -0.312500 +v -0.031250 0.937500 -0.312500 +v -0.031250 0.062500 -0.312500 +v 0.031250 0.062500 -0.312500 +v 0.343750 0.875000 0.312500 +v 0.281250 0.875000 0.312500 +v 0.281250 0.937500 0.312500 +v 0.343750 0.937500 0.312500 +v 0.031250 0.125000 -0.312500 +v -0.031250 0.125000 -0.312500 +v -0.031250 0.062500 -0.312500 +v 0.031250 0.062500 -0.312500 +v -0.281250 0.875000 0.312500 +v -0.343750 0.875000 0.312500 +v -0.343750 0.937500 0.312500 +v -0.281250 0.937500 0.312500 +v 0.031250 0.125000 -0.312500 +v -0.031250 0.125000 -0.312500 +v 0.312500 0.125000 0.281250 +v 0.312500 0.125000 0.343750 +v -0.312500 0.937500 0.281250 +v -0.312500 0.937500 0.343750 +v 0.312500 0.062500 0.281250 +v 0.312500 0.062500 0.343750 +v -0.312500 0.875000 0.281250 +v -0.312500 0.875000 0.343750 +v -0.312500 0.125000 0.343750 +v -0.312500 0.125000 0.281250 +v 0.312500 0.937500 0.343750 +v 0.312500 0.937500 0.281250 +v -0.312500 0.062500 0.343750 +v -0.312500 0.062500 0.281250 +v 0.312500 0.875000 0.343750 +v 0.312500 0.875000 0.281250 +vt 0.937500 0.625000 +vt 0.187500 0.625000 +vt 0.187500 0.562500 +vt 0.937500 0.562500 +vt 0.125000 0.000000 +vt 0.125000 1.000000 +vt -0.000000 1.000000 +vt 0.000000 0.000000 +vt -0.000000 0.875000 +vt 0.125000 0.875000 +vn -0.894400 0.000000 -0.447200 +vn 0.894400 0.000000 0.447200 +vn 0.894400 0.000000 -0.447200 +vn -0.894400 0.000000 0.447200 +vn 0.000000 -0.609700 -0.792600 +vn 0.000000 0.609700 0.792600 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.609700 0.792600 +vn 0.000000 0.609700 -0.792600 +vn 0.792600 0.609700 0.000000 +vn -0.792600 -0.609700 0.000000 +vn 0.792600 -0.609700 0.000000 +vn -0.792600 0.609700 0.000000 +s off +f 33/1/1 36/2/1 37/3/1 +f 38/2/2 35/3/2 34/4/2 +f 6/2/3 3/3/3 2/4/3 +f 1/1/4 4/2/4 5/3/4 +f 4/3/5 1/4/5 2/1/5 +f 7/4/6 8/1/6 5/2/6 +f 13/5/7 14/6/7 10/7/7 +f 10/6/8 12/7/8 11/8/8 +f 15/5/9 16/6/9 14/7/9 +f 12/8/10 16/5/10 15/6/10 +f 9/9/11 11/10/11 15/6/11 +f 16/7/12 12/9/12 10/10/12 +f 21/5/7 22/6/7 18/7/7 +f 18/6/8 20/7/8 19/8/8 +f 23/5/9 24/6/9 22/7/9 +f 20/8/10 24/5/10 23/6/10 +f 17/9/11 19/10/11 23/6/11 +f 24/7/12 20/9/12 18/10/12 +f 29/5/7 30/6/7 26/7/7 +f 26/6/8 28/7/8 27/8/8 +f 31/5/9 32/6/9 30/7/9 +f 28/6/10 32/7/10 31/8/10 +f 25/9/11 27/10/11 31/6/11 +f 32/7/12 28/9/12 26/10/12 +f 35/2/5 36/3/5 33/4/5 +f 38/3/6 39/4/6 40/1/6 +f 56/2/1 49/3/1 52/4/1 +f 55/3/2 54/4/2 51/1/2 +f 47/3/3 46/4/3 43/1/3 +f 48/2/4 41/3/4 44/4/4 +f 44/1/13 41/2/13 42/3/13 +f 47/2/14 48/3/14 45/4/14 +f 51/4/13 52/1/13 49/2/13 +f 54/1/14 55/2/14 56/3/14 +f 57/3/15 59/4/15 60/1/15 +f 64/4/16 63/1/16 61/2/16 +f 58/3/9 60/4/9 64/1/9 +f 72/4/17 71/1/17 69/2/17 +f 57/2/8 61/3/8 63/4/8 +f 65/3/18 67/4/18 68/1/18 +f 66/3/8 68/4/8 72/1/8 +f 65/2/9 69/3/9 71/4/9 +f 40/4/1 33/1/1 37/3/1 +f 39/1/2 38/2/2 34/4/2 +f 7/1/3 6/2/3 2/4/3 +f 8/4/4 1/1/4 5/3/4 +f 3/2/5 4/3/5 2/1/5 +f 6/3/6 7/4/6 5/2/6 +f 9/8/7 13/5/7 10/7/7 +f 9/5/8 10/6/8 11/8/8 +f 13/8/9 15/5/9 14/7/9 +f 11/7/10 12/8/10 15/6/10 +f 13/7/11 9/9/11 15/6/11 +f 14/6/12 16/7/12 10/10/12 +f 17/8/7 21/5/7 18/7/7 +f 17/5/8 18/6/8 19/8/8 +f 21/8/9 23/5/9 22/7/9 +f 19/7/10 20/8/10 23/6/10 +f 21/7/11 17/9/11 23/6/11 +f 22/6/12 24/7/12 18/10/12 +f 25/8/7 29/5/7 26/7/7 +f 25/5/8 26/6/8 27/8/8 +f 29/8/9 31/5/9 30/7/9 +f 27/5/10 28/6/10 31/8/10 +f 29/7/11 25/9/11 31/6/11 +f 30/6/12 32/7/12 26/10/12 +f 34/1/5 35/2/5 33/4/5 +f 37/2/6 38/3/6 40/1/6 +f 53/1/1 56/2/1 52/4/1 +f 50/2/2 55/3/2 51/1/2 +f 42/2/3 47/3/3 43/1/3 +f 45/1/4 48/2/4 44/4/4 +f 43/4/13 44/1/13 42/3/13 +f 46/1/14 47/2/14 45/4/14 +f 50/3/13 51/4/13 49/2/13 +f 53/4/14 54/1/14 56/3/14 +f 58/2/15 57/3/15 60/1/15 +f 62/3/16 64/4/16 61/2/16 +f 62/2/9 58/3/9 64/1/9 +f 70/3/17 72/4/17 69/2/17 +f 59/1/8 57/2/8 63/4/8 +f 66/2/18 65/3/18 68/1/18 +f 70/2/8 66/3/8 72/1/8 +f 67/1/9 65/2/9 71/4/9 diff --git a/assets/hbm/models/weapons/tom_flame.hmf b/assets/hbm/models/weapons/tom_flame.hmf new file mode 100644 index 000000000..89f153fd1 --- /dev/null +++ b/assets/hbm/models/weapons/tom_flame.hmf @@ -0,0 +1,181 @@ +# Blender v2.76 (sub 0) OBJ File: 'tom_flame.blend' +# www.blender.org +o Cube.001_Cube.003 +v -0.000000 0.350000 -0.375000 +v -0.122139 0.850000 -0.511920 +v -0.408227 1.375000 -0.410095 +v -0.000000 0.000000 0.000000 +v -0.000000 0.000000 0.000000 +v 0.187913 0.850000 -0.491598 +v 0.187500 0.350000 -0.324760 +v -0.000000 0.000000 0.000000 +v 0.408537 0.850000 -0.331780 +v 0.324760 0.350000 -0.187500 +v -0.000000 0.000000 0.000000 +v 0.519693 0.850000 -0.083061 +v 0.375000 0.350000 0.000000 +v -0.000000 0.000000 0.000000 +v 0.491598 0.850000 0.187913 +v 0.324759 0.350000 0.187500 +v -0.000000 0.000000 0.000000 +v 0.331780 0.850000 0.408537 +v 0.187500 0.350000 0.324759 +v -0.000000 0.000000 0.000000 +v 0.083061 0.850000 0.519693 +v -0.000000 0.350000 0.375000 +v -0.000000 0.000000 0.000000 +v -0.187913 0.850000 0.491598 +v -0.187500 0.350000 0.324759 +v -0.000000 0.000000 0.000000 +v -0.408537 0.850000 0.331780 +v -0.324759 0.350000 0.187500 +v -0.000000 0.000000 0.000000 +v -0.519693 0.850000 0.083061 +v -0.375000 0.350000 0.000000 +v -0.000000 0.000000 0.000000 +v -0.491598 0.850000 -0.187913 +v -0.324759 0.350000 -0.187500 +v -0.000000 0.000000 0.000000 +v -0.331780 0.850000 -0.408537 +v -0.187500 0.350000 -0.324759 +v -0.083061 0.850000 -0.519693 +v 0.150184 0.850000 -0.504405 +v -0.148488 1.375000 -0.559266 +v 0.382266 0.850000 -0.361736 +v 0.151039 1.375000 -0.558583 +v 0.511920 0.850000 -0.122139 +v 0.410095 1.375000 -0.408227 +v 0.504405 0.850000 0.150184 +v 0.559266 1.375000 -0.148488 +v 0.361736 0.850000 0.382266 +v 0.558583 1.375000 0.151039 +v 0.122139 0.850000 0.511920 +v 0.408227 1.375000 0.410095 +v -0.150184 0.850000 0.504405 +v 0.148488 1.375000 0.559266 +v -0.382266 0.850000 0.361736 +v -0.151039 1.375000 0.558583 +v -0.511920 0.850000 0.122139 +v -0.410095 1.375000 0.408227 +v -0.504405 0.850000 -0.150184 +v -0.559266 1.375000 0.148488 +v -0.361736 0.850000 -0.382266 +v -0.558583 1.375000 -0.151039 +vt 0.344973 0.794896 +vt 0.376126 0.144319 +vt 0.608614 0.192283 +vt 0.616018 1.485286 +vt 0.627764 0.836593 +vt 0.627768 -0.434627 +vt 0.627767 -0.434721 +vt 0.616822 -0.434961 +vn 0.245900 -0.311400 -0.917900 +vn 0.065300 -0.066900 -0.995600 +vn 0.179800 -0.719100 -0.671200 +vn 0.671900 -0.311400 -0.671900 +vn 0.554300 -0.066900 -0.829600 +vn 0.491300 -0.719100 -0.491300 +vn 0.917900 -0.311400 -0.245900 +vn 0.894900 -0.066900 -0.441300 +vn 0.671200 -0.719100 -0.179800 +vn 0.917900 -0.311400 0.245900 +vn 0.995600 -0.066900 0.065300 +vn 0.671200 -0.719100 0.179800 +vn 0.671900 -0.311400 0.671900 +vn 0.829600 -0.066900 0.554300 +vn 0.491300 -0.719100 0.491300 +vn 0.179800 -0.719100 0.671200 +vn 0.245900 -0.311400 0.917900 +vn 0.441300 -0.066900 0.894900 +vn -0.065300 -0.066900 0.995600 +vn -0.179800 -0.719100 0.671200 +vn -0.245900 -0.311400 0.917900 +vn -0.554300 -0.066900 0.829600 +vn -0.491300 -0.719100 0.491300 +vn -0.671900 -0.311400 0.671900 +vn -0.894900 -0.066900 0.441300 +vn -0.671200 -0.719100 0.179800 +vn -0.917900 -0.311400 0.245900 +vn -0.995600 -0.066900 -0.065300 +vn -0.671200 -0.719100 -0.179800 +vn -0.917900 -0.311400 -0.245900 +vn -0.829600 -0.066900 -0.554300 +vn -0.491300 -0.719100 -0.491300 +vn -0.671900 -0.311400 -0.671900 +vn -0.245900 -0.311400 -0.917900 +vn 0.000000 0.000000 1.000000 +vn -0.441300 -0.066900 -0.894900 +vn -0.801100 -0.267800 -0.535300 +vn -0.961400 -0.267800 -0.063000 +vn -0.864100 -0.267800 0.426100 +vn -0.535300 -0.267800 0.801100 +vn -0.063000 -0.267800 0.961400 +vn 0.426100 -0.267800 0.864100 +vn 0.801100 -0.267800 0.535300 +vn 0.961400 -0.267800 0.063000 +vn -0.426100 -0.267800 -0.864100 +vn 0.063000 -0.267800 -0.961400 +vn 0.864100 -0.267800 -0.426100 +vn 0.535300 -0.267800 -0.801100 +vn -0.179800 -0.719100 -0.671200 +s off +f 39/1/1 7/2/1 1/3/1 +f 40/4/2 39/1/2 38/5/2 +f 4/6/3 1/3/3 7/2/3 +f 41/1/4 10/2/4 7/3/4 +f 42/4/5 41/1/5 6/5/5 +f 5/6/6 7/3/6 10/2/6 +f 43/1/7 13/2/7 10/3/7 +f 44/4/8 43/1/8 9/5/8 +f 8/6/9 10/3/9 13/2/9 +f 45/1/10 16/2/10 13/3/10 +f 46/4/11 45/1/11 12/5/11 +f 11/6/12 13/3/12 16/2/12 +f 47/1/13 19/2/13 16/3/13 +f 48/4/14 47/1/14 15/5/14 +f 14/6/15 16/3/15 19/2/15 +f 17/6/16 19/3/16 22/2/16 +f 49/1/17 22/2/17 19/3/17 +f 50/4/18 49/1/18 18/5/18 +f 52/4/19 51/1/19 21/5/19 +f 20/6/20 22/3/20 25/2/20 +f 51/1/21 25/2/21 22/3/21 +f 54/4/22 53/1/22 24/5/22 +f 23/7/23 25/3/23 28/2/23 +f 53/1/24 28/2/24 25/3/24 +f 56/4/25 55/1/25 27/5/25 +f 26/6/26 28/3/26 31/2/26 +f 55/1/27 31/2/27 28/3/27 +f 58/4/28 57/1/28 30/5/28 +f 29/6/29 31/3/29 34/2/29 +f 57/1/30 34/2/30 31/3/30 +f 60/4/31 59/1/31 33/5/31 +f 32/6/32 34/3/32 37/2/32 +f 59/1/33 37/2/33 34/3/33 +f 1/2/34 37/3/34 2/1/34 +f 1/2/35 4/8/35 35/6/35 +f 2/1/36 36/5/36 3/4/36 +f 33/5/37 59/1/37 34/3/37 +f 30/5/38 57/1/38 31/3/38 +f 27/5/39 55/1/39 28/3/39 +f 24/5/40 53/1/40 25/3/40 +f 21/5/41 51/1/41 22/3/41 +f 18/5/42 49/1/42 19/3/42 +f 15/5/43 47/1/43 16/3/43 +f 12/5/44 45/1/44 13/3/44 +f 37/3/45 36/5/45 2/1/45 +f 38/5/46 39/1/46 1/3/46 +f 9/5/47 43/1/47 10/3/47 +f 6/5/48 41/1/48 7/3/48 +f 5/8/35 4/6/35 7/2/35 +f 8/8/35 5/6/35 10/2/35 +f 11/8/35 8/6/35 13/2/35 +f 14/8/35 11/6/35 16/2/35 +f 17/8/35 14/6/35 19/2/35 +f 20/8/35 17/6/35 22/2/35 +f 23/8/35 20/6/35 25/2/35 +f 26/8/35 23/7/35 28/2/35 +f 29/8/35 26/6/35 31/2/35 +f 32/8/35 29/6/35 34/2/35 +f 35/8/35 32/6/35 37/2/35 +f 37/3/49 1/2/49 35/6/49 diff --git a/assets/hbm/models/weapons/tom_main.obj b/assets/hbm/models/weapons/tom_main.obj new file mode 100644 index 000000000..4acaea09c --- /dev/null +++ b/assets/hbm/models/weapons/tom_main.obj @@ -0,0 +1,335 @@ +# Blender v2.76 (sub 0) OBJ File: 'tom_main.blend' +# www.blender.org +o Cube_Cube.001 +v 0.000000 0.000000 0.000000 +v 0.000000 1.375000 -0.475000 +v 0.000000 0.850000 -0.425000 +v 0.000000 0.350000 -0.300000 +v -0.000000 1.500000 -0.403750 +v 0.000000 0.000000 0.000000 +v 0.237500 1.375000 -0.411362 +v 0.212500 0.850000 -0.368061 +v 0.150000 0.350000 -0.259808 +v 0.201875 1.500000 -0.349658 +v 0.000000 0.000000 0.000000 +v 0.411362 1.375000 -0.237500 +v 0.368061 0.850000 -0.212500 +v 0.259808 0.350000 -0.150000 +v 0.349658 1.500000 -0.201875 +v 0.000000 0.000000 0.000000 +v 0.475000 1.375000 0.000000 +v 0.425000 0.850000 0.000000 +v 0.300000 0.350000 0.000000 +v 0.403750 1.500000 0.000000 +v 0.000000 0.000000 0.000000 +v 0.411362 1.375000 0.237500 +v 0.368061 0.850000 0.212500 +v 0.259808 0.350000 0.150000 +v 0.349658 1.500000 0.201875 +v 0.000000 0.000000 0.000000 +v 0.237500 1.375000 0.411362 +v 0.212500 0.850000 0.368061 +v 0.150000 0.350000 0.259808 +v 0.201875 1.500000 0.349658 +v 0.000000 0.000000 0.000000 +v 0.000000 1.375000 0.475000 +v -0.000000 0.850000 0.425000 +v -0.000000 0.350000 0.300000 +v -0.000000 1.500000 0.403750 +v 0.000000 0.000000 0.000000 +v -0.237500 1.375000 0.411362 +v -0.212500 0.850000 0.368061 +v -0.150000 0.350000 0.259808 +v -0.201875 1.500000 0.349658 +v 0.000000 0.000000 0.000000 +v -0.411362 1.375000 0.237500 +v -0.368061 0.850000 0.212500 +v -0.259808 0.350000 0.150000 +v -0.349658 1.500000 0.201875 +v 0.000000 0.000000 0.000000 +v -0.475000 1.375000 0.000000 +v -0.425000 0.850000 -0.000000 +v -0.300000 0.350000 0.000000 +v -0.403750 1.500000 -0.000000 +v 0.000000 0.000000 0.000000 +v -0.411362 1.375000 -0.237500 +v -0.368061 0.850000 -0.212500 +v -0.259808 0.350000 -0.150000 +v -0.349658 1.500000 -0.201875 +v 0.000000 0.000000 0.000000 +v -0.237500 1.375000 -0.411362 +v -0.212500 0.850000 -0.368061 +v -0.150000 0.350000 -0.259808 +v -0.201875 1.500000 -0.349658 +v 0.000000 0.000000 0.000000 +vt 0.748923 0.582472 +vt 0.678599 0.591145 +vt 0.666472 0.543895 +vt 0.648948 0.365957 +vt 0.638489 0.191536 +vt 0.690743 0.185091 +vt 0.722974 0.356828 +vt 0.648385 0.034678 +vt 0.663796 0.592602 +vt 0.593130 0.597815 +vt 0.574564 0.371444 +vt 0.572675 0.196719 +vt 0.625181 0.192846 +vt 0.583337 0.550027 +vt 0.590254 0.040536 +vt 0.578274 0.598544 +vt 0.507438 0.600283 +vt 0.500000 0.552073 +vt 0.500000 0.373274 +vt 0.506685 0.198667 +vt 0.531906 0.043535 +vt 0.559319 0.197375 +vt 0.492563 0.600283 +vt 0.421727 0.598545 +vt 0.416664 0.550028 +vt 0.425436 0.371444 +vt 0.440680 0.197375 +vt 0.493313 0.198667 +vt 0.473482 0.043667 +vt 0.406870 0.597815 +vt 0.336205 0.592603 +vt 0.333528 0.543896 +vt 0.351051 0.365958 +vt 0.374817 0.192847 +vt 0.427324 0.196719 +vt 0.415119 0.040909 +vt 0.356964 0.035339 +vt 0.361509 0.191536 +vt 0.309256 0.185092 +vt 0.321402 0.591146 +vt 0.251077 0.582473 +vt 0.250793 0.533693 +vt 0.277025 0.356829 +vt 0.168659 0.519444 +vt 0.203537 0.344079 +vt 0.299153 0.026874 +vt 0.296029 0.183130 +vt 0.244154 0.174130 +vt 0.236364 0.580291 +vt 0.166549 0.568178 +vt 0.087323 0.501181 +vt 0.130762 0.327739 +vt 0.241826 0.015607 +vt 0.231039 0.171522 +vt 0.179669 0.159988 +vt 0.151960 0.565277 +vt 0.082824 0.549754 +vt 0.006980 0.478950 +vt 0.058877 0.307848 +vt 0.185121 0.001542 +vt 0.166697 0.156739 +vt 0.115955 0.142699 +vt 0.068395 0.546140 +vt 0.000104 0.527244 +vt 0.993020 0.478948 +vt 0.912677 0.501179 +vt 0.869237 0.327737 +vt 0.820067 0.000104 +vt 0.884044 0.142697 +vt 0.833301 0.156738 +vt 0.999896 0.527241 +vt 0.931605 0.546138 +vt 0.831341 0.519442 +vt 0.796463 0.344078 +vt 0.763426 0.014427 +vt 0.820330 0.159987 +vt 0.768960 0.171521 +vt 0.917176 0.549752 +vt 0.848040 0.565275 +vt 0.755844 0.174129 +vt 0.749207 0.533692 +vt 0.833451 0.568177 +vt 0.703970 0.183129 +vt 0.703572 0.026842 +vt 0.706158 0.025975 +vt 0.000104 0.768682 +vt 0.168294 0.600491 +vt 0.229856 0.830244 +vt 0.645760 0.035417 +vt 0.587596 0.041145 +vt 0.529221 0.044013 +vt 0.470776 0.044013 +vt 0.412402 0.041146 +vt 0.354238 0.035418 +vt 0.296426 0.026843 +vt 0.239103 0.015443 +vt 0.182410 0.001244 +vt 0.941122 0.307846 +vt 0.817588 0.001242 +vt 0.760895 0.015442 +vt 0.763637 0.580289 +vt 0.168294 0.865787 +vt 0.097209 0.865787 +vt 0.035647 0.830244 +vt 0.000104 0.697596 +vt 0.035647 0.636034 +vt 0.097209 0.600491 +vt 0.229856 0.636034 +vt 0.265399 0.697596 +vt 0.265399 0.768682 +vn 0.226700 0.482300 -0.846200 +vn 0.251600 -0.234700 -0.938900 +vn 0.257700 -0.091600 -0.961900 +vn 0.199400 -0.637700 -0.744000 +vn 0.619400 0.482300 -0.619400 +vn 0.687300 -0.234700 -0.687400 +vn 0.704100 -0.091600 -0.704100 +vn 0.544700 -0.637700 -0.544700 +vn 0.846200 0.482300 -0.226700 +vn 0.938900 -0.234700 -0.251600 +vn 0.961900 -0.091600 -0.257700 +vn 0.744000 -0.637700 -0.199400 +vn 0.846200 0.482300 0.226700 +vn 0.938900 -0.234700 0.251600 +vn 0.961900 -0.091600 0.257700 +vn 0.744000 -0.637700 0.199400 +vn 0.619400 0.482300 0.619400 +vn 0.687300 -0.234700 0.687400 +vn 0.704100 -0.091600 0.704100 +vn 0.544700 -0.637700 0.544700 +vn 0.199400 -0.637700 0.744000 +vn 0.226700 0.482300 0.846200 +vn 0.251600 -0.234700 0.938900 +vn 0.257700 -0.091600 0.961900 +vn -0.257700 -0.091600 0.961900 +vn -0.199400 -0.637700 0.744000 +vn -0.226700 0.482300 0.846200 +vn -0.251600 -0.234700 0.938900 +vn -0.704100 -0.091600 0.704100 +vn -0.544700 -0.637700 0.544700 +vn -0.619400 0.482300 0.619400 +vn -0.687300 -0.234700 0.687300 +vn -0.961900 -0.091600 0.257700 +vn -0.744000 -0.637700 0.199400 +vn -0.846200 0.482300 0.226700 +vn -0.938900 -0.234700 0.251600 +vn -0.961900 -0.091600 -0.257700 +vn -0.744000 -0.637700 -0.199400 +vn -0.846200 0.482300 -0.226700 +vn -0.938900 -0.234700 -0.251600 +vn -0.704100 -0.091600 -0.704100 +vn -0.544700 -0.637700 -0.544700 +vn -0.619400 0.482300 -0.619400 +vn -0.687300 -0.234700 -0.687300 +vn -0.251600 -0.234700 -0.938900 +vn -0.226700 0.482300 -0.846200 +vn 0.000000 0.000000 1.000000 +vn -0.257700 -0.091600 -0.961900 +vn 0.000000 1.000000 0.000000 +vn 0.687400 -0.234700 -0.687300 +vn -0.687400 -0.234700 0.687300 +vn -0.687300 -0.234700 -0.687400 +vn -0.199400 -0.637700 -0.744000 +s off +f 5/1/1 10/2/1 7/3/1 +f 8/4/2 9/5/2 4/6/2 +f 7/3/3 8/4/3 3/7/3 +f 1/8/4 4/6/4 9/5/4 +f 7/3/5 10/9/5 15/10/5 +f 13/11/6 14/12/6 9/13/6 +f 12/14/7 13/11/7 8/4/7 +f 6/15/8 9/13/8 14/12/8 +f 15/16/9 20/17/9 17/18/9 +f 13/11/10 18/19/10 19/20/10 +f 17/18/11 18/19/11 13/11/11 +f 11/21/12 14/22/12 19/20/12 +f 20/23/13 25/24/13 22/25/13 +f 23/26/14 24/27/14 19/28/14 +f 22/25/15 23/26/15 18/19/15 +f 16/29/16 19/28/16 24/27/16 +f 25/30/17 30/31/17 27/32/17 +f 28/33/18 29/34/18 24/35/18 +f 27/32/19 28/33/19 23/26/19 +f 21/36/20 24/35/20 29/34/20 +f 26/37/21 29/38/21 34/39/21 +f 30/40/22 35/41/22 32/42/22 +f 33/43/23 34/39/23 29/38/23 +f 27/32/24 32/42/24 33/43/24 +f 32/42/25 37/44/25 38/45/25 +f 31/46/26 34/47/26 39/48/26 +f 32/42/27 35/49/27 40/50/27 +f 38/45/28 39/48/28 34/47/28 +f 42/51/29 43/52/29 38/45/29 +f 36/53/30 39/54/30 44/55/30 +f 37/44/31 40/56/31 45/57/31 +f 43/52/32 44/55/32 39/54/32 +f 47/58/33 48/59/33 43/52/33 +f 41/60/34 44/61/34 49/62/34 +f 45/63/35 50/64/35 47/58/35 +f 48/59/36 49/62/36 44/61/36 +f 47/65/37 52/66/37 53/67/37 +f 46/68/38 49/69/38 54/70/38 +f 50/71/39 55/72/39 52/66/39 +f 53/67/40 54/70/40 49/69/40 +f 57/73/41 58/74/41 53/67/41 +f 51/75/42 54/76/42 59/77/42 +f 55/78/43 60/79/43 57/73/43 +f 58/74/44 59/77/44 54/76/44 +f 59/80/45 58/74/45 3/7/45 +f 2/81/46 57/73/46 60/82/46 +f 4/83/47 1/84/47 56/85/47 +f 58/74/48 57/73/48 2/81/48 +f 50/86/49 30/87/49 10/88/49 +f 2/81/1 5/1/1 7/3/1 +f 3/7/2 8/4/2 4/6/2 +f 2/81/3 7/3/3 3/7/3 +f 6/89/47 1/8/47 9/5/47 +f 12/14/5 7/3/5 15/10/5 +f 8/4/50 13/11/50 9/13/50 +f 7/3/7 12/14/7 8/4/7 +f 11/90/47 6/15/47 14/12/47 +f 12/14/9 15/16/9 17/18/9 +f 14/22/10 13/11/10 19/20/10 +f 12/14/11 17/18/11 13/11/11 +f 16/91/47 11/21/47 19/20/47 +f 17/18/13 20/23/13 22/25/13 +f 18/19/14 23/26/14 19/28/14 +f 17/18/15 22/25/15 18/19/15 +f 21/92/47 16/29/47 24/27/47 +f 22/25/17 25/30/17 27/32/17 +f 23/26/18 28/33/18 24/35/18 +f 22/25/19 27/32/19 23/26/19 +f 26/93/47 21/36/47 29/34/47 +f 31/94/47 26/37/47 34/39/47 +f 27/32/22 30/40/22 32/42/22 +f 28/33/23 33/43/23 29/38/23 +f 28/33/24 27/32/24 33/43/24 +f 33/43/25 32/42/25 38/45/25 +f 36/95/47 31/46/47 39/48/47 +f 37/44/27 32/42/27 40/50/27 +f 33/43/28 38/45/28 34/47/28 +f 37/44/29 42/51/29 38/45/29 +f 41/96/47 36/53/47 44/55/47 +f 42/51/31 37/44/31 45/57/31 +f 38/45/51 43/52/51 39/54/51 +f 42/51/33 47/58/33 43/52/33 +f 46/97/47 41/60/47 49/62/47 +f 42/51/35 45/63/35 47/58/35 +f 43/52/36 48/59/36 44/61/36 +f 48/98/37 47/65/37 53/67/37 +f 51/99/47 46/68/47 54/70/47 +f 47/65/39 50/71/39 52/66/39 +f 48/98/40 53/67/40 49/69/40 +f 52/66/41 57/73/41 53/67/41 +f 56/100/47 51/75/47 59/77/47 +f 52/66/43 55/78/43 57/73/43 +f 53/67/52 58/74/52 54/76/52 +f 4/83/45 59/80/45 3/7/45 +f 5/101/46 2/81/46 60/82/46 +f 59/80/53 4/83/53 56/85/53 +f 3/7/48 58/74/48 2/81/48 +f 10/88/49 5/102/49 60/103/49 +f 60/103/49 55/104/49 50/86/49 +f 50/86/49 45/105/49 40/106/49 +f 40/106/49 35/107/49 30/87/49 +f 30/87/49 25/108/49 20/109/49 +f 20/109/49 15/110/49 30/87/49 +f 10/88/49 60/103/49 50/86/49 +f 50/86/49 40/106/49 30/87/49 +f 30/87/49 15/110/49 10/88/49 +l 61 56 diff --git a/assets/hbm/textures/blocks/barrel_lox.png b/assets/hbm/textures/blocks/barrel_lox.png new file mode 100644 index 000000000..f37c8043c Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_lox.png differ diff --git a/assets/hbm/textures/blocks/barrel_pink.png b/assets/hbm/textures/blocks/barrel_pink.png new file mode 100644 index 000000000..72e52b51d Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_pink.png differ diff --git a/assets/hbm/textures/blocks/barrel_red.png b/assets/hbm/textures/blocks/barrel_red.png new file mode 100644 index 000000000..f933ed52c Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_red.png differ diff --git a/assets/hbm/textures/blocks/barrel_taint.png b/assets/hbm/textures/blocks/barrel_taint.png new file mode 100644 index 000000000..2e82f2cfa Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_taint.png differ diff --git a/assets/hbm/textures/blocks/barrel_vitrified.png b/assets/hbm/textures/blocks/barrel_vitrified.png new file mode 100644 index 000000000..f23690753 Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_vitrified.png differ diff --git a/assets/hbm/textures/blocks/barrel_yellow.png b/assets/hbm/textures/blocks/barrel_yellow.png new file mode 100644 index 000000000..9ec39f50b Binary files /dev/null and b/assets/hbm/textures/blocks/barrel_yellow.png differ diff --git a/assets/hbm/textures/blocks/steel_beam.png b/assets/hbm/textures/blocks/steel_beam.png index a32f0e36c..197cfc6da 100644 Binary files a/assets/hbm/textures/blocks/steel_beam.png and b/assets/hbm/textures/blocks/steel_beam.png differ diff --git a/assets/hbm/textures/blocks/tokamare.png b/assets/hbm/textures/blocks/tokamare.png new file mode 100644 index 000000000..b56b8d4d9 Binary files /dev/null and b/assets/hbm/textures/blocks/tokamare.png differ diff --git a/assets/hbm/textures/models/ModelRedBarrel.png b/assets/hbm/textures/models/ModelRedBarrel.png deleted file mode 100644 index e58dab934..000000000 Binary files a/assets/hbm/textures/models/ModelRedBarrel.png and /dev/null differ diff --git a/assets/hbm/textures/models/ModelYellowBarrel.png b/assets/hbm/textures/models/ModelYellowBarrel.png deleted file mode 100644 index 0715c0a79..000000000 Binary files a/assets/hbm/textures/models/ModelYellowBarrel.png and /dev/null differ diff --git a/assets/hbm/textures/models/chem-base.zip b/assets/hbm/textures/models/chem-base.zip deleted file mode 100644 index 9a29080db..000000000 Binary files a/assets/hbm/textures/models/chem-base.zip and /dev/null differ diff --git a/assets/hbm/textures/models/weapons/tom_flame.png b/assets/hbm/textures/models/weapons/tom_flame.png new file mode 100644 index 000000000..dad3edb68 Binary files /dev/null and b/assets/hbm/textures/models/weapons/tom_flame.png differ diff --git a/assets/hbm/textures/models/weapons/tom_main.png b/assets/hbm/textures/models/weapons/tom_main.png new file mode 100644 index 000000000..dad24a65c Binary files /dev/null and b/assets/hbm/textures/models/weapons/tom_main.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 6054510d7..9079ca469 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -214,7 +214,11 @@ public class ModBlocks { public static Block det_charge; public static Block det_nuke; public static Block red_barrel; + public static Block pink_barrel; public static Block yellow_barrel; + public static Block vitrified_barrel; + public static Block lox_barrel; + public static Block taint_barrel; public static Block crashed_balefire; public static Block rejuvinator; public static Block mine_ap; @@ -829,7 +833,7 @@ public class ModBlocks { block_meteor_treasure = new BlockOre(Material.rock).setBlockName("block_meteor_treasure").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_meteor_treasure"); tape_recorder = new DecoTapeRecorder(Material.rock).setBlockName("tape_recorder").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_tape_recorder"); - steel_poles = new DecoSteelPoles(Material.rock).setBlockName("steel_poles").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_poles"); + steel_poles = new DecoSteelPoles(Material.rock).setBlockName("steel_poles").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_beam"); pole_top = new DecoPoleTop(Material.rock).setBlockName("pole_top").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_pole_top"); pole_satellite_receiver = new DecoPoleSatelliteReceiver(Material.rock).setBlockName("pole_satellite_receiver").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_satellite_receiver"); steel_wall = new DecoBlock(Material.rock).setBlockName("steel_wall").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_wall"); @@ -851,8 +855,8 @@ public class ModBlocks { waste_trinitite_red = new BlockOre(Material.sand).setBlockName("waste_trinitite_red").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_trinitite_red"); waste_log = new WasteLog(Material.wood).setBlockName("waste_log").setStepSound(Block.soundTypeWood).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(2.5F); waste_planks = new BlockOre(Material.wood).setBlockName("waste_planks").setStepSound(Block.soundTypeWood).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_planks"); - frozen_dirt = new BlockOre(Material.wood).setBlockName("frozen_dirt").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":frozen_dirt"); - frozen_grass = new WasteEarth(Material.wood).setBlockName("frozen_grass").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F); + frozen_dirt = new BlockOre(Material.ground).setBlockName("frozen_dirt").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":frozen_dirt"); + frozen_grass = new WasteEarth(Material.ground).setBlockName("frozen_grass").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F); frozen_log = new WasteLog(Material.wood).setBlockName("frozen_log").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F); frozen_planks = new BlockOre(Material.wood).setBlockName("frozen_planks").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":frozen_planks"); @@ -897,8 +901,12 @@ public class ModBlocks { det_cord = new DetCord(Material.iron).setBlockName("det_cord").setCreativeTab(MainRegistry.nukeTab).setHardness(0.1F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":det_cord"); det_charge = new DetCord(Material.iron).setBlockName("det_charge").setCreativeTab(MainRegistry.nukeTab).setHardness(0.1F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":det_charge"); det_nuke = new DetCord(Material.iron).setBlockName("det_nuke").setCreativeTab(MainRegistry.nukeTab).setHardness(0.1F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":det_nuke"); - red_barrel = new RedBarrel(Material.iron).setBlockName("red_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F); - yellow_barrel = new YellowBarrel(Material.iron).setBlockName("yellow_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F); + red_barrel = new RedBarrel(Material.iron).setBlockName("red_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":barrel_red"); + pink_barrel = new RedBarrel(Material.iron).setBlockName("pink_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":barrel_pink"); + yellow_barrel = new YellowBarrel(Material.iron).setBlockName("yellow_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":barrel_yellow"); + vitrified_barrel = new YellowBarrel(Material.iron).setBlockName("vitrified_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":barrel_vitrified"); + lox_barrel = new RedBarrel(Material.iron).setBlockName("lox_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":barrel_lox"); + taint_barrel = new RedBarrel(Material.iron).setBlockName("taint_barrel").setCreativeTab(MainRegistry.nukeTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":barrel_taint"); crashed_balefire = new BlockCrashedBomb(Material.iron).setBlockName("crashed_bomb").setCreativeTab(MainRegistry.nukeTab).setBlockUnbreakable().setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":crashed_balefire"); rejuvinator = new BombRejuvinator(Material.iron).setBlockName("rejuvinator").setCreativeTab(MainRegistry.nukeTab).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":inserter_side"); mine_ap = new Landmine(Material.iron).setBlockName("mine_ap").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_ap"); @@ -1472,7 +1480,11 @@ public class ModBlocks { GameRegistry.registerBlock(det_charge, det_charge.getUnlocalizedName()); GameRegistry.registerBlock(det_nuke, det_nuke.getUnlocalizedName()); GameRegistry.registerBlock(red_barrel, red_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(pink_barrel, pink_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(lox_barrel, lox_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(taint_barrel, taint_barrel.getUnlocalizedName()); GameRegistry.registerBlock(yellow_barrel, yellow_barrel.getUnlocalizedName()); + GameRegistry.registerBlock(vitrified_barrel, vitrified_barrel.getUnlocalizedName()); //Siren GameRegistry.registerBlock(machine_siren, machine_siren.getUnlocalizedName()); diff --git a/com/hbm/blocks/generic/DecoSteelPoles.java b/com/hbm/blocks/generic/DecoSteelPoles.java index d1f17ef2a..1a913e540 100644 --- a/com/hbm/blocks/generic/DecoSteelPoles.java +++ b/com/hbm/blocks/generic/DecoSteelPoles.java @@ -2,6 +2,7 @@ package com.hbm.blocks.generic; import com.hbm.tileentity.deco.TileEntityDecoSteelPoles; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -10,20 +11,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -public class DecoSteelPoles extends BlockContainer { +public class DecoSteelPoles extends Block { public DecoSteelPoles(Material p_i45386_1_) { super(p_i45386_1_); } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityDecoSteelPoles(); - } @Override public int getRenderType(){ - return -1; + return 334079; } @Override diff --git a/com/hbm/blocks/generic/RedBarrel.java b/com/hbm/blocks/generic/RedBarrel.java index f70559265..e2f60c7c6 100644 --- a/com/hbm/blocks/generic/RedBarrel.java +++ b/com/hbm/blocks/generic/RedBarrel.java @@ -1,5 +1,10 @@ package com.hbm.blocks.generic; +import java.util.Random; + +import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.bomb.BlockTaint; +import com.hbm.explosion.ExplosionThermo; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityRedBarrel; @@ -17,7 +22,7 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class RedBarrel extends BlockContainer { +public class RedBarrel extends Block { public RedBarrel(Material p_i45394_1_) { super(p_i45394_1_); @@ -35,7 +40,7 @@ public class RedBarrel extends BlockContainer { @Override public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_) { - if (p_149695_1_.getBlock(x + 1, y, z) == Blocks.fire || p_149695_1_.getBlock(x - 1, y, z) == Blocks.fire || p_149695_1_.getBlock(x, y + 1, z) == Blocks.fire || p_149695_1_.getBlock(x, y - 1, z) == Blocks.fire || p_149695_1_.getBlock(x, y, z + 1) == Blocks.fire || p_149695_1_.getBlock(x, y, z - 1) == Blocks.fire) + if ((this == ModBlocks.red_barrel || this == ModBlocks.pink_barrel) && p_149695_1_.getBlock(x + 1, y, z) == Blocks.fire || p_149695_1_.getBlock(x - 1, y, z) == Blocks.fire || p_149695_1_.getBlock(x, y + 1, z) == Blocks.fire || p_149695_1_.getBlock(x, y - 1, z) == Blocks.fire || p_149695_1_.getBlock(x, y, z + 1) == Blocks.fire || p_149695_1_.getBlock(x, y, z - 1) == Blocks.fire) { if(!p_149695_1_.isRemote) explode(p_149695_1_, x, y, z); @@ -44,12 +49,35 @@ public class RedBarrel extends BlockContainer { public void explode(World p_149695_1_, int x, int y, int z) { - p_149695_1_.newExplosion((Entity)null, x + 0.5F, y + 0.5F, z + 0.5F, 2.5F, true, true); + if(this == ModBlocks.red_barrel || this == ModBlocks.pink_barrel) + p_149695_1_.newExplosion((Entity)null, x + 0.5F, y + 0.5F, z + 0.5F, 2.5F, true, true); + + if(this == ModBlocks.lox_barrel) { + + p_149695_1_.newExplosion(null, x + 0.5F, y + 0.5F, z + 0.5F, 1F, false, false); + + ExplosionThermo.freeze(p_149695_1_, x, y, z, 7); + } + + if(this == ModBlocks.taint_barrel) { + + p_149695_1_.newExplosion(null, x + 0.5F, y + 0.5F, z + 0.5F, 1F, false, false); + + Random rand = p_149695_1_.rand; + for(int i = 0; i < 100; i++) { + int a = rand.nextInt(9) - 4 + x; + int b = rand.nextInt(9) - 4 + y; + int c = rand.nextInt(9) - 4 + z; + if(p_149695_1_.getBlock(a, b, c).isReplaceable(p_149695_1_, a, b, c) && BlockTaint.hasPosNeightbour(p_149695_1_, a, b, c)) { + p_149695_1_.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); + } + } + } } @Override public int getRenderType(){ - return -1; + return 334081; } @Override @@ -62,18 +90,6 @@ public class RedBarrel extends BlockContainer { return false; } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileEntityRedBarrel(); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconregister) { - this.blockIcon = iconregister.registerIcon(RefStrings.MODID + ":red_barrel"); - } - @Override public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { diff --git a/com/hbm/blocks/generic/YellowBarrel.java b/com/hbm/blocks/generic/YellowBarrel.java index 438d3285b..aaf037265 100644 --- a/com/hbm/blocks/generic/YellowBarrel.java +++ b/com/hbm/blocks/generic/YellowBarrel.java @@ -10,6 +10,7 @@ import com.hbm.tileentity.deco.TileEntityYellowBarrel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +20,7 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class YellowBarrel extends BlockContainer { +public class YellowBarrel extends Block { Random rand = new Random(); @@ -27,15 +28,10 @@ public class YellowBarrel extends BlockContainer { super(p_i45386_1_); } - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityYellowBarrel(); - } - @Override public void onBlockDestroyedByExplosion(World p_149723_1_, int p_149723_2_, int p_149723_3_, int p_149723_4_, Explosion p_149723_5_) { - if (!p_149723_1_.isRemote) + if (!p_149723_1_.isRemote && this == ModBlocks.yellow_barrel) { explode(p_149723_1_, p_149723_2_, p_149723_3_, p_149723_4_); } @@ -54,7 +50,7 @@ public class YellowBarrel extends BlockContainer { @Override public int getRenderType(){ - return -1; + return 334081; } @Override @@ -67,12 +63,6 @@ public class YellowBarrel extends BlockContainer { return false; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconregister) { - this.blockIcon = iconregister.registerIcon(RefStrings.MODID + ":yellow_barrel"); - } - @Override public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { @@ -99,7 +89,7 @@ public class YellowBarrel extends BlockContainer { { super.randomDisplayTick(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_, p_149734_5_); - p_149734_1_.spawnParticle("townaura", p_149734_2_ + p_149734_5_.nextFloat(), p_149734_3_ + 1.1F, p_149734_4_ + p_149734_5_.nextFloat(), 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("townaura", p_149734_2_ + p_149734_5_.nextFloat() * 0.5F + 0.25F, p_149734_3_ + 1.1F, p_149734_4_ + p_149734_5_.nextFloat() * 0.5F + 0.25F, 0.0D, 0.0D, 0.0D); } @Override diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 79aa8d4c9..dc77f9004 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -53,6 +53,7 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerBlockHandler(new RenderScaffoldBlock()); RenderingRegistry.registerBlockHandler(new RenderTapeBlock()); RenderingRegistry.registerBlockHandler(new RenderSteelBeam()); + RenderingRegistry.registerBlockHandler(new RenderBarrel()); MinecraftForgeClient.registerItemRenderer(ModItems.assembly_template, new ItemRenderTemplate()); MinecraftForgeClient.registerItemRenderer(ModItems.chemistry_template, new ItemRenderTemplate()); @@ -206,8 +207,8 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityRagingVortex.class, new RenderBlackHole()); RenderingRegistry.registerEntityRenderingHandler(EntityDeathBlast.class, new RenderDeathBlast()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles()); + //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder()); + //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleTop.class, new RenderPoleTop()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleSatelliteReceiver.class, new RenderPoleSatelliteReceiver()); @@ -314,9 +315,6 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukePrototype.class, new RenderNukePrototype()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRedBarrel.class, new RenderRedBarrel()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityYellowBarrel.class, new RenderYellowBarrel()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaunchPad.class, new RenderLaunchPadTier1()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMissileAssembly.class, new RenderMissileAssembly()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompactLauncher.class, new RenderCompactLauncher()); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 91cc3ee1d..1f5a25d51 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1355,6 +1355,8 @@ public class MainRegistry FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), FluidType.BIOGAS, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), FluidType.KEROSENE, 10000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), FluidType.OXYGEN, 10000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), FluidType.DEUTERIUM, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), FluidType.TRITIUM, 1000)); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 816af46db..a9b785eee 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -300,6 +300,8 @@ public class ResourceManager { public static final IModelCustom boxcar = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/boxcar.obj")); public static final IModelCustom duchessgambit = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/duchessgambit.obj")); public static final IModelCustom rpc = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rpc.obj")); + public static final IModelCustom tom_main = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/tom_main.obj")); + public static final IModelCustom tom_flame = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/tom_flame.hmf")); //Bomber public static final IModelCustom dornier = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/dornier.obj")); @@ -392,6 +394,8 @@ public class ResourceManager { public static final ResourceLocation boxcar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/boxcar.png"); public static final ResourceLocation duchessgambit_tex = new ResourceLocation(RefStrings.MODID, "textures/models/duchessgambit.png"); public static final ResourceLocation rpc_tex = new ResourceLocation(RefStrings.MODID, "textures/models/rpc.png"); + public static final ResourceLocation tom_main_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/tom_main.png"); + public static final ResourceLocation tom_flame_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/tom_flame.png"); //Bomber public static final ResourceLocation dornier_0_tex = new ResourceLocation(RefStrings.MODID, "textures/models/dornier_0.png"); @@ -588,5 +592,7 @@ public class ResourceManager { public static final IModelCustom scaffold = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/scaffold.obj")); public static final IModelCustom taperecorder = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/taperecorder.obj")); public static final IModelCustom beam = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/beam.obj")); + public static final IModelCustom barrel = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/barrel.obj")); + public static final IModelCustom pole = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/pole.obj")); } diff --git a/com/hbm/render/block/RenderBarrel.java b/com/hbm/render/block/RenderBarrel.java new file mode 100644 index 000000000..422348b8f --- /dev/null +++ b/com/hbm/render/block/RenderBarrel.java @@ -0,0 +1,68 @@ +package com.hbm.render.block; + +import org.lwjgl.opengl.GL11; + +import com.hbm.main.ResourceManager; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.obj.WavefrontObject; + +public class RenderBarrel implements ISimpleBlockRenderingHandler { + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + + GL11.glPushMatrix(); + Tessellator tessellator = Tessellator.instance; + IIcon iicon = block.getIcon(0, 0); + tessellator.setColorOpaque_F(1, 1, 1); + + if (renderer.hasOverrideBlockTexture()) + { + iicon = renderer.overrideBlockTexture; + } + + GL11.glTranslated(0, -0.5, 0); + tessellator.startDrawingQuads(); + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, false); + tessellator.draw(); + + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + + Tessellator tessellator = Tessellator.instance; + IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); + + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); + tessellator.setColorOpaque_F(1, 1, 1); + + if (renderer.hasOverrideBlockTexture()) + { + iicon = renderer.overrideBlockTexture; + } + + tessellator.addTranslation(x + 0.5F, y, z + 0.5F); + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, true); + tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); + + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return 334081; + } +} diff --git a/com/hbm/render/block/RenderTapeBlock.java b/com/hbm/render/block/RenderTapeBlock.java index 0059f56b1..f00576c58 100644 --- a/com/hbm/render/block/RenderTapeBlock.java +++ b/com/hbm/render/block/RenderTapeBlock.java @@ -2,6 +2,7 @@ package com.hbm.render.block; import org.lwjgl.opengl.GL11; +import com.hbm.blocks.ModBlocks; import com.hbm.main.ResourceManager; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -29,7 +30,10 @@ public class RenderTapeBlock implements ISimpleBlockRenderingHandler { GL11.glTranslated(0, -0.5, 0); tessellator.startDrawingQuads(); - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, 0, false); + if(block == ModBlocks.tape_recorder) + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, 0, false); + if(block == ModBlocks.steel_poles) + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.pole, iicon, tessellator, 0, false); tessellator.draw(); GL11.glPopMatrix(); @@ -61,7 +65,10 @@ public class RenderTapeBlock implements ISimpleBlockRenderingHandler { rotation = 180F / 180F * (float)Math.PI; tessellator.addTranslation(x + 0.5F, y, z + 0.5F); - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, rotation, true); + if(block == ModBlocks.tape_recorder) + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, rotation, true); + if(block == ModBlocks.steel_poles) + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.pole, iicon, tessellator, rotation - 90F / 180F * (float)Math.PI, true); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); return true; diff --git a/com/hbm/render/misc/TomPronter.java b/com/hbm/render/misc/TomPronter.java new file mode 100644 index 000000000..a2e003d08 --- /dev/null +++ b/com/hbm/render/misc/TomPronter.java @@ -0,0 +1,64 @@ +package com.hbm.render.misc; + +import java.util.Random; + +import org.lwjgl.opengl.GL11; + +import com.hbm.main.ResourceManager; +import com.hbm.render.util.HmfController; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureManager; + +public class TomPronter { + + + public static void prontTom() { + GL11.glPushMatrix(); + + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glScalef(100F, 100F, 100F); + + TextureManager tex = Minecraft.getMinecraft().getTextureManager(); + + tex.bindTexture(ResourceManager.tom_main_tex); + ResourceManager.tom_main.renderAll(); + + HmfController.setMod(50000D, 2500D); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glDisable(GL11.GL_ALPHA_TEST); + + float rot = -System.currentTimeMillis() / 10 % 360; + //GL11.glScalef(1.2F, 2F, 1.2F); + GL11.glScalef(0.8F, 5F, 0.8F); + + Random rand = new Random(0); + + for(int i = 0; i < 20/*10*/; i++) { + tex.bindTexture(ResourceManager.tom_flame_tex); + + int r = rand.nextInt(90); + + GL11.glRotatef(rot + r, 0, 1, 0); + + ResourceManager.tom_flame.renderAll(); + + GL11.glRotatef(rot, 0, -1, 0); + + GL11.glScalef(-1.015F, 0.9F, 1.015F); + } + + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_LIGHTING); + HmfController.resetMod(); + + GL11.glPopMatrix(); + } + +} diff --git a/com/hbm/render/tileentity/RendererObjTester.java b/com/hbm/render/tileentity/RendererObjTester.java index f55955b1a..607817a97 100644 --- a/com/hbm/render/tileentity/RendererObjTester.java +++ b/com/hbm/render/tileentity/RendererObjTester.java @@ -7,6 +7,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.render.misc.SoyuzPronter; +import com.hbm.render.misc.TomPronter; import com.hbm.render.model.ModelCalBarrel; import com.hbm.render.model.ModelCalDualStock; import com.hbm.render.model.ModelCalStock; @@ -110,7 +111,8 @@ public class RendererObjTester extends TileEntitySpecialRenderer { bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/ModelCalStock.png"));*/ //stock.renderAll(1F/16F); - SoyuzPronter.prontSoyuz(); + //SoyuzPronter.prontSoyuz(); + TomPronter.prontTom(); GL11.glPopMatrix(); } diff --git a/com/hbm/tileentity/deco/TileEntityObjTester.java b/com/hbm/tileentity/deco/TileEntityObjTester.java index b2520873e..3c1cb0f6f 100644 --- a/com/hbm/tileentity/deco/TileEntityObjTester.java +++ b/com/hbm/tileentity/deco/TileEntityObjTester.java @@ -1,5 +1,7 @@ package com.hbm.tileentity.deco; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -20,4 +22,11 @@ public class TileEntityObjTester extends TileEntity { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } }