diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 73be3c273..996eb651e 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -72,6 +72,7 @@ import vazkii.botania.common.block.dispenser.BehaviourSeeds; import vazkii.botania.common.block.dispenser.BehaviourWand; import vazkii.botania.common.block.string.BlockRedStringContainer; import vazkii.botania.common.block.string.BlockRedStringDispenser; +import vazkii.botania.common.block.string.BlockRedStringFertilizer; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; @@ -132,6 +133,7 @@ import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; +import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; @@ -188,6 +190,7 @@ public final class ModBlocks { public static Block terraPlate; public static Block redStringContainer; public static Block redStringDispenser; + public static Block redStringFertilizer; public static Block livingwoodStairs; public static Block livingwoodSlab; @@ -312,6 +315,7 @@ public final class ModBlocks { terraPlate = new BlockTerraPlate(); redStringContainer = new BlockRedStringContainer(); redStringDispenser = new BlockRedStringDispenser(); + redStringFertilizer = new BlockRedStringFertilizer(); livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); @@ -494,6 +498,7 @@ public final class ModBlocks { registerTile(TileTerraPlate.class, LibBlockNames.TERRA_PLATE); registerTile(TileRedStringContainer.class, LibBlockNames.RED_STRING_CONTAINER); registerTile(TileRedStringDispenser.class, LibBlockNames.RED_STRING_DISPENSER); + registerTile(TileRedStringFertilizer.class, LibBlockNames.RED_STRING_FERTILIZER); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java new file mode 100644 index 000000000..49c6f25ee --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -0,0 +1,48 @@ +/** + * 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 @ [Nov 16, 2014, 7:10:46 PM (GMT)] + */ +package vazkii.botania.common.block.string; + +import java.util.Random; + +import net.minecraft.block.IGrowable; +import net.minecraft.world.World; +import vazkii.botania.common.block.tile.string.TileRedString; +import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { + + public BlockRedStringFertilizer() { + super(LibBlockNames.RED_STRING_FERTILIZER); + } + + @Override + public boolean func_149851_a(World world, int x, int y, int z, boolean something) { + return ((TileRedStringFertilizer) world.getTileEntity(x, y, z)).func_149851_a(world, something); + } + + @Override + public boolean func_149852_a(World world, Random rand, int x, int y, int z) { + return ((TileRedStringFertilizer) world.getTileEntity(x, y, z)).func_149852_a(world, rand); + } + + @Override + public void func_149853_b(World world, Random rand, int x, int y, int z) { + ((TileRedStringFertilizer) world.getTileEntity(x, y, z)).func_149853_b(world, rand); + } + + @Override + public TileRedString createNewTileEntity(World world, int meta) { + return new TileRedStringFertilizer(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 56b078a58..bca6651d2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.tile.string; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; @@ -80,5 +82,10 @@ public abstract class TileRedString extends TileMod implements ITileBound { ChunkCoordinates binding = getBinding(); return binding == null ? null : worldObj.getTileEntity(binding.posX, binding.posY, binding.posZ); } + + public Block getBlockAtBinding() { + ChunkCoordinates binding = getBinding(); + return binding == null ? Blocks.air : worldObj.getBlock(binding.posX, binding.posY, binding.posZ); + } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java new file mode 100644 index 000000000..8a968dd6f --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -0,0 +1,49 @@ +/** + * 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 @ [Nov 16, 2014, 7:17:16 PM (GMT)] + */ +package vazkii.botania.common.block.tile.string; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.IGrowable; +import net.minecraft.init.Blocks; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; + +public class TileRedStringFertilizer extends TileRedString { + + public boolean func_149851_a(World p_149851_1_, boolean p_149851_5_) { + ChunkCoordinates binding = getBinding(); + Block block = getBlockAtBinding(); + + return block instanceof IGrowable ? ((IGrowable) block).func_149851_a(p_149851_1_, binding.posX, binding.posY, binding.posZ, p_149851_5_) : false; + } + + public boolean func_149852_a(World p_149852_1_, Random p_149852_2_) { + ChunkCoordinates binding = getBinding(); + Block block = getBlockAtBinding(); + return block instanceof IGrowable ? ((IGrowable) block).func_149852_a(p_149852_1_, p_149852_2_, binding.posX, binding.posY, binding.posZ) : false; + } + + public void func_149853_b(World p_149853_1_, Random p_149853_2_) { + ChunkCoordinates binding = getBinding(); + Block block = getBlockAtBinding(); + if(block instanceof IGrowable) + ((IGrowable) block).func_149853_b(p_149853_1_, p_149853_2_, binding.posX, binding.posY, binding.posZ); + } + + @Override + public boolean acceptBlock(int x, int y, int z) { + return worldObj.getBlock(x, y, z) instanceof IGrowable; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 917ea33f4..d00ebe584 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -113,6 +113,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.redStringContainer); addBlock(ModBlocks.redStringDispenser); + addBlock(ModBlocks.redStringFertilizer); addBlock(ModBlocks.shinyFlower); addBlock(ModBlocks.miniIsland); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index dc4690172..be38f8b84 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -63,6 +63,7 @@ public final class LibBlockNames { public static final String TERRA_PLATE = "terraPlate"; public static final String RED_STRING_CONTAINER = "redStringContainer"; public static final String RED_STRING_DISPENSER = "redStringDispenser"; + public static final String RED_STRING_FERTILIZER = "redStringFertilizer"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 05c549e8f..70f808e18 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -495,6 +495,8 @@ tile.botania:manaGlass.name=Managlass tile.botania:terraPlate.name=Terrestrial Agglomeration Plate tile.botania:redStringContainer.name=Red Stringed Container tile.botania:redStringDispenser.name=Red Stringed Dispenser +tile.botania:redStringFertilizer.name=Red Stringed Nutrifier +tile.botania:redStringDetonator.name=Red Stringed Detonator # FLOWER NAMES tile.botania:flower..name=Botania Flower