Merge 1.10, bump version for #releaseBuild

This commit is contained in:
modmuss50 2016-12-13 11:51:33 +00:00
commit a3b4e9de6e
2 changed files with 38 additions and 27 deletions

View file

@ -68,6 +68,8 @@ public class ModRecipes {
public static ItemStack diamondJackhammerStack = new ItemStack(diamondJackhammer, 1, OreDictionary.WILDCARD_VALUE);
public static void init() {
//Gonna rescan to make sure we have an uptodate list
OreUtil.scanForOres();
//Done again incase we loaded before QuantumStorage
CompatManager.isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage");
addShapelessRecipes();
@ -360,26 +362,20 @@ public class ModRecipes {
new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400,
2));
for(String ore : OreUtil.oreNames){
if(OreUtil.doesOreExistAndValid("plate" + OreUtil.capitalizeFirstLetter(ore)) && OreUtil.doesOreExistAndValid("ingot" + OreUtil.capitalizeFirstLetter(ore))){
RecipeHandler.addRecipe(
new CompressorRecipe(new ItemStack(Items.IRON_INGOT), ItemPlates.getPlateByName("iron"), 400, 2));
new CompressorRecipe(OreUtil.getStackFromName("ingot" + OreUtil.capitalizeFirstLetter(ore), 9), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300,
4));
}
if(OreUtil.hasPlate(ore) && OreUtil.hasBlock(ore)){
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("copper"), ItemPlates.getPlateByName("copper"), 400,
2));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("tin"), ItemPlates.getPlateByName("tin"), 400, 2));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("aluminum"), ItemPlates.getPlateByName("aluminum"), 400,
2));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("brass"), ItemPlates.getPlateByName("brass"), 400, 2));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("bronze"), ItemPlates.getPlateByName("bronze"), 400,
2));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("lead"), ItemPlates.getPlateByName("lead"), 400, 2));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemIngots.getIngotByName("silver"), ItemPlates.getPlateByName("silver"), 400,
2));
new CompressorRecipe(OreUtil.getStackFromName("block" + OreUtil.capitalizeFirstLetter(ore), 1), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300,
4));
}
}
}
static void addExtractorRecipes() {
@ -940,6 +936,21 @@ public class ModRecipes {
.addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DSD", "DDD",
'D', ItemParts.getPartByName("dataStorageCircuit"), 'S', ItemParts.getPartByName("dataStorageCircuit"));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.electricTreetap), "TB", " ",
'T', new ItemStack(ModItems.treeTap), 'B', new ItemStack(ModItems.reBattery));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.nanosaber), "DC ", "DC ", "GLG",
'L', new ItemStack(ModItems.lapotronCrystal), 'C', ItemPlates.getPlateByName("carbon"), 'D', "plateDiamond",
'G', ItemDustsSmall.getSmallDustByName("glowstone"));
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("diamondGrindingHead", 2), "TST", "SBS", "TST", 'T',
"plateDiamond", 'S', "plateSteel", 'B', "blockDiamond");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("coolantSimple", 2), " T ", "TWT", " T ", 'T',
"ingotTin", 'W', new ItemStack(Items.WATER_BUCKET));
Core.logHelper.info("Shapped Recipes Added");
}
@ -1185,13 +1196,6 @@ public class ModRecipes {
ItemStack arditeStack = OreDictionary.getOres("ingotArdite").get(0);
arditeStack.setCount(1);
RecipeHandler.addRecipe(new AlloySmelterRecipe(cobaltStack, arditeStack, manyullynStack, 200, 16));
RecipeHandler.addRecipe(
new AlloySmelterRecipe(cobaltStack, ItemDusts.getDustByName("ardite", 1), manyullynStack, 200, 16));
RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemDusts.getDustByName("cobalt", 1), arditeStack, manyullynStack, 200, 16));
RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemDusts.getDustByName("cobalt", 1), ItemDusts.getDustByName("ardite", 1),
manyullynStack, 200, 16));
}
// Conductive Iron

View file

@ -120,6 +120,13 @@ public class OreDict {
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type));
}
for (String type : ItemDustsSmall.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
String oreDictName = "dustSmall" + OreDictUtils.toFirstUpper(type);
OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type));
}
for (String type : ItemNuggets.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!