From 40bad433c874e0d8b77c660b9dcd4cb1bca8e060 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 22:13:45 -0600 Subject: [PATCH] Fel pumpkin can now be placed from dispensers --- .../botania/common/block/BlockFelPumpkin.java | 1 + .../botania/common/block/ModBlocks.java | 2 + .../block/dispenser/BehaviourFelPumpkin.java | 54 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 028ba8132..d30ffa9d4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -64,6 +64,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { public void onBlockAdded(World p_149726_1_, BlockPos pos, IBlockState state) { super.onBlockAdded(p_149726_1_, pos, state); + System.out.println("Added?"); if(!p_149726_1_.isRemote && p_149726_1_.getBlockState(pos.down()).getBlock() == Blocks.iron_bars && p_149726_1_.getBlockState(pos.down(2)).getBlock() == Blocks.iron_bars) { p_149726_1_.setBlockState(pos, Blocks.air.getDefaultState(), 2); p_149726_1_.setBlockState(pos.down(), Blocks.air.getDefaultState(), 2); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 143256ea7..b0aed942b 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -48,6 +48,7 @@ import vazkii.botania.common.block.decor.BlockStarfield; import vazkii.botania.common.block.decor.BlockThatch; import vazkii.botania.common.block.decor.BlockTinyPotato; import vazkii.botania.common.block.decor.BlockUnstable; +import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin; import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart; import vazkii.botania.common.block.dispenser.BehaviourSeeds; import vazkii.botania.common.block.dispenser.BehaviourWand; @@ -416,6 +417,7 @@ public final class ModBlocks { BlockDispenser.dispenseBehaviorRegistry.putObject(seed, new BehaviourSeeds(BotaniaAPI.seeds.get(seed))); BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.twigWand, new BehaviourWand()); BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); + BlockDispenser.dispenseBehaviorRegistry.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); } private static void initTileEntities() { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java new file mode 100644 index 000000000..e90e62177 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -0,0 +1,54 @@ +package vazkii.botania.common.block.dispenser; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockDispenser; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.common.block.ModBlocks; + +// Taken from vanilla pumpkin dispense behaviour +public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { + private boolean field_179241_b = true; + + @Override + protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) + { + World world = source.getWorld(); + BlockPos blockpos = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata())); + Block blockpumpkin = ModBlocks.felPumpkin; + + if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.iron_bars + && world.getBlockState(blockpos.down(2)).getBlock() == Blocks.iron_bars) // Botania - Check for iron bars + { + if (!world.isRemote) + { + world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); + } + + --stack.stackSize; + } + else + { + this.field_179241_b = false; + } + + return stack; + } + + @Override + protected void playDispenseSound(IBlockSource source) + { + if (this.field_179241_b) + { + source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0); + } + else + { + source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0); + } + } +}