From 3d7776a9394cdf86933290896234ab5a59fc6659 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 11 Mar 2018 15:03:38 +0100 Subject: [PATCH] alright i'm getting sick of this shit. also, shim axe --- assets/hbm/lang/de_DE.lang | 1 + assets/hbm/lang/en_US.lang | 1 + assets/hbm/models/shimmer_axe.obj | 407 +++++++++++++++++++++ assets/hbm/textures/items/shimmer_axe.png | Bin 0 -> 262 bytes assets/hbm/textures/models/shimmer_axe.png | Bin 0 -> 322 bytes com/hbm/blocks/bomb/TurretCIWS.java | 1 - com/hbm/items/ModItems.java | 3 + com/hbm/main/ClientProxy.java | 1 + com/hbm/main/ResourceManager.java | 2 + com/hbm/render/item/ItemRenderShim.java | 11 +- 10 files changed, 424 insertions(+), 3 deletions(-) create mode 100644 assets/hbm/models/shimmer_axe.obj create mode 100644 assets/hbm/textures/items/shimmer_axe.png create mode 100644 assets/hbm/textures/models/shimmer_axe.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 8ae84866a..1bd00f2ca 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1343,6 +1343,7 @@ tile.machine_transformer.name=Transformator item.schrabidium_hammer.name=Schrabidiumhammer item.shimmer_sledge.name=Shimmer Sledge +item.shimmer_axe.name=Shimmer Axe item.euphemium_stopper.name=Stopper item.matchstick.name=Streichholz item.remote.name=Kaputte Fernbedienung diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index f7852e36f..5a5bf3d45 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1346,6 +1346,7 @@ tile.machine_transformer.name=Transformer item.schrabidium_hammer.name=Schrabidium Hammer item.shimmer_sledge.name=Shimmer Sledge +item.shimmer_axe.name=Shimmer Axe item.euphemium_stopper.name=Stopper item.matchstick.name=Matchstick item.remote.name=Broken Remote diff --git a/assets/hbm/models/shimmer_axe.obj b/assets/hbm/models/shimmer_axe.obj new file mode 100644 index 000000000..3d07217d1 --- /dev/null +++ b/assets/hbm/models/shimmer_axe.obj @@ -0,0 +1,407 @@ +# Blender v2.76 (sub 0) OBJ File: 'shimmer_axe.blend' +# www.blender.org +o Cylinder.001 +v 0.000000 0.565000 0.025000 +v 0.012500 0.100000 0.021650 +v -0.012500 0.565000 0.021651 +v 0.021651 0.100000 0.012500 +v -0.021651 0.565000 0.012500 +v 0.025000 0.100000 -0.000000 +v -0.025000 0.565000 0.000000 +v 0.021651 0.100000 -0.012500 +v -0.021651 0.565000 -0.012500 +v 0.012500 0.100000 -0.021651 +v -0.012500 0.565000 -0.021650 +v 0.000000 0.100000 -0.025000 +v 0.000000 0.565000 -0.025000 +v 0.000000 0.100000 0.025000 +v 0.075000 0.750000 -0.031250 +v 0.075000 0.875000 -0.031250 +v 0.075000 0.750000 0.031250 +v 0.075000 0.875000 0.031250 +v -0.075000 0.750000 -0.031250 +v -0.075000 0.875000 -0.031250 +v -0.075000 0.750000 0.031250 +v -0.075000 0.875000 0.031250 +v 0.125000 0.746172 -0.019140 +v 0.125000 0.878828 -0.019140 +v 0.125000 0.878828 0.019141 +v 0.125000 0.746172 0.019141 +v 0.175000 0.742188 -0.009765 +v 0.175000 0.882812 -0.009765 +v 0.175000 0.882812 0.009766 +v 0.175000 0.742188 0.009766 +v 0.225000 0.730469 0.000000 +v 0.225000 0.894531 0.000000 +v 0.237500 0.785156 0.000000 +v 0.237500 0.839844 0.000000 +v -0.012500 0.575000 0.025000 +v -0.025000 0.575000 0.021651 +v -0.034151 0.575000 0.012500 +v -0.037500 0.575000 0.000000 +v -0.034151 0.575000 -0.012500 +v -0.025000 0.575000 -0.021650 +v -0.012500 0.575000 -0.025000 +v -0.012500 0.750000 0.025000 +v -0.025000 0.750000 0.021651 +v -0.034151 0.750000 0.012500 +v -0.037500 0.750000 0.000000 +v -0.034151 0.750000 -0.012500 +v -0.025000 0.750000 -0.021650 +v -0.012500 0.750000 -0.025000 +v 0.012500 0.750000 -0.021650 +v 0.021651 0.750000 -0.012500 +v 0.025000 0.750000 0.000000 +v 0.021651 0.750000 0.012500 +v 0.012500 0.750000 0.021651 +v 0.000000 0.750000 0.025000 +v 0.000000 0.750000 -0.025000 +v 0.037500 0.065000 0.021650 +v 0.025000 0.065000 0.025000 +v 0.046651 0.065000 0.012500 +v 0.050000 0.065000 -0.000000 +v 0.046651 0.065000 -0.012500 +v 0.037500 0.065000 -0.021651 +v 0.025000 0.065000 -0.025000 +v 0.037500 0.000000 0.021650 +v 0.025000 0.000000 0.025000 +v 0.046651 0.000000 0.012500 +v 0.050000 0.000000 -0.000000 +v 0.046651 0.000000 -0.012500 +v 0.037500 0.000000 -0.021651 +v 0.025000 0.000000 -0.025000 +v -0.012500 0.000000 -0.021651 +v -0.021651 0.000000 -0.012500 +v -0.025000 0.000000 -0.000000 +v -0.021651 0.000000 0.012500 +v -0.012500 0.000000 0.021650 +v 0.000000 0.000000 0.025000 +v 0.000000 0.000000 -0.025000 +vt 0.536641 0.461590 +vt 0.552012 0.397936 +vt 0.600605 0.397936 +vt 0.463827 0.669659 +vt 0.305156 0.669659 +vt 0.305156 0.479254 +vt 0.233985 0.717629 +vt 0.392656 0.717629 +vt 0.392656 0.796965 +vt 0.048829 0.669659 +vt 0.048829 0.479254 +vt 0.207499 0.479254 +vt 0.743282 0.461590 +vt 0.743282 0.651995 +vt 0.663947 0.651995 +vt 0.536641 0.651995 +vt 0.615976 0.461590 +vt 0.043969 0.413951 +vt 0.038912 0.349377 +vt 0.217416 0.349377 +vt 0.300297 0.413951 +vt 0.468686 0.413951 +vt 0.212359 0.413951 +vt 0.663947 0.461590 +vt 0.679318 0.397936 +vt 0.727911 0.397936 +vt 0.232342 0.284721 +vt 0.162873 0.269079 +vt 0.691218 0.334267 +vt 0.716011 0.334267 +vt 0.563912 0.334267 +vt 0.295239 0.349377 +vt 0.703614 0.269079 +vt 0.023985 0.284721 +vt 0.093455 0.269079 +vt 0.576309 0.269079 +vt 0.588705 0.334267 +vt 0.488670 0.284721 +vt 0.473744 0.349377 +vt 0.419201 0.269079 +vt 0.280313 0.284721 +vt 0.349783 0.269079 +vt 0.758780 0.797967 +vt 0.536641 0.797967 +vt 0.536641 0.781540 +vt 0.849076 0.171826 +vt 0.258804 0.171825 +vt 0.849076 0.155399 +vt 0.772121 0.716933 +vt 0.758780 0.732260 +vt 0.758780 0.715833 +vt 0.775721 0.737467 +vt 0.758780 0.748686 +vt 0.778680 0.761006 +vt 0.758780 0.765113 +vt 0.772121 0.813293 +vt 0.772121 0.829720 +vt 0.758780 0.814394 +vt 0.778680 0.769220 +vt 0.778680 0.785647 +vt 0.758780 0.781540 +vt 0.775721 0.792760 +vt 0.775721 0.809187 +vt 0.536641 0.732260 +vt 0.536641 0.715833 +vt 0.536641 0.765113 +vt 0.536641 0.699966 +vt 0.536641 0.748686 +vt 0.536641 0.814394 +vt 0.771474 0.830261 +vt 0.536641 0.830261 +vt 0.105000 0.800138 +vt 0.105000 0.717629 +vt 0.121427 0.717629 +vt 0.168506 0.845319 +vt 0.137853 0.800138 +vt 0.154280 0.800138 +vt 0.113213 0.854114 +vt 0.121427 0.800138 +vt 0.066134 0.849911 +vt 0.049707 0.849911 +vt 0.072146 0.800138 +vt 0.154280 0.717629 +vt 0.186014 0.717629 +vt 0.143866 0.849911 +vt 0.096786 0.854114 +vt 0.080360 0.854114 +vt 0.088573 0.800138 +vt 0.976015 0.171826 +vt 0.976015 0.188254 +vt 0.041494 0.845319 +vt 0.025067 0.845319 +vt 0.055720 0.800138 +vt 0.055719 0.717629 +vt 0.072146 0.717629 +vt 0.137854 0.717629 +vt 0.088573 0.717629 +vt 0.023985 0.844566 +vt 0.023985 0.717629 +vt 0.854721 0.300813 +vt 0.854721 0.332547 +vt 0.791253 0.300813 +vt 0.849075 0.122545 +vt 0.023985 0.122546 +vt 0.023985 0.106119 +vt 0.849076 0.138972 +vt 0.023986 0.138973 +vt 0.023986 0.155399 +vt 0.258804 0.188252 +vt 0.976015 0.204681 +vt 0.976015 0.221108 +vt 0.258804 0.221106 +vt 0.258817 0.023987 +vt 0.975998 0.023985 +vt 0.975998 0.040412 +vt 0.849075 0.106118 +vt 0.023985 0.089692 +vt 0.258817 0.073265 +vt 0.849075 0.089691 +vt 0.975998 0.056839 +vt 0.849075 0.073264 +vt 0.258817 0.056840 +vt 0.258817 0.040413 +vt 0.463827 0.479254 +vt 0.233985 0.796965 +vt 0.207499 0.669659 +vt 0.615976 0.651995 +vt 0.023986 0.171825 +vt 0.772121 0.700506 +vt 0.775721 0.721040 +vt 0.778680 0.744580 +vt 0.771473 0.699966 +vt 0.184933 0.845319 +vt 0.129640 0.854114 +vt 0.186014 0.844566 +vt 0.160293 0.849911 +vt 0.807120 0.360030 +vt 0.795504 0.348414 +vt 0.791253 0.332547 +vt 0.795504 0.284946 +vt 0.807120 0.273330 +vt 0.822987 0.269079 +vt 0.838854 0.273330 +vt 0.850469 0.284946 +vt 0.850469 0.348414 +vt 0.838854 0.360030 +vt 0.822987 0.364281 +vt 0.258804 0.204679 +vt 0.023985 0.073266 +vt 0.975998 0.073264 +vn -0.076300 0.997100 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 +vn 0.184300 0.000000 -0.982900 +vn 0.235400 0.000000 0.971900 +vn 0.235400 0.000000 -0.971900 +vn -0.076300 -0.997100 0.000000 +vn 0.182100 -0.041600 -0.982400 +vn -0.079400 -0.996800 0.000000 +vn -0.079400 0.996800 0.000000 +vn 0.184300 0.000000 0.982900 +vn -0.228200 -0.973600 0.000000 +vn 0.182100 0.041600 -0.982400 +vn -0.228200 0.973600 0.000000 +vn 0.154400 0.000000 -0.988000 +vn 0.182100 0.041600 0.982400 +vn 0.182100 -0.041600 0.982400 +vn 0.154400 0.000000 0.988000 +vn -0.707100 -0.000000 0.707100 +vn 0.258800 0.000000 -0.965900 +vn -0.246300 -0.307800 -0.919000 +vn -0.529800 -0.662300 -0.529800 +vn -0.616100 -0.770200 -0.165100 +vn -0.246300 -0.307800 0.919000 +vn -0.616100 -0.770200 0.165100 +vn -0.529800 -0.662300 0.529800 +vn -0.258800 0.000000 -0.965900 +vn -0.965900 -0.000000 0.258800 +vn -0.965900 -0.000000 -0.258800 +vn -0.258800 -0.000000 0.965900 +vn -0.707100 -0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.254500 0.181800 -0.949800 +vn 0.795100 0.567900 -0.213000 +vn 0.631200 0.450800 0.631200 +vn 0.631200 0.450800 -0.631200 +vn 0.795100 0.567900 0.213000 +vn 0.254500 0.181800 0.949800 +vn 0.258800 0.000000 0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.707100 0.000000 0.707100 +vn 0.965900 0.000000 0.258800 +s off +f 18/1/1 25/2/1 24/3/1 +f 22/4/2 21/5/2 17/6/2 +f 20/7/3 19/8/3 21/9/3 +f 20/10/4 16/11/4 15/12/4 +f 17/13/5 21/14/5 19/15/5 +f 22/16/6 18/1/6 16/17/6 +f 24/18/7 28/19/7 27/20/7 +f 17/6/8 26/21/8 25/22/8 +f 16/11/9 24/18/9 23/23/9 +f 15/24/10 23/25/10 26/26/10 +f 31/27/11 27/20/11 33/28/11 +f 23/25/12 27/29/12 30/30/12 +f 24/3/13 25/2/13 29/31/13 +f 25/22/14 26/21/14 30/32/14 +f 27/29/15 31/33/15 30/30/15 +f 32/34/16 34/35/16 28/19/16 +f 29/31/17 32/36/17 28/37/17 +f 28/19/18 34/35/18 33/28/18 +f 32/38/19 29/39/19 34/40/19 +f 31/41/20 33/42/20 30/32/20 +f 29/39/21 30/32/21 33/42/21 +f 36/43/22 43/44/22 44/45/22 +f 12/46/23 13/47/23 10/48/23 +f 11/49/24 40/50/24 41/51/24 +f 9/52/25 39/53/25 40/50/25 +f 7/54/26 38/55/26 39/53/26 +f 3/56/27 1/57/27 35/58/27 +f 7/59/28 5/60/28 37/61/28 +f 5/62/29 3/63/29 36/43/29 +f 40/50/30 47/64/30 48/65/30 +f 37/61/31 44/45/31 45/66/31 +f 41/51/4 48/65/4 55/67/4 +f 38/55/32 45/66/32 46/68/32 +f 36/43/33 35/58/33 42/69/33 +f 39/53/34 46/68/34 47/64/34 +f 35/58/2 1/70/2 54/71/2 +f 59/72/35 66/73/35 67/74/35 +f 10/75/36 61/76/36 62/77/36 +f 6/78/37 59/72/37 60/79/37 +f 4/80/38 2/81/38 56/82/38 +f 62/77/4 69/83/4 76/84/4 +f 8/85/39 60/79/39 61/76/39 +f 6/86/40 4/87/40 58/88/40 +f 12/46/30 76/89/30 70/90/30 +f 2/91/41 14/92/41 57/93/41 +f 57/93/42 64/94/42 63/95/42 +f 60/79/43 67/74/43 68/96/43 +f 56/82/44 63/95/44 65/97/44 +f 61/76/23 68/96/23 69/83/23 +f 58/88/45 65/97/45 66/73/45 +f 57/93/2 14/98/2 75/99/2 +f 64/100/5 75/101/5 69/102/5 +f 6/103/45 51/104/45 52/105/45 +f 8/106/35 50/107/35 51/104/35 +f 10/48/43 49/108/43 50/107/43 +f 11/109/34 70/90/34 71/110/34 +f 71/110/32 72/111/32 7/112/32 +f 7/113/31 72/114/31 73/115/31 +f 4/116/44 52/105/44 53/117/44 +f 53/117/42 1/118/42 2/119/42 +f 74/120/33 14/121/33 3/122/33 +f 5/123/22 73/115/22 74/120/22 +f 16/17/1 18/1/1 24/3/1 +f 18/124/2 22/4/2 17/6/2 +f 22/125/3 20/7/3 21/9/3 +f 19/126/4 20/10/4 15/12/4 +f 15/24/5 17/13/5 19/15/5 +f 20/127/6 22/16/6 16/17/6 +f 23/23/7 24/18/7 27/20/7 +f 18/124/8 17/6/8 25/22/8 +f 15/12/9 16/11/9 23/23/9 +f 17/13/10 15/24/10 26/26/10 +f 26/26/12 23/25/12 30/30/12 +f 28/37/13 24/3/13 29/31/13 +f 29/39/14 25/22/14 30/32/14 +f 27/20/18 28/19/18 33/28/18 +f 34/40/21 29/39/21 33/42/21 +f 37/61/22 36/43/22 44/45/22 +f 49/108/23 10/48/23 13/47/23 +f 13/47/23 55/128/23 49/108/23 +f 13/129/24 11/49/24 41/51/24 +f 11/130/25 9/52/25 40/50/25 +f 9/131/26 7/54/26 39/53/26 +f 36/43/27 3/56/27 35/58/27 +f 38/55/28 7/59/28 37/61/28 +f 37/61/29 5/62/29 36/43/29 +f 41/51/30 40/50/30 48/65/30 +f 38/55/31 37/61/31 45/66/31 +f 13/132/4 41/51/4 55/67/4 +f 39/53/32 38/55/32 46/68/32 +f 43/44/33 36/43/33 42/69/33 +f 40/50/34 39/53/34 47/64/34 +f 42/69/2 35/58/2 54/71/2 +f 60/79/35 59/72/35 67/74/35 +f 12/133/36 10/75/36 62/77/36 +f 8/134/37 6/78/37 60/79/37 +f 58/88/38 4/80/38 56/82/38 +f 12/135/4 62/77/4 76/84/4 +f 10/136/39 8/85/39 61/76/39 +f 59/72/40 6/86/40 58/88/40 +f 70/90/30 11/109/30 12/46/30 +f 13/47/30 12/46/30 11/109/30 +f 56/82/41 2/91/41 57/93/41 +f 56/82/42 57/93/42 63/95/42 +f 61/76/43 60/79/43 68/96/43 +f 58/88/44 56/82/44 65/97/44 +f 62/77/23 61/76/23 69/83/23 +f 59/72/45 58/88/45 66/73/45 +f 64/94/2 57/93/2 75/99/2 +f 71/137/5 70/138/5 76/139/5 +f 76/139/5 69/102/5 75/101/5 +f 68/140/5 67/141/5 66/142/5 +f 66/142/5 65/143/5 68/140/5 +f 63/144/5 64/100/5 68/140/5 +f 75/101/5 74/145/5 73/146/5 +f 73/146/5 72/147/5 71/137/5 +f 71/137/5 76/139/5 73/146/5 +f 68/140/5 65/143/5 63/144/5 +f 64/100/5 69/102/5 68/140/5 +f 73/146/5 76/139/5 75/101/5 +f 4/116/45 6/103/45 52/105/45 +f 6/103/35 8/106/35 51/104/35 +f 8/106/43 10/48/43 50/107/43 +f 9/148/34 11/109/34 71/110/34 +f 9/148/32 71/110/32 7/112/32 +f 5/123/31 7/113/31 73/115/31 +f 2/119/44 4/116/44 53/117/44 +f 14/121/42 2/119/42 1/118/42 +f 53/117/42 54/149/42 1/118/42 +f 1/118/33 3/122/33 14/121/33 +f 74/120/33 75/150/33 14/121/33 +f 3/122/22 5/123/22 74/120/22 diff --git a/assets/hbm/textures/items/shimmer_axe.png b/assets/hbm/textures/items/shimmer_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..9629508061abca2374a444e85407f930f8d11d85 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#zZj>;B%`ij&#b?sa@QXKQu!`y5MWzko#j)`mNZCs-z3)B33(5b^$Vs-?u$ z@3j}}B-obMZaDPWCVAGfv$MBLtVtAP6ufGp#yqv-N|5mNrjW`vr=HfebsVUUKbrZA*AoMKq!w{9{0a5N@+_p&_A5z z)vc5fz{0!v>eClbuUkK#^W|+^)78EMZ(3K#>bzwLF?QEzVspK)fI~{eu~{j@YXz1!{=%7lLWIwj1D^H+JJNc^vvY24GJcURB9Iz@CdiqZf8 literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/bomb/TurretCIWS.java b/com/hbm/blocks/bomb/TurretCIWS.java index cbb9d4d39..909623696 100644 --- a/com/hbm/blocks/bomb/TurretCIWS.java +++ b/com/hbm/blocks/bomb/TurretCIWS.java @@ -74,7 +74,6 @@ public class TurretCIWS extends TurretBase { } private void rayShot(World world, Vec3 vec, double posX, double posY, double posZ, int range, float damage, int hitPercent) { - List entities = world.getLoadedEntityList(); for(float i = 0; i < range; i += 0.25F) { double pX = posX + vec.xCoord * i; diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index af48e45e5..525a309f8 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -969,6 +969,7 @@ public class ModItems { public static Item schrabidium_hammer; public static Item shimmer_sledge; + public static Item shimmer_axe; public static Item bottle_opener; public static Item crowbar; @@ -2186,6 +2187,7 @@ public class ModItems { schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer"); shimmer_sledge = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_sledge").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_sledge_original"); + shimmer_axe = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_axe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_axe"); bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener"); euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper"); matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick"); @@ -3193,6 +3195,7 @@ public class ModItems { GameRegistry.registerItem(schrabidium_sword, schrabidium_sword.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_hammer, schrabidium_hammer.getUnlocalizedName()); GameRegistry.registerItem(shimmer_sledge, shimmer_sledge.getUnlocalizedName()); + GameRegistry.registerItem(shimmer_axe, shimmer_axe.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_pickaxe, schrabidium_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_axe, schrabidium_axe.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_shovel, schrabidium_shovel.getUnlocalizedName()); diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index f5c964736..34b5174fc 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -199,6 +199,7 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.multitool_decon, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_sledge, new ItemRenderShim()); + MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_axe, new ItemRenderShim()); RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke()); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index a54e83270..08f89490b 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -111,11 +111,13 @@ public class ResourceManager { //Shimmer Sledge public static final IModelCustom shimmer_sledge = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_sledge.obj")); + public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj")); ////Texture Items //Shimmer Sledge public static final ResourceLocation shimmer_sledge_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_sledge.png"); + public static final ResourceLocation shimmer_axe_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_axe.png"); diff --git a/com/hbm/render/item/ItemRenderShim.java b/com/hbm/render/item/ItemRenderShim.java index c34168630..6023823b0 100644 --- a/com/hbm/render/item/ItemRenderShim.java +++ b/com/hbm/render/item/ItemRenderShim.java @@ -2,6 +2,7 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; +import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; @@ -42,12 +43,18 @@ public class ItemRenderShim implements IItemRenderer { case EQUIPPED_FIRST_PERSON: case ENTITY: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.shimmer_sledge_tex); + if(item.getItem() == ModItems.shimmer_sledge) + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.shimmer_sledge_tex); + if(item.getItem() == ModItems.shimmer_axe) + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.shimmer_axe_tex); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glScalef(1.5F, 1.5F, 1.5F); GL11.glTranslatef(0.45F, -0.3F, 0.0F); - ResourceManager.shimmer_sledge.renderAll(); + if(item.getItem() == ModItems.shimmer_sledge) + ResourceManager.shimmer_sledge.renderAll(); + if(item.getItem() == ModItems.shimmer_axe) + ResourceManager.shimmer_axe.renderAll(); GL11.glPopMatrix(); default: break; }