From 52de90017ae8df8608c9817635a91316f59190ca Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 9 Nov 2020 21:07:50 +0100 Subject: [PATCH] bottlecap blocks, egon backpack texture, aschrab cell model --- .../hbm/models/weapons/grenade_aschrab.obj | 559 ++++++++++++++++++ .../assets/hbm/sounds/entity/megaquacc.ogg | Bin 0 -> 13384 bytes .../hbm/textures/blocks/block_cap_fritz.png | Bin 0 -> 136 bytes .../textures/blocks/block_cap_fritz_top.png | Bin 0 -> 176 bytes .../hbm/textures/blocks/block_cap_korl.png | Bin 0 -> 135 bytes .../textures/blocks/block_cap_korl_top.png | Bin 0 -> 178 bytes .../hbm/textures/blocks/block_cap_nuka.png | Bin 0 -> 141 bytes .../textures/blocks/block_cap_nuka_top.png | Bin 0 -> 170 bytes .../blocks/block_cap_overlay_multiply.png | Bin 0 -> 118 bytes .../hbm/textures/blocks/block_cap_quantum.png | Bin 0 -> 140 bytes .../textures/blocks/block_cap_quantum_top.png | Bin 0 -> 186 bytes .../hbm/textures/blocks/block_cap_rad.png | Bin 0 -> 139 bytes .../hbm/textures/blocks/block_cap_rad_top.png | Bin 0 -> 177 bytes .../hbm/textures/blocks/block_cap_sparkle.png | Bin 0 -> 140 bytes .../textures/blocks/block_cap_sparkle_top.png | Bin 0 -> 168 bytes .../hbm/textures/blocks/block_cap_star.png | Bin 0 -> 139 bytes .../textures/blocks/block_cap_star_top.png | Bin 0 -> 173 bytes .../hbm/textures/blocks/block_cap_sunset.png | Bin 0 -> 140 bytes .../textures/blocks/block_cap_sunset_top.png | Bin 0 -> 197 bytes .../hbm/textures/models/weapons/egon.png | Bin 0 -> 3678 bytes .../models/weapons/grenade_aschrab.png | Bin 0 -> 384 bytes src/main/java/com/hbm/blocks/ModBlocks.java | 29 + .../hbm/entity/grenade/EntityGrenadeBase.java | 92 +-- src/main/java/com/hbm/main/ClientProxy.java | 2 +- .../java/com/hbm/main/ResourceManager.java | 4 +- .../entity/projectile/RenderGrenade.java | 42 +- .../com/hbm/render/model/ModelArmorBase.java | 10 +- 27 files changed, 685 insertions(+), 53 deletions(-) create mode 100644 src/main/java/assets/hbm/models/weapons/grenade_aschrab.obj create mode 100644 src/main/java/assets/hbm/sounds/entity/megaquacc.ogg create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_fritz.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_fritz_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_korl.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_korl_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_nuka.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_nuka_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_overlay_multiply.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_quantum.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_quantum_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_rad.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_rad_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_sparkle.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_sparkle_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_star.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_star_top.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_sunset.png create mode 100644 src/main/java/assets/hbm/textures/blocks/block_cap_sunset_top.png create mode 100644 src/main/java/assets/hbm/textures/models/weapons/egon.png create mode 100644 src/main/java/assets/hbm/textures/models/weapons/grenade_aschrab.png diff --git a/src/main/java/assets/hbm/models/weapons/grenade_aschrab.obj b/src/main/java/assets/hbm/models/weapons/grenade_aschrab.obj new file mode 100644 index 000000000..db26c58c1 --- /dev/null +++ b/src/main/java/assets/hbm/models/weapons/grenade_aschrab.obj @@ -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 diff --git a/src/main/java/assets/hbm/sounds/entity/megaquacc.ogg b/src/main/java/assets/hbm/sounds/entity/megaquacc.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3cb097d5481c865398ff64f32dad5d41804a04ac GIT binary patch literal 13384 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 NXgEfWuQ~(p{{az+_;COL literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_fritz.png b/src/main/java/assets/hbm/textures/blocks/block_cap_fritz.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb7ca6c44af79c6a0ac3bda77ded009f31fdfec GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfFVdQ&MBb@02xmy$^ZZW literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_fritz_top.png b/src/main/java/assets/hbm/textures/blocks/block_cap_fritz_top.png new file mode 100644 index 0000000000000000000000000000000000000000..bac1ba47ba49364d749adb592d423e5649cb191c GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfl|8LY$Y;64J-|v2)_~RAaZm|Zh dnj9Z7F}x9J-M}Irk_0q~!PC{xWt~$(69C3GE3W_m literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_korl_top.png b/src/main/java/assets/hbm/textures/blocks/block_cap_korl_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ea548980c8d941f75a3a461cdec2ec0d77b42b GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfd#99Gp+jHNFtM@7u}QlS)HpNuKSwT%Go2 zm)7j!H%l)xM*dD~v*C|Fcg4`cWtmQS&$UJ?w$Q2CENMEg6J*yguhO#jJb!vdVTd9l P&@u*3S3j3^P6<5i9x-MHlP<}B`(2CMff^Y+ MUHx3vIVCg!00G1!@&Et; literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_quantum.png b/src/main/java/assets/hbm/textures/blocks/block_cap_quantum.png new file mode 100644 index 0000000000000000000000000000000000000000..99d82de84623baf30d19d1edf14ce318468e81c6 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfA@A;Zm|X)F$@ed(;GJQOTJ438pq)2>gTe~DWM4f#H%j3 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_quantum_top.png b/src/main/java/assets/hbm/textures/blocks/block_cap_quantum_top.png new file mode 100644 index 0000000000000000000000000000000000000000..363babb8a140b01b4b8186c624bf67af21568714 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfxTzFJn)yRVf>+#CvQA=(HfxT44$rjF6*2UngD%QN4)?5 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_rad.png b/src/main/java/assets/hbm/textures/blocks/block_cap_rad.png new file mode 100644 index 0000000000000000000000000000000000000000..adaa29421a85e287b012c2c485e6f93f4ec64b42 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfgTe~DWM4fy}mvK literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_sparkle.png b/src/main/java/assets/hbm/textures/blocks/block_cap_sparkle.png new file mode 100644 index 0000000000000000000000000000000000000000..e2b092c5bb11048fe80d499a01bf9e63b5305dea GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfta0#6+H$9r}MrJsh{=F1C3+wboFyt=akR{0Ai;r-v9sr literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_sparkle_top.png b/src/main/java/assets/hbm/textures/blocks/block_cap_sparkle_top.png new file mode 100644 index 0000000000000000000000000000000000000000..63a38d825350e8947f8c256d7a8ce9237b13a956 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf;p6UAI^JDR zo~=9TJhfMC_wrR4Uni*M^RGUum{nTwGcL5S!|!6w#YY$Te>vJ0bp4ypTDYWV_oYIh ORScf4elF{r5}E*TK&($mqi`~0^1 jXJTai3z~%gsQh4vHQsK@{6>=(Xc~j3tDnm{r-UW|6_hMv literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_star_top.png b/src/main/java/assets/hbm/textures/blocks/block_cap_star_top.png new file mode 100644 index 0000000000000000000000000000000000000000..82f2a80b2ba44d597f751c5dfa65f95b0e2099b4 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfgRBGx7$X0#yIM+*aVzJt*{|Em+Q0A8l^WyZl TH|xR!pnVLUu6{1-oD!M;9+x`0<;+na^IHS+nLC8(Z7|J4}Cg`t52`9z1xQ`rzM}nT;ZL kk5_QJ#TvY7a(u+Za3$_cg1vU>O`vfMp00i_>zopr09QFNZvX%Q literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/block_cap_sunset_top.png b/src/main/java/assets/hbm/textures/blocks/block_cap_sunset_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5ce9eda7739553c52476ac5826a5914c82f752 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4fb{+GYU59WW!V3%*6JVSz6vqntT&W_D5n6G30 nxlY3gr{sB?FB(Xw0bNtLZ`J>c?aDDgcQAOm`njxgN@xNAmbXak literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/models/weapons/egon.png b/src/main/java/assets/hbm/textures/models/weapons/egon.png new file mode 100644 index 0000000000000000000000000000000000000000..0532b14418ad8efa0e60fb037a74f139e4923791 GIT binary patch literal 3678 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 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/models/weapons/grenade_aschrab.png b/src/main/java/assets/hbm/textures/models/weapons/grenade_aschrab.png new file mode 100644 index 0000000000000000000000000000000000000000..4f8c4fe4451ee2a822e2ee30951cc4dfe251bbd7 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^8bEB!!3HFszV|W(QY^(zo*^7SP{WbZ!N9<1?&;zf zlF|5f`dQv)10FZoE2=k?G^#`11aul&aRe`TcTmbTiL*+JOTgpMa~8fja~?(h=jT^! z%T@n$!KC+-?c}aUtNNS;9Yq9P1RbZ`=3ce#^&aU`u2;MGZvByeY_Y7YF(5v9*(C|7 zU-R1bEx#o3Xir@xFXz2FzAl9>jzt|9#4n%Af5N|qWEJl1TmSxcp^{Sg?efsXrhwNB zTdrNmf1A`1E4gD<$W{}9yfRY?~W;Y9kE8{Qk`N&Sf0LfOwr~Ck(Sqs=M=f9 zhZpv+yw>7tw05>z#M=KPC?`0_J$BU@Htt`WCTHE4yZVOcY0LLHX6~_P=FNDVVPo^E z<6FC4cv$+u8Rv@lDlgSeSR2uy=+?J3!h`X;$c-sK+@JoAd%1sK`gV8kfAUe^Z+b>f S<^~2K1B0ilpUXO@geCx5zM=yF literal 0 HcmV?d00001 diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 06dc98aca..544bbc233 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -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()); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBase.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBase.java index 0935cb8aa..9b0062987 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBase.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBase.java @@ -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(); + } diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 74d5979b5..9f59233ed 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -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)); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 7644b1b04..697992deb 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -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"); diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java b/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java index 0fcc58ddc..a347849be 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java @@ -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; } } diff --git a/src/main/java/com/hbm/render/model/ModelArmorBase.java b/src/main/java/com/hbm/render/model/ModelArmorBase.java index aaa601e76..bb40c81e1 100644 --- a/src/main/java/com/hbm/render/model/ModelArmorBase.java +++ b/src/main/java/com/hbm/render/model/ModelArmorBase.java @@ -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;