feat: more works

platforms/allay/build.gradle.kts

@@ -4,6 +4,7 @@ repositories {
 
 dependencies {
     shadedApi(project(":common:implementation:base"))
+    implementation("com.google.code.gson", "gson", "2.11.0")
 
     compileOnly("org.projectlombok:lombok:1.18.32")
     compileOnly("org.allaymc", "Allay-API", "1.0.0")

platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java

@@ -1,10 +1,16 @@
 package org.allaymc.terra.allay;
 
+import com.dfsek.tectonic.api.TypeRegistry;
+import com.dfsek.tectonic.api.depth.DepthTracker;
+import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.terra.AbstractPlatform;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.handle.WorldHandle;
-
+import com.dfsek.terra.api.world.biome.PlatformBiome;
+import org.allaymc.api.data.VanillaBiomeId;
 import org.allaymc.api.server.Server;
+import org.allaymc.terra.allay.delegate.AllayBiome;
 import org.allaymc.terra.allay.handle.AllayItemHandle;
 import org.allaymc.terra.allay.handle.AllayWorldHandle;
 import org.jetbrains.annotations.NotNull;
@@ -22,6 +28,10 @@ public class AllayPlatform extends AbstractPlatform {
     protected static final AllayWorldHandle ALLAY_WORLD_HANDLE = new AllayWorldHandle();
     protected static final AllayItemHandle ALLAY_ITEM_HANDLE = new AllayItemHandle();
 
+    public AllayPlatform() {
+        load();
+    }
+
     @Override
     public boolean reload() {
         // TODO: Implement reload
@@ -52,4 +62,16 @@ public class AllayPlatform extends AbstractPlatform {
     public void runPossiblyUnsafeTask(@NotNull Runnable task) {
         Server.getInstance().getScheduler().runLater(Server.getInstance(), task);
     }
+
+    @Override
+    public void register(TypeRegistry registry) {
+        super.register(registry);
+        registry.registerLoader(BlockState.class, (type, o, loader, depthTracker) -> ALLAY_WORLD_HANDLE.createBlockState((String) o))
+            .registerLoader(PlatformBiome.class, (type, o, loader, depthTracker) -> parseBiome((String) o, depthTracker));
+    }
+
+    protected AllayBiome parseBiome(String id, DepthTracker depthTracker) throws LoadException {
+        if(!id.startsWith("minecraft:")) throw new LoadException("Invalid biome identifier " + id, depthTracker);
+        return new AllayBiome(VanillaBiomeId.fromId(Mapping.biomeIdJeToBe(id)));
+    }
 }

platforms/allay/src/main/java/org/allaymc/terra/allay/JeBlockState.java

@@ -1,9 +1,7 @@
 package org.allaymc.terra.allay;
 
-import org.allaymc.api.utils.Identifier;
+import org.allaymc.api.utils.HashUtils;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.TreeMap;
 
 
@@ -15,6 +13,7 @@ import java.util.TreeMap;
 public class JeBlockState {
     protected final String identifier;
     protected final TreeMap<String, String> properties;
+    protected int hash = Integer.MAX_VALUE; // 懒加载
 
     public static JeBlockState fromString(String data) {
         return new JeBlockState(data);
@@ -46,7 +45,19 @@ public class JeBlockState {
         if(!includeProperties) return identifier;
         StringBuilder builder = new StringBuilder(identifier).append(";");
         properties.forEach((k, v) -> builder.append(k).append("=").append(v).append(";"));
-        return builder.toString();
+        var str = builder.toString();
+        if (hash == Integer.MAX_VALUE) {
+            // 顺便算一下hash
+            hash = HashUtils.fnv1a_32(str.getBytes());
+        }
+        return str;
+    }
+
+    public int getHash() {
+        if (hash == Integer.MAX_VALUE) {
+            hash = HashUtils.fnv1a_32(toString(true).getBytes());
+        }
+        return hash;
     }
 
     @Override

platforms/allay/src/main/java/org/allaymc/terra/allay/Mapping.java

@@ -1,6 +1,23 @@
 package org.allaymc.terra.allay;
 
+import com.dfsek.terra.api.block.state.properties.Property;
+
+import com.google.gson.reflect.TypeToken;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import lombok.extern.slf4j.Slf4j;
+import org.allaymc.api.block.property.type.BlockPropertyType.BlockPropertyValue;
+import org.allaymc.api.block.registry.BlockTypeRegistry;
 import org.allaymc.api.block.type.BlockState;
+import org.allaymc.api.block.type.BlockTypes;
+import org.allaymc.api.utils.Identifier;
+import org.allaymc.api.utils.JSONUtils;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 
 /**
@@ -8,34 +25,117 @@ import org.allaymc.api.block.type.BlockState;
  *
  * @author daoge_cmd
  */
+@Slf4j
 public final class Mapping {
 
+    private static final Map<BlockState, JeBlockState> BLOCK_STATE_BE_TO_JE = new Object2ObjectOpenHashMap<>();
+    private static final Map<Integer, BlockState> BLOCK_STATE_JE_HASH_TO_BE = new Int2ObjectOpenHashMap<>();
+    private static final Map<String, String> ITEM_ID_JE_TO_BE = new Object2ObjectOpenHashMap<>();
+    private static final Map<String, Integer> BIOME_ID_JE_TO_BE = new Object2IntOpenHashMap<>();
+
     public static void init() {
-        // TODO
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/blocks.json")) {
+            if (stream == null) {
+                log.error("blocks.json not found");
+                return;
+            }
+            var mappings = (List<Map<String, Map<String, Object>>>) JSONUtils.from(stream, new TypeToken<Map<String, Object>>(){}).get("mappings");
+            for(var mapping : mappings) {
+                var jeState = createJeBlockState(mapping.get("java_state"));
+                var beState = createBeBlockState(mapping.get("bedrock_state"));
+                BLOCK_STATE_BE_TO_JE.put(beState, jeState);
+                BLOCK_STATE_JE_HASH_TO_BE.put(jeState.getHash(), beState);
+            }
+        } catch(IOException e) {
+            log.error("Failed to load mapping", e);
+        }
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/items.json")) {
+            if  (stream == null) {
+                log.error("items.json not found");
+                return;
+            }
+            var mappings = JSONUtils.from(stream, new TypeToken<Map<String, Map<String, Object>>>(){}).entrySet();
+            for(var mapping : mappings) {
+                ITEM_ID_JE_TO_BE.put(mapping.getKey(), (String) mapping.getValue().get("bedrock_identifier"));
+            }
+        } catch(IOException e) {
+            log.error("Failed to load mapping", e);
+        }
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/biomes.json")) {
+            if  (stream == null) {
+                log.error("biomes.json not found");
+                return;
+            }
+            var mappings = JSONUtils.from(stream, new TypeToken<Map<String, Map<String, Integer>>>(){}).entrySet();
+            for(var mapping : mappings) {
+                BIOME_ID_JE_TO_BE.put(mapping.getKey(), mapping.getValue().get("bedrock_id"));
+            }
+        } catch(IOException e) {
+            log.error("Failed to load mapping", e);
+        }
+    }
+
+    private static BlockState createBeBlockState(Map<String, Object> data) {
+        var identifier = new Identifier((String) data.get("bedrock_identifier"));
+        // 方块类型
+        var blockType = BlockTypeRegistry.getRegistry().get(identifier);
+        // 方块属性
+        Map<String, Object> state = (Map<String, Object>) data.get("state");
+        if (state == null) return blockType.getDefaultState();
+        var propertyValues = new BlockPropertyValue<?, ?, ?>[state.size()];
+        int index = -1;
+        for(var entry : state.entrySet()) {
+            index++;
+            var propertyName = entry.getKey();
+            var propertyType = blockType.getProperties().get(propertyName);
+            if (propertyType == null) {
+                log.warn("Unknown property type: {}", propertyName);
+                return null;
+            }
+            try {
+                propertyValues[index] = propertyType.tryCreateValue(entry.getValue());
+            } catch (IllegalArgumentException e) {
+                log.warn("Failed to create property value for {}: {}", propertyName, entry.getValue());
+                return null;
+            }
+        }
+        return blockType.ofState(propertyValues);
+    }
+
+    private static JeBlockState createJeBlockState(Map<String, Object> data) {
+        var identifier = (String) data.get("Name");
+        var properties = (Map<String, String>) data.getOrDefault("Properties", Map.of());
+        return JeBlockState.create(identifier, new TreeMap<>(properties));
     }
 
     public static JeBlockState blockStateBeToJe(BlockState beBlockState) {
-        // TODO
+        return BLOCK_STATE_BE_TO_JE.get(beBlockState);
-        return null;
     }
 
     public static BlockState blockStateJeToBe(JeBlockState jeBlockState) {
-        // TODO
+        var result = BLOCK_STATE_JE_HASH_TO_BE.get(jeBlockState.getHash());
-        return null;
+        if(result == null) {
-    }
+            log.warn("Failed to find be block state for {}", jeBlockState);
-
+            return BlockTypes.AIR_TYPE.getDefaultState();
-    public static String enchantmentIdBeToJe(String beEnchantmentId) {
+        }
-        // TODO
+        return result;
-        return null;
-    }
-
-    public static String enchantmentIdJeToBe(String jeEnchantmentId) {
-        // TODO
-        return null;
     }
 
     public static String itemIdJeToBe(String jeItemId) {
-        // TODO
+        return ITEM_ID_JE_TO_BE.get(jeItemId);
-        return null;
+    }
+
+    // Enchantment identifiers are same in both versions
+
+    public static String enchantmentIdBeToJe(String beEnchantmentId) {
+        return beEnchantmentId;
+    }
+
+    public static String enchantmentIdJeToBe(String jeEnchantmentId) {
+        return jeEnchantmentId;
+    }
+
+    public static int biomeIdJeToBe(String jeBiomeId) {
+        return BIOME_ID_JE_TO_BE.get(jeBiomeId);
     }
 }

platforms/allay/src/main/java/org/allaymc/terra/allay/TerraAllayPlugin.java

@@ -25,7 +25,7 @@ public class TerraAllayPlugin extends Plugin {
 
     // TODO: Adapt command manager
     @Override
-    public void onEnable() {
+    public void onLoad() {
         log.info("Starting Terra...");
 
         log.info("Loading mapping...");

platforms/allay/src/main/java/org/allaymc/terra/allay/generator/AllayGeneratorWrapper.java

@@ -29,7 +29,7 @@ import java.util.Locale;
  */
 @Slf4j
 public class AllayGeneratorWrapper extends WorldGenerator implements GeneratorWrapper {
-    protected static final String DEFAULT_PACK_NAME = "default";
+    protected static final String DEFAULT_PACK_NAME = "overworld";
     protected static final String OPTION_PACK_NAME = "pack";
     protected static final String OPTION_SEED = "pack";
 
@@ -86,6 +86,7 @@ public class AllayGeneratorWrapper extends WorldGenerator implements GeneratorWr
 
     @Override
     public void setDimension(Dimension dimension) {
+        super.setDimension(dimension);
         this.worldProperties = new WorldProperties() {
             @Override
             public long getSeed() {

platforms/allay/src/main/resources/mapping/blocks.json

@@ -28903,7 +28903,10 @@
         "Name": "minecraft:short_grass"
       },
       "bedrock_state": {
-        "bedrock_identifier": "short_grass"
+        "bedrock_identifier": "tallgrass",
+        "state": {
+          "tall_grass_type": "tall"
+        }
       }
     },
     {
@@ -28911,7 +28914,10 @@
         "Name": "minecraft:fern"
       },
       "bedrock_state": {
-        "bedrock_identifier": "fern"
+        "bedrock_identifier": "tallgrass",
+        "state": {
+          "tall_grass_type": "fern"
+        }
       }
     },
     {
@@ -187594,9 +187600,10 @@
         "Name": "minecraft:sunflower"
       },
       "bedrock_state": {
-        "bedrock_identifier": "sunflower",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": true
+          "upper_block_bit": true,
+          "double_plant_type": "sunflower"
         }
       }
     },
@@ -187608,9 +187615,10 @@
         "Name": "minecraft:sunflower"
       },
       "bedrock_state": {
-        "bedrock_identifier": "sunflower",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": false
+          "upper_block_bit": false,
+          "double_plant_type": "sunflower"
         }
       }
     },
@@ -187622,9 +187630,10 @@
         "Name": "minecraft:lilac"
       },
       "bedrock_state": {
-        "bedrock_identifier": "lilac",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": true
+          "upper_block_bit": true,
+          "double_plant_type": "syringa"
         }
       }
     },
