Skip to content

fix: don't write structure void blocks in minecraft structure #3092

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

Merged
MattBDev merged 2 commits into from
Dec 31, 2025
+22 −11
Merged

fix: don't write structure void blocks in minecraft structure #3092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4532517
fix: don't attempt to write structure void blocks in minecraft structure
PierreSchwang Jan 26, 2025
54670fb
feat: add structure void placeholders when loading structure file and…
PierreSchwang Dec 25, 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: 12 additions & 7 deletions ...in/java/com/fastasyncworldedit/core/extent/clipboard/io/schematic/MinecraftStructure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ public Clipboard read(UUID clipboardId) throws IOException {
size.get(0).valueAsInt(), size.get(1).valueAsInt(), size.get(2).value()
).subtract(BlockVector3.ONE));
final Clipboard clipboard = new BlockArrayClipboard(region, clipboardId);
// fill clipboard with structure void blocks to represent empty entries.
// known block data will be overridden with palette data.
clipboard.setBlocks((Region) region, BlockTypes.STRUCTURE_VOID.getDefaultState());

// Palette
final List<LinCompoundTag> paletteEntry = parent.getListTag("palette", LinTagType.compoundTag()).value();
Expand Down Expand Up @@ -204,6 +207,7 @@ public void write(Clipboard clipboard) throws IOException {
Int2ObjectMap<BlockState> paletteIndexes = new Int2ObjectArrayMap<>();
for (final BlockVector3 pos : clipboard) {
final BlockState block = clipboard.getBlock(pos);
// Structure Void Blocks are not part of the structure file and therefor not part of the palette
if (block.getBlockType() == BlockTypes.STRUCTURE_VOID || ordinals.containsKey(block.getOrdinalChar())) {
continue;
}
Expand All @@ -225,20 +229,21 @@ public void write(Clipboard clipboard) throws IOException {
// Blocks
LinListTag.Builder<@org.jetbrains.annotations.NotNull LinCompoundTag> blocks = LinListTag.builder(LinTagType.compoundTag());
Copy link
Copy Markdown
Member

@dordsor21 dordsor21 Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change this top javax while we're here I guess?

Copy link
Copy Markdown
Member Author

@PierreSchwang PierreSchwang Feb 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be great, but i hate that
image
image

guess i could suppress that simply (edit: or wait, i can simply use a var assignment)

for (final BlockVector3 pos : clipboard) {
final BlockState block = clipboard.getBlock(pos);
final BaseBlock block = clipboard.getFullBlock(pos);
// Structure Void Blocks are not part of the structure file
if (block.getBlockType() == BlockTypes.STRUCTURE_VOID) {
continue;
}
LinCompoundTag.Builder entry = LinCompoundTag.builder()
.putInt("state", ordinals.get(block.getOrdinalChar()))
.put("pos", LinListTag.of(LinTagType.intTag(), List.of(
LinIntTag.of(pos.x() - min.x()),
LinIntTag.of(pos.y() - min.y()),
LinIntTag.of(pos.z() - min.z())
)));
final BaseBlock baseBlock = clipboard.getFullBlock(pos);
if (baseBlock != null) {
final LinCompoundTag nbt = baseBlock.getNbt();
if (nbt != null) {
entry.put("nbt", nbt.toBuilder().remove("x").remove("y").remove("z").build());
}
final LinCompoundTag nbt = block.getNbt();
if (nbt != null) {
entry.put("nbt", nbt.toBuilder().remove("x").remove("y").remove("z").build());
}
blocks.add(entry.build());
}
Expand Down
14 changes: 10 additions & 4 deletions worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
import com.sk89q.worldedit.function.block.BlockReplace;
import com.sk89q.worldedit.function.mask.InverseSingleBlockTypeMask;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.mask.MaskIntersection;
import com.sk89q.worldedit.function.mask.Masks;
Expand Down Expand Up @@ -85,6 +86,7 @@
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockTypes;
import org.enginehub.piston.annotation.Command;
import org.enginehub.piston.annotation.CommandContainer;
import org.enginehub.piston.annotation.param.Arg;
Expand Down Expand Up @@ -526,14 +528,15 @@ public void paste(
Mask sourceMask,
//FAWE start - entity removal
@Switch(name = 'x', desc = "Remove existing entities in the affected region")
boolean removeEntities
boolean removeEntities,
@Switch(name = 'v', desc = "Don't paste structure void blocks and keep the target block state")
boolean ignoreStructureVoidBlocks
//FAWE end

) throws WorldEditException {

ClipboardHolder holder = session.getClipboard();
//FAWE start - use place
if (holder.getTransform().isIdentity() && sourceMask == null) {
if (holder.getTransform().isIdentity() && sourceMask == null && !ignoreStructureVoidBlocks) {
place(actor, world, session, editSession, ignoreAirBlocks, atOrigin, selectPasted, onlySelect,
pasteEntities, pasteBiomes, removeEntities
);
Expand All @@ -550,13 +553,16 @@ public void paste(
//FAWE end

if (!onlySelect) {
final Mask finalSourceMask = ignoreStructureVoidBlocks ?
MaskIntersection.of(sourceMask, new InverseSingleBlockTypeMask(clipboard, BlockTypes.STRUCTURE_VOID)) :
sourceMask;
Operation operation = holder
.createPaste(editSession)
.to(to)
.ignoreAirBlocks(ignoreAirBlocks)
.copyBiomes(pasteBiomes)
.copyEntities(pasteEntities)
.maskSource(sourceMask)
.maskSource(finalSourceMask)
.build();
Operations.completeLegacy(operation);
messages.addAll(Lists.newArrayList(operation.getStatusMessages()));
Expand Down
Loading