bottlecap blocks, egon backpack texture, aschrab cell model

This commit is contained in:
Bob 2020-11-09 21:07:50 +01:00
parent 87e669ad36
commit 52de90017a
27 changed files with 685 additions and 53 deletions

View File

@ -0,0 +1,559 @@
# Blender v2.79 (sub 0) OBJ File: 'grenade_aschrab.blend'
# www.blender.org
o Torus
v 0.535761 1.145096 -0.010591
v 0.451152 0.966383 -0.287183
v 0.450856 1.052470 -0.296618
v 0.516800 1.191760 -0.081039
v 0.387558 1.013568 -0.252120
v 0.453503 1.152858 -0.036541
v 0.221725 1.089753 -0.505686
v 0.272038 1.148626 -0.466922
v 0.208740 1.109724 -0.422424
v 0.076906 1.391834 -0.447596
v 0.159164 1.384071 -0.421645
v 0.095867 1.345169 -0.377148
v 0.161515 1.570546 -0.171003
v 0.225109 1.523361 -0.206066
v 0.161811 1.484460 -0.161568
v 0.390942 1.447177 0.047499
v 0.403927 1.427206 -0.035763
v 0.340629 1.388304 0.008735
v 0.000000 1.095000 0.481707
v -0.417171 1.095000 0.240853
v -0.417171 1.095000 -0.240854
v 0.000000 1.095000 -0.481707
v 0.417170 1.095000 0.240854
v 0.417170 1.095000 -0.240854
v 0.417170 -0.955000 -0.240854
v 0.000000 -0.955000 -0.481707
v -0.417171 -0.955000 -0.240854
v -0.417171 -0.955000 0.240853
v 0.417170 -0.955000 0.240854
v 0.000000 -0.955000 0.481707
v 0.402481 1.284100 -0.232373
v 0.402481 1.284100 0.232373
v 0.000000 1.284100 -0.464745
v -0.402481 1.284100 -0.232373
v -0.402481 1.284100 0.232372
v 0.000000 1.284100 0.464745
v 0.000000 -1.144099 0.464745
v 0.402481 -1.144099 0.232373
v 0.000000 -1.144099 -0.464745
v 0.402481 -1.144100 -0.232373
v -0.402481 -1.144100 0.232373
v -0.402481 -1.144100 -0.232373
v -0.185000 1.275000 -0.185000
v -0.185000 1.576083 -0.185000
v 0.185000 1.576083 -0.185000
v 0.185000 1.275000 -0.185000
v 0.185000 1.645000 -0.116083
v 0.185000 1.645000 0.185000
v -0.185000 1.645000 0.185000
v -0.185000 1.645000 -0.116082
v -0.185000 1.645000 0.318043
v 0.185000 1.645000 0.318043
v 0.185000 1.275000 -0.185000
v 0.185000 1.593779 0.543069
v 0.185000 1.479803 0.654830
v -0.185000 1.275000 -0.185000
v -0.185000 1.479802 0.654830
v -0.185000 1.593779 0.543069
v -0.185000 1.354530 0.699642
v 0.185000 1.354530 0.699642
v 0.185000 1.065725 0.750379
v -0.185000 1.065725 0.750379
v -0.185000 -0.980412 0.540406
v -0.185000 -0.878680 0.667896
v 0.185000 -0.980412 0.540406
v 0.185000 -0.878680 0.667896
v 0.000000 -0.955000 -0.400000
v 0.000000 1.095000 -0.400000
v 0.346410 1.095000 -0.200000
v 0.346410 -0.955000 -0.200000
v 0.346410 1.095000 0.200000
v 0.346410 -0.955000 0.200000
v 0.000000 1.095000 0.400000
v 0.000000 -0.955000 0.400000
v -0.346410 1.095000 0.200000
v -0.346410 -0.955000 0.200000
v -0.346410 1.095000 -0.200000
v -0.346410 -0.955000 -0.200000
v -0.000000 -0.955000 -0.320000
v -0.000000 1.095000 -0.320000
v 0.277128 1.095000 -0.160000
v 0.277128 -0.955000 -0.160000
v 0.277128 1.095000 0.160000
v 0.277128 -0.955000 0.160000
v -0.000000 1.095000 0.320000
v -0.000000 -0.955000 0.320000
v -0.277128 1.095000 0.160000
v -0.277128 -0.955000 0.160000
v -0.277128 1.095000 -0.160000
v -0.277128 -0.955000 -0.160000
v 0.417170 -0.955000 -0.240854
v 0.000000 -0.955000 -0.481707
v -0.417171 -0.955000 -0.240854
v -0.417171 -0.955000 0.240853
v 0.417170 -0.955000 0.240854
v 0.000000 -0.955000 0.481707
v 0.000000 -1.144099 0.464745
v 0.402481 -1.144099 0.232373
v 0.000000 -1.144099 -0.464745
v 0.402481 -1.144100 -0.232373
v -0.402481 -1.144100 0.232373
v -0.402481 -1.144100 -0.232373
v 0.000000 1.095000 0.481707
v -0.417171 1.095000 0.240853
v -0.417171 1.095000 -0.240854
v 0.000000 1.095000 -0.481707
v 0.417170 1.095000 0.240854
v 0.417170 1.095000 -0.240854
v 0.402481 1.284100 -0.232373
v 0.402481 1.284100 0.232373
v 0.000000 1.284100 -0.464745
v -0.402481 1.284100 -0.232373
v -0.402481 1.284100 0.232372
v 0.000000 1.284100 0.464745
v -0.185000 1.275000 -0.185000
v -0.185000 1.576083 -0.185000
v 0.185000 1.576083 -0.185000
v 0.185000 1.275000 -0.185000
v 0.185000 1.645000 -0.116083
v 0.185000 1.645000 0.185000
v 0.185000 1.275000 0.185000
v -0.185000 1.275000 0.185000
v -0.185000 1.645000 0.185000
v -0.185000 1.645000 -0.116082
v -0.185000 1.645000 0.318043
v 0.185000 1.645000 0.318043
v 0.185000 1.488427 0.474616
v 0.185000 1.593779 0.543069
v 0.185000 1.479803 0.654830
v 0.185000 1.275000 0.474615
v -0.185000 1.275000 0.474616
v -0.185000 1.488427 0.474616
v -0.185000 1.479802 0.654830
v -0.185000 1.593779 0.543069
v -0.185000 1.252799 0.572153
v -0.185000 1.354530 0.699642
v 0.185000 1.354530 0.699642
v 0.185000 1.252799 0.572153
v 0.185000 1.065725 0.750379
v 0.185000 0.963994 0.622889
v -0.185000 1.065725 0.750379
v -0.185000 0.963994 0.622889
v -0.185000 -0.980412 0.540406
v -0.185000 -0.878680 0.667896
v 0.185000 -0.980412 0.540406
v 0.185000 -0.878680 0.667896
v 0.185000 1.275000 0.185000
v -0.185000 1.275000 0.185000
v 0.185000 1.275000 0.474615
v -0.185000 1.275000 0.474616
v -0.185000 1.252799 0.572153
v 0.185000 1.252799 0.572153
v 0.185000 0.963994 0.622889
v -0.185000 0.963994 0.622889
v -0.185000 -0.980412 0.540406
v 0.185000 -0.980412 0.540406
vt 0.019171 0.954583
vt 0.019171 0.869535
vt 0.113079 0.827012
vt 0.607223 0.610035
vt 0.671569 0.572408
vt 0.618317 0.619507
vt 0.203680 0.953086
vt 0.113079 0.994112
vt 0.022478 0.953086
vt 0.980146 0.619507
vt 0.929532 0.621191
vt 0.926894 0.572408
vt 0.113079 0.997107
vt 0.019171 0.954583
vt 0.113079 0.827012
vt 0.113079 0.994112
vt 0.022478 0.953086
vt 0.022478 0.871033
vt 0.879730 0.602167
vt 0.868974 0.616440
vt 0.849374 0.602038
vt 0.907167 0.621935
vt 0.718733 0.602167
vt 0.729489 0.616441
vt 0.691295 0.621935
vt 0.736809 0.571646
vt 0.757515 0.585772
vt 0.749089 0.602038
vt 0.840948 0.585772
vt 0.861653 0.571646
vt 0.830359 0.547978
vt 0.851065 0.533852
vt 0.747398 0.533852
vt 0.768104 0.291153
vt 0.768104 0.547978
vt 0.830359 0.291153
vt 0.851065 0.277027
vt 0.206987 0.869535
vt 0.206987 0.954583
vt 0.113079 0.997107
vt 0.609370 0.570338
vt 0.668930 0.621191
vt 0.022478 0.871033
vt 0.113079 0.830007
vt 0.203680 0.871033
vt 0.989092 0.570338
vt 0.991239 0.610035
vt 0.019171 0.869536
vt 0.206987 0.869536
vt 0.206987 0.954583
vt 0.113079 0.830007
vt 0.203680 0.871033
vt 0.203680 0.953086
vt 0.878208 0.574028
vt 0.720255 0.574028
vt 0.747398 0.277027
vt 0.864221 0.743044
vt 0.820902 0.611393
vt 0.864218 0.595072
vt 0.772849 0.726725
vt 0.772847 0.611393
vt 0.729532 0.743046
vt 0.729530 0.595073
vt 0.864220 0.166389
vt 0.820904 0.034736
vt 0.864221 0.018416
vt 0.772848 0.150068
vt 0.772849 0.034736
vt 0.729532 0.018415
vt 0.864221 0.133748
vt 0.820901 0.265399
vt 0.820903 0.150068
vt 0.772846 0.265399
vt 0.729531 0.133747
vt 0.864217 0.397051
vt 0.864218 0.249079
vt 0.820900 0.380731
vt 0.729529 0.397051
vt 0.729530 0.249078
vt 0.864218 0.512382
vt 0.864217 0.364410
vt 0.772846 0.496062
vt 0.772845 0.380731
vt 0.729529 0.364410
vt 0.864219 0.627713
vt 0.820902 0.496062
vt 0.864218 0.479741
vt 0.729530 0.627714
vt 0.729529 0.479742
vt 0.250000 0.784314
vt 0.125000 0.823529
vt 0.125000 0.784314
vt 0.625000 0.784314
vt 0.500000 0.823529
vt 0.500000 0.784314
vt 0.375000 0.823529
vt 0.250000 0.823529
vt -0.000000 0.823529
vt -0.000000 0.784314
vt 0.375000 0.784314
vt 0.750000 0.784314
vt 0.625000 0.823529
vt 0.625000 0.784314
vt 0.750000 0.823529
vt 0.625000 0.823529
vt 0.375000 0.784314
vt 0.250000 0.823529
vt 0.250000 0.784314
vt 0.000000 0.784314
vt 0.125000 0.823529
vt 0.000000 0.823529
vt 0.500000 0.784314
vt 0.500000 0.823529
vt 0.125000 0.784314
vt 0.375000 0.823529
vt 0.768104 0.725903
vt 0.830359 0.765636
vt 0.768104 0.765636
vt 0.768104 0.673309
vt 0.830359 0.655752
vt 0.830359 0.673309
vt 0.768104 0.625297
vt 0.830359 0.604231
vt 0.830359 0.625297
vt 0.685143 0.533852
vt 0.747398 0.277027
vt 0.747398 0.533852
vt 0.768104 0.655752
vt 0.830359 0.586674
vt 0.768104 0.604231
vt 0.768104 0.586674
vt 0.830359 0.713042
vt 0.768104 0.713041
vt 0.685143 0.572548
vt 0.747398 0.572548
vt 0.747398 0.585748
vt 0.747398 0.623968
vt 0.685143 0.585749
vt 0.830359 0.547978
vt 0.830359 0.269629
vt 0.768104 0.291153
vt 0.768104 0.269629
vt 0.768104 0.547978
vt 0.830359 0.291153
vt 0.685143 0.672795
vt 0.747398 0.672795
vt 0.300000 0.392157
vt 0.200000 -0.000000
vt 0.300000 0.000000
vt 0.200000 0.392157
vt 0.100000 0.000000
vt 0.100000 0.392157
vt -0.000000 -0.000000
vt 0.600000 0.392157
vt 0.500000 0.000000
vt 0.600000 0.000000
vt 0.500000 0.392157
vt 0.400000 -0.000000
vt 0.400000 0.392157
vt 0.300000 0.784314
vt 0.200000 0.392157
vt 0.300000 0.392157
vt 0.200000 0.784314
vt 0.100000 0.392157
vt 0.100000 0.784314
vt 0.000000 0.392157
vt 0.600000 0.784314
vt 0.500000 0.392157
vt 0.600000 0.392157
vt 0.500000 0.784314
vt 0.400000 0.392157
vt 0.400000 0.784314
vt 0.820904 0.726724
vt 0.729531 0.166388
vt 0.864218 0.281720
vt 0.729530 0.281719
vt 0.729529 0.512383
vt 0.750000 0.823529
vt 0.750000 0.784314
vt 0.830359 0.725903
vt 0.685143 0.277027
vt 0.685143 0.623968
vt 0.000000 0.392157
vt 0.000000 0.784314
vn 0.0000 -1.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 1.0000 0.0000
vn 1.0000 -0.0000 0.0000
vn 0.4259 -0.8885 -0.1709
vn 0.5590 0.5197 -0.6460
vn 0.6748 -0.3628 0.6427
vn -0.8084 -0.2363 0.5392
vn -0.8648 -0.3553 0.3549
vn -0.2489 -0.5256 -0.8135
vn 0.6154 0.6388 -0.4618
vn -0.6555 -0.3185 0.6847
vn 0.8648 0.3553 -0.3549
vn 0.7683 0.5566 -0.3162
vn -0.5590 -0.5197 0.6460
vn -0.4259 0.8885 0.1709
vn -0.6748 0.3628 -0.6427
vn 0.8084 0.2363 -0.5392
vn 0.2488 0.5256 0.8135
vn -0.7683 -0.5566 0.3162
vn -0.6154 -0.6388 0.4618
vn 0.6555 0.3185 -0.6847
vn 0.8626 0.0893 -0.4980
vn 0.8626 0.0893 0.4980
vn -0.8626 0.0893 0.4980
vn -0.8626 0.0893 -0.4980
vn 0.0000 0.0893 -0.9960
vn -0.0000 0.0893 0.9960
vn 0.8626 -0.0893 0.4980
vn -0.0000 -0.0893 0.9960
vn 0.0000 -0.0893 -0.9960
vn -0.8626 -0.0893 -0.4980
vn -0.8626 -0.0893 0.4980
vn 0.8626 -0.0893 -0.4980
vn -0.0000 0.3827 -0.9239
vn 0.0000 0.0000 -1.0000
vn 0.0000 0.9937 0.1117
vn -0.0000 0.8730 0.4878
vn -0.0000 0.5308 0.8475
vn 0.0000 0.8730 0.4877
vn 0.0000 -0.0657 -0.9978
vn 0.0000 0.0424 -0.9991
vn -0.0000 0.2558 0.9667
vn -0.0000 0.9239 -0.3827
vn -0.0000 -0.6892 -0.7245
vn -0.0000 -0.9937 -0.1117
vn 0.0000 0.0657 0.9978
vn 0.0000 -0.7816 0.6237
vn 0.0000 -0.4528 0.8916
vn 0.8660 0.0000 -0.5000
vn 0.8660 -0.0000 0.5000
vn -0.0000 -0.0000 1.0000
vn -0.8660 -0.0000 0.5000
vn -0.8660 0.0000 -0.5000
s off
f 104/1/1 105/2/1 106/3/1
f 116/4/2 122/5/2 124/6/2
f 113/7/3 114/8/3 110/9/3
f 119/10/4 120/11/4 121/12/4
f 96/13/3 95/14/3 92/15/3
f 97/16/1 101/17/1 102/18/1
f 127/19/4 128/20/4 129/21/4
f 127/19/4 121/12/4 126/22/4
f 132/23/2 134/24/2 125/25/2
f 122/5/2 132/23/2 125/25/2
f 135/26/2 136/27/2 133/28/2
f 129/21/4 137/29/4 138/30/4
f 138/30/4 139/31/4 140/32/4
f 142/33/2 144/34/2 141/35/2
f 135/26/2 141/35/2 136/27/2
f 140/32/4 146/36/4 145/37/4
f 106/3/1 108/38/1 107/39/1
f 107/39/1 103/40/1 106/3/1
f 103/40/1 104/1/1 106/3/1
f 115/41/2 122/5/2 116/4/2
f 122/5/2 123/42/2 124/6/2
f 110/9/3 109/43/3 113/7/3
f 109/43/3 111/44/3 113/7/3
f 111/44/3 112/45/3 113/7/3
f 121/12/4 118/46/4 117/47/4
f 117/47/4 119/10/4 121/12/4
f 95/14/3 91/48/3 92/15/3
f 92/15/3 93/49/3 94/50/3
f 94/50/3 96/13/3 92/15/3
f 102/18/1 99/51/1 97/16/1
f 99/51/1 100/52/1 97/16/1
f 100/52/1 98/53/1 97/16/1
f 127/19/4 126/22/4 128/20/4
f 130/54/4 121/12/4 127/19/4
f 121/12/4 120/11/4 126/22/4
f 132/23/2 133/28/2 134/24/2
f 125/25/2 123/42/2 122/5/2
f 122/5/2 131/55/2 132/23/2
f 133/28/2 132/23/2 135/26/2
f 132/23/2 131/55/2 135/26/2
f 138/30/4 130/54/4 127/19/4
f 127/19/4 129/21/4 138/30/4
f 138/30/4 137/29/4 139/31/4
f 142/33/2 143/56/2 144/34/2
f 135/26/2 142/33/2 141/35/2
f 140/32/4 139/31/4 146/36/4
s 1
f 2/57/5 4/58/6 1/59/7
f 4/58/6 5/60/8 6/61/9
f 6/61/9 2/62/5 1/63/7
f 7/64/10 3/65/11 2/66/5
f 3/65/11 9/67/12 5/68/8
f 9/67/12 2/69/5 5/68/8
f 7/70/10 11/71/13 8/72/14
f 11/71/13 9/67/12 8/72/14
f 12/73/15 7/74/10 9/67/12
f 13/75/16 11/71/13 10/76/17
f 14/77/18 12/73/15 11/71/13
f 12/73/15 13/78/16 10/79/17
f 16/80/19 14/77/18 13/81/16
f 14/77/18 18/82/20 15/83/21
f 18/82/20 13/84/16 15/83/21
f 1/85/7 17/86/22 16/87/19
f 4/58/6 18/82/20 17/86/22
f 18/82/20 1/88/7 16/89/19
f 24/90/23 32/91/24 23/92/24
f 20/93/25 34/94/26 21/95/26
f 24/90/23 33/96/27 31/97/23
f 23/92/24 36/98/28 19/99/28
f 22/100/27 34/94/26 33/96/27
f 19/101/28 35/102/25 20/93/25
f 29/103/29 37/104/30 38/105/29
f 26/106/31 42/107/32 27/108/32
f 30/109/30 41/110/33 37/111/30
f 25/112/34 38/105/29 40/113/34
f 28/114/33 42/107/32 41/110/33
f 25/112/34 39/115/31 26/106/31
f 44/116/35 46/117/36 43/118/36
f 49/119/3 52/120/37 48/121/3
f 58/122/38 55/123/39 54/124/40
f 153/125/41 155/126/42 154/127/41
f 51/128/37 54/124/40 52/120/37
f 60/129/43 57/130/39 59/131/43
f 47/132/44 44/116/35 50/133/44
f 50/133/44 48/121/3 47/132/44
f 152/134/45 154/127/41 151/135/45
f 150/136/46 152/134/45 151/135/45
f 148/137/1 149/138/46 150/136/46
f 59/131/43 61/139/47 60/129/43
f 65/140/48 64/141/49 63/142/48
f 62/143/47 66/144/49 61/139/47
f 53/145/1 148/137/1 56/146/1
f 68/147/36 70/148/50 67/149/36
f 69/150/50 72/151/51 70/148/50
f 71/152/51 74/153/52 72/151/51
f 73/154/52 76/155/53 74/156/52
f 75/157/53 78/158/54 76/155/53
f 77/159/54 67/149/36 78/158/54
f 80/160/36 82/161/50 79/162/36
f 81/163/50 84/164/51 82/161/50
f 83/165/51 86/166/52 84/164/51
f 85/167/52 88/168/53 86/169/52
f 87/170/53 90/171/54 88/168/53
f 89/172/54 79/162/36 90/171/54
f 2/57/5 3/173/11 4/58/6
f 4/58/6 3/173/11 5/60/8
f 6/61/9 5/60/8 2/62/5
f 7/64/10 8/72/14 3/65/11
f 3/65/11 8/72/14 9/67/12
f 9/67/12 7/174/10 2/69/5
f 7/70/10 10/175/17 11/71/13
f 11/71/13 12/73/15 9/67/12
f 12/73/15 10/176/17 7/74/10
f 13/75/16 14/77/18 11/71/13
f 14/77/18 15/83/21 12/73/15
f 12/73/15 15/83/21 13/78/16
f 16/80/19 17/86/22 14/77/18
f 14/77/18 17/86/22 18/82/20
f 18/82/20 16/177/19 13/84/16
f 1/85/7 4/58/6 17/86/22
f 4/58/6 6/61/9 18/82/20
f 18/82/20 6/61/9 1/88/7
f 24/90/23 31/97/23 32/91/24
f 20/93/25 35/102/25 34/94/26
f 24/90/23 22/100/27 33/96/27
f 23/92/24 32/91/24 36/98/28
f 22/100/27 21/95/26 34/94/26
f 19/101/28 36/178/28 35/102/25
f 29/103/29 30/179/30 37/104/30
f 26/106/31 39/115/31 42/107/32
f 30/109/30 28/114/33 41/110/33
f 25/112/34 29/103/29 38/105/29
f 28/114/33 27/108/32 42/107/32
f 25/112/34 40/113/34 39/115/31
f 44/116/35 45/180/35 46/117/36
f 49/119/3 51/128/37 52/120/37
f 58/122/38 57/130/39 55/123/39
f 153/125/41 156/181/42 155/126/42
f 51/128/37 58/122/38 54/124/40
f 60/129/43 55/123/39 57/130/39
f 47/132/44 45/180/35 44/116/35
f 50/133/44 49/119/3 48/121/3
f 152/134/45 153/125/41 154/127/41
f 150/136/46 149/138/46 152/134/45
f 148/137/1 147/182/1 149/138/46
f 59/131/43 62/143/47 61/139/47
f 65/140/48 66/144/49 64/141/49
f 62/143/47 64/141/49 66/144/49
f 53/145/1 147/182/1 148/137/1
f 68/147/36 69/150/50 70/148/50
f 69/150/50 71/152/51 72/151/51
f 71/152/51 73/183/52 74/153/52
f 73/154/52 75/157/53 76/155/53
f 75/157/53 77/159/54 78/158/54
f 77/159/54 68/147/36 67/149/36
f 80/160/36 81/163/50 82/161/50
f 81/163/50 83/165/51 84/164/51
f 83/165/51 85/184/52 86/166/52
f 85/167/52 87/170/53 88/168/53
f 87/170/53 89/172/54 90/171/54
f 89/172/54 80/160/36 79/162/36

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 B

