Skip to content

1.21 Fix cross-version concrete blueprints 修复跨版本钢筋混凝土蓝图导入 #6079

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
PigeonNian merged 1 commit into from
Nov 13, 2026
Merged

1.21 Fix cross-version concrete blueprints 修复跨版本钢筋混凝土蓝图导入 #6079

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
30 changes: 28 additions & 2 deletions src/main/java/dev/dubhe/anvilcraft/building/StructureSnapshotCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package dev.dubhe.anvilcraft.building;

import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.block.state.Color;
import net.minecraft.SharedConstants;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderGetter;
Expand Down Expand Up @@ -133,14 +135,21 @@ private static List<BlockState> parsePaletteStates(ListTag paletteTag, HolderLoo
throws ConstructionBlueprintException {
HolderGetter<Block> lookup = registries.lookupOrThrow(Registries.BLOCK);
Set<String> unknownIds = new LinkedHashSet<>();
List<CompoundTag> states = new ArrayList<>(paletteTag.size());
for (int index = 0; index < paletteTag.size(); index++) {
CompoundTag stateTag = paletteTag.getCompound(index);
String rawName = stateTag.getString("Name");
ResourceLocation id = ResourceLocation.tryParse(rawName);
if (id == null) {
throw new ConstructionBlueprintException("corrupt_palette", "invalid block id: " + rawName);
}
if (lookup.get(ResourceKey.create(Registries.BLOCK, id)).isEmpty()) {
ResourceLocation normalizedId = normalizeConcreteId(id);
if (!normalizedId.equals(id)) {
stateTag = stateTag.copy();
stateTag.putString("Name", normalizedId.toString());
}
states.add(stateTag);
if (lookup.get(ResourceKey.create(Registries.BLOCK, normalizedId)).isEmpty()) {
unknownIds.add(id.toString());
}
}
Expand All @@ -149,11 +158,28 @@ private static List<BlockState> parsePaletteStates(ListTag paletteTag, HolderLoo
}
List<BlockState> palette = new ArrayList<>(paletteTag.size());
for (int index = 0; index < paletteTag.size(); index++) {
palette.add(NbtUtils.readBlockState(lookup, paletteTag.getCompound(index)));
palette.add(NbtUtils.readBlockState(lookup, states.get(index)));
}
return palette;
}

private static ResourceLocation normalizeConcreteId(ResourceLocation id) {
if (!id.getNamespace().equals(AnvilCraft.MOD_ID)) {
return id;
}
for (Color color : Color.values()) {
String prefix = color + "_reinforced_concrete";
if (!id.getPath().startsWith(prefix)) {
continue;
}
String suffix = id.getPath().substring(prefix.length());
if (List.of("", "_slab", "_stair", "_wall").contains(suffix)) {
return AnvilCraft.of("reinforced_concrete_" + color + suffix);
}
}
return id;
}

private static List<StructureSnapshot.BlockEntry> parseBlocks(
CompoundTag tag,
Vec3i size,
Expand Down
Loading