Skip to content

Make Peculiar Bell Transformation Pull from Haunting Catalyst Tag #8376

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
wants to merge 8 commits into
base: mc1.20.1/dev
Choose a base branch
from
Open

Make Peculiar Bell Transformation Pull from Haunting Catalyst Tag #8376

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0d39f9
Make Peculiar Bell Transformation Pull from Haunting Catalyst Tag
Attack8 Apr 29, 2025
a0ea752
Merge branch 'Creators-of-Create:mc1.20.1/dev' into mc1.20.1/peculiar…
Attack8 May 14, 2025
29e8b40
Change to using HauntingType$isValidAt
Attack8 May 14, 2025
aa8ae2b
Merge remote-tracking branch 'origin/mc1.20.1/peculiar-transformation…
Attack8 May 14, 2025
b4ff42d
Revert API changes
Attack8 May 15, 2025
c4c8f63
Remove unused import
Attack8 May 15, 2025
598adbc
Remove some redundancy
Attack8 May 15, 2025
5c33ac5
Commit Suggestion
Attack8 May 26, 2025
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
19 changes: 9 additions & 10 deletions src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllSoundEvents;

import com.simibubi.create.content.kinetics.fan.processing.AllFanProcessingTypes.HauntingType;

import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;
Expand Down Expand Up @@ -46,31 +46,30 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx) {

Level world = ctx.getLevel();
BlockPos pos = ctx.getClickedPos();
return tryConvert(world, pos, newState, world.getBlockState(pos.relative(Direction.DOWN)));
return tryConvert(world, pos, newState);
}

@Override
public BlockState updateShape(BlockState state, Direction facing, BlockState facingState, LevelAccessor world,
BlockPos currentPos, BlockPos facingPos) {
BlockState newState = super.updateShape(state, facing, facingState, world, currentPos, facingPos);
if (facing != Direction.DOWN)
if (facing != Direction.DOWN || !(world instanceof Level level))
return newState;

return tryConvert(world, currentPos, newState, facingState);
return tryConvert(level, currentPos, newState);
}

protected BlockState tryConvert(LevelAccessor world, BlockPos pos, BlockState state, BlockState underState) {
protected BlockState tryConvert(Level world, BlockPos pos, BlockState state) {
if (!AllBlocks.PECULIAR_BELL.has(state))
return state;

Block underBlock = underState.getBlock();
if (!(Blocks.SOUL_FIRE.equals(underBlock) || Blocks.SOUL_CAMPFIRE.equals(underBlock)))
if (!AllFanProcessingTypes.HAUNTING.isValidAt(world, pos.below()))
return state;

if (world.isClientSide()) {
spawnConversionParticles(world, pos);
} else if (world instanceof Level) {
AllSoundEvents.HAUNTED_BELL_CONVERT.playOnServer((Level) world, pos);
} else {
AllSoundEvents.HAUNTED_BELL_CONVERT.playOnServer(world, pos);
}

return AllBlocks.HAUNTED_BELL.getDefaultState()
Expand Down
Loading