View File

@ -18,6 +18,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockFalling;
import net.minecraft.block.material.*;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@ -159,6 +160,15 @@ public class ModBlocks {
public static Block block_daffergon;
public static Block block_verticium;
public static Block block_cap_nuka;
public static Block block_cap_quantum;
public static Block block_cap_rad;
public static Block block_cap_sparkle;
public static Block block_cap_korl;
public static Block block_cap_fritz;
public static Block block_cap_sunset;
public static Block block_cap_star;
public static Block deco_titanium;
public static Block deco_red_copper;
public static Block deco_tungsten;
@ -966,6 +976,15 @@ public class ModBlocks {
block_daffergon = new BlockGeneric(Material.iron).setBlockName("block_daffergon").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_daffergon");
block_verticium = new BlockGeneric(Material.iron).setBlockName("block_verticium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_verticium");
block_cap_nuka = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_nuka_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_nuka").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_nuka");
block_cap_quantum = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_quantum_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_quantum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_quantum");
block_cap_rad = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_rad_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_rad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_rad");
block_cap_sparkle = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_sparkle_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sparkle").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sparkle");
block_cap_korl = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_korl_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_korl").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_korl");
block_cap_fritz = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_fritz_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_fritz").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_fritz");
block_cap_sunset = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_sunset_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sunset").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sunset");
block_cap_star = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_star_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_star").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_star");
deco_titanium = new BlockOre(Material.iron).setBlockName("deco_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_titanium");
deco_red_copper = new BlockOre(Material.iron).setBlockName("deco_red_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_red_copper");
deco_tungsten = new BlockOre(Material.iron).setBlockName("deco_tungsten").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_tungsten");
@ -1638,6 +1657,16 @@ public class ModBlocks {
GameRegistry.registerBlock(block_unobtainium, ItemOreBlock.class, block_unobtainium.getUnlocalizedName());
GameRegistry.registerBlock(block_daffergon, ItemOreBlock.class, block_daffergon.getUnlocalizedName());
GameRegistry.registerBlock(block_verticium, ItemOreBlock.class, block_verticium.getUnlocalizedName());
//Bottlecap Blocks
GameRegistry.registerBlock(block_cap_nuka, block_cap_nuka.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_quantum, block_cap_quantum.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_rad, block_cap_rad.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_sparkle, block_cap_sparkle.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_korl, block_cap_korl.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_fritz, block_cap_fritz.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_sunset, block_cap_sunset.getUnlocalizedName());
GameRegistry.registerBlock(block_cap_star, block_cap_star.getUnlocalizedName());
//Deco Blocks
GameRegistry.registerBlock(deco_titanium, deco_titanium.getUnlocalizedName());

View File

@ -10,50 +10,70 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public abstract class EntityGrenadeBase extends EntityThrowable {
public EntityGrenadeBase(World p_i1773_1_)
{
super(p_i1773_1_);
}
public EntityGrenadeBase(World p_i1773_1_) {
super(p_i1773_1_);
}
public EntityGrenadeBase(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeBase(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeBase(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
public EntityGrenadeBase(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
@Override
public void onUpdate() {
super.onUpdate();
this.prevRotationPitch = this.rotationPitch;
this.rotationPitch -= Vec3.createVectorHelper(motionX, motionY, motionZ).lengthVector() * 25;
this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
while (this.rotationYaw - this.prevRotationYaw < -180.0F)
{
byte b0 = 0;
this.prevRotationYaw -= 360.0F;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
while (this.rotationYaw - this.prevRotationYaw >= 180.0F)
{
this.prevRotationYaw += 360.0F;
}
if(!worldObj.isRemote) {
if(GeneralConfig.enableExtendedLogging) {
String s = "null";
if(getThrower() != null && getThrower() instanceof EntityPlayer)
s = ((EntityPlayer)getThrower()).getDisplayName();
MainRegistry.logger.log(Level.INFO, "[GREN] Set off grenade at " + ((int)posX) + " / " + ((int)posY) + " / " + ((int)posZ) + " by " + s + "!");
}
}
this.explode();
}
public abstract void explode();
this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F;
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_) {
if(p_70184_1_.entityHit != null) {
byte b0 = 0;
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
if(!worldObj.isRemote) {
if(GeneralConfig.enableExtendedLogging) {
String s = "null";
if(getThrower() != null && getThrower() instanceof EntityPlayer)
s = ((EntityPlayer) getThrower()).getDisplayName();
MainRegistry.logger.log(Level.INFO, "[GREN] Set off grenade at " + ((int) posX) + " / " + ((int) posY) + " / " + ((int) posZ) + " by " + s + "!");
}
}
this.explode();
}
public abstract void explode();
}

View File

@ -366,7 +366,7 @@ public class ClientProxy extends ServerProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeLemon.class, new RenderSnowball(ModItems.grenade_lemon));
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMk2.class, new RenderGrenade());
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeZOMG.class, new RenderSnowball(ModItems.grenade_zomg));
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeASchrab.class, new RenderSnowball(ModItems.grenade_aschrab));
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeASchrab.class, new RenderGrenade());
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePulse.class, new RenderSnowball(ModItems.grenade_pulse));
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeShrapnel.class, new RenderSnowball(ModItems.grenade_shrapnel));
RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBlackHole.class, new RenderSnowball(ModItems.grenade_black_hole));

