Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
builder.add(CompactInterfaceAccess.INTERFACE);
}

@Override
public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
CompactMachineDrops.dropForCreativePlayer(level, pos, state, player);
return super.playerWillDestroy(level, pos, state, player);
}

@Override
protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player,
BlockHitResult hitResult) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
builder.add(CompactInterfaceAccess.INTERFACE);
}

@Override
public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
CompactMachineDrops.dropForCreativePlayer(level, pos, state, player);
return super.playerWillDestroy(level, pos, state, player);
}

@Override
protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player,
BlockHitResult hitResult) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
builder.add(CompactInterfaceAccess.INTERFACE);
}

@Override
public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
CompactMachineDrops.dropForCreativePlayer(level, pos, state, player);
return super.playerWillDestroy(level, pos, state, player);
}

@Override
protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player,
BlockHitResult hitResult) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.sorrowmist.useless.compat.neoecoae.compact.block;

import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;

/** 紧凑机器在创造模式下也通过原有掉落链路保留机器数据。 */
final class CompactMachineDrops {
private CompactMachineDrops() {
}

static void dropForCreativePlayer(Level level, BlockPos pos, BlockState state, Player player) {
if (!level.isClientSide() && player.isCreative()) {
// 必须在 onRemove 拆除集群和方块实体之前生成掉落,才能导出设置、存储域和样板引用。
Block.dropResources(state, level, pos, level.getBlockEntity(pos), player, ItemStack.EMPTY);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package com.sorrowmist.useless.compat.neoecoae.compact.block;

import com.sorrowmist.useless.InventoryTestBootstrap;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import static org.mockito.Mockito.*;

class CompactMachineDropsTest {
@BeforeAll
static void bootstrap() {
InventoryTestBootstrap.initialize();
}

@Test
void creativeBreakUsesExistingLootPathWithTheLiveBlockEntity() {
Level level = mock(Level.class);
Player player = mock(Player.class);
BlockState state = mock(BlockState.class);
BlockEntity blockEntity = mock(BlockEntity.class);
BlockPos pos = new BlockPos(12, 64, -8);
when(player.isCreative()).thenReturn(true);
when(level.getBlockEntity(pos)).thenReturn(blockEntity);

try (var drops = mockStatic(Block.class)) {
CompactMachineDrops.dropForCreativePlayer(level, pos, state, player);

drops.verify(() -> Block.dropResources(state, level, pos, blockEntity, player, ItemStack.EMPTY));
drops.verifyNoMoreInteractions();
verify(level).isClientSide();
verify(level).getBlockEntity(pos);
verifyNoMoreInteractions(level);
}
}

@Test
void survivalBreakLeavesDropsToTheNormalHarvestPath() {
Level level = mock(Level.class);
Player player = mock(Player.class);
BlockState state = mock(BlockState.class);

try (var drops = mockStatic(Block.class)) {
CompactMachineDrops.dropForCreativePlayer(level, BlockPos.ZERO, state, player);

drops.verifyNoInteractions();
verify(level).isClientSide();
verifyNoMoreInteractions(level);
}
}

@Test
void clientDoesNotReadTheBlockEntityOrSpawnDuplicateDrops() {
Level level = mock(Level.class);
when(level.isClientSide()).thenReturn(true);
Player player = mock(Player.class);
BlockState state = mock(BlockState.class);

try (var drops = mockStatic(Block.class)) {
CompactMachineDrops.dropForCreativePlayer(level, BlockPos.ZERO, state, player);

drops.verifyNoInteractions();
verify(level).isClientSide();
verifyNoMoreInteractions(level);
verifyNoInteractions(player);
}
}
}
Loading