From 9d99c7184f2f4c91f2b0890d0cfff4ae4478474e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 19 Mar 2020 21:04:36 -0500 Subject: [PATCH] Account for nullable placer in onBlockPlacedBy. Closes #3215 --- .../vazkii/botania/api/subtile/TileEntitySpecialFlower.java | 2 +- .../vazkii/botania/common/block/BlockAnimatedTorch.java | 3 ++- .../botania/common/block/BlockFloatingSpecialFlower.java | 3 ++- .../vazkii/botania/common/block/BlockSpecialFlower.java | 3 ++- .../vazkii/botania/common/block/decor/BlockTinyPotato.java | 3 ++- .../vazkii/botania/common/block/mana/BlockSpreader.java | 6 +++--- .../vazkii/botania/common/block/tile/TileAnimatedTorch.java | 3 ++- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 6f6297c5a..17634ded3 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -232,7 +232,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile /** * Called when this sub tile is placed in the world (by an entity). */ - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {} + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {} /** * Called when a player right clicks this sub tile. diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index a0aac5cfc..4eab7dd9f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -36,6 +36,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileAnimatedTorch; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD { @@ -56,7 +57,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { ((TileAnimatedTorch) world.getTileEntity(pos)).onPlace(entity); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index afe1bbf35..e92d5d53a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -34,6 +34,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.decor.BlockFloatingFlower; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; import java.util.Random; import java.util.function.Supplier; @@ -100,7 +101,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 38ee01953..e02de97a7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -41,6 +41,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.item.material.ItemDye; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; import java.util.function.Supplier; @@ -134,7 +135,7 @@ public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandH } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index c729ebaf1..0541f15cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -37,6 +37,7 @@ import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class BlockTinyPotato extends BlockMod { @@ -87,7 +88,7 @@ public class BlockTinyPotato extends BlockMod { } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity par5EntityLiving, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity living, ItemStack stack) { if (stack.hasDisplayName()) ((TileTinyPotato) world.getTileEntity(pos)).name = stack.getDisplayName(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index af8bb84b6..2d0adb0d3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -74,8 +74,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { - Direction orientation = Direction.getFacingDirections(placer)[0].getOpposite(); + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { + Direction orientation = placer == null ? Direction.WEST : Direction.getFacingDirections(placer)[0].getOpposite(); TileSpreader spreader = (TileSpreader) world.getTileEntity(pos); switch(orientation) { @@ -93,7 +93,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir break; case WEST: break; - default: + case EAST: spreader.rotationX = 180F; break; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index fcda7c43a..25f45857d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -28,6 +28,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nullable; import java.util.Arrays; public class TileAnimatedTorch extends TileMod implements ITickableTileEntity { @@ -76,7 +77,7 @@ public class TileAnimatedTorch extends TileMod implements ITickableTileEntity { world.addBlockEvent(getPos(), ModBlocks.animatedTorch, 0, (side + 1) % 4); } - public void onPlace(LivingEntity entity) { + public void onPlace(@Nullable LivingEntity entity) { if(entity != null) { side = Arrays.asList(SIDES).indexOf(entity.getHorizontalFacing().getOpposite()); }