View File

@ -487,6 +487,7 @@ public class ResourceManager {
public static final IModelCustom thompson = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/thompson.obj"));
public static final IModelCustom grenade_frag = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_frag.obj"));
public static final IModelCustom grenade_aschrab = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_aschrab.obj"));
public static final IModelCustom armor_bj = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/BJ.obj"));
@ -525,8 +526,9 @@ public class ResourceManager {
public static final ResourceLocation sauergun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sauergun.png");
public static final ResourceLocation vortex_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/vortex.png");
public static final ResourceLocation thompson_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/thompson.png");
public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");
public static final ResourceLocation bj_eyepatch = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_eyepatch.png");
public static final ResourceLocation bj_leg = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_leg.png");

View File

@ -2,6 +2,8 @@ package com.hbm.render.entity.projectile;
import org.lwjgl.opengl.GL11;
import com.hbm.entity.grenade.EntityGrenadeASchrab;
import com.hbm.entity.grenade.EntityGrenadeMk2;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.entity.Render;
@ -11,25 +13,45 @@ import net.minecraft.util.ResourceLocation;
public class RenderGrenade extends Render {
@Override
public void doRender(Entity p_76986_1_, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
public void doRender(Entity grenade, double x, double y, double z, float f0, float interp) {
GL11.glPushMatrix();
GL11.glTranslatef((float)x, (float)y + 0.125F, (float)z);
GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90, 0F, 1F, 0F);
GL11.glScaled(0.125, 0.125, 0.125);
GL11.glRotatef(grenade.prevRotationYaw + (grenade.rotationYaw - grenade.prevRotationYaw) * interp - 90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(grenade.prevRotationPitch + (grenade.rotationPitch - grenade.prevRotationPitch) * interp, 0.0F, 0.0F, 1.0F);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.grenade_mk2);
ResourceManager.grenade_frag.renderAll();
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(getEntityTexture(grenade));
if(grenade instanceof EntityGrenadeMk2) {
GL11.glRotatef(90, 0F, 1F, 0F);
GL11.glScaled(0.125, 0.125, 0.125);
ResourceManager.grenade_frag.renderAll();
}
if(grenade instanceof EntityGrenadeASchrab) {
GL11.glRotatef(90, 0F, 1F, 0F);
GL11.glScaled(0.125, 0.125, 0.125);
ResourceManager.grenade_aschrab.renderAll();
}
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glPopMatrix();
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return ResourceManager.grenade_mk2;
protected ResourceLocation getEntityTexture(Entity grenade) {
if(grenade instanceof EntityGrenadeMk2) {
return ResourceManager.grenade_mk2;
}
if(grenade instanceof EntityGrenadeASchrab) {
return ResourceManager.grenade_aschrab_tex;
}
return null;
}
}

View File

@ -130,11 +130,11 @@ public class ModelArmorBase extends ModelBiped {
else
{
body.rotateAngleX = 0.0F;
rightFoot.rotationPointZ = rightLeg.rotationPointZ = 0.1F;
leftFoot.rotationPointZ = leftLeg.rotationPointZ = 0.1F;
rightFoot.rotationPointY = rightLeg.rotationPointY = 12.0F;
leftFoot.rotationPointY = leftLeg.rotationPointY = 12.0F;
head.rotationPointY = 0.0F;
rightFoot.offsetZ = rightLeg.offsetZ = 0.1F;
leftFoot.offsetZ = leftLeg.offsetZ = 0.1F;
rightFoot.offsetY = rightLeg.offsetY = 0.0F;
leftFoot.offsetY = leftLeg.offsetY = 0.0F;
head.offsetY = 0.0F;
}
rightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F;