From 171f7de3c0d66061f85b88fe9058ac739560a20f Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 1 Sep 2017 12:40:00 +0200 Subject: [PATCH] Added temporary recipes, fixed NEI handlers, general improvements --- assets/hbm/models/pumpjack_base.obj | 1068 ++++++++--------- com/hbm/blocks/ModBlocks.java | 3 + com/hbm/blocks/generic/BlockOre.java | 15 + .../missile/EntityMissileBaseAdvanced.java | 14 +- com/hbm/handler/MultiblockHandler.java | 8 +- .../handler/nei/ChemplantRecipeHandler.java | 12 +- .../handler/nei/RefineryRecipeHandler.java | 27 +- com/hbm/inventory/MachineRecipes.java | 35 +- com/hbm/items/tool/ItemAssemblyTemplate.java | 8 +- com/hbm/items/tool/ItemTemplateFolder.java | 9 + com/hbm/lib/HbmWorldGen.java | 8 + com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/CraftingManager.java | 39 +- 13 files changed, 638 insertions(+), 610 deletions(-) diff --git a/assets/hbm/models/pumpjack_base.obj b/assets/hbm/models/pumpjack_base.obj index 25338e562..a700a7fdb 100644 --- a/assets/hbm/models/pumpjack_base.obj +++ b/assets/hbm/models/pumpjack_base.obj @@ -1,9 +1,6 @@ # Blender v2.76 (sub 0) OBJ File: 'pumpjack_base.blend' # www.blender.org o Plane -v -1.250000 0.000000 0.400000 -v 1.250000 0.000000 0.400000 -v -1.250000 0.343750 -3.156250 v 0.000000 0.000000 -0.100000 v 0.000000 0.500000 -0.100000 v 0.070711 0.000000 -0.070711 @@ -240,39 +237,6 @@ v 0.375000 -0.000000 0.375000 v 0.375000 0.050000 0.375000 v 0.375000 -0.000000 -0.375000 v 0.375000 0.050000 -0.375000 -v 1.250000 1.500000 0.400000 -v -1.250000 1.500000 0.400000 -v -1.250000 0.656250 -2.843750 -v -1.250000 0.343750 -2.843750 -v 1.250000 0.000000 -6.400000 -v 1.000000 0.000000 -6.400000 -v 1.000000 0.150000 -6.400000 -v 0.500000 1.500000 -6.400000 -v 0.375000 1.500000 -6.400000 -v 0.375000 0.150000 -6.400000 -v 1.250000 1.500000 -6.400000 -v 1.250000 0.150000 -6.400000 -v -1.250000 0.000000 -6.400000 -v -1.000000 0.000000 -6.400000 -v -1.000000 0.150000 -6.400000 -v -0.500000 1.500000 -6.400000 -v -0.375000 1.500000 -6.400000 -v -0.375000 0.150000 -6.400000 -v -1.250000 1.500000 -6.400000 -v -1.250000 0.150000 -6.400000 -v -1.250000 0.656250 -3.156250 -v -1.250000 0.343750 -1.843750 -v -1.250000 0.656250 -1.843750 -v -1.250000 0.343750 -2.156250 -v -1.250000 0.656250 -2.156250 -v 1.250000 0.343750 -1.843750 -v 1.250000 0.656250 -1.843750 -v 1.250000 0.343750 -2.156250 -v 1.250000 0.656250 -2.156250 -v 1.250000 0.343750 -2.843750 -v 1.250000 0.656250 -2.843750 -v 1.250000 0.343750 -3.156250 -v 1.250000 0.656250 -3.156250 vn 0.000000 -1.000000 0.000000 vn 0.382700 0.000000 -0.923900 vn 0.923900 0.000000 -0.382700 @@ -343,541 +307,497 @@ vn 0.000000 -0.382700 -0.923900 vn 0.000000 0.923900 -0.382700 vn -0.000000 0.923900 0.382700 s off -f 238//1 236//1 232//1 -f 5//2 7//2 6//2 -f 7//3 9//3 8//3 -f 9//4 11//4 10//4 -f 11//5 13//5 12//5 -f 13//6 15//6 14//6 -f 15//7 17//7 16//7 -f 17//8 13//8 5//8 -f 19//9 5//9 4//9 -f 17//10 19//10 18//10 -f 10//1 14//1 18//1 -f 23//11 22//11 20//11 -f 25//12 24//12 26//12 -f 21//13 20//13 24//13 -f 32//12 34//12 47//12 -f 35//14 34//14 30//14 -f 29//13 28//13 32//13 -f 59//1 50//1 48//1 -f 49//1 43//1 42//1 -f 57//1 55//1 54//1 -f 55//1 42//1 40//1 -f 45//8 47//8 46//8 -f 39//8 37//8 36//8 -f 48//1 42//1 55//1 -f 49//12 38//12 43//12 -f 59//14 37//14 50//14 -f 56//11 54//11 37//11 -f 40//13 38//13 53//13 -f 61//8 63//8 62//8 -f 65//8 67//8 66//8 -f 69//8 71//8 70//8 -f 88//15 45//15 47//15 -f 88//16 90//16 44//16 -f 93//15 92//15 61//15 -f 93//17 63//17 62//17 -f 89//18 47//18 46//18 -f 90//19 91//19 46//19 -f 92//20 95//20 60//20 -f 94//19 62//19 60//19 -f 100//21 70//21 68//21 -f 117//21 116//21 66//21 -f 117//16 64//16 65//16 -f 116//18 119//18 67//18 -f 118//22 65//22 67//22 -f 100//17 102//17 71//17 -f 101//20 68//20 69//20 -f 102//22 103//22 69//22 -f 67//8 65//8 44//8 -f 71//8 69//8 60//8 -f 30//11 28//11 68//11 -f 71//8 62//8 35//8 -f 44//8 65//8 29//8 -f 46//8 47//8 60//8 -f 86//19 74//19 75//19 -f 84//20 87//20 75//20 -f 85//17 73//17 74//17 -f 85//15 84//15 72//15 -f 82//19 83//19 79//19 -f 81//18 77//18 79//18 -f 80//16 82//16 78//16 -f 80//15 76//15 77//15 -f 41//15 80//15 81//15 -f 41//16 40//16 82//16 -f 43//18 81//18 83//18 -f 40//19 42//19 83//19 -f 51//15 49//15 84//15 -f 51//17 85//17 86//17 -f 49//20 48//20 87//20 -f 50//19 86//19 87//19 -f 78//19 79//19 91//19 -f 77//18 89//18 91//18 -f 76//16 78//16 90//16 -f 76//15 88//15 89//15 -f 74//19 94//19 95//19 -f 72//20 75//20 95//20 -f 73//17 93//17 94//17 -f 73//15 72//15 92//15 -f 106//22 107//22 99//22 -f 105//20 97//20 99//20 -f 104//17 106//17 98//17 -f 104//21 96//21 97//21 -f 98//22 99//22 103//22 -f 97//20 101//20 103//20 -f 96//17 98//17 102//17 -f 96//21 100//21 101//21 -f 58//21 104//21 105//21 -f 58//17 59//17 106//17 -f 56//20 105//20 107//20 -f 59//22 57//22 107//22 -f 114//22 110//22 111//22 -f 112//18 115//18 111//18 -f 113//16 109//16 110//16 -f 113//21 112//21 108//21 -f 52//21 54//21 112//21 -f 52//16 113//16 114//16 -f 54//18 55//18 115//18 -f 53//22 114//22 115//22 -f 110//22 118//22 119//22 -f 108//18 111//18 119//18 -f 109//16 117//16 118//16 -f 109//21 108//21 116//21 -f 60//23 61//23 89//23 -f 91//24 89//24 72//24 -f 81//25 72//25 75//25 -f 83//8 81//8 84//8 -f 107//8 105//8 112//8 -f 87//8 86//8 106//8 -f 115//8 114//8 82//8 -f 84//26 77//26 79//26 -f 95//27 92//27 77//27 -f 92//28 47//28 46//28 -f 86//29 87//29 99//29 -f 95//30 94//30 98//30 -f 94//31 95//31 69//31 -f 102//32 62//32 60//32 -f 74//33 75//33 103//33 -f 75//34 74//34 106//34 -f 99//25 97//25 112//25 -f 119//35 116//35 97//35 -f 116//23 68//23 69//23 -f 67//28 66//28 101//28 -f 108//36 111//36 103//36 -f 105//26 107//26 111//26 -f 118//32 119//32 46//32 -f 78//37 79//37 119//37 -f 79//38 78//38 114//38 -f 82//39 83//39 111//39 -f 91//40 90//40 110//40 -f 90//31 65//31 67//31 -f 144//41 142//41 145//41 -f 135//42 137//42 136//42 -f 137//43 139//43 138//43 -f 139//44 141//44 140//44 -f 147//45 135//45 134//45 -f 141//46 143//46 142//46 -f 126//11 134//11 142//11 -f 141//12 133//12 121//12 -f 155//47 145//47 121//47 -f 123//48 125//48 157//48 -f 159//49 157//49 125//49 -f 161//50 159//50 127//50 -f 163//51 161//51 129//51 -f 133//52 147//52 163//52 -f 153//53 147//53 146//53 -f 153//13 152//13 150//13 -f 149//14 148//14 144//14 -f 148//14 26//14 22//14 -f 120//47 144//47 154//47 -f 122//48 154//48 156//48 -f 124//49 156//49 158//49 -f 126//50 158//50 160//50 -f 128//51 160//51 162//51 -f 130//52 162//52 146//52 -f 154//11 144//11 148//11 -f 156//11 154//11 148//11 -f 158//11 156//11 148//11 -f 152//11 146//11 162//11 -f 152//11 162//11 150//11 -f 162//11 160//11 150//11 -f 160//11 158//11 150//11 -f 148//11 150//11 158//11 -f 149//12 145//12 155//12 -f 155//12 157//12 149//12 -f 159//12 149//12 157//12 -f 153//12 163//12 147//12 -f 153//12 151//12 163//12 -f 163//12 151//12 161//12 -f 161//12 151//12 159//12 -f 149//12 159//12 151//12 -f 32//8 28//8 21//8 -f 25//8 27//8 34//8 -f 21//8 28//8 30//8 -f 151//8 150//8 30//8 -f 23//8 30//8 150//8 -f 151//8 34//8 27//8 -f 165//54 167//54 166//54 -f 167//55 169//55 168//55 -f 169//56 171//56 170//56 -f 171//57 173//57 172//57 -f 173//58 175//58 174//58 -f 175//59 177//59 176//59 -f 175//13 173//13 169//13 -f 179//60 165//60 164//60 -f 177//61 179//61 178//61 -f 185//12 184//12 182//12 -f 197//13 199//13 198//13 -f 186//62 194//62 193//62 -f 183//63 184//63 192//63 -f 182//64 190//64 188//64 -f 187//65 195//65 194//65 -f 184//66 185//66 193//66 -f 182//67 183//67 191//67 -f 181//68 188//68 189//68 -f 180//69 189//69 195//69 -f 203//11 202//11 200//11 -f 207//14 206//14 202//14 -f 205//12 204//12 206//12 -f 201//13 200//13 204//13 -f 202//1 206//1 204//1 -f 207//8 203//8 201//8 -f 211//11 210//11 208//11 -f 215//14 214//14 210//14 -f 213//12 212//12 214//12 -f 209//13 208//13 212//13 -f 210//1 214//1 212//1 -f 215//8 211//8 209//8 -f 219//11 218//11 216//11 -f 223//14 222//14 218//14 -f 221//12 220//12 222//12 -f 217//13 216//13 220//13 -f 218//1 222//1 220//1 -f 223//8 219//8 217//8 -f 227//11 226//11 224//11 -f 231//14 230//14 226//14 -f 229//12 228//12 230//12 -f 225//13 224//13 228//13 -f 226//1 230//1 228//1 -f 231//8 227//8 225//8 -f 235//11 234//11 232//11 -f 239//14 238//14 234//14 -f 237//12 236//12 238//12 -f 233//13 232//13 236//13 -f 239//8 235//8 233//8 -f 2//13 240//13 241//13 -f 269//12 270//12 268//12 -f 2//12 265//12 266//12 -f 26//1 24//1 20//1 -f 246//14 249//14 247//14 -f 246//14 251//14 244//14 -f 253//14 252//14 259//14 -f 257//14 254//14 255//14 -f 259//11 252//11 3//11 -f 263//11 264//11 242//11 -f 262//11 261//11 1//11 -f 3//11 1//11 243//11 -f 264//11 241//11 242//11 -f 251//12 272//12 271//12 -f 270//12 240//12 268//12 -f 2//12 244//12 269//12 -f 234//1 238//1 232//1 -f 4//2 5//2 6//2 -f 6//3 7//3 8//3 -f 8//4 9//4 10//4 -f 10//5 11//5 12//5 -f 12//6 13//6 14//6 -f 14//7 15//7 16//7 -f 9//8 7//8 5//8 -f 5//8 19//8 17//8 -f 17//8 15//8 13//8 -f 13//8 11//8 9//8 -f 9//8 5//8 13//8 -f 18//9 19//9 4//9 -f 16//10 17//10 18//10 -f 18//1 4//1 10//1 -f 6//1 8//1 10//1 -f 10//1 12//1 14//1 -f 14//1 16//1 18//1 -f 4//1 6//1 10//1 -f 21//11 23//11 20//11 -f 27//12 25//12 26//12 -f 25//13 21//13 24//13 -f 63//12 61//12 34//12 -f 47//12 45//12 32//12 -f 33//12 32//12 45//12 -f 34//12 35//12 63//12 -f 61//12 47//12 34//12 -f 31//14 35//14 30//14 -f 33//13 29//13 32//13 -f 57//1 59//1 48//1 -f 48//1 49//1 42//1 -f 56//1 57//1 54//1 -f 53//1 55//1 40//1 -f 44//8 45//8 46//8 -f 38//8 39//8 36//8 -f 57//1 48//1 55//1 -f 41//12 43//12 38//12 -f 49//12 51//12 39//12 -f 39//12 38//12 49//12 -f 51//14 50//14 39//14 -f 59//14 58//14 37//14 -f 37//14 39//14 50//14 -f 36//11 37//11 54//11 -f 58//11 56//11 37//11 -f 54//11 52//11 36//11 -f 52//13 53//13 36//13 -f 40//13 41//13 38//13 -f 38//13 36//13 53//13 -f 60//8 61//8 62//8 -f 64//8 65//8 66//8 -f 68//8 69//8 70//8 -f 89//15 88//15 47//15 -f 45//16 88//16 44//16 -f 63//15 93//15 61//15 -f 94//17 93//17 62//17 -f 91//18 89//18 46//18 -f 44//19 90//19 46//19 -f 61//20 92//20 60//20 -f 95//19 94//19 60//19 -f 101//21 100//21 68//21 -f 64//21 117//21 66//21 -f 118//16 117//16 65//16 -f 66//18 116//18 67//18 -f 119//22 118//22 67//22 -f 70//17 100//17 71//17 -f 103//20 101//20 69//20 -f 71//22 102//22 69//22 -f 46//8 67//8 44//8 -f 62//8 71//8 60//8 -f 64//11 66//11 28//11 -f 68//11 70//11 30//11 -f 31//11 30//11 70//11 -f 28//11 29//11 64//11 -f 66//11 68//11 28//11 -f 35//8 31//8 71//8 -f 70//8 71//8 31//8 -f 62//8 63//8 35//8 -f 29//8 33//8 44//8 -f 45//8 44//8 33//8 -f 65//8 64//8 29//8 -f 60//8 69//8 67//8 -f 68//8 66//8 67//8 -f 67//8 46//8 60//8 -f 47//8 61//8 60//8 -f 69//8 68//8 67//8 -f 87//19 86//19 75//19 -f 72//20 84//20 75//20 -f 86//17 85//17 74//17 -f 73//15 85//15 72//15 -f 78//19 82//19 79//19 -f 83//18 81//18 79//18 -f 76//16 80//16 78//16 -f 81//15 80//15 77//15 -f 43//15 41//15 81//15 -f 80//16 41//16 82//16 -f 42//18 43//18 83//18 -f 82//19 40//19 83//19 -f 85//15 51//15 84//15 -f 50//17 51//17 86//17 -f 84//20 49//20 87//20 -f 48//19 50//19 87//19 -f 90//19 78//19 91//19 -f 79//18 77//18 91//18 -f 88//16 76//16 90//16 -f 77//15 76//15 89//15 -f 75//19 74//19 95//19 -f 92//20 72//20 95//20 -f 74//17 73//17 94//17 -f 93//15 73//15 92//15 -f 98//22 106//22 99//22 -f 107//20 105//20 99//20 -f 96//17 104//17 98//17 -f 105//21 104//21 97//21 -f 102//22 98//22 103//22 -f 99//20 97//20 103//20 -f 100//17 96//17 102//17 -f 97//21 96//21 101//21 -f 56//21 58//21 105//21 -f 104//17 58//17 106//17 -f 57//20 56//20 107//20 -f 106//22 59//22 107//22 -f 115//22 114//22 111//22 -f 108//18 112//18 111//18 -f 114//16 113//16 110//16 -f 109//21 113//21 108//21 -f 113//21 52//21 112//21 -f 53//16 52//16 114//16 -f 112//18 54//18 115//18 -f 55//22 53//22 115//22 -f 111//22 110//22 119//22 -f 116//18 108//18 119//18 -f 110//16 109//16 118//16 -f 117//21 109//21 116//21 -f 91//23 60//23 89//23 -f 75//24 91//24 72//24 -f 83//25 81//25 75//25 -f 87//8 83//8 84//8 -f 115//8 107//8 112//8 -f 107//8 87//8 106//8 -f 83//8 115//8 82//8 -f 87//26 84//26 79//26 -f 79//27 95//27 77//27 -f 95//28 92//28 46//28 -f 98//29 86//29 99//29 -f 99//30 95//30 98//30 -f 71//31 94//31 69//31 -f 103//32 102//32 60//32 -f 102//33 74//33 103//33 -f 107//34 75//34 106//34 -f 115//25 99//25 112//25 -f 99//35 119//35 97//35 -f 119//23 116//23 69//23 -f 103//28 67//28 101//28 -f 101//36 108//36 103//36 -f 108//26 105//26 111//26 -f 44//32 118//32 46//32 -f 118//37 78//37 119//37 -f 115//38 79//38 114//38 -f 110//39 82//39 111//39 -f 111//40 91//40 110//40 -f 91//31 90//31 67//31 -f 121//41 145//41 143//41 -f 144//41 120//41 142//41 -f 142//41 143//41 145//41 -f 134//42 135//42 136//42 -f 136//43 137//43 138//43 -f 138//44 139//44 140//44 -f 134//45 132//45 146//45 -f 147//45 133//45 135//45 -f 134//45 146//45 147//45 -f 140//46 141//46 142//46 -f 142//11 120//11 126//11 -f 122//11 124//11 126//11 -f 126//11 128//11 130//11 -f 130//11 132//11 126//11 -f 134//11 136//11 138//11 -f 138//11 140//11 142//11 -f 120//11 122//11 126//11 -f 126//11 132//11 134//11 -f 134//11 138//11 142//11 -f 125//12 123//12 121//12 -f 121//12 143//12 141//12 -f 141//12 139//12 133//12 -f 137//12 135//12 133//12 -f 133//12 131//12 129//12 -f 129//12 127//12 125//12 -f 125//12 121//12 133//12 -f 139//12 137//12 133//12 -f 133//12 129//12 125//12 -f 123//47 155//47 121//47 -f 155//48 123//48 157//48 -f 127//49 159//49 125//49 -f 129//50 161//50 127//50 -f 131//51 163//51 129//51 -f 131//52 133//52 163//52 -f 152//53 153//53 146//53 -f 151//13 153//13 150//13 -f 145//14 149//14 144//14 -f 22//14 23//14 148//14 -f 148//14 149//14 26//14 -f 27//14 26//14 149//14 -f 122//47 120//47 154//47 -f 124//48 122//48 156//48 -f 126//49 124//49 158//49 -f 128//50 126//50 160//50 -f 130//51 128//51 162//51 -f 132//52 130//52 146//52 -f 25//8 32//8 21//8 -f 32//8 25//8 34//8 -f 23//8 21//8 30//8 -f 34//8 151//8 30//8 -f 148//8 23//8 150//8 -f 149//8 151//8 27//8 -f 164//54 165//54 166//54 -f 166//55 167//55 168//55 -f 168//56 169//56 170//56 -f 170//57 171//57 172//57 -f 172//58 173//58 174//58 -f 174//59 175//59 176//59 -f 169//13 167//13 165//13 -f 165//13 179//13 169//13 -f 177//13 175//13 169//13 -f 173//13 171//13 169//13 -f 169//13 179//13 177//13 -f 178//60 179//60 164//60 -f 176//61 177//61 178//61 -f 182//12 181//12 180//12 -f 180//12 187//12 182//12 -f 186//12 185//12 182//12 -f 184//12 183//12 182//12 -f 182//12 187//12 186//12 -f 196//13 197//13 198//13 -f 185//62 186//62 193//62 -f 191//63 183//63 192//63 -f 181//64 182//64 188//64 -f 186//65 187//65 194//65 -f 192//66 184//66 193//66 -f 190//67 182//67 191//67 -f 180//68 181//68 189//68 -f 187//69 180//69 195//69 -f 201//11 203//11 200//11 -f 203//14 207//14 202//14 -f 207//12 205//12 206//12 -f 205//13 201//13 204//13 -f 200//1 202//1 204//1 -f 205//8 207//8 201//8 -f 209//11 211//11 208//11 -f 211//14 215//14 210//14 -f 215//12 213//12 214//12 -f 213//13 209//13 212//13 -f 208//1 210//1 212//1 -f 213//8 215//8 209//8 -f 217//11 219//11 216//11 -f 219//14 223//14 218//14 -f 223//12 221//12 222//12 -f 221//13 217//13 220//13 -f 216//1 218//1 220//1 -f 221//8 223//8 217//8 -f 225//11 227//11 224//11 -f 227//14 231//14 226//14 -f 231//12 229//12 230//12 -f 229//13 225//13 228//13 -f 224//1 226//1 228//1 -f 229//8 231//8 225//8 -f 233//11 235//11 232//11 -f 235//14 239//14 234//14 -f 239//12 237//12 238//12 -f 237//13 233//13 236//13 -f 237//8 239//8 233//8 -f 1//13 2//13 241//13 -f 267//12 269//12 268//12 -f 240//12 2//12 266//12 -f 22//1 26//1 20//1 -f 247//14 250//14 246//14 -f 251//14 246//14 250//14 -f 249//14 248//14 247//14 -f 245//14 246//14 244//14 -f 254//14 253//14 259//14 -f 258//14 255//14 254//14 -f 256//14 257//14 255//14 -f 254//14 259//14 258//14 -f 3//11 260//11 259//11 -f 258//11 259//11 260//11 -f 243//11 263//11 242//11 -f 241//11 262//11 1//11 -f 263//11 243//11 1//11 -f 3//11 252//11 1//11 -f 1//11 261//11 263//11 -f 260//11 242//11 241//11 -f 264//11 262//11 241//11 -f 241//11 258//11 260//11 -f 271//12 244//12 251//12 -f 251//12 250//12 272//12 -f 266//12 268//12 240//12 -f 270//12 272//12 250//12 -f 250//12 240//12 270//12 -f 269//12 267//12 2//12 -f 265//12 2//12 267//12 -f 244//12 271//12 269//12 +f 235//1 233//1 229//1 +f 2//2 4//2 3//2 +f 4//3 6//3 5//3 +f 6//4 8//4 7//4 +f 8//5 10//5 9//5 +f 10//6 12//6 11//6 +f 12//7 14//7 13//7 +f 14//8 10//8 2//8 +f 16//9 2//9 1//9 +f 14//10 16//10 15//10 +f 7//1 11//1 15//1 +f 20//11 19//11 17//11 +f 22//12 21//12 23//12 +f 18//13 17//13 21//13 +f 29//12 31//12 44//12 +f 32//14 31//14 27//14 +f 26//13 25//13 29//13 +f 56//1 47//1 45//1 +f 46//1 40//1 39//1 +f 54//1 52//1 51//1 +f 52//1 39//1 37//1 +f 42//8 44//8 43//8 +f 36//8 34//8 33//8 +f 45//1 39//1 52//1 +f 46//12 35//12 40//12 +f 56//14 34//14 47//14 +f 53//11 51//11 34//11 +f 37//13 35//13 50//13 +f 58//8 60//8 59//8 +f 62//8 64//8 63//8 +f 66//8 68//8 67//8 +f 85//15 42//15 44//15 +f 85//16 87//16 41//16 +f 90//15 89//15 58//15 +f 90//17 60//17 59//17 +f 86//18 44//18 43//18 +f 87//19 88//19 43//19 +f 89//20 92//20 57//20 +f 91//19 59//19 57//19 +f 97//21 67//21 65//21 +f 114//21 113//21 63//21 +f 114//16 61//16 62//16 +f 113//18 116//18 64//18 +f 115//22 62//22 64//22 +f 97//17 99//17 68//17 +f 98//20 65//20 66//20 +f 99//22 100//22 66//22 +f 64//8 62//8 41//8 +f 68//8 66//8 57//8 +f 27//11 25//11 65//11 +f 68//8 59//8 32//8 +f 41//8 62//8 26//8 +f 43//8 44//8 57//8 +f 83//19 71//19 72//19 +f 81//20 84//20 72//20 +f 82//17 70//17 71//17 +f 82//15 81//15 69//15 +f 79//19 80//19 76//19 +f 78//18 74//18 76//18 +f 77//16 79//16 75//16 +f 77//15 73//15 74//15 +f 38//15 77//15 78//15 +f 38//16 37//16 79//16 +f 40//18 78//18 80//18 +f 37//19 39//19 80//19 +f 48//15 46//15 81//15 +f 48//17 82//17 83//17 +f 46//20 45//20 84//20 +f 47//19 83//19 84//19 +f 75//19 76//19 88//19 +f 74//18 86//18 88//18 +f 73//16 75//16 87//16 +f 73//15 85//15 86//15 +f 71//19 91//19 92//19 +f 69//20 72//20 92//20 +f 70//17 90//17 91//17 +f 70//15 69//15 89//15 +f 103//22 104//22 96//22 +f 102//20 94//20 96//20 +f 101//17 103//17 95//17 +f 101//21 93//21 94//21 +f 95//22 96//22 100//22 +f 94//20 98//20 100//20 +f 93//17 95//17 99//17 +f 93//21 97//21 98//21 +f 55//21 101//21 102//21 +f 55//17 56//17 103//17 +f 53//20 102//20 104//20 +f 56//22 54//22 104//22 +f 111//22 107//22 108//22 +f 109//18 112//18 108//18 +f 110//16 106//16 107//16 +f 110//21 109//21 105//21 +f 49//21 51//21 109//21 +f 49//16 110//16 111//16 +f 51//18 52//18 112//18 +f 50//22 111//22 112//22 +f 107//22 115//22 116//22 +f 105//18 108//18 116//18 +f 106//16 114//16 115//16 +f 106//21 105//21 113//21 +f 57//23 58//23 86//23 +f 88//24 86//24 69//24 +f 78//25 69//25 72//25 +f 80//8 78//8 81//8 +f 104//8 102//8 109//8 +f 84//8 83//8 103//8 +f 112//8 111//8 79//8 +f 81//26 74//26 76//26 +f 92//27 89//27 74//27 +f 89//28 44//28 43//28 +f 83//29 84//29 96//29 +f 92//30 91//30 95//30 +f 91//31 92//31 66//31 +f 99//32 59//32 57//32 +f 71//33 72//33 100//33 +f 72//34 71//34 103//34 +f 96//25 94//25 109//25 +f 116//35 113//35 94//35 +f 113//23 65//23 66//23 +f 64//28 63//28 98//28 +f 105//36 108//36 100//36 +f 102//26 104//26 108//26 +f 115//32 116//32 43//32 +f 75//37 76//37 116//37 +f 76//38 75//38 111//38 +f 79//39 80//39 108//39 +f 88//40 87//40 107//40 +f 87//31 62//31 64//31 +f 141//41 139//41 142//41 +f 132//42 134//42 133//42 +f 134//43 136//43 135//43 +f 136//44 138//44 137//44 +f 144//45 132//45 131//45 +f 138//46 140//46 139//46 +f 123//11 131//11 139//11 +f 138//12 130//12 118//12 +f 152//47 142//47 118//47 +f 120//48 122//48 154//48 +f 156//49 154//49 122//49 +f 158//50 156//50 124//50 +f 160//51 158//51 126//51 +f 130//52 144//52 160//52 +f 150//53 144//53 143//53 +f 150//13 149//13 147//13 +f 146//14 145//14 141//14 +f 145//14 23//14 19//14 +f 117//47 141//47 151//47 +f 119//48 151//48 153//48 +f 121//49 153//49 155//49 +f 123//50 155//50 157//50 +f 125//51 157//51 159//51 +f 127//52 159//52 143//52 +f 151//11 141//11 145//11 +f 153//11 151//11 145//11 +f 155//11 153//11 145//11 +f 149//11 143//11 159//11 +f 149//11 159//11 147//11 +f 159//11 157//11 147//11 +f 157//11 155//11 147//11 +f 145//11 147//11 155//11 +f 146//12 142//12 152//12 +f 152//12 154//12 146//12 +f 156//12 146//12 154//12 +f 150//12 160//12 144//12 +f 150//12 148//12 160//12 +f 160//12 148//12 158//12 +f 158//12 148//12 156//12 +f 146//12 156//12 148//12 +f 29//8 25//8 18//8 +f 22//8 24//8 31//8 +f 18//8 25//8 27//8 +f 148//8 147//8 27//8 +f 20//8 27//8 147//8 +f 148//8 31//8 24//8 +f 162//54 164//54 163//54 +f 164//55 166//55 165//55 +f 166//56 168//56 167//56 +f 168//57 170//57 169//57 +f 170//58 172//58 171//58 +f 172//59 174//59 173//59 +f 172//13 170//13 166//13 +f 176//60 162//60 161//60 +f 174//61 176//61 175//61 +f 182//12 181//12 179//12 +f 194//13 196//13 195//13 +f 183//62 191//62 190//62 +f 180//63 181//63 189//63 +f 179//64 187//64 185//64 +f 184//65 192//65 191//65 +f 181//66 182//66 190//66 +f 179//67 180//67 188//67 +f 178//68 185//68 186//68 +f 177//69 186//69 192//69 +f 200//11 199//11 197//11 +f 204//14 203//14 199//14 +f 202//12 201//12 203//12 +f 198//13 197//13 201//13 +f 199//1 203//1 201//1 +f 204//8 200//8 198//8 +f 208//11 207//11 205//11 +f 212//14 211//14 207//14 +f 210//12 209//12 211//12 +f 206//13 205//13 209//13 +f 207//1 211//1 209//1 +f 212//8 208//8 206//8 +f 216//11 215//11 213//11 +f 220//14 219//14 215//14 +f 218//12 217//12 219//12 +f 214//13 213//13 217//13 +f 215//1 219//1 217//1 +f 220//8 216//8 214//8 +f 224//11 223//11 221//11 +f 228//14 227//14 223//14 +f 226//12 225//12 227//12 +f 222//13 221//13 225//13 +f 223//1 227//1 225//1 +f 228//8 224//8 222//8 +f 232//11 231//11 229//11 +f 236//14 235//14 231//14 +f 234//12 233//12 235//12 +f 230//13 229//13 233//13 +f 236//8 232//8 230//8 +f 23//1 21//1 17//1 +f 231//1 235//1 229//1 +f 1//2 2//2 3//2 +f 3//3 4//3 5//3 +f 5//4 6//4 7//4 +f 7//5 8//5 9//5 +f 9//6 10//6 11//6 +f 11//7 12//7 13//7 +f 6//8 4//8 2//8 +f 2//8 16//8 14//8 +f 14//8 12//8 10//8 +f 10//8 8//8 6//8 +f 6//8 2//8 10//8 +f 15//9 16//9 1//9 +f 13//10 14//10 15//10 +f 15//1 1//1 7//1 +f 3//1 5//1 7//1 +f 7//1 9//1 11//1 +f 11//1 13//1 15//1 +f 1//1 3//1 7//1 +f 18//11 20//11 17//11 +f 24//12 22//12 23//12 +f 22//13 18//13 21//13 +f 60//12 58//12 31//12 +f 44//12 42//12 29//12 +f 30//12 29//12 42//12 +f 31//12 32//12 60//12 +f 58//12 44//12 31//12 +f 28//14 32//14 27//14 +f 30//13 26//13 29//13 +f 54//1 56//1 45//1 +f 45//1 46//1 39//1 +f 53//1 54//1 51//1 +f 50//1 52//1 37//1 +f 41//8 42//8 43//8 +f 35//8 36//8 33//8 +f 54//1 45//1 52//1 +f 38//12 40//12 35//12 +f 46//12 48//12 36//12 +f 36//12 35//12 46//12 +f 48//14 47//14 36//14 +f 56//14 55//14 34//14 +f 34//14 36//14 47//14 +f 33//11 34//11 51//11 +f 55//11 53//11 34//11 +f 51//11 49//11 33//11 +f 49//13 50//13 33//13 +f 37//13 38//13 35//13 +f 35//13 33//13 50//13 +f 57//8 58//8 59//8 +f 61//8 62//8 63//8 +f 65//8 66//8 67//8 +f 86//15 85//15 44//15 +f 42//16 85//16 41//16 +f 60//15 90//15 58//15 +f 91//17 90//17 59//17 +f 88//18 86//18 43//18 +f 41//19 87//19 43//19 +f 58//20 89//20 57//20 +f 92//19 91//19 57//19 +f 98//21 97//21 65//21 +f 61//21 114//21 63//21 +f 115//16 114//16 62//16 +f 63//18 113//18 64//18 +f 116//22 115//22 64//22 +f 67//17 97//17 68//17 +f 100//20 98//20 66//20 +f 68//22 99//22 66//22 +f 43//8 64//8 41//8 +f 59//8 68//8 57//8 +f 61//11 63//11 25//11 +f 65//11 67//11 27//11 +f 28//11 27//11 67//11 +f 25//11 26//11 61//11 +f 63//11 65//11 25//11 +f 32//8 28//8 68//8 +f 67//8 68//8 28//8 +f 59//8 60//8 32//8 +f 26//8 30//8 41//8 +f 42//8 41//8 30//8 +f 62//8 61//8 26//8 +f 57//8 66//8 64//8 +f 65//8 63//8 64//8 +f 64//8 43//8 57//8 +f 44//8 58//8 57//8 +f 66//8 65//8 64//8 +f 84//19 83//19 72//19 +f 69//20 81//20 72//20 +f 83//17 82//17 71//17 +f 70//15 82//15 69//15 +f 75//19 79//19 76//19 +f 80//18 78//18 76//18 +f 73//16 77//16 75//16 +f 78//15 77//15 74//15 +f 40//15 38//15 78//15 +f 77//16 38//16 79//16 +f 39//18 40//18 80//18 +f 79//19 37//19 80//19 +f 82//15 48//15 81//15 +f 47//17 48//17 83//17 +f 81//20 46//20 84//20 +f 45//19 47//19 84//19 +f 87//19 75//19 88//19 +f 76//18 74//18 88//18 +f 85//16 73//16 87//16 +f 74//15 73//15 86//15 +f 72//19 71//19 92//19 +f 89//20 69//20 92//20 +f 71//17 70//17 91//17 +f 90//15 70//15 89//15 +f 95//22 103//22 96//22 +f 104//20 102//20 96//20 +f 93//17 101//17 95//17 +f 102//21 101//21 94//21 +f 99//22 95//22 100//22 +f 96//20 94//20 100//20 +f 97//17 93//17 99//17 +f 94//21 93//21 98//21 +f 53//21 55//21 102//21 +f 101//17 55//17 103//17 +f 54//20 53//20 104//20 +f 103//22 56//22 104//22 +f 112//22 111//22 108//22 +f 105//18 109//18 108//18 +f 111//16 110//16 107//16 +f 106//21 110//21 105//21 +f 110//21 49//21 109//21 +f 50//16 49//16 111//16 +f 109//18 51//18 112//18 +f 52//22 50//22 112//22 +f 108//22 107//22 116//22 +f 113//18 105//18 116//18 +f 107//16 106//16 115//16 +f 114//21 106//21 113//21 +f 88//23 57//23 86//23 +f 72//24 88//24 69//24 +f 80//25 78//25 72//25 +f 84//8 80//8 81//8 +f 112//8 104//8 109//8 +f 104//8 84//8 103//8 +f 80//8 112//8 79//8 +f 84//26 81//26 76//26 +f 76//27 92//27 74//27 +f 92//28 89//28 43//28 +f 95//29 83//29 96//29 +f 96//30 92//30 95//30 +f 68//31 91//31 66//31 +f 100//32 99//32 57//32 +f 99//33 71//33 100//33 +f 104//34 72//34 103//34 +f 112//25 96//25 109//25 +f 96//35 116//35 94//35 +f 116//23 113//23 66//23 +f 100//28 64//28 98//28 +f 98//36 105//36 100//36 +f 105//26 102//26 108//26 +f 41//32 115//32 43//32 +f 115//37 75//37 116//37 +f 112//38 76//38 111//38 +f 107//39 79//39 108//39 +f 108//40 88//40 107//40 +f 88//31 87//31 64//31 +f 118//41 142//41 140//41 +f 141//41 117//41 139//41 +f 139//41 140//41 142//41 +f 131//42 132//42 133//42 +f 133//43 134//43 135//43 +f 135//44 136//44 137//44 +f 131//45 129//45 143//45 +f 144//45 130//45 132//45 +f 131//45 143//45 144//45 +f 137//46 138//46 139//46 +f 139//11 117//11 123//11 +f 119//11 121//11 123//11 +f 123//11 125//11 127//11 +f 127//11 129//11 123//11 +f 131//11 133//11 135//11 +f 135//11 137//11 139//11 +f 117//11 119//11 123//11 +f 123//11 129//11 131//11 +f 131//11 135//11 139//11 +f 122//12 120//12 118//12 +f 118//12 140//12 138//12 +f 138//12 136//12 130//12 +f 134//12 132//12 130//12 +f 130//12 128//12 126//12 +f 126//12 124//12 122//12 +f 122//12 118//12 130//12 +f 136//12 134//12 130//12 +f 130//12 126//12 122//12 +f 120//47 152//47 118//47 +f 152//48 120//48 154//48 +f 124//49 156//49 122//49 +f 126//50 158//50 124//50 +f 128//51 160//51 126//51 +f 128//52 130//52 160//52 +f 149//53 150//53 143//53 +f 148//13 150//13 147//13 +f 142//14 146//14 141//14 +f 19//14 20//14 145//14 +f 145//14 146//14 23//14 +f 24//14 23//14 146//14 +f 119//47 117//47 151//47 +f 121//48 119//48 153//48 +f 123//49 121//49 155//49 +f 125//50 123//50 157//50 +f 127//51 125//51 159//51 +f 129//52 127//52 143//52 +f 22//8 29//8 18//8 +f 29//8 22//8 31//8 +f 20//8 18//8 27//8 +f 31//8 148//8 27//8 +f 145//8 20//8 147//8 +f 146//8 148//8 24//8 +f 161//54 162//54 163//54 +f 163//55 164//55 165//55 +f 165//56 166//56 167//56 +f 167//57 168//57 169//57 +f 169//58 170//58 171//58 +f 171//59 172//59 173//59 +f 166//13 164//13 162//13 +f 162//13 176//13 166//13 +f 174//13 172//13 166//13 +f 170//13 168//13 166//13 +f 166//13 176//13 174//13 +f 175//60 176//60 161//60 +f 173//61 174//61 175//61 +f 179//12 178//12 177//12 +f 177//12 184//12 179//12 +f 183//12 182//12 179//12 +f 181//12 180//12 179//12 +f 179//12 184//12 183//12 +f 193//13 194//13 195//13 +f 182//62 183//62 190//62 +f 188//63 180//63 189//63 +f 178//64 179//64 185//64 +f 183//65 184//65 191//65 +f 189//66 181//66 190//66 +f 187//67 179//67 188//67 +f 177//68 178//68 186//68 +f 184//69 177//69 192//69 +f 198//11 200//11 197//11 +f 200//14 204//14 199//14 +f 204//12 202//12 203//12 +f 202//13 198//13 201//13 +f 197//1 199//1 201//1 +f 202//8 204//8 198//8 +f 206//11 208//11 205//11 +f 208//14 212//14 207//14 +f 212//12 210//12 211//12 +f 210//13 206//13 209//13 +f 205//1 207//1 209//1 +f 210//8 212//8 206//8 +f 214//11 216//11 213//11 +f 216//14 220//14 215//14 +f 220//12 218//12 219//12 +f 218//13 214//13 217//13 +f 213//1 215//1 217//1 +f 218//8 220//8 214//8 +f 222//11 224//11 221//11 +f 224//14 228//14 223//14 +f 228//12 226//12 227//12 +f 226//13 222//13 225//13 +f 221//1 223//1 225//1 +f 226//8 228//8 222//8 +f 230//11 232//11 229//11 +f 232//14 236//14 231//14 +f 236//12 234//12 235//12 +f 234//13 230//13 233//13 +f 234//8 236//8 230//8 +f 19//1 23//1 17//1 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 7c08a342d..b70851e29 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -69,6 +69,7 @@ public class ModBlocks { public static Block ore_unobtainium; public static Block ore_daffergon; public static Block ore_verticium; + public static Block ore_rare; public static Block ore_oil; public static Block ore_oil_empty; @@ -468,6 +469,7 @@ public class ModBlocks { ore_unobtainium = new BlockGeneric(Material.rock).setBlockName("ore_unobtainium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_unobtainium"); ore_daffergon = new BlockGeneric(Material.rock).setBlockName("ore_daffergon").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_daffergon"); ore_verticium = new BlockGeneric(Material.rock).setBlockName("ore_verticium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_verticium"); + ore_rare = new BlockOre(Material.rock).setBlockName("ore_rare").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_rare"); ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil"); ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty"); @@ -789,6 +791,7 @@ public class ModBlocks { GameRegistry.registerBlock(ore_unobtainium, ItemOreBlock.class, ore_unobtainium.getUnlocalizedName()); GameRegistry.registerBlock(ore_daffergon, ItemOreBlock.class, ore_daffergon.getUnlocalizedName()); GameRegistry.registerBlock(ore_verticium, ItemOreBlock.class, ore_verticium.getUnlocalizedName()); + GameRegistry.registerBlock(ore_rare, ItemOreBlock.class, ore_rare.getUnlocalizedName()); //Nether Ores GameRegistry.registerBlock(ore_nether_uranium, ore_nether_uranium.getUnlocalizedName()); diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index 31a1a8654..437aa34a5 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -71,6 +71,17 @@ public class BlockOre extends Block { { return rand.nextInt(10) == 0 ? ModItems.plate_dalekanium : Item.getItemFromBlock(ModBlocks.block_meteor); } + if(this == ModBlocks.ore_rare) + { + switch(rand.nextInt(6)) { + case 0: return ModItems.fragment_actinium; + case 1: return ModItems.fragment_cerium; + case 2: return ModItems.fragment_cobalt; + case 3: return ModItems.fragment_lanthanium; + case 4: return ModItems.fragment_neodymium; + case 5: return ModItems.fragment_niobium; + } + } return Item.getItemFromBlock(this); } @@ -94,6 +105,10 @@ public class BlockOre extends Block { { return 2 + p_149745_1_.nextInt(3); } + if(this == ModBlocks.ore_rare) + { + return 2 + p_149745_1_.nextInt(4); + } return 1; } diff --git a/com/hbm/entity/missile/EntityMissileBaseAdvanced.java b/com/hbm/entity/missile/EntityMissileBaseAdvanced.java index 30a6eba2b..1c4e1c19a 100644 --- a/com/hbm/entity/missile/EntityMissileBaseAdvanced.java +++ b/com/hbm/entity/missile/EntityMissileBaseAdvanced.java @@ -78,7 +78,12 @@ public abstract class EntityMissileBaseAdvanced extends Entity { @Override protected void readEntityFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); + motionX = nbt.getDouble("moX"); + motionY = nbt.getDouble("moY"); + motionZ = nbt.getDouble("moZ"); + posX = nbt.getDouble("poX"); + posY = nbt.getDouble("poY"); + posZ = nbt.getDouble("poZ"); decelY = nbt.getDouble("decel"); accelXZ = nbt.getDouble("accel"); targetX = nbt.getInteger("tX"); @@ -89,7 +94,12 @@ public abstract class EntityMissileBaseAdvanced extends Entity { @Override protected void writeEntityToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); + nbt.setDouble("moX", motionX); + nbt.setDouble("moY", motionY); + nbt.setDouble("moZ", motionZ); + nbt.setDouble("poX", posX); + nbt.setDouble("poY", posY); + nbt.setDouble("poZ", posZ); nbt.setDouble("decel", decelY); nbt.setDouble("accel", accelXZ); nbt.setInteger("tX", targetX); diff --git a/com/hbm/handler/MultiblockHandler.java b/com/hbm/handler/MultiblockHandler.java index d97e392dc..afe6cac72 100644 --- a/com/hbm/handler/MultiblockHandler.java +++ b/com/hbm/handler/MultiblockHandler.java @@ -59,10 +59,10 @@ public class MultiblockHandler { public static final int[] fluidTankDimensionNS = new int[] { 1, 1, 2, 0, 2, 2 }; public static final int[] fluidTankDimensionEW = new int[] { 2, 2, 2, 0, 1, 1 }; public static final int[] refineryDimensions = new int[] { 1, 1, 9, 0, 1, 1 }; - public static final int[] pumpjackDimensionNorth = new int[] { 1, 1, 4, 0, 5, 0 }; - public static final int[] pumpjackDimensionEast = new int[] { 0, 5, 4, 0, 1, 1 }; - public static final int[] pumpjackDimensionSouth = new int[] { 1, 1, 4, 0, 0, 5 }; - public static final int[] pumpjackDimensionWest = new int[] { 5, 0, 4, 0, 1, 1 }; + public static final int[] pumpjackDimensionNorth = new int[] { 1, 1, 4, 0, 6, 0 }; + public static final int[] pumpjackDimensionEast = new int[] { 0, 6, 4, 0, 1, 1 }; + public static final int[] pumpjackDimensionSouth = new int[] { 1, 1, 4, 0, 0, 6 }; + public static final int[] pumpjackDimensionWest = new int[] { 6, 0, 4, 0, 1, 1 }; //Approved! public static boolean checkSpace(World world, int x, int y, int z, int[] i) { diff --git a/com/hbm/handler/nei/ChemplantRecipeHandler.java b/com/hbm/handler/nei/ChemplantRecipeHandler.java index bb6445673..692c1e8ae 100644 --- a/com/hbm/handler/nei/ChemplantRecipeHandler.java +++ b/com/hbm/handler/nei/ChemplantRecipeHandler.java @@ -130,8 +130,8 @@ public class ChemplantRecipeHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getChemistryRecipes(); for (Map.Entry recipe : recipes.entrySet()) { - if (NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[0]) || - NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[1]) || + if (compareFluidStacks(result, (ItemStack)recipe.getValue()[0]) || + compareFluidStacks(result, (ItemStack)recipe.getValue()[1]) || NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[2]) || NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[3]) || NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[4]) || @@ -166,8 +166,8 @@ public class ChemplantRecipeHandler extends TemplateRecipeHandler { public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getChemistryRecipes(); for (Map.Entry recipe : recipes.entrySet()) { - if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[0]) || - NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[1]) || + if (compareFluidStacks(ingredient, (ItemStack)recipe.getKey()[0]) || + compareFluidStacks(ingredient, (ItemStack)recipe.getKey()[1]) || NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[2]) || NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[3]) || NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[4]) || @@ -189,6 +189,10 @@ public class ChemplantRecipeHandler extends TemplateRecipeHandler { (ItemStack)recipe.getKey()[6])); } } + + private boolean compareFluidStacks(ItemStack sta1, ItemStack sta2) { + return sta1.getItem() == sta2.getItem() && sta1.getItemDamage() == sta2.getItemDamage(); + } @Override public Class getGuiClass() { diff --git a/com/hbm/handler/nei/RefineryRecipeHandler.java b/com/hbm/handler/nei/RefineryRecipeHandler.java index d62dcee49..6b8003bdc 100644 --- a/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -90,7 +90,10 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { if ((outputId.equals("refinery")) && getClass() == RefineryRecipeHandler.class) { Map recipes = MachineRecipes.instance().getRefineryRecipe(); for (Map.Entry recipe : recipes.entrySet()) { - this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], (ItemStack)recipe.getValue()[4])); + this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), + (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], + (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], + (ItemStack)recipe.getValue()[4])); } } else { super.loadCraftingRecipes(outputId, results); @@ -101,8 +104,15 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getRefineryRecipe(); for (Map.Entry recipe : recipes.entrySet()) { - if (NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[0], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[1], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[2], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[3], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[4], result)) - this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], (ItemStack)recipe.getValue()[4])); + if (compareFluidStacks((ItemStack)recipe.getValue()[0], result) || + compareFluidStacks((ItemStack)recipe.getValue()[1], result) || + compareFluidStacks((ItemStack)recipe.getValue()[2], result) || + compareFluidStacks((ItemStack)recipe.getValue()[3], result) || + compareFluidStacks((ItemStack)recipe.getValue()[4], result)) + this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), + (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], + (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], + (ItemStack)recipe.getValue()[4])); } } @@ -119,10 +129,17 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getRefineryRecipe(); for (Map.Entry recipe : recipes.entrySet()) { - if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey())) - this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], (ItemStack)recipe.getValue()[4])); + if (compareFluidStacks(ingredient, (ItemStack)recipe.getKey())) + this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), + (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], + (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], + (ItemStack)recipe.getValue()[4])); } } + + private boolean compareFluidStacks(ItemStack sta1, ItemStack sta2) { + return sta1.getItem() == sta2.getItem() && sta1.getItemDamage() == sta2.getItemDamage(); + } @Override public void drawExtras(int recipe) { diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 2cb86c7e2..c56b308c2 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; public class MachineRecipes { @@ -2463,7 +2464,7 @@ public class MachineRecipes { case REFINERY: output = new ItemStack(ModBlocks.machine_refinery, 1); break; - case CHEMPLANT: + /*case CHEMPLANT: output = new ItemStack(ModBlocks.machine_refinery, 1); break; case TANK: @@ -2612,7 +2613,7 @@ public class MachineRecipes { break; case MISSILE_BUSTER_2: output = new ItemStack(ModItems.missile_buster_strong, 1); - break; + break;*/ default: output = new ItemStack(Items.stick, 1); break; @@ -2692,12 +2693,32 @@ public class MachineRecipes { public Map getRefineryRecipe() { Map recipes = new HashMap(); + + ItemStack oil = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.OIL)); + oil.stackTagCompound = new NBTTagCompound(); + oil.stackTagCompound.setInteger("fill", 1000); - recipes.put(new ItemStack(ModItems.canister_oil, 1) , new ItemStack[] { - new ItemStack(ModItems.canister_heavyoil, 1), - new ItemStack(ModItems.canister_naphtha, 1), - new ItemStack(ModItems.canister_lightoil, 1), - new ItemStack(ModItems.gas_petroleum, 1), + ItemStack heavy = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.HEAVYOIL)); + heavy.stackTagCompound = new NBTTagCompound(); + heavy.stackTagCompound.setInteger("fill", 500); + + ItemStack naphtha = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.NAPHTHA)); + naphtha.stackTagCompound = new NBTTagCompound(); + naphtha.stackTagCompound.setInteger("fill", 250); + + ItemStack light = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.LIGHTOIL)); + light.stackTagCompound = new NBTTagCompound(); + light.stackTagCompound.setInteger("fill", 150); + + ItemStack petroleum = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.PETROLEUM)); + petroleum.stackTagCompound = new NBTTagCompound(); + petroleum.stackTagCompound.setInteger("fill", 100); + + recipes.put(oil , new ItemStack[] { + heavy, + naphtha, + light, + petroleum, new ItemStack(ModItems.sulfur, 1) }); return recipes; diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index 6eb9a9ec4..cbf00eead 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -31,12 +31,12 @@ public class ItemAssemblyTemplate extends Item { LIMITER, ANGRY_METAL, CMB_TILE, CMB_BRICKS, HATCH_FRAME, HATCH_CONTROLLER, CENTRIFUGE, BREEDING_REACTOR, RTG_FURNACE, DIESEL_GENERATOR, NUCLEAR_GENERATOR, INDUSTRIAL_GENERATOR, CYCLOTRON, RT_GENERATOR, BATTERY, HE_TO_RF, RF_TO_HE, SHREDDER, DERRICK, FLARE_STACK, - REFINERY, CHEMPLANT, TANK, MINER, SCHRABTRANS, CMB_FURNACE, FA_HULL, FA_HATCH, FA_CORE, FA_PORT, + REFINERY; /*, CHEMPLANT, TANK, MINER, SCHRABTRANS, CMB_FURNACE, FA_HULL, FA_HATCH, FA_CORE, FA_PORT, LR_ELEMENT, LR_HATCH, LR_PORT, LR_CORE, LF_MAGNET, LF_CENTER, LF_MOTOR, LF_HEATER, LF_HATCH, LF_CORE, LW_ELEMENT, LW_CONTROL, LW_COOLER, LW_STRUTURE, LW_HATCH, LW_PORT, LW_CORE, FW_MAGNET, FW_COMPUTER, FW_CORE, GADGET, LITTLE_BOY, FAT_MAN, IVY_MIKE, TSAR_BOMB, PROTOTYPE, FLEIJA, CUSTOM_NUKE, BOMB_LEV, BOMB_ENDO, BOMB_EXO, LAUNCH_PAD, HUNTER_CHOPPER, MISSILE_HE_1, MISSILE_FIRE_1, MISSILE_CLUSTER_1, - MISSILE_BUSTER_1, MISSILE_HE_2, MISSILE_FIRE_2, MISSILE_CLUSTER_2, MISSILE_BUSTER_2; + MISSILE_BUSTER_1, MISSILE_HE_2, MISSILE_FIRE_2, MISSILE_CLUSTER_2, MISSILE_BUSTER_2;*/ //private final int value; //private EnumAssemblyTemplate(int value) { @@ -311,7 +311,7 @@ public class ItemAssemblyTemplate extends Item { return 200; case REFINERY: return 350; - case CHEMPLANT: + /*case CHEMPLANT: return 200; case TANK: return 150; @@ -410,7 +410,7 @@ public class ItemAssemblyTemplate extends Item { case MISSILE_CLUSTER_2: return 250; case MISSILE_BUSTER_2: - return 250; + return 250;*/ default: return 100; } diff --git a/com/hbm/items/tool/ItemTemplateFolder.java b/com/hbm/items/tool/ItemTemplateFolder.java index edb86239f..69c21e9d1 100644 --- a/com/hbm/items/tool/ItemTemplateFolder.java +++ b/com/hbm/items/tool/ItemTemplateFolder.java @@ -1,5 +1,7 @@ package com.hbm.items.tool; +import java.util.List; + import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; @@ -20,5 +22,12 @@ public class ItemTemplateFolder extends Item { return stack; } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) + { + list.add("Machine Templates: Paper + Dye"); + list.add("Fluid IDs: Iron Plate + Dye"); + } } diff --git a/com/hbm/lib/HbmWorldGen.java b/com/hbm/lib/HbmWorldGen.java index 1b8a0f183..946acdb6a 100644 --- a/com/hbm/lib/HbmWorldGen.java +++ b/com/hbm/lib/HbmWorldGen.java @@ -180,6 +180,14 @@ public class HbmWorldGen implements IWorldGenerator { (new WorldGenMinable(ModBlocks.ore_verticium, 16)).generate(world, rand, randPosX, randPosY, randPosZ); } + for (int k = 0; k < MainRegistry.niterSpawn; k++) { + int randPosX = i + rand.nextInt(16); + int randPosY = rand.nextInt(25); + int randPosZ = j + rand.nextInt(16); + + (new WorldGenMinable(ModBlocks.ore_rare, 5)).generate(world, rand, randPosX, randPosY, randPosZ); + } + if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) { for (int k = 0; k < 1; k++) { int randPosX = i + rand.nextInt(16); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 445b590ed..697aec0bb 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.26 BETA (Selena-Luna-X01)"; + public static final String VERSION = "1.0.26 BETA (Astatine-Actinium-X02)"; //HBM's Beta Naming Convention: //V T (X-Y-Z) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 396f8d8f3..caf1a48dd 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -823,15 +823,15 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_steel, 'S', Items.stick }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_steel, 'S', Items.stick }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_steel, 'S', Items.stick }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_steel, 'S', Items.stick }); - GameRegistry.addRecipe(new ItemStack(ModItems.steel_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_steel, 'S', Items.stick }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_helmet, 1), new Object[] { "EEE", "E E", 'E', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_boots, 1), new Object[] { "E E", "E E", 'E', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_sword, 1), new Object[] { "I", "I", "S", 'I', "ingotSteel", 'S', Items.stick })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', "ingotSteel", 'S', Items.stick })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_axe, 1), new Object[] { "II", "IS", " S", 'I', "ingotSteel", 'S', Items.stick })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_shovel, 1), new Object[] { "I", "S", "S", 'I', "ingotSteel", 'S', Items.stick })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_hoe, 1), new Object[] { "II", " S", " S", 'I', "ingotSteel", 'S', Items.stick })); GameRegistry.addRecipe(new ItemStack(ModItems.titanium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.titanium_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.titanium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_titanium }); @@ -976,6 +976,27 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.crystal_charred, 1), new Object[] { ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_niobium, ModItems.powder_tennessine, ModItems.powder_cerium, ModBlocks.block_meteor, ModBlocks.block_aluminium, Items.water_bucket }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_virus, 1), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_sas3, 'T', "dustTungsten", 'H', ModItems.crystal_horn })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_pulsar, 32), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_uf6, 'T', "dustAluminum", 'H', ModItems.crystal_charred })); + + //TEMPORARY + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fluid_duct, 8), new Object[] { "SAS", " ", "SAS", 'S', "plateSteel", 'A', "plateAluminum" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_assembler, 1), new Object[] { "WWW", "MCM", "ISI", 'W', ModItems.coil_copper, 'M', ModItems.motor, 'C', ModItems.circuit_aluminium, 'I', "blockIron", 'S', "blockSteel" })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_chemplant, 1), new Object[] { "HTT", "HPP", "DCD", 'H', ModItems.hull_big_steel, 'T', ModItems.tank_steel, 'P', Blocks.piston, 'D', ModBlocks.fluid_duct, 'C', ModItems.circuit_red_copper }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_fluidtank, 1), new Object[] { "HHH", "HHH", "D D", 'H', ModItems.hull_big_steel, 'D', ModBlocks.fluid_duct }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_pumpjack, 1), new Object[] { "BBB", "PSM", "PST", 'B', "blockSteel", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', ModItems.tank_steel })); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_drill), 1), new Object[] { "MPM", "GPG", "GDG", 'P', ModItems.ingot_dura_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); + GameRegistry.addRecipe(new ItemStack(ModItems.template_folder, 1), new Object[] { "LPL", "BPB", "LPL", 'P', Items.paper, 'L', new ItemStack(Items.dye, 1, 4), 'B', new ItemStack(Items.dye, 1, 15) }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_light, 1), new Object[] { "PPR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_heavy, 1), new Object[] { "IIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_rocket, 1), new Object[] { "BBR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_flamer, 1), new Object[] { "NIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'N', ModItems.pipes_steel })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_tau, 1), new Object[] { "ADR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'A', ModItems.coil_advanced_alloy, 'D', ModItems.coil_advanced_torus })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_control, 1), new Object[] { "R12", "PPI", " I", 'R', Items.redstone, '1', ModItems.circuit_aluminium, '2', ModItems.circuit_red_copper, 'P', "plateSteel", 'I', "ingotSteel" })); + GameRegistry.addRecipe(new ItemStack(ModItems.pellet_antimatter, 1), new Object[] { "###", "###", "###", '#', ModItems.cell_antimatter }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_tank_empty, 8), new Object[] { "121", "1 1", "121", '1', "plateAluminum", '2', "plateIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_barrel_empty, 2), new Object[] { "121", "1 1", "121", '1', "plateSteel", '2', "plateAluminum" })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { ModItems.powder_actinium_tiny, ModItems.powder_actinium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_cerium_tiny, ModItems.powder_cobalt_tiny, ModItems.powder_lithium_tiny, ModItems.powder_neodymium_tiny, ModItems.powder_niobium_tiny }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_actinium, ModItems.powder_actinium, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium }); + } public static void AddSmeltingRec()