diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index deefc4345..120bf897f 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -464,32 +464,30 @@ public class ModBlocks { OreDictionary.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre2.getOreByName(ore)); } - OreDictionary.registerOre("blockSilver", new ItemStack(storage, 1, 0)); - OreDictionary.registerOre("blockAluminum", new ItemStack(storage, 1, 1)); - OreDictionary.registerOre("blockTitanium", new ItemStack(storage, 1, 2)); - OreDictionary.registerOre("blockChrome", new ItemStack(storage, 1, 3)); - OreDictionary.registerOre("blockSteel", new ItemStack(storage, 1, 4)); - OreDictionary.registerOre("blockBrass", new ItemStack(storage, 1, 5)); - OreDictionary.registerOre("blockLead", new ItemStack(storage, 1, 6)); - OreDictionary.registerOre("blockElectrum", new ItemStack(storage, 1, 7)); - OreDictionary.registerOre("blockZinc", new ItemStack(storage, 1, 8)); - OreDictionary.registerOre("blockPlatinum", new ItemStack(storage, 1, 9)); - OreDictionary.registerOre("blockTungsten", new ItemStack(storage, 1, 10)); - OreDictionary.registerOre("blockNickel", new ItemStack(storage, 1, 11)); - OreDictionary.registerOre("blockInvar", new ItemStack(storage, 1, 12)); - //OreDictionary.registerOre("blockOsmium", new ItemStack(storage, 1, 13)); No osmium, stolen by Mekanism - OreDictionary.registerOre("blockIridium", new ItemStack(storage, 1, 13)); + OreDictionary.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); + OreDictionary.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); + OreDictionary.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); + OreDictionary.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); + OreDictionary.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); + OreDictionary.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); + OreDictionary.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); + OreDictionary.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); + OreDictionary.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); + OreDictionary.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); + OreDictionary.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); + OreDictionary.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); + OreDictionary.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); + OreDictionary.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); + OreDictionary.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); OreDictionary.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); OreDictionary.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); - OreDictionary.registerOre("blockTungstensteel", new ItemStack(storage2, 1, 0)); - OreDictionary.registerOre("blockLodestone", new ItemStack(storage2, 1, 1)); - OreDictionary.registerOre("blockTellurium", new ItemStack(storage2, 1, 2)); - OreDictionary.registerOre("blockRuby", new ItemStack(storage2, 1, 5)); - OreDictionary.registerOre("blockSapphire", new ItemStack(storage2, 1, 6)); - OreDictionary.registerOre("blockPeridot", new ItemStack(storage2, 1, 7)); - OreDictionary.registerOre("blockYellowGarnet", new ItemStack(storage2, 1, 8)); - OreDictionary.registerOre("blockRedGarnet", new ItemStack(storage2, 1, 9)); + OreDictionary.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); + OreDictionary.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); + OreDictionary.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); + OreDictionary.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); + OreDictionary.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); + OreDictionary.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); OreDictionary.registerOre("craftingPiston", Blocks.PISTON); OreDictionary.registerOre("craftingPiston", Blocks.STICKY_PISTON); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 51e7f9aaa..93df33e69 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -11,7 +11,6 @@ import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.UniversalBucket; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.oredict.OreDictionary; @@ -365,15 +364,14 @@ public class ModRecipes { RecipeHandler.addRecipe( 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))){ + for (String ore : OreUtil.oreNames) { + if (OreUtil.doesOreExistAndValid("plate" + OreUtil.capitalizeFirstLetter(ore)) && OreUtil.doesOreExistAndValid("ingot" + OreUtil.capitalizeFirstLetter(ore))) { RecipeHandler.addRecipe( 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)){ + if (OreUtil.hasPlate(ore) && OreUtil.hasBlock(ore)) { RecipeHandler.addRecipe( new CompressorRecipe(OreUtil.getStackFromName("block" + OreUtil.capitalizeFirstLetter(ore), 1), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300, 4)); @@ -3146,12 +3144,12 @@ public class ModRecipes { ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30)); //Disable recipe for now -// if (OreUtil.doesOreExistAndValid("dustSalt")) { -// ItemStack salt = OreDictionary.getOres("dustSalt").get(0); -// salt.setCount(2); -// RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt, ItemCells.getCellByName("empty", 2), -// ItemCells.getCellByName("sodium"), ItemCells.getCellByName("chlorine"), null, null, 40, 60)); -// } + // if (OreUtil.doesOreExistAndValid("dustSalt")) { + // ItemStack salt = OreDictionary.getOres("dustSalt").get(0); + // salt.setCount(2); + // RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt, ItemCells.getCellByName("empty", 2), + // ItemCells.getCellByName("sodium"), ItemCells.getCellByName("chlorine"), null, null, 40, 60)); + // } Item drill = OreDictionary.getOres("drillBasic").get(0).getItem(); ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE); @@ -3237,7 +3235,7 @@ public class ModRecipes { GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.fluidLithium, 60); GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.THERMAL, FluidRegistry.LAVA, 60); - + GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.GAS, ModFluids.fluidHydrogen, 15); GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.GAS, ModFluids.fluidMethane, 45); }