diff --git a/src/main/java/com/simibubi/create/api/behaviour/movement/MovementBehaviour.java b/src/main/java/com/simibubi/create/api/behaviour/movement/MovementBehaviour.java index 83a6ba6095..9cde8b9aff 100644 --- a/src/main/java/com/simibubi/create/api/behaviour/movement/MovementBehaviour.java +++ b/src/main/java/com/simibubi/create/api/behaviour/movement/MovementBehaviour.java @@ -66,7 +66,7 @@ default boolean mustTickWhileDisabled() { return false; } - default void dropItem(MovementContext context, ItemStack stack) { + default void collectOrDropItem(MovementContext context, ItemStack stack) { ItemStack remainder; if (AllConfigs.server().kinetics.moveItemsToStorage.get()) remainder = ItemHandlerHelper.insertItem(context.contraption.getStorage().getAllItems(), stack, false); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java index d2e199ce1c..55b6ebee71 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java @@ -90,7 +90,7 @@ public void visitNewPosition(MovementContext context, BlockPos pos) { stack.shrink(1); seedSubtracted.setTrue(); } - dropItem(context, stack); + collectOrDropItem(context, stack); }); BlockState cutCrop = cutCrop(world, pos, stateVisited); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java index 7448ea6c5a..0a0cd6bad1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java @@ -125,7 +125,7 @@ protected void onBlockBroken(MovementContext context, BlockPos pos, BlockState b .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos)) .withParameter(LootContextParams.THIS_ENTITY, getPlayer(context)) .withParameter(LootContextParams.TOOL, new ItemStack(Items.IRON_SHOVEL))) - .forEach(s -> dropItem(context, s)); + .forEach(s -> collectOrDropItem(context, s)); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java index 5c2a5d90bd..f43abc3b54 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java @@ -178,7 +178,7 @@ protected void destroyBlock(MovementContext context, BlockPos breakingPos) { BlockHelper.destroyBlock(context.world, breakingPos, 1f, stack -> { if (noHarvest || context.world.random.nextBoolean()) return; - this.dropItem(context, stack); + this.collectOrDropItem(context, stack); }); super.destroyBlock(context, breakingPos); diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java index bdac042324..b5c2c85af6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java @@ -218,7 +218,7 @@ public void tickBreaker(MovementContext context) { } protected void destroyBlock(MovementContext context, BlockPos breakingPos) { - BlockHelper.destroyBlock(context.world, breakingPos, 1f, stack -> this.dropItem(context, stack)); + BlockHelper.destroyBlock(context.world, breakingPos, 1f, stack -> this.collectOrDropItem(context, stack)); } protected float getBlockBreakingSpeed(MovementContext context) { diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java index 7af9ef6df1..fc1fab7ab3 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java @@ -259,7 +259,7 @@ private void tryDisposeOfExcess(MovementContext context) { if (list == inv.items && i == inv.selected && filter.test(context.world, itemstack)) continue; - dropItem(context, itemstack); + collectOrDropItem(context, itemstack); list.set(i, ItemStack.EMPTY); } }