diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 522cb9907..b1b874466 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1111,6 +1111,11 @@ item.waste_thorium.name=Erschöpfter Thoriumkernbrennstoff item.waste_plutonium.name=Erschöpfter Plutoniumkernbrennstoff item.waste_mox.name=Erschöpfter MOX-Kernbrennstoff item.waste_schrabidium.name=Erschöpfter Schrabidiumkernbrennstoff +item.waste_uranium_hot.name=Erschöpfter Urankernbrennstoff (Heiß) +item.waste_thorium_hot.name=Erschöpfter Thoriumkernbrennstoff (Heiß) +item.waste_plutonium_hot.name=Erschöpfter Plutoniumkernbrennstoff (Heiß) +item.waste_mox_hot.name=Erschöpfter MOX-Kernbrennstoff (Heiß) +item.waste_schrabidium_hot.name=Erschöpfter Schrabidiumkernbrennstoff (Heiß) item.scrap.name=Schrott item.ingot_uranium_fuel.name=Urankernbrennstoffbarren diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 75500d239..6cde61941 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1111,6 +1111,11 @@ item.waste_thorium.name=Depleted Thorium Fuel item.waste_plutonium.name=Depleted Plutonium Fuel item.waste_mox.name=Depleted MOX Fuel item.waste_schrabidium.name=Depleted Schrabidium Fuel +item.waste_uranium_hot.name=Depleted Uranium Fuel (Hot) +item.waste_thorium_hot.name=Depleted Thorium Fuel (Hot) +item.waste_plutonium_hot.name=Depleted Plutonium Fuel (Hot) +item.waste_mox_hot.name=Depleted MOX Fuel (Hot) +item.waste_schrabidium_hot.name=Depleted Schrabidium Fuel (Hot) item.scrap.name=Scrap item.ingot_uranium_fuel.name=Ingot of Uranium Fuel diff --git a/assets/hbm/models/BalefireCrashed.obj b/assets/hbm/models/BalefireCrashed.obj index 36fbe4b0e..02deea2e4 100644 --- a/assets/hbm/models/BalefireCrashed.obj +++ b/assets/hbm/models/BalefireCrashed.obj @@ -1,623 +1,347 @@ -# Blender v2.76 (sub 0) OBJ File: 'BaleFireCrashed.blend' +# Blender v2.76 (sub 0) OBJ File: 'BalefireCrashed.blend' # www.blender.org o Sphere +v -0.192358 1.600254 -1.342660 +v -0.385711 1.581224 -1.324975 +v -0.515121 2.447250 -1.807938 v 0.002518 -3.248903 2.055765 -v -0.398402 -2.931915 1.973723 -v -0.592517 -2.498903 1.766917 -v -0.886012 2.697250 -1.260270 -v -0.676950 1.926895 -0.627098 v 0.082170 -3.153232 2.205975 v -0.260442 -2.766209 2.233894 -v -0.433214 -2.307561 2.067336 -v -0.535898 2.008001 -0.519458 -v -0.354920 2.062194 -0.470774 -v 0.223221 -3.072126 2.313615 -v -0.016133 -2.625729 2.420332 -v -0.151110 -2.145349 2.282616 -v -0.161567 2.081224 -0.488459 -v 0.014724 2.062194 -0.569820 -v 0.404200 -3.017933 2.362299 -v 0.297331 -2.531864 2.504655 -v 0.210847 -2.036963 2.379984 v 0.147114 2.008001 -0.702470 v 0.215449 1.926895 -0.866215 -v 0.597553 -2.998903 2.344614 -v 0.632228 -2.498903 2.474023 -v 0.597553 -1.998903 2.344614 +v 0.086039 2.792921 -1.349178 +v -0.592517 -2.498903 1.766917 +v -0.398402 -2.931915 1.973723 +v 0.223221 -3.072126 2.313615 +v -0.016133 -2.625729 2.420332 v 0.209324 1.831224 -1.036127 v 0.129673 1.735553 -1.186336 -v 0.773844 -3.017933 2.263253 +v 0.000262 2.601579 -1.669299 +v -0.433214 -2.307561 2.067336 +v -0.354920 2.062194 -0.470774 +v -0.484330 2.928220 -0.953737 +v -0.665308 2.874027 -1.002420 +v 0.017704 2.874027 -1.185433 +v -0.114686 2.928220 -1.052783 +v 0.297331 -2.531864 2.504655 +v 0.210847 -2.036963 2.379984 +v 0.079914 2.697250 -1.519089 +v 0.404200 -3.017933 2.362299 +v -0.535898 2.008001 -0.519458 +v -0.806360 2.792921 -1.110060 +v 0.632228 -2.498903 2.474023 +v 0.597553 -1.998903 2.344614 +v -0.161567 2.081224 -0.488459 +v 0.014724 2.062194 -0.569820 +v 0.597553 -2.998903 2.344614 +v -0.290977 2.947250 -0.971422 v 0.937573 -2.531864 2.333102 -v 0.950135 -2.036963 2.181892 -v -0.011379 1.654447 -1.293977 -v -0.192358 1.600254 -1.342660 -v 0.906234 -3.072126 2.130603 +v -0.756601 1.831224 -0.777308 +v -0.676950 1.926895 -0.627098 +v 0.773844 -3.017933 2.263253 +v -0.762726 1.735553 -0.947218 +v -0.892136 2.601579 -1.430181 +v -0.823802 2.520473 -1.593927 v 1.166879 -2.625729 2.103345 v 1.214915 -2.145350 1.916591 -v -0.385711 1.581224 -1.324975 -v -0.562002 1.600254 -1.243614 -v 0.502818 -3.364928 1.991061 -v 0.974568 -3.153232 1.966858 -v 1.285238 -2.766209 1.819730 -v 1.351584 -2.307561 1.589101 v -0.694392 1.654447 -1.110963 -v -0.762726 1.735553 -0.947218 -v -0.756601 1.831224 -0.777308 +v -0.691412 2.466280 -1.726577 +v 0.906234 -3.072126 2.130603 +v 1.285238 -2.766209 1.819730 +v -0.886012 2.697250 -1.260270 +v 0.974568 -3.153232 1.966858 +v -0.011379 1.654447 -1.293977 +v -0.321768 2.466280 -1.825623 v 0.968443 -3.248903 1.796946 v 1.274630 -2.931916 1.525435 +v 0.662393 0.773857 -0.982993 v 1.339334 -2.498903 1.249279 -v -1.122404 0.773857 -0.504757 -v -0.985735 0.611646 -0.832247 +v -0.720955 0.503259 -1.097548 +v -0.562002 1.600254 -1.243614 v 0.888792 -3.344573 1.646737 +v -0.950852 1.156541 0.135484 v 1.136669 -3.097622 1.265264 v 1.180032 -2.690245 0.948859 -v -0.720955 0.503259 -1.097548 -v -0.368373 0.465199 -1.260270 +v 0.432497 1.427138 0.250040 +v 0.697277 1.318752 -0.015261 v 0.747740 -3.425679 1.539097 v 0.892360 -3.238102 1.078826 +v -0.668748 1.318752 0.350765 v 0.897927 -2.852456 0.733579 -v 0.018332 0.503259 -1.295640 v 0.380289 0.611645 -1.198273 v 0.566762 -3.479873 1.490413 v 0.578896 -3.331967 0.994504 -v 0.535970 -2.960843 0.636212 -v 0.662393 0.773857 -0.982993 -v 0.821696 0.965199 -0.682573 +v -0.985735 0.611646 -0.832247 +v -0.306791 1.427138 0.448132 v 0.373409 -3.498903 1.508098 v 0.243999 -3.364928 1.025135 -v 0.149265 -2.998903 0.671582 v 0.833946 1.156540 -0.342751 -v 0.697277 1.318752 -0.015261 +v 0.535970 -2.960843 0.636212 v 0.197118 -3.479872 1.589459 +v 0.018332 0.503259 -1.295640 +v 0.149265 -2.998903 0.671582 v -0.061346 -3.331967 1.166056 -v -0.203317 -2.960842 0.834304 -v 0.432497 1.427138 0.250040 +v -1.122404 0.773857 -0.504757 v 0.079915 1.465199 0.412762 -v 0.064728 -3.425679 1.722109 +v -0.203317 -2.960842 0.834304 v -0.290652 -3.238101 1.395814 -v -0.468097 -2.852456 1.099605 -v -0.306791 1.427138 0.448132 -v -0.668748 1.318752 0.350765 -v -0.003607 -3.344573 1.885854 +v 0.821696 0.965199 -0.682573 +v 0.064728 -3.425679 1.722109 +v -0.368373 0.465199 -1.260270 v -0.409011 -3.097622 1.679429 v -0.604766 -2.690244 1.427095 -v -0.950852 1.156541 0.135484 v -1.110155 0.965199 -0.164935 -v -0.806360 2.792921 -1.110060 -v -0.665308 2.874027 -1.002420 -v -0.484330 2.928220 -0.953737 -v -0.290977 2.947250 -0.971422 -v -0.114686 2.928220 -1.052783 -v 0.017704 2.874027 -1.185433 -v 0.086039 2.792921 -1.349178 -v 0.079914 2.697250 -1.519089 -v 0.000262 2.601579 -1.669299 +v -0.003607 -3.344573 1.885854 +v 0.502818 -3.364928 1.991061 +v 0.950135 -2.036963 2.181892 +v -0.151110 -2.145349 2.282616 +v 1.351584 -2.307561 1.589101 +v -0.468097 -2.852456 1.099605 v -0.140790 2.520473 -1.776940 -v -0.321768 2.466280 -1.825623 -v -0.515121 2.447250 -1.807938 -v -0.691412 2.466280 -1.726577 -v -0.823802 2.520473 -1.593927 -v -0.892136 2.601579 -1.430181 -v -1.463708 1.331224 -1.484414 -v -1.015420 2.331225 0.188618 -v -1.593117 2.197250 -1.967377 -v -1.144830 3.197250 -0.294344 -v 0.468144 1.331224 -2.002052 -v 0.916431 2.331225 -0.329019 -v 0.338734 2.197250 -2.485015 -v 0.787022 3.197250 -0.811982 +v 0.304880 2.200599 -2.418174 +v -1.530379 2.200599 -1.926418 v -1.407440 1.377875 -1.467603 v -0.981567 2.327875 0.121777 -v -1.530379 2.200599 -1.926418 -v -1.104505 3.150599 -0.337037 -v 0.427819 1.377875 -1.959360 +v -1.015420 2.331225 0.188618 +v 0.916431 2.331225 -0.329019 v 0.853692 2.327875 -0.369979 -v 0.304880 2.200599 -2.418174 v 0.730753 3.150599 -0.828793 -v -0.186876 3.150599 -0.582915 -v -0.063937 2.327875 -0.124101 -v -1.194503 1.852875 -0.672913 +v -1.104505 3.150599 -0.337037 +v 0.468144 1.331224 -2.002052 +v 0.338734 2.197250 -2.485015 +v -1.463708 1.331224 -1.484414 +v -1.593117 2.197250 -1.967377 +v 0.427819 1.377875 -1.959360 +v -1.144830 3.197250 -0.294344 +v 0.787022 3.197250 -0.811982 +v 0.640756 1.852875 -1.164669 +v 0.517817 2.675599 -1.623483 v -1.317442 2.675599 -1.131727 +v -1.194503 1.852875 -0.672913 v -0.612749 2.200599 -2.172296 v -0.489810 1.377875 -1.713482 -v 0.517817 2.675599 -1.623483 -v 0.640756 1.852875 -1.164669 -vt 0.945208 0.440590 -vt 0.924528 0.440590 -vt 0.924528 0.335937 -vt 0.430111 0.981163 -vt 0.409431 0.981163 -vt 0.401862 0.927509 -vt 0.638208 0.937379 -vt 0.617528 0.937379 -vt 0.617528 0.832726 -vt 0.156902 0.848737 -vt 0.154131 0.902841 -vt 0.118313 0.902841 -vt 0.523297 0.966960 -vt 0.502618 0.966960 -vt 0.495048 0.913306 -vt 0.050900 0.943658 -vt 0.030220 0.943658 -vt 0.030220 0.839005 -vt 0.395502 0.848737 -vt 0.392731 0.902841 -vt 0.356913 0.902840 -vt 0.003180 0.943658 -vt 0.003180 0.839005 -vt 0.023860 0.839005 -vt 0.057260 0.943658 -vt 0.057260 0.839005 -vt 0.077940 0.839005 -vt 0.700321 0.869750 -vt 0.736139 0.869750 -vt 0.738910 0.923854 -vt 0.644568 0.937379 -vt 0.644568 0.832726 -vt 0.665248 0.832726 -vt 0.275869 0.962774 -vt 0.255189 0.962774 -vt 0.247620 0.909120 -vt 0.924528 0.218725 -vt 0.924528 0.114072 -vt 0.945208 0.114072 -vt 0.345011 0.902841 -vt 0.309193 0.902841 -vt 0.306422 0.848737 -vt 0.945208 0.329657 -vt 0.924528 0.329657 -vt 0.924528 0.225004 -vt 0.401862 0.921230 -vt 0.409431 0.867575 -vt 0.430111 0.867575 -vt 0.921792 0.863471 -vt 0.901112 0.863471 -vt 0.901112 0.758818 -vt 0.847384 0.713895 -vt 0.850155 0.659792 -vt 0.885973 0.659792 -vt 0.945208 0.107793 -vt 0.924528 0.107793 -vt 0.924528 0.003140 -vt 0.475577 0.966960 -vt 0.454897 0.966960 -vt 0.447328 0.913306 -vt 0.422542 0.645710 -vt 0.422542 0.750363 -vt 0.401862 0.750363 -vt 0.297291 0.902841 -vt 0.261473 0.902841 -vt 0.258702 0.848737 -vt 0.401862 0.528499 -vt 0.401862 0.423845 -vt 0.422542 0.423845 -vt 0.191511 0.962774 -vt 0.170831 0.962774 -vt 0.163262 0.909120 -vt 0.751611 0.923854 -vt 0.754381 0.869750 -vt 0.790200 0.869750 -vt 0.928152 0.863471 -vt 0.928152 0.758818 -vt 0.948832 0.758818 -vt 0.745270 0.983787 -vt 0.752839 0.930133 -vt 0.773519 0.930133 -vt 0.611168 0.937379 -vt 0.590488 0.937379 -vt 0.590488 0.832726 -vt 0.759872 0.428032 -vt 0.793601 0.450282 -vt 0.778978 0.522861 -vt 0.956401 0.869750 -vt 0.977081 0.869750 -vt 0.984650 0.923405 -vt 0.870448 0.371656 -vt 0.860108 0.488216 -vt 0.839428 0.488216 -vt 0.897875 0.659792 -vt 0.933693 0.659792 -vt 0.936464 0.713895 -vt 0.876808 0.119699 -vt 0.887148 0.003140 -vt 0.907828 0.003140 -vt 0.241260 0.909120 -vt 0.233690 0.962774 -vt 0.213010 0.962774 -vt 0.876808 0.488216 -vt 0.887148 0.371656 -vt 0.907828 0.371656 -vt 0.201851 0.902841 -vt 0.166033 0.902841 -vt 0.163262 0.848737 -vt 0.829088 0.125978 -vt 0.870448 0.125978 -vt 0.860108 0.242538 -vt 0.339547 0.909120 -vt 0.360227 0.909120 -vt 0.367796 0.962774 -vt 0.888744 0.536953 -vt 0.878404 0.653513 -vt 0.857724 0.653513 -vt 0.844261 0.935760 -vt 0.808442 0.935760 -vt 0.805672 0.881657 -vt 0.584128 0.790269 -vt 0.542768 0.790269 -vt 0.553108 0.673709 -vt 0.725799 0.983787 -vt 0.705119 0.983787 -vt 0.697550 0.930133 -vt 0.936464 0.653513 -vt 0.895104 0.653513 -vt 0.905444 0.536953 -vt 0.210982 0.902841 -vt 0.213753 0.848737 -vt 0.249571 0.848737 -vt 0.805672 0.875377 -vt 0.816012 0.758818 -vt 0.836692 0.758818 -vt 0.962761 0.758818 -vt 0.983441 0.758818 -vt 0.991011 0.812472 -vt 0.584128 0.544591 -vt 0.542768 0.544591 -vt 0.553108 0.428032 -vt 0.495048 0.907027 -vt 0.497819 0.852923 -vt 0.533637 0.852923 -vt 0.115542 0.962775 -vt 0.123111 0.909120 -vt 0.143791 0.909120 -vt 0.876808 0.242538 -vt 0.887148 0.125978 -vt 0.907828 0.125978 -vt 0.853392 0.935760 -vt 0.856162 0.881657 -vt 0.891981 0.881657 -vt 0.918168 0.248817 -vt 0.907828 0.365377 -vt 0.887148 0.365377 -vt 0.870448 0.248817 -vt 0.860108 0.365377 -vt 0.839428 0.365377 -vt 0.942472 0.869750 -vt 0.939701 0.923854 -vt 0.903882 0.923854 -vt 0.870448 0.003140 -vt 0.860108 0.119699 -vt 0.839428 0.119699 -vt 0.297368 0.909120 -vt 0.318048 0.909120 -vt 0.325617 0.962774 -vt 0.853392 0.758818 -vt 0.894752 0.758818 -vt 0.884412 0.875377 -vt 0.450098 0.852923 -vt 0.485917 0.852923 -vt 0.488688 0.907027 -vt 0.542768 0.913108 -vt 0.553108 0.796548 -vt 0.573788 0.796548 -vt 0.550337 0.919387 -vt 0.571017 0.919387 -vt 0.578587 0.973041 -vt 0.401862 0.639431 -vt 0.401862 0.534778 -vt 0.422542 0.534778 -vt 0.987705 0.657856 -vt 0.987705 0.712029 -vt 0.967396 0.661704 -vt 0.832712 0.995241 -vt 0.843052 0.942039 -vt 0.853392 0.995241 -vt 0.488688 0.421752 -vt 0.447328 0.421752 -vt 0.447328 0.003140 -vt 0.976140 0.113916 -vt 0.996449 0.063591 -vt 0.996449 0.117764 -vt 0.354142 0.842458 -vt 0.354142 0.423845 -vt 0.395502 0.423845 -vt 0.805672 0.995241 -vt 0.816012 0.942039 -vt 0.826352 0.995241 -vt 0.775008 0.003140 -vt 0.775008 0.421752 -vt 0.733648 0.421752 -vt 0.374156 0.959445 -vt 0.394466 0.909120 -vt 0.394466 0.963292 -vt 0.252342 0.423845 -vt 0.252342 0.842458 -vt 0.210982 0.842458 -vt 0.976140 0.177245 -vt 0.986480 0.124043 -vt 0.996820 0.177245 -vt 0.536408 0.003140 -vt 0.536408 0.421752 -vt 0.495048 0.421752 -vt 0.859752 0.995241 -vt 0.870092 0.942039 -vt 0.880432 0.995241 -vt 0.685928 0.421752 -vt 0.685928 0.003140 -vt 0.727288 0.003140 -vt 0.963854 0.269050 -vt 0.984164 0.218725 -vt 0.984164 0.272898 -vt 0.300062 0.423845 -vt 0.300062 0.842458 -vt 0.258702 0.842458 -vt 0.156902 0.423845 -vt 0.156902 0.842458 -vt 0.115542 0.842458 -vt 0.967396 0.587278 -vt 0.987705 0.536953 -vt 0.987705 0.591126 -vt 0.347782 0.842458 -vt 0.306422 0.842458 -vt 0.306422 0.423845 -vt 0.963854 0.329502 -vt 0.984164 0.279177 -vt 0.984164 0.333349 -vt 0.590488 0.421752 -vt 0.590488 0.003140 -vt 0.631848 0.003140 -vt 0.901112 0.983335 -vt 0.911452 0.930133 -vt 0.921792 0.983335 -vt 0.984164 0.339628 -vt 0.984164 0.393801 -vt 0.963854 0.343476 -vt 0.822728 0.003140 -vt 0.822728 0.421752 -vt 0.781368 0.421752 -vt 0.967396 0.647730 -vt 0.987705 0.597405 -vt 0.987705 0.651577 -vt 0.679568 0.003140 -vt 0.679568 0.421752 -vt 0.638208 0.421752 -vt 0.972248 0.497194 -vt 0.992558 0.446869 -vt 0.992558 0.501041 -vt 0.584128 0.421752 -vt 0.542768 0.421752 -vt 0.542768 0.003140 -vt 0.590488 0.996860 -vt 0.600828 0.943658 -vt 0.611168 0.996860 -vt 0.488688 0.846644 -vt 0.447328 0.846644 -vt 0.447328 0.428031 -vt 0.163262 0.423845 -vt 0.204622 0.423845 -vt 0.204622 0.842458 -vt 0.924528 0.500972 -vt 0.927299 0.446869 -vt 0.963118 0.446869 -vt 0.976140 0.053465 -vt 0.996449 0.003140 -vt 0.996449 0.057312 -vt 0.542768 0.667430 -vt 0.553108 0.550870 -vt 0.573788 0.550870 -vt 0.536408 0.428031 -vt 0.536408 0.846644 -vt 0.495048 0.846644 -vt 0.977081 0.983338 -vt 0.956401 0.983338 -vt 0.948832 0.929684 -vt 0.401862 0.861296 -vt 0.401862 0.756643 -vt 0.422542 0.756643 -vt 0.216244 0.218725 -vt 0.216244 0.417566 -vt 0.115542 0.417566 -vt 0.340266 0.003140 -vt 0.340266 0.201981 -vt 0.440968 0.201981 -vt 0.955110 0.542186 -vt 0.961036 0.536953 -vt 0.961036 0.746259 -vt 0.328606 0.417566 -vt 0.227904 0.417566 -vt 0.227904 0.218725 -vt 0.115542 0.212446 -vt 0.115542 0.003140 -vt 0.221544 0.003140 -vt 0.109182 0.003140 -vt 0.109182 0.212446 -vt 0.003180 0.212446 -vt 0.697550 0.536953 -vt 0.697550 0.641606 -vt 0.786963 0.638990 -vt 0.092593 0.730689 -vt 0.092593 0.830109 -vt 0.003180 0.832726 -vt 0.590488 0.721794 -vt 0.590488 0.826447 -vt 0.679901 0.823830 -vt 0.697550 0.749922 -vt 0.697550 0.650502 -vt 0.786963 0.647885 -vt 0.948750 0.536953 -vt 0.948750 0.746259 -vt 0.942824 0.741027 -vt 0.435668 0.627919 -vt 0.429742 0.633152 -vt 0.429742 0.423845 -vt 0.104879 0.932146 -vt 0.098953 0.937379 -vt 0.098953 0.728073 -vt 0.951568 0.428031 -vt 0.951568 0.218725 -vt 0.957494 0.223958 -vt 0.003180 0.218725 -vt 0.109182 0.218725 -vt 0.109182 0.428031 -vt 0.435668 0.218725 -vt 0.435668 0.417566 -vt 0.334966 0.417566 -vt 0.841024 0.641606 -vt 0.793323 0.638990 -vt 0.793323 0.539569 -vt 0.745251 0.860855 -vt 0.745251 0.761434 -vt 0.697550 0.758818 -vt 0.799312 0.761434 -vt 0.799312 0.860855 -vt 0.751611 0.863471 -vt 0.841024 0.752539 -vt 0.793323 0.749922 -vt 0.793323 0.650502 -vt 0.003180 0.581192 -vt 0.003180 0.721793 -vt 0.103882 0.721793 -vt 0.003180 0.434311 -vt 0.003180 0.574912 -vt 0.103882 0.574912 -vt 0.691190 0.574913 -vt 0.590488 0.574913 -vt 0.590488 0.715514 -vt 0.590488 0.428032 -vt 0.590488 0.568633 -vt 0.691190 0.568633 -vt 0.969780 0.207213 -vt 0.963854 0.212446 -vt 0.963854 0.003140 -vt 0.435668 0.639431 -vt 0.435668 0.848737 -vt 0.429742 0.843504 -vt 0.227904 0.212446 -vt 0.227904 0.003140 -vt 0.333906 0.003140 -vt 0.951568 0.008372 -vt 0.957494 0.003140 -vt 0.957494 0.212446 -vt 0.945208 0.335937 -vt 0.437681 0.927509 -vt 0.638208 0.832726 -vt 0.115542 0.848737 -vt 0.530867 0.913306 -vt 0.050900 0.839005 -vt 0.354142 0.848737 -vt 0.023860 0.943658 -vt 0.077940 0.943658 -vt 0.697550 0.923854 -vt 0.665248 0.937379 -vt 0.283438 0.909120 -vt 0.945208 0.218725 -vt 0.347782 0.848737 -vt 0.945208 0.225004 -vt 0.437681 0.921230 -vt 0.921792 0.758818 -vt 0.888744 0.713895 -vt 0.945208 0.003140 -vt 0.483147 0.913306 -vt 0.401862 0.645710 -vt 0.300062 0.848737 -vt 0.422542 0.528499 -vt 0.199081 0.909120 -vt 0.792971 0.923854 -vt 0.948832 0.863471 -vt 0.781089 0.983787 -vt 0.611168 0.832726 -vt 0.759873 0.530674 -vt 0.739193 0.530674 -vt 0.720087 0.522861 -vt 0.705464 0.508424 -vt 0.697550 0.489561 -vt 0.697550 0.469144 -vt 0.705464 0.450282 -vt 0.720087 0.435845 -vt 0.739193 0.428032 -vt 0.778978 0.435845 -vt 0.801515 0.469144 -vt 0.801515 0.489561 -vt 0.793601 0.508424 -vt 0.948832 0.923405 -vt 0.829088 0.371656 -vt 0.895104 0.713895 -vt 0.918168 0.119699 -vt 0.205441 0.909120 -vt 0.918168 0.488216 -vt 0.204622 0.848737 -vt 0.839428 0.242538 -vt 0.331977 0.962774 -vt 0.847384 0.536953 -vt 0.847032 0.881657 -vt 0.573788 0.673709 -vt 0.733369 0.930133 -vt 0.926124 0.536953 -vt 0.252342 0.902841 -vt 0.847032 0.875377 -vt 0.955192 0.812472 -vt 0.573788 0.428032 -vt 0.536408 0.907027 -vt 0.151361 0.962775 -vt 0.918168 0.242538 -vt 0.894752 0.935760 -vt 0.876808 0.248817 -vt 0.829088 0.248817 -vt 0.901112 0.869750 -vt 0.829088 0.003140 -vt 0.289798 0.962774 -vt 0.863732 0.875377 -vt 0.447328 0.907027 -vt 0.584128 0.913108 -vt 0.542768 0.973041 -vt 0.422542 0.639431 -vt 0.488688 0.003140 -vt 0.395502 0.842458 -vt 0.733648 0.003140 -vt 0.210982 0.423845 -vt 0.495048 0.003140 -vt 0.727288 0.421752 -vt 0.258702 0.423845 -vt 0.115542 0.423845 -vt 0.347782 0.423845 -vt 0.631848 0.421752 -vt 0.781368 0.003140 -vt 0.638208 0.003140 -vt 0.584128 0.003140 -vt 0.488688 0.428031 -vt 0.163262 0.842458 -vt 0.965888 0.500972 -vt 0.584128 0.667430 -vt 0.495048 0.428031 -vt 0.984650 0.929684 -vt 0.422542 0.861296 -vt 0.115542 0.218725 -vt 0.440968 0.003140 -vt 0.955110 0.741027 -vt 0.328606 0.218725 -vt 0.221544 0.212446 -vt 0.003180 0.003140 -vt 0.786963 0.539569 -vt 0.003180 0.728073 -vt 0.679901 0.724410 -vt 0.786963 0.752539 -vt 0.942824 0.542186 -vt 0.435668 0.429078 -vt 0.104879 0.733305 -vt 0.957494 0.422799 -vt 0.003180 0.428031 -vt 0.334966 0.218725 -vt 0.841024 0.536953 -vt 0.697550 0.863471 -vt 0.751611 0.758818 -vt 0.841024 0.647885 -vt 0.103882 0.581192 -vt 0.103882 0.434311 -vt 0.691190 0.715514 -vt 0.691190 0.428032 -vt 0.969780 0.008372 -vt 0.429742 0.644663 -vt 0.333906 0.212446 -vt 0.951568 0.207213 +v -0.186876 3.150599 -0.582915 +v -0.063937 2.327875 -0.124101 +v 1.214915 -2.145350 1.916591 +v 0.432497 1.427138 0.250040 +v 0.697277 1.318752 -0.015261 +v 0.950135 -2.036963 2.181892 +vt 0.519290 0.058179 +vt 0.519290 0.044033 +vt 0.591799 0.044033 +vt 0.073830 0.171353 +vt 0.073830 0.157208 +vt 0.111004 0.152030 +vt 0.519289 0.199636 +vt 0.519289 0.185490 +vt 0.591797 0.185490 +vt 0.148490 0.178426 +vt 0.111004 0.176531 +vt 0.073830 0.143062 +vt 0.073830 0.128916 +vt 0.111004 0.123738 +vt 0.519290 0.143053 +vt 0.519290 0.128907 +vt 0.591799 0.128907 +vt 0.148490 0.150135 +vt 0.111004 0.148240 +vt 0.519281 0.100625 +vt 0.591789 0.100625 +vt 0.591789 0.114770 +vt 0.519269 0.270370 +vt 0.591778 0.270370 +vt 0.591778 0.284515 +vt 0.111004 0.119948 +vt 0.111004 0.095447 +vt 0.148490 0.093552 +vt 0.519289 0.157199 +vt 0.591798 0.157199 +vt 0.591798 0.171345 +vt 0.073830 0.114771 +vt 0.073830 0.100625 +vt 0.591790 0.143062 +vt 0.111004 0.091657 +vt 0.111004 0.067156 +vt 0.148490 0.065261 +vt 0.073830 0.086479 +vt 0.073830 0.072333 +vt 0.519280 0.086479 +vt 0.519280 0.072334 +vt 0.591788 0.072334 +vt 0.111004 0.063365 +vt 0.111004 0.038864 +vt 0.519282 0.171354 +vt 0.073830 0.058188 +vt 0.073830 0.044042 +vt 0.519281 0.213791 +vt 0.591790 0.213791 +vt 0.591790 0.227937 +vt 0.110996 0.289698 +vt 0.110996 0.265197 +vt 0.148481 0.263302 +vt 0.519280 0.242082 +vt 0.591788 0.242082 +vt 0.591788 0.256228 +vt 0.073822 0.284520 +vt 0.073822 0.270375 +vt 0.148498 0.206708 +vt 0.111013 0.204813 +vt 0.111013 0.180312 +vt 0.591790 0.199645 +vt 0.073839 0.199635 +vt 0.073839 0.185490 +vt 0.867947 0.185572 +vt 0.852531 0.208643 +vt 0.802245 0.198641 +vt 0.073838 0.171344 +vt 0.438531 0.121834 +vt 0.438523 0.263301 +vt 0.519281 0.284519 +vt 0.438523 0.150135 +vt 0.148498 0.121834 +vt 0.438511 0.291588 +vt 0.148498 0.093543 +vt 0.438531 0.093543 +vt 0.111013 0.067147 +vt 0.438523 0.235009 +vt 0.111013 0.091648 +vt 0.438523 0.093552 +vt 0.519281 0.114770 +vt 0.438531 0.206709 +vt 0.438531 0.178417 +vt 0.438531 0.065252 +vt 0.148489 0.291592 +vt 0.519281 0.227937 +vt 0.111004 0.261405 +vt 0.111004 0.236904 +vt 0.519289 0.171345 +vt 0.073830 0.256227 +vt 0.073830 0.242082 +vt 0.438531 0.036960 +vt 0.111004 0.233114 +vt 0.111004 0.208613 +vt 0.073830 0.227936 +vt 0.073830 0.213790 +vt 0.036969 0.164280 +vt 0.036969 0.135989 +vt 0.036969 0.107698 +vt 0.036969 0.079406 +vt 0.036970 0.051115 +vt 0.148490 0.036969 +vt 0.036961 0.277447 +vt 0.036978 0.192562 +vt 0.036969 0.249154 +vt 0.036969 0.220863 +vt 0.148490 0.235009 +vt 0.192327 0.347853 +vt 0.192327 0.485619 +vt 0.123444 0.485619 +vt 0.699469 0.172501 +vt 0.699469 0.034735 +vt 0.768352 0.034735 +vt 0.443577 0.396280 +vt 0.584968 0.400334 +vt 0.439951 0.400334 +vt 0.581343 0.396280 +vt 0.443577 0.327397 +vt 0.581343 0.327397 +vt 0.319721 0.480769 +vt 0.319721 0.335752 +vt 0.392229 0.335752 +vt 0.695415 0.176127 +vt 0.622907 0.031110 +vt 0.695416 0.031110 +vt 0.903489 0.115635 +vt 0.964650 0.186331 +vt 0.903489 0.188144 +vt 0.866342 0.040735 +vt 0.866342 0.109618 +vt 0.805181 0.111431 +vt 0.712656 0.540579 +vt 0.651495 0.469883 +vt 0.712656 0.468071 +vt 0.781166 0.340069 +vt 0.781166 0.271186 +vt 0.842327 0.269373 +vt 0.622907 0.176127 +vt 0.618854 0.172502 +vt 0.443577 0.476895 +vt 0.439951 0.472842 +vt 0.584968 0.472842 +vt 0.396282 0.477144 +vt 0.392229 0.480769 +vt 0.315668 0.339377 +vt 0.315667 0.477144 +vt 0.246785 0.339377 +vt 0.876104 0.584646 +vt 0.877917 0.552017 +vt 0.946800 0.552017 +vt 0.558888 0.554541 +vt 0.490005 0.554541 +vt 0.488192 0.521912 +vt 0.971580 0.044744 +vt 0.900884 0.077373 +vt 0.902697 0.044744 +vt 0.927650 0.489798 +vt 0.925837 0.522427 +vt 0.856954 0.522427 +vt 0.835610 0.458829 +vt 0.933025 0.389946 +vt 0.933025 0.458829 +vt 0.724805 0.327967 +vt 0.724805 0.425382 +vt 0.655922 0.425382 +vt 0.636432 0.274081 +vt 0.636432 0.205198 +vt 0.733848 0.205198 +vt 0.957268 0.244504 +vt 0.957268 0.341919 +vt 0.888385 0.341919 +vt 0.042829 0.347853 +vt 0.046882 0.344228 +vt 0.046882 0.489245 +vt 0.119390 0.344228 +vt 0.119390 0.489245 +vt 0.591799 0.058179 +vt 0.591788 0.086479 +vt 0.591790 0.171354 +vt 0.519280 0.256228 +vt 0.796832 0.185572 +vt 0.796832 0.171427 +vt 0.802245 0.158358 +vt 0.812247 0.148355 +vt 0.825316 0.142942 +vt 0.839462 0.142942 +vt 0.852531 0.148355 +vt 0.862533 0.158357 +vt 0.867947 0.171426 +vt 0.862534 0.198641 +vt 0.839462 0.214057 +vt 0.825317 0.214057 +vt 0.812248 0.208644 +vt 0.123444 0.347853 +vt 0.768352 0.172501 +vt 0.964650 0.117448 +vt 0.805181 0.038922 +vt 0.651495 0.538767 +vt 0.842327 0.341882 +vt 0.618854 0.034735 +vt 0.581343 0.476896 +vt 0.396282 0.339378 +vt 0.246784 0.477143 +vt 0.948613 0.584646 +vt 0.560701 0.521912 +vt 0.973392 0.077373 +vt 0.855141 0.489798 +vt 0.835610 0.389946 +vt 0.655922 0.327967 +vt 0.733848 0.274081 +vt 0.888385 0.244504 +vt 0.042829 0.485620 +vt 0.021699 0.793428 +vt 0.021698 0.699267 +vt 0.986999 0.699267 +vt 0.986999 0.793427 vn -0.031400 -0.490400 -0.870900 vn -0.554500 -0.536800 0.635900 vn 0.927700 0.277800 0.249500 @@ -632,7 +356,7 @@ vn 0.991100 0.097500 -0.090700 vn -0.159500 -0.309600 0.937400 vn -0.678600 0.277800 0.679900 vn 0.063300 0.254200 0.965100 -vn 0.408300 0.490400 0.769900 +vn 0.408300 0.490400 0.770000 vn 0.113000 -0.256300 0.960000 vn 0.031400 0.490400 0.870900 vn 0.427800 0.254200 0.867400 @@ -651,7 +375,7 @@ vn 0.798200 -0.536800 0.273500 vn 0.754400 0.293700 -0.587100 vn 0.991400 -0.125800 0.035100 vn -0.423600 -0.059000 -0.903900 -vn 0.735800 -0.676000 0.040400 +vn 0.735700 -0.676000 0.040400 vn -0.868300 0.468900 0.161800 vn 0.906900 -0.314500 -0.280600 vn 0.592200 0.754600 0.282700 @@ -683,8 +407,8 @@ vn -0.113300 -0.809700 0.575800 vn -0.054000 -0.762200 0.645100 vn 0.032500 -0.725800 0.687100 vn 0.133100 -0.706200 0.695400 -vn 0.991100 0.097500 -0.090600 vn 0.232400 -0.706200 0.668800 +vn 0.408300 0.490400 0.769900 vn 0.315400 -0.725800 0.611300 vn 0.369300 -0.762200 0.531700 vn 0.386000 -0.809700 0.442000 @@ -701,260 +425,266 @@ vn -0.136400 -0.861100 0.489800 vn 0.309600 0.821600 0.478700 vn -0.617000 -0.676000 0.402900 vn 0.224100 0.500000 0.836500 -vn 0.965900 0.000000 -0.258800 -vn -0.015500 0.998200 -0.057900 -vn 0.524500 -0.353600 -0.774500 +vn 0.965900 -0.000000 -0.258800 +vn 0.015500 -0.998200 0.057900 +vn -0.224100 -0.500000 -0.836500 +vn -0.965900 0.000000 0.258800 +vn -0.524500 0.353600 0.774500 vn 0.841500 0.353600 0.408500 vn 0.316200 0.774600 -0.547700 vn -0.216000 0.551000 -0.806100 vn -0.547700 0.774600 -0.316200 -vn -0.965900 -0.000000 0.258800 -vn -0.524500 0.353600 0.774500 +vn -0.316200 -0.774600 0.547700 +vn -0.015500 0.998200 -0.057900 +vn 0.216000 -0.551000 0.806100 +vn 0.547700 -0.774600 0.316200 +vn -0.991100 -0.097500 0.090700 vn -0.129400 0.866000 -0.482900 +vn -0.408300 -0.490400 -0.770000 s off -f 30/1/1 34/2/1 94/3/1 -f 1/4/2 6/5/2 7/6/2 -f 19/7/3 20/8/3 89/9/3 -f 3/10/4 2/11/4 7/12/4 -f 6/13/5 11/14/5 12/15/5 -f 24/16/6 25/17/6 91/18/6 -f 8/19/7 7/20/7 12/21/7 -f 10/22/8 85/23/8 84/24/8 -f 19/25/9 88/26/9 87/27/9 -f 12/28/10 17/29/10 18/30/10 -f 24/31/11 90/32/11 89/33/11 -f 11/34/12 16/35/12 17/36/12 -f 9/37/13 84/38/13 83/39/13 -f 17/40/14 22/41/14 23/42/14 -f 14/43/15 15/44/15 87/45/15 -f 17/46/16 16/47/16 21/48/16 -f 10/49/17 14/50/17 86/51/17 -f 23/52/18 22/53/18 27/54/18 -f 42/55/19 5/56/19 83/57/19 -f 21/58/20 26/59/20 27/60/20 -f 41/61/21 97/62/21 96/63/21 -f 27/64/22 32/65/22 33/66/22 -f 40/67/23 96/68/23 95/69/23 -f 26/70/24 31/71/24 32/72/24 -f 33/73/25 32/74/25 38/75/25 -f 42/76/26 4/77/26 97/78/26 -f 32/79/27 31/80/27 37/81/27 -f 29/82/28 30/83/28 93/84/28 -f 91/85/29 93/86/29 97/87/29 -f 37/88/30 43/89/30 44/90/30 -f 61/91/31 25/92/31 24/93/31 -f 38/94/32 44/95/32 45/96/32 -f 51/97/33 35/98/33 34/99/33 -f 44/100/34 43/101/34 48/102/34 -f 81/103/35 5/104/35 42/105/35 -f 44/106/36 49/107/36 50/108/36 -f 71/109/37 67/110/37 19/111/37 -f 48/112/38 53/113/38 54/114/38 -f 77/115/39 9/116/39 5/117/39 -f 49/118/40 54/119/40 55/120/40 -f 61/121/41 57/122/41 29/123/41 -f 53/124/42 58/125/42 59/126/42 -f 51/127/43 47/128/43 40/129/43 -f 55/130/44 54/131/44 59/132/44 -f 76/133/45 10/134/45 9/135/45 -f 58/136/46 63/137/46 64/138/46 -f 67/139/47 66/140/47 20/141/47 -f 60/142/48 59/143/48 64/144/48 -f 64/145/49 63/146/49 68/147/49 -f 56/148/50 30/149/50 29/150/50 -f 65/151/51 64/152/51 69/153/51 -f 46/154/52 41/155/52 40/156/52 -f 72/157/53 14/158/53 10/159/53 -f 70/160/54 69/161/54 74/162/54 -f 62/163/55 24/164/55 20/165/55 -f 68/166/56 73/167/56 74/168/56 -f 56/169/57 52/170/57 34/171/57 -f 74/172/58 79/173/58 80/174/58 -f 82/175/59 42/176/59 41/177/59 -f 73/178/60 78/179/60 79/180/60 -f 35/181/61 95/182/61 94/183/61 -f 1/184/62 36/185/62 6/186/62 -f 6/187/63 36/188/63 11/189/63 -f 3/190/19 8/191/19 81/192/19 -f 11/193/64 36/194/64 16/195/64 -f 50/196/6 61/197/6 62/198/6 -f 16/199/65 36/200/65 21/201/65 -f 45/202/66 62/203/66 66/204/66 -f 21/205/67 36/206/67 26/207/67 -f 28/208/15 71/209/15 72/210/15 -f 26/211/68 36/212/68 31/213/68 -f 23/214/17 72/215/17 76/216/17 -f 31/217/69 36/218/69 37/219/69 -f 65/220/1 52/221/1 56/222/1 -f 37/223/70 36/224/70 43/225/70 -f 13/226/13 77/227/13 81/228/13 -f 60/229/28 56/230/28 57/231/28 -f 43/232/71 36/233/71 48/234/71 -f 13/235/8 18/236/8 76/237/8 -f 48/238/72 36/239/72 53/240/72 -f 39/241/3 66/242/3 67/243/3 -f 53/244/73 36/245/73 58/246/73 -f 58/247/74 36/248/74 63/249/74 -f 80/250/21 46/251/21 47/252/21 -f 63/253/75 36/254/75 68/255/75 -f 55/256/76 57/257/76 61/258/76 -f 68/259/77 36/260/77 73/261/77 -f 65/262/61 70/263/61 51/264/61 -f 73/265/78 36/266/78 78/267/78 -f 28/268/9 33/269/9 67/270/9 -f 70/271/23 75/272/23 47/273/23 -f 80/274/79 79/275/79 2/276/79 -f 78/277/80 36/278/80 1/279/80 -f 71/280/81 15/281/81 14/282/81 -f 3/283/26 82/284/26 46/285/26 -f 78/286/82 1/287/82 2/288/82 -f 29/289/76 92/290/76 91/291/76 -f 112/292/83 108/293/83 106/294/83 -f 107/295/84 106/296/84 108/297/84 -f 107/298/85 99/299/85 103/300/85 -f 111/301/83 113/302/83 109/303/83 -f 103/304/84 102/305/84 104/306/84 -f 99/307/84 98/308/84 100/309/84 -f 19/310/86 88/311/86 113/312/86 -f 109/313/87 107/314/87 9/315/87 -f 96/316/86 40/317/86 106/318/86 -f 110/319/87 112/320/87 92/321/87 -f 100/322/88 101/323/88 109/324/88 -f 109/325/89 101/326/89 105/327/89 -f 113/328/90 105/329/90 104/330/90 -f 103/331/88 102/332/88 110/333/88 -f 103/334/83 105/335/83 101/336/83 -f 111/337/84 110/338/84 112/339/84 -f 24/340/83 121/341/83 120/342/83 -f 117/343/83 116/344/83 42/345/83 -f 118/346/91 119/347/91 34/348/91 -f 86/349/84 114/350/84 115/351/84 -f 117/352/86 114/353/86 115/354/86 -f 120/355/87 114/356/87 115/357/87 -f 118/358/92 119/359/92 121/360/92 -f 118/361/87 117/362/87 116/363/87 -f 112/364/85 104/365/85 100/366/85 -f 102/367/89 98/368/89 106/369/89 -f 104/370/83 100/371/83 98/372/83 -f 106/373/90 98/374/90 99/375/90 -f 93/376/1 30/1/1 94/3/1 -f 2/377/2 1/4/2 7/6/2 -f 88/378/3 19/7/3 89/9/3 -f 8/379/4 3/10/4 7/12/4 -f 7/380/5 6/13/5 12/15/5 -f 90/381/6 24/16/6 91/18/6 -f 13/382/7 8/19/7 12/21/7 -f 9/383/8 10/22/8 84/24/8 -f 15/384/9 19/25/9 87/27/9 -f 13/385/10 12/28/10 18/30/10 -f 20/386/11 24/31/11 89/33/11 -f 12/387/12 11/34/12 17/36/12 -f 5/388/13 9/37/13 83/39/13 -f 18/389/14 17/40/14 23/42/14 -f 86/390/15 14/43/15 87/45/15 -f 22/391/16 17/46/16 21/48/16 -f 85/392/17 10/49/17 86/51/17 -f 28/393/18 23/52/18 27/54/18 -f 4/394/19 42/55/19 83/57/19 -f 22/395/20 21/58/20 27/60/20 -f 40/396/21 41/61/21 96/63/21 -f 28/397/22 27/64/22 33/66/22 -f 35/398/23 40/67/23 95/69/23 -f 27/399/24 26/70/24 32/72/24 -f 39/400/25 33/73/25 38/75/25 -f 41/401/26 42/76/26 97/78/26 -f 38/402/27 32/79/27 37/81/27 -f 92/403/28 29/82/28 93/84/28 -f 97/87/29 4/404/29 83/405/29 -f 83/405/29 84/406/29 97/87/29 -f 85/407/93 86/408/93 87/409/93 -f 87/409/29 88/410/29 89/411/29 -f 89/411/29 90/412/29 91/85/29 -f 91/85/29 92/413/29 93/86/29 -f 93/86/29 94/414/29 95/415/29 -f 95/415/29 96/416/29 97/87/29 -f 97/87/29 84/406/29 85/407/29 -f 85/407/29 87/409/29 97/87/29 -f 89/411/29 91/85/29 97/87/29 -f 93/86/29 95/415/29 97/87/29 -f 97/87/29 87/409/29 89/411/29 -f 38/417/30 37/88/30 44/90/30 -f 62/418/31 61/91/31 24/93/31 -f 39/419/32 38/94/32 45/96/32 -f 52/420/33 51/97/33 34/99/33 -f 49/421/34 44/100/34 48/102/34 -f 82/422/35 81/103/35 42/105/35 -f 45/423/36 44/106/36 50/108/36 -f 15/424/37 71/109/37 19/111/37 -f 49/425/38 48/112/38 54/114/38 -f 81/426/39 77/115/39 5/117/39 -f 50/427/40 49/118/40 55/120/40 -f 25/428/41 61/121/41 29/123/41 -f 54/429/42 53/124/42 59/126/42 -f 35/430/43 51/127/43 40/129/43 -f 60/431/44 55/130/44 59/132/44 -f 77/432/45 76/133/45 9/135/45 -f 59/433/46 58/136/46 64/138/46 -f 19/434/47 67/139/47 20/141/47 -f 65/435/48 60/142/48 64/144/48 -f 69/436/49 64/145/49 68/147/49 -f 57/437/50 56/148/50 29/150/50 -f 70/438/51 65/151/51 69/153/51 -f 47/439/52 46/154/52 40/156/52 -f 76/440/53 72/157/53 10/159/53 -f 75/441/54 70/160/54 74/162/54 -f 66/442/55 62/163/55 20/165/55 -f 69/443/56 68/166/56 74/168/56 -f 30/444/57 56/169/57 34/171/57 -f 75/445/58 74/172/58 80/174/58 -f 46/446/59 82/175/59 41/177/59 -f 74/447/60 73/178/60 79/180/60 -f 34/448/61 35/181/61 94/183/61 -f 82/449/19 3/190/19 81/192/19 -f 45/450/6 50/196/6 62/198/6 -f 39/451/11 45/202/11 66/204/11 -f 23/452/15 28/208/15 72/210/15 -f 18/453/17 23/214/17 76/216/17 -f 60/454/1 65/220/1 56/222/1 -f 8/455/13 13/226/13 81/228/13 -f 55/456/28 60/229/28 57/231/28 -f 77/457/8 13/235/8 76/237/8 -f 33/458/3 39/241/3 67/243/3 -f 75/459/21 80/250/21 47/252/21 -f 50/460/76 55/256/76 61/258/76 -f 52/461/61 65/262/61 51/264/61 -f 71/462/9 28/268/9 67/270/9 -f 51/463/23 70/271/23 47/273/23 -f 3/464/79 80/274/79 2/276/79 -f 72/465/81 71/280/81 14/282/81 -f 80/466/26 3/283/26 46/285/26 -f 79/467/82 78/286/82 2/288/82 -f 25/468/76 29/289/76 91/291/76 -f 110/469/83 112/292/83 106/294/83 -f 109/470/84 107/295/84 108/297/84 -f 111/471/85 107/298/85 103/300/85 -f 107/472/83 111/301/83 109/303/83 -f 105/473/84 103/304/84 104/306/84 -f 101/474/84 99/307/84 100/309/84 -f 111/475/86 19/310/86 113/312/86 -f 84/476/87 109/313/87 9/315/87 -f 108/477/86 96/316/86 106/318/86 -f 29/478/87 110/319/87 92/321/87 -f 108/479/88 100/322/88 109/324/88 -f 113/480/89 109/325/89 105/327/89 -f 112/481/90 113/328/90 104/330/90 -f 111/482/88 103/331/88 110/333/88 -f 99/483/83 103/334/83 101/336/83 -f 113/484/84 111/337/84 112/339/84 -f 90/485/83 24/340/83 120/342/83 -f 4/486/83 117/343/83 42/345/83 -f 94/487/91 118/346/91 34/348/91 -f 14/488/84 86/349/84 115/351/84 -f 116/489/86 117/352/86 115/354/86 -f 121/490/87 120/355/87 115/357/87 -f 120/491/92 118/358/92 121/360/92 -f 119/492/87 118/361/87 116/363/87 -f 108/493/85 112/364/85 100/366/85 -f 110/494/89 102/367/89 106/369/89 -f 102/495/83 104/370/83 98/372/83 -f 107/496/90 106/373/90 99/375/90 +f 1/1/1 2/2/1 3/3/1 +f 4/4/2 5/5/2 6/6/2 +f 7/7/3 8/8/3 9/9/3 +f 10/10/4 11/11/4 6/6/4 +f 5/12/5 12/13/5 13/14/5 +f 14/15/6 15/16/6 16/17/6 +f 17/18/7 6/19/7 13/14/7 +f 18/20/8 19/21/8 20/22/8 +f 7/23/9 21/24/9 22/25/9 +f 13/26/10 23/27/10 24/28/10 +f 14/29/11 25/30/11 9/31/11 +f 12/32/12 26/33/12 23/27/12 +f 27/16/13 20/17/13 28/34/13 +f 23/35/14 29/36/14 30/37/14 +f 31/1/15 32/2/15 22/3/15 +f 23/35/16 26/38/16 33/39/16 +f 18/40/17 31/41/17 34/42/17 +f 30/37/18 29/43/18 35/44/18 +f 36/45/19 37/29/19 28/30/19 +f 33/46/20 38/47/20 35/44/20 +f 39/48/21 40/49/21 41/50/21 +f 35/51/22 42/52/22 43/53/22 +f 44/54/23 41/55/23 45/56/23 +f 38/57/24 46/58/24 42/52/24 +f 43/59/25 42/60/25 47/61/25 +f 36/8/26 48/9/26 40/62/26 +f 42/60/27 46/63/27 49/64/27 +f 50/40/28 1/41/28 51/42/28 +f 16/65/29 51/66/29 40/67/29 +f 49/68/30 52/5/30 53/6/30 +f 54/69/31 15/16/31 14/15/31 +f 47/11/32 53/6/32 55/18/32 +f 56/70/33 57/23/33 2/71/33 +f 53/19/34 52/12/34 58/13/34 +f 59/72/35 37/29/35 36/45/35 +f 53/19/36 60/14/36 61/73/36 +f 62/74/37 63/70/37 7/23/37 +f 58/32/38 64/33/38 65/27/38 +f 66/69/39 27/16/39 37/15/39 +f 60/26/40 65/27/40 67/75/40 +f 54/69/41 68/76/41 50/20/41 +f 64/38/42 69/39/42 70/77/42 +f 56/70/43 71/78/43 44/54/43 +f 67/75/44 65/79/44 70/77/44 +f 72/80/45 18/20/45 27/81/45 +f 69/46/46 73/47/46 74/44/46 +f 63/82/47 75/83/47 8/8/47 +f 76/37/48 70/43/48 74/44/48 +f 74/51/49 73/57/49 77/58/49 +f 78/84/50 1/41/50 50/40/50 +f 79/85/51 74/51/51 80/52/51 +f 81/82/52 39/48/52 44/86/52 +f 82/84/53 31/41/53 18/40/53 +f 83/53/54 80/87/54 84/88/54 +f 85/72/55 14/29/55 8/89/55 +f 77/90/56 86/91/56 84/88/56 +f 78/84/57 87/92/57 2/2/57 +f 84/93/58 88/94/58 89/59/58 +f 90/83/59 36/8/59 39/7/59 +f 86/95/60 91/96/60 88/94/60 +f 57/23/61 45/24/61 3/25/61 +f 4/4/62 92/97/62 5/5/62 +f 5/12/63 92/98/63 12/13/63 +f 10/10/19 17/18/19 59/72/19 +f 12/32/64 92/99/64 26/33/64 +f 61/73/6 54/69/6 85/72/6 +f 26/38/65 92/100/65 33/39/65 +f 55/18/11 85/72/11 75/83/11 +f 33/46/66 92/101/66 38/47/66 +f 93/102/67 62/92/67 82/84/67 +f 38/57/68 92/103/68 46/58/68 +f 30/37/17 82/84/17 72/80/17 +f 46/63/69 92/104/69 49/64/69 +f 79/102/1 87/92/1 78/84/1 +f 49/68/70 92/97/70 52/5/70 +f 94/73/13 66/69/13 59/72/13 +f 76/37/28 78/84/28 68/76/28 +f 52/12/71 92/98/71 58/13/71 +f 94/73/8 24/28/8 72/80/8 +f 58/32/72 92/99/72 64/33/72 +f 95/10/3 75/83/3 63/82/3 +f 64/38/73 92/100/73 69/39/73 +f 69/46/74 92/101/74 73/47/74 +f 89/59/21 81/82/21 71/78/21 +f 73/57/75 92/103/75 77/58/75 +f 67/75/76 68/76/76 54/69/76 +f 77/90/77 92/105/77 86/91/77 +f 79/85/61 83/53/61 56/70/61 +f 86/95/78 92/106/78 91/96/78 +f 83/53/23 96/107/23 71/78/23 +f 89/59/79 88/60/79 11/61/79 +f 91/63/80 92/104/80 4/64/80 +f 62/92/81 32/2/81 31/1/81 +f 10/10/26 90/83/26 81/82/26 +f 91/63/82 4/64/82 11/61/82 +f 50/20/76 97/21/76 16/22/76 +f 98/108/83 99/109/83 100/110/83 +f 101/111/84 100/112/84 99/113/84 +f 101/114/85 103/115/85 102/116/85 +f 104/117/86 106/118/86 105/119/86 +f 103/120/84 107/121/84 108/122/84 +f 102/123/87 110/124/87 109/125/87 +f 7/126/88 105/127/88 21/128/88 +f 106/129/89 101/130/89 27/131/89 +f 41/132/88 100/133/88 44/134/88 +f 111/135/89 98/136/89 97/137/89 +f 110/124/90 112/138/90 106/139/90 +f 106/140/91 112/141/91 113/142/91 +f 105/143/92 113/144/92 108/122/92 +f 103/120/93 111/145/93 107/121/93 +f 103/115/83 113/142/83 112/141/83 +f 104/146/87 98/147/87 111/145/87 +f 14/148/83 114/149/83 115/150/83 +f 116/151/83 117/152/83 36/153/83 +f 118/154/84 2/155/84 119/156/84 +f 34/157/84 120/158/84 121/159/84 +f 116/160/88 121/161/88 120/162/88 +f 115/163/89 120/164/89 121/165/89 +f 118/166/88 119/167/88 114/168/88 +f 118/169/89 116/170/89 117/171/89 +f 98/172/94 108/173/94 110/174/94 +f 107/175/95 100/110/95 109/176/95 +f 108/173/86 109/176/86 110/174/86 +f 100/112/96 102/123/96 109/125/96 +f 51/177/1 1/1/1 3/3/1 +f 11/11/2 4/4/2 6/6/2 +f 21/62/3 7/7/3 9/9/3 +f 17/18/4 10/10/4 6/6/4 +f 6/19/5 5/12/5 13/14/5 +f 25/34/6 14/15/6 16/17/6 +f 94/73/7 17/18/7 13/14/7 +f 27/81/8 18/20/8 20/22/8 +f 32/71/9 7/23/9 22/25/9 +f 94/73/10 13/26/10 24/28/10 +f 8/89/11 14/29/11 9/31/11 +f 13/26/12 12/32/12 23/27/12 +f 37/15/13 27/16/13 28/34/13 +f 24/28/14 23/35/14 30/37/14 +f 34/177/15 31/1/15 22/3/15 +f 29/36/16 23/35/16 33/39/16 +f 19/178/17 18/40/17 34/42/17 +f 93/102/18 30/37/18 35/44/18 +f 48/179/19 36/45/19 28/30/19 +f 29/43/20 33/46/20 35/44/20 +f 44/86/21 39/48/21 41/50/21 +f 93/85/22 35/51/22 43/53/22 +f 57/180/23 44/54/23 45/56/23 +f 35/51/24 38/57/24 42/52/24 +f 95/10/25 43/59/25 47/61/25 +f 39/7/97 36/8/97 40/62/97 +f 47/61/27 42/60/27 49/64/27 +f 97/178/28 50/40/28 51/42/28 +f 40/67/29 48/181/29 28/182/29 +f 28/182/29 20/183/29 40/67/29 +f 19/184/29 34/185/29 22/186/29 +f 22/186/29 21/187/29 9/188/29 +f 9/188/29 25/189/29 16/65/29 +f 16/65/98 97/190/98 51/66/98 +f 51/66/29 3/191/29 45/192/29 +f 45/192/29 41/193/29 40/67/29 +f 40/67/29 20/183/29 19/184/29 +f 19/184/29 22/186/29 40/67/29 +f 9/188/29 16/65/29 40/67/29 +f 51/66/29 45/192/29 40/67/29 +f 40/67/29 22/186/29 9/188/29 +f 47/11/30 49/68/30 53/6/30 +f 85/72/31 54/69/31 14/15/31 +f 95/10/32 47/11/32 55/18/32 +f 87/74/33 56/70/33 2/71/33 +f 60/14/34 53/19/34 58/13/34 +f 90/83/35 59/72/35 36/45/35 +f 55/18/36 53/19/36 61/73/36 +f 32/71/37 62/74/37 7/23/37 +f 60/26/38 58/32/38 65/27/38 +f 59/72/39 66/69/39 37/15/39 +f 61/73/40 60/26/40 67/75/40 +f 15/81/41 54/69/41 50/20/41 +f 65/79/42 64/38/42 70/77/42 +f 57/180/43 56/70/43 44/54/43 +f 76/37/44 67/75/44 70/77/44 +f 66/69/45 72/80/45 27/81/45 +f 70/43/46 69/46/46 74/44/46 +f 7/7/47 63/82/47 8/8/47 +f 79/102/48 76/37/48 74/44/48 +f 80/52/49 74/51/49 77/58/49 +f 68/76/50 78/84/50 50/40/50 +f 83/53/51 79/85/51 80/52/51 +f 71/78/52 81/82/52 44/86/52 +f 72/80/53 82/84/53 18/40/53 +f 96/107/54 83/53/54 84/88/54 +f 75/83/55 85/72/55 8/89/55 +f 80/87/56 77/90/56 84/88/56 +f 1/1/57 78/84/57 2/2/57 +f 96/107/58 84/93/58 89/59/58 +f 81/82/59 90/83/59 39/7/59 +f 84/93/60 86/95/60 88/94/60 +f 2/71/99 57/23/99 3/25/99 +f 90/83/19 10/10/19 59/72/19 +f 55/18/6 61/73/6 85/72/6 +f 95/10/11 55/18/11 75/83/11 +f 30/37/67 93/102/67 82/84/67 +f 24/28/17 30/37/17 72/80/17 +f 76/37/1 79/102/1 78/84/1 +f 17/18/13 94/73/13 59/72/13 +f 67/75/28 76/37/28 68/76/28 +f 66/69/8 94/73/8 72/80/8 +f 43/59/3 95/10/3 63/82/3 +f 96/107/21 89/59/21 71/78/21 +f 61/73/76 67/75/76 54/69/76 +f 87/74/61 79/85/61 56/70/61 +f 56/70/23 83/53/23 71/78/23 +f 10/10/79 89/59/79 11/61/79 +f 82/84/81 62/92/81 31/1/81 +f 89/59/26 10/10/26 81/82/26 +f 88/60/82 91/63/82 11/61/82 +f 15/81/76 50/20/76 16/22/76 +f 111/194/83 98/108/83 100/110/83 +f 106/195/84 101/111/84 99/113/84 +f 104/117/85 103/115/85 101/114/85 +f 101/114/86 106/118/86 104/117/86 +f 113/144/84 103/120/84 108/122/84 +f 112/138/87 110/124/87 102/123/87 +f 104/196/88 105/127/88 7/126/88 +f 20/197/89 106/129/89 27/131/89 +f 99/198/88 100/133/88 41/132/88 +f 50/199/89 111/135/89 97/137/89 +f 99/200/90 110/124/90 106/139/90 +f 105/201/91 106/140/91 113/142/91 +f 98/202/92 105/143/92 108/122/92 +f 104/146/93 111/145/93 103/120/93 +f 102/116/83 103/115/83 112/141/83 +f 105/203/87 98/147/87 104/146/87 +f 25/204/83 14/148/83 115/150/83 +f 48/205/83 116/151/83 36/153/83 +f 3/206/84 2/155/84 118/154/84 +f 31/207/84 34/157/84 121/159/84 +f 117/208/88 121/161/88 116/160/88 +f 114/209/89 115/163/89 121/165/89 +f 115/210/88 118/166/88 114/168/88 +f 119/211/89 118/169/89 117/171/89 +f 99/212/94 98/172/94 110/174/94 +f 111/194/95 100/110/95 107/175/95 +f 107/175/86 109/176/86 108/173/86 +f 101/111/96 102/123/96 100/112/96 +f 125/213/9 122/214/9 124/215/9 +f 123/216/9 125/213/9 124/215/9 diff --git a/assets/hbm/sounds/block/dam1.ogg b/assets/hbm/sounds/block/dam1.ogg new file mode 100644 index 000000000..459908218 Binary files /dev/null and b/assets/hbm/sounds/block/dam1.ogg differ diff --git a/assets/hbm/sounds/block/dam2.ogg b/assets/hbm/sounds/block/dam2.ogg new file mode 100644 index 000000000..aa9ed8c51 Binary files /dev/null and b/assets/hbm/sounds/block/dam2.ogg differ diff --git a/assets/hbm/sounds/block/dam3.ogg b/assets/hbm/sounds/block/dam3.ogg new file mode 100644 index 000000000..2664177c6 Binary files /dev/null and b/assets/hbm/sounds/block/dam3.ogg differ diff --git a/assets/hbm/sounds/block/dam4.ogg b/assets/hbm/sounds/block/dam4.ogg new file mode 100644 index 000000000..ea99373f1 Binary files /dev/null and b/assets/hbm/sounds/block/dam4.ogg differ diff --git a/assets/hbm/textures/blocks/absorber.png b/assets/hbm/textures/blocks/absorber.png new file mode 100644 index 000000000..4b2b49b3d Binary files /dev/null and b/assets/hbm/textures/blocks/absorber.png differ diff --git a/assets/hbm/textures/blocks/absorber_green.png b/assets/hbm/textures/blocks/absorber_green.png new file mode 100644 index 000000000..351fd708d Binary files /dev/null and b/assets/hbm/textures/blocks/absorber_green.png differ diff --git a/assets/hbm/textures/blocks/absorber_pink.png b/assets/hbm/textures/blocks/absorber_pink.png new file mode 100644 index 000000000..73db77ad2 Binary files /dev/null and b/assets/hbm/textures/blocks/absorber_pink.png differ diff --git a/assets/hbm/textures/blocks/absorber_red.png b/assets/hbm/textures/blocks/absorber_red.png new file mode 100644 index 000000000..87064bdff Binary files /dev/null and b/assets/hbm/textures/blocks/absorber_red.png differ diff --git a/assets/hbm/textures/blocks/block_thorium.png b/assets/hbm/textures/blocks/block_thorium.png new file mode 100644 index 000000000..8cc11f586 Binary files /dev/null and b/assets/hbm/textures/blocks/block_thorium.png differ diff --git a/assets/hbm/textures/blocks/ore_thorium.png b/assets/hbm/textures/blocks/ore_thorium.png new file mode 100644 index 000000000..f89ad758e Binary files /dev/null and b/assets/hbm/textures/blocks/ore_thorium.png differ diff --git a/assets/hbm/textures/blocks/waste_drum.png b/assets/hbm/textures/blocks/waste_drum.png new file mode 100644 index 000000000..b109b4dd4 Binary files /dev/null and b/assets/hbm/textures/blocks/waste_drum.png differ diff --git a/assets/hbm/textures/blocks/waste_drum_side.png b/assets/hbm/textures/blocks/waste_drum_side.png new file mode 100644 index 000000000..3b8bb1d94 Binary files /dev/null and b/assets/hbm/textures/blocks/waste_drum_side.png differ diff --git a/assets/hbm/textures/items/nuclear_waste_tiny.png b/assets/hbm/textures/items/nuclear_waste_tiny.png new file mode 100644 index 000000000..c8d7e5a5f Binary files /dev/null and b/assets/hbm/textures/items/nuclear_waste_tiny.png differ diff --git a/assets/hbm/textures/items/nugget_th232.png b/assets/hbm/textures/items/nugget_th232.png new file mode 100644 index 000000000..63956c07d Binary files /dev/null and b/assets/hbm/textures/items/nugget_th232.png differ diff --git a/assets/hbm/textures/items/nugget_thorium_fuel.png b/assets/hbm/textures/items/nugget_thorium_fuel.png new file mode 100644 index 000000000..2ca09faf4 Binary files /dev/null and b/assets/hbm/textures/items/nugget_thorium_fuel.png differ diff --git a/assets/hbm/textures/items/nugget_u233.png b/assets/hbm/textures/items/nugget_u233.png new file mode 100644 index 000000000..79bfecc62 Binary files /dev/null and b/assets/hbm/textures/items/nugget_u233.png differ diff --git a/assets/hbm/textures/items/rod_dual_u233.png b/assets/hbm/textures/items/rod_dual_u233.png new file mode 100644 index 000000000..d01fcb129 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_u233.png differ diff --git a/assets/hbm/textures/items/rod_quad_u233.png b/assets/hbm/textures/items/rod_quad_u233.png new file mode 100644 index 000000000..96a414bfe Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_u233.png differ diff --git a/assets/hbm/textures/items/rod_u233.png b/assets/hbm/textures/items/rod_u233.png new file mode 100644 index 000000000..e57cf4f4b Binary files /dev/null and b/assets/hbm/textures/items/rod_u233.png differ diff --git a/assets/hbm/textures/items/waste_mox_hot.png b/assets/hbm/textures/items/waste_mox_hot.png new file mode 100644 index 000000000..c2490a66a Binary files /dev/null and b/assets/hbm/textures/items/waste_mox_hot.png differ diff --git a/assets/hbm/textures/items/waste_plutonium_hot.png b/assets/hbm/textures/items/waste_plutonium_hot.png new file mode 100644 index 000000000..0235c0a21 Binary files /dev/null and b/assets/hbm/textures/items/waste_plutonium_hot.png differ diff --git a/assets/hbm/textures/items/waste_schrabidium_hot.png b/assets/hbm/textures/items/waste_schrabidium_hot.png new file mode 100644 index 000000000..ce394e680 Binary files /dev/null and b/assets/hbm/textures/items/waste_schrabidium_hot.png differ diff --git a/assets/hbm/textures/items/waste_thorium_hot.png b/assets/hbm/textures/items/waste_thorium_hot.png new file mode 100644 index 000000000..fffa8ce58 Binary files /dev/null and b/assets/hbm/textures/items/waste_thorium_hot.png differ diff --git a/assets/hbm/textures/items/waste_uranium_hot.png b/assets/hbm/textures/items/waste_uranium_hot.png new file mode 100644 index 000000000..7f25da54b Binary files /dev/null and b/assets/hbm/textures/items/waste_uranium_hot.png differ diff --git a/assets/hbm/textures/models/BalefireCrashed.png b/assets/hbm/textures/models/BalefireCrashed.png index 6fde17298..9d0a2216f 100644 Binary files a/assets/hbm/textures/models/BalefireCrashed.png and b/assets/hbm/textures/models/BalefireCrashed.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 847c492c8..2471b2b2d 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -49,6 +49,7 @@ public class ModBlocks { public static Block ore_uranium; public static Block ore_titanium; public static Block ore_sulfur; + public static Block ore_thorium; public static Block ore_niter; public static Block ore_copper; @@ -80,6 +81,7 @@ public class ModBlocks { public static Block ore_tikite; + public static Block block_thorium; public static Block block_uranium; public static Block block_titanium; public static Block block_sulfur; @@ -531,6 +533,9 @@ public class ModBlocks { public static Block machine_forcefield; public static final int guiID_forcefield = 75; + public static Block machine_waste_drum; + public static final int guiID_waste_drum = 79; + public static Block turret_light; public static Block turret_heavy; public static Block turret_rocket; @@ -562,6 +567,11 @@ public class ModBlocks { public static Block vent_cloud; public static Block vent_pink_cloud; + public static Block absorber; + public static Block absorber_red; + public static Block absorber_green; + public static Block absorber_pink; + public static Block mud_block; public static Fluid mud_fluid; public static final Material fluidmud = (new MaterialLiquid(MapColor.adobeColor)); @@ -636,6 +646,7 @@ public class ModBlocks { ore_uranium = new BlockGeneric(Material.rock).setBlockName("ore_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium"); ore_titanium = new BlockGeneric(Material.rock).setBlockName("ore_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_titanium"); ore_sulfur = new BlockOre(Material.rock).setBlockName("ore_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_sulfur"); + ore_thorium = new BlockGeneric(Material.rock).setBlockName("ore_thorium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_thorium"); ore_niter = new BlockOre(Material.rock).setBlockName("ore_niter").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_niter"); ore_copper = new BlockGeneric(Material.rock).setBlockName("ore_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_copper"); @@ -668,6 +679,7 @@ public class ModBlocks { ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt"); block_uranium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium"); + block_thorium = new BlockGeneric(Material.iron).setBlockName("block_thorium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_thorium"); block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium"); block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur"); block_niter = new BlockGeneric(Material.iron).setBlockName("block_niter").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_niter"); @@ -1001,6 +1013,8 @@ public class ModBlocks { machine_boiler_electric_on = new MachineBoiler(true).setBlockName("machine_boiler_electric_on").setHardness(5.0F).setResistance(10.0F).setLightLevel(1.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":machine_boiler_electric_on"); machine_turbine = new MachineTurbine(Material.iron).setBlockName("machine_turbine").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_turbine"); + + machine_waste_drum = new WasteDrum(Material.iron).setBlockName("machine_waste_drum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":waste_drum"); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab); @@ -1028,6 +1042,11 @@ public class ModBlocks { vent_cloud = new BlockVent(Material.iron).setBlockName("vent_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_cloud"); vent_pink_cloud = new BlockVent(Material.iron).setBlockName("vent_pink_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_pink_cloud"); + absorber = new BlockAbsorber(Material.iron, 2.5F).setBlockName("absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber"); + absorber_red = new BlockAbsorber(Material.iron, 10F).setBlockName("absorber_red").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_red"); + absorber_green = new BlockAbsorber(Material.iron, 100F).setBlockName("absorber_green").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_green"); + absorber_pink = new BlockAbsorber(Material.iron, 10000F).setBlockName("absorber_pink").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_pink"); + statue_elb = new DecoBlockAlt(Material.iron).setBlockName("#null").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY); statue_elb_g = new DecoBlockAlt(Material.iron).setBlockName("#void").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY); statue_elb_w = new DecoBlockAlt(Material.iron).setBlockName("#ngtv").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY); @@ -1106,6 +1125,7 @@ public class ModBlocks { //Ores GameRegistry.registerBlock(ore_uranium, ore_uranium.getUnlocalizedName()); + GameRegistry.registerBlock(ore_thorium, ore_thorium.getUnlocalizedName()); GameRegistry.registerBlock(ore_titanium, ore_titanium.getUnlocalizedName()); GameRegistry.registerBlock(ore_sulfur, ore_sulfur.getUnlocalizedName()); GameRegistry.registerBlock(ore_niter, ore_niter.getUnlocalizedName()); @@ -1142,6 +1162,7 @@ public class ModBlocks { //Blocks GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName()); + GameRegistry.registerBlock(block_thorium, block_thorium.getUnlocalizedName()); GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName()); GameRegistry.registerBlock(block_sulfur, block_sulfur.getUnlocalizedName()); GameRegistry.registerBlock(block_niter, block_niter.getUnlocalizedName()); @@ -1394,6 +1415,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_boiler_electric_on, machine_boiler_electric_on.getUnlocalizedName()); GameRegistry.registerBlock(machine_boiler_electric_off, machine_boiler_electric_off.getUnlocalizedName()); GameRegistry.registerBlock(machine_turbine, machine_turbine.getUnlocalizedName()); + GameRegistry.registerBlock(machine_waste_drum, machine_waste_drum.getUnlocalizedName()); GameRegistry.registerBlock(machine_shredder, machine_shredder.getUnlocalizedName()); GameRegistry.registerBlock(machine_shredder_large, machine_shredder_large.getUnlocalizedName()); //GameRegistry.registerBlock(machine_deuterium, machine_deuterium.getUnlocalizedName()); @@ -1419,6 +1441,12 @@ public class ModBlocks { //Multiblock Helpers GameRegistry.registerBlock(marker_structure, marker_structure.getUnlocalizedName()); + //Absorbers + GameRegistry.registerBlock(absorber, absorber.getUnlocalizedName()); + GameRegistry.registerBlock(absorber_red, absorber_red.getUnlocalizedName()); + GameRegistry.registerBlock(absorber_green, absorber_green.getUnlocalizedName()); + GameRegistry.registerBlock(absorber_pink, absorber_pink.getUnlocalizedName()); + //Industrial Factories GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName()); GameRegistry.registerBlock(factory_titanium_furnace, factory_titanium_furnace.getUnlocalizedName()); diff --git a/com/hbm/blocks/generic/BlockAbsorber.java b/com/hbm/blocks/generic/BlockAbsorber.java new file mode 100644 index 000000000..6174700d2 --- /dev/null +++ b/com/hbm/blocks/generic/BlockAbsorber.java @@ -0,0 +1,40 @@ +package com.hbm.blocks.generic; + +import java.util.Random; + +import com.hbm.saveddata.RadiationSavedData; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.world.World; + +public class BlockAbsorber extends Block { + + float absorb = 0; + + public BlockAbsorber(Material mat, float ab) { + super(mat); + this.setTickRandomly(true); + absorb = ab; + } + + @Override + public int tickRate(World world) { + + return 10; + } + + @Override + public void updateTick(World world, int x, int y, int z, Random rand) { + + RadiationSavedData.decrementRad(world, x, z, absorb); + + world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); + } + + public void onBlockAdded(World world, int x, int y, int z) { + super.onBlockAdded(world, x, y, z); + + world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); + } +} diff --git a/com/hbm/blocks/machine/WasteDrum.java b/com/hbm/blocks/machine/WasteDrum.java new file mode 100644 index 000000000..3b65d0702 --- /dev/null +++ b/com/hbm/blocks/machine/WasteDrum.java @@ -0,0 +1,41 @@ +package com.hbm.blocks.machine; + +import java.util.Random; + +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +public class WasteDrum extends Block { + + private final Random field_149933_a = new Random(); + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + public WasteDrum(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":waste_drum"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":waste_drum_side"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + + if(side == 0 || side == 1) + return this.iconTop; + + return blockIcon; + } +} diff --git a/com/hbm/entity/projectile/EntityBullet.java b/com/hbm/entity/projectile/EntityBullet.java index bce6c7b02..697989f11 100644 --- a/com/hbm/entity/projectile/EntityBullet.java +++ b/com/hbm/entity/projectile/EntityBullet.java @@ -1,5 +1,6 @@ package com.hbm.entity.projectile; +import java.lang.reflect.Field; import java.util.List; import net.minecraft.block.Block; @@ -39,6 +40,7 @@ import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; +import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -585,11 +587,30 @@ public class EntityBullet extends Entity implements IProjectile { ; } } else { + + if(movingobjectposition.entityHit instanceof EntityLivingBase) { + + try { + Field lastDamage = ReflectionHelper.findField(EntityLivingBase.class, "lastDamage", "field_110153_bc"); + + float dmg = (float) damage + lastDamage.getFloat(movingobjectposition.entityHit); + + movingobjectposition.entityHit.attackEntityFrom(damagesource, dmg); + } catch (Exception x) { } + } + + } + + + + + + /* else { if (movingobjectposition.entityHit instanceof EntityLivingBase && !(movingobjectposition.entityHit instanceof EntityHunterChopper)) { EntityLivingBase target = (EntityLivingBase) movingobjectposition.entityHit; target.setHealth((float) (target.getHealth() - damage)); } - } + }*/ } else { this.setDead(); } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index d70e548b9..8a9dc3572 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -67,6 +67,7 @@ public class ModItems { public static Item ingot_schrabidium_fuel; public static Item ingot_thorium_fuel; public static Item nugget_uranium_fuel; + public static Item nugget_thorium_fuel; public static Item nugget_plutonium_fuel; public static Item nugget_mox_fuel; public static Item nugget_schrabidium_fuel; @@ -106,7 +107,9 @@ public class ModItems { public static Item ingot_saturnite; public static Item plate_saturnite; + public static Item nugget_th232; public static Item nugget_uranium; + public static Item nugget_u233; public static Item nugget_u235; public static Item nugget_u238; public static Item nugget_plutonium; @@ -596,6 +599,7 @@ public class ModItems { public static Item rod_empty; public static Item rod_uranium; + public static Item rod_u233; public static Item rod_u235; public static Item rod_u238; public static Item rod_plutonium; @@ -616,6 +620,7 @@ public class ModItems { public static Item rod_dual_empty; public static Item rod_dual_uranium; + public static Item rod_dual_u233; public static Item rod_dual_u235; public static Item rod_dual_u238; public static Item rod_dual_plutonium; @@ -629,6 +634,7 @@ public class ModItems { public static Item rod_quad_empty; public static Item rod_quad_uranium; + public static Item rod_quad_u233; public static Item rod_quad_u235; public static Item rod_quad_u238; public static Item rod_quad_plutonium; @@ -684,6 +690,11 @@ public class ModItems { public static Item waste_plutonium; public static Item waste_mox; public static Item waste_schrabidium; + public static Item waste_uranium_hot; + public static Item waste_thorium_hot; + public static Item waste_plutonium_hot; + public static Item waste_mox_hot; + public static Item waste_schrabidium_hot; public static Item rod_lithium; public static Item rod_dual_lithium; @@ -1468,6 +1479,7 @@ public class ModItems { ingot_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel"); ingot_thorium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel"); nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel"); + nugget_thorium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_thorium_fuel"); nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel"); nugget_mox_fuel = new ItemRadioactive().setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel"); nugget_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel"); @@ -1544,7 +1556,9 @@ public class ModItems { nugget_daffergon = new ItemCustomLore().setUnlocalizedName("nugget_daffergon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_daffergon"); nugget_verticium = new ItemCustomLore().setUnlocalizedName("nugget_verticium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_verticium"); + nugget_th232 = new Item().setUnlocalizedName("nugget_th232").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_th232"); nugget_uranium = new ItemRadioactive().setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium"); + nugget_u233 = new ItemRadioactive().setUnlocalizedName("nugget_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u233"); nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u235"); nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u238"); nugget_plutonium = new ItemRadioactive().setUnlocalizedName("nugget_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium"); @@ -1964,6 +1978,7 @@ public class ModItems { rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty"); rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); + rod_u233 = new ItemCustomLore().setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233"); rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235"); rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238"); rod_plutonium = new ItemCustomLore().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); @@ -1984,6 +1999,7 @@ public class ModItems { rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); rod_dual_uranium = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); + rod_dual_u233 = new ItemCustomLore().setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233"); rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235"); rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238"); rod_dual_plutonium = new ItemCustomLore().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); @@ -1997,6 +2013,7 @@ public class ModItems { rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); rod_quad_uranium = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); + rod_quad_u233 = new ItemCustomLore().setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233"); rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235"); rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238"); rod_quad_plutonium = new ItemCustomLore().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); @@ -2044,6 +2061,11 @@ public class ModItems { waste_plutonium = new ItemCustomLore().setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); waste_mox = new ItemCustomLore().setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); waste_schrabidium = new ItemCustomLore().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); + waste_uranium_hot = new ItemCustomLore().setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); + waste_thorium_hot = new ItemCustomLore().setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); + waste_plutonium_hot = new ItemCustomLore().setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); + waste_mox_hot = new ItemCustomLore().setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); + waste_schrabidium_hot = new ItemCustomLore().setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap"); rod_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel_depleted"); rod_dual_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel_depleted"); @@ -2831,12 +2853,12 @@ public class ModItems { GameRegistry.registerItem(test_nuke_tier2_target, test_nuke_tier2_target.getUnlocalizedName()); //Ingots - GameRegistry.registerItem(ingot_th232, ingot_th232.getUnlocalizedName()); GameRegistry.registerItem(ingot_uranium, ingot_uranium.getUnlocalizedName()); GameRegistry.registerItem(ingot_u233, ingot_u233.getUnlocalizedName()); GameRegistry.registerItem(ingot_u235, ingot_u235.getUnlocalizedName()); GameRegistry.registerItem(ingot_u238, ingot_u238.getUnlocalizedName()); GameRegistry.registerItem(ingot_u238m2, ingot_u238m2.getUnlocalizedName()); + GameRegistry.registerItem(ingot_th232, ingot_th232.getUnlocalizedName()); GameRegistry.registerItem(ingot_plutonium, ingot_plutonium.getUnlocalizedName()); GameRegistry.registerItem(ingot_pu238, ingot_pu238.getUnlocalizedName()); GameRegistry.registerItem(ingot_pu239, ingot_pu239.getUnlocalizedName()); @@ -2971,8 +2993,10 @@ public class ModItems { //Nuggets GameRegistry.registerItem(nugget_uranium, nugget_uranium.getUnlocalizedName()); + GameRegistry.registerItem(nugget_u233, nugget_u233.getUnlocalizedName()); GameRegistry.registerItem(nugget_u235, nugget_u235.getUnlocalizedName()); GameRegistry.registerItem(nugget_u238, nugget_u238.getUnlocalizedName()); + GameRegistry.registerItem(nugget_th232, nugget_th232.getUnlocalizedName()); GameRegistry.registerItem(nugget_plutonium, nugget_plutonium.getUnlocalizedName()); GameRegistry.registerItem(nugget_pu238, nugget_pu238.getUnlocalizedName()); GameRegistry.registerItem(nugget_pu239, nugget_pu239.getUnlocalizedName()); @@ -2983,6 +3007,7 @@ public class ModItems { GameRegistry.registerItem(nugget_schrabidium, nugget_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(nugget_solinium, nugget_solinium.getUnlocalizedName()); GameRegistry.registerItem(nugget_uranium_fuel, nugget_uranium_fuel.getUnlocalizedName()); + GameRegistry.registerItem(nugget_thorium_fuel, nugget_thorium_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_plutonium_fuel, nugget_plutonium_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_mox_fuel, nugget_mox_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_schrabidium_fuel, nugget_schrabidium_fuel.getUnlocalizedName()); @@ -3483,6 +3508,10 @@ public class ModItems { GameRegistry.registerItem(rod_dual_u235, rod_dual_u235.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_u235, rod_quad_u235.getUnlocalizedName()); + GameRegistry.registerItem(rod_u233, rod_u233.getUnlocalizedName()); + GameRegistry.registerItem(rod_dual_u233, rod_dual_u233.getUnlocalizedName()); + GameRegistry.registerItem(rod_quad_u233, rod_quad_u233.getUnlocalizedName()); + GameRegistry.registerItem(rod_u238, rod_u238.getUnlocalizedName()); GameRegistry.registerItem(rod_dual_u238, rod_dual_u238.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_u238, rod_quad_u238.getUnlocalizedName()); @@ -3583,6 +3612,11 @@ public class ModItems { GameRegistry.registerItem(rod_quad_waste, rod_quad_waste.getUnlocalizedName()); GameRegistry.registerItem(scrap, scrap.getUnlocalizedName()); + GameRegistry.registerItem(waste_uranium_hot, waste_uranium_hot.getUnlocalizedName()); + GameRegistry.registerItem(waste_thorium_hot, waste_thorium_hot.getUnlocalizedName()); + GameRegistry.registerItem(waste_plutonium_hot, waste_plutonium_hot.getUnlocalizedName()); + GameRegistry.registerItem(waste_mox_hot, waste_mox_hot.getUnlocalizedName()); + GameRegistry.registerItem(waste_schrabidium_hot, waste_schrabidium_hot.getUnlocalizedName()); GameRegistry.registerItem(waste_uranium, waste_uranium.getUnlocalizedName()); GameRegistry.registerItem(waste_thorium, waste_thorium.getUnlocalizedName()); GameRegistry.registerItem(waste_plutonium, waste_plutonium.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index e7be5d63c..0f00744fa 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -49,12 +49,16 @@ public class ItemRadioactive extends Item { //Strong - if (this == ModItems.ingot_u235 || + if (this == ModItems.ingot_u233 || + this == ModItems.ingot_u235 || + this == ModItems.ingot_pu239 || this == ModItems.ingot_pu239 || this == ModItems.ingot_pu240 || this == ModItems.ingot_uranium_fuel || this == ModItems.ingot_plutonium_fuel || this == ModItems.ingot_mox_fuel || + this == ModItems.rod_quad_u233 || + this == ModItems.rod_dual_u233 || this == ModItems.rod_quad_u235 || this == ModItems.rod_dual_u235 || this == ModItems.rod_quad_pu239 || @@ -88,12 +92,14 @@ public class ItemRadioactive extends Item { //Strong Nuggets - if (this == ModItems.nugget_u235 || + if (this == ModItems.nugget_u233 || + this == ModItems.nugget_u235 || this == ModItems.nugget_pu239 || this == ModItems.nugget_pu240 || this == ModItems.nugget_uranium_fuel || this == ModItems.nugget_plutonium_fuel || this == ModItems.nugget_mox_fuel || + this == ModItems.rod_u233 || this == ModItems.rod_u235 || this == ModItems.rod_pu239 || this == ModItems.rod_pu240 || @@ -171,7 +177,8 @@ public class ItemRadioactive extends Item { if (this == ModItems.cell_tritium || this == ModItems.rod_tritium || this == ModItems.rod_dual_tritium || - this == ModItems.rod_quad_tritium) { + this == ModItems.rod_quad_tritium || + this == ModItems.nugget_thorium_fuel) { //Library.applyRadiation(living, 10, 4, 0, 0); Library.applyRadData(living, 0.75F/20F * mod); } diff --git a/com/hbm/saveddata/RadiationSavedData.java b/com/hbm/saveddata/RadiationSavedData.java index 816af0e5e..a9964182a 100644 --- a/com/hbm/saveddata/RadiationSavedData.java +++ b/com/hbm/saveddata/RadiationSavedData.java @@ -188,5 +188,24 @@ public class RadiationSavedData extends WorldSavedData { data.setRadForCoord(chunk.xPosition, chunk.zPosition, r + rad); } } + + public static void decrementRad(World worldObj, int x, int z, float rad) { + + RadiationSavedData data = getData(worldObj); + + Chunk chunk = worldObj.getChunkFromBlockCoords(x, z); + + float r = data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition); + + r -= rad; + + if(r > 0) { + data.setRadForCoord(chunk.xPosition, chunk.zPosition, r); + } else { + data.setRadForCoord(chunk.xPosition, chunk.zPosition, 0); + } + + System.out.println(r); + } }