diff --git a/assets/hbm/models/ams_emitter.obj b/assets/hbm/models/ams_emitter.obj index d06fec049..5c7e9c799 100644 --- a/assets/hbm/models/ams_emitter.obj +++ b/assets/hbm/models/ams_emitter.obj @@ -305,546 +305,578 @@ v -0.843750 5.750000 0.156250 v -0.843750 6.000000 0.156250 v -0.843750 5.750000 -0.156250 v -0.843750 6.000000 -0.156250 -vt 0.576667 0.382357 -vt 0.574662 0.392437 -vt 0.538573 0.392437 -vt 0.496469 0.330973 -vt 0.456371 0.330973 -vt 0.460380 0.285188 -vt 0.496469 0.382357 -vt 0.536568 0.330973 -vt 0.215778 0.382357 -vt 0.215778 0.330973 -vt 0.255877 0.330973 -vt 0.536568 0.382357 -vt 0.576667 0.330973 -vt 0.255877 0.382357 -vt 0.295976 0.330973 -vt 0.616765 0.330973 -vt 0.295976 0.382357 -vt 0.336074 0.330973 -vt 0.015285 0.382357 -vt 0.015284 0.330972 -vt 0.055383 0.330973 -vt 0.616766 0.382357 -vt 0.656864 0.330973 -vt 0.336074 0.382357 -vt 0.376173 0.330973 -vt 0.055383 0.382357 -vt 0.095482 0.330973 -vt 0.376173 0.382357 -vt 0.416272 0.330973 -vt 0.095482 0.382357 -vt 0.135581 0.330973 -vt 0.416272 0.382357 -vt 0.135581 0.382357 -vt 0.175680 0.330973 -vt 0.456371 0.382357 -vt 0.175679 0.382357 -vt 0.037893 0.157761 -vt 0.097889 0.105396 -vt 0.113878 0.127662 -vt 0.179689 0.285188 -vt 0.500479 0.285188 -vt 0.219788 0.285188 -vt 0.251867 0.285188 -vt 0.540578 0.285188 -vt 0.572657 0.285188 -vt 0.259887 0.285188 -vt 0.291966 0.285188 -vt 0.580677 0.285188 -vt 0.612756 0.285188 -vt 0.299986 0.285188 -vt 0.332065 0.285188 -vt 0.019294 0.285188 -vt 0.051373 0.285188 -vt 0.620775 0.285188 -vt 0.340084 0.285188 -vt 0.372163 0.285188 -vt 0.059393 0.285188 -vt 0.091472 0.285188 -vt 0.380183 0.285188 -vt 0.412262 0.285188 -vt 0.099492 0.285188 -vt 0.131571 0.285188 -vt 0.420282 0.285188 -vt 0.452361 0.285188 -vt 0.139591 0.285188 -vt 0.171670 0.285188 -vt 0.189877 0.179213 -vt 0.218452 0.092694 -vt 0.228419 0.093797 -vt 0.261577 0.254619 -vt 0.255468 0.186780 -vt 0.277841 0.183511 -vt 0.061828 0.181659 -vt 0.131117 0.145504 -vt 0.292505 0.250984 -vt 0.300105 0.177215 -vt 0.087230 0.202411 -vt 0.149618 0.159807 -vt 0.323346 0.243600 -vt 0.322079 0.167732 -vt 0.113991 0.219762 -vt 0.169262 0.170979 -vt 0.383419 0.217381 -vt 0.353768 0.232390 -vt 0.141924 0.233653 -vt 0.343644 0.154778 -vt 0.364814 0.137796 -vt 0.170832 0.244091 -vt 0.211262 0.184588 -vt 0.412039 0.198787 -vt 0.385834 0.115603 -vt 0.200531 0.251087 -vt 0.233200 0.187119 -vt 0.015284 0.131361 -vt 0.082701 0.076692 -vt 0.439698 0.177079 -vt 0.407253 0.085317 -vt 0.230843 0.254619 -vt 0.239371 0.093934 -vt 0.239618 0.072162 -vt 0.247952 0.071284 -vt 0.296126 0.071516 -vt 0.228839 0.093866 -vt 0.238944 0.093914 -vt 0.171086 0.062488 -vt 0.175333 0.069930 -vt 0.302698 0.064011 -vt 0.307469 0.055415 -vt 0.175485 0.070183 -vt 0.181789 0.076717 -vt 0.249882 0.092898 -vt 0.182018 0.076970 -vt 0.189634 0.082346 -vt 0.260206 0.090763 -vt 0.189926 0.082579 -vt 0.198460 0.086853 -vt 0.270174 0.087542 -vt 0.279254 0.083423 -vt 0.198801 0.087053 -vt 0.208001 0.090261 -vt 0.279613 0.083253 -vt 0.208379 0.090422 -vt 0.218048 0.092578 -vt 0.288334 0.077911 -vt 0.295869 0.071756 -vt 0.056392 0.914653 -vt 0.132886 0.927485 -vt 0.132886 0.933900 -vt 0.869643 0.540606 -vt 0.882474 0.464113 -vt 0.888890 0.464113 -vt 0.053268 0.804993 -vt 0.066100 0.728499 -vt 0.072515 0.728499 -vt 0.445643 0.752607 -vt 0.458474 0.676114 -vt 0.464890 0.676114 -vt 0.844491 0.479833 -vt 0.445643 0.793715 -vt 0.477722 0.752607 -vt 0.117166 0.971884 -vt 0.040672 0.984716 -vt 0.056392 0.946732 -vt 0.869643 0.581714 -vt 0.901722 0.540606 -vt 0.926873 0.479833 -vt 0.939705 0.556326 -vt 0.072515 0.687392 -vt 0.028116 0.744219 -vt 0.173993 0.933901 -vt 0.420491 0.691834 -vt 0.458474 0.635006 -vt 0.464890 0.635006 -vt 0.110499 0.744219 -vt 0.123330 0.820713 -vt 0.085347 0.804993 -vt 0.888890 0.423006 -vt 0.053268 0.846101 -vt 0.502873 0.691834 -vt 0.515705 0.768327 -vt 0.117166 0.889501 -vt 0.015284 0.914653 -vt 0.830792 0.951097 -vt 0.794703 0.951097 -vt 0.794703 0.920266 -vt 0.758615 0.951097 -vt 0.758615 0.920266 -vt 0.722526 0.951097 -vt 0.722526 0.920266 -vt 0.686437 0.951097 -vt 0.686437 0.920266 -vt 0.650348 0.951097 -vt 0.650348 0.920266 -vt 0.614259 0.951097 -vt 0.614259 0.920266 -vt 0.578170 0.951097 -vt 0.578170 0.920266 -vt 0.542081 0.951097 -vt 0.542081 0.920266 -vt 0.505992 0.951097 -vt 0.505992 0.920266 -vt 0.469904 0.951097 -vt 0.469904 0.920266 -vt 0.433815 0.951097 -vt 0.433815 0.920266 -vt 0.397726 0.951097 -vt 0.397726 0.920266 -vt 0.361637 0.951097 -vt 0.361637 0.920266 -vt 0.325548 0.951097 -vt 0.325548 0.920266 -vt 0.465371 0.495677 -vt 0.574130 0.423006 -vt 0.646801 0.531766 -vt 0.289459 0.951097 -vt 0.253371 0.951097 -vt 0.253371 0.920266 -vt 0.289459 0.920266 -vt 0.420991 0.565108 -vt 0.292700 0.590626 -vt 0.395472 0.436816 -vt 0.719181 0.487879 -vt 0.759280 0.487879 -vt 0.759280 0.554291 -vt 0.867188 0.750076 -vt 0.867188 0.790175 -vt 0.800776 0.790175 -vt 0.729244 0.269031 -vt 0.729244 0.202619 -vt 0.769342 0.202619 -vt 0.295181 0.699879 -vt 0.335280 0.699879 -vt 0.335280 0.766291 -vt 0.932061 0.754086 -vt 0.932061 0.786165 -vt 0.733254 0.137746 -vt 0.765333 0.137746 -vt 0.299191 0.635006 -vt 0.331270 0.635006 -vt 0.723191 0.423006 -vt 0.755270 0.423006 -vt 0.755270 0.677697 -vt 0.723191 0.677697 -vt 0.677370 0.786165 -vt 0.677370 0.754086 -vt 0.769342 0.269031 -vt 0.765333 0.392437 -vt 0.331270 0.889697 -vt 0.299191 0.889697 -vt 0.916953 0.831986 -vt 0.687433 0.152855 -vt 0.811153 0.152855 -vt 0.295181 0.766291 -vt 0.253371 0.650115 -vt 0.377090 0.650115 -vt 0.719181 0.554291 -vt 0.677370 0.438115 -vt 0.801090 0.438115 -vt 0.800776 0.750076 -vt 0.916953 0.708266 -vt 0.231240 0.072328 -vt 0.231712 0.026114 -vt 0.237435 0.026033 -vt 0.186929 0.060062 -vt 0.192978 0.063389 -vt 0.256122 0.069706 -vt 0.199735 0.066312 -vt 0.264005 0.067454 -vt 0.207066 0.068734 -vt 0.271480 0.064580 -vt 0.214843 0.070580 -vt 0.288020 0.078121 -vt 0.222942 0.071792 -vt 0.278425 0.061160 -vt 0.302514 0.064267 -vt 0.284716 0.057300 -vt 0.181720 0.056495 -vt 0.290222 0.053155 -vt 0.294822 0.049005 -vt 0.678402 0.031412 -vt 0.669962 0.018780 -vt 0.675194 0.015284 -vt 0.191981 0.019123 -vt 0.197814 0.020724 -vt 0.275449 0.017353 -vt 0.280450 0.015284 -vt 0.243126 0.025633 -vt 0.203354 0.022170 -vt 0.248762 0.024920 -vt 0.208942 0.023455 -vt 0.214582 0.024527 -vt 0.254320 0.023906 -vt 0.259780 0.022611 -vt 0.265126 0.021063 -vt 0.220266 0.025345 -vt 0.225983 0.025881 -vt 0.270348 0.019296 -vt 0.199577 0.615944 -vt 0.190120 0.611038 -vt 0.207351 0.577829 -vt 0.293971 0.392437 -vt 0.614761 0.392437 -vt 0.334069 0.392437 -vt 0.297981 0.392437 -vt 0.053378 0.392437 -vt 0.656864 0.382357 -vt 0.654859 0.392437 -vt 0.618770 0.392437 -vt 0.374168 0.392437 -vt 0.093477 0.392437 -vt 0.057388 0.392437 -vt 0.414267 0.392437 -vt 0.378178 0.392437 -vt 0.133576 0.392437 -vt 0.097487 0.392437 -vt 0.454366 0.392437 -vt 0.418277 0.392437 -vt 0.173675 0.392437 -vt 0.494464 0.392437 -vt 0.458376 0.392437 -vt 0.213773 0.392437 -vt 0.177684 0.392437 -vt 0.534563 0.392437 -vt 0.498474 0.392437 -vt 0.253872 0.392437 -vt 0.217783 0.392437 -vt 0.071828 0.434180 -vt 0.078601 0.442565 -vt 0.049155 0.466352 -vt 0.168195 0.643923 -vt 0.161178 0.635681 -vt 0.115804 0.423108 -vt 0.118139 0.434367 -vt 0.076846 0.644247 -vt 0.080428 0.632551 -vt 0.121498 0.645127 -vt 0.124188 0.656427 -vt 0.161793 0.436204 -vt 0.158035 0.447565 -vt 0.042355 0.614556 -vt 0.049951 0.605877 -vt 0.194501 0.464302 -vt 0.187358 0.472652 -vt 0.022135 0.577324 -vt 0.031743 0.572139 -vt 0.214916 0.499915 -vt 0.205668 0.505129 -vt 0.015284 0.537262 -vt 0.025706 0.535543 -vt 0.222657 0.539314 -vt 0.212378 0.541224 -vt 0.021047 0.497306 -vt 0.031469 0.498947 -vt 0.217775 0.579261 -vt 0.039873 0.461315 -vt 0.151861 0.616145 -vt 0.122654 0.622531 -vt 0.091843 0.612268 -vt 0.067470 0.591915 -vt 0.052264 0.565301 -vt 0.047059 0.535866 -vt 0.051400 0.506071 -vt 0.065114 0.480078 -vt 0.087336 0.462177 -vt 0.116489 0.456621 -vt 0.146881 0.467314 -vt 0.170584 0.486335 -vt 0.185602 0.512103 -vt 0.191175 0.541265 -vt 0.187262 0.570991 -vt 0.173736 0.597549 -vt 0.140610 0.476860 -vt 0.112539 0.469840 -vt 0.527642 0.026026 -vt 0.638166 0.099876 -vt 0.607576 0.145656 -vt 0.076432 0.585285 -vt 0.098921 0.602292 -vt 0.161957 0.492790 -vt 0.140760 0.477010 -vt 0.062548 0.562014 -vt 0.076334 0.585108 -vt 0.175461 0.515369 -vt 0.162052 0.492961 -vt 0.057898 0.536026 -vt 0.062503 0.561827 -vt 0.180428 0.541667 -vt 0.175506 0.515554 -vt 0.062158 0.508155 -vt 0.057903 0.535834 -vt 0.176544 0.568573 -vt 0.180450 0.541858 -vt 0.074836 0.485758 -vt 0.062126 0.507941 -vt 0.163818 0.592042 -vt 0.176545 0.568777 -vt 0.093957 0.471847 -vt 0.074863 0.485524 -vt 0.144940 0.606580 -vt 0.163798 0.592281 -vt 0.112325 0.469536 -vt 0.094020 0.471520 -vt 0.099062 0.602489 -vt 0.126336 0.609101 -vt 0.126559 0.609401 -vt 0.144885 0.606911 -vt 0.610243 0.660698 -vt 0.599966 0.660698 -vt 0.599966 0.647852 -vt 0.610243 0.673544 -vt 0.599966 0.673544 -vt 0.610243 0.686391 -vt 0.599966 0.686391 -vt 0.610243 0.647852 -vt 0.599966 0.635006 -vt 0.556551 0.660698 -vt 0.546274 0.660698 -vt 0.546274 0.647852 -vt 0.623089 0.660698 -vt 0.556551 0.673544 -vt 0.546274 0.673544 -vt 0.556551 0.686391 -vt 0.546274 0.686391 -vt 0.556551 0.647852 -vt 0.546274 0.635006 -vt 0.569397 0.660698 -vt 0.614714 0.212659 -vt 0.604437 0.212659 -vt 0.604437 0.199813 -vt 0.614714 0.225505 -vt 0.604437 0.225505 -vt 0.614714 0.238351 -vt 0.604437 0.238351 -vt 0.614714 0.199813 -vt 0.604437 0.186966 -vt 0.627560 0.212659 -vt 0.561022 0.212659 -vt 0.550745 0.212659 -vt 0.550745 0.199813 -vt 0.561022 0.225505 -vt 0.550745 0.225505 -vt 0.561022 0.238351 -vt 0.550745 0.238351 -vt 0.561022 0.199813 -vt 0.550745 0.186966 -vt 0.573868 0.212659 -vt 0.507330 0.212659 -vt 0.497053 0.212659 -vt 0.497053 0.199813 -vt 0.507330 0.225505 -vt 0.497053 0.225505 -vt 0.507330 0.238351 -vt 0.497053 0.238351 -vt 0.507330 0.199813 -vt 0.497053 0.186966 -vt 0.520176 0.212659 -vt 0.492459 0.285188 -vt 0.211768 0.285188 -vt 0.532558 0.285188 -vt 0.652854 0.285188 -vt 0.466484 0.153968 -vt 0.249457 0.092927 -vt 0.259793 0.090841 -vt 0.269783 0.087668 -vt 0.831659 0.556326 -vt 0.477722 0.793715 -vt 0.901722 0.581714 -vt 0.066100 0.687392 -vt 0.015284 0.820713 -vt 0.173993 0.927485 -vt 0.407659 0.768327 -vt 0.882474 0.423006 -vt 0.085347 0.846101 -vt 0.040672 0.876670 -vt 0.015284 0.946732 -vt 0.830792 0.920266 -vt 0.632991 0.565108 -vt 0.607472 0.590626 -vt 0.574130 0.604437 -vt 0.538042 0.604437 -vt 0.504700 0.590626 -vt 0.479181 0.565108 -vt 0.465370 0.531766 -vt 0.479181 0.462335 -vt 0.504700 0.436816 -vt 0.538042 0.423006 -vt 0.607472 0.436816 -vt 0.632991 0.462335 -vt 0.646801 0.495677 -vt 0.267181 0.462335 -vt 0.292700 0.436817 -vt 0.326042 0.423006 -vt 0.362130 0.423006 -vt 0.420991 0.462335 -vt 0.434802 0.495677 -vt 0.434802 0.531766 -vt 0.395472 0.590626 -vt 0.362130 0.604437 -vt 0.326042 0.604437 -vt 0.267181 0.565108 -vt 0.253371 0.531766 -vt 0.253371 0.495677 -vt 0.733254 0.392437 -vt 0.678402 0.015284 -vt 0.681366 0.016512 -vt 0.683634 0.018780 -vt 0.684862 0.021744 -vt 0.684862 0.024952 -vt 0.683634 0.027916 -vt 0.681366 0.030184 -vt 0.675194 0.031412 -vt 0.672230 0.030184 -vt 0.669962 0.027916 -vt 0.668735 0.024952 -vt 0.668735 0.021744 -vt 0.672230 0.016512 -vt 0.216808 0.582736 -vt 0.257882 0.392437 -vt 0.578672 0.392437 -vt 0.017289 0.392437 -vt 0.338079 0.392437 -vt 0.137586 0.392437 -vt 0.042381 0.457966 -vt 0.197138 0.619280 -vt 0.076267 0.431306 -vt 0.117916 0.656823 -vt 0.163868 0.646980 -vt 0.121897 0.423006 -vt 0.072832 0.641230 -vt 0.165179 0.439215 -vt 0.040344 0.611062 -vt 0.196606 0.467437 -vt 0.021321 0.573858 -vt 0.215947 0.503218 -vt 0.015284 0.533902 -vt 0.222802 0.542656 -vt 0.022187 0.493911 -vt 0.581644 0.156397 -vt 0.553575 0.156397 -vt 0.527642 0.145656 -vt 0.507794 0.125808 -vt 0.497053 0.099876 -vt 0.497053 0.071806 -vt 0.507794 0.045874 -vt 0.553575 0.015284 -vt 0.581644 0.015284 -vt 0.607576 0.026026 -vt 0.627424 0.045874 -vt 0.638166 0.071806 -vt 0.627424 0.125808 -vt 0.610243 0.635006 -vt 0.623089 0.647852 -vt 0.556551 0.635006 -vt 0.569397 0.647852 -vt 0.614714 0.186966 -vt 0.627560 0.199813 -vt 0.561022 0.186966 -vt 0.573868 0.199813 -vt 0.507330 0.186966 -vt 0.520176 0.199813 +vt 0.597601 0.320994 +vt 0.595523 0.331439 +vt 0.558123 0.331439 +vt 0.514489 0.267742 +vt 0.472933 0.267742 +vt 0.477089 0.220293 +vt 0.514489 0.320994 +vt 0.556045 0.267742 +vt 0.223599 0.320994 +vt 0.223599 0.267742 +vt 0.265155 0.267742 +vt 0.556045 0.320994 +vt 0.597601 0.267742 +vt 0.265155 0.320994 +vt 0.306710 0.267742 +vt 0.639156 0.267742 +vt 0.306710 0.320994 +vt 0.348266 0.267742 +vt 0.015820 0.320994 +vt 0.015820 0.267742 +vt 0.057376 0.267742 +vt 0.639156 0.320994 +vt 0.680712 0.267742 +vt 0.348266 0.320994 +vt 0.389822 0.267742 +vt 0.057376 0.320994 +vt 0.098932 0.267742 +vt 0.389822 0.320994 +vt 0.431378 0.267742 +vt 0.098932 0.320994 +vt 0.140487 0.267742 +vt 0.431378 0.320994 +vt 0.140487 0.320994 +vt 0.182043 0.267742 +vt 0.472933 0.320994 +vt 0.182043 0.320994 +vt 0.049065 0.188653 +vt 0.049065 0.103450 +vt 0.082309 0.103450 +vt 0.186199 0.220293 +vt 0.518645 0.220294 +vt 0.227755 0.220293 +vt 0.260999 0.220294 +vt 0.560200 0.220293 +vt 0.593445 0.220293 +vt 0.269310 0.220293 +vt 0.302555 0.220293 +vt 0.601756 0.220293 +vt 0.635001 0.220293 +vt 0.310866 0.220293 +vt 0.344111 0.220294 +vt 0.019976 0.220293 +vt 0.053220 0.220293 +vt 0.643312 0.220293 +vt 0.352422 0.220294 +vt 0.385666 0.220294 +vt 0.061532 0.220293 +vt 0.094776 0.220293 +vt 0.393977 0.220293 +vt 0.427222 0.220293 +vt 0.103087 0.220293 +vt 0.136332 0.220293 +vt 0.435533 0.220293 +vt 0.468778 0.220294 +vt 0.144643 0.220293 +vt 0.177888 0.220293 +vt 0.215288 0.103450 +vt 0.228586 0.024177 +vt 0.235235 0.024177 +vt 0.315022 0.188653 +vt 0.315022 0.103450 +vt 0.348266 0.103450 +vt 0.082309 0.188653 +vt 0.115554 0.103450 +vt 0.348266 0.188653 +vt 0.381511 0.103450 +vt 0.115554 0.188653 +vt 0.148799 0.103450 +vt 0.381511 0.188653 +vt 0.414755 0.103450 +vt 0.148799 0.188653 +vt 0.182043 0.103450 +vt 0.448000 0.188653 +vt 0.414755 0.188653 +vt 0.182043 0.188653 +vt 0.448000 0.103450 +vt 0.481245 0.103450 +vt 0.215288 0.188653 +vt 0.248532 0.103450 +vt 0.481245 0.188653 +vt 0.514489 0.103450 +vt 0.248532 0.188653 +vt 0.281777 0.103450 +vt 0.015820 0.188653 +vt 0.015820 0.103450 +vt 0.514489 0.188653 +vt 0.547734 0.103450 +vt 0.281777 0.188653 +vt 0.295075 0.024177 +vt 0.296737 0.015820 +vt 0.300061 0.015820 +vt 0.494542 0.024177 +vt 0.261830 0.024177 +vt 0.268479 0.024177 +vt 0.029118 0.024177 +vt 0.035767 0.024177 +vt 0.527787 0.024177 +vt 0.534436 0.024177 +vt 0.062363 0.024177 +vt 0.069012 0.024177 +vt 0.328320 0.024177 +vt 0.095607 0.024177 +vt 0.102256 0.024177 +vt 0.361564 0.024177 +vt 0.128852 0.024177 +vt 0.135501 0.024177 +vt 0.394809 0.024177 +vt 0.401457 0.024177 +vt 0.162096 0.024177 +vt 0.168745 0.024177 +vt 0.428053 0.024177 +vt 0.195341 0.024177 +vt 0.201990 0.024177 +vt 0.461298 0.024177 +vt 0.467947 0.024177 +vt 0.058422 0.854277 +vt 0.137695 0.867575 +vt 0.137695 0.874224 +vt 0.911572 0.189368 +vt 0.924870 0.110095 +vt 0.931518 0.110095 +vt 0.901064 0.484954 +vt 0.914362 0.405681 +vt 0.921011 0.405681 +vt 0.597597 0.704618 +vt 0.610895 0.625345 +vt 0.617544 0.625345 +vt 0.885506 0.126386 +vt 0.597597 0.747220 +vt 0.630841 0.704618 +vt 0.121403 0.913588 +vt 0.042131 0.926886 +vt 0.058422 0.887522 +vt 0.911572 0.231969 +vt 0.944816 0.189368 +vt 0.970882 0.126386 +vt 0.984180 0.205659 +vt 0.921011 0.363080 +vt 0.874999 0.421972 +vt 0.180296 0.874224 +vt 0.571531 0.641637 +vt 0.610895 0.582744 +vt 0.617543 0.582744 +vt 0.960375 0.421972 +vt 0.973673 0.501245 +vt 0.934309 0.484954 +vt 0.931518 0.067494 +vt 0.901064 0.527556 +vt 0.656907 0.641637 +vt 0.670205 0.720909 +vt 0.121403 0.828212 +vt 0.015820 0.854277 +vt 0.860921 0.910281 +vt 0.823520 0.910281 +vt 0.823520 0.878329 +vt 0.786120 0.910281 +vt 0.786120 0.878329 +vt 0.748720 0.910281 +vt 0.748720 0.878329 +vt 0.711320 0.910281 +vt 0.711320 0.878329 +vt 0.673920 0.910281 +vt 0.673920 0.878329 +vt 0.636519 0.910281 +vt 0.636519 0.878330 +vt 0.599119 0.910281 +vt 0.599119 0.878330 +vt 0.561719 0.910281 +vt 0.561719 0.878330 +vt 0.524319 0.910281 +vt 0.524319 0.878330 +vt 0.486919 0.910281 +vt 0.486919 0.878330 +vt 0.449519 0.910281 +vt 0.449519 0.878330 +vt 0.412118 0.910281 +vt 0.412118 0.878329 +vt 0.374718 0.910281 +vt 0.374718 0.878329 +vt 0.337318 0.910281 +vt 0.337318 0.878329 +vt 0.482182 0.438391 +vt 0.594893 0.363080 +vt 0.670205 0.475792 +vt 0.299918 0.910281 +vt 0.262518 0.910281 +vt 0.262518 0.878329 +vt 0.299918 0.878329 +vt 0.436229 0.510345 +vt 0.303276 0.536791 +vt 0.409783 0.377392 +vt 0.745175 0.430311 +vt 0.786731 0.430311 +vt 0.786731 0.499135 +vt 0.898560 0.701995 +vt 0.898560 0.743551 +vt 0.829735 0.743551 +vt 0.755682 0.203550 +vt 0.755682 0.134725 +vt 0.797238 0.134725 +vt 0.305848 0.649974 +vt 0.347403 0.649974 +vt 0.347403 0.718799 +vt 0.965791 0.706151 +vt 0.965791 0.739396 +vt 0.759838 0.067494 +vt 0.793082 0.067494 +vt 0.310003 0.582744 +vt 0.343248 0.582744 +vt 0.749331 0.363080 +vt 0.782575 0.363080 +vt 0.782575 0.627025 +vt 0.749331 0.627025 +vt 0.701845 0.739395 +vt 0.701845 0.706151 +vt 0.797238 0.203550 +vt 0.793082 0.331439 +vt 0.343248 0.846689 +vt 0.310003 0.846689 +vt 0.950133 0.786881 +vt 0.712352 0.083152 +vt 0.840568 0.083152 +vt 0.305848 0.718799 +vt 0.262518 0.598401 +vt 0.390733 0.598401 +vt 0.745175 0.499135 +vt 0.701845 0.378738 +vt 0.830060 0.378738 +vt 0.829735 0.701995 +vt 0.950133 0.658666 +vt 0.496673 0.688937 +vt 0.496673 0.667636 +vt 0.499997 0.667636 +vt 0.064025 0.015820 +vt 0.067349 0.015820 +vt 0.329982 0.015821 +vt 0.333306 0.015821 +vt 0.097269 0.015820 +vt 0.100594 0.015820 +vt 0.363226 0.015821 +vt 0.366551 0.015821 +vt 0.130514 0.015820 +vt 0.133838 0.015820 +vt 0.396471 0.015821 +vt 0.399795 0.015821 +vt 0.163759 0.015820 +vt 0.167083 0.015820 +vt 0.434702 0.024177 +vt 0.429716 0.015821 +vt 0.197003 0.015820 +vt 0.200328 0.015820 +vt 0.462960 0.015820 +vt 0.230248 0.015820 +vt 0.501191 0.024177 +vt 0.496205 0.015820 +vt 0.263493 0.015820 +vt 0.266817 0.015820 +vt 0.030780 0.015821 +vt 0.529449 0.015820 +vt 0.532774 0.015820 +vt 0.644997 0.117426 +vt 0.636250 0.104335 +vt 0.641672 0.100712 +vt 0.473401 0.688937 +vt 0.473401 0.667636 +vt 0.476726 0.667636 +vt 0.523268 0.688937 +vt 0.523268 0.667636 +vt 0.526593 0.667636 +vt 0.499997 0.688937 +vt 0.503322 0.667636 +vt 0.476726 0.688937 +vt 0.480050 0.667636 +vt 0.503322 0.688937 +vt 0.506646 0.667636 +vt 0.480050 0.688937 +vt 0.483375 0.667636 +vt 0.509971 0.688937 +vt 0.506646 0.688937 +vt 0.483375 0.688937 +vt 0.486699 0.667636 +vt 0.509971 0.667636 +vt 0.513295 0.667636 +vt 0.490024 0.688937 +vt 0.486699 0.688937 +vt 0.513295 0.688937 +vt 0.516619 0.667636 +vt 0.490024 0.667636 +vt 0.493348 0.667636 +vt 0.516619 0.688937 +vt 0.519944 0.667636 +vt 0.493348 0.688937 +vt 0.519944 0.688937 +vt 0.206809 0.563029 +vt 0.197009 0.557944 +vt 0.214866 0.523529 +vt 0.304633 0.331439 +vt 0.637079 0.331439 +vt 0.346188 0.331439 +vt 0.308788 0.331439 +vt 0.055298 0.331439 +vt 0.680712 0.320994 +vt 0.678634 0.331439 +vt 0.641234 0.331439 +vt 0.387744 0.331439 +vt 0.096854 0.331439 +vt 0.059454 0.331439 +vt 0.429300 0.331439 +vt 0.391900 0.331439 +vt 0.138410 0.331439 +vt 0.101009 0.331439 +vt 0.470856 0.331439 +vt 0.433455 0.331439 +vt 0.179965 0.331439 +vt 0.512411 0.331439 +vt 0.475011 0.331439 +vt 0.221521 0.331439 +vt 0.184121 0.331439 +vt 0.553967 0.331439 +vt 0.516567 0.331439 +vt 0.263077 0.331439 +vt 0.225677 0.331439 +vt 0.074418 0.374660 +vt 0.081438 0.383350 +vt 0.050921 0.408001 +vt 0.174287 0.592024 +vt 0.167014 0.583482 +vt 0.119992 0.363186 +vt 0.122412 0.374854 +vt 0.079619 0.592359 +vt 0.083330 0.580239 +vt 0.125893 0.593272 +vt 0.128681 0.604982 +vt 0.167653 0.376758 +vt 0.163758 0.388532 +vt 0.043875 0.561590 +vt 0.051747 0.552596 +vt 0.201549 0.405876 +vt 0.194146 0.414530 +vt 0.022920 0.523005 +vt 0.032876 0.517631 +vt 0.222706 0.442783 +vt 0.213121 0.448187 +vt 0.015820 0.481488 +vt 0.026620 0.479706 +vt 0.230727 0.483614 +vt 0.220075 0.485594 +vt 0.021793 0.440080 +vt 0.032593 0.441780 +vt 0.225668 0.525012 +vt 0.041302 0.402781 +vt 0.157359 0.563237 +vt 0.127091 0.569855 +vt 0.095160 0.559218 +vt 0.069901 0.538127 +vt 0.054144 0.510545 +vt 0.048750 0.480041 +vt 0.053248 0.449163 +vt 0.067460 0.422226 +vt 0.090489 0.403674 +vt 0.120702 0.397916 +vt 0.152199 0.408998 +vt 0.176763 0.428710 +vt 0.192326 0.455414 +vt 0.198102 0.485635 +vt 0.194046 0.516442 +vt 0.180029 0.543965 +vt 0.145700 0.418890 +vt 0.116608 0.411615 +vt 0.047521 0.648165 +vt 0.162061 0.724698 +vt 0.130360 0.772142 +vt 0.079189 0.531256 +vt 0.102495 0.548881 +vt 0.167822 0.435400 +vt 0.145855 0.419046 +vt 0.064802 0.507139 +vt 0.079087 0.531072 +vt 0.181817 0.458799 +vt 0.167920 0.435576 +vt 0.059982 0.480207 +vt 0.064755 0.506945 +vt 0.186964 0.486053 +vt 0.181864 0.458991 +vt 0.064397 0.451323 +vt 0.059987 0.480007 +vt 0.182939 0.513936 +vt 0.186987 0.486251 +vt 0.077536 0.428113 +vt 0.064364 0.451102 +vt 0.169750 0.538258 +vt 0.182940 0.514148 +vt 0.097351 0.413696 +vt 0.077563 0.427870 +vt 0.150187 0.553325 +vt 0.169730 0.538506 +vt 0.116387 0.411301 +vt 0.097416 0.413357 +vt 0.102642 0.549085 +vt 0.130907 0.555937 +vt 0.131138 0.556247 +vt 0.150130 0.553667 +vt 0.645628 0.042446 +vt 0.634978 0.042446 +vt 0.634978 0.029133 +vt 0.645628 0.055759 +vt 0.634978 0.055759 +vt 0.645628 0.069072 +vt 0.634978 0.069072 +vt 0.645628 0.029133 +vt 0.634978 0.015820 +vt 0.513280 0.609370 +vt 0.502630 0.609370 +vt 0.502630 0.596057 +vt 0.658941 0.042446 +vt 0.513280 0.622683 +vt 0.502630 0.622683 +vt 0.513280 0.635996 +vt 0.502630 0.635996 +vt 0.513280 0.596057 +vt 0.502630 0.582744 +vt 0.526593 0.609370 +vt 0.433024 0.609370 +vt 0.422373 0.609370 +vt 0.422373 0.596057 +vt 0.433024 0.622683 +vt 0.422373 0.622683 +vt 0.433024 0.635996 +vt 0.422373 0.635996 +vt 0.433024 0.596057 +vt 0.422373 0.582744 +vt 0.446337 0.609370 +vt 0.590025 0.127338 +vt 0.579374 0.127338 +vt 0.579374 0.114025 +vt 0.590025 0.140651 +vt 0.579374 0.140651 +vt 0.590025 0.153964 +vt 0.579374 0.153964 +vt 0.590025 0.114025 +vt 0.579374 0.100712 +vt 0.603338 0.127338 +vt 0.590025 0.042446 +vt 0.579374 0.042446 +vt 0.579374 0.029133 +vt 0.590025 0.055759 +vt 0.579374 0.055759 +vt 0.590025 0.069072 +vt 0.579374 0.069072 +vt 0.590025 0.029133 +vt 0.579374 0.015820 +vt 0.603338 0.042446 +vt 0.510334 0.220294 +vt 0.219443 0.220293 +vt 0.551889 0.220293 +vt 0.676556 0.220293 +vt 0.547734 0.188653 +vt 0.301724 0.024177 +vt 0.334968 0.024177 +vt 0.368213 0.024177 +vt 0.872208 0.205659 +vt 0.630841 0.747220 +vt 0.944816 0.231969 +vt 0.914362 0.363080 +vt 0.861701 0.501245 +vt 0.180296 0.867575 +vt 0.558233 0.720909 +vt 0.924870 0.067494 +vt 0.934309 0.527556 +vt 0.042131 0.814914 +vt 0.015820 0.887522 +vt 0.860921 0.878329 +vt 0.655893 0.510345 +vt 0.629447 0.536791 +vt 0.594893 0.551103 +vt 0.557493 0.551103 +vt 0.522940 0.536791 +vt 0.496494 0.510345 +vt 0.482182 0.475792 +vt 0.496494 0.403838 +vt 0.522940 0.377392 +vt 0.557493 0.363080 +vt 0.629447 0.377392 +vt 0.655892 0.403838 +vt 0.670205 0.438391 +vt 0.276830 0.403838 +vt 0.303276 0.377392 +vt 0.337830 0.363080 +vt 0.375230 0.363080 +vt 0.436229 0.403838 +vt 0.450541 0.438391 +vt 0.450541 0.475792 +vt 0.409783 0.536791 +vt 0.375230 0.551103 +vt 0.337830 0.551103 +vt 0.276830 0.510345 +vt 0.262518 0.475792 +vt 0.262518 0.438391 +vt 0.759838 0.331439 +vt 0.433040 0.015821 +vt 0.466284 0.015820 +vt 0.233572 0.015820 +vt 0.499529 0.015820 +vt 0.034105 0.015821 +vt 0.644997 0.100712 +vt 0.648068 0.101985 +vt 0.650419 0.104335 +vt 0.651691 0.107407 +vt 0.651691 0.110731 +vt 0.650419 0.113803 +vt 0.648068 0.116153 +vt 0.641672 0.117426 +vt 0.638601 0.116153 +vt 0.636250 0.113803 +vt 0.634978 0.110731 +vt 0.634978 0.107407 +vt 0.638601 0.101985 +vt 0.526593 0.688937 +vt 0.224666 0.528614 +vt 0.267232 0.331439 +vt 0.599678 0.331439 +vt 0.017898 0.331439 +vt 0.350344 0.331439 +vt 0.142565 0.331439 +vt 0.043902 0.399311 +vt 0.204281 0.566485 +vt 0.079018 0.371682 +vt 0.122181 0.605393 +vt 0.169802 0.595192 +vt 0.126307 0.363080 +vt 0.075458 0.589233 +vt 0.171161 0.379878 +vt 0.041790 0.557969 +vt 0.203730 0.409126 +vt 0.022076 0.519413 +vt 0.223774 0.446207 +vt 0.015820 0.478005 +vt 0.230878 0.487077 +vt 0.022973 0.436561 +vt 0.103485 0.783273 +vt 0.074396 0.783273 +vt 0.047521 0.772142 +vt 0.026952 0.751572 +vt 0.015820 0.724698 +vt 0.015820 0.695609 +vt 0.026952 0.668734 +vt 0.074396 0.637033 +vt 0.103485 0.637033 +vt 0.130360 0.648165 +vt 0.150929 0.668734 +vt 0.162061 0.695609 +vt 0.150929 0.751572 +vt 0.645628 0.015820 +vt 0.658941 0.029133 +vt 0.513280 0.582744 +vt 0.526593 0.596057 +vt 0.433024 0.582744 +vt 0.446337 0.596057 +vt 0.590025 0.100712 +vt 0.603338 0.114025 +vt 0.590025 0.015820 +vt 0.603338 0.029133 vn 0.000000 1.000000 0.000000 vn 0.880600 -0.440300 0.175200 vn 0.980800 0.000000 -0.195100 @@ -1050,127 +1082,127 @@ f 149/203/77 165/238/77 157/204/77 f 152/205/78 160/239/78 168/240/78 f 176/241/8 192/242/8 193/243/8 f 65/109/35 169/244/35 171/245/35 -f 74/111/35 178/101/35 179/246/35 -f 67/112/35 171/245/35 172/247/35 -f 75/114/35 179/246/35 180/248/35 -f 68/115/35 172/247/35 173/249/35 -f 76/117/35 180/248/35 181/250/35 -f 69/119/35 173/249/35 174/251/35 -f 78/252/35 77/121/35 181/250/35 -f 70/122/35 174/251/35 175/253/35 -f 79/125/35 78/124/35 182/254/35 -f 72/69/35 71/68/35 175/253/35 -f 80/255/35 79/102/35 183/256/35 -f 72/103/35 176/241/35 177/100/35 -f 65/106/35 66/105/35 170/257/35 -f 80/107/35 184/258/35 170/259/35 -f 195/260/35 189/261/35 187/262/35 -f 170/257/9 186/263/9 185/264/9 -f 184/258/10 200/265/10 186/266/10 -f 177/100/11 193/243/11 194/267/11 -f 169/244/12 185/264/12 187/268/12 -f 178/101/13 194/267/13 195/269/13 -f 171/245/14 187/268/14 188/270/14 -f 180/248/15 179/246/15 195/269/15 -f 172/247/16 188/270/16 189/271/16 -f 180/248/17 196/272/17 197/273/17 -f 174/251/18 173/249/18 189/271/18 -f 181/250/3 197/273/3 198/274/3 -f 174/251/4 190/275/4 191/276/4 -f 182/254/5 198/274/5 199/277/5 -f 175/253/6 191/276/6 192/242/6 -f 183/256/7 199/277/7 200/265/7 -f 215/278/5 231/279/5 230/280/5 -f 7/14/1 8/17/1 208/281/1 -f 15/1/1 16/22/1 216/282/1 -f 9/24/1 209/283/1 208/284/1 -f 1/19/1 2/26/1 201/285/1 -f 1/286/1 202/287/1 216/288/1 -f 9/24/1 10/28/1 210/289/1 -f 3/30/1 203/290/1 201/291/1 -f 11/32/1 211/292/1 210/293/1 -f 4/33/1 204/294/1 203/295/1 -f 12/35/1 212/296/1 211/297/1 -f 4/33/1 5/36/1 205/298/1 -f 13/7/1 213/299/1 212/300/1 -f 6/9/1 206/301/1 205/302/1 -f 14/12/1 214/303/1 213/304/1 -f 7/14/1 207/305/1 206/306/1 -f 208/307/6 224/308/6 223/309/6 -f 216/310/7 232/311/7 231/279/7 -f 209/312/8 225/313/8 224/308/8 -f 201/314/9 217/315/9 218/316/9 -f 202/317/10 218/316/10 232/311/10 -f 210/318/11 226/319/11 225/313/11 -f 203/320/12 219/321/12 217/315/12 -f 211/322/13 227/323/13 226/319/13 -f 204/324/14 220/325/14 219/321/14 -f 212/326/15 228/327/15 227/323/15 -f 205/328/16 221/329/16 220/325/16 -f 213/330/17 229/331/17 228/327/17 -f 206/332/18 222/333/18 221/329/18 -f 214/334/3 230/280/3 229/331/3 -f 207/335/4 223/309/4 222/333/4 -f 231/279/1 232/311/1 248/336/1 -f 218/316/1 233/337/1 248/336/1 -f 218/316/1 217/315/1 234/338/1 -f 219/321/1 235/339/1 234/338/1 -f 220/325/1 236/340/1 235/339/1 -f 220/325/1 221/329/1 237/341/1 -f 222/333/1 238/342/1 237/341/1 -f 222/333/1 223/309/1 239/343/1 -f 224/308/1 240/344/1 239/343/1 -f 225/313/1 241/345/1 240/344/1 -f 225/313/1 226/319/1 242/346/1 -f 226/319/1 227/323/1 243/347/1 -f 227/323/1 228/327/1 244/348/1 -f 228/327/1 229/331/1 245/349/1 -f 230/280/1 246/350/1 245/349/1 -f 231/279/1 247/351/1 246/350/1 -f 242/346/9 258/352/9 257/353/9 -f 257/354/1 263/355/1 250/356/1 -f 235/339/13 251/357/13 249/358/13 -f 243/347/12 259/359/12 258/360/12 -f 236/340/15 252/361/15 251/362/15 -f 244/348/14 260/363/14 259/364/14 -f 237/341/17 253/365/17 252/366/17 -f 245/349/16 261/367/16 260/368/16 -f 238/342/3 254/369/3 253/370/3 -f 246/350/18 262/371/18 261/372/18 -f 239/343/5 255/373/5 254/374/5 -f 247/351/4 263/375/4 262/376/4 -f 240/344/7 256/377/7 255/378/7 -f 248/336/6 264/379/6 263/380/6 -f 241/345/10 257/381/10 256/382/10 -f 234/338/11 249/383/11 250/384/11 -f 233/337/8 250/385/8 264/386/8 -f 268/387/57 267/388/57 265/389/57 -f 272/390/56 271/391/56 267/388/56 -f 270/392/55 269/393/55 271/391/55 -f 266/394/58 265/389/58 269/395/58 -f 276/396/57 275/397/57 273/398/57 -f 272/399/1 268/387/1 266/394/1 -f 280/400/56 279/401/56 275/397/56 -f 278/402/55 277/403/55 279/401/55 -f 274/404/58 273/398/58 277/405/58 -f 280/406/1 276/396/1 274/404/1 -f 284/407/57 283/408/57 281/409/57 -f 288/410/56 287/411/56 283/408/56 -f 286/412/55 285/413/55 287/411/55 -f 282/414/58 281/409/58 285/415/58 -f 288/416/1 284/407/1 282/414/1 -f 292/417/57 291/418/57 289/419/57 -f 296/420/56 295/421/56 291/418/56 -f 294/422/55 293/423/55 295/421/55 -f 290/424/58 289/419/58 293/425/58 -f 296/426/1 292/417/1 290/424/1 -f 300/427/57 299/428/57 297/429/57 -f 304/430/56 303/431/56 299/428/56 -f 302/432/55 301/433/55 303/431/55 -f 298/434/58 297/429/58 301/435/58 -f 304/436/1 300/427/1 298/434/1 +f 74/111/35 178/246/35 179/247/35 +f 67/112/35 171/248/35 172/249/35 +f 75/114/35 179/250/35 180/251/35 +f 68/115/35 172/252/35 173/253/35 +f 76/117/35 180/254/35 181/255/35 +f 69/119/35 173/256/35 174/257/35 +f 78/258/35 77/121/35 181/259/35 +f 70/122/35 174/260/35 175/261/35 +f 79/125/35 78/124/35 182/262/35 +f 72/69/35 71/68/35 175/263/35 +f 80/264/35 79/102/35 183/265/35 +f 72/103/35 176/266/35 177/267/35 +f 65/106/35 66/105/35 170/268/35 +f 80/107/35 184/269/35 170/270/35 +f 195/271/35 189/272/35 187/273/35 +f 170/274/9 186/275/9 185/276/9 +f 184/277/10 200/278/10 186/279/10 +f 177/280/11 193/243/11 194/281/11 +f 169/282/12 185/276/12 187/283/12 +f 178/284/13 194/281/13 195/285/13 +f 171/286/14 187/283/14 188/287/14 +f 180/288/15 179/289/15 195/285/15 +f 172/290/16 188/287/16 189/291/16 +f 180/288/17 196/292/17 197/293/17 +f 174/294/18 173/295/18 189/291/18 +f 181/296/3 197/293/3 198/297/3 +f 174/294/4 190/298/4 191/299/4 +f 182/300/5 198/297/5 199/301/5 +f 175/302/6 191/299/6 192/242/6 +f 183/303/7 199/301/7 200/278/7 +f 215/304/5 231/305/5 230/306/5 +f 7/14/1 8/17/1 208/307/1 +f 15/1/1 16/22/1 216/308/1 +f 9/24/1 209/309/1 208/310/1 +f 1/19/1 2/26/1 201/311/1 +f 1/312/1 202/313/1 216/314/1 +f 9/24/1 10/28/1 210/315/1 +f 3/30/1 203/316/1 201/317/1 +f 11/32/1 211/318/1 210/319/1 +f 4/33/1 204/320/1 203/321/1 +f 12/35/1 212/322/1 211/323/1 +f 4/33/1 5/36/1 205/324/1 +f 13/7/1 213/325/1 212/326/1 +f 6/9/1 206/327/1 205/328/1 +f 14/12/1 214/329/1 213/330/1 +f 7/14/1 207/331/1 206/332/1 +f 208/333/6 224/334/6 223/335/6 +f 216/336/7 232/337/7 231/305/7 +f 209/338/8 225/339/8 224/334/8 +f 201/340/9 217/341/9 218/342/9 +f 202/343/10 218/342/10 232/337/10 +f 210/344/11 226/345/11 225/339/11 +f 203/346/12 219/347/12 217/341/12 +f 211/348/13 227/349/13 226/345/13 +f 204/350/14 220/351/14 219/347/14 +f 212/352/15 228/353/15 227/349/15 +f 205/354/16 221/355/16 220/351/16 +f 213/356/17 229/357/17 228/353/17 +f 206/358/18 222/359/18 221/355/18 +f 214/360/3 230/306/3 229/357/3 +f 207/361/4 223/335/4 222/359/4 +f 231/305/1 232/337/1 248/362/1 +f 218/342/1 233/363/1 248/362/1 +f 218/342/1 217/341/1 234/364/1 +f 219/347/1 235/365/1 234/364/1 +f 220/351/1 236/366/1 235/365/1 +f 220/351/1 221/355/1 237/367/1 +f 222/359/1 238/368/1 237/367/1 +f 222/359/1 223/335/1 239/369/1 +f 224/334/1 240/370/1 239/369/1 +f 225/339/1 241/371/1 240/370/1 +f 225/339/1 226/345/1 242/372/1 +f 226/345/1 227/349/1 243/373/1 +f 227/349/1 228/353/1 244/374/1 +f 228/353/1 229/357/1 245/375/1 +f 230/306/1 246/376/1 245/375/1 +f 231/305/1 247/377/1 246/376/1 +f 242/372/9 258/378/9 257/379/9 +f 257/380/1 263/381/1 250/382/1 +f 235/365/13 251/383/13 249/384/13 +f 243/373/12 259/385/12 258/386/12 +f 236/366/15 252/387/15 251/388/15 +f 244/374/14 260/389/14 259/390/14 +f 237/367/17 253/391/17 252/392/17 +f 245/375/16 261/393/16 260/394/16 +f 238/368/3 254/395/3 253/396/3 +f 246/376/18 262/397/18 261/398/18 +f 239/369/5 255/399/5 254/400/5 +f 247/377/4 263/401/4 262/402/4 +f 240/370/7 256/403/7 255/404/7 +f 248/362/6 264/405/6 263/406/6 +f 241/371/10 257/407/10 256/408/10 +f 234/364/11 249/409/11 250/410/11 +f 233/363/8 250/411/8 264/412/8 +f 268/413/57 267/414/57 265/415/57 +f 272/416/56 271/417/56 267/414/56 +f 270/418/55 269/419/55 271/417/55 +f 266/420/58 265/415/58 269/421/58 +f 276/422/57 275/423/57 273/424/57 +f 272/425/1 268/413/1 266/420/1 +f 280/426/56 279/427/56 275/423/56 +f 278/428/55 277/429/55 279/427/55 +f 274/430/58 273/424/58 277/431/58 +f 280/432/1 276/422/1 274/430/1 +f 284/433/57 283/434/57 281/435/57 +f 288/436/56 287/437/56 283/434/56 +f 286/438/55 285/439/55 287/437/55 +f 282/440/58 281/435/58 285/441/58 +f 288/442/1 284/433/1 282/440/1 +f 292/443/57 291/444/57 289/445/57 +f 296/446/56 295/447/56 291/444/56 +f 294/448/55 293/449/55 295/447/55 +f 290/450/58 289/445/58 293/451/58 +f 296/452/1 292/443/1 290/450/1 +f 300/453/57 299/454/57 297/455/57 +f 304/456/56 303/457/56 299/454/56 +f 302/458/55 301/459/55 303/457/55 +f 298/460/58 297/455/58 301/461/58 +f 304/462/1 300/453/1 298/460/1 f 14/12/1 15/1/1 214/3/1 -f 45/437/2 29/4/2 44/6/2 +f 45/463/2 29/4/2 44/6/2 f 14/12/3 13/7/3 30/8/3 f 7/14/4 6/9/4 23/11/4 f 15/1/5 14/12/5 31/13/5 @@ -1178,7 +1210,7 @@ f 8/17/6 7/14/6 24/15/6 f 16/22/7 15/1/7 32/16/7 f 9/24/8 8/17/8 25/18/8 f 2/26/9 1/19/9 17/21/9 -f 1/286/10 16/22/10 18/23/10 +f 1/312/10 16/22/10 18/23/10 f 10/28/11 9/24/11 26/25/11 f 3/30/12 2/26/12 19/27/12 f 11/32/13 10/28/13 27/29/13 @@ -1188,15 +1220,15 @@ f 5/36/16 4/33/16 21/34/16 f 13/7/17 12/35/17 29/4/17 f 6/9/18 5/36/18 22/10/18 f 35/73/12 33/37/12 51/39/12 -f 38/438/19 22/10/19 37/40/19 -f 46/439/20 30/8/20 45/41/20 +f 38/464/19 22/10/19 37/40/19 +f 46/465/20 30/8/20 45/41/20 f 23/11/21 22/10/21 39/43/21 f 31/13/22 30/8/22 47/45/22 f 24/15/23 23/11/23 40/47/23 f 32/16/24 31/13/24 48/49/24 f 25/18/25 24/15/25 41/51/25 f 17/21/26 18/20/26 33/53/26 -f 34/440/27 18/23/27 48/54/27 +f 34/466/27 18/23/27 48/54/27 f 26/25/28 25/18/28 42/56/28 f 19/27/29 17/21/29 35/58/29 f 27/29/30 26/25/30 43/60/30 @@ -1217,45 +1249,45 @@ f 40/92/6 39/88/6 56/89/6 f 48/96/7 47/90/7 64/91/7 f 41/98/8 40/92/8 57/93/8 f 33/37/9 34/94/9 49/38/9 -f 34/441/10 48/96/10 50/97/10 +f 34/467/10 48/96/10 50/97/10 f 42/70/11 41/98/11 58/71/11 -f 74/442/35 73/99/35 178/101/35 -f 80/255/36 64/91/36 79/102/36 +f 74/468/35 73/99/35 178/101/35 +f 80/264/36 64/91/36 79/102/36 f 57/93/37 56/89/37 73/104/37 f 49/38/38 50/95/38 65/106/38 f 50/97/39 64/91/39 66/108/39 -f 74/442/40 58/71/40 73/99/40 +f 74/468/40 58/71/40 73/99/40 f 51/39/41 49/38/41 67/110/41 -f 75/443/42 59/72/42 74/111/42 +f 75/469/42 59/72/42 74/111/42 f 52/74/43 51/39/43 68/113/43 -f 76/444/44 60/76/44 75/114/44 +f 76/470/44 60/76/44 75/114/44 f 53/78/45 52/74/45 69/116/45 f 61/80/46 60/76/46 77/118/46 f 54/82/47 53/78/47 70/120/47 -f 78/252/48 62/86/48 77/121/48 +f 78/258/48 62/86/48 77/121/48 f 55/67/49 54/82/49 71/123/49 f 63/87/50 62/86/50 79/125/50 f 99/143/51 100/126/51 107/128/51 f 103/145/52 104/129/52 111/131/52 f 97/156/53 98/132/53 105/134/53 f 101/140/54 102/135/54 109/137/54 -f 88/445/17 96/138/17 104/129/17 -f 87/446/55 86/139/55 101/140/55 +f 88/471/17 96/138/17 104/129/17 +f 87/472/55 86/139/55 101/140/55 f 107/128/3 93/141/3 99/143/3 -f 81/447/56 88/144/56 103/145/56 +f 81/473/56 88/144/56 103/145/56 f 111/131/18 89/146/18 103/145/18 -f 90/448/55 91/148/55 106/133/55 -f 82/449/10 90/149/10 98/132/10 -f 92/450/56 93/150/56 108/127/56 -f 86/451/8 94/151/8 102/135/8 +f 90/474/55 91/148/55 106/133/55 +f 82/475/10 90/149/10 98/132/10 +f 92/476/56 93/150/56 108/127/56 +f 86/477/8 94/151/8 102/135/8 f 110/136/57 94/152/57 109/137/57 f 105/134/11 91/154/11 97/156/11 -f 96/452/58 89/157/58 112/130/58 -f 83/453/57 82/158/57 97/156/57 +f 96/478/58 89/157/58 112/130/58 +f 83/479/57 82/158/57 97/156/57 f 109/137/9 95/159/9 101/140/9 -f 84/454/16 92/161/16 100/126/16 -f 85/455/58 84/162/58 99/143/58 -f 115/456/10 116/163/10 117/165/10 +f 84/480/16 92/161/16 100/126/16 +f 85/481/58 84/162/58 99/143/58 +f 115/482/10 116/163/10 117/165/10 f 117/165/7 118/164/7 119/167/7 f 119/167/5 120/166/5 121/169/5 f 121/169/3 122/168/3 123/171/3 @@ -1269,34 +1301,34 @@ f 135/183/4 136/182/4 137/185/4 f 137/185/18 138/184/18 139/187/18 f 139/187/16 140/186/16 141/189/16 f 141/189/14 142/188/14 143/191/14 -f 120/194/1 118/457/1 116/458/1 -f 116/458/1 146/459/1 120/194/1 -f 144/460/1 142/461/1 140/462/1 -f 140/462/1 138/463/1 136/192/1 -f 136/192/1 134/464/1 128/193/1 -f 132/465/1 130/466/1 128/193/1 -f 128/193/1 126/467/1 124/468/1 -f 124/468/1 122/469/1 120/194/1 -f 120/194/1 146/459/1 144/460/1 -f 144/460/1 140/462/1 120/194/1 -f 134/464/1 132/465/1 128/193/1 -f 128/193/1 124/468/1 120/194/1 -f 120/194/1 140/462/1 136/192/1 +f 120/194/1 118/483/1 116/484/1 +f 116/484/1 146/485/1 120/194/1 +f 144/486/1 142/487/1 140/488/1 +f 140/488/1 138/489/1 136/192/1 +f 136/192/1 134/490/1 128/193/1 +f 132/491/1 130/492/1 128/193/1 +f 128/193/1 126/493/1 124/494/1 +f 124/494/1 122/495/1 120/194/1 +f 120/194/1 146/485/1 144/486/1 +f 144/486/1 140/488/1 120/194/1 +f 134/490/1 132/491/1 128/193/1 +f 128/193/1 124/494/1 120/194/1 +f 120/194/1 140/488/1 136/192/1 f 145/198/9 146/195/9 115/197/9 f 143/191/12 144/190/12 145/198/12 -f 145/470/35 115/471/35 117/472/35 -f 117/472/35 119/473/35 121/201/35 -f 121/201/35 123/474/35 125/475/35 -f 125/475/35 127/476/35 121/201/35 -f 129/199/35 131/477/35 133/478/35 -f 133/478/35 135/479/35 137/200/35 -f 137/200/35 139/480/35 141/481/35 -f 141/481/35 143/482/35 145/470/35 -f 145/470/35 117/472/35 121/201/35 -f 121/201/35 127/476/35 129/199/35 -f 129/199/35 133/478/35 137/200/35 -f 137/200/35 141/481/35 145/470/35 -f 145/470/35 121/201/35 137/200/35 +f 145/496/35 115/497/35 117/498/35 +f 117/498/35 119/499/35 121/201/35 +f 121/201/35 123/500/35 125/501/35 +f 125/501/35 127/502/35 121/201/35 +f 129/199/35 131/503/35 133/504/35 +f 133/504/35 135/505/35 137/200/35 +f 137/200/35 139/506/35 141/507/35 +f 141/507/35 143/508/35 145/496/35 +f 145/496/35 117/498/35 121/201/35 +f 121/201/35 127/502/35 129/199/35 +f 129/199/35 133/504/35 137/200/35 +f 137/200/35 141/507/35 145/496/35 +f 145/496/35 121/201/35 137/200/35 f 158/236/59 150/202/59 157/204/59 f 160/239/60 152/205/60 159/207/60 f 154/226/61 153/208/61 114/210/61 @@ -1307,150 +1339,150 @@ f 148/211/65 164/218/65 147/212/65 f 150/202/66 166/220/66 149/203/66 f 158/236/67 157/204/67 166/223/67 f 160/239/68 159/207/68 168/225/68 -f 161/483/69 153/208/69 162/227/69 +f 161/509/69 153/208/69 162/227/69 f 156/233/70 155/213/70 164/229/70 -f 177/100/8 176/241/8 193/243/8 +f 177/280/8 176/241/8 193/243/8 f 67/110/35 65/109/35 171/245/35 -f 75/443/35 74/111/35 179/246/35 -f 68/113/35 67/112/35 172/247/35 -f 76/444/35 75/114/35 180/248/35 -f 69/116/35 68/115/35 173/249/35 -f 77/118/35 76/117/35 181/250/35 -f 70/120/35 69/119/35 174/251/35 -f 182/254/35 78/252/35 181/250/35 -f 71/123/35 70/122/35 175/253/35 -f 183/256/35 79/125/35 182/254/35 -f 176/241/35 72/69/35 175/253/35 -f 184/258/35 80/255/35 183/256/35 -f 73/104/35 72/103/35 177/100/35 -f 169/244/35 65/106/35 170/257/35 -f 66/108/35 80/107/35 170/259/35 -f 187/262/35 185/484/35 186/485/35 -f 186/485/35 200/486/35 199/487/35 -f 199/487/35 198/488/35 195/260/35 -f 197/489/35 196/490/35 195/260/35 -f 195/260/35 194/491/35 193/492/35 -f 193/492/35 192/493/35 195/260/35 -f 191/494/35 190/495/35 189/261/35 -f 189/261/35 188/496/35 187/262/35 -f 187/262/35 186/485/35 195/260/35 -f 198/488/35 197/489/35 195/260/35 -f 195/260/35 192/493/35 191/494/35 -f 191/494/35 189/261/35 195/260/35 -f 186/485/35 199/487/35 195/260/35 -f 169/244/9 170/257/9 185/264/9 -f 170/259/10 184/258/10 186/266/10 -f 178/101/11 177/100/11 194/267/11 -f 171/245/12 169/244/12 187/268/12 -f 179/246/13 178/101/13 195/269/13 -f 172/247/14 171/245/14 188/270/14 -f 196/272/15 180/248/15 195/269/15 -f 173/249/16 172/247/16 189/271/16 -f 181/250/17 180/248/17 197/273/17 -f 190/275/18 174/251/18 189/271/18 -f 182/254/3 181/250/3 198/274/3 -f 175/253/4 174/251/4 191/276/4 -f 183/256/5 182/254/5 199/277/5 -f 176/241/6 175/253/6 192/242/6 -f 184/258/7 183/256/7 200/265/7 -f 214/497/5 215/278/5 230/280/5 -f 207/498/1 7/14/1 208/281/1 -f 215/499/1 15/1/1 216/282/1 -f 8/17/1 9/24/1 208/284/1 -f 202/500/1 1/19/1 201/285/1 -f 16/22/1 1/286/1 216/288/1 -f 209/501/1 9/24/1 210/289/1 -f 2/26/1 3/30/1 201/291/1 -f 10/28/1 11/32/1 210/293/1 -f 3/30/1 4/33/1 203/295/1 -f 11/32/1 12/35/1 211/297/1 -f 204/502/1 4/33/1 205/298/1 -f 12/35/1 13/7/1 212/300/1 -f 5/36/1 6/9/1 205/302/1 -f 13/7/1 14/12/1 213/304/1 -f 6/9/1 7/14/1 206/306/1 -f 207/503/6 208/307/6 223/309/6 -f 215/504/7 216/310/7 231/279/7 -f 208/505/8 209/312/8 224/308/8 -f 202/506/9 201/314/9 218/316/9 -f 216/507/10 202/317/10 232/311/10 -f 209/508/11 210/318/11 225/313/11 -f 201/509/12 203/320/12 217/315/12 -f 210/510/13 211/322/13 226/319/13 -f 203/511/14 204/324/14 219/321/14 -f 211/512/15 212/326/15 227/323/15 -f 204/513/16 205/328/16 220/325/16 -f 212/514/17 213/330/17 228/327/17 -f 205/515/18 206/332/18 221/329/18 -f 213/516/3 214/334/3 229/331/3 -f 206/517/4 207/335/4 222/333/4 -f 247/351/1 231/279/1 248/336/1 -f 232/311/1 218/316/1 248/336/1 -f 233/337/1 218/316/1 234/338/1 -f 217/315/1 219/321/1 234/338/1 -f 219/321/1 220/325/1 235/339/1 -f 236/340/1 220/325/1 237/341/1 -f 221/329/1 222/333/1 237/341/1 -f 238/342/1 222/333/1 239/343/1 -f 223/309/1 224/308/1 239/343/1 -f 224/308/1 225/313/1 240/344/1 -f 241/345/1 225/313/1 242/346/1 -f 242/346/1 226/319/1 243/347/1 -f 243/347/1 227/323/1 244/348/1 -f 244/348/1 228/327/1 245/349/1 -f 229/331/1 230/280/1 245/349/1 -f 230/280/1 231/279/1 246/350/1 -f 241/345/9 242/346/9 257/353/9 -f 250/356/1 249/518/1 251/519/1 -f 251/519/1 252/520/1 253/521/1 -f 253/521/1 254/522/1 257/354/1 -f 255/523/1 256/524/1 257/354/1 -f 257/354/1 258/525/1 259/526/1 -f 259/526/1 260/527/1 257/354/1 -f 261/528/1 262/529/1 263/355/1 -f 263/355/1 264/530/1 250/356/1 -f 250/356/1 251/519/1 257/354/1 -f 254/522/1 255/523/1 257/354/1 -f 257/354/1 260/527/1 261/528/1 -f 261/528/1 263/355/1 257/354/1 -f 251/519/1 253/521/1 257/354/1 -f 234/338/13 235/339/13 249/358/13 -f 242/346/12 243/347/12 258/360/12 -f 235/339/15 236/340/15 251/362/15 -f 243/347/14 244/348/14 259/364/14 -f 236/340/17 237/341/17 252/366/17 -f 244/348/16 245/349/16 260/368/16 -f 237/341/3 238/342/3 253/370/3 -f 245/349/18 246/350/18 261/372/18 -f 238/342/5 239/343/5 254/374/5 -f 246/350/4 247/351/4 262/376/4 -f 239/343/7 240/344/7 255/378/7 -f 247/351/6 248/336/6 263/380/6 -f 240/344/10 241/345/10 256/382/10 -f 233/337/11 234/338/11 250/384/11 -f 248/336/8 233/337/8 264/386/8 -f 266/394/57 268/387/57 265/389/57 -f 268/387/56 272/390/56 267/388/56 -f 272/390/55 270/392/55 271/391/55 -f 270/531/58 266/394/58 269/395/58 -f 274/404/57 276/396/57 273/398/57 -f 270/532/1 272/399/1 266/394/1 -f 276/396/56 280/400/56 275/397/56 -f 280/400/55 278/402/55 279/401/55 -f 278/533/58 274/404/58 277/405/58 -f 278/534/1 280/406/1 274/404/1 -f 282/414/57 284/407/57 281/409/57 -f 284/407/56 288/410/56 283/408/56 -f 288/410/55 286/412/55 287/411/55 -f 286/535/58 282/414/58 285/415/58 -f 286/536/1 288/416/1 282/414/1 -f 290/424/57 292/417/57 289/419/57 -f 292/417/56 296/420/56 291/418/56 -f 296/420/55 294/422/55 295/421/55 -f 294/537/58 290/424/58 293/425/58 -f 294/538/1 296/426/1 290/424/1 -f 298/434/57 300/427/57 297/429/57 -f 300/427/56 304/430/56 299/428/56 -f 304/430/55 302/432/55 303/431/55 -f 302/539/58 298/434/58 301/435/58 -f 302/540/1 304/436/1 298/434/1 +f 75/469/35 74/111/35 179/247/35 +f 68/113/35 67/112/35 172/249/35 +f 76/470/35 75/114/35 180/251/35 +f 69/116/35 68/115/35 173/253/35 +f 77/118/35 76/117/35 181/255/35 +f 70/120/35 69/119/35 174/257/35 +f 182/510/35 78/258/35 181/259/35 +f 71/123/35 70/122/35 175/261/35 +f 183/511/35 79/125/35 182/262/35 +f 176/512/35 72/69/35 175/263/35 +f 184/513/35 80/264/35 183/265/35 +f 73/104/35 72/103/35 177/267/35 +f 169/514/35 65/106/35 170/268/35 +f 66/108/35 80/107/35 170/270/35 +f 187/273/35 185/515/35 186/516/35 +f 186/516/35 200/517/35 199/518/35 +f 199/518/35 198/519/35 195/271/35 +f 197/520/35 196/521/35 195/271/35 +f 195/271/35 194/522/35 193/523/35 +f 193/523/35 192/524/35 195/271/35 +f 191/525/35 190/526/35 189/272/35 +f 189/272/35 188/527/35 187/273/35 +f 187/273/35 186/516/35 195/271/35 +f 198/519/35 197/520/35 195/271/35 +f 195/271/35 192/524/35 191/525/35 +f 191/525/35 189/272/35 195/271/35 +f 186/516/35 199/518/35 195/271/35 +f 169/282/9 170/274/9 185/276/9 +f 170/528/10 184/277/10 186/279/10 +f 178/284/11 177/280/11 194/281/11 +f 171/286/12 169/282/12 187/283/12 +f 179/289/13 178/284/13 195/285/13 +f 172/290/14 171/286/14 188/287/14 +f 196/292/15 180/288/15 195/285/15 +f 173/295/16 172/290/16 189/291/16 +f 181/296/17 180/288/17 197/293/17 +f 190/298/18 174/294/18 189/291/18 +f 182/300/3 181/296/3 198/297/3 +f 175/302/4 174/294/4 191/299/4 +f 183/303/5 182/300/5 199/301/5 +f 176/241/6 175/302/6 192/242/6 +f 184/277/7 183/303/7 200/278/7 +f 214/529/5 215/304/5 230/306/5 +f 207/530/1 7/14/1 208/307/1 +f 215/531/1 15/1/1 216/308/1 +f 8/17/1 9/24/1 208/310/1 +f 202/532/1 1/19/1 201/311/1 +f 16/22/1 1/312/1 216/314/1 +f 209/533/1 9/24/1 210/315/1 +f 2/26/1 3/30/1 201/317/1 +f 10/28/1 11/32/1 210/319/1 +f 3/30/1 4/33/1 203/321/1 +f 11/32/1 12/35/1 211/323/1 +f 204/534/1 4/33/1 205/324/1 +f 12/35/1 13/7/1 212/326/1 +f 5/36/1 6/9/1 205/328/1 +f 13/7/1 14/12/1 213/330/1 +f 6/9/1 7/14/1 206/332/1 +f 207/535/6 208/333/6 223/335/6 +f 215/536/7 216/336/7 231/305/7 +f 208/537/8 209/338/8 224/334/8 +f 202/538/9 201/340/9 218/342/9 +f 216/539/10 202/343/10 232/337/10 +f 209/540/11 210/344/11 225/339/11 +f 201/541/12 203/346/12 217/341/12 +f 210/542/13 211/348/13 226/345/13 +f 203/543/14 204/350/14 219/347/14 +f 211/544/15 212/352/15 227/349/15 +f 204/545/16 205/354/16 220/351/16 +f 212/546/17 213/356/17 228/353/17 +f 205/547/18 206/358/18 221/355/18 +f 213/548/3 214/360/3 229/357/3 +f 206/549/4 207/361/4 222/359/4 +f 247/377/1 231/305/1 248/362/1 +f 232/337/1 218/342/1 248/362/1 +f 233/363/1 218/342/1 234/364/1 +f 217/341/1 219/347/1 234/364/1 +f 219/347/1 220/351/1 235/365/1 +f 236/366/1 220/351/1 237/367/1 +f 221/355/1 222/359/1 237/367/1 +f 238/368/1 222/359/1 239/369/1 +f 223/335/1 224/334/1 239/369/1 +f 224/334/1 225/339/1 240/370/1 +f 241/371/1 225/339/1 242/372/1 +f 242/372/1 226/345/1 243/373/1 +f 243/373/1 227/349/1 244/374/1 +f 244/374/1 228/353/1 245/375/1 +f 229/357/1 230/306/1 245/375/1 +f 230/306/1 231/305/1 246/376/1 +f 241/371/9 242/372/9 257/379/9 +f 250/382/1 249/550/1 251/551/1 +f 251/551/1 252/552/1 253/553/1 +f 253/553/1 254/554/1 257/380/1 +f 255/555/1 256/556/1 257/380/1 +f 257/380/1 258/557/1 259/558/1 +f 259/558/1 260/559/1 257/380/1 +f 261/560/1 262/561/1 263/381/1 +f 263/381/1 264/562/1 250/382/1 +f 250/382/1 251/551/1 257/380/1 +f 254/554/1 255/555/1 257/380/1 +f 257/380/1 260/559/1 261/560/1 +f 261/560/1 263/381/1 257/380/1 +f 251/551/1 253/553/1 257/380/1 +f 234/364/13 235/365/13 249/384/13 +f 242/372/12 243/373/12 258/386/12 +f 235/365/15 236/366/15 251/388/15 +f 243/373/14 244/374/14 259/390/14 +f 236/366/17 237/367/17 252/392/17 +f 244/374/16 245/375/16 260/394/16 +f 237/367/3 238/368/3 253/396/3 +f 245/375/18 246/376/18 261/398/18 +f 238/368/5 239/369/5 254/400/5 +f 246/376/4 247/377/4 262/402/4 +f 239/369/7 240/370/7 255/404/7 +f 247/377/6 248/362/6 263/406/6 +f 240/370/10 241/371/10 256/408/10 +f 233/363/11 234/364/11 250/410/11 +f 248/362/8 233/363/8 264/412/8 +f 266/420/57 268/413/57 265/415/57 +f 268/413/56 272/416/56 267/414/56 +f 272/416/55 270/418/55 271/417/55 +f 270/563/58 266/420/58 269/421/58 +f 274/430/57 276/422/57 273/424/57 +f 270/564/1 272/425/1 266/420/1 +f 276/422/56 280/426/56 275/423/56 +f 280/426/55 278/428/55 279/427/55 +f 278/565/58 274/430/58 277/431/58 +f 278/566/1 280/432/1 274/430/1 +f 282/440/57 284/433/57 281/435/57 +f 284/433/56 288/436/56 283/434/56 +f 288/436/55 286/438/55 287/437/55 +f 286/567/58 282/440/58 285/441/58 +f 286/568/1 288/442/1 282/440/1 +f 290/450/57 292/443/57 289/445/57 +f 292/443/56 296/446/56 291/444/56 +f 296/446/55 294/448/55 295/447/55 +f 294/569/58 290/450/58 293/451/58 +f 294/570/1 296/452/1 290/450/1 +f 298/460/57 300/453/57 297/455/57 +f 300/453/56 304/456/56 299/454/56 +f 304/456/55 302/458/55 303/457/55 +f 302/571/58 298/460/58 301/461/58 +f 302/572/1 304/462/1 298/460/1 diff --git a/assets/hbm/textures/blocks/ams_limiter.png b/assets/hbm/textures/blocks/ams_limiter.png index f5f4fe407..e55f3b55c 100644 Binary files a/assets/hbm/textures/blocks/ams_limiter.png and b/assets/hbm/textures/blocks/ams_limiter.png differ diff --git a/assets/hbm/textures/entity/creeper_tainted.png b/assets/hbm/textures/entity/creeper_tainted.png new file mode 100644 index 000000000..cd41bc1bb Binary files /dev/null and b/assets/hbm/textures/entity/creeper_tainted.png differ diff --git a/assets/hbm/textures/items/clip_bolt_action.png b/assets/hbm/textures/items/clip_bolt_action.png index 2dd33c488..16364887f 100644 Binary files a/assets/hbm/textures/items/clip_bolt_action.png and b/assets/hbm/textures/items/clip_bolt_action.png differ diff --git a/assets/hbm/textures/items/pc_mo8_backup.png b/assets/hbm/textures/items/pc_mo8_backup.png new file mode 100644 index 000000000..080a55363 Binary files /dev/null and b/assets/hbm/textures/items/pc_mo8_backup.png differ diff --git a/assets/hbm/textures/models/BalefireCrashed.png b/assets/hbm/textures/models/BalefireCrashed.png index 6ce2c87a1..6fde17298 100644 Binary files a/assets/hbm/textures/models/BalefireCrashed.png and b/assets/hbm/textures/models/BalefireCrashed.png differ diff --git a/assets/hbm/textures/models/ams_base.png b/assets/hbm/textures/models/ams_base.png index 35f5a0720..069d857a0 100644 Binary files a/assets/hbm/textures/models/ams_base.png and b/assets/hbm/textures/models/ams_base.png differ diff --git a/assets/hbm/textures/models/ams_limiter.png b/assets/hbm/textures/models/ams_limiter.png index 986f5e094..931c7e57c 100644 Binary files a/assets/hbm/textures/models/ams_limiter.png and b/assets/hbm/textures/models/ams_limiter.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index dbb511549..c5af8a955 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -817,12 +817,12 @@ public class ModBlocks { dummy_port_pumpjack = new DummyBlockPumpjack(Material.iron).setBlockName("dummy_port_pumpjack").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); dummy_block_turbofan = new DummyBlockTurbofan(Material.iron).setBlockName("dummy_block_turbofan").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_turbofan = new DummyBlockTurbofan(Material.iron).setBlockName("dummy_port_turbofan").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_block_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_block_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_port_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_block_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_block_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_port_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_block_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_block_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_port_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_block_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_block_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); + dummy_port_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_port_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); + dummy_block_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_block_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); + dummy_port_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_port_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); + dummy_block_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_block_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); + dummy_port_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_port_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); dummy_block_radgen = new DummyBlockRadGen(Material.iron).setBlockName("dummy_block_radgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_radgen = new DummyBlockRadGen(Material.iron).setBlockName("dummy_port_radgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); } diff --git a/com/hbm/blocks/bomb/LaunchPad.java b/com/hbm/blocks/bomb/LaunchPad.java index 00e8ba697..de94483cb 100644 --- a/com/hbm/blocks/bomb/LaunchPad.java +++ b/com/hbm/blocks/bomb/LaunchPad.java @@ -211,7 +211,7 @@ public class LaunchPad extends BlockContainer implements IBomb { TileEntityLaunchPad entity = (TileEntityLaunchPad) p_149695_1_.getTileEntity(x, y, z); // { - if(entity.slots[1] != null && (entity.slots[1].getItem() == ModItems.designator || entity.slots[1].getItem() == ModItems.designator_range) && entity.slots[1].stackTagCompound != null) + if(entity.slots[1] != null && (entity.slots[1].getItem() == ModItems.designator || entity.slots[1].getItem() == ModItems.designator_range || entity.slots[1].getItem() == ModItems.designator_manual) && entity.slots[1].stackTagCompound != null) { int xCoord = entity.slots[1].stackTagCompound.getInteger("xCoord"); int zCoord = entity.slots[1].stackTagCompound.getInteger("zCoord"); diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index df14d072e..efb169130 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -85,7 +85,7 @@ public class BlockOre extends Block { } if(this == ModBlocks.block_meteor_treasure) { - switch(rand.nextInt(35)) { + switch(rand.nextInt(36)) { case 0: return ModItems.coil_advanced_alloy; case 1: return ModItems.plate_advanced_alloy; case 2: return ModItems.powder_desh_mix; @@ -121,6 +121,7 @@ public class BlockOre extends Block { case 32: return ModItems.gun_mirv_ammo; case 33: return ModItems.gun_defabricator_ammo; case 34: return ModItems.gun_osipr_ammo2; + case 35: return ModItems.glitch; } } if(this == ModBlocks.ore_rare) diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java index b6649763c..2a09c6859 100644 --- a/com/hbm/handler/GUIHandler.java +++ b/com/hbm/handler/GUIHandler.java @@ -1119,6 +1119,8 @@ public class GUIHandler implements IGuiHandler { { case ModItems.guiID_item_folder: return new GUIScreenTemplateFolder(player); + case ModItems.guiID_item_designator: + return new GUIScreenDesignator(player); } } return null; diff --git a/com/hbm/inventory/gui/GUIScreenDesignator.java b/com/hbm/inventory/gui/GUIScreenDesignator.java new file mode 100644 index 000000000..ab0d67357 --- /dev/null +++ b/com/hbm/inventory/gui/GUIScreenDesignator.java @@ -0,0 +1,227 @@ +package com.hbm.inventory.gui; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.lwjgl.opengl.GL11; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.MachineRecipes; +import com.hbm.items.ModItems; +import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; +import com.hbm.items.tool.ItemCassette; +import com.hbm.items.tool.ItemCassette.TrackType; +import com.hbm.items.tool.ItemChemistryTemplate; +import com.hbm.items.tool.ItemFluidIdentifier; +import com.hbm.lib.RefStrings; +import com.hbm.packet.ItemDesignatorPacket; +import com.hbm.packet.ItemFolderPacket; +import com.hbm.packet.PacketDispatcher; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class GUIScreenDesignator extends GuiScreen { + + protected static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_designator.png"); + protected int xSize = 176; + protected int ySize = 178; + protected int guiLeft; + protected int guiTop; + int shownX; + int shownZ; + int currentPage = 0; + List stacks = new ArrayList(); + List buttons = new ArrayList(); + private final EntityPlayer player; + + public GUIScreenDesignator(EntityPlayer player) { + + this.player = player; + } + + public void drawScreen(int mouseX, int mouseY, float f) + { + this.drawDefaultBackground(); + this.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + GL11.glDisable(GL11.GL_LIGHTING); + this.drawGuiContainerForegroundLayer(mouseX, mouseY); + GL11.glEnable(GL11.GL_LIGHTING); + } + + public void initGui() + { + super.initGui(); + this.guiLeft = (this.width - this.xSize) / 2; + this.guiTop = (this.height - this.ySize) / 2; + + shownX = 0; + shownZ = 0; + ItemStack stack = player.getHeldItem(); + + if(stack != null && stack.getItem() == ModItems.designator_manual && stack.hasTagCompound()) { + shownX = stack.stackTagCompound.getInteger("xCoord"); + shownZ = stack.stackTagCompound.getInteger("zCoord"); + } + + updateButtons(); + } + + private void updateButtons() { + buttons.clear(); + + buttons.add(new FolderButton(guiLeft + 25, guiTop + 26, 0, 0, 0, 1, null)); + buttons.add(new FolderButton(guiLeft + 52, guiTop + 26, 1, 0, 0, 5, null)); + buttons.add(new FolderButton(guiLeft + 79, guiTop + 26, 2, 0, 0, 10, null)); + buttons.add(new FolderButton(guiLeft + 106, guiTop + 26, 3, 0, 0, 50, null)); + buttons.add(new FolderButton(guiLeft + 133, guiTop + 26, 4, 0, 0, 100, null)); + + buttons.add(new FolderButton(guiLeft + 25, guiTop + 62, 5, 1, 0, 1, null)); + buttons.add(new FolderButton(guiLeft + 52, guiTop + 62, 6, 1, 0, 5, null)); + buttons.add(new FolderButton(guiLeft + 79, guiTop + 62, 7, 1, 0, 10, null)); + buttons.add(new FolderButton(guiLeft + 106, guiTop + 62, 8, 1, 0, 50, null)); + buttons.add(new FolderButton(guiLeft + 133, guiTop + 62, 9, 1, 0, 100, null)); + + buttons.add(new FolderButton(guiLeft + 133, guiTop + 44, 10, 2, 0, 0, "Set coord to current X position...")); + + buttons.add(new FolderButton(guiLeft + 25, guiTop + 26 + 72, 0, 0, 1, 1, null)); + buttons.add(new FolderButton(guiLeft + 52, guiTop + 26 + 72, 1, 0, 1, 5, null)); + buttons.add(new FolderButton(guiLeft + 79, guiTop + 26 + 72, 2, 0, 1, 10, null)); + buttons.add(new FolderButton(guiLeft + 106, guiTop + 26 + 72, 3, 0, 1, 50, null)); + buttons.add(new FolderButton(guiLeft + 133, guiTop + 26 + 72, 4, 0, 1, 100, null)); + + buttons.add(new FolderButton(guiLeft + 25, guiTop + 62 + 72, 5, 1, 1, 1, null)); + buttons.add(new FolderButton(guiLeft + 52, guiTop + 62 + 72, 6, 1, 1, 5, null)); + buttons.add(new FolderButton(guiLeft + 79, guiTop + 62 + 72, 7, 1, 1, 10, null)); + buttons.add(new FolderButton(guiLeft + 106, guiTop + 62 + 72, 8, 1, 1, 50, null)); + buttons.add(new FolderButton(guiLeft + 133, guiTop + 62 + 72, 9, 1, 1, 100, null)); + + buttons.add(new FolderButton(guiLeft + 133, guiTop + 44 + 72, 10, 2, 1, 0, "Set coord to current Z position...")); + } + + protected void mouseClicked(int i, int j, int k) { + try { + for(FolderButton b : buttons) + if(b.isMouseOnButton(i, j)) + b.executeAction(); + } catch (Exception ex) { } + } + + protected void drawGuiContainerForegroundLayer(int i, int j) { + + //this.fontRendererObj.drawString(I18n.format((currentPage + 1) + "/" + (getPageCount() + 1)), + // guiLeft + this.xSize / 2 - this.fontRendererObj.getStringWidth(I18n.format((currentPage + 1) + "/" + (getPageCount() + 1))) / 2, guiTop + 10, 4210752); + + for(FolderButton b : buttons) + if(b.isMouseOnButton(i, j)) + b.drawString(i, j); + + String x = String.valueOf(shownX); + String z = String.valueOf(shownZ); + this.fontRendererObj.drawString("X: " + x, + guiLeft + this.xSize / 2 - this.fontRendererObj.getStringWidth("X: " + x) / 2, guiTop + 50, 4210752); + this.fontRendererObj.drawString("Z: " + z, + guiLeft + this.xSize / 2 - this.fontRendererObj.getStringWidth("Z: " + z) / 2, guiTop + 50 + 18 * 4, 4210752); + } + + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + for(FolderButton b : buttons) + b.drawButton(b.isMouseOnButton(i, j)); + } + + protected void keyTyped(char p_73869_1_, int p_73869_2_) + { + if (p_73869_2_ == 1 || p_73869_2_ == this.mc.gameSettings.keyBindInventory.getKeyCode()) + { + this.mc.thePlayer.closeScreen(); + } + + } + + public void updateScreen() { + if(player.getHeldItem() == null || player.getHeldItem().getItem() != ModItems.designator_manual) + player.closeScreen(); + } + + class FolderButton { + + int xPos; + int yPos; + int type; + int operator; + int value; + int reference; + String info; + + public FolderButton(int x, int y, int t, int o, int r, int v, String i) { + xPos = x; + yPos = y; + type = t; + operator = o; + value = v; + reference = r; + info = i; + } + + public void updateButton(int mouseX, int mouseY) { + } + + public boolean isMouseOnButton(int mouseX, int mouseY) { + return xPos <= mouseX && xPos + 18 > mouseX && yPos < mouseY && yPos + 18 >= mouseY; + } + + public void drawButton(boolean b) { + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(xPos, yPos, b ? 176 + 18 : 176, type * 18, 18, 18); + } + + public void drawString(int x, int y) { + if(info == null || info.isEmpty()) + return; + + String s = info; + + func_146283_a(Arrays.asList(new String[] { s }), x, y); + } + + public void executeAction() { + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + PacketDispatcher.wrapper.sendToServer(new ItemDesignatorPacket(this.operator, this.value, this.reference)); + + int result = 0; + + if(operator == 0) + result += value; + if(operator == 1) + result -= value; + if(operator == 2) { + if(reference == 0) + shownX = (int)Math.round(player.posX); + else + shownZ = (int)Math.round(player.posZ); + return; + } + + if(reference == 0) + shownX += result; + else + shownZ += result; + } + + } + +} diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 813e0f11d..541eed93f 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -597,6 +597,7 @@ public class ModItems { public static Item designator; public static Item designator_range; + public static Item designator_manual; public static Item linker; public static Item oil_detector; public static Item geiger_counter; @@ -1122,8 +1123,9 @@ public class ModItems { public static Item ln2_10; public static Item nothing; public static Item void_anim; - + public static final int guiID_item_folder = 99; + public static final int guiID_item_designator = 100; public static void initializeItem() { @@ -1680,6 +1682,7 @@ public class ModItems { designator = new ItemDesingator().setUnlocalizedName("designator").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":designator"); designator_range = new ItemDesingatorRange().setUnlocalizedName("designator_range").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":designator_range_alt"); + designator_manual = new ItemDesingatorManual().setUnlocalizedName("designator_manual").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":designator_manual"); missile_generic = new Item().setUnlocalizedName("missile_generic").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_generic"); missile_anti_ballistic = new Item().setUnlocalizedName("missile_anti_ballistic").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_anti_ballistic"); missile_incendiary = new Item().setUnlocalizedName("missile_incendiary").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_incendiary"); @@ -2891,6 +2894,7 @@ public class ModItems { //Computer Tools GameRegistry.registerItem(designator, designator.getUnlocalizedName()); GameRegistry.registerItem(designator_range, designator_range.getUnlocalizedName()); + GameRegistry.registerItem(designator_manual, designator_manual.getUnlocalizedName()); GameRegistry.registerItem(turret_control, turret_control.getUnlocalizedName()); GameRegistry.registerItem(turret_chip, turret_chip.getUnlocalizedName()); GameRegistry.registerItem(linker, linker.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemGlitch.java b/com/hbm/items/special/ItemGlitch.java index 0c47b17d3..308484e40 100644 --- a/com/hbm/items/special/ItemGlitch.java +++ b/com/hbm/items/special/ItemGlitch.java @@ -2,11 +2,23 @@ package com.hbm.items.special; import java.util.List; +import com.hbm.blocks.ModBlocks; +import com.hbm.entity.effect.EntityVortex; +import com.hbm.entity.missile.EntityMIRV; +import com.hbm.entity.projectile.EntityBoxcar; +import com.hbm.explosion.ExplosionChaos; +import com.hbm.explosion.ExplosionLarge; +import com.hbm.items.ModItems; +import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemGlitch extends Item { @@ -23,6 +35,140 @@ public class ItemGlitch extends Item { stack.damageItem(5, player); + if(!world.isRemote) + switch(itemRand.nextInt(31)) { + case 0: + player.addChatMessage(new ChatComponentText("Sorry nothing.")); + break; + case 1: + player.addChatMessage(new ChatComponentText("Prometheus was punished by the gods by giving the gift of knowledge to man. He was cast into the bowels of the earth and pecked by birds.")); + break; + case 2: + player.attackEntityFrom(ModDamageSource.radiation, 1000); + break; + case 3: + player.attackEntityFrom(ModDamageSource.boxcar, 1000); + break; + case 4: + player.attackEntityFrom(ModDamageSource.blackhole, 1000); + break; + case 5: + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.block_meteor_treasure.getItemDropped(0, itemRand, 0))); + break; + case 6: + for(int i = 0; i < 3; i++) + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.block_meteor_treasure.getItemDropped(0, itemRand, 0))); + break; + case 7: + for(int i = 0; i < 10; i++) + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.block_meteor_treasure.getItemDropped(0, itemRand, 0))); + break; + case 8: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_container, 10)); + player.addChatMessage(new ChatComponentText("Oh, and by the way: The polaroid shifts reality. Things can be different if the polaroid is broken.")); + break; + case 9: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.nuke_advanced_kit, 1)); + break; + case 10: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.nuke_starter_kit, 1)); + break; + case 11: + EntityBoxcar pip = new EntityBoxcar(world); + pip.posX = player.posX; + pip.posY = player.posY + 50; + pip.posZ = player.posZ; + world.spawnEntityInWorld(pip); + break; + case 12: + for(int i = 0; i < 10; i++) { + EntityBoxcar pippo = new EntityBoxcar(world); + pippo.posX = player.posX + itemRand.nextGaussian() * 25; + pippo.posY = player.posY + 50; + pippo.posZ = player.posZ + itemRand.nextGaussian() * 25; + world.spawnEntityInWorld(pippo); + } + break; + case 13: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_sparkle)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter)); + player.addChatMessage(new ChatComponentText("Congratz, you're the wasteland hero now, now throw yourself into some fire or something for this weird achievement. Get going already, I'm not even being paid to tell you this.")); + break; + case 14: + player.inventory.dropAllItems(); + ExplosionChaos.burn(world, (int)player.posX, (int)player.posY, (int)player.posZ, 5); + break; + case 15: + for(int i = 0; i < 36; i++) + player.inventory.addItemStackToInventory(new ItemStack(Blocks.dirt, 64)); + break; + case 16: + player.addChatMessage(new ChatComponentText("v yvxr lbhe nggvghqr!")); + break; + case 17: + player.addChatMessage(new ChatComponentText("89% of magic tricks are not magic. Technically, they are sorcery.")); + break; + case 18: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lever_action)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lever_action_ammo, 12)); + player.addChatMessage(new ChatComponentText("Here ya go.")); + break; + case 19: + player.addChatMessage(new ChatComponentText("Indigo - Purple - Pink - Indigo")); + break; + case 20: + player.addChatMessage(new ChatComponentText("These colors are everywhere. Everywhere.")); + break; + case 21: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear)); + player.addChatMessage(new ChatComponentText("73616d706c652074657874!")); + break; + case 22: + player.addChatMessage(new ChatComponentText("Budget cuts, no effect for you.")); + break; + case 23: + player.addChatMessage(new ChatComponentText("oof")); + break; + case 24: + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 60 * 20, 9)); + player.addChatMessage(new ChatComponentText("Tank!")); + break; + case 25: + player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 60 * 20, 9)); + player.addChatMessage(new ChatComponentText("More devastating than a falling boxcar!")); + break; + case 26: + player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 60 * 20, 9)); + player.addChatMessage(new ChatComponentText("Ha!")); + break; + case 27: + EntityVortex vortex = new EntityVortex(world, 2.5F); + vortex.posX = player.posX; + vortex.posY = player.posY - 15; + vortex.posZ = player.posZ; + world.spawnEntityInWorld(vortex); + break; + case 28: + EntityMIRV mirv = new EntityMIRV(world); + mirv.posX = player.posX; + mirv.posY = player.posY + 100; + mirv.posZ = player.posZ; + world.spawnEntityInWorld(mirv); + player.addChatMessage(new ChatComponentText("Watch your head...")); + break; + case 29: + ExplosionLarge.spawnBurst(world, player.posX, player.posY, player.posZ, 27, 3); + player.addChatMessage(new ChatComponentText("Bam!")); + break; + case 30: + player.inventory.addItemStackToInventory(new ItemStack(ModItems.plate_dineutronium)); + player.addChatMessage(new ChatComponentText("Stare at it. No really, stare at it until you understand. Stare at it more. Stop reading this text, STARE AT IT!")); + break; + } + + player.inventoryContainer.detectAndSendChanges(); + return stack; } diff --git a/com/hbm/items/tool/ItemDesingatorManual.java b/com/hbm/items/tool/ItemDesingatorManual.java new file mode 100644 index 000000000..14d1427e7 --- /dev/null +++ b/com/hbm/items/tool/ItemDesingatorManual.java @@ -0,0 +1,44 @@ +package com.hbm.items.tool; + +import java.util.List; + +import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class ItemDesingatorManual extends Item { + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + + if(world.isRemote) + player.openGui(MainRegistry.instance, ModItems.guiID_item_designator, world, 0, 0, 0); + + return stack; + } + + @Override + public void onCreated(ItemStack p_77622_1_, World p_77622_2_, EntityPlayer p_77622_3_) { + p_77622_1_.stackTagCompound = new NBTTagCompound(); + p_77622_1_.stackTagCompound.setInteger("xCoord", 0); + p_77622_1_.stackTagCompound.setInteger("zCoord", 0); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) + { + if(stack.stackTagCompound != null) + { + list.add("Target Coordinates:"); + list.add("X: " + String.valueOf(stack.stackTagCompound.getInteger("xCoord"))); + list.add("Z: " + String.valueOf(stack.stackTagCompound.getInteger("zCoord"))); + } else { + list.add("Please select a target."); + } + } +} diff --git a/com/hbm/items/tool/ItemTemplateFolder.java b/com/hbm/items/tool/ItemTemplateFolder.java index 8e422547e..04bcd9ae7 100644 --- a/com/hbm/items/tool/ItemTemplateFolder.java +++ b/com/hbm/items/tool/ItemTemplateFolder.java @@ -8,6 +8,7 @@ import com.hbm.main.MainRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowNockEvent; diff --git a/com/hbm/packet/ItemDesignatorPacket.java b/com/hbm/packet/ItemDesignatorPacket.java new file mode 100644 index 000000000..a02fae135 --- /dev/null +++ b/com/hbm/packet/ItemDesignatorPacket.java @@ -0,0 +1,92 @@ +package com.hbm.packet; + +import com.hbm.items.ModItems; +import com.hbm.items.tool.ItemAssemblyTemplate; +import com.hbm.items.tool.ItemCassette; +import com.hbm.items.tool.ItemChemistryTemplate; +import com.hbm.items.tool.ItemFluidIdentifier; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class ItemDesignatorPacket implements IMessage { + + //0: Add + //1: Subtract + //2: Set + int operator; + int value; + int reference; + + public ItemDesignatorPacket() + { + + } + + public ItemDesignatorPacket(int operator, int value, int reference) + { + this.operator = operator; + this.value = value; + this.reference = reference; + } + + @Override + public void fromBytes(ByteBuf buf) { + operator = buf.readInt(); + value = buf.readInt(); + reference = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(operator); + buf.writeInt(value); + buf.writeInt(reference); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(ItemDesignatorPacket m, MessageContext ctx) { + + EntityPlayer p = ctx.getServerHandler().playerEntity; + + ItemStack stack = p.getHeldItem(); + + if(stack != null && stack.getItem() == ModItems.designator_manual) { + if(!stack.hasTagCompound()) + stack.stackTagCompound = new NBTTagCompound(); + int x = stack.stackTagCompound.getInteger("xCoord"); + int z = stack.stackTagCompound.getInteger("zCoord"); + + int result = 0; + + if(m.operator == 0) + result += m.value; + if(m.operator == 1) + result -= m.value; + if(m.operator == 2) { + if(m.reference == 0) + stack.stackTagCompound.setInteger("xCoord", (int)Math.round(p.posX)); + else + stack.stackTagCompound.setInteger("zCoord", (int)Math.round(p.posZ)); + return null; + } + + if(m.reference == 0) + stack.stackTagCompound.setInteger("xCoord", x + result); + else + stack.stackTagCompound.setInteger("zCoord", z + result); + } + + return null; + } + } +} diff --git a/com/hbm/packet/PacketDispatcher.java b/com/hbm/packet/PacketDispatcher.java index 4ceed2698..7a3024900 100644 --- a/com/hbm/packet/PacketDispatcher.java +++ b/com/hbm/packet/PacketDispatcher.java @@ -55,6 +55,8 @@ public class PacketDispatcher { wrapper.registerMessage(AuxGaugePacket.Handler.class, AuxGaugePacket.class, i++, Side.CLIENT); //Siren packet for looped sounds wrapper.registerMessage(TESirenPacket.Handler.class, TESirenPacket.class, i++, Side.CLIENT); + //Signals server to change ItemStack's + wrapper.registerMessage(ItemDesignatorPacket.Handler.class, ItemDesignatorPacket.class, i++, Side.SERVER); } } diff --git a/com/hbm/render/model/ModelBoltAction.java b/com/hbm/render/model/ModelBoltAction.java index fb37276f8..d0603bde0 100644 --- a/com/hbm/render/model/ModelBoltAction.java +++ b/com/hbm/render/model/ModelBoltAction.java @@ -92,7 +92,7 @@ public class ModelBoltAction extends ModelBase { setRotation(LeverMid, 0F, 0F, 0F); Trigger = new ModelRenderer(this, 88, 30); Trigger.addBox(-1F, 0F, 0F, 1, 3, 1); - Trigger.setRotationPoint(12.5F, 9F, -2.5F); + Trigger.setRotationPoint(12.5F, 9F, -0.5F); Trigger.setTextureSize(64, 32); Trigger.mirror = true; setRotation(Trigger, 0F, 0F, 0.3490659F); diff --git a/com/hbm/render/tileentity/RenderAMSLimiter.java b/com/hbm/render/tileentity/RenderAMSLimiter.java index 831ec5343..f037f6df4 100644 --- a/com/hbm/render/tileentity/RenderAMSLimiter.java +++ b/com/hbm/render/tileentity/RenderAMSLimiter.java @@ -36,7 +36,7 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { GL11.glRotatef(0, 0F, 1F, 0F); break; } - bindTexture(ResourceManager.universal); + bindTexture(ResourceManager.ams_limiter_tex); if(((TileEntityAMSLimiter)tileEntity).locked) ResourceManager.ams_limiter_destroyed.renderAll(); @@ -68,7 +68,7 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { GL11.glRotatef(0, 0F, 1F, 0F); break; } - bindTexture(ResourceManager.universal); + // bindTexture(ResourceManager.universal); TileEntityAMSLimiter limiter = (TileEntityAMSLimiter)tileEntity; diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java index 561ee5e56..3981e143d 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -26,8 +26,8 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public final long maxPower = 100000; private static final int[] slots_top = new int[] {0}; - private static final int[] slots_bottom = new int[] {2}; - private static final int[] slots_side = new int[] {1}; + private static final int[] slots_bottom = new int[] { 0, 1, 2}; + private static final int[] slots_side = new int[] {0}; public int state = 0; private String customName; diff --git a/com/hbm/tileentity/bomb/TileEntityTurretBase.java b/com/hbm/tileentity/bomb/TileEntityTurretBase.java index 3586d2218..ef1e141bc 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretBase.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretBase.java @@ -88,7 +88,12 @@ public abstract class TileEntityTurretBase extends TileEntity { if(e instanceof EntityPlayer && ((EntityPlayer)e).getUniqueID().toString().equals(uuid)) return false; - Vec3 turret = Vec3.createVectorHelper(xCoord + 0.5, yCoord + 1, zCoord + 0.5); + Vec3 turret; + if(this instanceof TileEntityTurretSpitfire) + turret = Vec3.createVectorHelper(xCoord + 0.5, yCoord + 1.5, zCoord + 0.5); + else + turret = Vec3.createVectorHelper(xCoord + 0.5, yCoord + 1, zCoord + 0.5); + Vec3 entity = Vec3.createVectorHelper(e.posX, e.posY + e.getEyeHeight(), e.posZ); Vec3 side = Vec3.createVectorHelper(entity.xCoord - turret.xCoord, entity.yCoord - turret.yCoord, entity.zCoord - turret.zCoord); side = side.normalize();