@@ -187636,9 +187645,10 @@
         "Name": "minecraft:lilac"
       },
       "bedrock_state": {
-        "bedrock_identifier": "lilac",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": false
+          "upper_block_bit": false,
+          "double_plant_type": "syringa"
         }
       }
     },
@@ -187650,9 +187660,10 @@
         "Name": "minecraft:rose_bush"
       },
       "bedrock_state": {
-        "bedrock_identifier": "rose_bush",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": true
+          "upper_block_bit": true,
+          "double_plant_type": "rose"
         }
       }
     },
@@ -187664,9 +187675,10 @@
         "Name": "minecraft:rose_bush"
       },
       "bedrock_state": {
-        "bedrock_identifier": "rose_bush",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": false
+          "upper_block_bit": false,
+          "double_plant_type": "rose"
         }
       }
     },
@@ -187678,9 +187690,10 @@
         "Name": "minecraft:peony"
       },
       "bedrock_state": {
-        "bedrock_identifier": "peony",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": true
+          "upper_block_bit": true,
+          "double_plant_type": "paeonia"
         }
       }
     },
@@ -187692,9 +187705,10 @@
         "Name": "minecraft:peony"
       },
       "bedrock_state": {
-        "bedrock_identifier": "peony",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": false
+          "upper_block_bit": false,
+          "double_plant_type": "paeonia"
         }
       }
     },
