mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
hk69 model, multicloud improvement, small tex adjustments, fallout fix
This commit is contained in:
HbmMods
parent
5cfe7ca701
commit
2872cc7d69
397
assets/hbm/models/weapons/hk69.obj
Normal file
397
assets/hbm/models/weapons/hk69.obj
Normal file
@ -0,0 +1,397 @@
|
||||
# Blender v2.76 (sub 0) OBJ File: 'hk69.blend'
|
||||
# www.blender.org
|
||||
o Cube_Cube.001
|
||||
v -0.100000 0.100000 0.500000
|
||||
v -0.100000 0.200000 0.500000
|
||||
v -0.100000 0.000000 -0.500000
|
||||
v -0.100000 0.200000 -0.500000
|
||||
v 0.100000 0.100000 0.500000
|
||||
v 0.100000 0.200000 0.500000
|
||||
v 0.100000 0.000000 -0.500000
|
||||
v 0.100000 0.200000 -0.500000
|
||||
v -0.100000 0.000000 0.200000
|
||||
v 0.100000 0.000000 0.200000
|
||||
v 0.125000 0.000000 -0.500000
|
||||
v -0.125000 0.000000 -0.500000
|
||||
v 0.000000 0.450000 -0.500000
|
||||
v 0.000000 0.450000 1.000000
|
||||
v 0.129904 0.375000 -0.500000
|
||||
v 0.129904 0.375000 1.000000
|
||||
v 0.129904 0.225000 -0.500000
|
||||
v 0.129904 0.225000 1.000000
|
||||
v -0.000000 0.150000 -0.500000
|
||||
v -0.000000 0.150000 1.000000
|
||||
v -0.129904 0.225000 -0.500000
|
||||
v -0.129904 0.225000 1.000000
|
||||
v -0.129904 0.375000 -0.500000
|
||||
v -0.129904 0.375000 1.000000
|
||||
v 0.125000 0.150000 -0.500000
|
||||
v -0.125000 0.150000 -0.500000
|
||||
v 0.125000 0.450000 -0.500000
|
||||
v -0.125000 0.450000 -0.500000
|
||||
v -0.150000 0.250000 -0.500000
|
||||
v 0.150000 0.250000 -0.500000
|
||||
v -0.150000 0.400000 -0.500000
|
||||
v 0.150000 0.400000 -0.500000
|
||||
v 0.125000 0.000000 -0.650000
|
||||
v -0.125000 0.000000 -0.650000
|
||||
v 0.125000 0.150000 -0.650000
|
||||
v -0.125000 0.150000 -0.650000
|
||||
v 0.125000 0.450000 -0.650000
|
||||
v -0.125000 0.450000 -0.650000
|
||||
v -0.150000 0.250000 -0.650000
|
||||
v 0.150000 0.250000 -0.650000
|
||||
v -0.150000 0.400000 -0.650000
|
||||
v 0.150000 0.400000 -0.650000
|
||||
v -0.100000 0.000000 -0.650000
|
||||
v 0.100000 0.000000 -0.650000
|
||||
v -0.100000 0.400000 -0.650000
|
||||
v 0.100000 0.400000 -0.650000
|
||||
v -0.100000 0.350000 -0.710000
|
||||
v 0.100000 0.350000 -0.710000
|
||||
v -0.100000 0.200000 -0.710000
|
||||
v 0.100000 0.200000 -0.710000
|
||||
v -0.100000 0.400000 -1.000000
|
||||
v 0.100000 0.400000 -1.000000
|
||||
v -0.100000 -0.100000 -1.000000
|
||||
v 0.100000 -0.100000 -1.000000
|
||||
v -0.100000 0.300000 -1.100000
|
||||
v 0.100000 0.300000 -1.100000
|
||||
v -0.100000 0.000000 -1.100000
|
||||
v 0.100000 0.000000 -1.100000
|
||||
v 0.000000 0.200000 -1.000000
|
||||
v 0.000000 0.200000 -0.650000
|
||||
v 0.050000 0.150000 -1.000000
|
||||
v 0.050000 0.150000 -0.650000
|
||||
v -0.000000 0.100000 -1.000000
|
||||
v -0.000000 0.100000 -0.650000
|
||||
v -0.050000 0.150000 -1.000000
|
||||
v -0.050000 0.150000 -0.650000
|
||||
v -0.050000 0.400000 -0.785000
|
||||
v 0.050000 0.400000 -0.785000
|
||||
v -0.050000 0.350000 -0.785000
|
||||
v 0.050000 0.350000 -0.785000
|
||||
v -0.050000 0.325000 -0.710000
|
||||
v 0.050000 0.325000 -0.710000
|
||||
v -0.050000 0.275000 -0.710000
|
||||
v 0.050000 0.275000 -0.710000
|
||||
v -0.050000 0.000000 -0.575000
|
||||
v 0.050000 0.000000 -0.575000
|
||||
v -0.050000 0.000000 -0.425000
|
||||
v 0.050000 0.000000 -0.425000
|
||||
v -0.050000 -0.350000 -0.675000
|
||||
v 0.050000 -0.350000 -0.675000
|
||||
v -0.050000 -0.350000 -0.525000
|
||||
v 0.050000 -0.350000 -0.525000
|
||||
v -0.050000 0.400000 0.965000
|
||||
v 0.050000 0.400000 0.965000
|
||||
v -0.050000 0.400000 0.865000
|
||||
v 0.050000 0.400000 0.865000
|
||||
v 0.050000 0.550000 0.965000
|
||||
v -0.050000 0.550000 0.965000
|
||||
v 0.050000 0.550000 0.865000
|
||||
v -0.050000 0.550000 0.865000
|
||||
v -0.000000 0.500000 -0.585000
|
||||
v -0.000000 0.500000 -0.535000
|
||||
v 0.025000 0.450000 -0.585000
|
||||
v 0.025000 0.450000 -0.535000
|
||||
v -0.025000 0.450000 -0.585000
|
||||
v -0.025000 0.450000 -0.535000
|
||||
vt 0.760870 0.130435
|
||||
vt 0.456522 0.217391
|
||||
vt 0.326087 0.130435
|
||||
vt 0.108696 0.891304
|
||||
vt 0.239130 0.891304
|
||||
vt 0.239130 0.956522
|
||||
vt 0.326087 0.391304
|
||||
vt 0.456522 0.304348
|
||||
vt 0.760870 0.391304
|
||||
vt 0.239130 0.217391
|
||||
vt 0.326087 0.217391
|
||||
vt 0.326087 0.304348
|
||||
vt 0.760870 0.217391
|
||||
vt 0.760870 0.304348
|
||||
vt 0.760870 0.043478
|
||||
vt 0.108696 0.586957
|
||||
vt 0.108696 0.521739
|
||||
vt 0.760870 0.521739
|
||||
vt 0.108696 0.456522
|
||||
vt 0.760870 0.456522
|
||||
vt 0.217391 0.847826
|
||||
vt 0.130435 0.847826
|
||||
vt 0.130435 0.782609
|
||||
vt 0.108696 0.391304
|
||||
vt 0.108696 0.782609
|
||||
vt 0.108696 0.717391
|
||||
vt 0.760870 0.717391
|
||||
vt 0.007716 0.472674
|
||||
vt 0.007716 0.419018
|
||||
vt 0.100650 0.419018
|
||||
vt 0.108696 0.652174
|
||||
vt 0.760870 0.586957
|
||||
vt 0.760870 0.652174
|
||||
vt 0.217391 0.978261
|
||||
vt 0.130435 0.978261
|
||||
vt 0.108696 0.956522
|
||||
vt 0.760870 0.434783
|
||||
vt 0.826087 0.434783
|
||||
vt 0.826087 0.543478
|
||||
vt 0.760870 0.413043
|
||||
vt 0.826087 0.413043
|
||||
vt 0.826087 0.347826
|
||||
vt 0.826087 0.304348
|
||||
vt 0.760870 0.347826
|
||||
vt 0.826087 0.239130
|
||||
vt 0.826087 0.739130
|
||||
vt 0.826087 0.847826
|
||||
vt 0.760870 0.847826
|
||||
vt 0.760870 0.673913
|
||||
vt 0.826087 0.673913
|
||||
vt 0.760870 0.630435
|
||||
vt 0.826087 0.630435
|
||||
vt 0.760870 0.565217
|
||||
vt 0.826087 0.565217
|
||||
vt 0.369565 0.891304
|
||||
vt 0.260870 0.847826
|
||||
vt 0.347826 0.782609
|
||||
vt 0.347826 0.847826
|
||||
vt 0.847826 0.413043
|
||||
vt 0.847826 0.391304
|
||||
vt 0.934783 0.391304
|
||||
vt 0.847826 0.326087
|
||||
vt 0.934783 0.326087
|
||||
vt 0.847826 0.239130
|
||||
vt 0.956522 0.239130
|
||||
vt 0.956522 0.413043
|
||||
vt 0.000063 0.000063
|
||||
vt 0.086957 0.000000
|
||||
vt 0.086957 0.217391
|
||||
vt 0.130435 0.217391
|
||||
vt 0.130435 0.173913
|
||||
vt 0.217391 0.173913
|
||||
vt 0.217391 0.043478
|
||||
vt 0.130435 0.043478
|
||||
vt 0.130435 0.000000
|
||||
vt 0.260870 0.217391
|
||||
vt 0.152174 0.304348
|
||||
vt -0.000000 0.304348
|
||||
vt -0.000000 0.260870
|
||||
vt 0.152174 0.260870
|
||||
vt -0.000000 0.217391
|
||||
vt -0.000000 0.347826
|
||||
vt -0.000000 0.391304
|
||||
vt 0.152174 0.347826
|
||||
vt 0.869565 0.478261
|
||||
vt 0.869565 0.456522
|
||||
vt 0.913043 0.456522
|
||||
vt 0.869565 0.413043
|
||||
vt 0.913043 0.413043
|
||||
vt 0.913043 0.521739
|
||||
vt 0.869565 0.521739
|
||||
vt 0.826087 0.478261
|
||||
vt 0.826087 0.456522
|
||||
vt 0.956522 0.456522
|
||||
vt 0.956522 0.478261
|
||||
vt 0.869565 0.086957
|
||||
vt 0.804348 0.086957
|
||||
vt 0.804348 0.043478
|
||||
vt 0.760870 0.086957
|
||||
vt 0.804348 0.239130
|
||||
vt 0.869565 0.239130
|
||||
vt 0.913043 0.086957
|
||||
vt 0.978261 0.086957
|
||||
vt 0.978261 0.239130
|
||||
vt 0.913043 0.239130
|
||||
vt 0.065217 0.608696
|
||||
vt 0.108696 0.608696
|
||||
vt 0.065217 0.652174
|
||||
vt 0.065217 0.543478
|
||||
vt 0.000000 0.500000
|
||||
vt 0.021739 0.500000
|
||||
vt 0.021739 0.521739
|
||||
vt 0.021739 0.543478
|
||||
vt 0.000000 0.543478
|
||||
vt 0.043478 0.521739
|
||||
vt 0.347826 0.978261
|
||||
vt 0.260870 0.978261
|
||||
vt 0.369565 0.956522
|
||||
vt 0.326087 0.173913
|
||||
vt 0.326087 0.347826
|
||||
vt 0.239130 0.304348
|
||||
vt 0.326087 0.043478
|
||||
vt 0.217391 0.782609
|
||||
vt 0.760870 0.782609
|
||||
vt 0.100650 0.472674
|
||||
vt 0.054183 0.499502
|
||||
vt 0.054183 0.392190
|
||||
vt 0.760870 0.543478
|
||||
vt 0.760870 0.239130
|
||||
vt 0.760870 0.739130
|
||||
vt 0.260870 0.782609
|
||||
vt 0.934783 0.413043
|
||||
vt 0.934783 0.239130
|
||||
vt 0.217391 0.217391
|
||||
vt 0.217391 -0.000000
|
||||
vt 0.260870 -0.000000
|
||||
vt 0.152174 0.217391
|
||||
vt 0.152174 0.391304
|
||||
vt 0.913043 0.478261
|
||||
vt 0.869565 0.043478
|
||||
vt 0.065217 0.717391
|
||||
vt 0.108696 0.543478
|
||||
vt 0.000000 0.521739
|
||||
vn -1.000000 -0.000000 0.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.948700 0.316200
|
||||
vn 0.500000 0.866000 -0.000000
|
||||
vn 0.500000 -0.866000 0.000000
|
||||
vn -0.500000 -0.866000 0.000000
|
||||
vn -0.500000 0.866000 -0.000000
|
||||
vn 0.894400 0.447200 0.000000
|
||||
vn 0.970100 -0.242500 0.000000
|
||||
vn -0.970100 -0.242500 0.000000
|
||||
vn -0.894400 0.447200 0.000000
|
||||
vn 0.000000 0.000000 -1.000000
|
||||
vn 0.000000 0.768200 -0.640200
|
||||
vn 0.000000 -0.287300 -0.957800
|
||||
vn 0.000000 0.707100 -0.707100
|
||||
vn 0.000000 -0.707100 -0.707100
|
||||
vn 0.707100 0.707100 -0.000000
|
||||
vn 0.707100 -0.707100 0.000000
|
||||
vn -0.707100 0.707100 -0.000000
|
||||
vn -0.707100 -0.707100 0.000000
|
||||
vn 0.000000 0.707100 0.707100
|
||||
vn 0.000000 -0.274700 0.961500
|
||||
vn 0.000000 0.274700 -0.961500
|
||||
s off
|
||||
f 4/1/1 9/2/1 2/3/1
|
||||
f 29/4/2 30/5/2 32/6/2
|
||||
f 6/7/3 10/8/3 8/9/3
|
||||
f 2/10/2 1/11/2 5/12/2
|
||||
f 3/13/4 7/14/4 10/8/4
|
||||
f 8/15/5 4/1/5 2/3/5
|
||||
f 9/2/6 10/8/6 5/12/6
|
||||
f 14/16/7 16/17/7 15/18/7
|
||||
f 16/17/3 18/19/3 17/20/3
|
||||
f 25/21/2 26/22/2 12/23/2
|
||||
f 17/20/8 18/19/8 20/24/8
|
||||
f 26/22/2 25/21/2 30/5/2
|
||||
f 20/25/9 22/26/9 21/27/9
|
||||
f 24/28/2 22/29/2 18/30/2
|
||||
f 24/31/10 14/16/10 13/32/10
|
||||
f 22/26/1 24/31/1 23/33/1
|
||||
f 27/34/2 28/35/2 31/36/2
|
||||
f 27/37/5 37/38/5 38/39/5
|
||||
f 32/40/11 42/41/11 37/38/11
|
||||
f 40/42/3 42/41/3 32/40/3
|
||||
f 35/43/12 40/42/12 30/44/12
|
||||
f 33/45/3 35/43/3 25/14/3
|
||||
f 34/46/4 33/47/4 11/48/4
|
||||
f 26/49/1 36/50/1 34/46/1
|
||||
f 29/51/13 39/52/13 36/50/13
|
||||
f 31/53/1 41/54/1 39/52/1
|
||||
f 38/39/14 41/54/14 31/53/14
|
||||
f 39/55/15 40/5/15 35/56/15
|
||||
f 34/57/15 36/58/15 35/56/15
|
||||
f 46/59/16 48/60/16 47/61/16
|
||||
f 48/60/15 50/62/15 49/63/15
|
||||
f 49/63/17 50/62/17 44/64/17
|
||||
f 46/41/3 44/45/3 50/62/3
|
||||
f 49/63/1 43/65/1 45/66/1
|
||||
f 53/67/2 54/68/2 52/69/2
|
||||
f 52/70/18 56/71/18 55/72/18
|
||||
f 57/73/19 58/74/19 54/75/19
|
||||
f 56/71/15 58/74/15 57/73/15
|
||||
f 58/74/3 56/71/3 52/69/3
|
||||
f 51/76/1 55/72/1 57/73/1
|
||||
f 59/77/20 60/78/20 62/79/20
|
||||
f 61/80/21 62/79/21 64/81/21
|
||||
f 66/82/22 60/78/22 59/77/22
|
||||
f 64/83/23 66/82/23 65/84/23
|
||||
f 68/85/15 70/86/15 69/87/15
|
||||
f 70/86/19 74/88/19 73/89/19
|
||||
f 71/90/24 72/91/24 68/85/24
|
||||
f 72/92/3 74/93/3 70/86/3
|
||||
f 69/87/1 73/94/1 71/95/1
|
||||
f 80/96/4 82/97/4 81/98/4
|
||||
f 81/99/25 82/97/25 78/100/25
|
||||
f 76/101/26 80/96/26 79/102/26
|
||||
f 81/103/1 77/104/1 75/105/1
|
||||
f 76/101/3 78/100/3 82/97/3
|
||||
f 87/106/5 89/107/5 90/31/5
|
||||
f 88/108/1 90/31/1 85/26/1
|
||||
f 89/107/3 87/106/3 84/109/3
|
||||
f 94/110/11 93/111/11 91/112/11
|
||||
f 91/112/14 95/113/14 96/114/14
|
||||
f 93/115/15 95/112/15 91/111/15
|
||||
f 94/115/2 92/113/2 96/112/2
|
||||
f 38/116/15 37/117/15 42/6/15
|
||||
f 41/118/15 42/6/15 40/5/15
|
||||
f 1/119/1 2/3/1 9/2/1
|
||||
f 4/1/1 3/13/1 9/2/1
|
||||
f 31/36/2 29/4/2 32/6/2
|
||||
f 7/14/3 8/9/3 10/8/3
|
||||
f 6/7/3 5/120/3 10/8/3
|
||||
f 6/121/2 2/10/2 5/12/2
|
||||
f 9/2/4 3/13/4 10/8/4
|
||||
f 6/122/5 8/15/5 2/3/5
|
||||
f 1/11/6 9/2/6 5/12/6
|
||||
f 13/32/7 14/16/7 15/18/7
|
||||
f 15/18/3 16/17/3 17/20/3
|
||||
f 11/123/2 25/21/2 12/23/2
|
||||
f 19/9/8 17/20/8 20/24/8
|
||||
f 29/4/2 26/22/2 30/5/2
|
||||
f 19/124/9 20/25/9 21/27/9
|
||||
f 18/30/2 16/125/2 14/126/2
|
||||
f 14/126/2 24/28/2 18/30/2
|
||||
f 22/29/2 20/127/2 18/30/2
|
||||
f 23/33/10 24/31/10 13/32/10
|
||||
f 21/27/1 22/26/1 23/33/1
|
||||
f 32/6/2 27/34/2 31/36/2
|
||||
f 28/128/5 27/37/5 38/39/5
|
||||
f 27/37/11 32/40/11 37/38/11
|
||||
f 30/44/3 40/42/3 32/40/3
|
||||
f 25/14/12 35/43/12 30/44/12
|
||||
f 11/129/3 33/45/3 25/14/3
|
||||
f 12/130/4 34/46/4 11/48/4
|
||||
f 12/130/1 26/49/1 34/46/1
|
||||
f 26/49/13 29/51/13 36/50/13
|
||||
f 29/51/1 31/53/1 39/52/1
|
||||
f 28/128/14 38/39/14 31/53/14
|
||||
f 36/58/15 39/55/15 35/56/15
|
||||
f 33/131/15 34/57/15 35/56/15
|
||||
f 45/132/16 46/59/16 47/61/16
|
||||
f 47/61/15 48/60/15 49/63/15
|
||||
f 43/133/17 49/63/17 44/64/17
|
||||
f 48/60/3 46/41/3 50/62/3
|
||||
f 47/61/1 49/63/1 45/66/1
|
||||
f 51/81/2 53/67/2 52/69/2
|
||||
f 51/134/18 52/70/18 55/72/18
|
||||
f 53/135/19 57/73/19 54/75/19
|
||||
f 55/72/15 56/71/15 57/73/15
|
||||
f 54/68/3 58/74/3 52/69/3
|
||||
f 53/136/1 51/76/1 57/73/1
|
||||
f 61/80/20 59/77/20 62/79/20
|
||||
f 63/137/21 61/80/21 64/81/21
|
||||
f 65/84/22 66/82/22 59/77/22
|
||||
f 63/138/23 64/83/23 65/84/23
|
||||
f 67/139/15 68/85/15 69/87/15
|
||||
f 69/87/19 70/86/19 73/89/19
|
||||
f 67/139/24 71/90/24 68/85/24
|
||||
f 68/85/3 72/92/3 70/86/3
|
||||
f 67/139/1 69/87/1 71/95/1
|
||||
f 79/140/4 80/96/4 81/98/4
|
||||
f 77/129/25 81/99/25 78/100/25
|
||||
f 75/105/26 76/101/26 79/102/26
|
||||
f 79/102/1 81/103/1 75/105/1
|
||||
f 80/96/3 76/101/3 82/97/3
|
||||
f 88/108/5 87/106/5 90/31/5
|
||||
f 83/141/1 88/108/1 85/26/1
|
||||
f 86/142/3 89/107/3 84/109/3
|
||||
f 92/143/11 94/110/11 91/112/11
|
||||
f 92/143/14 91/112/14 96/114/14
|
||||
f 41/118/15 38/116/15 42/6/15
|
||||
f 39/55/15 41/118/15 40/5/15
|
||||
BIN
assets/hbm/textures/items/ammo_grenade_nuclear.png
Normal file
BIN
assets/hbm/textures/items/ammo_grenade_nuclear.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 300 B |
Binary file not shown.
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 347 B |
Binary file not shown.
|
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 278 B |
Binary file not shown.
|
Before Width: | Height: | Size: 268 B After Width: | Height: | Size: 235 B |
Binary file not shown.
|
Before Width: | Height: | Size: 307 B After Width: | Height: | Size: 308 B |
BIN
assets/hbm/textures/items/motor_desh.png
Normal file
BIN
assets/hbm/textures/items/motor_desh.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 268 B |
BIN
assets/hbm/textures/items/seg_10.png
Normal file
BIN
assets/hbm/textures/items/seg_10.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 248 B |
BIN
assets/hbm/textures/items/seg_15.png
Normal file
BIN
assets/hbm/textures/items/seg_15.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 332 B |
BIN
assets/hbm/textures/items/seg_20.png
Normal file
BIN
assets/hbm/textures/items/seg_20.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 387 B |
BIN
assets/hbm/textures/models/weapons/hk69.png
Normal file
BIN
assets/hbm/textures/models/weapons/hk69.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 528 B |
BIN
assets/hbm/textures/models/weapons/hk69_base.png
Normal file
BIN
assets/hbm/textures/models/weapons/hk69_base.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 675 B |
@ -156,11 +156,10 @@ public class EntityFalloutRain extends Entity {
|
||||
}
|
||||
|
||||
else if (b == Blocks.coal_ore) {
|
||||
int ra = rand.nextInt(30);
|
||||
if (ra < 9) {
|
||||
int ra = rand.nextInt(150);
|
||||
if (ra < 7) {
|
||||
worldObj.setBlock(x, y, z, Blocks.diamond_ore);
|
||||
}
|
||||
if (ra == 9) {
|
||||
} else if (ra < 10) {
|
||||
worldObj.setBlock(x, y, z, Blocks.emerald_ore);
|
||||
}
|
||||
return;
|
||||
|
||||
@ -33,6 +33,8 @@ public class GunConfiguration {
|
||||
public boolean hasSpinup;
|
||||
//whether there is a cooldown duration for spindown
|
||||
public boolean hasSpindown;
|
||||
//whether ot not to disable crosshais when sneaking
|
||||
public boolean hasSights;
|
||||
|
||||
//how long the reload animation will play
|
||||
//MUST BE GREATER THAN ZERO ! ! !
|
||||
|
||||
@ -22,6 +22,7 @@ public class GunGrenadeFactory {
|
||||
config.hasFiringAnim = false;
|
||||
config.hasSpinup = false;
|
||||
config.hasSpindown = false;
|
||||
config.hasSights = true;
|
||||
config.reloadDuration = 40;
|
||||
config.firingDuration = 0;
|
||||
config.ammoCap = 1;
|
||||
@ -67,7 +68,7 @@ public class GunGrenadeFactory {
|
||||
bullet.velocity = 2.0F;
|
||||
bullet.dmgMin = 20;
|
||||
bullet.dmgMax = 15;
|
||||
bullet.wear = 10;
|
||||
bullet.wear = 15;
|
||||
bullet.explosive = 5.0F;
|
||||
bullet.trail = 1;
|
||||
|
||||
@ -82,7 +83,7 @@ public class GunGrenadeFactory {
|
||||
bullet.velocity = 2.0F;
|
||||
bullet.dmgMin = 15;
|
||||
bullet.dmgMax = 15;
|
||||
bullet.wear = 10;
|
||||
bullet.wear = 15;
|
||||
bullet.trail = 0;
|
||||
bullet.incendiary = 2;
|
||||
|
||||
|
||||
@ -2676,7 +2676,7 @@ public class ModItems {
|
||||
gun_karl = new ItemGunBase(GunRocketFactory.getKarlConfig()).setUnlocalizedName("gun_karl").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_karl");
|
||||
gun_panzerschreck = new ItemGunBase(GunRocketFactory.getPanzConfig()).setUnlocalizedName("gun_panzerschreck").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_panzerschreck");
|
||||
gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt");
|
||||
gun_hk69 = new ItemGunBase(GunGrenadeFactory.getHK69Config()).setFull3D().setUnlocalizedName("gun_hk69").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_hk69");
|
||||
gun_hk69 = new ItemGunBase(GunGrenadeFactory.getHK69Config()).setUnlocalizedName("gun_hk69").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_hk69");
|
||||
gun_stinger = new GunStinger().setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger");
|
||||
gun_skystinger = new GunStinger().setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_skystinger");
|
||||
gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger_ammo");
|
||||
|
||||
@ -234,6 +234,9 @@ public class ItemGunBase extends Item implements IHoldableWeapon {
|
||||
count = mainConfig.ammoCap - getMag(stack);
|
||||
}
|
||||
|
||||
if(count == 0)
|
||||
setIsReloading(stack, false);
|
||||
|
||||
for(int i = 0; i < count; i++) {
|
||||
|
||||
if(getMag(stack) < mainConfig.ammoCap) {
|
||||
|
||||
@ -134,6 +134,7 @@ public class ClientProxy extends ServerProxy
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_panzerschreck, new ItemRenderRpg());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj());
|
||||
//MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg_ammo, new ItemRenderRocket());
|
||||
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti());
|
||||
|
||||
@ -72,7 +72,6 @@ public class ModEventHandlerClient {
|
||||
|
||||
RenderScreenOverlay.renderAmmo(event.resolution, Minecraft.getMinecraft().ingameGUI, ammo, count, max, dura);
|
||||
//RenderScreenOverlay.renderRadCounter(event.resolution, 0, Minecraft.getMinecraft().ingameGUI);
|
||||
|
||||
}
|
||||
|
||||
if(event.type == ElementType.HOTBAR) {
|
||||
@ -92,7 +91,8 @@ public class ModEventHandlerClient {
|
||||
if(event.type == ElementType.CROSSHAIRS && player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IHoldableWeapon) {
|
||||
event.setCanceled(true);
|
||||
|
||||
RenderScreenOverlay.renderCustomCrosshairs(event.resolution, Minecraft.getMinecraft().ingameGUI, ((IHoldableWeapon)player.getHeldItem().getItem()).getCrosshair());
|
||||
if(!(player.getHeldItem().getItem() instanceof ItemGunBase && ((ItemGunBase)player.getHeldItem().getItem()).mainConfig.hasSights && player.isSneaking()))
|
||||
RenderScreenOverlay.renderCustomCrosshairs(event.resolution, Minecraft.getMinecraft().ingameGUI, ((IHoldableWeapon)player.getHeldItem().getItem()).getCrosshair());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -281,14 +281,16 @@ public class ResourceManager {
|
||||
public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj"));
|
||||
|
||||
public static final IModelCustom brimstone = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/brimstone.obj"));
|
||||
public static final IModelCustom hk69 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/hk69.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");
|
||||
|
||||
|
||||
public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png");
|
||||
public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png");
|
||||
|
||||
|
||||
|
||||
|
||||
@ -90,13 +90,14 @@ public class MultiCloudRenderer extends Render {
|
||||
|
||||
////
|
||||
Random randy = new Random(p_76986_1_.hashCode());
|
||||
double d = randy.nextInt(10) * 0.05;
|
||||
GL11.glColor3d(1 - d, 1 - d, 1 - d);
|
||||
////
|
||||
|
||||
Random rand = new Random(100);
|
||||
|
||||
for(int i = 0; i < 5; i++) {
|
||||
|
||||
double d = randy.nextInt(10) * 0.05;
|
||||
GL11.glColor3d(1 - d, 1 - d, 1 - d);
|
||||
|
||||
double dX = (rand.nextGaussian() - 1D) * 0.15D;
|
||||
double dY = (rand.nextGaussian() - 1D) * 0.15D;
|
||||
|
||||
86
com/hbm/render/item/ItemRenderWeaponObj.java
Normal file
86
com/hbm/render/item/ItemRenderWeaponObj.java
Normal file
@ -0,0 +1,86 @@
|
||||
package com.hbm.render.item;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.lib.RefStrings;
|
||||
import com.hbm.main.ResourceManager;
|
||||
import com.hbm.render.model.ModelGustav;
|
||||
import com.hbm.render.model.ModelPanzerschreck;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
|
||||
|
||||
public class ItemRenderWeaponObj implements IItemRenderer {
|
||||
|
||||
public ItemRenderWeaponObj() { }
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
switch(type) {
|
||||
case EQUIPPED:
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
case ENTITY:
|
||||
return true;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
|
||||
if(item.getItem() == ModItems.gun_hk69)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.hk69_tex);
|
||||
|
||||
switch(type) {
|
||||
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
GL11.glTranslatef(1.0F, 0.5F, 0.0F);
|
||||
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glRotatef(-25F, 1.0F, 0.0F, 0.0F);
|
||||
GL11.glRotatef(-10F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glScaled(0.75, 0.75, 0.75);
|
||||
|
||||
if(Minecraft.getMinecraft().thePlayer.isSneaking()) {
|
||||
GL11.glTranslatef(1.16F, 0.35F, -0.8F);
|
||||
GL11.glRotatef(5.5F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glRotatef(4F, 1.0F, 0.0F, 0.0F);
|
||||
}
|
||||
break;
|
||||
|
||||
case EQUIPPED:
|
||||
GL11.glRotatef(20F, 1.0F, 0.0F, 1.0F);
|
||||
GL11.glRotatef(10F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glTranslatef(0.4F, 0.0F, 0.55F);
|
||||
GL11.glScaled(0.75, 0.75, 0.75);
|
||||
break;
|
||||
|
||||
case ENTITY:
|
||||
GL11.glTranslatef(0.0F, 0.2F, 0.0F);
|
||||
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glScaled(0.75, 0.75, 0.75);
|
||||
break;
|
||||
|
||||
default: break;
|
||||
}
|
||||
|
||||
if(item.getItem() == ModItems.gun_hk69)
|
||||
ResourceManager.hk69.renderAll();
|
||||
|
||||
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user