diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index e8b7417e0..5417cbd02 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1355,6 +1355,10 @@ item.jetpack_vector.name=Schubvektorgesteuerter Raketenrucksack item.chainsaw.name=Kettensäge item.crowbar.name=Mk.V Kistenöffnungsapparat "Brechstange" +item.wrench.name=Rohrzange +item.wrench_flipped.name=Rohrzange mit Klinge +item.memespoon.name=§eLuftschlag + item.mask_of_infamy.name=Maske der Schande tile.det_cord.name=Det Cord diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 6c655d968..f4b7fb281 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1355,6 +1355,10 @@ item.jetpack_vector.name=Vectored Jetpack item.chainsaw.name=Chainsaw item.crowbar.name=Mk.V Crate Opening Device "Crowbar" +item.wrench.name=Pipe Wrench +item.wrench_flipped.name=Blade on a Wrench +item.memespoon.name=§eMarket Gardener + item.mask_of_infamy.name=Mask of Infamy tile.det_cord.name=Det Cord diff --git a/assets/hbm/models/BombGeneric.obj b/assets/hbm/models/BombGeneric.obj index 55e066ee6..02d972f31 100644 --- a/assets/hbm/models/BombGeneric.obj +++ b/assets/hbm/models/BombGeneric.obj @@ -1,4 +1,4 @@ -# Blender v2.70 (sub 0) OBJ File: 'BombGeneric.blend' +# Blender v2.76 (sub 0) OBJ File: 'BombGeneric.blend' # www.blender.org o Cylinder v 0.176777 0.426777 -0.375000 @@ -85,599 +85,390 @@ v -0.247487 0.497487 -0.674000 v 0.247487 0.002513 -0.674000 v -0.247487 0.497487 -0.826000 v 0.247487 0.002513 -0.826000 -v -0.247487 0.497487 -0.674000 -v 0.247487 0.002513 -0.674000 -v -0.247487 0.497487 -0.826000 -v 0.247487 0.002513 -0.826000 v 0.247488 0.497487 -0.674000 v -0.247488 0.002513 -0.674000 v 0.247488 0.497487 -0.826000 v -0.247488 0.002513 -0.826000 -v 0.247488 0.497487 -0.674000 -v -0.247488 0.002513 -0.674000 -v 0.247488 0.497487 -0.826000 -v -0.247488 0.002513 -0.826000 -vt 0.488163 0.020352 -vt 0.488163 0.274747 -vt 0.455617 0.274747 -vt 0.528202 0.315450 -vt 0.560748 0.315450 -vt 0.560748 0.569846 -vt 0.745955 0.315450 -vt 0.778501 0.315450 -vt 0.778501 0.569845 -vt 0.179657 0.552886 -vt 0.147111 0.552886 -vt 0.147110 0.298491 -vt 0.252241 0.298491 -vt 0.252241 0.552886 -vt 0.219695 0.552886 -vt 0.560748 0.274747 -vt 0.528202 0.274747 -vt 0.528202 0.020352 -vt 0.705917 0.274747 -vt 0.673370 0.274747 -vt 0.673370 0.020352 -vt 0.070734 0.552886 -vt 0.038188 0.552886 -vt 0.038188 0.298491 -vt 0.600786 0.274747 -vt 0.600786 0.020352 -vt 0.633332 0.020352 -vt 0.383033 0.569846 -vt 0.383033 0.315450 -vt 0.415579 0.315450 -vt 0.488163 0.569846 -vt 0.455617 0.569846 -vt 0.455617 0.315450 -vt 0.383033 0.020352 -vt 0.415579 0.020352 -vt 0.415579 0.274747 -vt 0.324825 0.552886 -vt 0.292279 0.552886 -vt 0.292279 0.298491 -vt 0.705917 0.569845 -vt 0.673370 0.569845 -vt 0.673370 0.315450 -vt 0.745955 0.020352 -vt 0.778501 0.020352 -vt 0.778501 0.274747 -vt 0.633332 0.569845 -vt 0.600786 0.569845 -vt 0.600786 0.315450 -vt 0.107072 0.933803 -vt 0.074526 0.933803 -vt 0.082663 0.868092 -vt 0.179657 0.933803 -vt 0.147110 0.933803 -vt 0.155247 0.868092 -vt 0.252241 0.933803 -vt 0.219695 0.933803 -vt 0.227831 0.868092 -vt 0.203199 0.593589 -vt 0.252241 0.626902 -vt 0.188165 0.599920 -vt 0.633332 0.933305 -vt 0.600786 0.933305 -vt 0.608922 0.867594 -vt 0.778501 0.933305 -vt 0.745955 0.933305 -vt 0.754091 0.867594 -vt 0.851085 0.419215 -vt 0.818539 0.419215 -vt 0.826676 0.353504 -vt 0.633332 0.826890 -vt 0.600786 0.826890 -vt 0.608922 0.761179 -vt 0.415579 0.826890 -vt 0.383033 0.826890 -vt 0.391169 0.761179 -vt 0.745955 0.826890 -vt 0.754091 0.761179 -vt 0.770364 0.761179 -vt 0.455617 0.826891 -vt 0.463754 0.761179 -vt 0.480027 0.761179 -vt 0.818539 0.086063 -vt 0.826676 0.020352 -vt 0.842949 0.020352 -vt 0.528202 0.826890 -vt 0.536338 0.761179 -vt 0.552611 0.761179 -vt 0.383033 0.933305 -vt 0.391169 0.867594 -vt 0.407442 0.867594 -vt 0.528202 0.933305 -vt 0.536338 0.867594 -vt 0.552611 0.867594 -vt 0.455617 0.933305 -vt 0.463754 0.867594 -vt 0.480027 0.867594 -vt 0.891123 0.525629 -vt 0.899260 0.459918 -vt 0.915533 0.459918 -vt 0.107072 0.643445 -vt 0.074304 0.593589 -vt 0.025262 0.626902 -vt 0.963708 0.020352 -vt 0.947435 0.020352 -vt 0.947435 0.088190 -vt 0.891123 0.383289 -vt 0.907397 0.383289 -vt 0.907397 0.315450 -vt 0.907397 0.020352 -vt 0.891124 0.020352 -vt 0.891124 0.088190 -vt 0.907397 0.164820 -vt 0.891123 0.164820 -vt 0.891123 0.232659 -vt 0.834812 0.979648 -vt 0.851085 0.979648 -vt 0.851085 0.911810 -vt 0.963708 0.610549 -vt 0.947435 0.610549 -vt 0.947435 0.678387 -vt 0.963708 0.761179 -vt 0.947435 0.761179 -vt 0.947435 0.829018 -vt 0.292279 0.894850 -vt 0.292279 0.962689 -vt 0.308552 0.962689 -vt 0.907397 0.761179 -vt 0.891124 0.761179 -vt 0.891124 0.829018 -vt 0.963708 0.232659 -vt 0.963708 0.164820 -vt 0.947435 0.164820 -vt 0.979981 0.527757 -vt 0.979981 0.459918 -vt 0.963708 0.459918 -vt 0.907397 0.678387 -vt 0.907397 0.610549 -vt 0.891124 0.610549 -vt 0.963708 0.937560 -vt 0.963708 0.869721 -vt 0.947435 0.869721 -vt 0.891124 0.937560 -vt 0.907397 0.937560 -vt 0.907397 0.869721 -vt 0.963708 0.341201 -vt 0.963708 0.273362 -vt 0.947435 0.273362 -vt 0.705916 0.979648 -vt 0.705917 0.911810 -vt 0.689643 0.911810 -vt 0.292279 0.703516 -vt 0.300416 0.593589 -vt 0.316689 0.593589 -vt 0.292279 0.854147 -vt 0.300416 0.744220 -vt 0.316689 0.744220 -vt 0.528202 0.720476 -vt 0.536338 0.610549 -vt 0.552611 0.610549 -vt 0.600786 0.720476 -vt 0.608923 0.610549 -vt 0.625196 0.610549 -vt 0.673370 0.720476 -vt 0.681507 0.610549 -vt 0.697780 0.610549 -vt 0.074526 0.827389 -vt 0.082663 0.717461 -vt 0.098936 0.717461 -vt 0.383033 0.720476 -vt 0.391169 0.610549 -vt 0.407442 0.610549 -vt 0.818539 0.274747 -vt 0.826676 0.164820 -vt 0.842949 0.164820 -vt 0.826676 0.610549 -vt 0.842949 0.610549 -vt 0.851085 0.720476 -vt 0.826676 0.761179 -vt 0.842949 0.761179 -vt 0.851085 0.871106 -vt 0.681507 0.761179 -vt 0.697780 0.761179 -vt 0.705917 0.871106 -vt 0.842949 0.569845 -vt 0.826676 0.569845 -vt 0.818539 0.459918 -vt 0.227831 0.717461 -vt 0.244104 0.717461 -vt 0.252241 0.827389 -vt 0.155247 0.717461 -vt 0.171520 0.717461 -vt 0.179657 0.827389 -vt 0.463754 0.610549 -vt 0.480027 0.610549 -vt 0.488163 0.720476 -vt 0.754091 0.610549 -vt 0.770364 0.610549 -vt 0.778501 0.720476 -vt 0.110773 0.257787 -vt 0.110773 0.020352 -vt 0.161488 0.020352 -vt 0.070734 0.020352 -vt 0.070734 0.257787 -vt 0.020019 0.257787 -vt 0.252241 0.020352 -vt 0.252241 0.257787 -vt 0.201526 0.257787 -vt 0.342994 0.257787 -vt 0.292279 0.257787 -vt 0.292279 0.020352 -vt 0.455617 0.020352 -vt 0.528202 0.569846 -vt 0.745955 0.569845 -vt 0.179657 0.298491 -vt 0.219695 0.298491 -vt 0.560748 0.020352 -vt 0.705917 0.020352 -vt 0.070734 0.298491 -vt 0.633332 0.274747 -vt 0.415579 0.569846 -vt 0.488163 0.315450 -vt 0.383033 0.274747 -vt 0.324826 0.298491 -vt 0.705917 0.315450 -vt 0.745955 0.274747 -vt 0.633332 0.315450 -vt 0.098936 0.868092 -vt 0.171520 0.868092 -vt 0.244104 0.868092 -vt 0.188165 0.670427 -vt 0.176658 0.658729 -vt 0.203199 0.676758 -vt 0.170431 0.643445 -vt 0.219472 0.676758 -vt 0.176658 0.611618 -vt 0.170431 0.626902 -vt 0.625196 0.867594 -vt 0.219472 0.593589 -vt 0.234507 0.599920 -vt 0.246014 0.611618 -vt 0.252241 0.643445 -vt 0.234507 0.670427 -vt 0.770364 0.867594 -vt 0.246014 0.658729 -vt 0.842949 0.353504 -vt 0.625196 0.761179 -vt 0.407442 0.761179 -vt 0.778501 0.826890 -vt 0.488163 0.826891 -vt 0.851085 0.086063 -vt 0.560748 0.826890 -vt 0.415579 0.933305 -vt 0.560748 0.933305 -vt 0.488163 0.933305 -vt 0.923670 0.525629 -vt 0.031489 0.658729 -vt 0.058031 0.676758 -vt 0.025262 0.643445 -vt 0.042996 0.670427 -vt 0.089338 0.670427 -vt 0.074304 0.676758 -vt 0.100845 0.658729 -vt 0.100845 0.611618 -vt 0.089338 0.599920 -vt 0.107072 0.626902 -vt 0.042996 0.599920 -vt 0.031489 0.611618 -vt 0.058031 0.593589 -vt 0.891123 0.315450 -vt 0.963708 0.088190 -vt 0.907397 0.088190 -vt 0.907397 0.232659 -vt 0.834812 0.911810 -vt 0.963708 0.678387 -vt 0.963708 0.829018 -vt 0.308552 0.894850 -vt 0.907397 0.829018 -vt 0.947435 0.232659 -vt 0.963708 0.527757 -vt 0.891124 0.678387 -vt 0.947435 0.937560 -vt 0.891124 0.869721 -vt 0.947435 0.341201 -vt 0.689643 0.979648 -vt 0.324825 0.703516 -vt 0.324825 0.854147 -vt 0.560748 0.720476 -vt 0.633332 0.720476 -vt 0.705917 0.720476 -vt 0.107072 0.827389 -vt 0.415579 0.720476 -vt 0.851085 0.274747 -vt 0.818539 0.720476 -vt 0.818539 0.871106 -vt 0.673370 0.871106 -vt 0.851085 0.459918 -vt 0.219695 0.827389 -vt 0.147110 0.827389 -vt 0.455617 0.720476 -vt 0.745955 0.720476 -vt 0.161488 0.257787 -vt 0.020019 0.020352 -vt 0.201526 0.020352 -vt 0.342994 0.020352 -vn 0.831470 0.555570 0.000001 -vn 0.980785 0.195090 0.000001 -vn 0.980785 -0.195091 0.000000 -vn 0.831469 -0.555571 0.000000 -vn 0.555570 -0.831470 -0.000000 -vn 0.195090 -0.980785 -0.000000 -vn -0.195091 -0.980785 -0.000001 -vn -0.555571 -0.831469 -0.000001 -vn -0.831469 -0.555570 -0.000001 -vn -0.980785 -0.195091 -0.000001 -vn -0.980785 0.195090 -0.000000 -vn -0.831469 0.555571 -0.000000 -vn -0.555570 0.831470 0.000000 -vn -0.195090 0.980785 0.000000 -vn 0.555571 0.831469 0.000001 -vn 0.195091 0.980785 0.000001 -vn 0.643794 0.430169 0.632838 -vn 0.759407 0.151055 0.632838 -vn 0.759407 -0.151056 0.632838 -vn -0.000001 -0.000000 1.000000 -vn 0.643793 -0.430170 0.632838 -vn 0.430168 -0.643794 0.632838 -vn 0.151055 -0.759406 0.632839 -vn -0.151056 -0.759406 0.632839 -vn -0.430169 -0.643793 0.632839 -vn -0.643794 -0.430168 0.632839 -vn -0.759406 -0.151056 0.632839 -vn -0.759405 0.151055 0.632840 -vn -0.643794 0.430169 0.632838 -vn -0.430170 0.643793 0.632839 -vn -0.151056 0.759407 0.632838 -vn 0.151054 0.759407 0.632838 -vn 0.430170 0.643794 0.632838 -vn 0.000001 0.000000 -1.000000 -vn 0.831469 0.555570 0.000000 -vn 0.980785 0.195090 0.000000 -vn 0.980785 -0.195090 -0.000000 -vn 0.195089 -0.980785 0.000000 -vn -0.195091 -0.980785 -0.000000 -vn -0.555570 -0.831469 0.000000 -vn -0.831470 -0.555570 0.000000 -vn -0.980785 -0.195090 0.000000 -vn -0.980785 0.195091 0.000000 -vn 0.555570 0.831470 0.000000 -vn 0.195091 0.980785 0.000000 -vn 0.769680 0.514283 -0.378292 -vn 0.514283 0.769680 -0.378292 -vn 0.180594 0.907899 -0.378292 -vn -0.180593 0.907899 -0.378292 -vn -0.514283 0.769681 -0.378292 -vn -0.769680 0.514284 -0.378291 -vn -0.907900 0.180593 -0.378291 -vn -0.907900 -0.180592 -0.378291 -vn -0.769681 -0.514283 -0.378291 -vn -0.514286 -0.769680 -0.378291 -vn -0.180593 -0.907900 -0.378291 -vn 0.180593 -0.907900 -0.378291 -vn 0.514284 -0.769680 -0.378292 -vn 0.769680 -0.514284 -0.378292 -vn 0.907900 -0.180592 -0.378292 -vn 0.907899 0.180593 -0.378292 -vn 0.707107 0.707107 0.000000 -vn -0.707107 -0.707107 0.000000 -vn -0.707106 0.707108 0.000000 -vn 0.707106 -0.707108 -0.000000 -vn 0.831470 -0.555570 0.000000 -vn -0.831470 -0.555570 -0.000001 -vn -0.831470 0.555570 -0.000000 -vn -0.195090 0.980785 0.000001 -vn 0.555570 0.831469 0.000001 -vn 0.759406 -0.151056 0.632838 -vn 0.000001 0.000003 1.000000 -vn 0.000000 -0.000001 1.000000 -vn 0.000008 -0.000001 1.000000 -vn 0.643793 -0.430169 0.632838 -vn -0.000002 -0.000003 1.000000 -vn -0.000000 0.000001 1.000000 -vn -0.000003 -0.000001 1.000000 -vn -0.000001 -0.000001 1.000000 -vn 0.430167 -0.643794 0.632839 -vn 0.000004 -0.000001 1.000000 -vn -0.643793 -0.430169 0.632839 -vn -0.759406 -0.151055 0.632839 -vn -0.759406 0.151055 0.632838 -vn -0.430170 0.643794 0.632838 -vn -0.151055 0.759407 0.632838 -vn 0.151056 0.759407 0.632838 -vn 0.430169 0.643794 0.632838 -vn 0.000000 0.000001 -1.000000 -vn 0.000008 0.000002 -1.000000 -vn 0.000000 -0.000001 -1.000000 -vn 0.000000 0.000003 -1.000000 +vt 0.335293 0.709457 +vt 0.282306 0.709457 +vt 0.282306 0.302056 +vt 0.229320 0.709457 +vt 0.229319 0.302057 +vt 0.176333 0.709457 +vt 0.176333 0.302057 +vt 0.123346 0.709457 +vt 0.070360 0.709457 +vt 0.070360 0.302057 +vt 0.017373 0.709457 +vt 0.017373 0.302057 +vt 0.865159 0.709457 +vt 0.812172 0.709457 +vt 0.812172 0.302056 +vt 0.759185 0.709457 +vt 0.759185 0.302056 +vt 0.706199 0.709457 +vt 0.706199 0.302056 +vt 0.653212 0.709457 +vt 0.653212 0.302056 +vt 0.600226 0.709457 +vt 0.600226 0.302056 +vt 0.547239 0.709457 +vt 0.547239 0.302056 +vt 0.494252 0.709457 +vt 0.494252 0.302056 +vt 0.441266 0.709457 +vt 0.388279 0.709457 +vt 0.335292 0.302056 +vt 0.388279 0.302056 +vt 0.322046 0.814689 +vt 0.295553 0.814689 +vt 0.269060 0.814689 +vt 0.242566 0.814689 +vt 0.216073 0.814689 +vt 0.189580 0.814689 +vt 0.600297 0.902785 +vt 0.680139 0.849436 +vt 0.653646 0.982627 +vt 0.163087 0.814690 +vt 0.136593 0.814690 +vt 0.110100 0.814690 +vt 0.083607 0.814690 +vt 0.057113 0.814690 +vt 0.030620 0.814690 +vt 0.851912 0.814690 +vt 0.825419 0.814690 +vt 0.798925 0.814690 +vt 0.745939 0.814690 +vt 0.692952 0.814690 +vt 0.639965 0.814690 +vt 0.586979 0.814689 +vt 0.533992 0.814689 +vt 0.481006 0.814689 +vt 0.428019 0.814689 +vt 0.375033 0.814689 +vt 0.348539 0.814689 +vt 0.512202 0.982627 +vt 0.432360 0.929278 +vt 0.485709 0.849436 +vt 0.295552 0.017374 +vt 0.322045 0.017374 +vt 0.322046 0.126014 +vt 0.242566 0.126014 +vt 0.242565 0.017375 +vt 0.269059 0.017375 +vt 0.189579 0.126014 +vt 0.189579 0.017374 +vt 0.216072 0.017374 +vt 0.136592 0.017373 +vt 0.163086 0.017373 +vt 0.163086 0.126014 +vt 0.083606 0.126015 +vt 0.083606 0.017375 +vt 0.110099 0.017375 +vt 0.030619 0.126015 +vt 0.030619 0.017375 +vt 0.057113 0.017375 +vt 0.825418 0.126014 +vt 0.825418 0.017374 +vt 0.851911 0.017374 +vt 0.772431 0.017375 +vt 0.798925 0.017375 +vt 0.798925 0.126014 +vt 0.719445 0.126014 +vt 0.719445 0.017374 +vt 0.745939 0.017374 +vt 0.666459 0.017374 +vt 0.692952 0.017374 +vt 0.692952 0.126014 +vt 0.613473 0.017374 +vt 0.639966 0.017374 +vt 0.639966 0.126014 +vt 0.560486 0.017374 +vt 0.586979 0.017374 +vt 0.586979 0.126014 +vt 0.507499 0.017374 +vt 0.533993 0.017374 +vt 0.533993 0.126014 +vt 0.348539 0.126014 +vt 0.348539 0.017373 +vt 0.375032 0.017373 +vt 0.401526 0.017373 +vt 0.428019 0.017373 +vt 0.428019 0.126014 +vt 0.454513 0.017373 +vt 0.481006 0.017373 +vt 0.481006 0.126014 +vt 0.295552 0.126014 +vt 0.375032 0.126014 +vt 0.401526 0.126014 +vt 0.441266 0.302056 +vt 0.454513 0.126014 +vt 0.507499 0.126014 +vt 0.560486 0.126014 +vt 0.613473 0.126014 +vt 0.666459 0.126014 +vt 0.745939 0.126014 +vt 0.772432 0.126014 +vt 0.851911 0.126014 +vt 0.057113 0.126015 +vt 0.110099 0.126015 +vt 0.123346 0.302057 +vt 0.136592 0.126014 +vt 0.216072 0.126014 +vt 0.269059 0.126014 +vt 0.982471 0.397613 +vt 0.899905 0.397613 +vt 0.899905 0.017373 +vt 0.397613 0.932002 +vt 0.017373 0.932003 +vt 0.017373 0.849436 +vt 0.865158 0.302056 +vt 0.733487 0.929278 +vt 0.723349 0.953755 +vt 0.704615 0.972488 +vt 0.680139 0.982627 +vt 0.629169 0.972488 +vt 0.610435 0.953755 +vt 0.600297 0.929278 +vt 0.610435 0.878308 +vt 0.629169 0.859575 +vt 0.653645 0.849436 +vt 0.704615 0.859575 +vt 0.723349 0.878308 +vt 0.733487 0.902785 +vt 0.772432 0.814690 +vt 0.719445 0.814690 +vt 0.666459 0.814690 +vt 0.613472 0.814690 +vt 0.560485 0.814690 +vt 0.507499 0.814689 +vt 0.454512 0.814689 +vt 0.401526 0.814689 +vt 0.512202 0.849436 +vt 0.565550 0.902785 +vt 0.536678 0.859575 +vt 0.555412 0.878308 +vt 0.565550 0.929278 +vt 0.555412 0.953755 +vt 0.536678 0.972488 +vt 0.485708 0.982627 +vt 0.461232 0.972488 +vt 0.442498 0.953755 +vt 0.432360 0.902785 +vt 0.442498 0.878308 +vt 0.461232 0.859575 +vt 0.982471 0.017373 +vt 0.397613 0.849436 +vn 0.831500 0.555600 0.000000 +vn 0.980800 0.195100 0.000000 +vn 0.980800 -0.195100 0.000000 +vn 0.831500 -0.555600 0.000000 +vn 0.555600 -0.831500 -0.000000 +vn 0.195100 -0.980800 -0.000000 +vn -0.195100 -0.980800 -0.000000 +vn -0.555600 -0.831500 -0.000000 +vn -0.831500 -0.555600 -0.000000 +vn -0.980800 -0.195100 -0.000000 +vn -0.980800 0.195100 -0.000000 +vn -0.831500 0.555600 -0.000000 +vn -0.555600 0.831500 0.000000 +vn -0.195100 0.980800 0.000000 +vn 0.555600 0.831500 0.000000 +vn 0.195100 0.980800 0.000000 +vn 0.643800 0.430200 0.632800 +vn 0.759400 0.151100 0.632800 +vn 0.759400 -0.151100 0.632800 +vn -0.000000 -0.000000 1.000000 +vn 0.643800 -0.430200 0.632800 +vn 0.430200 -0.643800 0.632800 +vn 0.151100 -0.759400 0.632800 +vn -0.151100 -0.759400 0.632800 +vn -0.430200 -0.643800 0.632800 +vn -0.643800 -0.430200 0.632800 +vn -0.759400 -0.151100 0.632800 +vn -0.759400 0.151100 0.632800 +vn -0.643800 0.430200 0.632800 +vn -0.430200 0.643800 0.632800 +vn -0.151100 0.759400 0.632800 +vn 0.151100 0.759400 0.632800 +vn 0.430200 0.643800 0.632800 vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000002 -1.000000 -vn 0.000000 -0.000002 -1.000000 -vn -0.000001 0.000001 -1.000000 -vn 0.000003 0.000002 -1.000000 -vn 0.831470 0.555570 0.000000 -vn 0.000002 0.000002 -1.000000 -vn -0.831469 0.555570 0.000000 -vn 0.555571 0.831469 0.000000 -vn -0.195091 0.980785 0.000000 -vn 0.514284 0.769680 -0.378293 -vn -0.180592 0.907900 -0.378292 -vn -0.769680 0.514284 -0.378292 -vn -0.769681 -0.514284 -0.378291 -vn -0.514284 -0.769681 -0.378291 -vn -0.180592 -0.907900 -0.378291 -vn 0.180592 -0.907900 -0.378291 -vn 0.514284 -0.769680 -0.378291 -vn 0.769680 -0.514283 -0.378292 -vn 0.907899 -0.180593 -0.378292 -vn 0.707107 0.707106 0.000000 -vn -0.707106 0.707107 0.000000 -vn 0.707106 -0.707107 -0.000000 +vn 0.769700 0.514300 -0.378300 +vn 0.514300 0.769700 -0.378300 +vn 0.180600 0.907900 -0.378300 +vn -0.180600 0.907900 -0.378300 +vn -0.514300 0.769700 -0.378300 +vn -0.769700 0.514300 -0.378300 +vn -0.907900 0.180600 -0.378300 +vn -0.907900 -0.180600 -0.378300 +vn -0.769700 -0.514300 -0.378300 +vn -0.514300 -0.769700 -0.378300 +vn -0.180600 -0.907900 -0.378300 +vn 0.180600 -0.907900 -0.378300 +vn 0.514300 -0.769700 -0.378300 +vn 0.769700 -0.514300 -0.378300 +vn 0.907900 -0.180600 -0.378300 +vn 0.907900 0.180600 -0.378300 +vn 0.707100 0.707100 0.000000 +vn -0.707100 0.707100 0.000000 s off -f 1/1/1 2/2/1 4/3/1 -f 4/4/2 6/5/2 5/6/2 -f 6/7/3 8/8/3 7/9/3 -f 8/10/4 10/11/4 9/12/4 -f 9/13/5 10/14/5 12/15/5 -f 12/16/6 14/17/6 13/18/6 -f 14/19/7 16/20/7 15/21/7 -f 16/22/8 18/23/8 17/24/8 -f 17/25/9 18/26/9 20/27/9 -f 19/28/10 20/29/10 22/30/10 -f 22/31/11 24/32/11 23/33/11 -f 24/34/12 26/35/12 25/36/12 -f 26/37/13 28/38/13 27/39/13 -f 28/40/14 30/41/14 29/42/14 -f 32/43/15 2/44/15 1/45/15 -f 30/46/16 32/47/16 31/48/16 -f 4/49/17 2/50/17 33/51/17 -f 6/52/18 4/53/18 48/54/18 -f 8/55/19 6/56/19 47/57/19 -f 41/58/20 45/59/20 40/60/20 -f 10/61/21 8/62/21 46/63/21 -f 12/64/22 10/65/22 45/66/22 -f 14/67/23 12/68/23 44/69/23 -f 16/70/24 14/71/24 43/72/24 -f 18/73/25 16/74/25 42/75/25 -f 18/76/26 41/77/26 40/78/26 -f 20/79/27 40/80/27 39/81/27 -f 22/82/28 39/83/28 38/84/28 -f 24/85/29 38/86/29 37/87/29 -f 26/88/30 37/89/30 36/90/30 -f 28/91/31 36/92/31 35/93/31 -f 30/94/32 35/95/32 34/96/32 -f 32/97/33 34/98/33 33/99/33 -f 75/100/34 71/101/34 67/102/34 -f 80/103/35 65/104/35 49/105/35 -f 79/106/36 80/107/36 64/108/36 -f 78/109/37 79/110/37 63/111/37 -f 77/112/4 78/113/4 62/114/4 -f 76/115/5 77/116/5 61/117/5 -f 75/118/38 76/119/38 60/120/38 -f 74/121/39 75/122/39 59/123/39 -f 57/124/40 73/125/40 74/126/40 -f 72/127/41 73/128/41 57/129/41 -f 55/130/42 71/131/42 72/132/42 -f 54/133/43 70/134/43 71/135/43 -f 53/136/12 69/137/12 70/138/12 -f 52/139/13 68/140/13 69/141/13 -f 65/142/44 66/143/44 50/144/44 -f 50/145/45 66/146/45 67/147/45 -f 51/148/14 67/149/14 68/150/14 -f 3/151/46 64/152/46 49/153/46 -f 1/154/47 49/155/47 50/156/47 -f 31/157/48 50/158/48 51/159/48 -f 29/160/49 51/161/49 52/162/49 -f 27/163/50 52/164/50 53/165/50 -f 25/166/51 53/167/51 54/168/51 -f 23/169/52 54/170/52 55/171/52 -f 21/172/53 55/173/53 56/174/53 -f 56/175/54 57/176/54 17/177/54 -f 57/178/55 58/179/55 15/180/55 -f 58/181/56 59/182/56 13/183/56 -f 59/184/57 60/185/57 11/186/57 -f 60/187/58 61/188/58 9/189/58 -f 61/190/59 62/191/59 7/192/59 -f 62/193/60 63/194/60 5/195/60 -f 63/196/61 64/197/61 3/198/61 -f 81/199/62 82/200/62 84/201/62 -f 87/202/63 88/203/63 86/204/63 -f 91/205/64 92/206/64 90/207/64 -f 94/208/65 96/209/65 95/210/65 -f 3/211/1 1/1/1 4/3/1 -f 3/212/2 4/4/2 5/6/2 -f 5/213/3 6/7/3 7/9/3 -f 7/214/66 8/10/66 9/12/66 -f 11/215/5 9/13/5 12/15/5 -f 11/216/6 12/16/6 13/18/6 -f 13/217/7 14/19/7 15/21/7 -f 15/218/8 16/22/8 17/24/8 -f 19/219/67 17/25/67 20/27/67 -f 21/220/10 19/28/10 22/30/10 -f 21/221/43 22/31/43 23/33/43 -f 23/222/68 24/34/68 25/36/68 -f 25/223/13 26/37/13 27/39/13 -f 27/224/69 28/40/69 29/42/69 -f 31/225/70 32/43/70 1/45/70 -f 29/226/16 30/46/16 31/48/16 -f 48/227/17 4/49/17 33/51/17 -f 47/228/18 6/52/18 48/54/18 -f 46/229/71 8/55/71 47/57/71 -f 35/230/72 36/231/72 34/232/72 -f 37/233/73 33/234/73 36/231/73 -f 39/235/74 40/60/74 38/236/74 -f 45/237/75 10/61/75 46/63/75 -f 41/58/76 42/238/76 43/239/76 -f 45/59/73 41/58/73 44/240/73 -f 41/58/77 43/239/77 44/240/77 -f 33/234/78 46/241/78 48/242/78 -f 36/231/79 33/234/79 34/232/79 -f 45/59/79 33/234/79 37/233/79 -f 44/243/80 12/64/80 45/66/80 -f 46/241/81 47/244/81 48/242/81 -f 40/60/79 37/233/79 38/236/79 -f 45/59/79 37/233/79 40/60/79 -f 33/234/79 45/59/79 46/241/79 -f 43/245/23 14/67/23 44/69/23 -f 42/246/24 16/70/24 43/72/24 -f 41/247/25 18/73/25 42/75/25 -f 20/248/82 18/76/82 40/78/82 -f 22/249/83 20/79/83 39/81/83 -f 24/250/84 22/82/84 38/84/84 -f 26/251/29 24/85/29 37/87/29 -f 28/252/85 26/88/85 36/90/85 -f 30/253/86 28/91/86 35/93/86 -f 32/254/87 30/94/87 34/96/87 -f 2/255/88 32/97/88 33/99/88 -f 65/256/89 79/257/89 66/258/89 -f 65/256/90 80/259/90 79/257/90 -f 77/260/91 75/100/91 78/261/91 -f 77/260/92 76/262/92 75/100/92 -f 73/263/93 72/264/93 74/265/93 -f 71/101/94 75/100/94 72/264/94 -f 69/266/95 68/267/95 70/268/95 -f 71/101/89 70/268/89 67/102/89 -f 70/268/96 68/267/96 67/102/96 -f 63/269/36 79/106/36 64/108/36 -f 72/264/97 75/100/97 74/265/97 -f 75/100/89 79/257/89 78/261/89 -f 67/102/93 79/257/93 75/100/93 -f 64/270/98 80/103/98 49/105/98 -f 79/257/99 67/102/99 66/258/99 -f 62/271/37 78/109/37 63/111/37 -f 61/272/4 77/112/4 62/114/4 -f 60/273/5 76/115/5 61/117/5 -f 59/274/6 75/118/6 60/120/6 -f 58/275/39 74/121/39 59/123/39 -f 58/276/40 57/124/40 74/126/40 -f 56/277/41 72/127/41 57/129/41 -f 56/278/42 55/130/42 72/132/42 -f 55/279/11 54/133/11 71/135/11 -f 54/280/100 53/136/100 70/138/100 -f 53/281/13 52/139/13 69/141/13 -f 49/282/101 65/142/101 50/144/101 -f 51/283/45 50/145/45 67/147/45 -f 52/284/102 51/148/102 68/150/102 -f 1/285/46 3/151/46 49/153/46 -f 31/286/103 1/154/103 50/156/103 -f 29/287/48 31/157/48 51/159/48 -f 27/288/104 29/160/104 52/162/104 -f 25/289/50 27/163/50 53/165/50 -f 23/290/105 25/166/105 54/168/105 -f 21/291/52 23/169/52 55/171/52 -f 19/292/53 21/172/53 56/174/53 -f 19/293/106 56/175/106 17/177/106 -f 17/294/107 57/178/107 15/180/107 -f 15/295/108 58/181/108 13/183/108 -f 13/296/109 59/184/109 11/186/109 -f 11/297/110 60/187/110 9/189/110 -f 9/298/111 61/190/111 7/192/111 -f 7/299/112 62/193/112 5/195/112 -f 5/300/61 63/196/61 3/198/61 -f 83/301/113 81/199/113 84/201/113 -f 85/302/63 87/202/63 86/204/63 -f 89/303/114 91/205/114 90/207/114 -f 93/304/115 94/208/115 95/210/115 +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 7/7/4 8/6/4 10/8/4 +f 10/8/5 12/9/5 11/10/5 +f 12/9/6 14/11/6 13/12/6 +f 14/13/7 16/14/7 15/15/7 +f 16/14/8 18/16/8 17/17/8 +f 18/16/9 20/18/9 19/19/9 +f 20/18/10 22/20/10 21/21/10 +f 22/20/11 24/22/11 23/23/11 +f 24/22/12 26/24/12 25/25/12 +f 26/24/13 28/26/13 27/27/13 +f 27/27/14 28/26/14 30/28/14 +f 32/29/15 2/1/15 1/30/15 +f 30/28/16 32/29/16 31/31/16 +f 2/1/17 33/32/17 48/33/17 +f 4/2/18 48/34/18 47/35/18 +f 6/4/19 47/36/19 46/37/19 +f 41/38/20 45/39/20 37/40/20 +f 8/6/21 46/41/21 45/42/21 +f 10/8/22 45/43/22 44/44/22 +f 12/9/23 44/45/23 43/46/23 +f 14/13/24 43/47/24 42/48/24 +f 18/16/25 16/14/25 42/49/25 +f 20/18/26 18/16/26 41/50/26 +f 22/20/27 20/18/27 40/51/27 +f 24/22/28 22/20/28 39/52/28 +f 26/24/29 24/22/29 38/53/29 +f 28/26/30 26/24/30 37/54/30 +f 30/28/31 28/26/31 36/55/31 +f 32/29/32 30/28/32 35/56/32 +f 32/29/33 34/57/33 33/58/33 +f 75/59/34 71/60/34 67/61/34 +f 80/62/1 65/63/1 49/64/1 +f 63/65/2 79/66/2 80/67/2 +f 62/68/3 78/69/3 79/70/3 +f 77/71/4 78/72/4 62/73/4 +f 60/74/5 76/75/5 77/76/5 +f 59/77/6 75/78/6 76/79/6 +f 58/80/7 74/81/7 75/82/7 +f 73/83/8 74/84/8 58/85/8 +f 56/86/9 72/87/9 73/88/9 +f 71/89/10 72/90/10 56/91/10 +f 70/92/11 71/93/11 55/94/11 +f 69/95/12 70/96/12 54/97/12 +f 68/98/13 69/99/13 53/100/13 +f 49/101/15 65/102/15 66/103/15 +f 66/104/16 67/105/16 51/106/16 +f 67/107/14 68/108/14 52/109/14 +f 64/110/35 49/64/35 1/30/35 +f 49/101/36 50/111/36 31/31/36 +f 50/112/37 51/106/37 29/113/37 +f 51/114/38 52/109/38 27/27/38 +f 52/115/39 53/100/39 25/25/39 +f 53/116/40 54/97/40 23/23/40 +f 54/117/41 55/94/41 21/21/41 +f 55/118/42 56/91/42 19/19/42 +f 19/19/43 56/86/43 57/119/43 +f 57/120/44 58/85/44 15/15/44 +f 15/15/45 58/80/45 59/121/45 +f 13/12/46 59/77/46 60/122/46 +f 11/10/47 60/74/47 61/123/47 +f 9/124/48 61/125/48 62/73/48 +f 7/7/49 62/68/49 63/126/49 +f 5/5/50 63/65/50 64/127/50 +f 82/128/51 84/129/51 83/130/51 +f 87/131/52 88/132/52 86/133/52 +f 1/30/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 9/124/4 7/7/4 10/8/4 +f 9/124/5 10/8/5 11/10/5 +f 11/10/6 12/9/6 13/12/6 +f 13/134/7 14/13/7 15/15/7 +f 15/15/8 16/14/8 17/17/8 +f 17/17/9 18/16/9 19/19/9 +f 19/19/10 20/18/10 21/21/10 +f 21/21/11 22/20/11 23/23/11 +f 23/23/12 24/22/12 25/25/12 +f 25/25/13 26/24/13 27/27/13 +f 29/113/14 27/27/14 30/28/14 +f 31/31/15 32/29/15 1/30/15 +f 29/113/16 30/28/16 31/31/16 +f 4/2/17 2/1/17 48/33/17 +f 6/4/18 4/2/18 47/35/18 +f 8/6/19 6/4/19 46/37/19 +f 33/135/20 34/136/20 35/137/20 +f 35/137/20 36/138/20 33/135/20 +f 37/40/20 38/139/20 39/140/20 +f 39/140/20 40/141/20 37/40/20 +f 41/38/20 42/142/20 43/143/20 +f 43/143/20 44/144/20 41/38/20 +f 45/39/20 46/145/20 33/135/20 +f 47/146/20 48/147/20 33/135/20 +f 33/135/20 36/138/20 37/40/20 +f 37/40/20 40/141/20 41/38/20 +f 41/38/20 44/144/20 45/39/20 +f 46/145/20 47/146/20 33/135/20 +f 33/135/20 37/40/20 45/39/20 +f 10/8/21 8/6/21 45/42/21 +f 12/9/22 10/8/22 44/44/22 +f 14/11/23 12/9/23 43/46/23 +f 16/14/24 14/13/24 42/48/24 +f 41/148/25 18/16/25 42/49/25 +f 40/149/26 20/18/26 41/50/26 +f 39/150/27 22/20/27 40/51/27 +f 38/151/28 24/22/28 39/52/28 +f 37/152/29 26/24/29 38/53/29 +f 36/153/30 28/26/30 37/54/30 +f 35/154/31 30/28/31 36/55/31 +f 34/155/32 32/29/32 35/56/32 +f 2/1/33 32/29/33 33/58/33 +f 67/61/34 66/156/34 79/157/34 +f 65/158/34 80/159/34 79/157/34 +f 79/157/34 78/160/34 75/59/34 +f 77/161/34 76/162/34 75/59/34 +f 75/59/34 74/163/34 73/164/34 +f 73/164/34 72/165/34 75/59/34 +f 71/60/34 70/166/34 69/167/34 +f 69/167/34 68/168/34 71/60/34 +f 66/156/34 65/158/34 79/157/34 +f 78/160/34 77/161/34 75/59/34 +f 75/59/34 72/165/34 71/60/34 +f 71/60/34 68/168/34 67/61/34 +f 67/61/34 79/157/34 75/59/34 +f 64/110/1 80/62/1 49/64/1 +f 64/127/2 63/65/2 80/67/2 +f 63/126/3 62/68/3 79/70/3 +f 61/125/4 77/71/4 62/73/4 +f 61/123/5 60/74/5 77/76/5 +f 60/122/6 59/77/6 76/79/6 +f 59/121/7 58/80/7 75/82/7 +f 57/120/8 73/83/8 58/85/8 +f 57/119/9 56/86/9 73/88/9 +f 55/118/10 71/89/10 56/91/10 +f 54/117/11 70/92/11 55/94/11 +f 53/116/12 69/95/12 54/97/12 +f 52/115/13 68/98/13 53/100/13 +f 50/111/15 49/101/15 66/103/15 +f 50/112/16 66/104/16 51/106/16 +f 51/114/14 67/107/14 52/109/14 +f 3/3/35 64/110/35 1/30/35 +f 1/30/36 49/101/36 31/31/36 +f 31/31/37 50/112/37 29/113/37 +f 29/113/38 51/114/38 27/27/38 +f 27/27/39 52/115/39 25/25/39 +f 25/25/40 53/116/40 23/23/40 +f 23/23/41 54/117/41 21/21/41 +f 21/21/42 55/118/42 19/19/42 +f 17/17/43 19/19/43 57/119/43 +f 17/17/44 57/120/44 15/15/44 +f 13/134/45 15/15/45 59/121/45 +f 11/10/46 13/12/46 60/122/46 +f 9/124/47 11/10/47 61/123/47 +f 7/7/48 9/124/48 62/73/48 +f 5/5/49 7/7/49 63/126/49 +f 3/3/50 5/5/50 64/127/50 +f 81/169/51 82/128/51 83/130/51 +f 85/170/52 87/131/52 86/133/52 diff --git a/assets/hbm/textures/blocks/bomb_multi1.png b/assets/hbm/textures/blocks/bomb_multi1.png index 1306ee03d..f778d2084 100644 Binary files a/assets/hbm/textures/blocks/bomb_multi1.png and b/assets/hbm/textures/blocks/bomb_multi1.png differ diff --git a/assets/hbm/textures/blocks/bomb_multi1_alt.png b/assets/hbm/textures/blocks/bomb_multi1_alt.png new file mode 100644 index 000000000..1306ee03d Binary files /dev/null and b/assets/hbm/textures/blocks/bomb_multi1_alt.png differ diff --git a/assets/hbm/textures/items/memespoon.png b/assets/hbm/textures/items/memespoon.png new file mode 100644 index 000000000..35023b3f1 Binary files /dev/null and b/assets/hbm/textures/items/memespoon.png differ diff --git a/assets/hbm/textures/items/wrench.png b/assets/hbm/textures/items/wrench.png new file mode 100644 index 000000000..c46a3773f Binary files /dev/null and b/assets/hbm/textures/items/wrench.png differ diff --git a/assets/hbm/textures/items/wrench_flipped.png b/assets/hbm/textures/items/wrench_flipped.png new file mode 100644 index 000000000..e3b142e3e Binary files /dev/null and b/assets/hbm/textures/items/wrench_flipped.png differ diff --git a/assets/hbm/textures/models/BombGeneric.png b/assets/hbm/textures/models/BombGeneric.png index eb06639b5..312900db9 100644 Binary files a/assets/hbm/textures/models/BombGeneric.png and b/assets/hbm/textures/models/BombGeneric.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 33bbcf07f..3c2439c62 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -731,13 +731,13 @@ public class ModBlocks { nuke_custom = new NukeCustom(Material.iron).setBlockName("nuke_custom").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":custom"); nuke_solinium = new NukeSolinium(Material.iron).setBlockName("nuke_solinium").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_solinium"); nuke_n2 = new NukeN2(Material.iron).setBlockName("nuke_n2").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_n2"); - nuke_n45 = new NukeN45(Material.iron).setBlockName("nuke_n45").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_n45"); + nuke_n45 = new NukeN45(Material.iron).setBlockName("nuke_n45").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); - cel_prime = new CelPrime(Material.iron).setBlockName("cel_prime").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cel_prime"); - cel_prime_terminal = new CelPrimePart(Material.iron).setBlockName("cel_prime_terminal").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cel_prime_terminal"); - cel_prime_battery = new CelPrimePart(Material.iron).setBlockName("cel_prime_battery").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cel_prime_battery"); - cel_prime_port = new CelPrimePart(Material.iron).setBlockName("cel_prime_port").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cel_prime_port"); - cel_prime_tanks = new CelPrimePart(Material.iron).setBlockName("cel_prime_tanks").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cel_prime_tanks"); + cel_prime = new CelPrime(Material.iron).setBlockName("cel_prime").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); + cel_prime_terminal = new CelPrimePart(Material.iron).setBlockName("cel_prime_terminal").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); + cel_prime_battery = new CelPrimePart(Material.iron).setBlockName("cel_prime_battery").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); + cel_prime_port = new CelPrimePart(Material.iron).setBlockName("cel_prime_port").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); + cel_prime_tanks = new CelPrimePart(Material.iron).setBlockName("cel_prime_tanks").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); bomb_multi = new BombMulti(Material.iron).setBlockName("bomb_multi").setCreativeTab(MainRegistry.nukeTab).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":bomb_multi1"); //bomb_multi_large = new BombMultiLarge(Material.iron).setBlockName("bomb_multi_large").setCreativeTab(MainRegistry.tabNuke).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":bomb_multi_large"); @@ -916,7 +916,7 @@ public class ModBlocks { safe = new BlockStorageCrate(Material.iron).setBlockName("safe").setStepSound(Block.soundTypeMetal).setHardness(7.5F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab); boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boxcar"); - bomber = new DecoBlock(Material.iron).setBlockName("bomber").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":bomber"); + bomber = new DecoBlock(Material.iron).setBlockName("bomber").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":code"); machine_well = new MachineOilWell(Material.iron).setBlockName("machine_well").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_well"); machine_pumpjack = new MachinePumpjack(Material.iron).setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack"); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 57706da0f..87508bf27 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1082,6 +1082,10 @@ public class ModItems { public static Item crowbar; + public static Item wrench; + public static Item wrench_flipped; + public static Item memespoon; + public static Item multitool_hit; public static Item multitool_dig; public static Item multitool_silk; @@ -2465,6 +2469,9 @@ public class ModItems { euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper"); matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick"); crowbar = new ModSword(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar"); + wrench = new WeaponSpecial(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("wrench").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench"); + wrench_flipped = new WeaponSpecial(MainRegistry.enumToolMaterialElec).setUnlocalizedName("wrench_flipped").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench_flipped"); + memespoon = new WeaponSpecial(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("memespoon").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":memespoon"); multitool_hit = new ItemMultitoolPassive().setUnlocalizedName("multitool_hit").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); multitool_dig = new ItemMultitoolTool(4.0F, MainRegistry.enumToolMaterialMultitool, ItemMultitoolTool.getAllBlocks()).setFull3D().setUnlocalizedName("multitool_dig").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multitool_claw"); @@ -3626,6 +3633,9 @@ public class ModItems { GameRegistry.registerItem(elec_shovel, elec_shovel.getUnlocalizedName()); GameRegistry.registerItem(matchstick, matchstick.getUnlocalizedName()); GameRegistry.registerItem(crowbar, crowbar.getUnlocalizedName()); + GameRegistry.registerItem(wrench, wrench.getUnlocalizedName()); + GameRegistry.registerItem(wrench_flipped, wrench_flipped.getUnlocalizedName()); + GameRegistry.registerItem(memespoon, memespoon.getUnlocalizedName()); GameRegistry.registerItem(saw, saw.getUnlocalizedName()); GameRegistry.registerItem(bat, bat.getUnlocalizedName()); GameRegistry.registerItem(bat_nail, bat_nail.getUnlocalizedName()); diff --git a/com/hbm/items/gear/WeaponSpecial.java b/com/hbm/items/gear/WeaponSpecial.java index d126030a8..94685c0d4 100644 --- a/com/hbm/items/gear/WeaponSpecial.java +++ b/com/hbm/items/gear/WeaponSpecial.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; +import com.hbm.entity.effect.EntityNukeCloudSmall; +import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.entity.projectile.EntityRubble; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -20,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -103,6 +106,43 @@ public class WeaponSpecial extends ItemSword { world.playSoundAtEntity(entity, "hbm:weapon.slice", 3.0F, 1.F); } + + if(this == ModItems.wrench) { + + Vec3 vec = entityPlayer.getLookVec(); + + double dX = vec.xCoord * 0.5; + double dY = vec.yCoord * 0.5; + double dZ = vec.zCoord * 0.5; + + entity.motionX += dX; + entity.motionY += dY; + entity.motionZ += dZ; + world.playSoundAtEntity(entity, "random.anvil_land", 3.0F, 0.75F); + } + + if(this == ModItems.memespoon) { + + if(entityPlayer.fallDistance >= 2) { + world.playSoundAtEntity(entity, "hbm:weapon.bang", 3.0F, 0.75F); + entity.setHealth(0); + } + + if(!(entityPlayer instanceof EntityPlayer)) + return false; + + if(entityPlayer.fallDistance >= 20 && !((EntityPlayer)entityPlayer).capabilities.isCreativeMode) { + if(!world.isRemote) { + world.spawnEntityInWorld(EntityNukeExplosionMK4.statFac(world, 100, entity.posX, entity.posY, entity.posZ)); + + EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000, 100 * 0.005F); + entity2.posX = entity.posX; + entity2.posY = entity.posY; + entity2.posZ = entity.posZ; + world.spawnEntityInWorld(entity2); + } + } + } return false; } @@ -171,6 +211,9 @@ public class WeaponSpecial extends ItemSword { if(this == ModItems.shimmer_sledge || this == ModItems.shimmer_axe) { multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", -0.2, 1)); } + if(this == ModItems.wrench || this == ModItems.wrench_flipped) { + multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", -0.1, 1)); + } return multimap; } @@ -219,6 +262,18 @@ public class WeaponSpecial extends ItemSword { list.add("Timber!"); } } + if(this == ModItems.wrench) { + list.add("Mechanic Richard"); + } + if(this == ModItems.wrench_flipped) { + list.add("Wrench 2: The Wrenchening"); + } + if(this == ModItems.memespoon) { + list.add(EnumChatFormatting.DARK_GRAY + "Level 10 Shovel"); + list.add(EnumChatFormatting.AQUA + "Deals crits while the wielder is rocket jumping"); + list.add(EnumChatFormatting.RED + "20% slower firing speed"); + list.add(EnumChatFormatting.RED + "No random critical hits"); + } } } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 052e48080..d47bbe8b3 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -504,6 +504,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_tungsten, 2), new Object[] { "IP", "TP", "TI", 'P', "plateTitanium", 'T', "ingotTitanium", 'I', "ingotTungsten" })); GameRegistry.addRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', ModItems.ingot_dura_steel }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.wrench, 1), new Object[] { " S ", " IS", "I ", 'S', "ingotSteel", 'I', "ingotIron" })); + GameRegistry.addRecipe(new ItemStack(ModItems.wrench_flipped, 1), new Object[] { "S", "D", "W", 'S', Items.iron_sword, 'D', ModItems.ducttape, 'W', ModItems.wrench }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_cloud, 'G', ModItems.cape_codered_, 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.toothpicks, 3), new Object[] { Items.stick, Items.stick, Items.stick }); GameRegistry.addShapedRecipe(new ItemStack(ModItems.ducttape, 6), new Object[] { "FSF", "SPS", "FSF", 'F', Items.string, 'S', Items.slime_ball, 'P', Items.paper }); @@ -1098,7 +1102,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', ModItems.ingot_euphemium }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_dafnik, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1), 'D', new ItemStack(Items.dye, 1, 0), 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_lpkukin, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "plateSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_codered_, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 14), 'D', new ItemStack(Items.dye, 1, 8), 'I', "ingotAustralium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_codered_, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 6), 'D', new ItemStack(Items.dye, 1, 5), 'I', "ingotAustralium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_vertice, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "ingotVerticium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', ModItems.ingot_euphemium })); @@ -1152,9 +1156,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustLapis" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_ss, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustAdvanced" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_vc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustCMBSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotPolymer", 'D', "dustLapis" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_ss, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotPolymer", 'D', "dustAdvanced" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_vc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotPolymer", 'D', "dustCMBSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_advanced_alloy, 4), new Object[] { "dustRedstone", "dustIron", "dustCoal", "dustCopper" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_advanced_alloy, 3), new Object[] { "dustIron", "dustCoal", "dustRedstoneAlloy" })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index b710f5cd7..7b7c10fbe 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1595,5 +1595,35 @@ public class MainRegistry mutationID = propMutationID.getInt(); config.save(); + + radioStructure = setDef(radioStructure, 1000); + antennaStructure = setDef(antennaStructure, 1000); + atomStructure = setDef(atomStructure, 1000); + vertibirdStructure = setDef(vertibirdStructure, 1000); + dungeonStructure = setDef(dungeonStructure, 1000); + relayStructure = setDef(relayStructure, 1000); + satelliteStructure = setDef(satelliteStructure, 1000); + bunkerStructure = setDef(bunkerStructure, 1000); + siloStructure = setDef(siloStructure, 1000); + factoryStructure = setDef(factoryStructure, 1000); + dudStructure = setDef(dudStructure, 1000); + spaceshipStructure = setDef(spaceshipStructure, 1000); + barrelStructure = setDef(barrelStructure, 1000); + broadcaster = setDef(broadcaster, 1000); + minefreq = setDef(minefreq, 1000); + radfreq = setDef(radfreq, 1000); + meteorStrikeChance = setDef(meteorStrikeChance, 1000); + meteorShowerChance = setDef(meteorShowerChance, 1000); + } + + private static int setDef(int value, int def) { + + if(value <= 0) { + logger.error("Fatal error config: Randomizer value has been set to zero, despite bound having to be positive integer!"); + logger.error(String.format("Errored value will default back to %d, PLEASE REVIEW CONFIGURATION DESCRIPTION BEFORE MEDDLING WITH VALUES!", def)); + return def; + } + + return value; } } diff --git a/com/hbm/render/tileentity/RenderBombMulti.java b/com/hbm/render/tileentity/RenderBombMulti.java index 8d5afa5f8..754835902 100644 --- a/com/hbm/render/tileentity/RenderBombMulti.java +++ b/com/hbm/render/tileentity/RenderBombMulti.java @@ -26,19 +26,21 @@ public class RenderBombMulti extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glTranslated(x + 0.5D, y + 0.5D, z + 0.5D); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 1F, 0F, 0F); + switch(tileEntity.getBlockMetadata()) { case 5: GL11.glRotatef(90, 0F, 1F, 0F); break; case 2: - GL11.glRotatef(180, 0F, 1F, 0F); break; + GL11.glRotatef(0, 0F, 1F, 0F); break; case 4: GL11.glRotatef(270, 0F, 1F, 0F); break; case 3: - GL11.glRotatef(0, 0F, 1F, 0F); break; + GL11.glRotatef(180, 0F, 1F, 0F); break; } bindTexture(bombTexture);