@@ -187706,9 +187720,10 @@
         "Name": "minecraft:tall_grass"
       },
       "bedrock_state": {
-        "bedrock_identifier": "tall_grass",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": true
+          "upper_block_bit": true,
+          "double_plant_type": "grass"
         }
       }
     },
@@ -187720,9 +187735,10 @@
         "Name": "minecraft:tall_grass"
       },
       "bedrock_state": {
-        "bedrock_identifier": "tall_grass",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": false
+          "upper_block_bit": false,
+          "double_plant_type": "grass"
         }
       }
     },
@@ -187734,9 +187750,10 @@
         "Name": "minecraft:large_fern"
       },
       "bedrock_state": {
-        "bedrock_identifier": "large_fern",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": true
+          "upper_block_bit": true,
+          "double_plant_type": "fern"
         }
       }
     },
@@ -187748,9 +187765,10 @@
         "Name": "minecraft:large_fern"
       },
       "bedrock_state": {
-        "bedrock_identifier": "large_fern",
+        "bedrock_identifier": "double_plant",
         "state": {
-          "upper_block_bit": false
+          "upper_block_bit": false,
+          "double_plant_type": "fern"
         }
       }
     },
@@ -194712,8 +194730,9 @@
         "Name": "minecraft:smooth_stone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "smooth_stone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "smooth_stone",
           "minecraft:vertical_half": "top"
         }
       }
