From 49c51e041ca84313676889f935b48e13d2852dda Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 1 Nov 2019 19:19:56 +0100 Subject: [PATCH] delete writable mca chunk --- .../cfi/HeightMapMCAGenerator.java | 17 +- .../brush/visualization/cfi/MCAWriter.java | 11 +- .../visualization/cfi/WritableMCAChunk.java | 438 ------------------ 3 files changed, 15 insertions(+), 451 deletions(-) delete mode 100644 worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/WritableMCAChunk.java diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java index df4fbec81..42a537076 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java @@ -7,6 +7,7 @@ import com.boydti.fawe.beta.IChunkGet; import com.boydti.fawe.beta.IChunkSet; import com.boydti.fawe.beta.implementation.ChunkPacket; import com.boydti.fawe.beta.implementation.FallbackChunkGet; +import com.boydti.fawe.jnbt.anvil.MCAChunk; import com.boydti.fawe.object.FaweInputStream; import com.boydti.fawe.object.FaweOutputStream; import com.boydti.fawe.object.Metadatable; @@ -335,7 +336,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr public IChunkSet getChunk(int chunkX, int chunkZ) { // TODO don't generate new Writeable MCA chunk System.out.println("TODO don't generate new Writeable MCA chunk"); - WritableMCAChunk tmp = new WritableMCAChunk(); + MCAChunk tmp = new MCAChunk(); int bx = chunkX << 4; int bz = chunkZ << 4; write(tmp, bx, bx + 15, bz, bz + 15); @@ -767,13 +768,13 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr // return getSnapshot(null, chunkX, chunkZ); // } // -// private FaweChunk getSnapshot(final WritableMCAChunk chunk, int chunkX, int chunkZ) { -// return new LazyFaweChunk(this, chunkX, chunkZ) { +// private FaweChunk getSnapshot(final MCAChunk chunk, int chunkX, int chunkZ) { +// return new LazyFaweChunk(this, chunkX, chunkZ) { // @Override -// public WritableMCAChunk getChunk() { -// WritableMCAChunk tmp = chunk; +// public MCAChunk getChunk() { +// MCAChunk tmp = chunk; // if (tmp == null) { -// tmp = new WritableMCAChunk(); +// tmp = new MCAChunk(); // } // tmp.setLoc(HeightMapMCAGenerator.this, chunkX, chunkZ); // int cbx = chunkX << 4; @@ -789,7 +790,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr // // @Override // public void addToQueue() { -// WritableMCAChunk cached = getCachedChunk(); +// MCAChunk cached = getCachedChunk(); // if (cached != null) setChunk(cached); // } // }; @@ -1574,7 +1575,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr } @Override - public WritableMCAChunk write(WritableMCAChunk chunk, int csx, int cex, int csz, int cez) { + public MCAChunk write(MCAChunk chunk, int csx, int cex, int csz, int cez) { byte[] heights = this.heights.get(); byte[] biomes = this.biomes.get(); char[] main = this.main.get(); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java index 0a2cd68f1..716b962c2 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java @@ -1,5 +1,6 @@ package com.boydti.fawe.object.brush.visualization.cfi; +import com.boydti.fawe.jnbt.anvil.MCAChunk; import com.boydti.fawe.object.collection.CleanableThreadLocal; import com.boydti.fawe.object.io.BufferedRandomAccessFile; import com.boydti.fawe.util.MainUtil; @@ -71,7 +72,7 @@ public abstract class MCAWriter implements Extent { public abstract boolean shouldWrite(int chunkX, int chunkZ); - public abstract WritableMCAChunk write(WritableMCAChunk input, int startX, int endX, int startZ, int endZ); + public abstract MCAChunk write(MCAChunk input, int startX, int endX, int startZ, int endZ); public void generate() throws IOException { if (!folder.exists()) { @@ -80,10 +81,10 @@ public abstract class MCAWriter implements Extent { final ForkJoinPool pool = new ForkJoinPool(); int tcx = (width - 1) >> 4; int tcz = (length - 1) >> 4; - final ThreadLocal chunkStore = new ThreadLocal() { + final ThreadLocal chunkStore = new ThreadLocal() { @Override - protected WritableMCAChunk initialValue() { - WritableMCAChunk chunk = new WritableMCAChunk(); + protected MCAChunk initialValue() { + MCAChunk chunk = new MCAChunk(); Arrays.fill(chunk.blocks, (char) BlockID.AIR); // Arrays.fill(chunk.skyLight, (byte) 255); return chunk; @@ -141,7 +142,7 @@ public abstract class MCAWriter implements Extent { if (shouldWrite(cx, cz)) { pool.submit(() -> { try { - WritableMCAChunk chunk = chunkStore.get(); + MCAChunk chunk = chunkStore.get(); chunk.reset(); chunk.setPosition(fcx, fcz); chunk = write(chunk, csx, cex, csz, cez); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/WritableMCAChunk.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/WritableMCAChunk.java deleted file mode 100644 index 5b1cd1ce6..000000000 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/WritableMCAChunk.java +++ /dev/null @@ -1,438 +0,0 @@ -package com.boydti.fawe.object.brush.visualization.cfi; - -import com.boydti.fawe.FaweCache; -import com.boydti.fawe.beta.IChunkSet; -import com.boydti.fawe.object.collection.BitArray4096; -import com.boydti.fawe.object.collection.BlockVector3ChunkMap; -import com.boydti.fawe.object.io.FastByteArrayOutputStream; -import com.boydti.fawe.util.MathMan; -import com.sk89q.jnbt.CompoundTag; -import com.sk89q.jnbt.ListTag; -import com.sk89q.jnbt.NBTConstants; -import com.sk89q.jnbt.NBTOutputStream; -import com.sk89q.worldedit.math.BlockVector2; -import com.sk89q.worldedit.math.BlockVector3; -import com.sk89q.worldedit.registry.state.Property; -import com.sk89q.worldedit.world.biome.BiomeType; -import com.sk89q.worldedit.world.biome.BiomeTypes; -import com.sk89q.worldedit.world.block.BlockID; -import com.sk89q.worldedit.world.block.BlockState; -import com.sk89q.worldedit.world.block.BlockStateHolder; -import com.sk89q.worldedit.world.block.BlockType; -import com.sk89q.worldedit.world.block.BlockTypes; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -public class WritableMCAChunk implements IChunkSet { - public final boolean[] hasSections = new boolean[16]; - - public boolean hasBiomes = false; - public final byte[] biomes = new byte[256]; - - public final char[] blocks = new char[65536]; - - public final BlockVector3ChunkMap tiles = new BlockVector3ChunkMap(); - public final Map entities = new HashMap<>(); - public long inhabitedTime = System.currentTimeMillis(); - public long lastUpdate; - - public int modified; - public boolean deleted; - - public int chunkX, chunkZ; - - public WritableMCAChunk() {} - - private boolean readLayer(Section section) { - if (section.palette == null || section.palette[section.palette.length - 1] == null || section.layer == -1 || section.blocks == null) { - // not initialized - return false; - } - // TODO load - section.layer = -1; - section.blocks = null; - section.palette = null; - return true; - } - - private static class Section { - public int layer = -1; - public long[] blocks; - public BlockState[] palette; - } - - public int getX() { - return chunkX; - } - - public int getZ() { - return chunkZ; - } - - @Override - public boolean hasSection(int layer) { - return hasSections[layer]; - } - - public void setPosition(int X, int Z) { - this.chunkX = X; - this.chunkZ = Z; - } - - @Override - public IChunkSet reset() { - return this.reset(true); - } - - public IChunkSet reset(boolean full) { - if (!tiles.isEmpty()) { - tiles.clear(); - } - if (!entities.isEmpty()) { - entities.clear(); - } - modified = 0; - deleted = false; - hasBiomes = false; - if (full) { - for (int i = 0; i < 65536; i++) { - blocks[i] = BlockID.AIR; - } - } - Arrays.fill(hasSections, false); - return this; - } - - public void write(NBTOutputStream nbtOut) throws IOException { - int[] blockToPalette = FaweCache.IMP.BLOCK_TO_PALETTE.get(); - int[] paletteToBlock = FaweCache.IMP.PALETTE_TO_BLOCK.get(); - long[] blockstates = FaweCache.IMP.BLOCK_STATES.get(); - int[] blocksCopy = FaweCache.IMP.SECTION_BLOCKS.get(); - - nbtOut.writeNamedTagName("", NBTConstants.TYPE_COMPOUND); - nbtOut.writeNamedTag("DataVersion", 1631); - nbtOut.writeLazyCompoundTag("Level", out -> { - out.writeNamedTag("Status", "decorated"); - out.writeNamedTag("xPos", getX()); - out.writeNamedTag("zPos", getZ()); - if (entities.isEmpty()) { - out.writeNamedEmptyList("Entities"); - } else { - out.writeNamedTag("Entities", new ListTag(CompoundTag.class, new ArrayList<>(entities.values()))); - } - if (tiles.isEmpty()) { - out.writeNamedEmptyList("TileEntities"); - } else { - out.writeNamedTag("TileEntities", new ListTag(CompoundTag.class, - new ArrayList<>(tiles.values()))); - } - out.writeNamedTag("InhabitedTime", inhabitedTime); - out.writeNamedTag("LastUpdate", lastUpdate); - if (hasBiomes) { - out.writeNamedTag("Biomes", biomes); - } - int len = 0; - for (boolean hasSection : hasSections) { - if (hasSection) { - len++; - } - } - out.writeNamedTagName("Sections", NBTConstants.TYPE_LIST); - nbtOut.writeByte(NBTConstants.TYPE_COMPOUND); - nbtOut.writeInt(len); - - for (int layer = 0; layer < hasSections.length; layer++) { - if (!hasSections[layer]) { - continue; - } - out.writeNamedTag("Y", (byte) layer); - - int blockIndexStart = layer << 12; - int blockIndexEnd = blockIndexStart + 4096; - int num_palette = 0; - try { - for (int i = blockIndexStart, j = 0; i < blockIndexEnd; i++, j++) { - int ordinal = blocks[i]; - int palette = blockToPalette[ordinal]; - if (palette == Integer.MAX_VALUE) { -// BlockState state = BlockTypes.states[ordinal]; - blockToPalette[ordinal] = palette = num_palette; - paletteToBlock[num_palette] = ordinal; - num_palette++; - } - blocksCopy[j] = palette; - } - - for (int i = 0; i < num_palette; i++) { - blockToPalette[paletteToBlock[i]] = Integer.MAX_VALUE; - } - - out.writeNamedTagName("Palette", NBTConstants.TYPE_LIST); - out.writeByte(NBTConstants.TYPE_COMPOUND); - out.writeInt(num_palette); - - for (int i = 0; i < num_palette; i++) { - int ordinal = paletteToBlock[i]; - BlockState state = BlockTypes.states[ordinal]; - BlockType type = state.getBlockType(); - out.writeNamedTag("Name", type.getId()); - - // Has no properties - if (type.getDefaultState() != state) { - // Write properties - out.writeNamedTagName("Properties", NBTConstants.TYPE_COMPOUND); - for (Property property : type.getProperties()) { - String key = property.getName(); - Object value = state.getState(property); - String valueStr = value.toString(); - if (Character.isUpperCase(valueStr.charAt(0))) { - System.out.println("Invalid uppercase value " + value); - valueStr = valueStr.toLowerCase(); - } - out.writeNamedTag(key, valueStr); - } - out.writeEndTag(); - } - out.writeEndTag(); - } - - - // BlockStates - int bitsPerEntry = MathMan.log2nlz(num_palette - 1); - int blockBitArrayEnd = (bitsPerEntry * 4096) >> 6; - if (num_palette == 1) { - // Set a value, because minecraft needs it for some reason - blockstates[0] = 0; - blockBitArrayEnd = 1; - } else { - BitArray4096 bitArray = new BitArray4096(blockstates, bitsPerEntry); - bitArray.fromRaw(blocksCopy); - } - - out.writeNamedTagName("BlockStates", NBTConstants.TYPE_LONG_ARRAY); - out.writeInt(blockBitArrayEnd); - for (int i = 0; i < blockBitArrayEnd; i++) { - out.writeLong(blockstates[i]); - } - - -// out.writeNamedTagName("BlockLight", NBTConstants.TYPE_BYTE_ARRAY); -// out.writeInt(2048); -// out.write(blockLight, layer << 11, 1 << 11); -// -// out.writeNamedTagName("SkyLight", NBTConstants.TYPE_BYTE_ARRAY); -// out.writeInt(2048); -// out.write(skyLight, layer << 11, 1 << 11); - - - out.writeEndTag(); - - // cleanup - } catch (Throwable e) { - Arrays.fill(blockToPalette, Integer.MAX_VALUE); - e.printStackTrace(); - throw e; - } - } - }); - nbtOut.writeEndTag(); - } - - public byte[] toBytes(byte[] buffer) throws IOException { - if (buffer == null) { - buffer = new byte[8192]; - } - FastByteArrayOutputStream buffered = new FastByteArrayOutputStream(buffer); - try (NBTOutputStream nbtOut = new NBTOutputStream(buffered)) { - write(nbtOut); - } - return buffered.toByteArray(); - } - - public long getInhabitedTime() { - return inhabitedTime; - } - - public long getLastUpdate() { - return lastUpdate; - } - - public void setInhabitedTime(long inhabitedTime) { - this.inhabitedTime = inhabitedTime; - } - - public void setLastUpdate(long lastUpdate) { - this.lastUpdate = lastUpdate; - } - - public void setDeleted(boolean deleted) { - setModified(); - this.deleted = deleted; - } - - public boolean isDeleted() { - return deleted; - } - - @Override - public boolean isEmpty() { - if (deleted) return true; - for (boolean hasSection : hasSections) { - if (hasSection) return false; - } - return true; - } - - public boolean isModified() { - return modified != 0; - } - - public int getModified() { - return modified; - } - - public final void setModified() { - this.modified++; - } - - public int getBitMask() { - int bitMask = 0; - for (int section = 0; section < hasSections.length; section++) { - if (hasSections[section]) { - bitMask += 1 << section; - } - } - return bitMask; - } - - @Override - public boolean setTile(int x, int y, int z, CompoundTag tile) { - setModified(); - if (tile != null) { - tiles.put(x, y, z, tile); - } else { - if (tiles.remove(x, y, z) == null) { - return false; - } - } - return true; - } - - public void setEntity(CompoundTag entityTag) { - setModified(); - long least = entityTag.getLong("UUIDLeast"); - long most = entityTag.getLong("UUIDMost"); - entities.put(new UUID(most, least), entityTag); - } - - @Override - public BiomeType getBiomeType(int x, int z) { - return BiomeTypes.get(this.biomes[(z << 4) | x] & 0xFF); - } - - @Override - public BiomeType[] getBiomes() { - BiomeType[] tmp = new BiomeType[256]; - for (int i = 0; i < 256; i++) { - tmp[i] = BiomeTypes.get(this.biomes[i] & 0xFF); - } - return tmp; - } - - @Override - public boolean setBiome(BlockVector2 pos, BiomeType biome) { - return this.setBiome(pos.getX(), 0, pos.getZ(), biome); - } - - @Override - public boolean setBiome(int x, int y, int z, BiomeType biome) { - setModified(); - biomes[x + (z << 4)] = (byte) biome.getInternalId(); - return true; - } - - public Set getEntities() { - return new HashSet<>(entities.values()); - } - - @Override - public Map getTiles() { - return tiles == null ? Collections.emptyMap() : tiles; - } - - public CompoundTag getTile(int x, int y, int z) { - if (tiles == null || tiles.isEmpty()) { - return null; - } - short pair = MathMan.tripleBlockCoord(x, y, z); - return tiles.get(pair); - } - - private final int getIndex(int x, int y, int z) { - return x | (z << 4) | (y << 8); - } - - public int getBlockOrdinal(int x, int y, int z) { - return blocks[x | (z << 4) | (y << 8)]; - } - - @Override - public BlockState getBlock(int x, int y, int z) { - int ordinal = getBlockOrdinal(x, y, z); - return BlockState.getFromOrdinal(ordinal); - } - - public Set getEntityRemoves() { - return new HashSet<>(); - } - - @Override - public boolean setBlock(int x, int y, int z, BlockStateHolder holder) { - setBlock(x, y, z, holder.getOrdinalChar()); - holder.applyTileEntity(this, x, y, z); - return true; - } - - @Override - public void setBlocks(int layer, char[] data) { - int offset = layer << 12; - for (int i = 0; i < 4096; i++) { - blocks[offset + i] = data[i]; - } - } - - @Override - public char[] getArray(int layer) { - char[] tmp = FaweCache.IMP.SECTION_BITS_TO_CHAR.get(); - int offset = layer << 12; - for (int i = 0; i < 4096; i++) { - tmp[i] = blocks[offset + i]; - } - return tmp; - } - - public void setBlock(int x, int y, int z, char ordinal) { - blocks[getIndex(x, y, z)] = ordinal; - } - - public void setBiome(BiomeType biome) { - Arrays.fill(biomes, (byte) biome.getInternalId()); - } - - public void removeEntity(UUID uuid) { - entities.remove(uuid); - } - - @Override - public boolean trim(boolean aggressive) { - return isEmpty(); - } -}