diff --git a/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartz.java b/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartz.java index 6192143c7..24c1ab07a 100644 --- a/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartz.java +++ b/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartz.java @@ -17,18 +17,22 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.quartz.ItemBlockSpecialQuartz; +import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockSpecialQuartz extends BlockMod { +public class BlockSpecialQuartz extends BlockMod implements ILexiconable { private final String[] iconNames; public final String type; @@ -141,4 +145,9 @@ public class BlockSpecialQuartz extends BlockMod { chiseledSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "chiseled" + type + "Quartz1"); pillarSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "pillar" + type + "Quartz1"); } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } } diff --git a/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzSlab.java b/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzSlab.java index 9f06ca311..e9c4bca70 100644 --- a/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzSlab.java +++ b/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzSlab.java @@ -17,21 +17,25 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.quartz.ItemBlockSpecialQuartzSlab; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockSpecialQuartzSlab extends BlockSlab { +public class BlockSpecialQuartzSlab extends BlockSlab implements ILexiconable { Block source; String name; @@ -117,4 +121,9 @@ public class BlockSpecialQuartzSlab extends BlockSlab { // NO-OP } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + } diff --git a/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzStairs.java b/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzStairs.java index 546c312cd..e26274770 100644 --- a/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzStairs.java +++ b/MODSRC/vazkii/botania/common/block/quartz/BlockSpecialQuartzStairs.java @@ -12,12 +12,18 @@ package vazkii.botania.common.block.quartz; import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.lexicon.LexiconData; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; -public class BlockSpecialQuartzStairs extends BlockStairs { +public class BlockSpecialQuartzStairs extends BlockStairs implements ILexiconable { public BlockSpecialQuartzStairs(Block source) { super(source, 0); @@ -30,4 +36,9 @@ public class BlockSpecialQuartzStairs extends BlockStairs { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); return super.setBlockName(par1Str); } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } } \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index a22ea5ed2..4cdfe5c4f 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -68,6 +68,19 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); + addBlock(ModBlocks.openCrate); + addBlock(ModBlocks.platform); + addBlock(ModBlocks.alfPortal); + addBlock(ModBlocks.altar); + addBlock(ModBlocks.runeAltar); + addBlock(ModBlocks.pylon); + addBlock(ModBlocks.pistonRelay); + addBlock(ModBlocks.shinyFlower); + addBlock(ModBlocks.unstableBlock); + addBlock(ModBlocks.manaBeacon); + addItem(ModItems.signalFlare); + + addItem(ModItems.quartz); addBlock(ModBlocks.darkQuartz); addBlock(ModBlocks.darkQuartzSlab); addBlock(ModBlocks.darkQuartzStairs); @@ -83,18 +96,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.redQuartz); addBlock(ModBlocks.redQuartzSlab); addBlock(ModBlocks.redQuartzStairs); - - addBlock(ModBlocks.openCrate); - addBlock(ModBlocks.platform); - addBlock(ModBlocks.alfPortal); - addBlock(ModBlocks.altar); - addBlock(ModBlocks.runeAltar); - addBlock(ModBlocks.pylon); - addBlock(ModBlocks.pistonRelay); - addBlock(ModBlocks.shinyFlower); - addBlock(ModBlocks.unstableBlock); - addBlock(ModBlocks.manaBeacon); - addItem(ModItems.signalFlare); addItem(ModItems.manasteelPick); addItem(ModItems.manasteelShovel); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 6609e945a..a173add06 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -11,11 +11,12 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -27,8 +28,6 @@ import vazkii.botania.common.item.ItemLens; import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; import cpw.mods.fml.common.registry.GameRegistry; @@ -124,6 +123,10 @@ public final class ModCrafingRecipes { public static List recipesShinyFlowers; public static IRecipe recipePlatform; public static IRecipe recipeEnderDagger; + public static IRecipe recipeDarkQuartz; + public static IRecipe recipeBlazeQuartz; + public static List recipesLavenderQuartz; + public static IRecipe recipeRedQuartz; public static void init() { // Lexicon Recipe @@ -664,7 +667,7 @@ public final class ModCrafingRecipes { for(int i = 0; i < 16; i++) addShapelessOreDictRecipe(new ItemStack(ModBlocks.shinyFlower, 1, i), new ItemStack(Items.glowstone_dust), new ItemStack(Items.glowstone_dust), LibOreDict.FLOWER[i]); recipesShinyFlowers = BotaniaAPI.getLatestAddedRecipes(16); - + // Abtruse Platform Recipe GameRegistry.addRecipe(new ItemStack(ModBlocks.platform), "343", "0 0", @@ -672,7 +675,7 @@ public final class ModCrafingRecipes { '3', new ItemStack(ModBlocks.livingwood, 0, 3), '4', new ItemStack(ModBlocks.livingwood, 0, 4)); recipePlatform = BotaniaAPI.getLatestAddedRecipe(); - + // Soulscribe Recipe addOreDictRecipe(new ItemStack(ModItems.enderDagger), "P", "S", "T", @@ -680,7 +683,33 @@ public final class ModCrafingRecipes { 'S', LibOreDict.MANA_STEEL, 'T', LibOreDict.LIVINGWOOD_TWIG); recipeEnderDagger = BotaniaAPI.getLatestAddedRecipe(); + + // Quartz Recipes + recipeDarkQuartz = addQuartzRecipes(0, Items.coal, ModBlocks.darkQuartz, ModBlocks.darkQuartzStairs, ModBlocks.darkQuartzSlab); + addQuartzRecipes(1, null, ModBlocks.manaQuartz, ModBlocks.manaQuartzStairs, ModBlocks.manaQuartzSlab); + recipeBlazeQuartz = addQuartzRecipes(2, Items.blaze_powder, ModBlocks.blazeQuartz, ModBlocks.blazeQuartzStairs, ModBlocks.blazeQuartzSlab); + GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, 3), + "QQQ", "QCQ", "QQQ", + 'Q', Items.quartz, + 'C', new ItemStack(Blocks.red_flower, 1, 2)); + GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, 3), + "QQQ", "QCQ", "QQQ", + 'Q', Items.quartz, + 'C', new ItemStack(Blocks.red_flower, 1, 7)); + GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, 3), + "QQQ", "QCQ", "QQQ", + 'Q', Items.quartz, + 'C', new ItemStack(Blocks.double_plant, 1, 1)); + GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, 3), + "QQQ", "QCQ", "QQQ", + 'Q', Items.quartz, + 'C', new ItemStack(Blocks.double_plant, 1, 5)); + recipesLavenderQuartz = BotaniaAPI.getLatestAddedRecipes(4); + addQuartzRecipes(3, null, ModBlocks.lavenderQuartz, ModBlocks.lavenderQuartzStairs, ModBlocks.lavenderQuartzSlab); + + recipeRedQuartz = addQuartzRecipes(4, Items.redstone, ModBlocks.redQuartz, ModBlocks.redQuartzStairs, ModBlocks.redQuartzSlab); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", @@ -692,6 +721,41 @@ public final class ModCrafingRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 4), new ItemStack(ModBlocks.storage, 1, 1)); } + private static IRecipe addQuartzRecipes(int meta, Item req, Block block, Block stairs, Block slab) { + GameRegistry.addRecipe(new ItemStack(block), + "QQ", "QQ", + 'Q', new ItemStack(ModItems.quartz, 1, meta)); + GameRegistry.addRecipe(new ItemStack(slab, 6), + "QQQ", + 'Q', block); + GameRegistry.addRecipe(new ItemStack(block, 2, 2), + "Q", "Q", + 'Q', block); + GameRegistry.addRecipe(new ItemStack(block, 1, 1), + "Q", "Q", + 'Q', slab); + GameRegistry.addRecipe(new ItemStack(stairs, 4), + " Q", " QQ", "QQQ", + 'Q', block); + GameRegistry.addRecipe(new ItemStack(stairs, 4), + "Q ", "QQ ", "QQQ", + 'Q', block); + + if(req != null) { + if(req == Items.coal) + GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, meta), + "QQQ", "QCQ", "QQQ", + 'Q', Items.quartz, + 'C', new ItemStack(req, 1, 1)); + GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, meta), + "QQQ", "QCQ", "QQQ", + 'Q', Items.quartz, + 'C', req); + return BotaniaAPI.getLatestAddedRecipe(); + } + return null; + } + private static void addOreDictRecipe(ItemStack output, Object... recipe) { CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(output, recipe)); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 503426704..11b1636f3 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -19,6 +19,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; public final class ModManaAlchemyRecipes { @@ -26,7 +28,7 @@ public final class ModManaAlchemyRecipes { public static List woodRecipes; public static List saplingRecipes; public static RecipeManaInfusion glowstoneDustRecipe; - public static RecipeManaInfusion netherQuartzRecipe; + public static List quartzRecipes; public static RecipeManaInfusion chiseledBrickRecipe; public static RecipeManaInfusion iceRecipe; public static List swampFolliageRecipes; @@ -58,7 +60,14 @@ public final class ModManaAlchemyRecipes { saplingRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.sapling, 1, i == 5 ? 0 : i + 1), new ItemStack(Blocks.sapling, 1, i), 120)); glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust, 4), new ItemStack(Blocks.glowstone), 25); - netherQuartzRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.quartz, 4), new ItemStack(Blocks.quartz_block), 25); + quartzRecipes = new ArrayList(); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.quartz, 4), new ItemStack(Blocks.quartz_block), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModBlocks.darkQuartz), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 1), new ItemStack(ModBlocks.manaQuartz), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 2), new ItemStack(ModBlocks.blazeQuartz), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 3), new ItemStack(ModBlocks.lavenderQuartz), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 4), new ItemStack(ModBlocks.redQuartz), 25)); + chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick), 150); iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ice), new ItemStack(Blocks.snow), 2250); diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index b65dd7e51..c5c03d9c2 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -34,6 +34,7 @@ public final class ModManaInfusionRecipes { public static RecipeManaInfusion grassSeedsRecipe; public static RecipeManaInfusion podzolSeedsRecipe; public static List mycelSeedsRecipes; + public static RecipeManaInfusion manaQuartzRecipe; public static void init() { manaPetalRecipes = new ArrayList(); @@ -54,6 +55,8 @@ public final class ModManaInfusionRecipes { mycelSeedsRecipes = new ArrayList(); mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.red_mushroom), 6500)); mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.brown_mushroom), 6500)); + + manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.quartz), 250); } } diff --git a/MODSRC/vazkii/botania/common/item/ItemQuartz.java b/MODSRC/vazkii/botania/common/item/ItemQuartz.java new file mode 100644 index 000000000..618aac2f9 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemQuartz.java @@ -0,0 +1,60 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)] + */ +package vazkii.botania.common.item; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemQuartz extends ItemMod { + + private static final int SUBTYPES = 5; + IIcon[] icons; + + public ItemQuartz() { + setUnlocalizedName(LibItemNames.QUARTZ); + setHasSubtypes(true); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for(int i = 0; i < SUBTYPES; i++) + list.add(new ItemStack(item, 1, i)); + } + + @Override + public void registerIcons(IIconRegister par1IconRegister) { + icons = new IIcon[SUBTYPES]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forItem(par1IconRegister, this, i); + } + + @Override + public IIcon getIconFromDamage(int par1) { + return icons[Math.min(icons.length - 1, par1)]; + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + } + + String getUnlocalizedNameLazy(ItemStack par1ItemStack) { + return super.getUnlocalizedName(par1ItemStack); + } +} diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 0613a049a..aeb4b3c7a 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -100,6 +100,7 @@ public final class ModItems { public static Item divaCharm; public static Item flightTiara; public static Item enderDagger; + public static Item quartz; public static void init() { lexicon = new ItemLexicon(); @@ -152,7 +153,8 @@ public final class ModItems { divaCharm = new ItemDivaCharm(); flightTiara = new ItemFlightTiara(); enderDagger = new ItemEnderDagger(); - + quartz = new ItemQuartz(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index e7cd12c5d..ce8df05fa 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -357,7 +357,7 @@ public final class LexiconData { alchemy = new BLexiconEntry(LibLexicon.DEVICE_ALCHEMY, categoryDevices); alchemy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeAlchemyCatalyst), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), new PageManaInfusionRecipe("3", ModManaAlchemyRecipes.woodRecipes), new PageManaInfusionRecipe("4", ModManaAlchemyRecipes.saplingRecipes), new PageManaInfusionRecipe("5", ModManaAlchemyRecipes.glowstoneDustRecipe), - new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.netherQuartzRecipe), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), + new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.quartzRecipes), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), new PageManaInfusionRecipe("10", ModManaAlchemyRecipes.fishRecipes), new PageManaInfusionRecipe("11", ModManaAlchemyRecipes.cropRecipes), new PageManaInfusionRecipe("12", ModManaAlchemyRecipes.potatoRecipe), new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.netherWartRecipe), new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.slimeballRecipe), new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.enderPearlRecipe), new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe)); @@ -460,7 +460,8 @@ public final class LexiconData { decorativeBlocks = new BLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLivingrockDecor1), new PageCraftingRecipe("2", ModCrafingRecipes.recipeLivingrockDecor2), new PageCraftingRecipe("3", ModCrafingRecipes.recipeLivingrockDecor3), new PageCraftingRecipe("4", ModCrafingRecipes.recipeLivingrockDecor4), - new PageCraftingRecipe("5", ModCrafingRecipes.recipeLivingwoodDecor1), new PageCraftingRecipe("6", ModCrafingRecipes.recipeLivingwoodDecor2), new PageCraftingRecipe("7", ModCrafingRecipes.recipeLivingwoodDecor3), new PageCraftingRecipe("8", ModCrafingRecipes.recipeLivingwoodDecor4), new PageCraftingRecipe("9", ModCrafingRecipes.recipeLivingwoodDecor5)); + new PageCraftingRecipe("5", ModCrafingRecipes.recipeLivingwoodDecor1), new PageCraftingRecipe("6", ModCrafingRecipes.recipeLivingwoodDecor2), new PageCraftingRecipe("7", ModCrafingRecipes.recipeLivingwoodDecor3), new PageCraftingRecipe("8", ModCrafingRecipes.recipeLivingwoodDecor4), new PageCraftingRecipe("9", ModCrafingRecipes.recipeLivingwoodDecor5), + new PageText("10"), new PageCraftingRecipe("11", ModCrafingRecipes.recipeDarkQuartz), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCrafingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCrafingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCrafingRecipes.recipeRedQuartz)); dispenserTweaks = new BLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); dispenserTweaks.setLexiconPages(new PageText("0")); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 5da500fb0..f23ede9c4 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -63,6 +63,7 @@ public final class LibItemNames { public static final String DIVA_CHARM = "divaCharm"; public static final String FLIGHT_TIARA = "flightTiara"; public static final String ENDER_DAGGER = "enderDagger"; + public static final String QUARTZ = "quartz"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 11d6691c8..4aecd3c59 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -419,6 +419,11 @@ item.botania:terraPick.name=Terra Shatterer item.botania:divaCharm.name=Charm of the Diva item.botania:flightTiara.name=Flügel Tiara item.botania:enderDagger.name=Soulscribe +item.botania:quartz0.name=Smokey Quartz +item.botania:quartz1.name=Mana Quartz +item.botania:quartz2.name=Blaze Quartz +item.botania:quartz3.name=Lavender Quartz +item.botania:quartz4.name=Redquartz # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: @@ -1032,6 +1037,12 @@ botania.page.decorativeBlocks6=Mossing the planks botania.page.decorativeBlocks7=Framing the planks botania.page.decorativeBlocks8=Pattern planks botania.page.decorativeBlocks9=Glimmering livingwood +botania.page.decorativeBlocks10=Carrying on, by combining &1Nether Quartz&0 with all sorts of other substances, it's possible to create a wide array of other decorative &1Quartz&0 blocks.
As expected, all these items can be crafted into all their decorative block counterparts just like regular &1Quartz&0 blocks are crafted. +botania.page.decorativeBlocks11=Smokey Quartz +botania.page.decorativeBlocks12=Mana Quartz +botania.page.decorativeBlocks13=Blaze Quartz +botania.page.decorativeBlocks14=Lavender Quartz +botania.page.decorativeBlocks15=Redquartz # -- DISPENSER TWEAKS botania.entry.dispenserTweaks=Dispenser Tweaks