From cf1b004aa1bc9fed81e0264ae6f92c18271ac86a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 17 Apr 2015 20:50:38 +0100 Subject: [PATCH] Added Blaze Light. --- .../botania/common/block/ModBlocks.java | 6 ++- .../common/block/decor/BlockBlaze.java | 50 +++++++++++++++++++ .../common/core/BotaniaCreativeTab.java | 2 + .../common/crafting/ModCraftingRecipes.java | 8 +++ .../common/crafting/ModPureDaisyRecipes.java | 2 + .../vazkii/botania/common/item/ModItems.java | 2 + .../botania/common/lexicon/LexiconData.java | 5 ++ .../botania/common/lib/LibBlockNames.java | 1 + .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../vazkii/botania/common/lib/LibOreDict.java | 2 +- .../resources/assets/botania/lang/en_US.lang | 6 +++ 11 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 22db2a5f0..b0a8bdce0 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -21,6 +21,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.corporea.BlockCorporeaFunnel; import vazkii.botania.common.block.corporea.BlockCorporeaIndex; +import vazkii.botania.common.block.decor.BlockBlaze; import vazkii.botania.common.block.decor.BlockBuriedPetals; import vazkii.botania.common.block.decor.BlockCustomBrick; import vazkii.botania.common.block.decor.BlockDirtPath; @@ -214,6 +215,7 @@ public final class ModBlocks { public static Block doubleFlower1; public static Block doubleFlower2; public static Block fakeAir; + public static Block blazeBlock; public static void init() { flower = new BlockModFlower(); @@ -281,7 +283,8 @@ public final class ModBlocks { doubleFlower1 = new BlockModDoubleFlower(false); doubleFlower2 = new BlockModDoubleFlower(true); fakeAir = new BlockFakeAir(); - + blazeBlock = new BlockBlaze(); + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) @@ -297,6 +300,7 @@ public final class ModBlocks { } OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[i], new ItemStack(ModFluffBlocks.stone, 1, i)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java new file mode 100644 index 000000000..aee3127eb --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -0,0 +1,50 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Apr 17, 2015, 7:55:33 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { + + public BlockBlaze() { + super(Material.iron); + setHardness(3F); + setResistance(10F); + setStepSound(soundTypeMetal); + setLightLevel(1F); + setBlockName(LibBlockNames.BLAZE_BLOCK); + GameRegistry.registerFuelHandler(this); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.blazeBlock; + } + + @Override + public int getBurnTime(ItemStack fuel) { + return fuel.getItem() == Item.getItemFromBlock(this) ? TileEntityFurnace.getItemBurnTime(new ItemStack(Items.blaze_rod)) * 9 : 0; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 618c4e7c5..47e4dacdd 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -263,6 +263,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.darkPrismarineStairs); addBlock(ModFluffBlocks.darkPrismarineSlab); + addBlock(ModBlocks.blazeBlock); + addBlock(ModBlocks.reedBlock); addBlock(ModFluffBlocks.reedStairs); addBlock(ModFluffBlocks.reedSlab); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index f87239f41..f721c1108 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -252,6 +252,7 @@ public final class ModCraftingRecipes { public static List recipe18StonePolish; public static List recipe18StoneBrick; public static List recipe18StoneChisel; + public static IRecipe recipeBlazeBlock; public static void init() { // Lexicon Recipe @@ -1672,6 +1673,13 @@ public final class ModCraftingRecipes { recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); } + // Blaze Light Recipe + addOreDictRecipe(new ItemStack(ModBlocks.blazeBlock), + "BBB", "BBB", "BBB", + 'B', "rodBlaze"); + recipeBlazeBlock = BotaniaAPI.getLatestAddedRecipe(); + addShapelessOreDictRecipe(new ItemStack(Items.blaze_rod, 9), LibOreDict.BLAZE_BLOCK); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java index b8bc533b8..5ba2fd62e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java @@ -12,6 +12,7 @@ package vazkii.botania.common.crafting; import net.minecraft.init.Blocks; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibOreDict; import vazkii.botania.api.BotaniaAPI; public final class ModPureDaisyRecipes { @@ -23,6 +24,7 @@ public final class ModPureDaisyRecipes { BotaniaAPI.registerPureDaisyRecipe("netherrack", Blocks.cobblestone, 0); BotaniaAPI.registerPureDaisyRecipe("soulSand", Blocks.sand, 0); BotaniaAPI.registerPureDaisyRecipe("ice", Blocks.packed_ice, 0); + BotaniaAPI.registerPureDaisyRecipe(LibOreDict.BLAZE_BLOCK, Blocks.obsidian, 0); } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 84efe4a05..75febe26c 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -405,5 +405,7 @@ public final class ModItems { int max = Item.getIdFromItem(Items.record_wait); for(int i = min; i <= max; i++) BotaniaAPI.blackListItemFromLoonium(Item.getItemById(i)); + + OreDictionary.registerOre("rodBlaze", Items.blaze_rod); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 1ec7dc763..40da296b2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -240,6 +240,7 @@ public final class LexiconData { public static LexiconEntry mushrooms; public static LexiconEntry phantomInk; public static LexiconEntry stoneAlchemy; + public static LexiconEntry blazeBlock; public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; @@ -881,6 +882,10 @@ public final class LexiconData { stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StonePolish), new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneBrick), new PageCraftingRecipe("4", ModCraftingRecipes.recipe18StoneChisel)); } + blazeBlock = new BLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); + blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); + LexiconRecipeMappings.map(new ItemStack(Blocks.obsidian), blazeBlock, 0); + if(Botania.bcTriggersLoaded) { bcIntegration = new BLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index f30125223..a0dd6fa35 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -80,6 +80,7 @@ public final class LibBlockNames { public static final String DOUBLE_FLOWER = "doubleFlower"; public static final String STONE = "stone"; public static final String FAKE_AIR = "fakeAir"; + public static final String BLAZE_BLOCK = "blazeBlock"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index ee12f0de9..295dcae14 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -212,6 +212,7 @@ public final class LibLexicon { public static final String MISC_MUSHROOMS = "mushrooms"; public static final String MISC_PHANTOM_INK = "phantomInk"; public static final String MISC_STONE_ALCHEMY = "stoneAlchemy"; + public static final String MISC_BLAZE_BLOCK = "blazeBlock"; public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index c56c85a05..5d60dc44a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -40,7 +40,7 @@ public final class LibOreDict { public static final String FLASK = "bFlask"; public static final String PRISMARINE_BLOCK = "blockPrismarine"; - + public static final String BLAZE_BLOCK = "blockBlaze"; public static final String[] FLOWER = new String[] { "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 49d20f5d1..9257e72e3 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -902,6 +902,7 @@ tile.botania:stone8Slab.name=Andesite Brick Slab tile.botania:stone9Slab.name=Basalt Brick Slab tile.botania:stone10Slab.name=Diorite Brick Slab tile.botania:stone11Slab.name=Granite Brick Slab +tile.botania:blazeBlock.name=Blaze Lamp # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -2665,6 +2666,11 @@ botania.page.stoneAlchemy2=Polish botania.page.stoneAlchemy3=Brickage botania.page.stoneAlchemy4=Chiseling +# -- BLAZE LIGHT +botania.entry.blazeBlock=Blaze Light +botania.page.blazeBlock0=Smashing a bunch of &1Blaze Rods&0 together makes a usable decorative light block. A crude one, admittedly, but a source of light non the less.
Naturally, like a &1Block of Coal&0, the &1Blaze Light&0 can also be used to fuel furnaces and other fuel consumers alike. Putting it next to a &1Pure Daisy&0 converts it into &1Obsidian&0, strangely enough. +botania.page.blazeBlock1=0x1a4 + # -- THAUMCRAFT INTEGRATION botania.entry.tcIntegration=Thaumcraft Integration botania.page.tcIntegration0=Often enough, the paths of &4Botany&0 and &4Thaumaturgy&0 cross together. Mixing some of the artifacts mentioned in this book as well as any from the school of &5Thaumcraft&0 can allow for combinations of these to form.