From 7fd60ae2e6d128d02b846cc34838de470e41779d Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 21 Apr 2019 13:32:26 +0200 Subject: [PATCH] more missile parts --- .../models/missile_parts/mp_s_10_cruise.obj | 348 +++++++++++++++++ .../models/missile_parts/mp_t_10_solid.obj | 368 ++++++++++++++++++ .../missile_parts/mp_w_10_incendiary.obj | 219 +++++++++++ .../models/missile_parts/mp_f_10_solid.png | Bin 0 -> 1355 bytes .../models/missile_parts/mp_s_10_cruise.png | Bin 0 -> 320 bytes .../models/missile_parts/mp_t_10_kerosene.png | Bin 772 -> 813 bytes .../models/missile_parts/mp_t_10_solid.png | Bin 0 -> 786 bytes .../missile_parts/mp_w_10_incendiary.png | Bin 0 -> 746 bytes com/hbm/blocks/test/TestEventTester.java | 5 +- com/hbm/items/ModItems.java | 109 +++--- com/hbm/main/MainRegistry.java | 18 +- com/hbm/main/ResourceManager.java | 7 + .../render/item/ItemRenderMissilePart.java | 3 +- com/hbm/render/misc/MissilePart.java | 38 +- 14 files changed, 1048 insertions(+), 67 deletions(-) create mode 100644 assets/hbm/models/missile_parts/mp_s_10_cruise.obj create mode 100644 assets/hbm/models/missile_parts/mp_t_10_solid.obj create mode 100644 assets/hbm/models/missile_parts/mp_w_10_incendiary.obj create mode 100644 assets/hbm/textures/models/missile_parts/mp_f_10_solid.png create mode 100644 assets/hbm/textures/models/missile_parts/mp_s_10_cruise.png create mode 100644 assets/hbm/textures/models/missile_parts/mp_t_10_solid.png create mode 100644 assets/hbm/textures/models/missile_parts/mp_w_10_incendiary.png diff --git a/assets/hbm/models/missile_parts/mp_s_10_cruise.obj b/assets/hbm/models/missile_parts/mp_s_10_cruise.obj new file mode 100644 index 000000000..a28eac8f4 --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_s_10_cruise.obj @@ -0,0 +1,348 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_s_10_c.blend' +# www.blender.org +o Cube +v 0.031250 0.500000 -1.000000 +v 0.031250 0.500000 1.000000 +v -0.031250 0.500000 1.000000 +v -0.031250 0.500000 -1.000000 +v -1.000000 0.687500 0.031250 +v 1.000000 0.687500 0.031250 +v 1.000000 0.687500 -0.031250 +v -1.000000 0.687500 -0.031250 +v -1.000000 0.500000 -0.031250 +v 1.000000 0.500000 -0.031250 +v 1.000000 0.500000 0.031250 +v -1.000000 0.500000 0.031250 +v -0.031250 0.687500 -1.000000 +v -0.031250 0.687500 1.000000 +v 0.031250 0.687500 1.000000 +v 0.031250 0.687500 -1.000000 +v 0.031250 0.500000 -0.500000 +v 0.031250 0.500000 0.500000 +v -0.031250 0.500000 0.500000 +v -0.031250 0.500000 -0.500000 +v -0.500000 0.500000 -0.031250 +v 0.500000 0.500000 -0.031250 +v 0.500000 0.500000 0.031250 +v -0.500000 0.500000 0.031250 +v -0.500000 1.000000 0.031250 +v 0.500000 1.000000 0.031250 +v 0.500000 1.000000 -0.031250 +v -0.500000 1.000000 -0.031250 +v -0.031250 1.000000 -0.500000 +v -0.031250 1.000000 0.500000 +v 0.031250 1.000000 0.500000 +v 0.031250 1.000000 -0.500000 +v 0.031250 0.750000 -0.750000 +v 0.031250 0.750000 0.750000 +v -0.031250 0.750000 0.750000 +v -0.031250 0.750000 -0.750000 +v -0.750000 0.750000 -0.031250 +v 0.750000 0.750000 -0.031250 +v 0.750000 0.750000 0.031250 +v -0.750000 0.750000 0.031250 +v 0.031250 3.250000 -0.750000 +v 0.031250 3.250000 0.750000 +v -0.031250 3.250000 0.750000 +v -0.031250 3.250000 -0.750000 +v -0.750000 3.250000 -0.031250 +v 0.750000 3.250000 -0.031250 +v 0.750000 3.250000 0.031250 +v -0.750000 3.250000 0.031250 +v 0.031250 3.250000 -0.500000 +v 0.031250 3.250000 0.500000 +v -0.031250 3.250000 0.500000 +v -0.031250 3.250000 -0.500000 +v -0.500000 3.250000 -0.031250 +v 0.500000 3.250000 -0.031250 +v 0.500000 3.250000 0.031250 +v -0.500000 3.250000 0.031250 +v -0.500000 3.750000 0.031250 +v 0.500000 3.750000 0.031250 +v 0.500000 3.750000 -0.031250 +v -0.500000 3.750000 -0.031250 +v -0.031250 3.750000 -0.500000 +v -0.031250 3.750000 0.500000 +v 0.031250 3.750000 0.500000 +v 0.031250 3.750000 -0.500000 +v 0.031250 3.500000 -0.750000 +v 0.031250 3.500000 0.750000 +v -0.031250 3.500000 0.750000 +v -0.031250 3.500000 -0.750000 +v -0.750000 3.500000 -0.031250 +v 0.750000 3.500000 -0.031250 +v 0.750000 3.500000 0.031250 +v -0.750000 3.500000 0.031250 +v -0.031249 0.500000 0.437500 +v -0.031249 1.000000 0.437500 +v 0.031251 1.000000 0.437500 +v 0.031251 0.500000 0.437500 +v 0.437500 0.500000 0.031249 +v 0.437500 1.000000 0.031249 +v 0.437500 1.000000 -0.031251 +v 0.437500 0.500000 -0.031251 +v -0.437500 0.500000 0.031250 +v -0.437500 0.500000 -0.031250 +v -0.437500 1.000000 -0.031250 +v -0.437500 1.000000 0.031250 +v -0.031250 0.500000 -0.437500 +v 0.031250 0.500000 -0.437500 +v 0.031250 1.000000 -0.437500 +v -0.031250 1.000000 -0.437500 +v -0.031249 3.250000 0.437500 +v -0.031249 3.750000 0.437500 +v 0.031251 3.750000 0.437500 +v 0.031251 3.250000 0.437500 +v 0.437500 3.250000 0.031249 +v 0.437500 3.750000 0.031249 +v 0.437500 3.750000 -0.031251 +v 0.437500 3.250000 -0.031251 +v -0.437500 3.250000 0.031250 +v -0.437500 3.250000 -0.031250 +v -0.437500 3.750000 -0.031250 +v -0.437500 3.750000 0.031250 +v -0.031250 3.250000 -0.437500 +v 0.031250 3.250000 -0.437500 +v 0.031250 3.750000 -0.437500 +v -0.031250 3.750000 -0.437500 +vt 1.000000 0.000000 +vt 1.000000 0.363636 +vt 0.954545 0.363636 +vt 0.045455 0.000000 +vt 0.045455 0.136364 +vt 0.000000 0.136364 +vt 0.000000 0.000000 +vt 0.954545 0.181818 +vt 0.909091 0.181818 +vt 0.909091 -0.000000 +vt 0.954545 0.409091 +vt 0.909091 0.409091 +vt 0.954545 -0.000000 +vt 0.409091 0.000000 +vt 0.227273 0.181818 +vt 0.409091 0.363636 +vt 0.727273 0.181818 +vt 0.545455 0.000000 +vt 0.545455 0.363636 +vt 0.590909 0.454545 +vt 0.590909 0.636364 +vt 0.545455 0.636364 +vt 0.636364 0.727273 +vt 0.590909 0.727273 +vt 0.636364 0.454545 +vt 0.045455 0.454545 +vt 0.045455 0.636364 +vt -0.000000 0.636364 +vt -0.000000 0.454545 +vt 0.363636 0.454545 +vt 0.545455 0.454545 +vt 0.227273 0.454545 +vt 0.227273 0.818182 +vt 0.500000 0.363636 +vt 0.454545 0.363636 +vt 0.454545 0.000000 +vt 0.500000 0.000000 +vt 0.954545 0.454545 +vt 0.909091 0.454545 +vt 1.000000 0.409091 +vt 0.318182 0.818182 +vt 0.272727 0.818182 +vt 0.272727 0.454545 +vt 0.318182 0.454545 +vt 0.636364 0.772727 +vt 0.590909 0.772727 +vt 0.590909 0.681818 +vt 0.545455 0.681818 +vt 0.909091 0.136364 +vt 0.363636 0.818182 +vn 0.000000 -1.000000 0.000000 +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.242500 0.970100 0.000000 +vn -0.707100 0.707100 -0.000000 +vn -0.000000 0.970100 0.242500 +vn -0.000000 0.707100 0.707100 +vn 0.242500 0.970100 0.000000 +vn 0.707100 0.707100 0.000000 +vn 0.000000 0.970100 -0.242500 +vn 0.000000 0.707100 -0.707100 +vn 0.000000 1.000000 0.000000 +s off +f 1/1/1 17/2/1 20/3/1 +f 9/1/1 21/2/1 24/3/1 +f 11/1/1 23/2/1 22/3/1 +f 3/1/1 19/2/1 18/3/1 +f 10/4/2 7/5/2 6/6/2 +f 13/5/3 16/6/3 1/7/3 +f 5/5/4 8/6/4 9/7/4 +f 2/4/5 15/5/5 14/6/5 +f 40/8/6 37/9/6 8/10/6 +f 25/11/7 28/12/7 37/9/7 +f 14/10/8 15/13/8 34/8/8 +f 35/9/9 34/8/9 31/11/9 +f 6/10/10 7/13/10 38/8/10 +f 39/9/11 38/8/11 27/11/11 +f 36/8/12 33/9/12 16/10/12 +f 29/11/13 32/12/13 33/9/13 +f 4/4/4 20/14/4 36/15/4 +f 29/16/4 36/15/4 20/14/4 +f 37/17/3 21/18/3 9/10/3 +f 28/19/3 21/18/3 37/17/3 +f 10/4/3 22/14/3 38/15/3 +f 27/16/3 38/15/3 22/14/3 +f 35/17/4 19/18/4 3/10/4 +f 30/19/4 19/18/4 35/17/4 +f 12/4/5 24/14/5 40/15/5 +f 25/16/5 40/15/5 24/14/5 +f 2/4/2 18/14/2 34/15/2 +f 31/16/2 34/15/2 18/14/2 +f 39/17/5 23/18/5 11/10/5 +f 26/19/5 23/18/5 39/17/5 +f 33/17/2 17/18/2 1/10/2 +f 32/19/2 17/18/2 33/17/2 +f 41/20/1 49/21/1 52/22/1 +f 45/20/1 53/21/1 56/22/1 +f 47/20/1 55/21/1 54/22/1 +f 43/20/1 51/21/1 50/22/1 +f 57/23/7 60/24/7 69/20/7 +f 67/20/9 66/25/9 63/23/9 +f 42/26/5 66/27/5 67/28/5 +f 71/20/11 70/25/11 59/23/11 +f 61/23/13 64/24/13 65/20/13 +f 69/28/4 45/29/4 48/26/4 +f 53/30/3 45/31/3 69/22/3 +f 56/32/5 57/33/5 72/27/5 +f 66/27/2 42/26/2 50/32/2 +f 51/30/4 43/31/4 67/22/4 +f 47/29/2 46/26/2 70/27/2 +f 55/30/5 47/31/5 71/22/5 +f 70/27/3 46/26/3 54/32/3 +f 52/32/4 61/33/4 68/27/4 +f 49/30/2 41/31/2 65/22/2 +f 68/27/3 65/28/3 41/29/3 +f 74/34/3 75/35/3 76/36/3 +f 74/34/4 73/37/4 19/18/4 +f 75/38/14 74/39/14 30/12/14 +f 76/36/2 75/35/2 31/16/2 +f 73/40/1 76/11/1 18/3/1 +f 78/34/4 79/35/4 80/36/4 +f 78/34/5 77/37/5 23/18/5 +f 79/38/14 78/39/14 26/12/14 +f 80/36/3 79/35/3 27/16/3 +f 77/40/1 80/11/1 22/3/1 +f 82/37/2 83/34/2 84/35/2 +f 82/40/1 81/11/1 24/3/1 +f 83/34/3 82/37/3 21/18/3 +f 84/38/14 83/39/14 28/12/14 +f 81/36/5 84/35/5 25/16/5 +f 86/37/5 87/34/5 88/35/5 +f 86/40/1 85/11/1 20/3/1 +f 87/34/2 86/37/2 17/18/2 +f 88/38/14 87/39/14 32/12/14 +f 85/36/4 88/35/4 29/16/4 +f 90/41/3 91/42/3 92/43/3 +f 90/41/4 89/44/4 51/30/4 +f 91/45/14 90/46/14 62/24/14 +f 92/43/2 91/42/2 63/33/2 +f 89/47/1 92/48/1 50/22/1 +f 94/41/4 95/42/4 96/43/4 +f 94/41/5 93/44/5 55/30/5 +f 95/45/14 94/46/14 58/24/14 +f 96/43/3 95/42/3 59/33/3 +f 93/47/1 96/48/1 54/22/1 +f 98/44/2 99/41/2 100/42/2 +f 98/47/1 97/48/1 56/22/1 +f 99/41/3 98/44/3 53/30/3 +f 100/45/14 99/46/14 60/24/14 +f 97/43/5 100/42/5 57/33/5 +f 102/44/5 103/41/5 104/42/5 +f 102/47/1 101/48/1 52/22/1 +f 103/41/2 102/44/2 49/30/2 +f 104/45/14 103/46/14 64/24/14 +f 101/43/4 104/42/4 61/33/4 +f 4/13/1 1/1/1 20/3/1 +f 12/13/1 9/1/1 24/3/1 +f 10/13/1 11/1/1 22/3/1 +f 2/13/1 3/1/1 18/3/1 +f 11/7/2 10/4/2 6/6/2 +f 4/4/3 13/5/3 1/7/3 +f 12/4/4 5/5/4 9/7/4 +f 3/7/5 2/4/5 14/6/5 +f 5/13/6 40/8/6 8/10/6 +f 40/8/7 25/11/7 37/9/7 +f 35/9/8 14/10/8 34/8/8 +f 30/12/9 35/9/9 31/11/9 +f 39/9/10 6/10/10 38/8/10 +f 26/12/11 39/9/11 27/11/11 +f 13/13/12 36/8/12 16/10/12 +f 36/8/13 29/11/13 33/9/13 +f 13/5/4 4/4/4 36/15/4 +f 8/49/3 37/17/3 9/10/3 +f 7/5/3 10/4/3 38/15/3 +f 14/49/4 35/17/4 3/10/4 +f 5/5/5 12/4/5 40/15/5 +f 15/5/2 2/4/2 34/15/2 +f 6/49/5 39/17/5 11/10/5 +f 16/49/2 33/17/2 1/10/2 +f 44/31/1 41/20/1 52/22/1 +f 48/31/1 45/20/1 56/22/1 +f 46/31/1 47/20/1 54/22/1 +f 42/31/1 43/20/1 50/22/1 +f 72/25/7 57/23/7 69/20/7 +f 62/24/9 67/20/9 63/23/9 +f 43/29/5 42/26/5 67/28/5 +f 58/24/11 71/20/11 59/23/11 +f 68/25/13 61/23/13 65/20/13 +f 72/27/4 69/28/4 48/26/4 +f 60/50/3 53/30/3 69/22/3 +f 48/26/5 56/32/5 72/27/5 +f 63/33/2 66/27/2 50/32/2 +f 62/50/4 51/30/4 67/22/4 +f 71/28/2 47/29/2 70/27/2 +f 58/50/5 55/30/5 71/22/5 +f 59/33/3 70/27/3 54/32/3 +f 44/26/4 52/32/4 68/27/4 +f 64/50/2 49/30/2 65/22/2 +f 44/26/3 68/27/3 41/29/3 +f 73/37/3 74/34/3 76/36/3 +f 30/19/4 74/34/4 19/18/4 +f 31/11/14 75/38/14 30/12/14 +f 18/14/2 76/36/2 31/16/2 +f 19/2/1 73/40/1 18/3/1 +f 77/37/4 78/34/4 80/36/4 +f 26/19/5 78/34/5 23/18/5 +f 27/11/14 79/38/14 26/12/14 +f 22/14/3 80/36/3 27/16/3 +f 23/2/1 77/40/1 22/3/1 +f 81/36/2 82/37/2 84/35/2 +f 21/2/1 82/40/1 24/3/1 +f 28/19/3 83/34/3 21/18/3 +f 25/11/14 84/38/14 28/12/14 +f 24/14/5 81/36/5 25/16/5 +f 85/36/5 86/37/5 88/35/5 +f 17/2/1 86/40/1 20/3/1 +f 32/19/2 87/34/2 17/18/2 +f 29/11/14 88/38/14 32/12/14 +f 20/14/4 85/36/4 29/16/4 +f 89/44/3 90/41/3 92/43/3 +f 62/50/4 90/41/4 51/30/4 +f 63/23/14 91/45/14 62/24/14 +f 50/32/2 92/43/2 63/33/2 +f 51/21/1 89/47/1 50/22/1 +f 93/44/4 94/41/4 96/43/4 +f 58/50/5 94/41/5 55/30/5 +f 59/23/14 95/45/14 58/24/14 +f 54/32/3 96/43/3 59/33/3 +f 55/21/1 93/47/1 54/22/1 +f 97/43/2 98/44/2 100/42/2 +f 53/21/1 98/47/1 56/22/1 +f 60/50/3 99/41/3 53/30/3 +f 57/23/14 100/45/14 60/24/14 +f 56/32/5 97/43/5 57/33/5 +f 101/43/5 102/44/5 104/42/5 +f 49/21/1 102/47/1 52/22/1 +f 64/50/2 103/41/2 49/30/2 +f 61/23/14 104/45/14 64/24/14 +f 52/32/4 101/43/4 61/33/4 diff --git a/assets/hbm/models/missile_parts/mp_t_10_solid.obj b/assets/hbm/models/missile_parts/mp_t_10_solid.obj new file mode 100644 index 000000000..50bcd7157 --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_t_10_solid.obj @@ -0,0 +1,368 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_t_10_solid.blend' +# www.blender.org +o Circle +v 0.000000 0.500000 -0.500000 +v -0.250000 0.500000 -0.433013 +v -0.433013 0.500000 -0.250000 +v -0.500000 0.500000 0.000000 +v -0.433013 0.500000 0.250000 +v -0.250000 0.500000 0.433013 +v -0.000000 0.500000 0.500000 +v 0.250000 0.500000 0.433013 +v 0.433013 0.500000 0.250000 +v 0.500000 0.500000 0.000000 +v 0.433013 0.500000 -0.250000 +v 0.250000 0.500000 -0.433013 +v -0.187500 0.375000 -0.324760 +v 0.000000 0.375000 -0.375000 +v -0.324760 0.375000 -0.187500 +v -0.375000 0.375000 0.000000 +v -0.324759 0.375000 0.187500 +v -0.187500 0.375000 0.324760 +v -0.000000 0.375000 0.375000 +v 0.187500 0.375000 0.324760 +v 0.324759 0.375000 0.187500 +v 0.375000 0.375000 0.000000 +v 0.324760 0.375000 -0.187500 +v 0.187500 0.375000 -0.324759 +v 0.070313 0.250000 -0.121785 +v 0.121785 0.250000 -0.070312 +v 0.140625 0.250000 0.000000 +v 0.121785 0.250000 0.070313 +v 0.070312 0.250000 0.121785 +v -0.000000 0.250000 0.140625 +v -0.070312 0.250000 0.121785 +v -0.121785 0.250000 0.070313 +v -0.140625 0.250000 0.000000 +v -0.121785 0.250000 -0.070312 +v 0.000000 0.250000 -0.140625 +v -0.070312 0.250000 -0.121785 +v -0.140625 0.000000 -0.243570 +v -0.243570 0.000000 -0.140625 +v -0.281250 0.000000 0.000000 +v -0.243570 0.000000 0.140625 +v -0.140625 0.000000 0.243570 +v -0.000000 0.000000 0.281250 +v 0.140625 0.000000 0.243570 +v 0.243570 0.000000 0.140625 +v 0.281250 0.000000 0.000000 +v 0.243570 0.000000 -0.140625 +v 0.140625 0.000000 -0.243570 +v 0.000000 0.000000 -0.281250 +v -0.140625 0.375000 -0.243570 +v -0.243570 0.375000 -0.140625 +v -0.281250 0.375000 0.000000 +v -0.243570 0.375000 0.140625 +v -0.140625 0.375000 0.243570 +v -0.000000 0.375000 0.281250 +v 0.140625 0.375000 0.243570 +v 0.243570 0.375000 0.140625 +v 0.281250 0.375000 0.000000 +v 0.243570 0.375000 -0.140625 +v 0.140625 0.375000 -0.243570 +v 0.000000 0.375000 -0.281250 +v 0.187500 0.000000 -0.324759 +v 0.324760 0.000000 -0.187500 +v 0.375000 0.000000 0.000000 +v 0.324759 0.000000 0.187500 +v 0.187500 0.000000 0.324760 +v -0.000000 0.000000 0.375000 +v -0.187500 0.000000 0.324760 +v -0.324760 0.000000 0.187500 +v -0.375000 0.000000 0.000000 +v -0.324760 0.000000 -0.187500 +v -0.187500 0.000000 -0.324760 +v 0.000000 0.000000 -0.375000 +vt 0.416667 0.604167 +vt 0.562500 0.520833 +vt 0.416667 0.270833 +vt 0.250000 0.395833 +vt 0.062500 0.291667 +vt 0.062500 0.500000 +vt 0.583333 0.208333 +vt 0.666667 0.208333 +vt 0.666667 0.270833 +vt 0.916667 0.208333 +vt 0.916667 0.270833 +vt 0.833333 0.270833 +vt 0.333333 0.208333 +vt 0.333333 0.270833 +vt 0.250000 0.270833 +vt 0.166667 0.208333 +vt 0.166667 0.270833 +vt 0.083333 0.270833 +vt 0.583333 0.270833 +vt 0.500000 0.270833 +vt 0.750000 0.208333 +vt 0.833333 0.208333 +vt 0.000000 0.208333 +vt 0.083333 0.208333 +vt 0.500000 0.208333 +vt 0.750000 0.270833 +vt 1.000000 0.208333 +vt 1.000000 0.270833 +vt 0.416667 0.208333 +vt 0.250000 0.208333 +vt 0.291667 -0.000000 +vt 0.291667 0.083333 +vt 0.250000 0.083333 +vt 0.041667 0.000000 +vt 0.083333 -0.000000 +vt 0.083333 0.083333 +vt 0.166667 -0.000000 +vt 0.166667 0.083333 +vt 0.125000 0.083333 +vt 0.458333 -0.000000 +vt 0.458333 0.083333 +vt 0.416667 0.083333 +vt 0.333333 0.000000 +vt 0.333333 0.083333 +vt 0.125000 -0.000000 +vt 0.208333 -0.000000 +vt 0.208333 0.083333 +vt 0.500000 -0.000000 +vt 0.500000 0.083333 +vt 0.375000 0.000000 +vt 0.375000 0.083333 +vt 0.250000 -0.000000 +vt 0.000000 0.000000 +vt 0.041667 0.083333 +vt 0.166667 0.625000 +vt 0.125000 0.687500 +vt 0.083333 0.625000 +vt 0.125000 0.770833 +vt 0.062500 0.750000 +vt 0.083333 0.729167 +vt 0.020833 0.583333 +vt 0.041667 0.604167 +vt 0.041667 0.645833 +vt 0.250000 0.645833 +vt 0.208333 0.645833 +vt 0.208333 0.604167 +vt 0.125000 0.729167 +vt 0.166667 0.729167 +vt 0.000000 0.645833 +vt 0.041667 0.687500 +vt 0.229167 0.583333 +vt 0.166667 0.562500 +vt 0.125000 0.520833 +vt 0.125000 0.562500 +vt 0.083333 0.562500 +vt 0.187500 0.750000 +vt 0.208333 0.687500 +vt 0.020833 0.708333 +vt 0.187500 0.541667 +vt 0.062500 0.541667 +vt 0.187500 0.083333 +vt 0.187500 0.208333 +vt 0.125000 0.208333 +vt 0.750000 0.083333 +vt 0.687500 0.208333 +vt 0.437500 0.083333 +vt 0.437500 0.208333 +vt 0.062500 0.083333 +vt 0.062500 0.208333 +vt 0.625000 0.083333 +vt 0.625000 0.208333 +vt 0.562500 0.208333 +vt 0.312500 0.083333 +vt 0.312500 0.208333 +vt 0.562500 0.083333 +vt 0.687500 0.083333 +vt 0.375000 0.208333 +vt 0.416667 -0.000000 +vt 0.229167 0.708333 +vt 0.333333 0.291667 +vt 0.270833 0.354167 +vt 0.250000 0.437500 +vt 0.270833 0.520833 +vt 0.333333 0.583333 +vt 0.500000 0.583333 +vt 0.583333 0.437500 +vt 0.562500 0.354167 +vt 0.500000 0.291667 +vt 0.187500 0.500000 +vt 0.229167 0.458333 +vt 0.229167 0.333333 +vt 0.187500 0.291667 +vt 0.125000 0.270833 +vt 0.020833 0.333333 +vt -0.000000 0.395833 +vt 0.020833 0.458333 +vt 0.000000 0.270833 +vt -0.000000 0.083333 +vt 0.104167 0.604167 +vt 0.125000 0.604167 +vt 0.145833 0.604167 +vt 0.166667 0.645833 +vt 0.166667 0.666667 +vt 0.145833 0.687500 +vt 0.104167 0.687500 +vt 0.083333 0.666667 +vt 0.083333 0.645833 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 -0.000000 +vn 0.508600 -0.694700 0.508600 +vn -0.508600 -0.694700 0.508600 +vn 0.186200 -0.694700 -0.694700 +vn -0.508600 -0.694700 -0.508600 +vn 0.694700 -0.694700 0.186200 +vn -0.186200 -0.694700 0.694700 +vn -0.694700 -0.694700 -0.186200 +vn 0.694700 -0.694700 -0.186200 +vn 0.186200 -0.694700 0.694700 +vn -0.694700 -0.694700 0.186200 +vn 0.508600 -0.694700 -0.508600 +vn -0.186200 -0.694700 -0.694700 +vn -0.848700 -0.477400 -0.227400 +vn 0.621300 -0.477400 0.621300 +vn -0.227400 -0.477400 0.848700 +vn 0.621300 -0.477400 -0.621300 +vn -0.621300 -0.477400 -0.621300 +vn 0.227400 -0.477400 0.848700 +vn -0.621300 -0.477400 0.621300 +vn 0.848700 -0.477400 -0.227400 +vn -0.227400 -0.477400 -0.848700 +vn -0.848700 -0.477400 0.227400 +vn 0.848700 -0.477400 0.227400 +vn -0.251600 0.234700 0.938900 +vn -0.938900 0.234700 -0.251600 +vn 0.938900 0.234700 -0.251600 +vn 0.251600 0.234700 0.938900 +vn -0.938900 0.234700 0.251600 +vn 0.687400 0.234700 -0.687300 +vn -0.251600 0.234700 -0.938900 +vn 0.687300 0.234700 0.687400 +vn -0.687400 0.234700 0.687300 +vn 0.251600 0.234700 -0.938900 +vn -0.687300 0.234700 -0.687300 +vn 0.938900 0.234700 0.251600 +vn 0.227400 -0.477400 -0.848700 +vn -0.687300 0.234700 0.687300 +s off +f 7/1/1 9/2/1 1/3/1 +f 23/4/2 19/5/2 15/6/2 +f 9/7/3 8/8/3 20/9/3 +f 5/10/4 17/11/4 18/12/4 +f 12/13/5 24/14/5 14/15/5 +f 2/16/6 13/17/6 15/18/6 +f 9/7/7 21/19/7 22/20/7 +f 7/21/8 6/22/8 18/12/8 +f 4/23/9 3/24/9 15/18/9 +f 10/25/10 22/20/10 23/3/10 +f 8/8/11 7/21/11 19/26/11 +f 4/27/12 16/28/12 17/11/12 +f 12/13/13 11/29/13 23/3/13 +f 1/30/14 14/15/14 13/17/14 +f 44/31/15 28/32/15 27/33/15 +f 38/34/16 37/35/16 36/36/16 +f 47/37/17 25/38/17 35/39/17 +f 40/40/18 32/41/18 31/42/18 +f 43/43/19 29/44/19 28/32/19 +f 48/45/20 35/39/20 36/36/20 +f 46/46/21 26/47/21 25/38/21 +f 39/48/22 33/49/22 32/41/22 +f 42/50/23 30/51/23 29/44/23 +f 45/52/24 27/33/24 26/47/24 +f 39/53/25 38/34/25 34/54/25 +f 26/55/2 30/56/2 34/57/2 +f 66/58/2 67/59/2 41/60/2 +f 70/61/2 38/62/2 39/63/2 +f 63/64/2 45/65/2 46/66/2 +f 66/58/2 42/67/2 43/68/2 +f 69/69/2 39/63/2 40/70/2 +f 62/71/2 46/66/2 47/72/2 +f 72/73/2 48/74/2 37/75/2 +f 65/76/2 43/68/2 44/77/2 +f 68/78/2 40/70/2 41/60/2 +f 61/79/2 47/72/2 48/74/2 +f 71/80/2 37/75/2 38/62/2 +f 66/81/26 54/82/26 53/83/26 +f 69/84/27 51/21/27 50/85/27 +f 63/51/28 62/86/28 58/87/28 +f 65/33/29 55/30/29 54/82/29 +f 68/88/30 52/89/30 51/23/30 +f 62/86/31 61/49/31 59/25/31 +f 71/90/32 49/91/32 60/92/32 +f 64/93/33 56/94/33 55/30/33 +f 67/39/34 53/83/34 52/89/34 +f 72/95/35 60/92/35 59/25/35 +f 70/96/36 50/85/36 49/91/36 +f 63/51/37 57/97/37 56/94/37 +f 41/98/38 31/42/38 30/51/38 +f 64/99/2 44/77/2 45/65/2 +f 1/3/1 2/100/1 3/101/1 +f 3/101/1 4/102/1 5/103/1 +f 5/103/1 6/104/1 7/1/1 +f 7/1/1 8/105/1 9/2/1 +f 9/2/1 10/106/1 11/107/1 +f 11/107/1 12/108/1 1/3/1 +f 1/3/1 3/101/1 5/103/1 +f 5/103/1 7/1/1 1/3/1 +f 9/2/1 11/107/1 1/3/1 +f 15/6/2 13/73/2 23/4/2 +f 14/109/2 24/110/2 23/4/2 +f 23/4/2 22/111/2 21/112/2 +f 21/112/2 20/113/2 19/5/2 +f 19/5/2 18/114/2 17/115/2 +f 17/115/2 16/116/2 15/6/2 +f 13/73/2 14/109/2 23/4/2 +f 23/4/2 21/112/2 19/5/2 +f 19/5/2 17/115/2 15/6/2 +f 21/19/3 9/7/3 20/9/3 +f 6/22/4 5/10/4 18/12/4 +f 1/30/5 12/13/5 14/15/5 +f 3/24/6 2/16/6 15/18/6 +f 10/25/7 9/7/7 22/20/7 +f 19/26/8 7/21/8 18/12/8 +f 16/117/9 4/23/9 15/18/9 +f 11/29/10 10/25/10 23/3/10 +f 20/9/11 8/8/11 19/26/11 +f 5/10/12 4/27/12 17/11/12 +f 24/14/13 12/13/13 23/3/13 +f 2/16/14 1/30/14 13/17/14 +f 45/52/15 44/31/15 27/33/15 +f 34/54/16 38/34/16 36/36/16 +f 48/45/17 47/37/17 35/39/17 +f 41/98/18 40/40/18 31/42/18 +f 44/31/19 43/43/19 28/32/19 +f 37/35/20 48/45/20 36/36/20 +f 47/37/21 46/46/21 25/38/21 +f 40/40/22 39/48/22 32/41/22 +f 43/43/23 42/50/23 29/44/23 +f 46/46/24 45/52/24 26/47/24 +f 33/118/25 39/53/25 34/54/25 +f 34/57/2 36/119/2 35/120/2 +f 35/120/2 25/121/2 26/55/2 +f 26/55/2 27/122/2 30/56/2 +f 28/123/2 29/124/2 30/56/2 +f 30/56/2 31/125/2 32/126/2 +f 32/126/2 33/127/2 34/57/2 +f 34/57/2 35/120/2 26/55/2 +f 27/122/2 28/123/2 30/56/2 +f 30/56/2 32/126/2 34/57/2 +f 42/67/2 66/58/2 41/60/2 +f 69/69/2 70/61/2 39/63/2 +f 62/71/2 63/64/2 46/66/2 +f 65/76/2 66/58/2 43/68/2 +f 68/78/2 69/69/2 40/70/2 +f 61/79/2 62/71/2 47/72/2 +f 71/80/2 72/73/2 37/75/2 +f 64/99/2 65/76/2 44/77/2 +f 67/59/2 68/78/2 41/60/2 +f 72/73/2 61/79/2 48/74/2 +f 70/61/2 71/80/2 38/62/2 +f 67/39/26 66/81/26 53/83/26 +f 70/96/27 69/84/27 50/85/27 +f 57/97/28 63/51/28 58/87/28 +f 66/81/29 65/33/29 54/82/29 +f 69/118/30 68/88/30 51/23/30 +f 58/87/31 62/86/31 59/25/31 +f 72/95/32 71/90/32 60/92/32 +f 65/33/33 64/93/33 55/30/33 +f 68/88/39 67/39/39 52/89/39 +f 61/49/35 72/95/35 59/25/35 +f 71/90/36 70/96/36 49/91/36 +f 64/93/37 63/51/37 56/94/37 +f 42/50/38 41/98/38 30/51/38 +f 63/64/2 64/99/2 45/65/2 diff --git a/assets/hbm/models/missile_parts/mp_w_10_incendiary.obj b/assets/hbm/models/missile_parts/mp_w_10_incendiary.obj new file mode 100644 index 000000000..109bf2b1b --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_w_10_incendiary.obj @@ -0,0 +1,219 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_w_10_in.blend' +# www.blender.org +o Cone +v -0.000000 0.250000 -0.375000 +v 0.000000 2.500000 0.000000 +v 0.187500 0.250000 -0.324760 +v 0.324760 0.250000 -0.187500 +v 0.375000 0.250000 0.000000 +v 0.324760 0.250000 0.187500 +v 0.187500 0.250000 0.324760 +v 0.000000 0.250000 0.375000 +v -0.187500 0.250000 0.324760 +v -0.324759 0.250000 0.187500 +v -0.375000 0.250000 0.000000 +v -0.324760 0.250000 -0.187500 +v -0.187500 0.250000 -0.324759 +v 0.000000 0.000000 -0.500000 +v 0.250000 0.000000 -0.433013 +v 0.433013 0.000000 -0.250000 +v 0.500000 0.000000 0.000000 +v 0.433013 0.000000 0.250000 +v 0.250000 0.000000 0.433013 +v 0.000000 0.000000 0.500000 +v -0.250000 0.000000 0.433013 +v -0.433013 0.000000 0.250000 +v -0.500000 0.000000 0.000000 +v -0.433013 0.000000 -0.250000 +v -0.250000 0.000000 -0.433013 +v 0.000000 0.125000 -0.475000 +v 0.237500 0.125000 -0.411362 +v 0.411362 0.125000 -0.237500 +v 0.475000 0.125000 0.000000 +v 0.411362 0.125000 0.237500 +v 0.237500 0.125000 0.411362 +v 0.000000 0.125000 0.475000 +v -0.237500 0.125000 0.411362 +v -0.411362 0.125000 0.237500 +v -0.475000 0.125000 0.000000 +v -0.411362 0.125000 -0.237500 +v -0.237500 0.125000 -0.411362 +vt 0.634615 0.096154 +vt 0.596154 0.788462 +vt 0.576923 0.096154 +vt 0.519231 0.096154 +vt 0.480769 0.788462 +vt 0.461538 0.096154 +vt 0.692308 0.096154 +vt 0.653846 0.788462 +vt 0.057692 0.096154 +vt 0.019231 0.788462 +vt 0.000000 0.096154 +vt 0.115385 0.096154 +vt 0.076923 0.788462 +vt 0.173077 0.096154 +vt 0.134615 0.788462 +vt 0.230769 0.096154 +vt 0.192308 0.788462 +vt 0.288462 0.096154 +vt 0.250000 0.788462 +vt 0.346154 0.096154 +vt 0.307692 0.788462 +vt 0.403846 0.096154 +vt 0.365385 0.788462 +vt 0.538462 0.788462 +vt 0.423077 0.788462 +vt 0.384615 0.096154 +vt 0.384615 0.038462 +vt 0.461538 0.038462 +vt 0.846154 0.096154 +vt 0.846154 0.403846 +vt 0.980769 0.326923 +vt 0.538462 0.038462 +vt 0.538462 0.096154 +vt 0.384615 0.000000 +vt 0.307692 0.038462 +vt 0.692308 0.000000 +vt 0.769231 -0.000000 +vt 0.769231 0.038462 +vt 0.615385 0.000000 +vt 0.615385 0.038462 +vt 0.076923 -0.000000 +vt 0.076923 0.038462 +vt -0.000000 0.038462 +vt 0.307692 0.000000 +vt 0.230769 0.038462 +vt 0.538462 0.000000 +vt 0.923077 0.000000 +vt 0.923077 0.038462 +vt 0.846154 0.038462 +vt 0.230769 0.000000 +vt 0.153846 0.038462 +vt 0.461538 0.000000 +vt 0.846154 -0.000000 +vt 0.692308 0.038462 +vt 0.153846 0.000000 +vt 0.769231 0.096154 +vt 0.923077 0.096154 +vt 0.076923 0.096154 +vt 0.153846 0.096154 +vt 1.000000 0.250000 +vt 0.980769 0.173077 +vt 0.923077 0.115385 +vt 0.769231 0.115385 +vt 0.711538 0.173077 +vt 0.692308 0.250000 +vt 0.711538 0.326923 +vt 0.769231 0.384615 +vt 0.923077 0.384615 +vt -0.000000 0.000000 +vt 0.615385 0.096154 +vt 0.307692 0.096154 +vn -0.698100 0.158900 -0.698100 +vn 0.255500 0.158900 -0.953600 +vn -0.953600 0.158900 -0.255500 +vn -0.953600 0.158900 0.255500 +vn -0.698100 0.158900 0.698100 +vn -0.255500 0.158900 0.953600 +vn 0.255500 0.158900 0.953600 +vn 0.698100 0.158900 0.698100 +vn 0.953600 0.158900 0.255500 +vn 0.953600 0.158900 -0.255500 +vn -0.255500 0.158900 -0.953600 +vn 0.698100 0.158900 -0.698100 +vn 0.764300 0.611500 0.204800 +vn 0.000000 -1.000000 0.000000 +vn 0.764300 0.611500 -0.204800 +vn 0.694300 0.189700 0.694300 +vn -0.254100 0.189700 -0.948400 +vn 0.694300 0.189700 -0.694300 +vn -0.948400 0.189700 0.254100 +vn 0.254100 0.189700 0.948400 +vn 0.948400 0.189700 -0.254100 +vn -0.948400 0.189700 -0.254100 +vn -0.254100 0.189700 0.948400 +vn 0.948400 0.189700 0.254100 +vn -0.694300 0.189700 -0.694300 +vn 0.254100 0.189700 -0.948400 +vn -0.694300 0.189700 0.694300 +vn 0.559500 0.611500 -0.559500 +vn 0.204800 0.611500 -0.764300 +vn -0.204800 0.611500 -0.764300 +vn -0.559500 0.611500 -0.559500 +vn -0.764300 0.611500 -0.204800 +vn -0.764300 0.611500 0.204800 +vn -0.559500 0.611500 0.559500 +vn -0.204800 0.611500 0.764300 +vn 0.204800 0.611500 0.764300 +vn 0.559500 0.611500 0.559500 +s off +f 12/1/1 2/2/1 13/3/1 +f 1/4/2 2/5/2 3/6/2 +f 11/7/3 2/8/3 12/1/3 +f 10/9/4 2/10/4 11/11/4 +f 9/12/5 2/13/5 10/9/5 +f 8/14/6 2/15/6 9/12/6 +f 7/16/7 2/17/7 8/14/7 +f 6/18/8 2/19/8 7/16/8 +f 5/20/9 2/21/9 6/18/9 +f 4/22/10 2/23/10 5/20/10 +f 13/3/11 2/24/11 1/4/11 +f 3/6/12 2/25/12 4/22/12 +f 6/26/13 30/27/13 29/28/13 +f 17/29/14 23/30/14 25/31/14 +f 29/28/15 28/32/15 4/33/15 +f 18/34/16 30/27/16 31/35/16 +f 14/36/17 25/37/17 37/38/17 +f 15/39/18 27/40/18 28/32/18 +f 22/41/19 34/42/19 35/43/19 +f 19/44/20 31/35/20 32/45/20 +f 16/46/21 28/32/21 29/28/21 +f 23/47/22 35/48/22 36/49/22 +f 20/50/23 32/45/23 33/51/23 +f 17/52/24 29/28/24 30/27/24 +f 24/53/25 36/49/25 37/38/25 +f 14/36/26 26/54/26 27/40/26 +f 21/55/27 33/51/27 34/42/27 +f 4/33/28 28/32/28 27/40/28 +f 27/40/29 26/54/29 1/7/29 +f 26/54/30 37/38/30 13/56/30 +f 13/56/31 37/38/31 36/49/31 +f 36/49/32 35/48/32 11/57/32 +f 35/43/33 34/42/33 10/58/33 +f 34/42/34 33/51/34 9/59/34 +f 33/51/35 32/45/35 8/16/35 +f 8/16/36 32/45/36 31/35/36 +f 31/35/37 30/27/37 6/26/37 +f 5/6/13 6/26/13 29/28/13 +f 25/31/14 14/60/14 15/61/14 +f 15/61/14 16/62/14 17/29/14 +f 17/29/14 18/63/14 19/64/14 +f 19/64/14 20/65/14 21/66/14 +f 21/66/14 22/67/14 23/30/14 +f 23/30/14 24/68/14 25/31/14 +f 25/31/14 15/61/14 17/29/14 +f 17/29/14 19/64/14 21/66/14 +f 21/66/14 23/30/14 17/29/14 +f 5/6/15 29/28/15 4/33/15 +f 19/44/16 18/34/16 31/35/16 +f 26/54/17 14/36/17 37/38/17 +f 16/46/18 15/39/18 28/32/18 +f 23/69/19 22/41/19 35/43/19 +f 20/50/20 19/44/20 32/45/20 +f 17/52/21 16/46/21 29/28/21 +f 24/53/22 23/47/22 36/49/22 +f 21/55/23 20/50/23 33/51/23 +f 18/34/24 17/52/24 30/27/24 +f 25/37/25 24/53/25 37/38/25 +f 15/39/26 14/36/26 27/40/26 +f 22/41/27 21/55/27 34/42/27 +f 3/70/28 4/33/28 27/40/28 +f 3/70/29 27/40/29 1/7/29 +f 1/7/30 26/54/30 13/56/30 +f 12/29/31 13/56/31 36/49/31 +f 12/29/32 36/49/32 11/57/32 +f 11/11/33 35/43/33 10/58/33 +f 10/58/34 34/42/34 9/59/34 +f 9/59/35 33/51/35 8/16/35 +f 7/71/36 8/16/36 31/35/36 +f 7/71/37 31/35/37 6/26/37 diff --git a/assets/hbm/textures/models/missile_parts/mp_f_10_solid.png b/assets/hbm/textures/models/missile_parts/mp_f_10_solid.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a96a0f54c96190525cd252d07963041af385ec GIT binary patch literal 1355 zcmV-R1+@B!P)1v2N-}6g@`Bv0=3m5TsoqMN}zcDM~?#SD>VEN0BlcDc_Ld zeZzi5q!e4zxk4!@Kv5ba(vZd?GEa&jmR8H!SlZ_;*qLX89k2~J_8tl0v3>5$y`Fn# z=GwzZl4K*n5Ji!R!p~MJ6)=ojhHcMnG8&CgC=`&(<(95FIks&t$p8RVRhRfq8LL3* z=XrjqzD*%R4*LDR>%#N%v#Z?i_gxh)-XFBQD1TLX6+bK(S(fc}d%&XQy`H)gyXXOe zAVhM3jMqso#k?B5$*#Bx+p5cD0B0rJ^0_FmZF}Qw$?kvu-S=YYm;VmFhZ9cu|Agc3 zN34GxWdHi}+xDa<0G=`6|Ag#MKmQtc8)8LvocZcIoRMLS=lKtXtl}>YgTTjumB?GK z{y#o!+bS%%z-Nj0yFv!|F}x7vRaK27G;V$ncm~0PgM&yyVjM z82Sst_rop?>S=({XcS3k-25QOdY!CPDv^YS<&&P|#ou~9AShNXg*VBMTGvMiWq?gJ z$SZ!V!lvWHr-=bhL-_GY>Me}n{NQPTMIQ`WSzIwB3-U zzrSxpP*RaC7K=DJIf15Wczt~ZfW(y}86dKRPli?BJ1l-rz}(#2BsZT0;O_2@Dnyho z6bhdA>befVZG>#GSln(4cLYh2Y^UO~EW4yu7@i-EO1T>*49?39VKOvMi(9?E;wh5Yk(i+uPejyTHZ81%SCy-EJ3$hlj}L z^N=J79LK>lP0VI9G#U*|r&A1vL)2JHiK>+2<iK*g)9DnV zD5BHp002Z$#B@4EKA)$u3WWl6T~E&_Aj>jZtrkk95`Eg2mzMy5!C*jp#dtgh00@Er zz-KWO_p7Zie8VunvMl!Y_VDoVfTN=$sHzH8RiSAbI-L$UjswfGG&lk&do{+gEI5t> z$8k&7Ow)vEny@U(bv`xAVV>t_mm+5@#$){N(0{G<0CkZqvslp1{6i1_X3|NEgpqWhBU)4sPfHblXiPalIZ9_ z{GV{vPKgD~zzdwaupJcgnubPnL;reYWrMUf%1L8pR? zQ(*#K*Qw!BVF2KV5rFw5$Eh%Z*J3CYF@S(5rt7-r&v_3);$uKmq-Gufxbp#CKj%FJ zzA+%~S6e~(VeVz^8t)3%f6HDB*Xyc*4Z#GN13#3pAY(a{9iOq(-Ey=3AF$K N002ovPDHLkV1lZWdk+8r literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/missile_parts/mp_s_10_cruise.png b/assets/hbm/textures/models/missile_parts/mp_s_10_cruise.png new file mode 100644 index 0000000000000000000000000000000000000000..2be5c984cbce1238efcd8cd3aa8c30300c0d5720 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf)<5zf!ul=W)j-orP1F1Q)*E)xT51U2oO-!v+?w85EXo+1GsN&nAIGQYOD$ zL`vr{I@}I9{WZ_r=lHB`E5%AXXVqHf%|2y$QZ_s24%3@n-p5`wOzxexDwW5-T=5!si9qOGfB4u-CxroO-)b;ccD~m09 zTk3JAkf7mbT>Bn?7;gXCyyQ&W0B(?Fl?d%e3p&)xT54pt}^M%e^r zq19>)r;WGUZN+}*>kcn7I0l$&Y&~CR4!*$(4lm80W*MHY@%{SN9*8UTfzkyk+ z)yn3u5UPIzD*+|L*xlV-sx0*S`fALTMh^}SmP)|O%ZmYX6ta4~zElE&AW+4%P%CkD zbu~OcKL_Cc{vLoT*)`j?+1}m;z_x9wW*e8JPM@KVb;`#Y` zW&_x0G-j^9y??#c+CYwN_8a*Oc_K3MuIo-+C#3}RiclLBC7)qZM5ECdjuQ7gk2sD2 za2$tjx2t}WQfd=nz)$jdC!9BLl)UG8tgo+gcXx+nS)^%7nx>qcoe{?|zVB-lVH72w zCt_!32l#fIq z4zBAWrR3t`0wDxK2u0p?T^z?5TeB!kExYjTIu8#IY;JBU!k3qq00cpxZY7E$JkJ}8 ziAA98YbK6kEX%^SZ5|&Vsn_fD`+fTTKJV}EJUu-jgut>a72GfU!Eaf(nNRosk zNl4RF=YL=76W}-wX_}HG2`48f1VKO;hJ<0r*47rMr>6`C1JX2Aai9a*VxZgY;&~qX z`}-Rwp`)5H%MnpjB#^TZEnHk+OohT%eke}9YX>+7Y)`x_e@|4GX4 z;Fn6JyfyrY;;+EkK+br3dwVN&3cbF*dP^OnhlhtNW#IYw*@Gn#S-D(ZDFaay+2p!V zDN(Q22bY(Z0Nmf-15l)PDF^~~cXt5@f`Fp6y+)%k`1tq$U~6j&fFiXgin)`MlbJE` z^z<~d0Ib*RGk>4Ixw&y#K#oi{PyCQ+CgzDB;?jhjXi@P)#!ZZi*IJXNDF8|-I-SnQ z^R7&IFe!f8KRj*RSMgeFHa9o9ySqaOfiVVS3>Oy{q-jdG+jVNfTU7is6Gul!_IIUH zVSj(0Fbrw6T1Y9$vW$MePqkVlNfKUOUYwd3sio(MpMN(-DMc8DBuT>6)fG}oq?A^C z7=|dNexi2*-_=A~YufEL+uPe#aIIDYAc`WpD(~;_Xsst=;$Lz0HIt?(LI{E&;Njtc za=A>e*Q3|#@%Hw{VV3A}tYfPG^R{ZVlt=%@QR?D7F^ZMrGzsBkWVq^)BxmDPX8o`y;bAmm1yWnhL79&ak O0000cQB7E|SiGi)Cakphw8%y8w@r0&&~CS_0P83D-`~6%^Oy$75 zqmUM_h(IV>$1PUkK;JRam;Wye)giB6|uOk7=EadUHH#P@nV zUS3{MO64LRpt6j3&E(uDiV#9z+cwY7&m0{cF&GRO3 z2w{#*nmCS$R3V)7sl zs*9)0#`k@cQl{Ftu1mk)$8j90Y4gyOfg8&rgI9rkMpnFxANP+D!@9Sg>3f1-QSzHv$TGl~`nAQoN>6 zmpPbkVwQN#*00mo*Vp5ViwgiAA0GkOrE$f!Z4M3&0I+SFT^n1iR%`tA^##D*-W~wE zG`4PUZ^u7BKh$b90Ja_9-Q8u%nX3K+Qmy`N2}OuA85oU5=nqhcIJ1G@-(R!12ytcu zqtVE0UlHO=2EM<)0npz?iI+C;{{EhMQ5JmP&$Sa*bs5`Ls=7JsDm!oB59rmj{Kqs{ QS^xk507*qoM6N<$f{^@ly8r+H literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/missile_parts/mp_w_10_incendiary.png b/assets/hbm/textures/models/missile_parts/mp_w_10_incendiary.png new file mode 100644 index 0000000000000000000000000000000000000000..a9606903fb2dca15842dbb727c8da423645a544f GIT binary patch literal 746 zcmVa!nud9#WzA_2oCEA*Y;w&i$Wr0u2of4Gj$q z4gU?!@$qrF>LltsJUlqd#Jjt@yI+-y6*%QLtg4W6%Tg8E_^L!~!Ts@lxau4hx$Q3% zzIGK_I}bHS&UP9>w$li*owXC>?(OZZItN2pEBl6#D(XNw5;rYPCLmb~c*iE8ol#(pVI6pr}2!RlSZnsO8Wk@OU zeSaawx(ZbULBQSJ9oyU6M!?0z1pt%D1Suus@t8DC>2x|oQ3O~#hw?nf^E@^;H@UyR z=iuOgBuPk;gqN2W9v>eOLg0CxX%=9yAOO$v%rX0&q9`be0MZ4YRuZ3O{tm;i{A_$3r`PLQRiV#vd3m{5p^v8Uzl@c0Xc^q9 cQ>+U=0iTy_p&tPh#Q*>R07*qoM6N<$g3j?*F8}}l literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/test/TestEventTester.java b/com/hbm/blocks/test/TestEventTester.java index 1da92db5c..09f6999df 100644 --- a/com/hbm/blocks/test/TestEventTester.java +++ b/com/hbm/blocks/test/TestEventTester.java @@ -24,6 +24,7 @@ import com.hbm.main.ModEventHandler; import com.hbm.packet.AuxParticlePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.potion.HbmPotion; +import com.hbm.render.misc.MissilePart; import com.hbm.saveddata.RadiationSaveStructure; import com.hbm.saveddata.RadiationSavedData; import com.hbm.saveddata.SatelliteSaveStructure; @@ -404,9 +405,9 @@ public class TestEventTester extends Block { new GeyserLarge().generate(worldObj, itemRand, par2, par3, par4); }*/ - if(!worldObj.isRemote) + /*if(!worldObj.isRemote) PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacket(par2, par3 + 2, par4, 2), - new TargetPoint(worldObj.provider.dimensionId,par2, par3, par4, 50)); + new TargetPoint(worldObj.provider.dimensionId,par2, par3, par4, 50));*/ /*if(!worldObj.isRemote) { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 191adf613..32fbf139f 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -822,21 +822,30 @@ public class ModItems { public static Item missile_schrabidium; public static Item missile_emp; - public static Item mp_t_10; - public static Item mp_t_15; - public static Item mp_t_20; - public static Item mp_s_10; - public static Item mp_s_15; - public static Item mp_s_20; - public static Item mp_f_10; - public static Item mp_f_15; - public static Item mp_f_20; - public static Item mp_w_10; - public static Item mp_w_15; - public static Item mp_w_20; - public static Item mp_c_1; - public static Item mp_c_2; - public static Item mp_c_3; + public static Item mp_thruster_10_kerosene; + public static Item mp_thruster_10_solid; + public static Item mp_thruster_15_kerosene; + public static Item mp_thruster_20_kerosene; + + public static Item mp_stability_10_flat; + public static Item mp_stability_10_cruise; + public static Item mp_stability_15_flat; + public static Item mp_stability_20_flat; + + public static Item mp_fuselage_10_kerosene; + public static Item mp_fuselage_10_solid; + public static Item mp_fuselage_15_kerosene; + public static Item mp_fuselage_20_kerosene; + + public static Item mp_warhead_10_he; + public static Item mp_warhead_10_incendiary; + public static Item mp_warhead_10_buster; + public static Item mp_warhead_15_he; + public static Item mp_warhead_20_he; + + public static Item mp_chip_1; + public static Item mp_chip_2; + public static Item mp_chip_3; public static Item missile_carrier; public static Item sat_mapper; @@ -2330,21 +2339,26 @@ public class ModItems { sat_chip = new ItemSatChip().setUnlocalizedName("sat_chip").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":sat_chip"); sat_interface = new ItemSatInterface().setUnlocalizedName("sat_interface").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":sat_interface"); - mp_t_10 = new Item().setUnlocalizedName("mp_t_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_10"); - mp_t_15 = new Item().setUnlocalizedName("mp_t_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_15"); - mp_t_20 = new Item().setUnlocalizedName("mp_t_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_20"); - mp_s_10 = new Item().setUnlocalizedName("mp_s_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_10"); - mp_s_15 = new Item().setUnlocalizedName("mp_s_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_15"); - mp_s_20 = new Item().setUnlocalizedName("mp_s_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_20"); - mp_f_10 = new Item().setUnlocalizedName("mp_f_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_f_10"); - mp_f_15 = new Item().setUnlocalizedName("mp_f_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_f_15"); - mp_f_20 = new Item().setUnlocalizedName("mp_f_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_f_20"); - mp_w_10 = new Item().setUnlocalizedName("mp_w_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_10"); - mp_w_15 = new Item().setUnlocalizedName("mp_w_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_15"); - mp_w_20 = new Item().setUnlocalizedName("mp_w_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_20"); - mp_c_1 = new Item().setUnlocalizedName("mp_c_1").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_1"); - mp_c_2 = new Item().setUnlocalizedName("mp_c_2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_2"); - mp_c_3 = new Item().setUnlocalizedName("mp_c_3").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_3"); + mp_thruster_10_kerosene = new Item().setUnlocalizedName("mp_t_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_10"); + mp_thruster_10_solid = new Item().setUnlocalizedName("mp_thruster_10_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_10"); + mp_thruster_15_kerosene = new Item().setUnlocalizedName("mp_t_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_15"); + mp_thruster_20_kerosene = new Item().setUnlocalizedName("mp_t_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_t_20"); + mp_stability_10_flat = new Item().setUnlocalizedName("mp_s_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_10"); + mp_stability_10_cruise = new Item().setUnlocalizedName("mp_s_10_cruise").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_10_cruise"); + mp_stability_15_flat = new Item().setUnlocalizedName("mp_s_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_15"); + mp_stability_20_flat = new Item().setUnlocalizedName("mp_s_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_s_20"); + mp_fuselage_10_kerosene = new Item().setUnlocalizedName("mp_f_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_f_10"); + mp_fuselage_10_solid = new Item().setUnlocalizedName("mp_fuselage_10_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage_10_solid"); + mp_fuselage_15_kerosene = new Item().setUnlocalizedName("mp_f_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_f_15"); + mp_fuselage_20_kerosene = new Item().setUnlocalizedName("mp_f_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_f_20"); + mp_warhead_10_he = new Item().setUnlocalizedName("mp_w_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_10"); + mp_warhead_10_incendiary = new Item().setUnlocalizedName("mp_warhead_10_incendiary").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_10"); + mp_warhead_10_buster = new Item().setUnlocalizedName("mp_warhead_10_buster").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_10"); + mp_warhead_15_he = new Item().setUnlocalizedName("mp_w_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_15"); + mp_warhead_20_he = new Item().setUnlocalizedName("mp_w_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_w_20"); + mp_chip_1 = new Item().setUnlocalizedName("mp_c_1").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_1"); + mp_chip_2 = new Item().setUnlocalizedName("mp_c_2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_2"); + mp_chip_3 = new Item().setUnlocalizedName("mp_c_3").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_3"); ammo_12gauge = new ItemAmmo().setUnlocalizedName("ammo_12gauge").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_12gauge"); ammo_12gauge_incendiary = new ItemAmmo().setUnlocalizedName("ammo_12gauge_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_12gauge_incendiary"); @@ -4018,21 +4032,26 @@ public class ModItems { GameRegistry.registerItem(missile_carrier, missile_carrier.getUnlocalizedName()); //Missile Parts - GameRegistry.registerItem(mp_t_10, mp_t_10.getUnlocalizedName()); - GameRegistry.registerItem(mp_t_15, mp_t_15.getUnlocalizedName()); - GameRegistry.registerItem(mp_t_20, mp_t_20.getUnlocalizedName()); - GameRegistry.registerItem(mp_s_10, mp_s_10.getUnlocalizedName()); - GameRegistry.registerItem(mp_s_15, mp_s_15.getUnlocalizedName()); - GameRegistry.registerItem(mp_s_20, mp_s_20.getUnlocalizedName()); - GameRegistry.registerItem(mp_f_10, mp_f_10.getUnlocalizedName()); - GameRegistry.registerItem(mp_f_15, mp_f_15.getUnlocalizedName()); - GameRegistry.registerItem(mp_f_20, mp_f_20.getUnlocalizedName()); - GameRegistry.registerItem(mp_w_10, mp_w_10.getUnlocalizedName()); - GameRegistry.registerItem(mp_w_15, mp_w_15.getUnlocalizedName()); - GameRegistry.registerItem(mp_w_20, mp_w_20.getUnlocalizedName()); - GameRegistry.registerItem(mp_c_1, mp_c_1.getUnlocalizedName()); - GameRegistry.registerItem(mp_c_2, mp_c_2.getUnlocalizedName()); - GameRegistry.registerItem(mp_c_3, mp_c_3.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_10_kerosene, mp_thruster_10_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_10_solid, mp_thruster_10_solid.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_15_kerosene, mp_thruster_15_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_20_kerosene, mp_thruster_20_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_stability_10_flat, mp_stability_10_flat.getUnlocalizedName()); + GameRegistry.registerItem(mp_stability_10_cruise, mp_stability_10_cruise.getUnlocalizedName()); + GameRegistry.registerItem(mp_stability_15_flat, mp_stability_15_flat.getUnlocalizedName()); + GameRegistry.registerItem(mp_stability_20_flat, mp_stability_20_flat.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_kerosene, mp_fuselage_10_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_solid, mp_fuselage_10_solid.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene, mp_fuselage_15_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_20_kerosene, mp_fuselage_20_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_warhead_10_he, mp_warhead_10_he.getUnlocalizedName()); + GameRegistry.registerItem(mp_warhead_10_incendiary, mp_warhead_10_incendiary.getUnlocalizedName()); + GameRegistry.registerItem(mp_warhead_10_buster, mp_warhead_10_buster.getUnlocalizedName()); + GameRegistry.registerItem(mp_warhead_15_he, mp_warhead_15_he.getUnlocalizedName()); + GameRegistry.registerItem(mp_warhead_20_he, mp_warhead_20_he.getUnlocalizedName()); + GameRegistry.registerItem(mp_chip_1, mp_chip_1.getUnlocalizedName()); + GameRegistry.registerItem(mp_chip_2, mp_chip_2.getUnlocalizedName()); + GameRegistry.registerItem(mp_chip_3, mp_chip_3.getUnlocalizedName()); //Satellites GameRegistry.registerItem(sat_mapper, sat_mapper.getUnlocalizedName()); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 586a4e4d7..18b965760 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1469,22 +1469,8 @@ public class MainRegistry TileEntityMachineReactorLarge.registerWasteEntry(6, ReactorFuelType.THORIUM, ModItems.rod_empty, ModItems.rod_thorium_fuel_depleted); TileEntityMachineReactorLarge.registerWasteEntry(12, ReactorFuelType.THORIUM, ModItems.rod_dual_empty, ModItems.rod_dual_thorium_fuel_depleted); TileEntityMachineReactorLarge.registerWasteEntry(24, ReactorFuelType.THORIUM, ModItems.rod_quad_empty, ModItems.rod_quad_thorium_fuel_depleted); - - MissilePart.registerPart(ModItems.mp_t_10, PartType.THRUSTER, 1, ResourceManager.mp_t_10_kerosene, ResourceManager.mp_t_10_kerosene_tex); - MissilePart.registerPart(ModItems.mp_t_15, PartType.THRUSTER, 1.625, ResourceManager.mp_t_15, ResourceManager.universal); - MissilePart.registerPart(ModItems.mp_t_20, PartType.THRUSTER, 2.25, ResourceManager.mp_t_20, ResourceManager.universal); - - MissilePart.registerPart(ModItems.mp_s_10, PartType.FINS, 0, ResourceManager.mp_s_10_flat, ResourceManager.mp_s_10_flat_tex); - MissilePart.registerPart(ModItems.mp_s_15, PartType.FINS, 0, ResourceManager.mp_s_15, ResourceManager.universal); - MissilePart.registerPart(ModItems.mp_s_20, PartType.FINS, 0, ResourceManager.mp_s_20, ResourceManager.universal); - - MissilePart.registerPart(ModItems.mp_f_10, PartType.FUSELAGE, 4, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_tex); - MissilePart.registerPart(ModItems.mp_f_15, PartType.FUSELAGE, 6, ResourceManager.mp_f_15, ResourceManager.universal); - MissilePart.registerPart(ModItems.mp_f_20, PartType.FUSELAGE, 10, ResourceManager.mp_f_20, ResourceManager.universal); - - MissilePart.registerPart(ModItems.mp_w_10, PartType.WARHEAD, 2, ResourceManager.mp_w_10_he, ResourceManager.mp_w_10_he_tex); - MissilePart.registerPart(ModItems.mp_w_15, PartType.WARHEAD, 3, ResourceManager.mp_w_15, ResourceManager.universal); - MissilePart.registerPart(ModItems.mp_w_20, PartType.WARHEAD, 3, ResourceManager.mp_w_20, ResourceManager.universal); + + MissilePart.registerAllParts(); proxy.registerMissileItems(); } diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 42cbf77e8..85ae70da4 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -314,15 +314,18 @@ public class ResourceManager { //Missile Parts public static final IModelCustom mp_t_10_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_10_kerosene.obj")); + public static final IModelCustom mp_t_10_solid = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_10_solid.obj")); public static final IModelCustom mp_t_15 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_15.obj")); public static final IModelCustom mp_t_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_20.obj")); public static final IModelCustom mp_s_10_flat = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_10_flat.obj")); + public static final IModelCustom mp_s_10_cruise = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_10_cruise.obj")); public static final IModelCustom mp_s_15 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_15.obj")); public static final IModelCustom mp_s_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_20.obj")); public static final IModelCustom mp_f_10_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_10_kerosene.obj")); public static final IModelCustom mp_f_15 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_15.obj")); public static final IModelCustom mp_f_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_20.obj")); public static final IModelCustom mp_w_10_he = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_10_he.obj")); + public static final IModelCustom mp_w_10_incendiary = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_10_incendiary.obj")); public static final IModelCustom mp_w_15 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_15.obj")); public static final IModelCustom mp_w_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_20.obj")); @@ -375,7 +378,11 @@ public class ResourceManager { //Missile Parts public static final ResourceLocation mp_t_10_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_t_10_kerosene.png"); + public static final ResourceLocation mp_t_10_solid_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_t_10_solid.png"); public static final ResourceLocation mp_s_10_flat_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_s_10_flat.png"); + public static final ResourceLocation mp_s_10_cruise_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_s_10_cruise.png"); public static final ResourceLocation mp_f_10_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_f_10_kerosene.png"); + public static final ResourceLocation mp_f_10_solid_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_f_10_solid.png"); public static final ResourceLocation mp_w_10_he_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_w_10_he.png"); + public static final ResourceLocation mp_w_10_incendiary_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/mp_w_10_incendiary.png"); } diff --git a/com/hbm/render/item/ItemRenderMissilePart.java b/com/hbm/render/item/ItemRenderMissilePart.java index 075273e0b..e79467219 100644 --- a/com/hbm/render/item/ItemRenderMissilePart.java +++ b/com/hbm/render/item/ItemRenderMissilePart.java @@ -77,7 +77,8 @@ public class ItemRenderMissilePart implements IItemRenderer { case INVENTORY: - double height = part.height; + double height = part.guiheight; + if(height == 0D) height = 4D; diff --git a/com/hbm/render/misc/MissilePart.java b/com/hbm/render/misc/MissilePart.java index 26fe653e3..510db1198 100644 --- a/com/hbm/render/misc/MissilePart.java +++ b/com/hbm/render/misc/MissilePart.java @@ -3,6 +3,10 @@ package com.hbm.render.misc; import java.util.ArrayList; import java.util.List; +import com.hbm.items.ModItems; +import com.hbm.main.ResourceManager; +import com.hbm.render.misc.MissilePart.PartType; + import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelCustom; @@ -14,13 +18,15 @@ public class MissilePart { public Item part; public PartType type; public double height; + public double guiheight; public IModelCustom model; public ResourceLocation texture; - private MissilePart(Item item, PartType type, double height, IModelCustom model, ResourceLocation texture) { + private MissilePart(Item item, PartType type, double height, double guiheight, IModelCustom model, ResourceLocation texture) { this.part = item; this.type = type; this.height = height; + this.guiheight = guiheight; this.model = model; this.texture = texture; } @@ -32,9 +38,35 @@ public class MissilePart { THRUSTER } - public static void registerPart(Item item, PartType type, double height, IModelCustom model, ResourceLocation texture) { + public static void registerAllParts() { - MissilePart part = new MissilePart(item, type, height, model, texture); + parts.clear(); + + MissilePart.registerPart(ModItems.mp_thruster_10_kerosene, PartType.THRUSTER, 1, 1, ResourceManager.mp_t_10_kerosene, ResourceManager.mp_t_10_kerosene_tex); + MissilePart.registerPart(ModItems.mp_thruster_10_solid, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_10_solid, ResourceManager.mp_t_10_solid_tex); + MissilePart.registerPart(ModItems.mp_thruster_15_kerosene, PartType.THRUSTER, 1.625, 1.5, ResourceManager.mp_t_15, ResourceManager.universal); + MissilePart.registerPart(ModItems.mp_thruster_20_kerosene, PartType.THRUSTER, 2.25, 2, ResourceManager.mp_t_20, ResourceManager.universal); + + MissilePart.registerPart(ModItems.mp_stability_10_flat, PartType.FINS, 0, 2, ResourceManager.mp_s_10_flat, ResourceManager.mp_s_10_flat_tex); + MissilePart.registerPart(ModItems.mp_stability_10_cruise, PartType.FINS, 0, 3, ResourceManager.mp_s_10_cruise, ResourceManager.mp_s_10_cruise_tex); + MissilePart.registerPart(ModItems.mp_stability_15_flat, PartType.FINS, 0, 3, ResourceManager.mp_s_15, ResourceManager.universal); + MissilePart.registerPart(ModItems.mp_stability_20_flat, PartType.FINS, 0, 3, ResourceManager.mp_s_20, ResourceManager.universal); + + MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_solid, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene, PartType.FUSELAGE, 6, 4, ResourceManager.mp_f_15, ResourceManager.universal); + MissilePart.registerPart(ModItems.mp_fuselage_20_kerosene, PartType.FUSELAGE, 10, 8, ResourceManager.mp_f_20, ResourceManager.universal); + + MissilePart.registerPart(ModItems.mp_warhead_10_he, PartType.WARHEAD, 2, 1.5, ResourceManager.mp_w_10_he, ResourceManager.mp_w_10_he_tex); + MissilePart.registerPart(ModItems.mp_warhead_10_incendiary, PartType.WARHEAD, 2.5, 2, ResourceManager.mp_w_10_incendiary, ResourceManager.mp_w_10_incendiary_tex); + MissilePart.registerPart(ModItems.mp_warhead_15_he, PartType.WARHEAD, 3, 2.25, ResourceManager.mp_w_15, ResourceManager.universal); + MissilePart.registerPart(ModItems.mp_warhead_20_he, PartType.WARHEAD, 3, 2.25, ResourceManager.mp_w_20, ResourceManager.universal); + + } + + public static void registerPart(Item item, PartType type, double height, double guiheight, IModelCustom model, ResourceLocation texture) { + + MissilePart part = new MissilePart(item, type, height, guiheight, model, texture); parts.add(part); }