@@ -194727,8 +194746,9 @@
         "Name": "minecraft:smooth_stone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "smooth_stone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "smooth_stone",
           "minecraft:vertical_half": "top"
         }
       }
@@ -194742,8 +194762,9 @@
         "Name": "minecraft:smooth_stone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "smooth_stone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "smooth_stone",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -194757,8 +194778,9 @@
         "Name": "minecraft:smooth_stone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "smooth_stone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "smooth_stone",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -194804,8 +194826,9 @@
         "Name": "minecraft:sandstone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "sandstone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "sandstone",
           "minecraft:vertical_half": "top"
         }
       }
@@ -194819,8 +194842,9 @@
         "Name": "minecraft:sandstone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "sandstone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "sandstone",
           "minecraft:vertical_half": "top"
         }
       }
@@ -194834,8 +194858,9 @@
         "Name": "minecraft:sandstone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "sandstone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "sandstone",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -194849,8 +194874,9 @@
         "Name": "minecraft:sandstone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "sandstone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "sandstone",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -194992,8 +195018,9 @@
         "Name": "minecraft:petrified_oak_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "petrified_oak_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "wood",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195007,8 +195034,9 @@
         "Name": "minecraft:petrified_oak_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "petrified_oak_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "wood",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195022,8 +195050,9 @@
         "Name": "minecraft:petrified_oak_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "petrified_oak_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "wood",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195037,8 +195066,9 @@
         "Name": "minecraft:petrified_oak_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "petrified_oak_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "wood",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195084,8 +195114,9 @@
         "Name": "minecraft:cobblestone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "cobblestone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "cobblestone",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195099,8 +195130,9 @@
         "Name": "minecraft:cobblestone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "cobblestone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "cobblestone",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195114,8 +195146,9 @@
         "Name": "minecraft:cobblestone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "cobblestone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "cobblestone",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195129,8 +195162,9 @@
         "Name": "minecraft:cobblestone_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "cobblestone_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "cobblestone",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195176,8 +195210,9 @@
         "Name": "minecraft:brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "brick",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195191,8 +195226,9 @@
         "Name": "minecraft:brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "brick",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195206,8 +195242,9 @@
         "Name": "minecraft:brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "brick",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195221,8 +195258,9 @@
         "Name": "minecraft:brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "brick",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195268,8 +195306,9 @@
         "Name": "minecraft:stone_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "stone_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "stone_brick",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195283,8 +195322,9 @@
         "Name": "minecraft:stone_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "stone_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "stone_brick",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195298,8 +195338,9 @@
         "Name": "minecraft:stone_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "stone_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "stone_brick",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195313,8 +195354,9 @@
         "Name": "minecraft:stone_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "stone_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "stone_brick",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195450,8 +195492,9 @@
         "Name": "minecraft:nether_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "nether_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "nether_brick",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195465,8 +195508,9 @@
         "Name": "minecraft:nether_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "nether_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "nether_brick",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195480,8 +195524,9 @@
         "Name": "minecraft:nether_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "nether_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "nether_brick",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195495,8 +195540,9 @@
         "Name": "minecraft:nether_brick_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "nether_brick_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "nether_brick",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195542,8 +195588,9 @@
         "Name": "minecraft:quartz_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "quartz_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "quartz",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195557,8 +195604,9 @@
         "Name": "minecraft:quartz_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "quartz_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "quartz",
           "minecraft:vertical_half": "top"
         }
       }
