diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index a8d9da72c..d83ebdb4e 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -66,7 +66,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_HEISEI_DREAM, LibBlockNames.SUBTILE_TIGERSEYE, LibBlockNames.SUBTILE_ORECHID, - LibBlockNames.SUBTILE_FALLEN_KANADE + LibBlockNames.SUBTILE_FALLEN_KANADE, + LibBlockNames.SUBTILE_EXOFLAME }; protected BlockSpecialFlower() { diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index a869c0849..70cc9c095 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -17,6 +17,7 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; @@ -139,6 +140,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_JADED_AMARANTHUS, SubTileJadedAmaranthus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ORECHID, SubtileOrechid.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_FALLEN_KANADE, SubTileFallenKanade.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_EXOFLAME, SubTileExoflame.class); } private static void registerMultiparts() { @@ -152,4 +154,4 @@ public final class ModBlocks { } } -} +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java new file mode 100644 index 000000000..98460882f --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -0,0 +1,93 @@ +/** + * 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 @ [Mar 19, 2014, 3:42:32 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import net.minecraft.block.BlockFurnace; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityFurnace; +import vazkii.botania.api.subtile.SubTileFunctional; +import cpw.mods.fml.common.network.PacketDispatcher; + +public class SubTileExoflame extends SubTileFunctional { + + @Override + public void onUpdate() { + super.onUpdate(); + + int range = 5; + int rangeY = 2; + + fireFurnaces : { + for(int i = -range + 1; i < range; i++) + for(int j = -rangeY; j < rangeY; j++) + for(int k = -range + 1; k < range; k++) { + int x = supertile.xCoord + i; + int y = supertile.yCoord + j; + int z = supertile.zCoord + k; + + TileEntity tile = supertile.worldObj.getBlockTileEntity(x, y, z); + if(tile != null && tile instanceof TileEntityFurnace) { + TileEntityFurnace furnace = (TileEntityFurnace) tile; + boolean canSmelt = canFurnaceSmelt(furnace); + if(canSmelt && mana > 2) { + if(furnace.furnaceBurnTime < 2) { + if(furnace.furnaceBurnTime == 0) + BlockFurnace.updateFurnaceBlockState(true, supertile.worldObj, x, y, z); + furnace.furnaceBurnTime = 200; + } + if(supertile.worldObj.getTotalWorldTime() % 2 == 0) + furnace.furnaceCookTime = Math.min(199, furnace.furnaceCookTime + 1); + + mana -= 2; + + if(mana == 0) + break fireFurnaces; + } + } + } + } + } + + public boolean canFurnaceSmelt(TileEntityFurnace furnace){ + if(furnace.getStackInSlot(0) == null) + return false; + else { + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnace.getStackInSlot(0)); + + if(itemstack == null) + return false; + + if(furnace.getStackInSlot(2) == null) + return true; + + if(!furnace.getStackInSlot(2).isItemEqual(itemstack)) + return false; + + int result = furnace.getStackInSlot(2).stackSize + itemstack.stackSize; + return result <= 64 && result <= itemstack.getMaxStackSize(); + } + } + + + @Override + public int getMaxMana() { + return 300; + } + + @Override + public int getColor() { + return 0x661600; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 7b18442c5..362edfd13 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -50,5 +50,6 @@ public final class LibBlockNames { public static final String SUBTILE_JADED_AMARANTHUS = "jadedAmaranthus"; public static final String SUBTILE_ORECHID = "orechid"; public static final String SUBTILE_FALLEN_KANADE = "fallenKanade"; + public static final String SUBTILE_EXOFLAME = "exoflame"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 1c4a7a469..fba8f21e6 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -118,7 +118,7 @@ tile.botania:flower.puredaisy.reference=What color do you want to be? tile.botania:flower.daybloom.name=Daybloom tile.botania:flower.daybloom.reference=A Sting of light tile.botania:flower.endoflame.name=Endoflame -tile.botania:flower.endoflame.reference=An endotermic reaction +tile.botania:flower.endoflame.reference=An endothermic reaction tile.botania:flower.hydroangeas.name=Hydroangeas tile.botania:flower.hydroangeas.reference=Careful: Wet floor tile.botania:flower.thermalily.name=Thermalily @@ -141,6 +141,8 @@ tile.botania:flower.orechid.name=Orechid tile.botania:flower.orechid.reference=I seed what you did there tile.botania:flower.fallenKanade.name=Fallen Kanade tile.botania:flower.fallenKanade.reference=I'm not an Angel +tile.botania:flower.exoflame.name=Exoflame +tile.botania:flower.exoflame.reference=An exothermic reaction # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/resources/assets/botania/textures/blocks/exoflame.png b/resources/assets/botania/textures/blocks/exoflame.png new file mode 100644 index 000000000..3f2979495 Binary files /dev/null and b/resources/assets/botania/textures/blocks/exoflame.png differ