Removed Poison Puffs

src/main/java/biomesoplenty/api/block/BOPBlocks.java

@@ -268,7 +268,6 @@ public class BOPBlocks
     public static Block bramble;
     public static Block toadstool;
     public static Block glowshroom;
-    public static Block poison_puff;
 
     public static Block potted_origin_sapling;
     public static Block potted_flowering_oak_sapling;
@@ -302,5 +301,4 @@ public class BOPBlocks
     public static Block potted_burning_blossom;
     public static Block potted_toadstool;
     public static Block potted_glowshroom;
-    public static Block potted_poison_puff;
 }

src/main/java/biomesoplenty/common/block/MushroomBlockBOP.java

@@ -43,48 +43,9 @@ public class MushroomBlockBOP extends MushroomBlock
         Block ground = worldIn.getBlockState(pos.down()).getBlock();
         BlockState BlockState = worldIn.getBlockState(pos.down());
 
-        if (this == BOPBlocks.poison_puff)
-        {
-            return ground == Blocks.END_STONE || BlockState.canSustainPlant(worldIn, pos.down(), net.minecraft.util.Direction.UP, this);
-        }
-
         return BlockState.canSustainPlant(worldIn, pos.down(), net.minecraft.util.Direction.UP, this);
     }
 
-    @Override
-    @OnlyIn(Dist.CLIENT)
-    public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand)
-    {
-        super.animateTick(stateIn, worldIn, pos, rand);
-        Block block = stateIn.getBlock();
-
-        if (block == BOPBlocks.poison_puff)
-        {
-            if (rand.nextInt(8) == 0)
-            {
-                worldIn.addParticle(ParticleTypes.SNEEZE, (double)(pos.getX() + 0.5D), (double)(pos.getY() + 0.5D), (double)(pos.getZ() + 0.5D), (rand.nextDouble() - rand.nextDouble()) / 10.0D, (rand.nextDouble() - rand.nextDouble()) / 10.0D, (rand.nextDouble() - rand.nextDouble()) / 10.0D);
-            }
-        }
-    }
-
-    @Override
-    public void onEntityCollision(BlockState stateIn, World worldIn, BlockPos pos, Entity entityIn)
-    {
-        Block block = stateIn.getBlock();
-
-        if (!worldIn.isRemote && worldIn.getDifficulty() != Difficulty.PEACEFUL)
-        {
-            if (block == BOPBlocks.poison_puff)
-            {
-                if (entityIn instanceof LivingEntity)
-                {
-                    LivingEntity livingentity = (LivingEntity) entityIn;
-                    livingentity.addPotionEffect(new EffectInstance(Effects.POISON, 50));
-                }
-            }
-        }
-    }
-
     @Override
     public boolean generateBigMushroom(IWorld worldIn, BlockPos pos, BlockState state, Random rand)
     {

src/main/java/biomesoplenty/init/ModBlocks.java

@@ -295,7 +295,6 @@ public class ModBlocks
         bramble = registerBlock(new BrambleBlock(Block.Properties.create(Material.PLANTS, MaterialColor.NETHERRACK).hardnessAndResistance(0.4F).harvestLevel(0).harvestTool(ToolType.AXE).sound(SoundType.WOOD)), "bramble");
         toadstool = registerBlock(new MushroomBlockBOP(Block.Properties.create(Material.PLANTS, MaterialColor.ADOBE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "toadstool");
         glowshroom = registerBlock(new MushroomBlockBOP(Block.Properties.create(Material.PLANTS, MaterialColor.DIAMOND).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT).lightValue(6)), "glowshroom");
-        poison_puff = registerBlock(new MushroomBlockBOP(Block.Properties.create(Material.PLANTS, MaterialColor.BLUE_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "poison_puff");
 
         //Potted Plants
         potted_origin_sapling = registerBlockNoGroup(new FlowerPotBlock(origin_sapling, Block.Properties.create(Material.MISCELLANEOUS).zeroHardnessAndResistance()), "potted_origin_sapling");
@@ -330,7 +329,6 @@ public class ModBlocks
         potted_burning_blossom = registerBlockNoGroup(new FlowerPotBlock(burning_blossom, Block.Properties.create(Material.MISCELLANEOUS).zeroHardnessAndResistance().lightValue(7)), "potted_burning_blossom");
         potted_toadstool = registerBlockNoGroup(new FlowerPotBlock(toadstool, Block.Properties.create(Material.MISCELLANEOUS).zeroHardnessAndResistance()), "potted_toadstool");
         potted_glowshroom = registerBlockNoGroup(new FlowerPotBlock(glowshroom, Block.Properties.create(Material.MISCELLANEOUS).zeroHardnessAndResistance().lightValue(6)), "potted_glowshroom");
-        potted_poison_puff = registerBlockNoGroup(new FlowerPotBlock(poison_puff, Block.Properties.create(Material.MISCELLANEOUS).zeroHardnessAndResistance()), "potted_poison_puff");
     }
 
     public static Block registerBlock(Block block, String name)

src/main/resources/assets/biomesoplenty/blockstates/poison_puff.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "biomesoplenty:block/poison_puff" }
-    }
-}

src/main/resources/assets/biomesoplenty/blockstates/potted_poison_puff.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "biomesoplenty:block/potted_poison_puff" }
-    }
-}

src/main/resources/assets/biomesoplenty/lang/en_us.json

@@ -274,7 +274,6 @@
   "block.biomesoplenty.pink_cherry_sapling": "Pink Cherry Sapling",
   "block.biomesoplenty.pink_daffodil": "Pink Daffodil",
   "block.biomesoplenty.pink_hibiscus": "Pink Hibiscus",
-  "block.biomesoplenty.poison_puff": "Poison Puff",
   "block.biomesoplenty.potted_blue_hydrangea": "Potted Blue Hydrangea",
   "block.biomesoplenty.potted_burning_blossom": "Potted Burning Blossom",
   "block.biomesoplenty.potted_dead_sapling": "Potted Dead Sapling",
@@ -297,7 +296,6 @@
   "block.biomesoplenty.potted_pink_cherry_sapling": "Potted Pink Cherry Sapling",
   "block.biomesoplenty.potted_pink_daffodil": "Potted Pink Daffodil",
   "block.biomesoplenty.potted_pink_hibiscus": "Potted Pink Hibiscus",
-  "block.biomesoplenty.potted_poison_puff": "Potted Poison Puff",
   "block.biomesoplenty.potted_redwood_sapling": "Potted Redwood Sapling",
   "block.biomesoplenty.potted_rose": "Potted Rose",
   "block.biomesoplenty.potted_toadstool": "Potted Toadstool",

src/main/resources/assets/biomesoplenty/models/block/poison_puff.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "biomesoplenty:blocks/poison_puff"
-    }
-}

src/main/resources/assets/biomesoplenty/models/block/potted_poison_puff.json

@@ -1,6 +0,0 @@
-{
-    "parent": "minecraft:block/flower_pot_cross",
-    "textures": {
-        "plant": "biomesoplenty:blocks/potted_poison_puff"
-    }
-}

src/main/resources/assets/biomesoplenty/models/item/poison_puff.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:blocks/poison_puff"
-    }
-}

src/main/resources/assets/biomesoplenty/models/item/potted_poison_puff.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/flower_pot"
-    }
-}