diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java index 796400fc7..179a16775 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java @@ -13,19 +13,17 @@ import com.simibubi.create.content.contraptions.components.deployer.DeployerTile import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; -import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.BeehiveBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.EquipmentSlotType; @@ -39,13 +37,13 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; import net.minecraft.server.management.PlayerInteractionManager; -import net.minecraft.stats.Stats; -import net.minecraft.tileentity.BeehiveTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -53,6 +51,7 @@ import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceContext.BlockMode; import net.minecraft.util.math.RayTraceContext.FluidMode; import net.minecraft.util.math.Vec3d; +import net.minecraft.world.GameType; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.ForgeHooks; @@ -216,7 +215,7 @@ public class DeployerHandler { progress += before; if (progress >= 1) { - safeTryHarvestBlock(player.interactionManager, clickedPos); + tryHarvestBlock(player.interactionManager, clickedPos); world.sendBlockBreakProgress(player.getEntityId(), clickedPos, -1); player.blockBreakingProgress = null; return; @@ -255,11 +254,9 @@ public class DeployerHandler { boolean flag1 = !(player.isSneaking() && holdingSomething) || (stack.doesSneakBypassUse(world, clickedPos, player)); - if (clickedState.getBlock() instanceof BeehiveBlock) - return; // Beehives assume a lot about the usage context. Crashes to side-effects - // Use on block - if (useBlock != DENY && flag1 && clickedState.onUse(world, player, hand, result) == ActionResultType.SUCCESS) + if (useBlock != DENY && flag1 + && safeOnUse(clickedState, world, clickedPos, player, hand, result) == ActionResultType.SUCCESS) return; if (stack.isEmpty()) return; @@ -294,7 +291,8 @@ public class DeployerHandler { ActionResult onItemRightClick = item.onItemRightClick(itemUseWorld, player, hand); ItemStack resultStack = onItemRightClick.getResult(); - if (resultStack != stack || resultStack.getCount() != stack.getCount() || resultStack.getUseDuration() > 0 || resultStack.getDamage() != stack.getDamage()) { + if (resultStack != stack || resultStack.getCount() != stack.getCount() || resultStack.getUseDuration() > 0 + || resultStack.getDamage() != stack.getDamage()) { player.setHeldItem(hand, onItemRightClick.getResult()); } @@ -309,51 +307,89 @@ public class DeployerHandler { player.resetActiveHand(); } - private static boolean safeTryHarvestBlock(PlayerInteractionManager interactionManager, BlockPos clickedPos) { - BlockState state = interactionManager.world.getBlockState(clickedPos); - if (!(state.getBlock() instanceof BeehiveBlock)) - return interactionManager.tryHarvestBlock(clickedPos); - else { - harvestBeehive(interactionManager, state, clickedPos); - } + public static boolean tryHarvestBlock(PlayerInteractionManager interactionManager, BlockPos pos) { + // <> PlayerInteractionManager#tryHarvestBlock + + ServerWorld world = interactionManager.world; + ServerPlayerEntity player = interactionManager.player; + BlockState blockstate = world.getBlockState(pos); + GameType gameType = interactionManager.getGameType(); + + if (net.minecraftforge.common.ForgeHooks.onBlockBreakEvent(world, gameType, player, pos) == -1) + return false; + + TileEntity tileentity = world.getTileEntity(pos); + if (player.getHeldItemMainhand() + .onBlockStartBreak(pos, player)) + return false; + if (player.canMine(world, pos, gameType)) + return false; + + ItemStack prevHeldItem = player.getHeldItemMainhand(); + ItemStack heldItem = prevHeldItem.copy(); + + boolean canHarvest = blockstate.canHarvestBlock(world, pos, player); + prevHeldItem.onBlockDestroyed(world, blockstate, pos, player); + if (prevHeldItem.isEmpty() && !heldItem.isEmpty()) + net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, heldItem, Hand.MAIN_HAND); + if (!blockstate.removedByPlayer(world, pos, player, canHarvest, world.getFluidState(pos))) + return true; + + blockstate.getBlock() + .onPlayerDestroy(world, pos, blockstate); + if (!canHarvest) + return true; + + Block.getDrops(blockstate, world, pos, tileentity, player, prevHeldItem) + .forEach(item -> player.inventory.placeItemBackInInventory(world, item)); + blockstate.spawnAdditionalDrops(world, pos, prevHeldItem); return true; } - private static void harvestBeehive(PlayerInteractionManager interactionManager, BlockState state, - BlockPos clickedPos) { - // Modified code from PlayerInteractionManager, Block and BeehiveBlock to handle - // deployers breaking beehives without crash. - ItemStack itemstack = interactionManager.player.getHeldItemMainhand(); - ItemStack itemstack1 = itemstack.copy(); - - boolean flag1 = state.canHarvestBlock(interactionManager.world, clickedPos, interactionManager.player); - itemstack.onBlockDestroyed(interactionManager.world, state, clickedPos, interactionManager.player); - if (itemstack.isEmpty() && !itemstack1.isEmpty()) - net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(interactionManager.player, itemstack1, - Hand.MAIN_HAND); - - boolean flag = state.removedByPlayer(interactionManager.world, clickedPos, interactionManager.player, flag1, - interactionManager.world.getFluidState(clickedPos)); - if (flag) - state.getBlock() - .onPlayerDestroy(interactionManager.world, clickedPos, state); - - if (flag && flag1) { - interactionManager.player.addStat(Stats.BLOCK_MINED.get(state.getBlock())); - interactionManager.player.addExhaustion(0.005F); - TileEntity te = interactionManager.world.getTileEntity(clickedPos); - ItemStack heldItem = interactionManager.player.getHeldItemMainhand(); - Block.spawnDrops(state, interactionManager.world, clickedPos, te, interactionManager.player, heldItem); - - if (!interactionManager.world.isRemote && te instanceof BeehiveTileEntity) { - BeehiveTileEntity beehivetileentity = (BeehiveTileEntity) te; - if (EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, heldItem) == 0) { - interactionManager.world.updateComparatorOutputLevel(clickedPos, state.getBlock()); - } - - CriteriaTriggers.BEE_NEST_DESTROYED.test(interactionManager.player, - state.getBlock(), heldItem, beehivetileentity.getBeeCount()); - } - } + public static ActionResultType safeOnUse(BlockState state, World world, BlockPos pos, PlayerEntity player, + Hand hand, BlockRayTraceResult ray) { + if (state.getBlock() instanceof BeehiveBlock) + return safeOnBeehiveUse(state, world, pos, player, hand); + return state.onUse(world, player, hand, ray); } + + protected static ActionResultType safeOnBeehiveUse(BlockState state, World world, BlockPos pos, PlayerEntity player, + Hand hand) { + // <> BeehiveBlock#onUse + + BeehiveBlock block = (BeehiveBlock) state.getBlock(); + ItemStack prevHeldItem = player.getHeldItem(hand); + int honeyLevel = state.get(BeehiveBlock.HONEY_LEVEL); + boolean success = false; + if (honeyLevel < 5) + return ActionResultType.PASS; + + if (prevHeldItem.getItem() == Items.SHEARS) { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.field_226133_ah_, + SoundCategory.NEUTRAL, 1.0F, 1.0F); + // <> BeehiveBlock#dropHoneycomb + player.inventory.placeItemBackInInventory(world, new ItemStack(Items.field_226635_pU_, 3)); + prevHeldItem.damageItem(1, player, s -> s.sendBreakAnimation(hand)); + success = true; + } + + if (prevHeldItem.getItem() == Items.GLASS_BOTTLE) { + prevHeldItem.shrink(1); + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.ITEM_BOTTLE_FILL, + SoundCategory.NEUTRAL, 1.0F, 1.0F); + ItemStack honeyBottle = new ItemStack(Items.field_226638_pX_); + if (prevHeldItem.isEmpty()) + player.setHeldItem(hand, honeyBottle); + else + player.inventory.placeItemBackInInventory(world, honeyBottle); + success = true; + } + + if (!success) + return ActionResultType.PASS; + + block.takeHoney(world, state, pos); + return ActionResultType.SUCCESS; + } + } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java index f82785446..48f01d48b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java @@ -156,6 +156,8 @@ public class FluidPropagator { if (PumpBlock.isPump(connectedState) && connectedState.get(PumpBlock.FACING) .getAxis() == side.getAxis()) return false; + if (connectedState.has(BlockStateProperties.HONEY_LEVEL)) + return true; if (Block.hasSolidSide(connectedState, reader, connectedPos, side.getOpposite())) return false; if (!(connectedState.getMaterial() diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java index 785216484..3a085e7e1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java @@ -1,5 +1,8 @@ package com.simibubi.create.content.contraptions.fluids; +import static net.minecraft.state.properties.BlockStateProperties.HONEY_LEVEL; +import static net.minecraft.state.properties.BlockStateProperties.WATERLOGGED; + import java.util.List; import javax.annotation.Nullable; @@ -21,7 +24,6 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.PotionUtils; -import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tags.FluidTags; import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; @@ -71,7 +73,13 @@ public class OpenEndedPipe extends FlowSource { BlockState state = world.getBlockState(outputPos); IFluidState fluidState = state.getFluidState(); - boolean waterlog = state.has(BlockStateProperties.WATERLOGGED); + boolean waterlog = state.has(WATERLOGGED); + + if (state.has(HONEY_LEVEL) && state.get(HONEY_LEVEL) >= 5) { + if (!simulate) + world.setBlockState(outputPos, state.with(HONEY_LEVEL, 0), 3); + return new FluidStack(AllFluids.HONEY.get(), 250); + } if (!waterlog && !state.getMaterial() .isReplaceable()) @@ -83,11 +91,11 @@ public class OpenEndedPipe extends FlowSource { if (simulate) return stack; - + AllTriggers.triggerForNearbyPlayers(AllTriggers.PIPE_SPILL, world, pos, 5); if (waterlog) { - world.setBlockState(outputPos, state.with(BlockStateProperties.WATERLOGGED, false), 3); + world.setBlockState(outputPos, state.with(WATERLOGGED, false), 3); world.getPendingFluidTicks() .scheduleTick(outputPos, Fluids.WATER, 1); return stack; @@ -105,7 +113,7 @@ public class OpenEndedPipe extends FlowSource { BlockState state = world.getBlockState(outputPos); IFluidState fluidState = state.getFluidState(); - boolean waterlog = state.has(BlockStateProperties.WATERLOGGED); + boolean waterlog = state.has(WATERLOGGED); if (!waterlog && !state.getMaterial() .isReplaceable()) @@ -139,11 +147,11 @@ public class OpenEndedPipe extends FlowSource { 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); return true; } - + AllTriggers.triggerForNearbyPlayers(AllTriggers.PIPE_SPILL, world, pos, 5); if (waterlog) { - world.setBlockState(outputPos, state.with(BlockStateProperties.WATERLOGGED, true), 3); + world.setBlockState(outputPos, state.with(WATERLOGGED, true), 3); world.getPendingFluidTicks() .scheduleTick(outputPos, Fluids.WATER, 1); return true; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java index 67eb4c6e2..b28c60f7a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java @@ -142,6 +142,8 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWren public static boolean canConnectTo(ILightReader world, BlockPos neighbourPos, BlockState neighbour, Direction direction) { if (FluidPropagator.hasFluidCapability(world, neighbourPos, direction.getOpposite())) return true; + if (neighbour.has(BlockStateProperties.HONEY_LEVEL)) + return true; FluidTransportBehaviour transport = TileEntityBehaviour.get(world, neighbourPos, FluidTransportBehaviour.TYPE); BracketedTileEntityBehaviour bracket = TileEntityBehaviour.get(world, neighbourPos, BracketedTileEntityBehaviour.TYPE); if (isPipe(neighbour))