diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 6bd1aa961..8d5bc1ad0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -84,7 +84,7 @@ public class SubTileEndoflame extends SubTileGenerating { @Override public int getValueForPassiveGeneration() { - return 2; + return 3; } @Override @@ -123,7 +123,7 @@ public class SubTileEndoflame extends SubTileGenerating { @Override public int getDelayBetweenPassiveGeneration() { - return 1; + return 2; } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 3621178c3..a559893e6 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -846,13 +846,17 @@ public final class ModCraftingRecipes { // Alfheim Portal Recipe addOreDictRecipe(new ItemStack(ModBlocks.alfPortal), - "WWW", "WTW", "WWW", + "WTW", "WTW", "WTW", 'W', LibOreDict.LIVING_WOOD, - 'T', LibOreDict.TERRA_STEEL); + 'T', LibOreDict.TERRASTEEL_NUGGET); recipeAlfPortal = BotaniaAPI.getLatestAddedRecipe(); // Natura Pylon Recipe - addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 2, 1), ModBlocks.pylon, LibOreDict.TERRA_STEEL, ModBlocks.pylon); + addOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 1), + " T ", "TPT", " E ", + 'T', LibOreDict.TERRASTEEL_NUGGET, + 'P', new ItemStack(ModBlocks.pylon), + 'E', new ItemStack(Items.ender_eye)); recipeNaturaPylon = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Seas Recipe @@ -1761,7 +1765,7 @@ public final class ModCraftingRecipes { 'H', new ItemStack(ModItems.grassHorn, 1, 1)); recipeCanopyDrum = BotaniaAPI.getLatestAddedRecipe(); - // Storage Block Recipes + // Storage Block/Nugget Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", 'I', LibOreDict.MANA_STEEL); @@ -1783,6 +1787,19 @@ public final class ModCraftingRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 2), new ItemStack(ModBlocks.storage, 1, 3)); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 9), new ItemStack(ModBlocks.storage, 1, 4)); + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 0), + "III", "III", "III", + 'I', LibOreDict.MANASTEEL_NUGGET); + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 4), + "III", "III", "III", + 'I', LibOreDict.TERRASTEEL_NUGGET); + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 7), + "III", "III", "III", + 'I', LibOreDict.ELEMENTIUM_NUGGET); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 9, 17), LibOreDict.MANA_STEEL); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 9, 18), LibOreDict.TERRA_STEEL); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 9, 19), LibOreDict.ELEMENTIUM); + // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 6d6dc0218..e4c89eabe 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -402,6 +402,9 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(manaResource, 1, 14)); OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(manaResource, 1, 15)); OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaResource, 1, 16)); + OreDictionary.registerOre(LibOreDict.MANASTEEL_NUGGET, new ItemStack(manaResource, 1, 17)); + OreDictionary.registerOre(LibOreDict.TERRASTEEL_NUGGET, new ItemStack(manaResource, 1, 18)); + OreDictionary.registerOre(LibOreDict.ELEMENTIUM_NUGGET, new ItemStack(manaResource, 1, 19)); OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 4c4085589..b49519f10 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -45,7 +45,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { - final int types = 17; + final int types = 20; IIcon[] icons; public IIcon tailIcon = null; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index ebaf5af39..54eba7757 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -184,6 +184,9 @@ public final class LibItemNames { "dreamwoodTwig", "gaiaIngot", "enderAirBottle", - "manaString" + "manaString", + "manasteelNugget", + "terrasteelNugget", + "elementiumNugget" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index cb77e5ae7..c5c2bb08f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -35,6 +35,9 @@ public final class LibOreDict { public static final String GAIA_INGOT = "gaiaIngot"; public static final String ENDER_AIR_BOTTLE = "bEnderAirBottle"; public static final String MANA_STRING = "manaString"; + public static final String MANASTEEL_NUGGET = "nuggetManasteel"; + public static final String TERRASTEEL_NUGGET = "nuggetTerrasteel"; + public static final String ELEMENTIUM_NUGGET = "nuggetElvenElementium"; public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 69990c1c8..0b9637425 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1334,6 +1334,9 @@ item.botania:recordGaia2.name=Scathed Music Disc item.botania:temperanceStone.name=Stone of Temperance item.botania:incenseStick.name=Incense Stick item.botania:terraAxe.name=Terra Truncator +item.botania:manasteelNugget.name=Manasteel Nugget +item.botania:terrasteelNugget.name=Terrasteel Nugget +item.botania:elementiumNugget.name=Elementium Nugget # BREW NAMES botania.brew.fallback=Fallback @@ -1527,7 +1530,7 @@ botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 v botania.page.pool1=Making a &1Dilluted Mana Pool&0. botania.page.pool10=Infusing a normal &1Mana Pool&0 botania.page.pool2=Tossing in some resources into a normal &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
A few examples are &1Iron Ingots&0 or &1Mystical Petals&0.
&4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1Redstone Comparator&0 can also output a signal based on the contents. -botania.page.pool8=For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. +botania.page.pool8=&1Manasteel&0 Ingots and other ingots based on it, can be converted into both blocks or nuggets through the normal conversion recipes.
For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. botania.page.pool3=Infusing &1Manasteel&0 botania.page.pool4=Infusing &1Mana Pearls&0 botania.page.pool5=Infusing &1Mana Diamonds&0 diff --git a/src/main/resources/assets/botania/textures/items/elementiumNugget.png b/src/main/resources/assets/botania/textures/items/elementiumNugget.png new file mode 100644 index 000000000..c4f42dfd1 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/elementiumNugget.png differ diff --git a/src/main/resources/assets/botania/textures/items/manasteelNugget.png b/src/main/resources/assets/botania/textures/items/manasteelNugget.png new file mode 100644 index 000000000..1be52a4c3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/manasteelNugget.png differ diff --git a/src/main/resources/assets/botania/textures/items/terrasteelNugget.png b/src/main/resources/assets/botania/textures/items/terrasteelNugget.png new file mode 100644 index 000000000..4dd348d7c Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/terrasteelNugget.png differ