Skip to content

fix: sponge v3 palette writer with __reserved__ #3295

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
PierreSchwang wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

fix: sponge v3 palette writer with __reserved__ #3295

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
10 changes: 5 additions & 5 deletions .../src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicWriterV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypesCache;
import net.jpountz.lz4.LZ4BlockInputStream;
import net.jpountz.lz4.LZ4BlockOutputStream;
Expand Down Expand Up @@ -145,7 +145,7 @@ private void writeBlocks(NBTOutputStream blocks, Clipboard clipboard) throws IOE
}
return ordinal;
},
BlockStateHolder::getAsString,
ordinal -> BlockTypesCache.states[ordinal].getAsString(),
clipboard
);
lz4Stream.finish();
Expand All @@ -168,7 +168,7 @@ private void writeBiomes(NBTOutputStream biomes, Clipboard clipboard) throws IOE
biomes, BiomeType.REGISTRY.size(),
pos -> pos.getBiome(clipboard),
biome -> (char) biome.getInternalId(),
BiomeType::id,
ordinal -> BiomeTypes.get(ordinal).id(),
clipboard
);
}
Expand Down Expand Up @@ -218,7 +218,7 @@ private <T> void writePalette(
NBTOutputStream out, int capacity,
Function<BlockVector3, T> objectResolver,
Function<T, Character> ordinalResolver,
Function<T, String> paletteEntryResolver,
Function<Character, String> paletteEntryResolver,
Clipboard clipboard
) throws IOException {
int dataBytesUsed = 0;
Expand All @@ -240,7 +240,7 @@ private <T> void writePalette(
if (index >= palette.length) {
throw new IOException("insufficient palette capacity: " + palette.length + ", index: " + index);
}
out.writeNamedTag(paletteEntryResolver.apply(obj), value);
out.writeNamedTag(paletteEntryResolver.apply(ordinal), value);
}
if ((value & -128) != 0) {
dataBytesUsed++;
Expand Down
Loading