Skip to content

Align dispenser boat placement on ice with vanilla waterlogged behavior #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brandonhenness wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Align dispenser boat placement on ice with vanilla waterlogged behavior #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/main/java/carpetextra/dispenser/CarpetExtraDispenserBehaviors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,14 @@ else if(CauldronWaterDispenserBehavior.isWaterCauldronItem(stack)) {
}

// dispensersPlaceBoatsOnIce
if (CarpetExtraSettings.dispensersPlaceBoatsOnIce && item instanceof BoatItem && frontBlock == Blocks.AIR) {
BlockPos blockBelowFrontBlockPos = frontBlockPos.down();
if (world.getBlockState(blockBelowFrontBlockPos).isIn(BlockTags.ICE)) {
if (CarpetExtraSettings.dispensersPlaceBoatsOnIce && item instanceof BoatItem) {
BlockState frontState = world.getBlockState(frontBlockPos);

boolean iceInFront = frontState.isIn(BlockTags.ICE);
boolean airInFront = frontState.isAir();
boolean iceBelowFront = world.getBlockState(frontBlockPos.down()).isIn(BlockTags.ICE);

if (iceInFront || (airInFront && iceBelowFront)) {
return PLACE_BOAT_ON_ICE;
}
}
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/carpetextra/dispenser/behaviors/PlaceBoatOnIceDispenserBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package carpetextra.dispenser.behaviors;

import carpetextra.mixins.BoatItemAccessorMixin;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.DispenserBlock;
import net.minecraft.block.dispenser.FallibleItemDispenserBehavior;
import net.minecraft.entity.EntityType;
Expand All @@ -21,10 +18,10 @@ public class PlaceBoatOnIceDispenserBehavior extends FallibleItemDispenserBehavi

@Override
public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
this.setSuccess(true);
this.setSuccess(false);
ServerWorld world = pointer.world();
Direction facing = pointer.state().get(DispenserBlock.FACING);

BoatItemAccessorMixin boatInfo = (BoatItemAccessorMixin) stack.getItem();
EntityType<? extends AbstractBoatEntity> boatType = boatInfo.getType();

Expand All @@ -34,24 +31,27 @@ public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
double y = vec3d.getY() + facing.getOffsetY() * 1.125F;
double z = vec3d.getZ() + facing.getOffsetZ() * d;

BlockPos frontBlockPos = pointer.pos().offset(facing);
Block frontBlock = world.getBlockState(frontBlockPos).getBlock();
BlockState stateBelowFront = world.getBlockState(frontBlockPos.down());
BlockPos frontPos = pointer.pos().offset(facing);
boolean iceInFront = world.getBlockState(frontPos).isIn(BlockTags.ICE);
boolean airInFront = world.getBlockState(frontPos).isAir();
boolean iceBelowFront = world.getBlockState(frontPos.down()).isIn(BlockTags.ICE);

if (frontBlock == Blocks.AIR && stateBelowFront.isIn(BlockTags.ICE)) {
AbstractBoatEntity boatEntity = boatType.create(world, SpawnReason.DISPENSER);
if (!(iceInFront || (airInFront && iceBelowFront))) {
return stack;
}

boatEntity.initPosition(x, y, z);
EntityType.copier(world, stack, null).accept(boatEntity);
boatEntity.setYaw(facing.getPositiveHorizontalDegrees());
double h = iceInFront ? 1.0 : 0.0;

world.spawnEntity(boatEntity);
AbstractBoatEntity boat = boatType.create(world, SpawnReason.DISPENSER);
if (boat != null) {
boat.initPosition(x, y + h, z);
EntityType.copier(world, stack, null).accept(boat);
boat.setYaw(facing.getPositiveHorizontalDegrees());
world.spawnEntity(boat);
stack.decrement(1);
return stack;
this.setSuccess(true);
}

// fail to dispense
this.setSuccess(false);
return stack;
}
}