From 6ab738e9aa19ca85eb81cd40728905ff788e6bfb Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 13 Apr 2018 12:08:54 +0200 Subject: [PATCH] Selenium unwrap, crafting recipes, more rare earth drops --- assets/hbm/lang/de_DE.lang | 2 + assets/hbm/lang/en_US.lang | 6 +- assets/hbm/models/selenium_engine_body.obj | 636 +++++++++++++------ assets/hbm/models/selenium_engine_piston.obj | 560 ++++++++++------ assets/hbm/models/selenium_engine_rotor.obj | 188 ++++-- com/hbm/blocks/generic/BlockOre.java | 2 +- com/hbm/inventory/MachineRecipes.java | 36 +- com/hbm/items/special/ItemCell.java | 11 +- com/hbm/items/tool/ItemAssemblyTemplate.java | 11 +- com/hbm/main/CraftingManager.java | 3 + com/hbm/main/MainRegistry.java | 9 +- com/hbm/main/ModEventHandler.java | 16 +- 12 files changed, 1008 insertions(+), 472 deletions(-) diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 0af3b7708..b6418a9c4 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -10,6 +10,8 @@ achievement.impossible=Vollkommen unmöglich achievement.impossible.desc=Du kannst diese Errungenschaft nicht bekommen. achievement.tasteofblood=Der Geschmack von Blut achievement.tasteofblood.desc=ist nicht Teil des Testprotokolls. +achievement.freytag=Freytag +achievement.freytag.desc=Leibgarde Herold potion.hbm_taint=Verdorben diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 896f892e9..f552def80 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -10,6 +10,8 @@ achievement.impossible=Literally impossible achievement.impossible.desc=You can't get this achievement. achievement.tasteofblood=The Taste of Blood achievement.tasteofblood.desc=is not part of any testing protocol. +achievement.freytag=Freytag +achievement.freytag.desc=Herold's life guards potion.hbm_taint=Tainted @@ -389,8 +391,8 @@ tile.machine_rtg_cyan.name=Schrabidium Decay Generator (WIP) tile.machine_rtg_blue.name=Convection Generator tile.machine_rtg_purple.name=Antimatter Annihilation Generator -tile.machine_spp_bottom.name=SPE Potential Generator (Bottom) -tile.machine_spp_top.name=SPE Potential Generator (Top) +tile.machine_spp_bottom.name=ZPE Potential Generator (Bottom) +tile.machine_spp_top.name=ZPE Potential Generator (Top) tile.ams_limiter.name=AMS Stabilizer [WIP] container.amsLimiter=AMS Stabilizer [WIP] diff --git a/assets/hbm/models/selenium_engine_body.obj b/assets/hbm/models/selenium_engine_body.obj index d11247226..b679392b9 100644 --- a/assets/hbm/models/selenium_engine_body.obj +++ b/assets/hbm/models/selenium_engine_body.obj @@ -117,6 +117,230 @@ v -0.078125 0.706250 -0.078125 v -0.078125 0.706250 0.078125 v 0.078125 0.706250 0.078125 v 0.078125 0.706250 -0.078125 +vt 0.377779 0.024108 +vt 0.436724 0.024108 +vt 0.436724 0.137981 +vt 0.495669 0.024108 +vt 0.495669 0.137981 +vt 0.554615 0.024108 +vt 0.554615 0.137981 +vt 0.613560 0.024108 +vt 0.613560 0.137981 +vt 0.672505 0.024108 +vt 0.672505 0.137981 +vt 0.731450 0.024108 +vt 0.731450 0.137981 +vt 0.024108 0.024108 +vt 0.083053 0.024108 +vt 0.083053 0.137982 +vt 0.141998 0.024108 +vt 0.141998 0.137982 +vt 0.200943 0.024108 +vt 0.200944 0.137981 +vt 0.259889 0.024108 +vt 0.259889 0.137981 +vt 0.163574 0.186198 +vt 0.214622 0.215670 +vt 0.182414 0.247878 +vt 0.318834 0.024108 +vt 0.377779 0.137981 +vt 0.318834 0.137981 +vt 0.104629 0.406184 +vt 0.116418 0.362187 +vt 0.151785 0.362187 +vt 0.024108 0.325663 +vt 0.068105 0.313874 +vt 0.085789 0.344503 +vt 0.482824 0.376711 +vt 0.450616 0.344503 +vt 0.468299 0.313874 +vt 0.292310 0.266718 +vt 0.336308 0.278507 +vt 0.336308 0.313874 +vt 0.244094 0.325663 +vt 0.200097 0.313874 +vt 0.200097 0.278507 +vt 0.053581 0.215670 +vt 0.085789 0.247878 +vt 0.068105 0.278507 +vt 0.512297 0.266718 +vt 0.468299 0.278507 +vt 0.450616 0.247878 +vt 0.372831 0.406184 +vt 0.321783 0.376711 +vt 0.353991 0.344503 +vt 0.431776 0.186198 +vt 0.419987 0.230195 +vt 0.384620 0.230195 +vt 0.163574 0.406184 +vt 0.182414 0.344503 +vt 0.151785 0.230195 +vt 0.116418 0.230195 +vt 0.053581 0.376711 +vt 0.431776 0.406184 +vt 0.419987 0.362187 +vt 0.321783 0.215670 +vt 0.353991 0.247878 +vt 0.244094 0.266718 +vt 0.024108 0.266718 +vt 0.512297 0.325663 +vt 0.292310 0.325663 +vt 0.214622 0.376711 +vt 0.104629 0.186198 +vt 0.482824 0.215670 +vt 0.384620 0.362187 +vt 0.372831 0.186198 +vt 0.039821 0.878779 +vt 0.176469 0.878779 +vt 0.142307 0.937949 +vt 0.073983 0.937949 +vt 0.108145 0.947103 +vt 0.103935 0.962816 +vt 0.048975 0.912941 +vt 0.062480 0.949452 +vt 0.024108 0.882989 +vt 0.033262 0.840407 +vt 0.048975 0.844617 +vt 0.062480 0.808106 +vt 0.073983 0.819609 +vt 0.103935 0.794742 +vt 0.108145 0.810455 +vt 0.142307 0.819609 +vt 0.112356 0.794742 +vt 0.167316 0.844617 +vt 0.153810 0.808106 +vt 0.183029 0.840407 +vt 0.167316 0.912941 +vt 0.192183 0.882989 +vt 0.178819 0.924444 +vt 0.146518 0.953663 +vt 0.340346 0.943001 +vt 0.274350 0.925318 +vt 0.304978 0.811009 +vt 0.370975 0.828693 +vt 0.340346 0.811009 +vt 0.348479 0.796921 +vt 0.388658 0.859322 +vt 0.385063 0.820559 +vt 0.388658 0.894689 +vt 0.404926 0.859322 +vt 0.370975 0.925318 +vt 0.402746 0.902823 +vt 0.379108 0.939406 +vt 0.304979 0.943001 +vt 0.340346 0.959269 +vt 0.296845 0.957089 +vt 0.256666 0.894689 +vt 0.260262 0.933451 +vt 0.240399 0.859322 +vt 0.256666 0.859322 +vt 0.260262 0.820559 +vt 0.274350 0.828693 +vt 0.296845 0.796921 +vt 0.304978 0.794742 +vt 0.024108 0.684733 +vt 0.025734 0.644096 +vt 0.046052 0.644909 +vt 0.444044 0.726997 +vt 0.442418 0.686360 +vt 0.462737 0.685548 +vt 0.464321 0.515373 +vt 0.465946 0.556010 +vt 0.445628 0.556822 +vt 0.046052 0.474734 +vt 0.044426 0.515371 +vt 0.024108 0.514558 +vt 0.046003 0.746519 +vt 0.044426 0.705880 +vt 0.379792 0.705887 +vt 0.465946 0.576344 +vt 0.791559 0.556013 +vt 0.464362 0.746519 +vt 0.464362 0.726184 +vt 0.789974 0.726188 +vt 0.046052 0.624575 +vt 0.381418 0.624575 +vt 0.371665 0.644912 +vt 0.465899 0.454400 +vt 0.801265 0.454400 +vt 0.799687 0.495039 +vt 0.370039 0.685549 +vt 0.464321 0.495038 +vt 0.789934 0.515377 +vt 0.044426 0.685546 +vt 0.371664 0.474741 +vt 0.370037 0.515377 +vt 0.464315 0.624575 +vt 0.799681 0.624575 +vt 0.798103 0.665213 +vt 0.044426 0.535705 +vt 0.462737 0.665213 +vt 0.788350 0.685551 +vt 0.045987 0.576344 +vt 0.383041 0.535719 +vt 0.046053 0.454400 +vt 0.384669 0.454400 +vt 0.394160 0.516343 +vt 0.814096 0.555112 +vt 0.810887 0.684650 +vt 0.812512 0.725286 +vt 0.394203 0.645814 +vt 0.392577 0.686451 +vt 0.830946 0.331144 +vt 0.830946 0.229471 +vt 0.932619 0.229471 +vt 0.932619 0.331143 +vt 0.907200 0.387980 +vt 0.856364 0.387980 +vt 0.774109 0.305725 +vt 0.774109 0.254889 +vt 0.856364 0.172634 +vt 0.907200 0.172634 +vt 0.989455 0.254889 +vt 0.989455 0.305725 +vt 0.560513 0.237034 +vt 0.739457 0.237034 +vt 0.739457 0.287870 +vt 0.560513 0.338707 +vt 0.739457 0.338706 +vt 0.739457 0.389543 +vt 0.560513 0.186198 +vt 0.739457 0.186198 +vt 0.560513 0.287870 +vt 0.024108 0.137982 +vt 0.069773 0.953663 +vt 0.037472 0.924444 +vt 0.033262 0.917151 +vt 0.024108 0.874569 +vt 0.037472 0.833114 +vt 0.069773 0.803895 +vt 0.146518 0.803895 +vt 0.178819 0.833114 +vt 0.192183 0.874569 +vt 0.183029 0.917151 +vt 0.153810 0.949452 +vt 0.112356 0.962816 +vt 0.379108 0.814605 +vt 0.402746 0.851188 +vt 0.404926 0.894689 +vt 0.385063 0.933451 +vt 0.348479 0.957089 +vt 0.304979 0.959269 +vt 0.266216 0.939406 +vt 0.242578 0.902823 +vt 0.240399 0.894689 +vt 0.242578 0.851188 +vt 0.266216 0.814605 +vt 0.340346 0.794742 +vt 0.444003 0.516186 +vt 0.025734 0.473921 +vt 0.381369 0.746526 +vt 0.801311 0.576351 +vt 0.799727 0.746526 +vt 0.384603 0.576359 +vt 0.395787 0.475707 +vt 0.812471 0.514475 +vt 0.560513 0.389543 vn 0.258800 0.965900 0.000000 vn 0.707100 0.707100 0.000000 vn 0.965900 0.258800 0.000000 @@ -154,209 +378,209 @@ vn -0.999100 -0.038800 -0.018600 vn -0.999100 0.038800 0.018600 vn 0.999000 0.038400 -0.024600 s off -f 2//1 4//1 3//1 -f 4//2 6//2 5//2 -f 6//3 8//3 7//3 -f 8//4 10//4 9//4 -f 10//5 12//5 11//5 -f 12//6 14//6 13//6 -f 14//7 16//7 15//7 -f 16//8 18//8 17//8 -f 18//9 20//9 19//9 -f 20//10 22//10 21//10 -f 16//11 14//11 38//11 -f 24//12 2//12 1//12 -f 22//13 24//13 23//13 -f 4//11 27//11 30//11 -f 24//11 48//11 28//11 -f 11//14 35//14 33//14 -f 21//14 45//14 43//14 -f 10//11 34//11 36//11 -f 20//11 44//11 46//11 -f 7//14 31//14 29//14 -f 15//14 17//14 41//14 -f 3//14 26//14 25//14 -f 6//11 30//11 32//11 -f 16//11 40//11 42//11 -f 2//11 28//11 27//11 -f 13//14 37//14 35//14 -f 21//14 23//14 47//14 -f 12//11 36//11 38//11 -f 22//11 46//11 48//11 -f 9//14 33//14 31//14 -f 17//14 19//14 43//14 -f 8//11 32//11 34//11 -f 18//11 42//11 44//11 -f 3//14 5//14 29//14 -f 15//14 39//14 37//14 -f 1//14 25//14 47//14 -f 52//11 58//11 60//11 -f 50//1 49//1 27//1 -f 51//12 50//12 28//12 -f 46//13 52//13 51//13 -f 44//10 53//10 52//10 -f 42//9 54//9 53//9 -f 40//8 55//8 54//8 -f 56//7 55//7 40//7 -f 57//6 56//6 38//6 -f 58//5 57//5 36//5 -f 59//4 58//4 34//4 -f 60//3 59//3 32//3 -f 49//2 60//2 30//2 -f 66//14 68//14 72//14 -f 62//1 61//1 25//1 -f 63//2 62//2 26//2 -f 64//3 63//3 29//3 -f 65//4 64//4 31//4 -f 66//5 65//5 33//5 -f 67//6 66//6 35//6 -f 68//7 67//7 37//7 -f 69//8 68//8 39//8 -f 43//9 70//9 69//9 -f 45//10 71//10 70//10 -f 47//13 72//13 71//13 -f 61//12 72//12 47//12 -f 77//15 78//15 74//15 -f 79//15 80//15 76//15 -f 85//15 86//15 82//15 -f 87//15 88//15 84//15 -f 78//14 77//14 100//14 -f 82//16 86//16 91//16 -f 79//17 75//17 101//17 -f 78//18 99//18 104//18 -f 82//11 96//11 95//11 -f 74//11 104//11 103//11 -f 81//19 95//19 92//19 -f 77//20 73//20 103//20 -f 87//14 90//14 89//14 -f 79//14 98//14 97//14 -f 84//21 88//21 89//21 -f 80//22 97//22 102//22 -f 83//11 84//11 94//11 -f 86//14 85//14 92//14 -f 75//11 76//11 102//11 -f 83//23 93//23 90//23 -f 94//24 89//24 90//24 -f 96//25 91//25 92//25 -f 102//26 97//26 98//26 -f 104//26 99//26 100//26 -f 106//15 105//15 107//15 -f 111//11 115//11 114//11 -f 108//27 111//27 110//27 -f 106//28 110//28 109//28 -f 105//29 109//29 112//29 -f 107//30 112//30 111//30 -f 110//31 114//31 113//31 -f 109//14 113//14 116//14 -f 112//32 116//32 115//32 -f 1//1 2//1 3//1 -f 3//2 4//2 5//2 -f 5//3 6//3 7//3 -f 7//4 8//4 9//4 -f 9//5 10//5 11//5 -f 11//6 12//6 13//6 -f 13//7 14//7 15//7 -f 15//8 16//8 17//8 -f 17//9 18//9 19//9 -f 19//10 20//10 21//10 -f 40//11 16//11 38//11 -f 23//12 24//12 1//12 -f 21//13 22//13 23//13 -f 6//11 4//11 30//11 -f 2//11 24//11 28//11 -f 9//14 11//14 33//14 -f 19//14 21//14 43//14 -f 12//11 10//11 36//11 -f 22//11 20//11 46//11 -f 5//14 7//14 29//14 -f 39//14 15//14 41//14 -f 1//14 3//14 25//14 -f 8//11 6//11 32//11 -f 18//11 16//11 42//11 -f 4//11 2//11 27//11 -f 11//14 13//14 35//14 -f 45//14 21//14 47//14 -f 14//11 12//11 38//11 -f 24//11 22//11 48//11 -f 7//14 9//14 31//14 -f 41//14 17//14 43//14 -f 10//11 8//11 34//11 -f 20//11 18//11 44//11 -f 26//14 3//14 29//14 -f 13//14 15//14 37//14 -f 23//14 1//14 47//14 -f 60//11 49//11 50//11 -f 50//11 51//11 60//11 -f 52//11 53//11 54//11 -f 54//11 55//11 52//11 -f 56//11 57//11 58//11 -f 58//11 59//11 60//11 -f 60//11 51//11 52//11 -f 52//11 55//11 56//11 -f 56//11 58//11 52//11 -f 28//1 50//1 27//1 -f 48//12 51//12 28//12 -f 48//13 46//13 51//13 -f 46//10 44//10 52//10 -f 44//9 42//9 53//9 -f 42//8 40//8 54//8 -f 38//7 56//7 40//7 -f 36//6 57//6 38//6 -f 34//5 58//5 36//5 -f 32//4 59//4 34//4 -f 30//3 60//3 32//3 -f 27//2 49//2 30//2 -f 72//14 61//14 62//14 -f 62//14 63//14 64//14 -f 64//14 65//14 66//14 -f 66//14 67//14 68//14 -f 68//14 69//14 70//14 -f 70//14 71//14 72//14 -f 72//14 62//14 64//14 -f 64//14 66//14 72//14 -f 68//14 70//14 72//14 -f 26//1 62//1 25//1 -f 29//2 63//2 26//2 -f 31//3 64//3 29//3 -f 33//4 65//4 31//4 -f 35//5 66//5 33//5 -f 37//6 67//6 35//6 -f 39//7 68//7 37//7 -f 41//8 69//8 39//8 -f 41//9 43//9 69//9 -f 43//10 45//10 70//10 -f 45//13 47//13 71//13 -f 25//12 61//12 47//12 -f 73//15 77//15 74//15 -f 75//15 79//15 76//15 -f 81//15 85//15 82//15 -f 83//15 87//15 84//15 -f 99//14 78//14 100//14 -f 96//33 82//33 91//33 -f 98//34 79//34 101//34 -f 74//16 78//16 104//16 -f 81//11 82//11 95//11 -f 73//11 74//11 103//11 -f 85//20 81//20 92//20 -f 100//35 77//35 103//35 -f 88//14 87//14 89//14 -f 80//14 79//14 97//14 -f 94//36 84//36 89//36 -f 76//21 80//21 102//21 -f 93//11 83//11 94//11 -f 91//14 86//14 92//14 -f 101//11 75//11 102//11 -f 87//17 83//17 90//17 -f 93//24 94//24 90//24 -f 95//25 96//25 92//25 -f 101//26 102//26 98//26 -f 103//26 104//26 100//26 -f 108//15 106//15 107//15 -f 110//11 111//11 114//11 -f 106//27 108//27 110//27 -f 105//28 106//28 109//28 -f 107//29 105//29 112//29 -f 108//30 107//30 111//30 -f 109//31 110//31 113//31 -f 112//14 109//14 116//14 -f 111//32 112//32 115//32 +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/8/5 12/10/5 11/11/5 +f 12/10/6 14/12/6 13/13/6 +f 14/14/7 16/15/7 15/16/7 +f 16/15/8 18/17/8 17/18/8 +f 18/17/9 20/19/9 19/20/9 +f 20/19/10 22/21/10 21/22/10 +f 16/23/11 14/24/11 38/25/11 +f 24/26/12 2/1/12 1/27/12 +f 22/21/13 24/26/13 23/28/13 +f 4/29/11 27/30/11 30/31/11 +f 24/32/11 48/33/11 28/34/11 +f 11/35/14 35/36/14 33/37/14 +f 21/38/14 45/39/14 43/40/14 +f 10/41/11 34/42/11 36/43/11 +f 20/44/11 44/45/11 46/46/11 +f 7/47/14 31/48/14 29/49/14 +f 15/50/14 17/51/14 41/52/14 +f 3/53/14 26/54/14 25/55/14 +f 6/56/11 30/31/11 32/57/11 +f 16/23/11 40/58/11 42/59/11 +f 2/60/11 28/34/11 27/30/11 +f 13/61/14 37/62/14 35/36/14 +f 21/38/14 23/63/14 47/64/14 +f 12/65/11 36/43/11 38/25/11 +f 22/66/11 46/46/11 48/33/11 +f 9/67/14 33/37/14 31/48/14 +f 17/51/14 19/68/14 43/40/14 +f 8/69/11 32/57/11 34/42/11 +f 18/70/11 42/59/11 44/45/11 +f 3/53/14 5/71/14 29/49/14 +f 15/50/14 39/72/14 37/62/14 +f 1/73/14 25/55/14 47/64/14 +f 52/74/11 58/75/11 60/76/11 +f 50/77/1 49/78/1 27/79/1 +f 51/80/12 50/77/12 28/81/12 +f 46/82/13 52/74/13 51/80/13 +f 44/83/10 53/84/10 52/74/10 +f 42/85/9 54/86/9 53/84/9 +f 40/87/8 55/88/8 54/86/8 +f 56/89/7 55/88/7 40/90/7 +f 57/91/6 56/89/6 38/92/6 +f 58/75/5 57/91/5 36/93/5 +f 59/94/4 58/75/4 34/95/4 +f 60/76/3 59/94/3 32/96/3 +f 49/78/2 60/76/2 30/97/2 +f 66/98/14 68/99/14 72/100/14 +f 62/101/1 61/102/1 25/103/1 +f 63/104/2 62/101/2 26/105/2 +f 64/106/3 63/104/3 29/107/3 +f 65/108/4 64/106/4 31/109/4 +f 66/98/5 65/108/5 33/110/5 +f 67/111/6 66/98/6 35/112/6 +f 68/99/7 67/111/7 37/113/7 +f 69/114/8 68/99/8 39/115/8 +f 43/116/9 70/117/9 69/114/9 +f 45/118/10 71/119/10 70/117/10 +f 47/120/13 72/100/13 71/119/13 +f 61/102/12 72/100/12 47/121/12 +f 77/122/15 78/123/15 74/124/15 +f 79/125/15 80/126/15 76/127/15 +f 85/128/15 86/129/15 82/130/15 +f 87/131/15 88/132/15 84/133/15 +f 78/134/14 77/135/14 100/136/14 +f 82/137/16 86/129/16 91/138/16 +f 79/139/17 75/140/17 101/141/17 +f 78/142/18 99/143/18 104/144/18 +f 82/145/11 96/146/11 95/147/11 +f 74/124/11 104/144/11 103/148/11 +f 81/149/19 95/147/19 92/150/19 +f 77/135/20 73/151/20 103/148/20 +f 87/131/14 90/152/14 89/153/14 +f 79/154/14 98/155/14 97/156/14 +f 84/157/21 88/132/21 89/153/21 +f 80/158/22 97/156/22 102/159/22 +f 83/160/11 84/157/11 94/161/11 +f 86/129/14 85/128/14 92/150/14 +f 75/140/11 76/127/11 102/159/11 +f 83/162/23 93/163/23 90/152/23 +f 94/164/24 89/153/24 90/152/24 +f 96/165/25 91/138/25 92/150/25 +f 102/159/26 97/166/26 98/167/26 +f 104/144/26 99/168/26 100/169/26 +f 106/170/15 105/171/15 107/172/15 +f 108/173/27 111/174/27 110/175/27 +f 106/170/28 110/176/28 109/177/28 +f 105/171/29 109/178/29 112/179/29 +f 107/172/30 112/180/30 111/181/30 +f 110/182/31 114/183/31 113/184/31 +f 112/185/32 116/186/32 115/187/32 +f 111/188/11 115/189/11 114/183/11 +f 109/190/14 113/184/14 116/186/14 +f 1/27/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/9/5 10/8/5 11/11/5 +f 11/11/6 12/10/6 13/13/6 +f 13/191/7 14/14/7 15/16/7 +f 15/16/8 16/15/8 17/18/8 +f 17/18/9 18/17/9 19/20/9 +f 19/20/10 20/19/10 21/22/10 +f 40/58/11 16/23/11 38/25/11 +f 23/28/12 24/26/12 1/27/12 +f 21/22/13 22/21/13 23/28/13 +f 6/56/11 4/29/11 30/31/11 +f 2/60/11 24/32/11 28/34/11 +f 9/67/14 11/35/14 33/37/14 +f 19/68/14 21/38/14 43/40/14 +f 12/65/11 10/41/11 36/43/11 +f 22/66/11 20/44/11 46/46/11 +f 5/71/14 7/47/14 29/49/14 +f 39/72/14 15/50/14 41/52/14 +f 1/73/14 3/53/14 25/55/14 +f 8/69/11 6/56/11 32/57/11 +f 18/70/11 16/23/11 42/59/11 +f 4/29/11 2/60/11 27/30/11 +f 11/35/14 13/61/14 35/36/14 +f 45/39/14 21/38/14 47/64/14 +f 14/24/11 12/65/11 38/25/11 +f 24/32/11 22/66/11 48/33/11 +f 7/47/14 9/67/14 31/48/14 +f 41/52/14 17/51/14 43/40/14 +f 10/41/11 8/69/11 34/42/11 +f 20/44/11 18/70/11 44/45/11 +f 26/54/14 3/53/14 29/49/14 +f 13/61/14 15/50/14 37/62/14 +f 23/63/14 1/73/14 47/64/14 +f 60/76/11 49/78/11 50/77/11 +f 50/77/11 51/80/11 60/76/11 +f 52/74/11 53/84/11 54/86/11 +f 54/86/11 55/88/11 52/74/11 +f 56/89/11 57/91/11 58/75/11 +f 58/75/11 59/94/11 60/76/11 +f 60/76/11 51/80/11 52/74/11 +f 52/74/11 55/88/11 56/89/11 +f 56/89/11 58/75/11 52/74/11 +f 28/192/1 50/77/1 27/79/1 +f 48/193/12 51/80/12 28/81/12 +f 48/194/13 46/82/13 51/80/13 +f 46/195/10 44/83/10 52/74/10 +f 44/196/9 42/85/9 53/84/9 +f 42/197/8 40/87/8 54/86/8 +f 38/198/7 56/89/7 40/90/7 +f 36/199/6 57/91/6 38/92/6 +f 34/200/5 58/75/5 36/93/5 +f 32/201/4 59/94/4 34/95/4 +f 30/202/3 60/76/3 32/96/3 +f 27/203/2 49/78/2 30/97/2 +f 72/100/14 61/102/14 62/101/14 +f 62/101/14 63/104/14 64/106/14 +f 64/106/14 65/108/14 66/98/14 +f 66/98/14 67/111/14 68/99/14 +f 68/99/14 69/114/14 70/117/14 +f 70/117/14 71/119/14 72/100/14 +f 72/100/14 62/101/14 64/106/14 +f 64/106/14 66/98/14 72/100/14 +f 68/99/14 70/117/14 72/100/14 +f 26/204/1 62/101/1 25/103/1 +f 29/205/2 63/104/2 26/105/2 +f 31/206/3 64/106/3 29/107/3 +f 33/207/4 65/108/4 31/109/4 +f 35/208/5 66/98/5 33/110/5 +f 37/209/6 67/111/6 35/112/6 +f 39/210/7 68/99/7 37/113/7 +f 41/211/8 69/114/8 39/115/8 +f 41/212/9 43/116/9 69/114/9 +f 43/213/10 45/118/10 70/117/10 +f 45/214/13 47/120/13 71/119/13 +f 25/215/12 61/102/12 47/121/12 +f 73/151/15 77/122/15 74/124/15 +f 75/140/15 79/125/15 76/127/15 +f 81/216/15 85/128/15 82/130/15 +f 83/217/15 87/131/15 84/133/15 +f 99/218/14 78/134/14 100/136/14 +f 96/219/33 82/137/33 91/138/33 +f 98/220/34 79/139/34 101/141/34 +f 74/124/16 78/142/16 104/144/16 +f 81/149/11 82/145/11 95/147/11 +f 73/151/11 74/124/11 103/148/11 +f 85/128/20 81/149/20 92/150/20 +f 100/136/35 77/135/35 103/148/35 +f 88/132/14 87/131/14 89/153/14 +f 80/158/14 79/154/14 97/156/14 +f 94/161/36 84/157/36 89/153/36 +f 76/127/21 80/158/21 102/159/21 +f 93/221/11 83/160/11 94/161/11 +f 91/138/14 86/129/14 92/150/14 +f 101/141/11 75/140/11 102/159/11 +f 87/131/17 83/162/17 90/152/17 +f 93/222/24 94/164/24 90/152/24 +f 95/223/25 96/165/25 92/150/25 +f 101/141/26 102/159/26 98/167/26 +f 103/148/26 104/144/26 100/169/26 +f 108/173/15 106/170/15 107/172/15 +f 106/170/27 108/173/27 110/175/27 +f 105/171/28 106/170/28 109/177/28 +f 107/172/29 105/171/29 112/179/29 +f 108/173/30 107/172/30 111/181/30 +f 109/190/31 110/182/31 113/184/31 +f 111/224/32 112/185/32 115/187/32 +f 110/182/11 111/188/11 114/183/11 +f 112/185/14 109/190/14 116/186/14 diff --git a/assets/hbm/models/selenium_engine_piston.obj b/assets/hbm/models/selenium_engine_piston.obj index 3a1176bbe..8e3894b38 100644 --- a/assets/hbm/models/selenium_engine_piston.obj +++ b/assets/hbm/models/selenium_engine_piston.obj @@ -117,6 +117,210 @@ v -0.200000 0.200000 -0.075000 v -0.200000 0.612500 -0.075000 v -0.200000 0.200000 0.075000 v -0.200000 0.612500 0.075000 +vt 0.420709 0.299122 +vt 0.353866 0.299122 +vt 0.353866 0.019654 +vt 0.554394 0.299122 +vt 0.487551 0.299122 +vt 0.487552 0.019654 +vt 0.287024 0.299122 +vt 0.220182 0.299122 +vt 0.220182 0.019654 +vt 0.153339 0.299122 +vt 0.153339 0.019654 +vt 0.420709 0.019654 +vt 0.086497 0.299123 +vt 0.019654 0.299123 +vt 0.019654 0.019654 +vt 0.287024 0.019654 +vt 0.086496 0.019654 +vt 0.186760 0.872253 +vt 0.103207 0.872253 +vt 0.103207 0.784919 +vt 0.019654 0.872253 +vt 0.019654 0.784919 +vt 0.688079 0.872253 +vt 0.604526 0.872253 +vt 0.604526 0.784919 +vt 0.520973 0.872253 +vt 0.520973 0.784919 +vt 0.437420 0.872253 +vt 0.437420 0.784919 +vt 0.353867 0.872253 +vt 0.353866 0.784919 +vt 0.408297 0.397511 +vt 0.610013 0.397511 +vt 0.610013 0.481064 +vt 0.270313 0.872253 +vt 0.186760 0.784919 +vt 0.270313 0.784919 +vt 0.362222 0.764747 +vt 0.429064 0.764747 +vt 0.345511 0.764747 +vt 0.195116 0.764747 +vt 0.261958 0.764747 +vt 0.178405 0.764747 +vt 0.028009 0.764747 +vt 0.094852 0.764747 +vt 0.679724 0.764747 +vt 0.688079 0.784919 +vt 0.529328 0.764747 +vt 0.596171 0.764747 +vt 0.512617 0.764747 +vt 0.719188 0.494732 +vt 0.719188 0.540145 +vt 0.649321 0.540145 +vt 0.649321 0.494732 +vt 0.649321 0.460149 +vt 0.719188 0.460149 +vt 0.649321 0.390282 +vt 0.719188 0.390282 +vt 0.649320 0.273112 +vt 0.719188 0.273111 +vt 0.649320 0.133377 +vt 0.719188 0.133377 +vt 0.920071 0.661756 +vt 0.920071 0.417221 +vt 0.937537 0.417221 +vt 0.902605 0.661756 +vt 0.902604 0.417221 +vt 0.885138 0.661756 +vt 0.885137 0.417221 +vt 0.867671 0.661756 +vt 0.867671 0.417221 +vt 0.529281 0.592250 +vt 0.533648 0.596617 +vt 0.507448 0.596617 +vt 0.433353 0.591439 +vt 0.450440 0.587814 +vt 0.455618 0.591180 +vt 0.504082 0.591439 +vt 0.481818 0.591180 +vt 0.477451 0.586813 +vt 0.429988 0.596616 +vt 0.455617 0.662601 +vt 0.533648 0.694239 +vt 0.507447 0.694239 +vt 0.507447 0.668038 +vt 0.481818 0.662601 +vt 0.533648 0.668039 +vt 0.793429 0.377913 +vt 0.793429 0.133377 +vt 0.810896 0.133377 +vt 0.775962 0.377913 +vt 0.775962 0.133377 +vt 0.758496 0.377913 +vt 0.758496 0.133377 +vt 0.810896 0.377913 +vt 0.828362 0.133377 +vt 0.808277 0.730813 +vt 0.811642 0.735990 +vt 0.786013 0.730554 +vt 0.833476 0.731624 +vt 0.837843 0.735990 +vt 0.781646 0.726187 +vt 0.759812 0.730554 +vt 0.754635 0.727188 +vt 0.734183 0.735990 +vt 0.837843 0.807412 +vt 0.837843 0.833613 +vt 0.811642 0.833613 +vt 0.786013 0.801975 +vt 0.759812 0.801975 +vt 0.811642 0.807412 +vt 0.885138 0.377913 +vt 0.885137 0.133377 +vt 0.902604 0.133377 +vt 0.867671 0.377913 +vt 0.867671 0.133377 +vt 0.920071 0.377913 +vt 0.920071 0.133377 +vt 0.937537 0.133377 +vt 0.902605 0.377913 +vt 0.781646 0.872920 +vt 0.786013 0.877287 +vt 0.759812 0.877287 +vt 0.791190 0.873922 +vt 0.808277 0.877546 +vt 0.811642 0.882724 +vt 0.737548 0.877546 +vt 0.754635 0.873922 +vt 0.833476 0.878357 +vt 0.837843 0.882724 +vt 0.811642 0.954146 +vt 0.786013 0.948709 +vt 0.811642 0.980346 +vt 0.837843 0.954146 +vt 0.734183 0.882724 +vt 0.759812 0.948709 +vt 0.758496 0.661756 +vt 0.758496 0.417221 +vt 0.775962 0.417221 +vt 0.810896 0.661756 +vt 0.810896 0.417221 +vt 0.828362 0.417221 +vt 0.793429 0.661756 +vt 0.793429 0.417221 +vt 0.775962 0.661756 +vt 0.594580 0.584079 +vt 0.611667 0.580455 +vt 0.616845 0.583820 +vt 0.621211 0.579453 +vt 0.638678 0.579453 +vt 0.643045 0.583820 +vt 0.690508 0.584890 +vt 0.694875 0.589257 +vt 0.668675 0.589257 +vt 0.648223 0.580455 +vt 0.665309 0.584079 +vt 0.643045 0.655242 +vt 0.616845 0.655242 +vt 0.668675 0.686879 +vt 0.668675 0.660679 +vt 0.694875 0.660679 +vt 0.591215 0.589257 +vt 0.264189 0.696500 +vt 0.264189 0.338430 +vt 0.368990 0.338430 +vt 0.194322 0.626632 +vt 0.194322 0.338430 +vt 0.089521 0.626632 +vt 0.089521 0.338430 +vt 0.019654 0.696499 +vt 0.019654 0.338430 +vt 0.194322 0.725439 +vt 0.089521 0.725439 +vt 0.554394 0.019654 +vt 0.550932 0.540146 +vt 0.467378 0.540146 +vt 0.408297 0.481064 +vt 0.467378 0.338430 +vt 0.550932 0.338430 +vt 0.278669 0.764747 +vt 0.111562 0.764747 +vt 0.612881 0.764747 +vt 0.445775 0.764747 +vt 0.937538 0.661756 +vt 0.511814 0.592250 +vt 0.486996 0.587814 +vt 0.459984 0.586813 +vt 0.429988 0.668038 +vt 0.828363 0.377913 +vt 0.791190 0.727188 +vt 0.816009 0.731624 +vt 0.764179 0.726187 +vt 0.737548 0.730813 +vt 0.734183 0.807412 +vt 0.937538 0.377913 +vt 0.764179 0.872920 +vt 0.816009 0.878357 +vt 0.837843 0.980346 +vt 0.734183 0.954146 +vt 0.828363 0.661756 +vt 0.673041 0.584890 +vt 0.694875 0.686879 +vt 0.591215 0.660679 +vt 0.368990 0.696500 vn 0.382700 0.000000 -0.923900 vn -0.923900 -0.000000 -0.382700 vn 0.923900 0.000000 0.382700 @@ -147,181 +351,181 @@ vn -1.000000 -0.000000 -0.000000 vn 0.000000 0.000000 -1.000000 vn -0.707100 0.707100 -0.000000 s off -f 7//1 5//1 6//1 -f 11//2 9//2 10//2 -f 3//3 1//3 2//3 -f 1//4 15//4 16//4 -f 9//5 7//5 8//5 -f 13//6 11//6 12//6 -f 5//7 3//7 4//7 -f 15//8 13//8 14//8 -f 18//8 20//8 19//8 -f 20//6 22//6 21//6 -f 22//2 24//2 23//2 -f 24//5 26//5 25//5 -f 26//1 28//1 27//1 -f 28//7 30//7 29//7 -f 30//9 24//9 22//9 -f 32//4 18//4 17//4 -f 30//3 32//3 31//3 -f 3//10 5//10 27//10 -f 3//10 29//10 31//10 -f 15//10 1//10 31//10 -f 15//10 17//10 19//10 -f 11//10 13//10 19//10 -f 11//10 21//10 23//10 -f 7//10 9//10 23//10 -f 7//10 25//10 27//10 -f 35//9 34//9 36//9 -f 33//11 37//11 38//11 -f 39//12 40//12 38//12 -f 41//13 42//13 40//13 -f 43//12 44//12 42//12 -f 48//14 47//14 45//14 -f 52//15 51//15 47//15 -f 50//16 49//16 51//16 -f 46//17 45//17 49//17 -f 46//10 53//10 54//10 -f 46//10 50//10 55//10 -f 48//10 54//10 56//10 -f 52//10 56//10 55//10 -f 53//17 55//17 60//17 -f 60//9 59//9 58//9 -f 54//15 58//15 59//15 -f 56//18 59//18 60//18 -f 54//19 53//19 57//19 -f 64//14 63//14 61//14 -f 68//15 67//15 63//15 -f 66//16 65//16 67//16 -f 62//17 61//17 65//17 -f 62//10 69//10 70//10 -f 66//10 71//10 69//10 -f 64//10 70//10 72//10 -f 68//10 72//10 71//10 -f 69//20 71//20 76//20 -f 76//9 75//9 74//9 -f 70//21 74//21 75//21 -f 71//16 72//16 75//16 -f 69//14 73//14 74//14 -f 80//14 79//14 77//14 -f 84//15 83//15 79//15 -f 82//16 81//16 83//16 -f 78//17 77//17 81//17 -f 78//10 85//10 86//10 -f 78//10 82//10 87//10 -f 84//10 80//10 86//10 -f 84//10 88//10 87//10 -f 87//17 92//17 89//17 -f 89//9 92//9 91//9 -f 88//15 86//15 90//15 -f 88//22 91//22 92//22 -f 86//23 85//23 89//23 -f 96//14 95//14 93//14 -f 100//15 99//15 95//15 -f 98//16 97//16 99//16 -f 94//17 93//17 97//17 -f 96//10 94//10 101//10 -f 94//10 98//10 103//10 -f 96//10 102//10 104//10 -f 98//10 100//10 104//10 -f 103//24 108//24 105//24 -f 108//9 107//9 106//9 -f 102//25 106//25 107//25 -f 104//16 107//16 108//16 -f 102//14 101//14 105//14 -f 112//12 111//12 109//12 -f 116//26 115//26 111//26 -f 114//27 113//27 115//27 -f 114//28 110//28 109//28 -f 116//29 112//29 110//29 -f 8//1 7//1 6//1 -f 12//2 11//2 10//2 -f 4//3 3//3 2//3 -f 2//4 1//4 16//4 -f 10//5 9//5 8//5 -f 14//6 13//6 12//6 -f 6//7 5//7 4//7 -f 16//8 15//8 14//8 -f 17//8 18//8 19//8 -f 19//6 20//6 21//6 -f 21//2 22//2 23//2 -f 23//5 24//5 25//5 -f 25//1 26//1 27//1 -f 27//7 28//7 29//7 -f 22//9 20//9 30//9 -f 18//9 32//9 30//9 -f 30//9 28//9 26//9 -f 26//9 24//9 30//9 -f 20//9 18//9 30//9 -f 31//4 32//4 17//4 -f 29//3 30//3 31//3 -f 29//10 3//10 27//10 -f 1//10 3//10 31//10 -f 17//10 15//10 31//10 -f 13//10 15//10 19//10 -f 21//10 11//10 19//10 -f 9//10 11//10 23//10 -f 25//10 7//10 23//10 -f 5//10 7//10 27//10 -f 33//9 35//9 36//9 -f 35//11 33//11 38//11 -f 37//12 39//12 38//12 -f 39//13 41//13 40//13 -f 41//12 43//12 42//12 -f 46//14 48//14 45//14 -f 48//15 52//15 47//15 -f 52//16 50//16 51//16 -f 50//17 46//17 49//17 -f 48//10 46//10 54//10 -f 53//10 46//10 55//10 -f 52//10 48//10 56//10 -f 50//10 52//10 55//10 -f 57//17 53//17 60//17 -f 57//9 60//9 58//9 -f 56//15 54//15 59//15 -f 55//18 56//18 60//18 -f 58//19 54//19 57//19 -f 62//14 64//14 61//14 -f 64//15 68//15 63//15 -f 68//16 66//16 67//16 -f 66//17 62//17 65//17 -f 64//10 62//10 70//10 -f 62//10 66//10 69//10 -f 68//10 64//10 72//10 -f 66//10 68//10 71//10 -f 73//20 69//20 76//20 -f 73//9 76//9 74//9 -f 72//21 70//21 75//21 -f 76//16 71//16 75//16 -f 70//14 69//14 74//14 -f 78//14 80//14 77//14 -f 80//15 84//15 79//15 -f 84//16 82//16 83//16 -f 82//17 78//17 81//17 -f 80//10 78//10 86//10 -f 85//10 78//10 87//10 -f 88//10 84//10 86//10 -f 82//10 84//10 87//10 -f 85//17 87//17 89//17 -f 90//9 89//9 91//9 -f 91//15 88//15 90//15 -f 87//22 88//22 92//22 -f 90//23 86//23 89//23 -f 94//14 96//14 93//14 -f 96//15 100//15 95//15 -f 100//16 98//16 99//16 -f 98//17 94//17 97//17 -f 102//10 96//10 101//10 -f 101//10 94//10 103//10 -f 100//10 96//10 104//10 -f 103//10 98//10 104//10 -f 101//24 103//24 105//24 -f 105//9 108//9 106//9 -f 104//25 102//25 107//25 -f 103//16 104//16 108//16 -f 106//14 102//14 105//14 -f 110//12 112//12 109//12 -f 112//26 116//26 111//26 -f 116//27 114//27 115//27 -f 113//28 114//28 109//28 -f 114//29 116//29 110//29 +f 7/1/1 5/2/1 6/3/1 +f 11/4/2 9/5/2 10/6/2 +f 3/7/3 1/8/3 2/9/3 +f 1/8/4 15/10/4 16/11/4 +f 9/5/5 7/1/5 8/12/5 +f 13/13/6 11/14/6 12/15/6 +f 5/2/7 3/7/7 4/16/7 +f 15/10/8 13/13/8 14/17/8 +f 18/18/8 20/19/8 19/20/8 +f 20/19/6 22/21/6 21/22/6 +f 22/23/2 24/24/2 23/25/2 +f 24/24/5 26/26/5 25/27/5 +f 26/26/1 28/28/1 27/29/1 +f 28/28/7 30/30/7 29/31/7 +f 30/32/9 24/33/9 22/34/9 +f 32/35/4 18/18/4 17/36/4 +f 30/30/3 32/35/3 31/37/3 +f 3/38/10 5/39/10 27/29/10 +f 3/40/10 29/31/10 31/37/10 +f 15/41/10 1/42/10 31/37/10 +f 15/43/10 17/36/10 19/20/10 +f 11/44/10 13/45/10 19/20/10 +f 11/46/10 21/47/10 23/25/10 +f 7/48/10 9/49/10 23/25/10 +f 7/50/10 25/27/10 27/29/10 +f 35/51/9 34/52/9 36/53/9 +f 33/54/11 37/55/11 38/56/11 +f 39/57/12 40/58/12 38/56/12 +f 41/59/13 42/60/13 40/58/13 +f 43/61/12 44/62/12 42/60/12 +f 48/63/14 47/64/14 45/65/14 +f 52/66/15 51/67/15 47/64/15 +f 50/68/16 49/69/16 51/67/16 +f 46/70/17 45/71/17 49/69/17 +f 46/72/10 53/73/10 54/74/10 +f 46/75/10 50/76/10 55/77/10 +f 48/78/10 54/74/10 56/79/10 +f 52/80/10 56/79/10 55/77/10 +f 53/81/17 55/77/17 60/82/17 +f 60/83/9 59/84/9 58/85/9 +f 54/74/15 58/85/15 59/86/15 +f 56/79/18 59/86/18 60/82/18 +f 54/74/19 53/73/19 57/87/19 +f 64/88/14 63/89/14 61/90/14 +f 68/91/15 67/92/15 63/89/15 +f 66/93/16 65/94/16 67/92/16 +f 62/95/17 61/90/17 65/96/17 +f 62/97/10 69/98/10 70/99/10 +f 66/100/10 71/101/10 69/98/10 +f 64/102/10 70/99/10 72/103/10 +f 68/104/10 72/103/10 71/105/10 +f 69/98/20 71/101/20 76/106/20 +f 76/106/9 75/107/9 74/108/9 +f 70/99/21 74/109/21 75/110/21 +f 71/105/16 72/103/16 75/110/16 +f 69/98/14 73/111/14 74/109/14 +f 80/112/14 79/113/14 77/114/14 +f 84/115/15 83/116/15 79/113/15 +f 82/117/16 81/118/16 83/119/16 +f 78/120/17 77/114/17 81/118/17 +f 78/121/10 85/122/10 86/123/10 +f 78/124/10 82/125/10 87/126/10 +f 84/127/10 80/128/10 86/123/10 +f 84/129/10 88/130/10 87/126/10 +f 87/126/17 92/131/17 89/132/17 +f 89/133/9 92/131/9 91/134/9 +f 88/135/15 86/123/15 90/136/15 +f 88/130/22 91/134/22 92/131/22 +f 86/123/23 85/122/23 89/132/23 +f 96/137/14 95/138/14 93/139/14 +f 100/140/15 99/141/15 95/142/15 +f 98/143/16 97/144/16 99/141/16 +f 94/145/17 93/139/17 97/144/17 +f 96/146/10 94/147/10 101/148/10 +f 94/149/10 98/150/10 103/151/10 +f 96/152/10 102/153/10 104/154/10 +f 98/155/10 100/156/10 104/154/10 +f 103/151/24 108/157/24 105/158/24 +f 108/159/9 107/160/9 106/161/9 +f 102/153/25 106/161/25 107/160/25 +f 104/154/16 107/160/16 108/157/16 +f 102/162/14 101/148/14 105/158/14 +f 112/163/12 111/164/12 109/165/12 +f 116/166/26 115/167/26 111/164/26 +f 114/168/27 113/169/27 115/167/27 +f 114/168/28 110/170/28 109/171/28 +f 116/166/29 112/172/29 110/173/29 +f 8/12/1 7/1/1 6/3/1 +f 12/174/2 11/4/2 10/6/2 +f 4/16/3 3/7/3 2/9/3 +f 2/9/4 1/8/4 16/11/4 +f 10/6/5 9/5/5 8/12/5 +f 14/17/6 13/13/6 12/15/6 +f 6/3/7 5/2/7 4/16/7 +f 16/11/8 15/10/8 14/17/8 +f 17/36/8 18/18/8 19/20/8 +f 19/20/6 20/19/6 21/22/6 +f 21/47/2 22/23/2 23/25/2 +f 23/25/5 24/24/5 25/27/5 +f 25/27/1 26/26/1 27/29/1 +f 27/29/7 28/28/7 29/31/7 +f 22/34/9 20/175/9 30/32/9 +f 18/176/9 32/177/9 30/32/9 +f 30/32/9 28/178/9 26/179/9 +f 26/179/9 24/33/9 30/32/9 +f 20/175/9 18/176/9 30/32/9 +f 31/37/4 32/35/4 17/36/4 +f 29/31/3 30/30/3 31/37/3 +f 29/31/10 3/38/10 27/29/10 +f 1/180/10 3/40/10 31/37/10 +f 17/36/10 15/41/10 31/37/10 +f 13/181/10 15/43/10 19/20/10 +f 21/22/10 11/44/10 19/20/10 +f 9/182/10 11/46/10 23/25/10 +f 25/27/10 7/48/10 23/25/10 +f 5/183/10 7/50/10 27/29/10 +f 33/54/9 35/51/9 36/53/9 +f 35/51/11 33/54/11 38/56/11 +f 37/55/12 39/57/12 38/56/12 +f 39/57/13 41/59/13 40/58/13 +f 41/59/12 43/61/12 42/60/12 +f 46/184/14 48/63/14 45/65/14 +f 48/63/15 52/66/15 47/64/15 +f 52/66/16 50/68/16 51/67/16 +f 50/68/17 46/70/17 49/69/17 +f 48/185/10 46/72/10 54/74/10 +f 53/81/10 46/75/10 55/77/10 +f 52/186/10 48/78/10 56/79/10 +f 50/187/10 52/80/10 55/77/10 +f 57/188/17 53/81/17 60/82/17 +f 57/87/9 60/83/9 58/85/9 +f 56/79/15 54/74/15 59/86/15 +f 55/77/18 56/79/18 60/82/18 +f 58/85/19 54/74/19 57/87/19 +f 62/95/14 64/88/14 61/90/14 +f 64/88/15 68/91/15 63/89/15 +f 68/91/16 66/93/16 67/92/16 +f 66/189/17 62/95/17 65/96/17 +f 64/190/10 62/97/10 70/99/10 +f 62/191/10 66/100/10 69/98/10 +f 68/192/10 64/102/10 72/103/10 +f 66/193/10 68/104/10 71/105/10 +f 73/111/20 69/98/20 76/106/20 +f 73/111/9 76/106/9 74/108/9 +f 72/103/21 70/99/21 75/110/21 +f 76/194/16 71/105/16 75/110/16 +f 70/99/14 69/98/14 74/109/14 +f 78/120/14 80/112/14 77/114/14 +f 80/112/15 84/115/15 79/113/15 +f 84/195/16 82/117/16 83/119/16 +f 82/117/17 78/120/17 81/118/17 +f 80/196/10 78/121/10 86/123/10 +f 85/122/10 78/124/10 87/126/10 +f 88/135/10 84/127/10 86/123/10 +f 82/197/10 84/129/10 87/126/10 +f 85/122/17 87/126/17 89/132/17 +f 90/198/9 89/133/9 91/134/9 +f 91/199/15 88/135/15 90/136/15 +f 87/126/22 88/130/22 92/131/22 +f 90/136/23 86/123/23 89/132/23 +f 94/145/14 96/137/14 93/139/14 +f 96/200/15 100/140/15 95/142/15 +f 100/140/16 98/143/16 99/141/16 +f 98/143/17 94/145/17 97/144/17 +f 102/162/10 96/146/10 101/148/10 +f 101/148/10 94/149/10 103/151/10 +f 100/201/10 96/152/10 104/154/10 +f 103/151/10 98/155/10 104/154/10 +f 101/148/24 103/151/24 105/158/24 +f 105/202/9 108/159/9 106/161/9 +f 104/154/25 102/153/25 107/160/25 +f 103/151/16 104/154/16 108/157/16 +f 106/203/14 102/162/14 105/158/14 +f 110/204/12 112/163/12 109/165/12 +f 112/163/26 116/166/26 111/164/26 +f 116/166/27 114/168/27 115/167/27 +f 113/169/28 114/168/28 109/171/28 +f 114/168/29 116/166/29 110/173/29 diff --git a/assets/hbm/models/selenium_engine_rotor.obj b/assets/hbm/models/selenium_engine_rotor.obj index c46d7a29b..7a4de9dad 100644 --- a/assets/hbm/models/selenium_engine_rotor.obj +++ b/assets/hbm/models/selenium_engine_rotor.obj @@ -33,6 +33,74 @@ v -0.000000 -0.050000 -0.325000 v -0.035355 -0.035355 -0.325000 v -0.050000 -0.000000 -0.325000 v -0.035355 0.035355 -0.325000 +vt 0.598952 0.123521 +vt 0.598952 0.565266 +vt 0.493775 0.565266 +vt 0.373026 0.565267 +vt 0.373025 0.123521 +vt 0.252276 0.565267 +vt 0.131527 0.565267 +vt 0.131527 0.123521 +vt 0.252276 0.123521 +vt 0.413275 0.662438 +vt 0.292526 0.662438 +vt 0.026349 0.123521 +vt 0.171777 0.662438 +vt 0.212026 0.026350 +vt 0.453525 0.026349 +vt 0.493774 0.123521 +vt 0.332775 0.026349 +vt 0.620400 0.895852 +vt 0.648861 0.827142 +vt 0.689111 0.924313 +vt 0.973650 0.520682 +vt 0.973650 0.573271 +vt 0.933400 0.573271 +vt 0.691901 0.573271 +vt 0.651650 0.573271 +vt 0.651650 0.520682 +vt 0.732151 0.573272 +vt 0.691901 0.520682 +vt 0.861451 0.925589 +vt 0.832990 0.897128 +vt 0.861450 0.828418 +vt 0.933400 0.520683 +vt 0.893150 0.026349 +vt 0.933401 0.078939 +vt 0.691902 0.026349 +vt 0.732152 0.026349 +vt 0.732152 0.078938 +vt 0.651652 0.026349 +vt 0.691902 0.078938 +vt 0.933401 0.026349 +vt 0.973651 0.026349 +vt 0.973651 0.078939 +vt 0.852901 0.573271 +vt 0.852901 0.026349 +vt 0.812651 0.573272 +vt 0.812651 0.026349 +vt 0.772402 0.573272 +vt 0.772402 0.026349 +vt 0.732151 0.520682 +vt 0.453525 0.662438 +vt 0.332776 0.662438 +vt 0.026349 0.565267 +vt 0.212027 0.662438 +vt 0.171776 0.026350 +vt 0.413275 0.026349 +vt 0.292525 0.026349 +vt 0.717572 0.855602 +vt 0.717572 0.895852 +vt 0.648861 0.924313 +vt 0.620400 0.855602 +vt 0.689111 0.827142 +vt 0.901700 0.828418 +vt 0.901700 0.925589 +vt 0.930161 0.856879 +vt 0.930161 0.897128 +vt 0.832990 0.856879 +vt 0.893151 0.573271 +vt 0.651652 0.078938 vn 0.707100 -0.707100 0.000000 vn -0.923900 -0.382700 0.000000 vn -0.382700 0.923900 -0.000000 @@ -46,63 +114,63 @@ vn 0.923900 -0.382700 0.000000 vn 0.382700 -0.923900 0.000000 vn -0.382700 -0.923900 0.000000 s off -f 3//1 4//1 12//1 -f 12//2 14//2 13//2 -f 16//3 10//3 9//3 -f 14//4 16//4 15//4 -f 6//5 14//5 12//5 -f 8//5 16//5 14//5 -f 1//6 9//6 10//6 -f 2//5 10//5 16//5 -f 7//7 15//7 9//7 -f 3//7 11//7 13//7 -f 5//7 13//7 15//7 -f 20//5 22//5 18//5 -f 8//3 19//3 18//3 -f 20//4 19//4 8//4 -f 21//2 20//2 6//2 -f 29//7 30//7 32//7 -f 2//8 26//8 1//8 -f 31//2 30//2 3//2 -f 32//4 31//4 5//4 -f 25//3 32//3 7//3 -f 24//9 27//9 26//9 -f 23//10 28//10 27//10 -f 22//11 29//11 28//11 -f 29//12 22//12 4//12 -f 11//1 3//1 12//1 -f 11//2 12//2 13//2 -f 15//3 16//3 9//3 -f 13//4 14//4 15//4 -f 4//5 6//5 12//5 -f 6//5 8//5 14//5 -f 2//6 1//6 10//6 -f 8//5 2//5 16//5 -f 1//7 7//7 9//7 -f 5//7 3//7 13//7 -f 7//7 5//7 15//7 -f 24//5 17//5 18//5 -f 18//5 19//5 20//5 -f 20//5 21//5 22//5 -f 22//5 23//5 24//5 -f 24//5 18//5 22//5 -f 2//3 8//3 18//3 -f 6//4 20//4 8//4 -f 4//2 21//2 6//2 -f 32//7 25//7 28//7 -f 26//7 27//7 28//7 -f 28//7 29//7 32//7 -f 30//7 31//7 32//7 -f 25//7 26//7 28//7 -f 25//8 1//8 26//8 -f 2//8 18//8 17//8 -f 17//8 26//8 2//8 -f 5//2 31//2 3//2 -f 7//4 32//4 5//4 -f 1//3 25//3 7//3 -f 17//9 24//9 26//9 -f 24//10 23//10 27//10 -f 23//11 22//11 28//11 -f 4//12 3//12 29//12 -f 30//12 29//12 3//12 -f 22//12 21//12 4//12 +f 3/1/1 4/2/1 12/3/1 +f 12/3/2 14/4/2 13/5/2 +f 16/6/3 10/7/3 9/8/3 +f 14/4/4 16/6/4 15/9/4 +f 6/10/5 14/4/5 12/3/5 +f 8/11/5 16/6/5 14/4/5 +f 1/12/6 9/8/6 10/7/6 +f 2/13/5 10/7/5 16/6/5 +f 7/14/7 15/9/7 9/8/7 +f 3/15/7 11/16/7 13/5/7 +f 5/17/7 13/5/7 15/9/7 +f 20/18/5 22/19/5 18/20/5 +f 8/21/3 19/22/3 18/23/3 +f 20/24/4 19/25/4 8/26/4 +f 21/27/2 20/24/2 6/28/2 +f 29/29/7 30/30/7 32/31/7 +f 2/32/8 26/33/8 1/34/8 +f 31/35/2 30/36/2 3/37/2 +f 32/38/4 31/35/4 5/39/4 +f 25/40/3 32/41/3 7/42/3 +f 24/43/9 27/44/9 26/33/9 +f 23/45/10 28/46/10 27/44/10 +f 22/47/11 29/48/11 28/46/11 +f 29/48/12 22/47/12 4/49/12 +f 11/16/1 3/1/1 12/3/1 +f 11/16/2 12/3/2 13/5/2 +f 15/9/3 16/6/3 9/8/3 +f 13/5/4 14/4/4 15/9/4 +f 4/50/5 6/10/5 12/3/5 +f 6/51/5 8/11/5 14/4/5 +f 2/52/6 1/12/6 10/7/6 +f 8/53/5 2/13/5 16/6/5 +f 1/54/7 7/14/7 9/8/7 +f 5/55/7 3/15/7 13/5/7 +f 7/56/7 5/17/7 15/9/7 +f 24/57/5 17/58/5 18/20/5 +f 18/20/5 19/59/5 20/18/5 +f 20/18/5 21/60/5 22/19/5 +f 22/19/5 23/61/5 24/57/5 +f 24/57/5 18/20/5 22/19/5 +f 2/32/3 8/21/3 18/23/3 +f 6/28/4 20/24/4 8/26/4 +f 4/49/2 21/27/2 6/28/2 +f 32/31/7 25/62/7 28/63/7 +f 26/64/7 27/65/7 28/63/7 +f 28/63/7 29/29/7 32/31/7 +f 30/30/7 31/66/7 32/31/7 +f 25/62/7 26/64/7 28/63/7 +f 25/40/8 1/34/8 26/33/8 +f 2/32/8 18/23/8 17/67/8 +f 17/67/8 26/33/8 2/32/8 +f 5/39/2 31/35/2 3/37/2 +f 7/68/4 32/38/4 5/39/4 +f 1/34/3 25/40/3 7/42/3 +f 17/67/9 24/43/9 26/33/9 +f 24/43/10 23/45/10 27/44/10 +f 23/45/11 22/47/11 28/46/11 +f 4/49/12 3/37/12 29/48/12 +f 30/36/12 29/48/12 3/37/12 +f 22/47/12 21/27/12 4/49/12 diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index efb169130..ded7d5aad 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -160,7 +160,7 @@ public class BlockOre extends Block { } if(this == ModBlocks.ore_rare) { - return 2 + p_149745_1_.nextInt(4); + return 4 + p_149745_1_.nextInt(8); } if(this == ModBlocks.block_meteor_broken) { diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 4775000ad..feedcb29c 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -2232,6 +2232,15 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.plate_copper, 4)); list.add(new ItemStack(ModItems.wire_red_copper, 6)); break; + case SELENIUM_GENERATOR: + list.add(new ItemStack(ModItems.ingot_steel, 4)); + list.add(new ItemStack(ModItems.plate_titanium, 6)); + list.add(new ItemStack(ModItems.plate_copper, 8)); + list.add(new ItemStack(ModItems.hull_big_steel, 1)); + list.add(new ItemStack(ModItems.hull_small_steel, 9)); + list.add(new ItemStack(ModItems.pedestal_steel, 1)); + list.add(new ItemStack(ModItems.coil_copper, 4)); + break; case NUCLEAR_GENERATOR: list.add(new ItemStack(ModItems.ingot_steel, 6)); list.add(new ItemStack(ModItems.ingot_polymer, 4)); @@ -2614,6 +2623,22 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.wire_gold, 8)); list.add(new ItemStack(Items.dye, 4, 15)); break; + case SOLINIUM: + list.add(new ItemStack(ModItems.hull_small_steel, 2)); + list.add(new ItemStack(ModItems.fins_quad_titanium, 1)); + list.add(new ItemStack(ModItems.circuit_targeting_tier4, 3)); + list.add(new ItemStack(ModItems.wire_gold, 10)); + list.add(new ItemStack(ModItems.pipes_steel, 4)); + list.add(new ItemStack(Items.dye, 4, 8)); + break; + case N2: + list.add(new ItemStack(ModItems.hull_big_steel, 3)); + list.add(new ItemStack(ModItems.hull_small_steel, 2)); + list.add(new ItemStack(ModItems.wire_magnetized_tungsten, 12)); + list.add(new ItemStack(ModItems.pipes_steel, 6)); + list.add(new ItemStack(ModItems.circuit_targeting_tier4, 3)); + list.add(new ItemStack(Items.dye, 12, 0)); + break; case CUSTOM_NUKE: list.add(new ItemStack(ModItems.hull_small_steel, 2)); list.add(new ItemStack(ModItems.fins_small_steel, 1)); @@ -3427,6 +3452,9 @@ public class MachineRecipes { case DIESEL_GENERATOR: output = new ItemStack(ModBlocks.machine_diesel, 1); break; + case SELENIUM_GENERATOR: + output = new ItemStack(ModBlocks.machine_selenium, 1); + break; case NUCLEAR_GENERATOR: output = new ItemStack(ModBlocks.machine_generator, 1); break; @@ -3586,6 +3614,12 @@ public class MachineRecipes { case FLEIJA: output = new ItemStack(ModBlocks.nuke_fleija, 1); break; + case SOLINIUM: + output = new ItemStack(ModBlocks.nuke_solinium, 1); + break; + case N2: + output = new ItemStack(ModBlocks.nuke_n2, 1); + break; case CUSTOM_NUKE: output = new ItemStack(ModBlocks.nuke_custom, 1); break; @@ -3949,7 +3983,7 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.niter, 1)); break; case DESH: - list.add(new ItemStack(ModItems.powder_desh_mix, 2)); + list.add(new ItemStack(ModItems.powder_desh_mix, 1)); break; case CIRCUIT_4: list.add(new ItemStack(ModItems.circuit_red_copper, 1)); diff --git a/com/hbm/items/special/ItemCell.java b/com/hbm/items/special/ItemCell.java index 3ab82e363..ac2292b4d 100644 --- a/com/hbm/items/special/ItemCell.java +++ b/com/hbm/items/special/ItemCell.java @@ -26,16 +26,7 @@ public class ItemCell extends Item { { if (!world.isRemote) { - EntityNukeExplosionMK3 entity0 = new EntityNukeExplosionMK3(world); - entity0.posX = p_77648_4_; - entity0.posY = p_77648_5_; - entity0.posZ = p_77648_6_; - entity0.destructionRange = 35; - entity0.speed = 25; - entity0.coefficient = 10.0F; - - world.spawnEntityInWorld(entity0); - ExplosionParticleB.spawnMush(world, p_77648_4_, p_77648_5_ - 3, p_77648_6_); + ((BlockCrashedBomb)world.getBlock(p_77648_4_, p_77648_5_, p_77648_6_)).explode(world, p_77648_4_, p_77648_5_, p_77648_6_); } } else if(i < 90) { diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index e7d8557a1..92f2bd376 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -116,6 +116,7 @@ public class ItemAssemblyTemplate extends Item { BREEDING_REACTOR, RTG_FURNACE, DIESEL_GENERATOR, + SELENIUM_GENERATOR, NUCLEAR_GENERATOR, INDUSTRIAL_GENERATOR, CYCLOTRON, @@ -168,6 +169,8 @@ public class ItemAssemblyTemplate extends Item { TSAR_BOMB, PROTOTYPE, FLEIJA, + SOLINIUM, + N2, CUSTOM_NUKE, BOMB_LEV, BOMB_ENDO, @@ -502,6 +505,8 @@ public class ItemAssemblyTemplate extends Item { return 150; case DIESEL_GENERATOR: return 200; + case SELENIUM_GENERATOR: + return 250; case NUCLEAR_GENERATOR: return 300; case INDUSTRIAL_GENERATOR: @@ -601,11 +606,15 @@ public class ItemAssemblyTemplate extends Item { case IVY_MIKE: return 300; case TSAR_BOMB: - return 300; + return 600; case PROTOTYPE: return 500; case FLEIJA: return 400; + case SOLINIUM: + return 400; + case N2: + return 300; case CUSTOM_NUKE: return 300; case BOMB_LEV: diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 7e9384029..163c6e673 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -877,6 +877,8 @@ public class CraftingManager { //GameRegistry.addRecipe(new ItemStack(ModItems.fleija_propellant, 1), new Object[] { "PPP", "TST", "PPP", 'P', ModItems.plate_schrabidium, 'S', ModItems.ingot_schrabidium, 'T', Item.getItemFromBlock(Blocks.tnt) }); //GameRegistry.addRecipe(new ItemStack(ModItems.fleija_core, 1), new Object[] { "NUU", "BHW", "NUU", 'N', ModItems.nugget_neptunium, 'B', ModItems.nugget_beryllium, 'U', ModItems.nugget_u235, 'H', ModItems.coil_copper, 'W', ModItems.wire_red_copper }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.n2_charge, 1), new Object[] { " D ", "ERE", " D ", 'D', ModItems.ducttape, 'E', ModBlocks.det_charge, 'R', "blockRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_generic), new Object[] { " A ", "PRP", "PRP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'R', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" })); @@ -1131,6 +1133,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip_ammo, 1), new Object[] { "S", "G", "C", 'S', "plateSteel", 'G', Items.gunpowder, 'C', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_dineutronium, 4), new Object[] { "PIP", "IDI", "PIP", 'P', ModItems.powder_spark_mix, 'I', "ingotDineutronium", 'D', "ingotDesh" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_desh, 4), new Object[] { "PIP", "IDI", "PIP", 'P', ModItems.powder_polymer, 'I', "ingotDesh", 'D', "ingotDuraSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.piston_selenium, 1), new Object[] { "SSS", "STS", " D ", 'S', "plateSteel", 'T', "ingotTungsten", 'D', ModItems.bolt_dura_steel })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.taint), new Object[] { "nuggetEuphemium", ModItems.nuclear_waste })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.taint), new Object[] { "nuggetEuphemium", ModItems.trinitite })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.meteor_remote), new Object[] { "nuggetSchrabidium", ModItems.fragment_meteorite, ModItems.crate_caller })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 0aef077a2..a080e590d 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -382,6 +382,7 @@ public class MainRegistry public static Achievement achSacrifice; public static Achievement achImpossible; public static Achievement achTOB; + public static Achievement achFreytag; public static boolean enableDebugMode = true; public static boolean enableMycelium = false; @@ -898,11 +899,13 @@ public class MainRegistry achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", 0, 0, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat(); achImpossible = new Achievement("achievement.impossible", "impossible", 2, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat(); achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 0, 2, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat(); + achFreytag = new Achievement("achievement.freytag", "freytag", 0, -2, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat(); - AchievementPage.registerAchievementPage(new AchievementPage("NTM Achievements", new Achievement[]{ + AchievementPage.registerAchievementPage(new AchievementPage("Nuclear Tech", new Achievement[]{ achSacrifice, achImpossible, - achTOB + achTOB, + achFreytag })); OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium); @@ -1322,7 +1325,7 @@ public class MainRegistry Property propSolinium = config.get(Configuration.CATEGORY_GENERAL, "3.12_soliniumRadius", 75); propSolinium.comment = "Radius of the blue rinse"; soliniumRadius = propSolinium.getInt(); - Property propN2 = config.get(Configuration.CATEGORY_GENERAL, "3.13_n2Radius", 100); + Property propN2 = config.get(Configuration.CATEGORY_GENERAL, "3.13_n2Radius", 130); propN2.comment = "Radius of the N2 mine"; n2Radius = propN2.getInt(); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index d0fb8050b..98ea41cc2 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -2,12 +2,14 @@ package com.hbm.main; import com.hbm.entity.missile.EntityMissileBaseAdvanced; import com.hbm.entity.projectile.EntityMeteor; +import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.util.ChatComponentText; import net.minecraftforge.event.entity.EntityEvent.EnteringChunk; @@ -75,25 +77,19 @@ public class ModEventHandler if(e.smelting.getItem().equals(ModItems.ingot_titanium)) { e.player.addStat(MainRegistry.achievementGetTitanium, 1); } - } + }*/ @SubscribeEvent public void itemCrafted(PlayerEvent.ItemCraftedEvent e) { Item item = e.crafting.getItem(); - if(item.equals(Item.getItemFromBlock(ModBlocks.machine_difurnace_off))) { - e.player.addStat(MainRegistry.achievementCraftAlloyFurnace, 1); - } - if(item.equals(Item.getItemFromBlock(ModBlocks.machine_reactor))) { - e.player.addStat(MainRegistry.achievementCraftBreedingReactor, 1); - } - if(item.equals(Item.getItemFromBlock(ModBlocks.machine_centrifuge))) { - e.player.addStat(MainRegistry.achievementCraftCentrifuge, 1); + if(item == ModItems.gun_mp40) { + e.player.addStat(MainRegistry.achFreytag, 1); } } - @SubscribeEvent + /*@SubscribeEvent public void itemCollected(PlayerEvent.ItemPickupEvent e) { if(e.pickedUp.getEntityItem().equals(ModItems.nothing)) { //e.player.addStat(MainRegistry.achievementGetAmblygonite, 1);