Skip to content

use same handle as solid substitution block #847

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
Raycoms wants to merge 3 commits into
base: version/main
Choose a base branch
from
Open

use same handle as solid substitution block #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06a4a1b
use same handle as solid substitution block
Raycoms Jul 18, 2026
252b4ca
Merge remote-tracking branch 'origin/version/main' into fix/unopt-wor…
Raycoms Jul 18, 2026
82d6992
fix compile issues
Raycoms Jul 18, 2026
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
4 changes: 2 additions & 2 deletions ...dtteam/structurize/placement/handlers/placement/BlockTagSubstitutionPlacementHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public ActionProcessingResult handle(
world.setBlock(pos, blockState, UPDATE_FLAG);
if (tileEntityData != null)
{
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror());
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror().getRotationMirror());
}
return ActionProcessingResult.PASS;
}
Expand All @@ -85,7 +85,7 @@ public ActionProcessingResult handle(

if (tileEntityData != null)
{
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror());
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror().getRotationMirror());
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/ldtteam/structurize/placement/handlers/placement/DoBlockPlacementHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public ActionProcessingResult handle(
{
try
{
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror());
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror().getRotationMirror());
placementState.getBlock().setPlacedBy(world, pos, placementState, null, placementState.getBlock().getCloneItemStack(placementState,
new BlockHitResult(new Vec3(0, 0, 0), Direction.NORTH, pos, false), world, pos, null));
}
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/ldtteam/structurize/placement/handlers/placement/DoDoorBlockPlacementHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public ActionProcessingResult handle(
{
try
{
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror());
handleTileEntityPlacement(tileEntityData, world, pos.above(), placementContext.getRotationMirror());
handleTileEntityPlacement(tileEntityData, world, pos, placementContext.getRotationMirror().getRotationMirror());
handleTileEntityPlacement(tileEntityData, world, pos.above(), placementContext.getRotationMirror().getRotationMirror());
}
catch (final Exception ex)
{
Expand Down
31 changes: 2 additions & 29 deletions src/main/java/com/ldtteam/structurize/placement/handlers/placement/PlacementHandlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,22 +350,7 @@ public List<ItemStack> getRequiredItems(

if (!BlockUtils.isAnySolid(world.getBlockState(pos.below())))
{
BlockPos posBelow = pos;
BlockState supportBlockState = Blocks.DIRT instanceof Fallable ? Blocks.STONE.defaultBlockState() : Blocks.DIRT.defaultBlockState();
for (int i = 0; i < 10; i++) // try up to ten blocks below for solid worldgen
{
posBelow = posBelow.below();
final boolean isFirstTest = i == 0;
final BlockState possibleSupport = BlockUtils.getWorldgenBlock(world, posBelow, bp -> isFirstTest ? blockState : null);
if (possibleSupport != null && BlockUtils.canBlockFloatInAir(possibleSupport) && !canHandle(world,
posBelow,
possibleSupport))
{
supportBlockState = possibleSupport;
break;
}
}

BlockState supportBlockState = placementContext.getSolidBlockForPos(pos, placementContext.getBluePrint().getRawBlockStateFunction());
if (canHandle(world, pos, supportBlockState))
{
Log.getLogger().warn("Unable to use: " + supportBlockState + " as support for a falling block, it is either a falling black itself or made fallable");
Expand Down Expand Up @@ -393,19 +378,7 @@ public ActionProcessingResult handle(

if (!BlockUtils.isAnySolid(world.getBlockState(pos.below())))
{
BlockPos posBelow = pos;
BlockState supportBlockState = Blocks.DIRT.defaultBlockState();
for (int i = 0; i < 10; i++) // try up to ten blocks below for solid worldgen
{
posBelow = posBelow.below();
final boolean isFirstTest = i == 0;
final BlockState possibleSupport = BlockUtils.getWorldgenBlock(world, posBelow, bp -> isFirstTest ? blockState : null);
if (possibleSupport != null && BlockUtils.canBlockFloatInAir(possibleSupport))
{
supportBlockState = possibleSupport;
break;
}
}
BlockState supportBlockState = placementContext.getSolidBlockForPos(pos, placementContext.getBluePrint().getRawBlockStateFunction());
handleBlockPlacement(world, pos.below(), supportBlockState);
}

Expand Down
Loading