@@ -195572,8 +195620,9 @@
         "Name": "minecraft:quartz_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "quartz_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "quartz",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -195587,8 +195636,9 @@
         "Name": "minecraft:quartz_slab"
       },
       "bedrock_state": {
-        "bedrock_identifier": "quartz_slab",
+        "bedrock_identifier": "stone_block_slab",
         "state": {
+          "stone_slab_type": "quartz",
           "minecraft:vertical_half": "bottom"
         }
       }
@@ -222004,7 +222054,11 @@
         "Name": "minecraft:dead_tube_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "dead_tube_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "blue",
+          "dead_bit": true
+        }
       }
     },
     {
@@ -222012,7 +222066,11 @@
         "Name": "minecraft:dead_brain_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "dead_brain_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "pink",
+          "dead_bit": true
+        }
       }
     },
     {
@@ -222020,7 +222078,11 @@
         "Name": "minecraft:dead_bubble_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "dead_bubble_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "purple",
+          "dead_bit": true
+        }
       }
     },
     {
@@ -222028,7 +222090,11 @@
         "Name": "minecraft:dead_fire_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "dead_fire_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "red",
+          "dead_bit": true
+        }
       }
     },
     {
@@ -222036,7 +222102,11 @@
         "Name": "minecraft:dead_horn_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "dead_horn_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "yellow",
+          "dead_bit": true
+        }
       }
     },
     {
@@ -222044,7 +222114,11 @@
         "Name": "minecraft:tube_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "tube_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "blue",
+          "dead_bit": false
+        }
       }
     },
     {
@@ -222052,7 +222126,11 @@
         "Name": "minecraft:brain_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "brain_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "pink",
+          "dead_bit": false
+        }
       }
     },
     {
@@ -222060,7 +222138,11 @@
         "Name": "minecraft:bubble_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "bubble_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "purple",
+          "dead_bit": false
+        }
       }
     },
     {
@@ -222068,7 +222150,11 @@
         "Name": "minecraft:fire_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "fire_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "red",
+          "dead_bit": false
+        }
       }
     },
     {
@@ -222076,7 +222162,11 @@
         "Name": "minecraft:horn_coral_block"
       },
       "bedrock_state": {
-        "bedrock_identifier": "horn_coral_block"
+        "bedrock_identifier": "coral_block",
+        "state": {
+          "coral_color": "yellow",
+          "dead_bit": false
+        }
       }
     },
     {
@@ -511090,7 +511180,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": true,
           "trial_spawner_state": 0
         }
       }
