tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Minor cleanup/fix

Browse source
This commit is contained in:
Aidan Brady 2013-06-01 23:20:15 -04:00
parent 81674b19aa
commit c9729e978a
1 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/minecraft/mekanism/common/Mekanism.java
View file

@ -980,21 +980,31 @@ public class Mekanism
RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), MekanismUtils.getStackWithSize(OreDictionary.getOres("oreSilver").get(0), 1)); RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), MekanismUtils.getStackWithSize(OreDictionary.getOres("oreSilver").get(0), 1));
} }
} catch(Exception e) {} } catch(Exception e) {}
/** Here we go through every Metallurgy metal set and add recipes to handle the new metals added /** Here we go through every Metallurgy metal set and add recipes to handle the new metals added
* There is no API way to iterate all the metal types, so we use hardcode :( */ * There is no API way to iterate all the metal types, so we use hardcode :(
if(hooks.MetallurgyCoreLoaded){ */
try{ if(hooks.MetallurgyCoreLoaded)
{
try {
String[] setNames = {"base", "precious", "nether", "fantasy", "ender", "utility"}; String[] setNames = {"base", "precious", "nether", "fantasy", "ender", "utility"};
for (String setName : setNames ){
for (IOreInfo oreInfo : MetallurgyAPI.getMetalSet(setName).getOreList().values()){ for(String setName : setNames )
switch (oreInfo.getType()) { {
for(IOreInfo oreInfo : MetallurgyAPI.getMetalSet(setName).getOreList().values())
{
switch(oreInfo.getType())
{
/** Alloy metal don't drop, they are only produced by combining other metals /** Alloy metal don't drop, they are only produced by combining other metals
* only adding crusher * only adding crusher
*/ */
case ALLOY: { case ALLOY:
if (oreInfo.getIngot() != null && oreInfo.getDust() != null){ {
RecipeHandler.addCrusherRecipe(MekanismUtils.getStackWithSize(oreInfo.getIngot() ,1), MekanismUtils.getStackWithSize(oreInfo.getDust(),1)); if(oreInfo.getIngot() != null && oreInfo.getDust() != null)
{
RecipeHandler.addCrusherRecipe(MekanismUtils.getStackWithSize(oreInfo.getIngot(), 1), MekanismUtils.getStackWithSize(oreInfo.getDust(), 1));
} }
break; break;
} }
@ -1002,38 +1012,49 @@ public class Mekanism
* bonus items given by enrichment chamber if silk touch or other way gives the player the ore block * bonus items given by enrichment chamber if silk touch or other way gives the player the ore block
* Maybe add combiner recipe, but seems pointless now * Maybe add combiner recipe, but seems pointless now
*/ */
case DROP: { case DROP:
{
ItemStack ore = oreInfo.getOre(); ItemStack ore = oreInfo.getOre();
ItemStack drop = oreInfo.getDrop(); ItemStack drop = oreInfo.getDrop();
if(drop != null && ore != null){
if(drop != null && ore != null)
{
RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.getStackWithSize(ore, 1), MekanismUtils.getStackWithSize(drop, 12)); RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.getStackWithSize(ore, 1), MekanismUtils.getStackWithSize(drop, 12));
//maybe combiner recipe too //maybe combiner recipe too
} }
break; break;
} }
/** For all other types we don't really care, just try the general stencil*/
default: { /**
* For all other types we don't really care, just try the general stencil
*/
default:
{
ItemStack ore = oreInfo.getOre(); ItemStack ore = oreInfo.getOre();
ItemStack dust = oreInfo.getDust(); ItemStack dust = oreInfo.getDust();
ItemStack ingot = oreInfo.getIngot(); ItemStack ingot = oreInfo.getIngot();
if (ore != null && dust != null){
RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.getStackWithSize(ore ,1), MekanismUtils.getStackWithSize(dust,2)); if(ore != null && dust != null)
{
RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.getStackWithSize(ore, 1), MekanismUtils.getStackWithSize(dust, 2));
RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(dust, 8), MekanismUtils.getStackWithSize(ore, 1));
} }
if (ingot != null && dust != null){
RecipeHandler.addCrusherRecipe(MekanismUtils.getStackWithSize(ingot ,1), MekanismUtils.getStackWithSize(dust,1)); if(ingot != null && dust != null)
{
RecipeHandler.addCrusherRecipe(MekanismUtils.getStackWithSize(ingot, 1), MekanismUtils.getStackWithSize(dust, 1));
} }
break; break;
} }
} }
} }
} }
} } catch(Exception e) {}
catch(Exception e) {}
} }
} }
/** /**
* Adds and registers all entities and tile entities. * Adds and registers all entities and tile entities.
*/ */