1.1.2

app/build.gradle.kts

@@ -10,8 +10,8 @@ dependencies {
 }
 
 node {
-    version.set("22.4.0")
-    npmVersion.set("10.8.1")
+    version.set("22.8.0")
+    npmVersion.set("10.8.3")
     download.set(true)
 }
 

app/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chunker-electron",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Convert worlds between Java and Bedrock.",
   "private": true,
   "main": "src/index.js",

app/electron/src/session.js

@@ -589,7 +589,7 @@ export class Session {
         await fs.mkdir(worldOutputPath);
 
         if (copyNbt) {
-            await fs.cp(worldInputPath, worldOutputPath, {recursive: true});
+            await fs.copy(worldInputPath, worldOutputPath);
         }
 
         // Process request

app/package.json

@@ -15,8 +15,8 @@
   "author": "Hive Games Limited",
   "license": "MIT",
   "devDependencies": {
-    "concurrently": "^8.2.2",
+    "concurrently": "^9.0.0",
     "cross-env": "^7.0.3",
-    "wait-on": "^8.0.0"
+    "wait-on": "^8.0.1"
   }
 }

app/ui/package.json

@@ -15,7 +15,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "base64-arraybuffer": "^1.0.2",
-    "chroma-js": "^3.0.0",
+    "chroma-js": "^3.1.1",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1",
     "leaflet": "^1.9.4",
@@ -24,7 +24,7 @@
     "leaflet-mouse-position": "^1.2.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.26.1",
+    "react-router-dom": "^6.26.2",
     "react-scripts": "^5.0.1",
     "react-select": "^5.8.0",
     "react-syntax-highlighter": "^15.5.0",

cli/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
 }
 
 group = "com.hivemc.chunker"
-version = "1.1.1"
+version = "1.1.2"
 description = "chunker"
 base.archivesName = "chunker-cli"
 java.sourceCompatibility = JavaVersion.VERSION_17

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockBannerBlockEntityHandler.java

@@ -139,8 +139,10 @@ public BannerBlockEntity updateBeforeProcess(@NotNull BedrockResolvers resolvers
             // Get the new block type
             ChunkerBlockType newType = BANNER_TO_WALL_DYE.inverse().getOrDefault(Pair.of(wall, blockEntity.getBase().get()), ChunkerVanillaBlockType.WHITE_BANNER);
 
-            // Set the new block type
-            column.setBlock(x, y, z, new ChunkerBlockIdentifier(newType, blockIdentifier.getPresentStates(), blockIdentifier.getPreservedIdentifier()));
+            // Set the new block type (if the banner is present)
+            if (!blockIdentifier.isAir()) {
+                column.setBlock(x, y, z, new ChunkerBlockIdentifier(newType, blockIdentifier.getPresentStates(), blockIdentifier.getPreservedIdentifier()));
+            }
 
             // Remove the base since it's now in the block
             blockEntity.setBase(Optional.empty());

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockBedBlockEntityHandler.java

@@ -81,8 +81,10 @@ public BedBlockEntity updateBeforeProcess(@NotNull BedrockResolvers resolvers, C
             // Grab the bed type
             ChunkerBlockType newType = BED_TO_DYE.inverse().getOrDefault(bedrockBedBlockEntity.getColor(), ChunkerVanillaBlockType.WHITE_BED);
 
-            // Set the new block type
-            column.setBlock(x, y, z, new ChunkerBlockIdentifier(newType, blockIdentifier.getPresentStates(), blockIdentifier.getPreservedIdentifier()));
+            // Set the new block type (if the bed is present)
+            if (!blockIdentifier.isAir()) {
+                column.setBlock(x, y, z, new ChunkerBlockIdentifier(newType, blockIdentifier.getPresentStates(), blockIdentifier.getPreservedIdentifier()));
+            }
 
             // Return the chunker version
             return bedrockBedBlockEntity.toChunker();

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockChestBlockEntityHandler.java

@@ -80,7 +80,11 @@ public ChestBlockEntity updateBeforeProcess(@NotNull BedrockResolvers resolvers,
                 // Single chest
                 chestType = ChestType.SINGLE;
             }
-            column.setBlock(x, y, z, blockIdentifier.copyWith(VanillaBlockStates.CHEST_TYPE, chestType));
+
+            // Only update if the block identifier isn't air
+            if (!blockIdentifier.isAir()) {
+                column.setBlock(x, y, z, blockIdentifier.copyWith(VanillaBlockStates.CHEST_TYPE, chestType));
+            }
         }
 
         // Handle trapped chest

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockItemFrameBlockEntityHandler.java

@@ -6,6 +6,7 @@
 import com.hivemc.chunker.conversion.encoding.bedrock.base.resolver.blockentity.type.BedrockItemFrameBlockEntity;
 import com.hivemc.chunker.conversion.intermediate.column.ChunkerColumn;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.ChunkerBlockIdentifier;
+import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.ChunkerVanillaBlockType;
 import com.hivemc.chunker.nbt.tags.Tag;
 import com.hivemc.chunker.nbt.tags.collection.CompoundTag;
 import com.hivemc.chunker.nbt.tags.primitive.ByteTag;
@@ -57,10 +58,15 @@ public void write(@NotNull BedrockResolvers resolvers, @NotNull CompoundTag outp
     @Override
     public boolean shouldRemoveBeforeProcess(ChunkerColumn column, int x, int y, int z, BedrockItemFrameBlockEntity blockEntity) {
         // Turn into an entity
-        column.getEntities().add(blockEntity.toChunker(column.getBlock(x, y, z)));
+        ChunkerBlockIdentifier block = column.getBlock(x, y, z);
 
-        // Replace the block with air
-        column.setBlock(x, y, z, ChunkerBlockIdentifier.AIR);
+        // Only add the item frame if there is a backing item frame block
+        if (block.getType() == ChunkerVanillaBlockType.ITEM_FRAME_BEDROCK) {
+            column.getEntities().add(blockEntity.toChunker(block));
+
+            // Replace the block with air
+            column.setBlock(x, y, z, ChunkerBlockIdentifier.AIR);
+        }
 
         // Remove
         return true;

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockJukeboxBlockEntityHandler.java

@@ -6,6 +6,7 @@
 import com.hivemc.chunker.conversion.intermediate.column.ChunkerColumn;
 import com.hivemc.chunker.conversion.intermediate.column.blockentity.JukeboxBlockEntity;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.ChunkerBlockIdentifier;
+import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.ChunkerVanillaBlockType;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.states.vanilla.VanillaBlockStates;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.states.vanilla.types.Bool;
 import com.hivemc.chunker.nbt.tags.collection.CompoundTag;
@@ -37,6 +38,11 @@ public void write(@NotNull BedrockResolvers resolvers, @NotNull CompoundTag outp
     @Override
     public JukeboxBlockEntity updateBeforeProcess(@NotNull BedrockResolvers resolvers, ChunkerColumn column, int x, int y, int z, JukeboxBlockEntity blockEntity) {
         ChunkerBlockIdentifier identifier = column.getBlock(x, y, z);
+
+        // Don't update anything if the block isn't a jukebox
+        if (identifier.getType() != ChunkerVanillaBlockType.JUKEBOX) return blockEntity;
+
+        // Check for the record
         boolean hasRecord = blockEntity.getRecord() != null && !blockEntity.getRecord().getIdentifier().isAir();
         column.setBlock(x, y, z, identifier.copyWith(VanillaBlockStates.HAS_RECORD, hasRecord ? Bool.TRUE : Bool.FALSE));
 

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockLecternBlockEntityHandler.java

@@ -6,6 +6,7 @@
 import com.hivemc.chunker.conversion.intermediate.column.ChunkerColumn;
 import com.hivemc.chunker.conversion.intermediate.column.blockentity.LecternBlockEntity;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.ChunkerBlockIdentifier;
+import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.ChunkerVanillaBlockType;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.states.vanilla.VanillaBlockStates;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.states.vanilla.types.Bool;
 import com.hivemc.chunker.nbt.tags.collection.CompoundTag;
@@ -49,6 +50,11 @@ public void write(@NotNull BedrockResolvers resolvers, @NotNull CompoundTag outp
     @Override
     public LecternBlockEntity updateBeforeProcess(@NotNull BedrockResolvers resolvers, ChunkerColumn column, int x, int y, int z, LecternBlockEntity blockEntity) {
         ChunkerBlockIdentifier identifier = column.getBlock(x, y, z);
+
+        // Don't update anything if the block isn't a lectern
+        if (identifier.getType() != ChunkerVanillaBlockType.LECTERN) return blockEntity;
+
+        // Check for the book
         boolean hasBook = blockEntity.getBook() != null && !blockEntity.getBook().getIdentifier().isAir();
         column.setBlock(x, y, z, identifier.copyWith(VanillaBlockStates.HAS_BOOK, hasBook ? Bool.TRUE : Bool.FALSE));
 

cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/resolver/blockentity/handlers/BedrockShulkerBoxBlockEntityHandler.java

@@ -10,6 +10,7 @@
 import com.hivemc.chunker.conversion.intermediate.column.ChunkerColumn;
 import com.hivemc.chunker.conversion.intermediate.column.blockentity.container.randomizable.ShulkerBoxBlockEntity;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.ChunkerBlockIdentifier;
+import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.ChunkerVanillaBlockType;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.states.vanilla.VanillaBlockStates;
 import com.hivemc.chunker.conversion.intermediate.column.chunk.identifier.type.block.states.vanilla.types.FacingDirection;
 import com.hivemc.chunker.nbt.tags.collection.CompoundTag;
@@ -72,6 +73,9 @@ public ShulkerBoxBlockEntity updateBeforeProcess(@NotNull BedrockResolvers resol
         if (blockEntity instanceof BedrockShulkerBlockEntity bedrockShulkerBlockEntity) {
             ChunkerBlockIdentifier blockIdentifier = column.getBlock(x, y, z);
 
+            // Don't update anything if the block is air
+            if (blockIdentifier.isAir()) return blockEntity;
+
             // Apply facing direction
             blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.FACING_ALL, bedrockShulkerBlockEntity.getFacing());