@@ -511106,7 +511195,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": true,
           "trial_spawner_state": 1
         }
       }
@@ -511122,7 +511210,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": true,
           "trial_spawner_state": 2
         }
       }
@@ -511138,7 +511225,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": true,
           "trial_spawner_state": 3
         }
       }
@@ -511154,7 +511240,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": true,
           "trial_spawner_state": 4
         }
       }
@@ -511170,7 +511255,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": true,
           "trial_spawner_state": 5
         }
       }
@@ -511186,7 +511270,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": false,
           "trial_spawner_state": 0
         }
       }
@@ -511202,7 +511285,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": false,
           "trial_spawner_state": 1
         }
       }
@@ -511218,7 +511300,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": false,
           "trial_spawner_state": 2
         }
       }
@@ -511234,7 +511315,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": false,
           "trial_spawner_state": 3
         }
       }
@@ -511250,7 +511330,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": false,
           "trial_spawner_state": 4
         }
       }
@@ -511266,7 +511345,6 @@
       "bedrock_state": {
         "bedrock_identifier": "trial_spawner",
         "state": {
-          "ominous": false,
           "trial_spawner_state": 5
         }
       }
@@ -511283,7 +511361,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "north"
         }
@@ -511301,7 +511378,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "active",
           "minecraft:cardinal_direction": "north"
         }
@@ -511319,7 +511395,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "north"
         }
@@ -511337,7 +511412,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "north"
         }
@@ -511355,7 +511429,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "north"
         }
@@ -511373,7 +511446,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "active",
           "minecraft:cardinal_direction": "north"
         }
@@ -511391,7 +511463,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "north"
         }
@@ -511409,7 +511480,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "north"
         }
@@ -511427,7 +511497,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "south"
         }
@@ -511445,7 +511514,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "active",
           "minecraft:cardinal_direction": "south"
         }
@@ -511463,7 +511531,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "south"
         }
@@ -511481,7 +511548,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "south"
         }
@@ -511499,7 +511565,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "south"
         }
@@ -511517,7 +511582,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "active",
           "minecraft:cardinal_direction": "south"
         }
@@ -511535,7 +511599,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "south"
         }
@@ -511553,7 +511616,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "south"
         }
@@ -511571,7 +511633,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "west"
         }
@@ -511589,7 +511650,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "active",
           "minecraft:cardinal_direction": "west"
         }
@@ -511607,7 +511667,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "west"
         }
@@ -511625,7 +511684,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "west"
         }
@@ -511643,7 +511701,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "west"
         }
@@ -511661,7 +511718,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "active",
           "minecraft:cardinal_direction": "west"
         }
@@ -511679,7 +511735,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "west"
         }
@@ -511697,7 +511752,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "west"
         }
@@ -511715,7 +511769,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "east"
         }
@@ -511733,7 +511786,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "active",
           "minecraft:cardinal_direction": "east"
         }
@@ -511751,7 +511803,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "east"
         }
@@ -511769,7 +511820,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": true,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "east"
         }
@@ -511787,7 +511837,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "inactive",
           "minecraft:cardinal_direction": "east"
         }
@@ -511805,7 +511854,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "active",
           "minecraft:cardinal_direction": "east"
         }
@@ -511823,7 +511871,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "unlocking",
           "minecraft:cardinal_direction": "east"
         }
@@ -511841,7 +511888,6 @@
       "bedrock_state": {
         "bedrock_identifier": "vault",
         "state": {
-          "ominous": false,
           "vault_state": "ejecting",
           "minecraft:cardinal_direction": "east"
         }