From 11d4345ee701ad2f8c781e22f03509c54abd70b7 Mon Sep 17 00:00:00 2001 From: joflashstudios Date: Thu, 25 Jun 2015 20:04:08 -0400 Subject: [PATCH] Renamed to ItemDustTiny for consistancy Renamed to ItemDustsTiny --- .../techreborn/compat/recipes/RecipesIC2.java | 110 +++++------ src/main/java/techreborn/init/ModItems.java | 186 +++++++++--------- src/main/java/techreborn/init/ModRecipes.java | 16 +- .../{ItemDustTiny.java => ItemDustsTiny.java} | 4 +- 4 files changed, 158 insertions(+), 158 deletions(-) rename src/main/java/techreborn/items/{ItemDustTiny.java => ItemDustsTiny.java} (97%) diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index b45400f1c..82c590dba 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -24,7 +24,7 @@ import techreborn.init.ModFluids; import techreborn.init.ModItems; import techreborn.items.ItemCells; import techreborn.items.ItemCrushedOre; -import techreborn.items.ItemDustTiny; +import techreborn.items.ItemDustsTiny; import techreborn.items.ItemDusts; import techreborn.items.ItemDustsSmall; import techreborn.items.ItemGems; @@ -668,26 +668,26 @@ public class RecipesIC2 implements ICompatModule { //Ore Washing Plant NBTTagCompound liquidAmount = new NBTTagCompound(); liquidAmount.setInteger("amount", 1000); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustTiny.getTinyDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustTiny.getTinyDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustTiny.getTinyDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustTiny.getTinyDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustTiny.getTinyDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustTiny.getTinyDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustTiny.getTinyDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustTiny.getTinyDustByName("Indium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustTiny.getTinyDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustTiny.getTinyDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustTiny.getTinyDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustTiny.getTinyDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustTiny.getTinyDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustTiny.getTinyDustByName("Galena", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum", 1), ItemDustsTiny.getTinyDustByName("Aluminum", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Ardite", 1), ItemDustsTiny.getTinyDustByName("Ardite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Bauxite", 1), ItemDustsTiny.getTinyDustByName("Bauxite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cadmium", 1), ItemDustsTiny.getTinyDustByName("Cadmium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cinnabar", 1), ItemDustsTiny.getTinyDustByName("Cinnabar", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Cobalt", 1), ItemDustsTiny.getTinyDustByName("Cobalt", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("DarkIron", 1), ItemDustsTiny.getTinyDustByName("DarkIron", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Indium", 1), ItemDustsTiny.getTinyDustByName("Indium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Nickel", 1), ItemDustsTiny.getTinyDustByName("Nickel", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Osmium", 1), ItemDustsTiny.getTinyDustByName("Osmium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Pyrite", 1), ItemDustsTiny.getTinyDustByName("Pyrite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Sphalerite", 1), ItemDustsTiny.getTinyDustByName("Sphalerite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tetrahedrite", 1), ItemDustsTiny.getTinyDustByName("Tetrahedrite", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Galena", 1), ItemDustsTiny.getTinyDustByName("Galena", 2), IC2Items.getItem("stoneDust")); if(!Loader.isModLoaded("aobd")) { - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustTiny.getTinyDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustTiny.getTinyDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); - Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustTiny.getTinyDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Platinum", 1), ItemDustsTiny.getTinyDustByName("Platinum", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Iridium", 1), ItemDustsTiny.getTinyDustByName("Iridium", 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Tungsten", 1), ItemDustsTiny.getTinyDustByName("Tungsten", 2), IC2Items.getItem("stoneDust")); } } @@ -730,45 +730,45 @@ public class RecipesIC2 implements ICompatModule { NBTTagCompound galenaHeat = new NBTTagCompound(); galenaHeat.setInteger("minHeat", 2500); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedAluminum"), aluminumHeat, ItemDustsTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedArdite"), arditeHeat, ItemDustsTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedBauxite"), bauxiteHeat, ItemDustsTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCadmium"), cadmiumHeat, ItemDustsTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCinnabar"), cinnabarHeat, ItemDustsTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedCobalt"), cobaltHeat, ItemDustsTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedDarkIron"), darkIronHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIndium"), indiumHeat, ItemDustsTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedNickel"), nickelHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedOsmium"), osmiumHeat, ItemDustsTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPyrite"), pyriteHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedSphalerite"), sphaleriteHeat, ItemDustsTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), tetrahedriteHeat, ItemDustsTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedGalena"), galenaHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedAluminum"), aluminumHeat, ItemDustsTiny.getTinyDustByName("Bauxite", 1), ItemDusts.getDustByName("aluminum", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedArdite"), arditeHeat, ItemDustsTiny.getTinyDustByName("Ardite", 1), ItemDusts.getDustByName("ardite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedBauxite"), bauxiteHeat, ItemDustsTiny.getTinyDustByName("Aluminum", 1), ItemDusts.getDustByName("bauxite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCadmium"), cadmiumHeat, ItemDustsTiny.getTinyDustByName("Cadmium", 1), ItemDusts.getDustByName("cadmium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCinnabar"), cinnabarHeat, ItemDustsTiny.getTinyDustByName("Redstone", 1), ItemDusts.getDustByName("cinnabar", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedCobalt"), cobaltHeat, ItemDustsTiny.getTinyDustByName("Cobalt", 1), ItemDusts.getDustByName("cobalt", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedDarkIron"), darkIronHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("darkIron", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIndium"), indiumHeat, ItemDustsTiny.getTinyDustByName("Indium", 1), ItemDusts.getDustByName("indium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedNickel"), nickelHeat, ItemDustsTiny.getTinyDustByName("Iron", 1), ItemDusts.getDustByName("nickel", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedOsmium"), osmiumHeat, ItemDustsTiny.getTinyDustByName("Osmium", 1), ItemDusts.getDustByName("osmium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPyrite"), pyriteHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("pyrite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedSphalerite"), sphaleriteHeat, ItemDustsTiny.getTinyDustByName("Zinc", 1), ItemDusts.getDustByName("sphalerite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTetrahedrite"), tetrahedriteHeat, ItemDustsTiny.getTinyDustByName("Antimony", 1), ItemDusts.getDustByName("tetrahedrite", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedGalena"), galenaHeat, ItemDustsTiny.getTinyDustByName("Sulfur", 1), ItemDusts.getDustByName("galena", 1)); if(!Loader.isModLoaded("aobd")) { - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedIridium"), iridiumHeat, ItemDustsTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPlatinum"), platinumHeat, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1), IC2Items.getItem("stoneDust")); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedTungsten"), tungstenHeat, ItemDustsTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1), IC2Items.getItem("stoneDust")); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); - Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedIridium"), iridiumHeat, ItemDustsTiny.getTinyDustByName("Platinum", 1), ItemDusts.getDustByName("iridium", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedPlatinum"), platinumHeat, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDusts.getDustByName("platinum", 1)); + Recipes.centrifuge.addRecipe(new RecipeInputOreDict("crushedPurifiedTungsten"), tungstenHeat, ItemDustsTiny.getTinyDustByName("Manganese", 1), ItemDusts.getDustByName("tungsten", 1)); } } @@ -920,7 +920,7 @@ public class RecipesIC2 implements ICompatModule { RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Items.magma_cream, 1), null, new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1), null, null, 2500, 5)); //Dust Byproducts - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("platinum", 1), null, ItemDustTiny.getTinyDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, null, 3000, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("platinum", 1), null, ItemDustsTiny.getTinyDustByName("Iridium", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, null, 3000, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("electrum", 2), null, ItemDusts.getDustByName("silver", 1), ItemDusts.getDustByName("gold", 1), null, null, 2400, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("invar", 3), null, ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), null, null, 1340, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("marble", 8), null, ItemDusts.getDustByName("magnesium", 1), ItemDusts.getDustByName("calcite", 7), null, null, 1280, 5)); @@ -937,7 +937,7 @@ public class RecipesIC2 implements ICompatModule { RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("nichrome", 5), null, ItemDusts.getDustByName("nickel", 4), ItemDusts.getDustByName("chrome", 1), null, null, 2240, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cupronickel", 2), null, ItemDusts.getDustByName("copper", 1), ItemDusts.getDustByName("nickel", 1), null, null, 960, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("kanthal", 3), null, ItemDusts.getDustByName("iron", 1), ItemDusts.getDustByName("aluminum", 1), ItemDusts.getDustByName("chrome", 1), null, 1040, 5)); - RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustTiny.getTinyDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("endstone", 16), new ItemStack(IC2Items.getItem("cell").getItem(), 2), ItemCells.getCellByName("helium3", 1), ItemCells.getCellByName("helium"), ItemDustsTiny.getTinyDustByName("Tungsten", 1), new ItemStack(Blocks.sand, 12), 4800, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("cinnabar", 2), IC2Items.getItem("cell"), ItemCells.getCellByName("mercury", 1), ItemDusts.getDustByName("sulfur", 1), null, null, 80, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("brass", 4), null, ItemDusts.getDustByName("zinc", 1), ItemDusts.getDustByName("copper", 3), null, null, 2000, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("aluminumBrass", 4), null, ItemDusts.getDustByName("aluminum", 1), ItemDusts.getDustByName("copper", 3), null, null, 2000, 5)); @@ -956,7 +956,7 @@ public class RecipesIC2 implements ICompatModule { //Lava Cell Byproducts ItemStack lavaCells = IC2Items.getItem("lavaCell"); lavaCells.stackSize = 8; - RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustTiny.getTinyDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 17), 6000, 5)); + RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4), ItemIngots.getIngotByName("copper", 2), ItemDustsTiny.getTinyDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 17), 6000, 5)); } static void addIndustrialGrinderRecipes() { diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 1184818e8..213475460 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import techreborn.items.ItemCells; import techreborn.items.ItemCrushedOre; -import techreborn.items.ItemDustTiny; +import techreborn.items.ItemDustsTiny; import techreborn.items.ItemDusts; import techreborn.items.ItemDustsSmall; import techreborn.items.ItemGems; @@ -99,7 +99,7 @@ public class ModItems { GameRegistry.registerItem(dusts, "dust"); smallDusts = new ItemDustsSmall(); GameRegistry.registerItem(smallDusts, "smallDust"); - tinyDusts = new ItemDustTiny(); + tinyDusts = new ItemDustsTiny(); GameRegistry.registerItem(tinyDusts, "tinyDust"); plate = new ItemPlates(); GameRegistry.registerItem(plate, "plates"); @@ -486,97 +486,97 @@ public class ModItems { OreDictionary.registerOre("dustSmallZinc", ItemDustsSmall.getSmallDustByName("Zinc")); // Tiny Dusts - OreDictionary.registerOre("dustTinyAlmandine", ItemDustTiny.getTinyDustByName("Almandine")); - OreDictionary.registerOre("dustTinyAluminumBrass", ItemDustTiny.getTinyDustByName("AluminumBrass")); - OreDictionary.registerOre("dustTinyAluminum", ItemDustTiny.getTinyDustByName("Aluminum")); - OreDictionary.registerOre("dustTinyAluminium", ItemDustTiny.getTinyDustByName("Aluminum")); - OreDictionary.registerOre("dustTinyAlumite", ItemDustTiny.getTinyDustByName("Alumite")); - OreDictionary.registerOre("dustTinyAndradite", ItemDustTiny.getTinyDustByName("Andradite")); - OreDictionary.registerOre("dustTinyAntimony", ItemDustTiny.getTinyDustByName("Antimony")); - OreDictionary.registerOre("dustTinyArdite", ItemDustTiny.getTinyDustByName("Ardite")); - OreDictionary.registerOre("dustTinyAsh", ItemDustTiny.getTinyDustByName("Ashes")); - OreDictionary.registerOre("dustTinyBasalt", ItemDustTiny.getTinyDustByName("Basalt")); - OreDictionary.registerOre("dustTinyBauxite", ItemDustTiny.getTinyDustByName("Bauxite")); - OreDictionary.registerOre("dustTinyBiotite", ItemDustTiny.getTinyDustByName("Biotite")); - OreDictionary.registerOre("dustTinyBrass", ItemDustTiny.getTinyDustByName("Brass")); - OreDictionary.registerOre("dustTinyBronze", ItemDustTiny.getTinyDustByName("Bronze")); - OreDictionary.registerOre("dustTinyCadmium", ItemDustTiny.getTinyDustByName("Cadmium")); - OreDictionary.registerOre("dustTinyCalcite", ItemDustTiny.getTinyDustByName("Calcite")); - OreDictionary.registerOre("dustTinyCharcoal", ItemDustTiny.getTinyDustByName("Charcoal")); - OreDictionary.registerOre("dustTinyChrome", ItemDustTiny.getTinyDustByName("Chrome")); - OreDictionary.registerOre("dustTinyCinnabar", ItemDustTiny.getTinyDustByName("Cinnabar")); - OreDictionary.registerOre("dustTinyClay", ItemDustTiny.getTinyDustByName("Clay")); - OreDictionary.registerOre("dustTinyCoal", ItemDustTiny.getTinyDustByName("Coal")); - OreDictionary.registerOre("dustTinyCobalt", ItemDustTiny.getTinyDustByName("Cobalt")); - OreDictionary.registerOre("dustTinyCopper", ItemDustTiny.getTinyDustByName("Copper")); - OreDictionary.registerOre("dustTinyCupronickel", ItemDustTiny.getTinyDustByName("Cupronickel")); - OreDictionary.registerOre("dustTinyDarkAsh", ItemDustTiny.getTinyDustByName("DarkAshes")); - OreDictionary.registerOre("dustTinyDarkIron", ItemDustTiny.getTinyDustByName("DarkIron")); - OreDictionary.registerOre("dustTinyDiamond", ItemDustTiny.getTinyDustByName("Diamond")); - OreDictionary.registerOre("dustTinyElectrum", ItemDustTiny.getTinyDustByName("Electrum")); - OreDictionary.registerOre("dustTinyEmerald", ItemDustTiny.getTinyDustByName("Emerald")); - OreDictionary.registerOre("dustTinyEnderEye", ItemDustTiny.getTinyDustByName("EnderEye")); - OreDictionary.registerOre("dustTinyEnderPearl", ItemDustTiny.getTinyDustByName("EnderPearl")); - OreDictionary.registerOre("dustTinyEndstone", ItemDustTiny.getTinyDustByName("Endstone")); - OreDictionary.registerOre("dustTinyFlint", ItemDustTiny.getTinyDustByName("Flint")); - OreDictionary.registerOre("dustTinyGalena", ItemDustTiny.getTinyDustByName("Galena")); - OreDictionary.registerOre("dustTinyGlowstone", ItemDustTiny.getTinyDustByName("Glowstone")); - OreDictionary.registerOre("dustTinyGold", ItemDustTiny.getTinyDustByName("Gold")); - OreDictionary.registerOre("dustTinyGraphite", ItemDustTiny.getTinyDustByName("Graphite")); - OreDictionary.registerOre("dustTinyGrossular", ItemDustTiny.getTinyDustByName("Grossular")); - OreDictionary.registerOre("dustTinyGunpowder", ItemDustTiny.getTinyDustByName("Gunpowder")); - OreDictionary.registerOre("dustTinyIndium", ItemDustTiny.getTinyDustByName("Indium")); - OreDictionary.registerOre("dustTinyInvar", ItemDustTiny.getTinyDustByName("Invar")); - OreDictionary.registerOre("dustTinyIridium", ItemDustTiny.getTinyDustByName("Iridium")); - OreDictionary.registerOre("dustTinyIron", ItemDustTiny.getTinyDustByName("Iron")); - OreDictionary.registerOre("dustTinyKanthal", ItemDustTiny.getTinyDustByName("Kanthal")); - OreDictionary.registerOre("dustTinyLapis", ItemDustTiny.getTinyDustByName("Lapis")); - OreDictionary.registerOre("dustTinyLazurite", ItemDustTiny.getTinyDustByName("Lazurite")); - OreDictionary.registerOre("dustTinyLead", ItemDustTiny.getTinyDustByName("Lead")); - OreDictionary.registerOre("dustTinyLimestone", ItemDustTiny.getTinyDustByName("Limestone")); - OreDictionary.registerOre("dustTinyLodestone", ItemDustTiny.getTinyDustByName("Lodestone")); - OreDictionary.registerOre("dustTinyMagnesium", ItemDustTiny.getTinyDustByName("Magnesium")); - OreDictionary.registerOre("dustTinyMagnetite", ItemDustTiny.getTinyDustByName("Magnetite")); - OreDictionary.registerOre("dustTinyManganese", ItemDustTiny.getTinyDustByName("Manganese")); - OreDictionary.registerOre("dustTinyManyullyn", ItemDustTiny.getTinyDustByName("Manyullyn")); - OreDictionary.registerOre("dustTinyMarble", ItemDustTiny.getTinyDustByName("Marble")); - OreDictionary.registerOre("dustTinyMithril", ItemDustTiny.getTinyDustByName("Mithril")); - OreDictionary.registerOre("dustTinyNetherrack", ItemDustTiny.getTinyDustByName("Netherrack")); - OreDictionary.registerOre("dustTinyNichrome", ItemDustTiny.getTinyDustByName("Nichrome")); - OreDictionary.registerOre("dustTinyNickel", ItemDustTiny.getTinyDustByName("Nickel")); - OreDictionary.registerOre("dustTinyObsidian", ItemDustTiny.getTinyDustByName("Obsidian")); - OreDictionary.registerOre("dustTinyOsmium", ItemDustTiny.getTinyDustByName("Osmium")); - OreDictionary.registerOre("dustTinyPeridot", ItemDustTiny.getTinyDustByName("Peridot")); - OreDictionary.registerOre("dustTinyPhosphorous", ItemDustTiny.getTinyDustByName("Phosphorous")); - OreDictionary.registerOre("dustTinyPlatinum", ItemDustTiny.getTinyDustByName("Platinum")); - OreDictionary.registerOre("dustTinyPotassiumFeldspar", ItemDustTiny.getTinyDustByName("PotassiumFeldspar")); - OreDictionary.registerOre("dustTinyPyrite", ItemDustTiny.getTinyDustByName("Pyrite")); - OreDictionary.registerOre("dustTinyPyrope", ItemDustTiny.getTinyDustByName("Pyrope")); - OreDictionary.registerOre("dustTinyRedGarnet", ItemDustTiny.getTinyDustByName("RedGarnet")); - OreDictionary.registerOre("dustTinyRedrock", ItemDustTiny.getTinyDustByName("Redrock")); - OreDictionary.registerOre("dustTinyRedstone", ItemDustTiny.getTinyDustByName("Redstone")); - OreDictionary.registerOre("dustTinyRuby", ItemDustTiny.getTinyDustByName("Ruby")); - OreDictionary.registerOre("dustTinySaltpeter", ItemDustTiny.getTinyDustByName("Saltpeter")); - OreDictionary.registerOre("dustTinySapphire", ItemDustTiny.getTinyDustByName("Sapphire")); - OreDictionary.registerOre("dustTinySilver", ItemDustTiny.getTinyDustByName("Silver")); - OreDictionary.registerOre("dustTinySilicon", ItemDustTiny.getTinyDustByName("Silicon")); - OreDictionary.registerOre("dustTinySodalite", ItemDustTiny.getTinyDustByName("Sodalite")); - OreDictionary.registerOre("dustTinySpessartine", ItemDustTiny.getTinyDustByName("Spessartine")); - OreDictionary.registerOre("dustTinySphalerite", ItemDustTiny.getTinyDustByName("Sphalerite")); - OreDictionary.registerOre("dustTinySteel", ItemDustTiny.getTinyDustByName("Steel")); - OreDictionary.registerOre("dustTinySulfur", ItemDustTiny.getTinyDustByName("Sulfur")); - OreDictionary.registerOre("dustTinyTellurium", ItemDustTiny.getTinyDustByName("Tellurium")); - OreDictionary.registerOre("dustTinyTeslatite", ItemDustTiny.getTinyDustByName("Teslatite")); - OreDictionary.registerOre("dustTinyTetrahedrite", ItemDustTiny.getTinyDustByName("Tetrahedrite")); - OreDictionary.registerOre("dustTinyCopper", ItemDustTiny.getTinyDustByName("Copper")); - OreDictionary.registerOre("dustTinyTin", ItemDustTiny.getTinyDustByName("Tin")); - OreDictionary.registerOre("dustTinyTitanium", ItemDustTiny.getTinyDustByName("Titanium")); - OreDictionary.registerOre("dustTinyTungsten", ItemDustTiny.getTinyDustByName("Tungsten")); - OreDictionary.registerOre("dustTinyUvarovite", ItemDustTiny.getTinyDustByName("Uvarovite")); - OreDictionary.registerOre("dustTinyVinteum", ItemDustTiny.getTinyDustByName("Vinteum")); - OreDictionary.registerOre("dustTinyVoidstone", ItemDustTiny.getTinyDustByName("Voidstone")); - OreDictionary.registerOre("dustTinyYellowGarnet", ItemDustTiny.getTinyDustByName("YellowGarnet")); - OreDictionary.registerOre("dustTinyZinc", ItemDustTiny.getTinyDustByName("Zinc")); + OreDictionary.registerOre("dustTinyAlmandine", ItemDustsTiny.getTinyDustByName("Almandine")); + OreDictionary.registerOre("dustTinyAluminumBrass", ItemDustsTiny.getTinyDustByName("AluminumBrass")); + OreDictionary.registerOre("dustTinyAluminum", ItemDustsTiny.getTinyDustByName("Aluminum")); + OreDictionary.registerOre("dustTinyAluminium", ItemDustsTiny.getTinyDustByName("Aluminum")); + OreDictionary.registerOre("dustTinyAlumite", ItemDustsTiny.getTinyDustByName("Alumite")); + OreDictionary.registerOre("dustTinyAndradite", ItemDustsTiny.getTinyDustByName("Andradite")); + OreDictionary.registerOre("dustTinyAntimony", ItemDustsTiny.getTinyDustByName("Antimony")); + OreDictionary.registerOre("dustTinyArdite", ItemDustsTiny.getTinyDustByName("Ardite")); + OreDictionary.registerOre("dustTinyAsh", ItemDustsTiny.getTinyDustByName("Ashes")); + OreDictionary.registerOre("dustTinyBasalt", ItemDustsTiny.getTinyDustByName("Basalt")); + OreDictionary.registerOre("dustTinyBauxite", ItemDustsTiny.getTinyDustByName("Bauxite")); + OreDictionary.registerOre("dustTinyBiotite", ItemDustsTiny.getTinyDustByName("Biotite")); + OreDictionary.registerOre("dustTinyBrass", ItemDustsTiny.getTinyDustByName("Brass")); + OreDictionary.registerOre("dustTinyBronze", ItemDustsTiny.getTinyDustByName("Bronze")); + OreDictionary.registerOre("dustTinyCadmium", ItemDustsTiny.getTinyDustByName("Cadmium")); + OreDictionary.registerOre("dustTinyCalcite", ItemDustsTiny.getTinyDustByName("Calcite")); + OreDictionary.registerOre("dustTinyCharcoal", ItemDustsTiny.getTinyDustByName("Charcoal")); + OreDictionary.registerOre("dustTinyChrome", ItemDustsTiny.getTinyDustByName("Chrome")); + OreDictionary.registerOre("dustTinyCinnabar", ItemDustsTiny.getTinyDustByName("Cinnabar")); + OreDictionary.registerOre("dustTinyClay", ItemDustsTiny.getTinyDustByName("Clay")); + OreDictionary.registerOre("dustTinyCoal", ItemDustsTiny.getTinyDustByName("Coal")); + OreDictionary.registerOre("dustTinyCobalt", ItemDustsTiny.getTinyDustByName("Cobalt")); + OreDictionary.registerOre("dustTinyCopper", ItemDustsTiny.getTinyDustByName("Copper")); + OreDictionary.registerOre("dustTinyCupronickel", ItemDustsTiny.getTinyDustByName("Cupronickel")); + OreDictionary.registerOre("dustTinyDarkAsh", ItemDustsTiny.getTinyDustByName("DarkAshes")); + OreDictionary.registerOre("dustTinyDarkIron", ItemDustsTiny.getTinyDustByName("DarkIron")); + OreDictionary.registerOre("dustTinyDiamond", ItemDustsTiny.getTinyDustByName("Diamond")); + OreDictionary.registerOre("dustTinyElectrum", ItemDustsTiny.getTinyDustByName("Electrum")); + OreDictionary.registerOre("dustTinyEmerald", ItemDustsTiny.getTinyDustByName("Emerald")); + OreDictionary.registerOre("dustTinyEnderEye", ItemDustsTiny.getTinyDustByName("EnderEye")); + OreDictionary.registerOre("dustTinyEnderPearl", ItemDustsTiny.getTinyDustByName("EnderPearl")); + OreDictionary.registerOre("dustTinyEndstone", ItemDustsTiny.getTinyDustByName("Endstone")); + OreDictionary.registerOre("dustTinyFlint", ItemDustsTiny.getTinyDustByName("Flint")); + OreDictionary.registerOre("dustTinyGalena", ItemDustsTiny.getTinyDustByName("Galena")); + OreDictionary.registerOre("dustTinyGlowstone", ItemDustsTiny.getTinyDustByName("Glowstone")); + OreDictionary.registerOre("dustTinyGold", ItemDustsTiny.getTinyDustByName("Gold")); + OreDictionary.registerOre("dustTinyGraphite", ItemDustsTiny.getTinyDustByName("Graphite")); + OreDictionary.registerOre("dustTinyGrossular", ItemDustsTiny.getTinyDustByName("Grossular")); + OreDictionary.registerOre("dustTinyGunpowder", ItemDustsTiny.getTinyDustByName("Gunpowder")); + OreDictionary.registerOre("dustTinyIndium", ItemDustsTiny.getTinyDustByName("Indium")); + OreDictionary.registerOre("dustTinyInvar", ItemDustsTiny.getTinyDustByName("Invar")); + OreDictionary.registerOre("dustTinyIridium", ItemDustsTiny.getTinyDustByName("Iridium")); + OreDictionary.registerOre("dustTinyIron", ItemDustsTiny.getTinyDustByName("Iron")); + OreDictionary.registerOre("dustTinyKanthal", ItemDustsTiny.getTinyDustByName("Kanthal")); + OreDictionary.registerOre("dustTinyLapis", ItemDustsTiny.getTinyDustByName("Lapis")); + OreDictionary.registerOre("dustTinyLazurite", ItemDustsTiny.getTinyDustByName("Lazurite")); + OreDictionary.registerOre("dustTinyLead", ItemDustsTiny.getTinyDustByName("Lead")); + OreDictionary.registerOre("dustTinyLimestone", ItemDustsTiny.getTinyDustByName("Limestone")); + OreDictionary.registerOre("dustTinyLodestone", ItemDustsTiny.getTinyDustByName("Lodestone")); + OreDictionary.registerOre("dustTinyMagnesium", ItemDustsTiny.getTinyDustByName("Magnesium")); + OreDictionary.registerOre("dustTinyMagnetite", ItemDustsTiny.getTinyDustByName("Magnetite")); + OreDictionary.registerOre("dustTinyManganese", ItemDustsTiny.getTinyDustByName("Manganese")); + OreDictionary.registerOre("dustTinyManyullyn", ItemDustsTiny.getTinyDustByName("Manyullyn")); + OreDictionary.registerOre("dustTinyMarble", ItemDustsTiny.getTinyDustByName("Marble")); + OreDictionary.registerOre("dustTinyMithril", ItemDustsTiny.getTinyDustByName("Mithril")); + OreDictionary.registerOre("dustTinyNetherrack", ItemDustsTiny.getTinyDustByName("Netherrack")); + OreDictionary.registerOre("dustTinyNichrome", ItemDustsTiny.getTinyDustByName("Nichrome")); + OreDictionary.registerOre("dustTinyNickel", ItemDustsTiny.getTinyDustByName("Nickel")); + OreDictionary.registerOre("dustTinyObsidian", ItemDustsTiny.getTinyDustByName("Obsidian")); + OreDictionary.registerOre("dustTinyOsmium", ItemDustsTiny.getTinyDustByName("Osmium")); + OreDictionary.registerOre("dustTinyPeridot", ItemDustsTiny.getTinyDustByName("Peridot")); + OreDictionary.registerOre("dustTinyPhosphorous", ItemDustsTiny.getTinyDustByName("Phosphorous")); + OreDictionary.registerOre("dustTinyPlatinum", ItemDustsTiny.getTinyDustByName("Platinum")); + OreDictionary.registerOre("dustTinyPotassiumFeldspar", ItemDustsTiny.getTinyDustByName("PotassiumFeldspar")); + OreDictionary.registerOre("dustTinyPyrite", ItemDustsTiny.getTinyDustByName("Pyrite")); + OreDictionary.registerOre("dustTinyPyrope", ItemDustsTiny.getTinyDustByName("Pyrope")); + OreDictionary.registerOre("dustTinyRedGarnet", ItemDustsTiny.getTinyDustByName("RedGarnet")); + OreDictionary.registerOre("dustTinyRedrock", ItemDustsTiny.getTinyDustByName("Redrock")); + OreDictionary.registerOre("dustTinyRedstone", ItemDustsTiny.getTinyDustByName("Redstone")); + OreDictionary.registerOre("dustTinyRuby", ItemDustsTiny.getTinyDustByName("Ruby")); + OreDictionary.registerOre("dustTinySaltpeter", ItemDustsTiny.getTinyDustByName("Saltpeter")); + OreDictionary.registerOre("dustTinySapphire", ItemDustsTiny.getTinyDustByName("Sapphire")); + OreDictionary.registerOre("dustTinySilver", ItemDustsTiny.getTinyDustByName("Silver")); + OreDictionary.registerOre("dustTinySilicon", ItemDustsTiny.getTinyDustByName("Silicon")); + OreDictionary.registerOre("dustTinySodalite", ItemDustsTiny.getTinyDustByName("Sodalite")); + OreDictionary.registerOre("dustTinySpessartine", ItemDustsTiny.getTinyDustByName("Spessartine")); + OreDictionary.registerOre("dustTinySphalerite", ItemDustsTiny.getTinyDustByName("Sphalerite")); + OreDictionary.registerOre("dustTinySteel", ItemDustsTiny.getTinyDustByName("Steel")); + OreDictionary.registerOre("dustTinySulfur", ItemDustsTiny.getTinyDustByName("Sulfur")); + OreDictionary.registerOre("dustTinyTellurium", ItemDustsTiny.getTinyDustByName("Tellurium")); + OreDictionary.registerOre("dustTinyTeslatite", ItemDustsTiny.getTinyDustByName("Teslatite")); + OreDictionary.registerOre("dustTinyTetrahedrite", ItemDustsTiny.getTinyDustByName("Tetrahedrite")); + OreDictionary.registerOre("dustTinyCopper", ItemDustsTiny.getTinyDustByName("Copper")); + OreDictionary.registerOre("dustTinyTin", ItemDustsTiny.getTinyDustByName("Tin")); + OreDictionary.registerOre("dustTinyTitanium", ItemDustsTiny.getTinyDustByName("Titanium")); + OreDictionary.registerOre("dustTinyTungsten", ItemDustsTiny.getTinyDustByName("Tungsten")); + OreDictionary.registerOre("dustTinyUvarovite", ItemDustsTiny.getTinyDustByName("Uvarovite")); + OreDictionary.registerOre("dustTinyVinteum", ItemDustsTiny.getTinyDustByName("Vinteum")); + OreDictionary.registerOre("dustTinyVoidstone", ItemDustsTiny.getTinyDustByName("Voidstone")); + OreDictionary.registerOre("dustTinyYellowGarnet", ItemDustsTiny.getTinyDustByName("YellowGarnet")); + OreDictionary.registerOre("dustTinyZinc", ItemDustsTiny.getTinyDustByName("Zinc")); // Ingots OreDictionary.registerOre("ingotAluminum", ItemIngots.getIngotByName("aluminum")); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index de7a93459..38e936113 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -15,12 +15,7 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.api.recipe.machines.LatheRecipe; import techreborn.api.recipe.machines.PlateCuttingMachineRecipe; import techreborn.config.ConfigTechReborn; -import techreborn.items.ItemDusts; -import techreborn.items.ItemDustsSmall; -import techreborn.items.ItemIngots; -import techreborn.items.ItemParts; -import techreborn.items.ItemPlates; -import techreborn.items.ItemRods; +import techreborn.items.*; import techreborn.util.CraftingHelper; import techreborn.util.LogHelper; @@ -483,8 +478,13 @@ public class ModRecipes { public static void addBlastFurnaceRecipes() { - RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, null, (ItemIngots.getIngotByName("titanium")), 500, 128000, 1500)); - } + RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); + RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("titanium", 4), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); + RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("titanium", 9), null, ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500)); + RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDusts.getDustByName("aluminum"), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); + RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("aluminum", 4), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); + RecipeHandler.addRecipe(new BlastFurnaceRecipe(ItemDustsTiny.getTinyDustByName("aluminum", 9), null, ItemIngots.getIngotByName("aluminum"), null, 2200, 120, 1700)); + } public static void addUUrecipes() { if(ConfigTechReborn.UUrecipesIridiamOre) diff --git a/src/main/java/techreborn/items/ItemDustTiny.java b/src/main/java/techreborn/items/ItemDustsTiny.java similarity index 97% rename from src/main/java/techreborn/items/ItemDustTiny.java rename to src/main/java/techreborn/items/ItemDustsTiny.java index 1a9dc8000..318b452ad 100644 --- a/src/main/java/techreborn/items/ItemDustTiny.java +++ b/src/main/java/techreborn/items/ItemDustsTiny.java @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -public class ItemDustTiny extends ItemTR { +public class ItemDustsTiny extends ItemTR { public static ItemStack getTinyDustByName(String name, int count) { @@ -47,7 +47,7 @@ public class ItemDustTiny extends ItemTR { private IIcon[] textures; - public ItemDustTiny() + public ItemDustsTiny() { setUnlocalizedName("techreborn.dusttiny"); setHasSubtypes(true);