diff --git a/README.md b/README.md index 23bde93d2..bbb9532a5 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here! -### Currently supporting Minecraft Bedrock 1.17.41 + 1.18.0 - 1.18.10 and Minecraft Java 1.18.2. +### Currently supporting Minecraft Bedrock 1.18.0 - 1.18.30 and Minecraft Java 1.18.2. ## Setting Up Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser. diff --git a/core/pom.xml b/core/pom.xml index d40b7dcc4..7dc64e08b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -120,8 +120,8 @@ com.github.CloudburstMC.Protocol - bedrock-v486 - 0cd24c0 + bedrock-v503 + 29ecd7a compile diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java index 58f04a756..0d6c0dac1 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java @@ -37,6 +37,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.AttributeData; +import com.nukkitx.protocol.bedrock.data.GameType; import com.nukkitx.protocol.bedrock.data.PlayerPermission; import com.nukkitx.protocol.bedrock.data.command.CommandPermission; import com.nukkitx.protocol.bedrock.data.entity.EntityData; @@ -126,6 +127,7 @@ public class PlayerEntity extends LivingEntity { addPlayerPacket.getAdventureSettings().setPlayerPermission(PlayerPermission.MEMBER); addPlayerPacket.setDeviceId(""); addPlayerPacket.setPlatformChatId(""); + addPlayerPacket.setGameType(GameType.SURVIVAL); //TODO addPlayerPacket.getMetadata().putFlags(flags); dirtyMetadata.apply(addPlayerPacket.getMetadata()); diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java index ce1615816..f1a447b57 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/SkullPlayerEntity.java @@ -27,6 +27,7 @@ package org.geysermc.geyser.entity.type.player; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3i; +import com.nukkitx.protocol.bedrock.data.GameType; import com.nukkitx.protocol.bedrock.data.PlayerPermission; import com.nukkitx.protocol.bedrock.data.command.CommandPermission; import com.nukkitx.protocol.bedrock.data.entity.EntityData; @@ -84,6 +85,7 @@ public class SkullPlayerEntity extends PlayerEntity { addPlayerPacket.getAdventureSettings().setPlayerPermission(PlayerPermission.MEMBER); addPlayerPacket.setDeviceId(""); addPlayerPacket.setPlatformChatId(""); + addPlayerPacket.setGameType(GameType.SURVIVAL); addPlayerPacket.getMetadata().putFlags(flags); dirtyMetadata.apply(addPlayerPacket.getMetadata()); diff --git a/core/src/main/java/org/geysermc/geyser/level/BedrockDimension.java b/core/src/main/java/org/geysermc/geyser/level/BedrockDimension.java new file mode 100644 index 000000000..78c6b2c6a --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/level/BedrockDimension.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.geyser.level; + +/** + * A data structure to represent what Bedrock believes are the height requirements for a specific dimension. + * As of 1.18.30, biome count is representative of the height of the world, and out-of-bounds chunks can crash + * the client. + * + * @param minY The minimum height Bedrock Edition will accept. + * @param height The maximum chunk height Bedrock Edition will accept, from the lowest point to the highest. + * @param doUpperHeightWarn whether to warn in the console if the Java dimension height exceeds Bedrock's. + */ +public record BedrockDimension(int minY, int height, boolean doUpperHeightWarn) { + public static BedrockDimension OVERWORLD = new BedrockDimension(-64, 384, true); + public static BedrockDimension THE_NETHER = new BedrockDimension(0, 128, false); + public static BedrockDimension THE_END = new BedrockDimension(0, 256, true); +} diff --git a/core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java b/core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java index 425c78f18..d22150ccf 100644 --- a/core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java +++ b/core/src/main/java/org/geysermc/geyser/level/block/BlockPositionIterator.java @@ -26,8 +26,6 @@ package org.geysermc.geyser.level.block; import com.nukkitx.network.util.Preconditions; -import lombok.Getter; - public class BlockPositionIterator { private final int minX; diff --git a/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java b/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java index 7ab381375..0f5782f86 100644 --- a/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java +++ b/core/src/main/java/org/geysermc/geyser/network/MinecraftProtocol.java @@ -28,11 +28,14 @@ package org.geysermc.geyser.network; import com.github.steveice10.mc.protocol.codec.MinecraftCodec; import com.github.steveice10.mc.protocol.codec.PacketCodec; import com.nukkitx.protocol.bedrock.BedrockPacketCodec; -import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; import com.nukkitx.protocol.bedrock.v475.Bedrock_v475; import com.nukkitx.protocol.bedrock.v486.Bedrock_v486; +import com.nukkitx.protocol.bedrock.v503.Bedrock_v503; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.StringJoiner; /** * Contains information about the supported protocols in Geyser. @@ -42,7 +45,7 @@ public final class MinecraftProtocol { * Default Bedrock codec that should act as a fallback. Should represent the latest available * release of the game that Geyser supports. */ - public static final BedrockPacketCodec DEFAULT_BEDROCK_CODEC = Bedrock_v486.V486_CODEC; + public static final BedrockPacketCodec DEFAULT_BEDROCK_CODEC = Bedrock_v503.V503_CODEC; /** * A list of all supported Bedrock versions that can join Geyser */ @@ -55,11 +58,11 @@ public final class MinecraftProtocol { private static final PacketCodec DEFAULT_JAVA_CODEC = MinecraftCodec.CODEC; static { - SUPPORTED_BEDROCK_CODECS.add(Bedrock_v471.V471_CODEC); SUPPORTED_BEDROCK_CODECS.add(Bedrock_v475.V475_CODEC.toBuilder().minecraftVersion("1.18.0/1.18.1/1.18.2").build()); - SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC.toBuilder() + SUPPORTED_BEDROCK_CODECS.add(Bedrock_v486.V486_CODEC.toBuilder() .minecraftVersion("1.18.10/1.18.12") // 1.18.11 is also supported, but was only on Switch and since that auto-updates it's not needed .build()); + SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC); } /** diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java index 5ded35259..5ae6fbca9 100644 --- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java +++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java @@ -30,18 +30,18 @@ import com.nukkitx.protocol.bedrock.BedrockPacketCodec; import com.nukkitx.protocol.bedrock.data.ExperimentData; import com.nukkitx.protocol.bedrock.data.ResourcePackType; import com.nukkitx.protocol.bedrock.packet.*; -import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.session.PendingMicrosoftAuthentication; -import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.pack.ResourcePack; import org.geysermc.geyser.pack.ResourcePackManifest; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.registry.Registries; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.PendingMicrosoftAuthentication; +import org.geysermc.geyser.session.auth.AuthType; import org.geysermc.geyser.text.GeyserLocale; -import org.geysermc.geyser.util.*; +import org.geysermc.geyser.util.LoginEncryptionUtils; +import org.geysermc.geyser.util.MathUtils; import java.io.FileInputStream; import java.io.InputStream; @@ -165,11 +165,6 @@ public class UpstreamPacketHandler extends LoggingPacketHandler { stackPacket.getExperiments().add(new ExperimentData("data_driven_items", true)); } - if (session.getUpstream().getProtocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) { - // Allow extended world height in the overworld to work for pre-1.18 clients - stackPacket.getExperiments().add(new ExperimentData("caves_and_cliffs", true)); - } - session.sendUpstreamPacket(stackPacket); break; diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java index 8238bcea1..d8aa6a456 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java @@ -28,8 +28,9 @@ package org.geysermc.geyser.registry.populator; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; import com.nukkitx.nbt.*; -import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; +import com.nukkitx.protocol.bedrock.v475.Bedrock_v475; import com.nukkitx.protocol.bedrock.v486.Bedrock_v486; +import com.nukkitx.protocol.bedrock.v503.Bedrock_v503; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.objects.Object2IntMap; @@ -60,35 +61,50 @@ public class BlockRegistryPopulator { private static final ImmutableMap, BiFunction> BLOCK_MAPPERS; private static final BiFunction EMPTY_MAPPER = (bedrockIdentifier, statesBuilder) -> null; + private static final BiFunction V486_MAPPER = (bedrockIdentifier, statesBuilder) -> { + statesBuilder.remove("no_drop_bit"); // Used in skulls + if (bedrockIdentifier.equals("minecraft:glow_lichen")) { + // Moved around north, south, west + int bits = (int) statesBuilder.get("multi_face_direction_bits"); + boolean north = (bits & (1 << 2)) != 0; + boolean south = (bits & (1 << 3)) != 0; + boolean west = (bits & (1 << 4)) != 0; + if (north) { + bits |= 1 << 4; + } else { + bits &= ~(1 << 4); + } + if (south) { + bits |= 1 << 2; + } else { + bits &= ~(1 << 2); + } + if (west) { + bits |= 1 << 3; + } else { + bits &= ~(1 << 3); + } + statesBuilder.put("multi_face_direction_bits", bits); + } + return null; + }; + static { ImmutableMap.Builder, BiFunction> stateMapperBuilder = ImmutableMap., BiFunction>builder() - .put(ObjectIntPair.of("1_17_40", Bedrock_v471.V471_CODEC.getProtocolVersion()), EMPTY_MAPPER) - .put(ObjectIntPair.of("1_18_10", Bedrock_v486.V486_CODEC.getProtocolVersion()), (bedrockIdentifier, statesBuilder) -> { - statesBuilder.remove("no_drop_bit"); // Used in skulls - if (bedrockIdentifier.equals("minecraft:glow_lichen")) { - // Moved around north, south, west - int bits = (int) statesBuilder.get("multi_face_direction_bits"); - boolean north = (bits & (1 << 2)) != 0; - boolean south = (bits & (1 << 3)) != 0; - boolean west = (bits & (1 << 4)) != 0; - if (north) { - bits |= 1 << 4; - } else { - bits &= ~(1 << 4); - } - if (south) { - bits |= 1 << 2; - } else { - bits &= ~(1 << 2); - } - if (west) { - bits |= 1 << 3; - } else { - bits &= ~(1 << 3); - } - statesBuilder.put("multi_face_direction_bits", bits); - } - return null; + .put(ObjectIntPair.of("1_18_0", Bedrock_v475.V475_CODEC.getProtocolVersion()), EMPTY_MAPPER) + .put(ObjectIntPair.of("1_18_10", Bedrock_v486.V486_CODEC.getProtocolVersion()), V486_MAPPER) + .put(ObjectIntPair.of("1_18_30", Bedrock_v503.V503_CODEC.getProtocolVersion()), (bedrockIdentifier, statesBuilder) -> { + // Apply these fixes too + V486_MAPPER.apply(bedrockIdentifier, statesBuilder); + return switch (bedrockIdentifier) { + case "minecraft:pistonArmCollision" -> "minecraft:piston_arm_collision"; + case "minecraft:stickyPistonArmCollision" -> "minecraft:sticky_piston_arm_collision"; + case "minecraft:movingBlock" -> "minecraft:moving_block"; + case "minecraft:tripWire" -> "minecraft:trip_wire"; + case "minecraft:seaLantern" -> "minecraft:sea_lantern"; + case "minecraft:concretePowder" -> "minecraft:concrete_powder"; + default -> null; + }; }); BLOCK_MAPPERS = stateMapperBuilder.build(); diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java index 0e12669e3..37b6c49f4 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java @@ -35,10 +35,12 @@ import com.nukkitx.protocol.bedrock.data.SoundEvent; import com.nukkitx.protocol.bedrock.data.inventory.ComponentItemData; import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.StartGamePacket; -import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; import com.nukkitx.protocol.bedrock.v475.Bedrock_v475; import com.nukkitx.protocol.bedrock.v486.Bedrock_v486; -import it.unimi.dsi.fastutil.ints.*; +import com.nukkitx.protocol.bedrock.v503.Bedrock_v503; +import it.unimi.dsi.fastutil.ints.Int2IntMap; +import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.objects.*; import org.geysermc.geyser.GeyserBootstrap; import org.geysermc.geyser.GeyserImpl; @@ -58,19 +60,16 @@ import java.util.*; * Populates the item registries. */ public class ItemRegistryPopulator { - private static final Map PALETTE_VERSIONS; - - static { - PALETTE_VERSIONS = new Object2ObjectOpenHashMap<>(); - PALETTE_VERSIONS.put("1_17_40", new PaletteVersion(Bedrock_v471.V471_CODEC.getProtocolVersion(), Collections.emptyMap())); - PALETTE_VERSIONS.put("1_18_0", new PaletteVersion(Bedrock_v475.V475_CODEC.getProtocolVersion(), Collections.emptyMap())); - PALETTE_VERSIONS.put("1_18_10", new PaletteVersion(Bedrock_v486.V486_CODEC.getProtocolVersion(), Collections.emptyMap())); - } private record PaletteVersion(int protocolVersion, Map additionalTranslatedItems) { } public static void populate() { + Map paletteVersions = new Object2ObjectOpenHashMap<>(); + paletteVersions.put("1_18_0", new PaletteVersion(Bedrock_v475.V475_CODEC.getProtocolVersion(), Collections.emptyMap())); + paletteVersions.put("1_18_10", new PaletteVersion(Bedrock_v486.V486_CODEC.getProtocolVersion(), Collections.emptyMap())); + paletteVersions.put("1_18_30", new PaletteVersion(Bedrock_v503.V503_CODEC.getProtocolVersion(), Collections.emptyMap())); + GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap(); TypeReference> mappingItemsType = new TypeReference<>() { }; @@ -88,7 +87,7 @@ public class ItemRegistryPopulator { Int2IntMap dyeColors = new FixedInt2IntMap(); /* Load item palette */ - for (Map.Entry palette : PALETTE_VERSIONS.entrySet()) { + for (Map.Entry palette : paletteVersions.entrySet()) { TypeReference> paletteEntriesType = new TypeReference<>() {}; // Used to get the Bedrock namespaced ID (in instances where there are small differences) @@ -232,12 +231,15 @@ public class ItemRegistryPopulator { } String bedrockIdentifier; - if (javaIdentifier.equals("minecraft:music_disc_otherside") && palette.getValue().protocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) { - bedrockIdentifier = "minecraft:music_disc_pigstep"; - } else if (javaIdentifier.equals("minecraft:globe_banner_pattern") && palette.getValue().protocolVersion() < Bedrock_v486.V486_CODEC.getProtocolVersion()) { + if (javaIdentifier.equals("minecraft:globe_banner_pattern") && palette.getValue().protocolVersion() < Bedrock_v486.V486_CODEC.getProtocolVersion()) { bedrockIdentifier = "minecraft:banner_pattern"; } else { bedrockIdentifier = mappingItem.getBedrockIdentifier(); + if (palette.getValue().protocolVersion() >= Bedrock_v503.V503_CODEC.getProtocolVersion()) { + if (bedrockIdentifier.equals("minecraft:sealantern")) { + bedrockIdentifier = "minecraft:sea_lantern"; + } + } } if (usingFurnaceMinecart && javaIdentifier.equals("minecraft:furnace_minecart")) { diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index aeb8e9970..f35378af3 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -67,7 +67,6 @@ import com.nukkitx.protocol.bedrock.data.*; import com.nukkitx.protocol.bedrock.data.command.CommandPermission; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.packet.*; -import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; import io.netty.channel.Channel; import io.netty.channel.EventLoop; import it.unimi.dsi.fastutil.ints.*; @@ -1388,7 +1387,7 @@ public class GeyserSession implements GeyserConnection, CommandSender { startGamePacket.setPlayerPosition(Vector3f.from(0, 69, 0)); startGamePacket.setRotation(Vector2f.from(1, 1)); - startGamePacket.setSeed(-1); + startGamePacket.setSeed(-1L); startGamePacket.setDimensionId(DimensionUtils.javaToBedrock(dimension)); startGamePacket.setGeneratorId(1); startGamePacket.setLevelGameType(GameType.SURVIVAL); @@ -1437,10 +1436,6 @@ public class GeyserSession implements GeyserConnection, CommandSender { settings.setServerAuthoritativeBlockBreaking(false); startGamePacket.setPlayerMovementSettings(settings); - if (upstream.getProtocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) { - startGamePacket.getExperiments().add(new ExperimentData("caves_and_cliffs", true)); - } - upstream.sendPacket(startGamePacket); } diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java index feb1cf3a8..91d6b33d6 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java @@ -33,6 +33,7 @@ import lombok.Setter; import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.level.block.BlockStateValues; import org.geysermc.geyser.level.chunk.GeyserChunk; +import org.geysermc.geyser.level.BedrockDimension; import org.geysermc.geyser.util.MathUtils; public class ChunkCache { @@ -45,11 +46,11 @@ public class ChunkCache { private int heightY; /** - * Whether the Bedrock client believes they are in a world with a minimum of -64 and maximum of 320 + * Which dimension Bedrock understands themselves to be in. */ @Getter @Setter - private boolean isExtendedHeight = false; + private BedrockDimension bedrockDimension = BedrockDimension.OVERWORLD; public ChunkCache(GeyserSession session) { this.cache = !session.getGeyser().getWorldManager().hasOwnChunkCache(); // To prevent Spigot from initializing diff --git a/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java index 847a70a27..55d45f67e 100644 --- a/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/nbt/EnchantmentTranslator.java @@ -136,7 +136,7 @@ public class EnchantmentTranslator extends NbtItemStackTranslator { CompoundTag bedrockTag = new CompoundTag(""); bedrockTag.put(new ShortTag("id", (short) enchantment.ordinal())); // If the tag cannot parse, Java Edition 1.18.2 sets to 0 - bedrockTag.put(new ShortTag("lvl", javaEnchLvl != null && javaEnchLvl.getValue() instanceof Number lvl ? lvl.shortValue() : 0)); + bedrockTag.put(new ShortTag("lvl", javaEnchLvl != null && javaEnchLvl.getValue() instanceof Number lvl ? lvl.shortValue() : (short) 0)); return bedrockTag; } diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java index 2fccbe482..a63c0f334 100644 --- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockMovePlayerTranslator.java @@ -37,14 +37,12 @@ import org.geysermc.geyser.entity.EntityDefinitions; import org.geysermc.geyser.entity.type.player.SessionPlayerEntity; import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.text.ChatColor; +import org.geysermc.geyser.level.BedrockDimension; import org.geysermc.geyser.translator.protocol.PacketTranslator; import org.geysermc.geyser.translator.protocol.Translator; @Translator(packet = MovePlayerPacket.class) public class BedrockMovePlayerTranslator extends PacketTranslator { - /* The upper and lower bounds to check for the void floor that only exists in Bedrock. These are the constants for the overworld. */ - private static final int BEDROCK_OVERWORLD_VOID_FLOOR_UPPER_Y = -104; - private static final int BEDROCK_OVERWORLD_VOID_FLOOR_LOWER_Y = BEDROCK_OVERWORLD_VOID_FLOOR_UPPER_Y + 2; @Override public void translate(GeyserSession session, MovePlayerPacket packet) { @@ -124,11 +122,10 @@ public class BedrockMovePlayerTranslator extends PacketTranslator= (extendedWorld ? BEDROCK_OVERWORLD_VOID_FLOOR_UPPER_Y : -40)) { + // The void floor is offset about 40 blocks below the bottom of the world + BedrockDimension bedrockDimension = session.getChunkCache().getBedrockDimension(); + int voidFloorLocation = bedrockDimension.minY() - 40; + if (floorY <= (voidFloorLocation + 2) && floorY >= voidFloorLocation) { // Work around there being a floor at the bottom of the world and teleport the player below it // Moving from below to above the void floor works fine entity.setPosition(entity.getPosition().sub(0, 4f, 0)); diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java index 97b826473..165d90b36 100644 --- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java @@ -43,7 +43,7 @@ import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtUtils; import com.nukkitx.network.VarInts; import com.nukkitx.protocol.bedrock.packet.LevelChunkPacket; -import com.nukkitx.protocol.bedrock.v475.Bedrock_v475; +import com.nukkitx.protocol.bedrock.v503.Bedrock_v503; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufOutputStream; @@ -52,26 +52,29 @@ import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntLists; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.geysermc.geyser.entity.type.ItemFrameEntity; -import org.geysermc.geyser.session.GeyserSession; -import org.geysermc.geyser.translator.protocol.PacketTranslator; -import org.geysermc.geyser.translator.protocol.Translator; -import org.geysermc.geyser.translator.level.BiomeTranslator; import org.geysermc.geyser.level.block.BlockStateValues; -import org.geysermc.geyser.translator.level.block.entity.BedrockOnlyBlockEntity; -import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; -import org.geysermc.geyser.translator.level.block.entity.SkullBlockEntityTranslator; import org.geysermc.geyser.level.chunk.BlockStorage; import org.geysermc.geyser.level.chunk.GeyserChunkSection; import org.geysermc.geyser.level.chunk.bitarray.BitArray; import org.geysermc.geyser.level.chunk.bitarray.BitArrayVersion; import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray; import org.geysermc.geyser.registry.BlockRegistries; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.level.BedrockDimension; +import org.geysermc.geyser.translator.level.BiomeTranslator; +import org.geysermc.geyser.translator.level.block.entity.BedrockOnlyBlockEntity; +import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator; +import org.geysermc.geyser.translator.level.block.entity.SkullBlockEntityTranslator; +import org.geysermc.geyser.translator.protocol.PacketTranslator; +import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.util.BlockEntityUtils; import org.geysermc.geyser.util.ChunkUtils; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.*; +import java.util.BitSet; +import java.util.List; +import java.util.Map; import static org.geysermc.geyser.util.ChunkUtils.*; @@ -98,13 +101,13 @@ public class JavaLevelChunkWithLightTranslator extends PacketTranslator> 4) - 1; + BedrockDimension bedrockDimension = session.getChunkCache().getBedrockDimension(); + int maxBedrockSectionY = (bedrockDimension.height() >> 4) - 1; int sectionCount; byte[] payload; ByteBuf byteBuf = null; - GeyserChunkSection[] sections = new GeyserChunkSection[javaChunks.length - (yOffset + ((overworld ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT) >> 4))]; + GeyserChunkSection[] sections = new GeyserChunkSection[javaChunks.length - (yOffset + (bedrockDimension.minY() >> 4))]; try { NetInput in = new StreamNetInput(new ByteArrayInputStream(packet.getChunkData())); @@ -113,7 +116,7 @@ public class JavaLevelChunkWithLightTranslator extends PacketTranslator> 4)); + int bedrockSectionY = sectionY + (yOffset - (bedrockDimension.minY() >> 4)); if (bedrockSectionY < 0 || maxBedrockSectionY < bedrockSectionY) { // Ignore this chunk section since it goes outside the bounds accepted by the Bedrock client continue; @@ -309,11 +312,11 @@ public class JavaLevelChunkWithLightTranslator extends PacketTranslator= Bedrock_v475.V475_CODEC.getProtocolVersion(); - int biomeCount = isNewVersion ? 25 : 32; - int dimensionOffset = (overworld ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT) >> 4; + // As of 1.18.0, Bedrock hardcodes to always read 25 biome sections + // As of 1.18.30, the hardcode may now be tied to the dimension definition + boolean isNewVersion = session.getUpstream().getProtocolVersion() >= Bedrock_v503.V503_CODEC.getProtocolVersion(); + int biomeCount = isNewVersion ? bedrockDimension.height() >> 4 : 25; + int dimensionOffset = bedrockDimension.minY() >> 4; for (int i = 0; i < biomeCount; i++) { int biomeYOffset = dimensionOffset + i; if (biomeYOffset < yOffset) { diff --git a/core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java b/core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java index 7fdf12ec9..445ffb882 100644 --- a/core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/ChunkUtils.java @@ -46,23 +46,13 @@ import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray; import org.geysermc.geyser.registry.BlockRegistries; import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.text.GeyserLocale; +import org.geysermc.geyser.level.BedrockDimension; import org.geysermc.geyser.translator.level.block.entity.BedrockOnlyBlockEntity; import static org.geysermc.geyser.level.block.BlockStateValues.JAVA_AIR_ID; @UtilityClass public class ChunkUtils { - /** - * The minimum height Bedrock Edition will accept. - */ - public static final int MINIMUM_ACCEPTED_HEIGHT = 0; - public static final int MINIMUM_ACCEPTED_HEIGHT_OVERWORLD = -64; - /** - * The maximum chunk height Bedrock Edition will accept, from the lowest point to the highest. - */ - public static final int MAXIMUM_ACCEPTED_HEIGHT = 256; - public static final int MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD = 384; - /** * An empty subchunk. */ @@ -249,17 +239,20 @@ public class ChunkUtils { throw new RuntimeException("Maximum Y must be a multiple of 16!"); } - int dimension = DimensionUtils.javaToBedrock(session.getDimension()); - boolean extendedHeight = dimension == 0; - session.getChunkCache().setExtendedHeight(extendedHeight); + BedrockDimension bedrockDimension = switch (session.getDimension()) { + case DimensionUtils.THE_END -> BedrockDimension.THE_END; + case DimensionUtils.NETHER -> DimensionUtils.isCustomBedrockNetherId() ? BedrockDimension.THE_END : BedrockDimension.THE_NETHER; + default -> BedrockDimension.OVERWORLD; + }; + session.getChunkCache().setBedrockDimension(bedrockDimension); // Yell in the console if the world height is too height in the current scenario // The constraints change depending on if the player is in the overworld or not, and if experimental height is enabled - if (minY < (extendedHeight ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT) - || maxY > (extendedHeight ? MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD : MAXIMUM_ACCEPTED_HEIGHT)) { + // (Ignore this for the Nether. We can't change that at the moment without the workaround. :/ ) + if (minY < bedrockDimension.minY() || (bedrockDimension.doUpperHeightWarn() && maxY > bedrockDimension.height())) { session.getGeyser().getLogger().warning(GeyserLocale.getLocaleStringLog("geyser.network.translator.chunk.out_of_bounds", - extendedHeight ? MINIMUM_ACCEPTED_HEIGHT_OVERWORLD : MINIMUM_ACCEPTED_HEIGHT, - extendedHeight ? MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD : MAXIMUM_ACCEPTED_HEIGHT, + String.valueOf(bedrockDimension.minY()), + String.valueOf(bedrockDimension.height()), session.getDimension())); } diff --git a/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java index 5af5e2c2b..f1aca63e8 100644 --- a/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java @@ -109,7 +109,7 @@ public class DimensionUtils { // we check if the player is entering the nether and apply the nether fog to fake the fact that the client // thinks they are in the end dimension. if (BEDROCK_NETHER_ID == 2) { - if (bedrockDimension == BEDROCK_NETHER_ID) { + if (NETHER.equals(javaDimension)) { session.sendFog("minecraft:fog_hell"); } else if (previousDimension == BEDROCK_NETHER_ID) { session.removeFog("minecraft:fog_hell"); diff --git a/core/src/main/resources/bedrock/block_palette.1_17_40.nbt b/core/src/main/resources/bedrock/block_palette.1_18_0.nbt similarity index 100% rename from core/src/main/resources/bedrock/block_palette.1_17_40.nbt rename to core/src/main/resources/bedrock/block_palette.1_18_0.nbt diff --git a/core/src/main/resources/bedrock/block_palette.1_18_30.nbt b/core/src/main/resources/bedrock/block_palette.1_18_30.nbt new file mode 100644 index 000000000..bf7690970 Binary files /dev/null and b/core/src/main/resources/bedrock/block_palette.1_18_30.nbt differ diff --git a/core/src/main/resources/bedrock/creative_items.1_17_40.json b/core/src/main/resources/bedrock/creative_items.1_18_30.json similarity index 84% rename from core/src/main/resources/bedrock/creative_items.1_17_40.json rename to core/src/main/resources/bedrock/creative_items.1_18_30.json index 0bc7f91ea..3cfb5cfc1 100644 --- a/core/src/main/resources/bedrock/creative_items.1_17_40.json +++ b/core/src/main/resources/bedrock/creative_items.1_18_30.json @@ -2,379 +2,379 @@ "items" : [ { "id" : "minecraft:planks", - "blockRuntimeId" : 5797 + "blockRuntimeId" : 5995 }, { "id" : "minecraft:planks", - "blockRuntimeId" : 5798 + "blockRuntimeId" : 5996 }, { "id" : "minecraft:planks", - "blockRuntimeId" : 5799 + "blockRuntimeId" : 5997 }, { "id" : "minecraft:planks", - "blockRuntimeId" : 5800 + "blockRuntimeId" : 5998 }, { "id" : "minecraft:planks", - "blockRuntimeId" : 5801 + "blockRuntimeId" : 5999 }, { "id" : "minecraft:planks", - "blockRuntimeId" : 5802 + "blockRuntimeId" : 6000 }, { "id" : "minecraft:crimson_planks", - "blockRuntimeId" : 3840 + "blockRuntimeId" : 4806 }, { "id" : "minecraft:warped_planks", - "blockRuntimeId" : 7598 + "blockRuntimeId" : 928 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1319 + "blockRuntimeId" : 1187 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1320 + "blockRuntimeId" : 1188 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1321 + "blockRuntimeId" : 1189 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1322 + "blockRuntimeId" : 1190 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1323 + "blockRuntimeId" : 1191 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1324 + "blockRuntimeId" : 1192 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1331 + "blockRuntimeId" : 1199 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1326 + "blockRuntimeId" : 1194 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1327 + "blockRuntimeId" : 1195 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1325 + "blockRuntimeId" : 1193 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1328 + "blockRuntimeId" : 1196 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1332 + "blockRuntimeId" : 1200 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1329 + "blockRuntimeId" : 1197 }, { "id" : "minecraft:cobblestone_wall", - "blockRuntimeId" : 1330 + "blockRuntimeId" : 1198 }, { "id" : "minecraft:blackstone_wall", - "blockRuntimeId" : 507 + "blockRuntimeId" : 3919 }, { "id" : "minecraft:polished_blackstone_wall", - "blockRuntimeId" : 6041 + "blockRuntimeId" : 6640 }, { "id" : "minecraft:polished_blackstone_brick_wall", - "blockRuntimeId" : 5838 + "blockRuntimeId" : 978 }, { "id" : "minecraft:cobbled_deepslate_wall", - "blockRuntimeId" : 1156 + "blockRuntimeId" : 8024 }, { "id" : "minecraft:deepslate_tile_wall", - "blockRuntimeId" : 4298 + "blockRuntimeId" : 5027 }, { "id" : "minecraft:polished_deepslate_wall", - "blockRuntimeId" : 6216 + "blockRuntimeId" : 7759 }, { "id" : "minecraft:deepslate_brick_wall", - "blockRuntimeId" : 4115 + "blockRuntimeId" : 437 }, { "id" : "minecraft:fence", - "blockRuntimeId" : 4774 + "blockRuntimeId" : 7306 }, { "id" : "minecraft:fence", - "blockRuntimeId" : 4775 + "blockRuntimeId" : 7307 }, { "id" : "minecraft:fence", - "blockRuntimeId" : 4776 + "blockRuntimeId" : 7308 }, { "id" : "minecraft:fence", - "blockRuntimeId" : 4777 + "blockRuntimeId" : 7309 }, { "id" : "minecraft:fence", - "blockRuntimeId" : 4778 + "blockRuntimeId" : 7310 }, { "id" : "minecraft:fence", - "blockRuntimeId" : 4779 + "blockRuntimeId" : 7311 }, { "id" : "minecraft:nether_brick_fence", - "blockRuntimeId" : 5689 + "blockRuntimeId" : 4238 }, { "id" : "minecraft:crimson_fence", - "blockRuntimeId" : 3818 + "blockRuntimeId" : 7938 }, { "id" : "minecraft:warped_fence", - "blockRuntimeId" : 7576 + "blockRuntimeId" : 5777 }, { "id" : "minecraft:fence_gate", - "blockRuntimeId" : 4780 - }, - { - "id" : "minecraft:spruce_fence_gate", - "blockRuntimeId" : 7010 - }, - { - "id" : "minecraft:birch_fence_gate", - "blockRuntimeId" : 400 - }, - { - "id" : "minecraft:jungle_fence_gate", - "blockRuntimeId" : 5253 - }, - { - "id" : "minecraft:acacia_fence_gate", - "blockRuntimeId" : 44 - }, - { - "id" : "minecraft:dark_oak_fence_gate", - "blockRuntimeId" : 3981 - }, - { - "id" : "minecraft:crimson_fence_gate", - "blockRuntimeId" : 3819 - }, - { - "id" : "minecraft:warped_fence_gate", - "blockRuntimeId" : 7577 - }, - { - "id" : "minecraft:normal_stone_stairs", - "blockRuntimeId" : 5708 - }, - { - "id" : "minecraft:stone_stairs", - "blockRuntimeId" : 7281 - }, - { - "id" : "minecraft:mossy_cobblestone_stairs", - "blockRuntimeId" : 5668 - }, - { - "id" : "minecraft:oak_stairs", - "blockRuntimeId" : 5717 - }, - { - "id" : "minecraft:spruce_stairs", - "blockRuntimeId" : 7042 - }, - { - "id" : "minecraft:birch_stairs", - "blockRuntimeId" : 432 - }, - { - "id" : "minecraft:jungle_stairs", - "blockRuntimeId" : 5285 - }, - { - "id" : "minecraft:acacia_stairs", "blockRuntimeId" : 76 }, + { + "id" : "minecraft:spruce_fence_gate", + "blockRuntimeId" : 6475 + }, + { + "id" : "minecraft:birch_fence_gate", + "blockRuntimeId" : 3782 + }, + { + "id" : "minecraft:jungle_fence_gate", + "blockRuntimeId" : 5315 + }, + { + "id" : "minecraft:acacia_fence_gate", + "blockRuntimeId" : 7528 + }, + { + "id" : "minecraft:dark_oak_fence_gate", + "blockRuntimeId" : 4156 + }, + { + "id" : "minecraft:crimson_fence_gate", + "blockRuntimeId" : 4617 + }, + { + "id" : "minecraft:warped_fence_gate", + "blockRuntimeId" : 5349 + }, + { + "id" : "minecraft:normal_stone_stairs", + "blockRuntimeId" : 641 + }, + { + "id" : "minecraft:stone_stairs", + "blockRuntimeId" : 3713 + }, + { + "id" : "minecraft:mossy_cobblestone_stairs", + "blockRuntimeId" : 4081 + }, + { + "id" : "minecraft:oak_stairs", + "blockRuntimeId" : 287 + }, + { + "id" : "minecraft:spruce_stairs", + "blockRuntimeId" : 128 + }, + { + "id" : "minecraft:birch_stairs", + "blockRuntimeId" : 6957 + }, + { + "id" : "minecraft:jungle_stairs", + "blockRuntimeId" : 6883 + }, + { + "id" : "minecraft:acacia_stairs", + "blockRuntimeId" : 6123 + }, { "id" : "minecraft:dark_oak_stairs", - "blockRuntimeId" : 4013 + "blockRuntimeId" : 5019 }, { "id" : "minecraft:stone_brick_stairs", - "blockRuntimeId" : 7187 + "blockRuntimeId" : 939 }, { "id" : "minecraft:mossy_stone_brick_stairs", - "blockRuntimeId" : 5676 + "blockRuntimeId" : 5807 }, { "id" : "minecraft:sandstone_stairs", - "blockRuntimeId" : 6710 + "blockRuntimeId" : 3592 }, { "id" : "minecraft:smooth_sandstone_stairs", - "blockRuntimeId" : 6903 + "blockRuntimeId" : 3632 }, { "id" : "minecraft:red_sandstone_stairs", - "blockRuntimeId" : 6637 + "blockRuntimeId" : 5300 }, { "id" : "minecraft:smooth_red_sandstone_stairs", - "blockRuntimeId" : 6895 + "blockRuntimeId" : 5496 }, { "id" : "minecraft:granite_stairs", - "blockRuntimeId" : 4989 + "blockRuntimeId" : 3542 }, { "id" : "minecraft:polished_granite_stairs", - "blockRuntimeId" : 6386 + "blockRuntimeId" : 4139 }, { "id" : "minecraft:diorite_stairs", - "blockRuntimeId" : 4476 + "blockRuntimeId" : 4339 }, { "id" : "minecraft:polished_diorite_stairs", - "blockRuntimeId" : 6378 + "blockRuntimeId" : 6588 }, { "id" : "minecraft:andesite_stairs", - "blockRuntimeId" : 144 + "blockRuntimeId" : 5258 }, { "id" : "minecraft:polished_andesite_stairs", - "blockRuntimeId" : 5814 + "blockRuntimeId" : 6982 }, { "id" : "minecraft:brick_stairs", - "blockRuntimeId" : 876 + "blockRuntimeId" : 6421 }, { "id" : "minecraft:nether_brick_stairs", - "blockRuntimeId" : 5690 + "blockRuntimeId" : 106 }, { "id" : "minecraft:red_nether_brick_stairs", - "blockRuntimeId" : 6625 + "blockRuntimeId" : 6493 }, { "id" : "minecraft:end_brick_stairs", - "blockRuntimeId" : 4720 + "blockRuntimeId" : 6347 }, { "id" : "minecraft:quartz_stairs", - "blockRuntimeId" : 6559 + "blockRuntimeId" : 4723 }, { "id" : "minecraft:smooth_quartz_stairs", - "blockRuntimeId" : 6887 + "blockRuntimeId" : 7642 }, { "id" : "minecraft:purpur_stairs", - "blockRuntimeId" : 6537 + "blockRuntimeId" : 7697 }, { "id" : "minecraft:prismarine_stairs", - "blockRuntimeId" : 6449 + "blockRuntimeId" : 7205 }, { "id" : "minecraft:dark_prismarine_stairs", - "blockRuntimeId" : 4037 + "blockRuntimeId" : 7372 }, { "id" : "minecraft:prismarine_bricks_stairs", - "blockRuntimeId" : 6441 + "blockRuntimeId" : 206 }, { "id" : "minecraft:crimson_stairs", - "blockRuntimeId" : 3860 + "blockRuntimeId" : 6245 }, { "id" : "minecraft:warped_stairs", - "blockRuntimeId" : 7618 + "blockRuntimeId" : 3723 }, { "id" : "minecraft:blackstone_stairs", - "blockRuntimeId" : 499 + "blockRuntimeId" : 6973 }, { "id" : "minecraft:polished_blackstone_stairs", - "blockRuntimeId" : 6033 + "blockRuntimeId" : 4245 }, { "id" : "minecraft:polished_blackstone_brick_stairs", - "blockRuntimeId" : 5830 + "blockRuntimeId" : 4425 }, { "id" : "minecraft:cut_copper_stairs", - "blockRuntimeId" : 3913 + "blockRuntimeId" : 4528 }, { "id" : "minecraft:exposed_cut_copper_stairs", - "blockRuntimeId" : 4756 + "blockRuntimeId" : 4519 }, { "id" : "minecraft:weathered_cut_copper_stairs", - "blockRuntimeId" : 7745 + "blockRuntimeId" : 4253 }, { "id" : "minecraft:oxidized_cut_copper_stairs", - "blockRuntimeId" : 5758 + "blockRuntimeId" : 361 }, { "id" : "minecraft:waxed_cut_copper_stairs", - "blockRuntimeId" : 7689 + "blockRuntimeId" : 403 }, { "id" : "minecraft:waxed_exposed_cut_copper_stairs", - "blockRuntimeId" : 7703 + "blockRuntimeId" : 3891 }, { "id" : "minecraft:waxed_weathered_cut_copper_stairs", - "blockRuntimeId" : 7731 + "blockRuntimeId" : 6091 }, { "id" : "minecraft:waxed_oxidized_cut_copper_stairs", - "blockRuntimeId" : 7717 + "blockRuntimeId" : 5764 }, { "id" : "minecraft:cobbled_deepslate_stairs", - "blockRuntimeId" : 1148 + "blockRuntimeId" : 147 }, { "id" : "minecraft:deepslate_tile_stairs", - "blockRuntimeId" : 4290 + "blockRuntimeId" : 4609 }, { "id" : "minecraft:polished_deepslate_stairs", - "blockRuntimeId" : 6208 + "blockRuntimeId" : 308 }, { "id" : "minecraft:deepslate_brick_stairs", - "blockRuntimeId" : 4107 + "blockRuntimeId" : 7364 }, { "id" : "minecraft:wooden_door" @@ -405,747 +405,755 @@ }, { "id" : "minecraft:trapdoor", - "blockRuntimeId" : 7363 + "blockRuntimeId" : 227 }, { "id" : "minecraft:spruce_trapdoor", - "blockRuntimeId" : 7066 + "blockRuntimeId" : 6443 }, { "id" : "minecraft:birch_trapdoor", - "blockRuntimeId" : 456 + "blockRuntimeId" : 6524 }, { "id" : "minecraft:jungle_trapdoor", - "blockRuntimeId" : 5309 + "blockRuntimeId" : 5331 }, { "id" : "minecraft:acacia_trapdoor", - "blockRuntimeId" : 100 + "blockRuntimeId" : 5539 }, { "id" : "minecraft:dark_oak_trapdoor", - "blockRuntimeId" : 4021 + "blockRuntimeId" : 7444 }, { "id" : "minecraft:iron_trapdoor", - "blockRuntimeId" : 5168 + "blockRuntimeId" : 335 }, { "id" : "minecraft:crimson_trapdoor", - "blockRuntimeId" : 3887 + "blockRuntimeId" : 4281 }, { "id" : "minecraft:warped_trapdoor", - "blockRuntimeId" : 7645 + "blockRuntimeId" : 4689 }, { "id" : "minecraft:iron_bars", - "blockRuntimeId" : 5133 + "blockRuntimeId" : 4757 }, { "id" : "minecraft:glass", - "blockRuntimeId" : 4883 + "blockRuntimeId" : 6088 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7088 + "blockRuntimeId" : 1140 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7096 + "blockRuntimeId" : 1148 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7095 + "blockRuntimeId" : 1147 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7103 + "blockRuntimeId" : 1155 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7100 + "blockRuntimeId" : 1152 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7102 + "blockRuntimeId" : 1154 }, { "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7089 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7092 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7093 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7101 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7097 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7091 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7099 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7098 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7090 - }, - { - "id" : "minecraft:stained_glass", - "blockRuntimeId" : 7094 - }, - { - "id" : "minecraft:tinted_glass", - "blockRuntimeId" : 7352 - }, - { - "id" : "minecraft:glass_pane", - "blockRuntimeId" : 4884 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7104 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7112 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7111 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7119 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7116 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7118 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7105 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7108 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7109 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7117 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7113 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7107 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7115 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7114 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7106 - }, - { - "id" : "minecraft:stained_glass_pane", - "blockRuntimeId" : 7110 - }, - { - "id" : "minecraft:ladder", - "blockRuntimeId" : 5357 - }, - { - "id" : "minecraft:scaffolding", - "blockRuntimeId" : 6730 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7223 - }, - { - "id" : "minecraft:double_stone_slab4", - "blockRuntimeId" : 7273 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7226 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7244 - }, - { - "id" : "minecraft:wooden_slab", - "blockRuntimeId" : 7903 - }, - { - "id" : "minecraft:wooden_slab", - "blockRuntimeId" : 7904 - }, - { - "id" : "minecraft:wooden_slab", - "blockRuntimeId" : 7905 - }, - { - "id" : "minecraft:wooden_slab", - "blockRuntimeId" : 7906 - }, - { - "id" : "minecraft:wooden_slab", - "blockRuntimeId" : 7907 - }, - { - "id" : "minecraft:wooden_slab", - "blockRuntimeId" : 7908 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7228 - }, - { - "id" : "minecraft:double_stone_slab4", - "blockRuntimeId" : 7271 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7224 - }, - { - "id" : "minecraft:double_stone_slab4", - "blockRuntimeId" : 7274 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7245 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7239 - }, - { - "id" : "minecraft:double_stone_slab4", - "blockRuntimeId" : 7275 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7256 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7261 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7262 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7259 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7260 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7258 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7257 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7227 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7230 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7246 - }, - { - "id" : "minecraft:double_stone_slab3", - "blockRuntimeId" : 7255 - }, - { - "id" : "minecraft:double_stone_slab", - "blockRuntimeId" : 7229 - }, - { - "id" : "minecraft:double_stone_slab4", - "blockRuntimeId" : 7272 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7240 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7241 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7242 - }, - { - "id" : "minecraft:double_stone_slab2", - "blockRuntimeId" : 7243 - }, - { - "id" : "minecraft:crimson_slab", - "blockRuntimeId" : 3858 - }, - { - "id" : "minecraft:warped_slab", - "blockRuntimeId" : 7616 - }, - { - "id" : "minecraft:blackstone_slab", - "blockRuntimeId" : 497 - }, - { - "id" : "minecraft:polished_blackstone_slab", - "blockRuntimeId" : 6031 - }, - { - "id" : "minecraft:polished_blackstone_brick_slab", - "blockRuntimeId" : 5828 - }, - { - "id" : "minecraft:cut_copper_slab", - "blockRuntimeId" : 3911 - }, - { - "id" : "minecraft:exposed_cut_copper_slab", - "blockRuntimeId" : 4754 - }, - { - "id" : "minecraft:weathered_cut_copper_slab", - "blockRuntimeId" : 7743 - }, - { - "id" : "minecraft:oxidized_cut_copper_slab", - "blockRuntimeId" : 5756 - }, - { - "id" : "minecraft:waxed_cut_copper_slab", - "blockRuntimeId" : 7687 - }, - { - "id" : "minecraft:waxed_exposed_cut_copper_slab", - "blockRuntimeId" : 7701 - }, - { - "id" : "minecraft:waxed_weathered_cut_copper_slab", - "blockRuntimeId" : 7729 - }, - { - "id" : "minecraft:waxed_oxidized_cut_copper_slab", - "blockRuntimeId" : 7715 - }, - { - "id" : "minecraft:cobbled_deepslate_slab", - "blockRuntimeId" : 1146 - }, - { - "id" : "minecraft:polished_deepslate_slab", - "blockRuntimeId" : 6206 - }, - { - "id" : "minecraft:deepslate_tile_slab", - "blockRuntimeId" : 4288 - }, - { - "id" : "minecraft:deepslate_brick_slab", - "blockRuntimeId" : 4105 - }, - { - "id" : "minecraft:brick_block", - "blockRuntimeId" : 875 - }, - { - "id" : "minecraft:chiseled_nether_bricks", - "blockRuntimeId" : 1130 - }, - { - "id" : "minecraft:cracked_nether_bricks", - "blockRuntimeId" : 3769 - }, - { - "id" : "minecraft:quartz_bricks", - "blockRuntimeId" : 6557 - }, - { - "id" : "minecraft:stonebrick", - "blockRuntimeId" : 7289 - }, - { - "id" : "minecraft:stonebrick", - "blockRuntimeId" : 7290 - }, - { - "id" : "minecraft:stonebrick", - "blockRuntimeId" : 7291 - }, - { - "id" : "minecraft:stonebrick", - "blockRuntimeId" : 7292 - }, - { - "id" : "minecraft:end_bricks", - "blockRuntimeId" : 4728 - }, - { - "id" : "minecraft:prismarine", - "blockRuntimeId" : 6440 - }, - { - "id" : "minecraft:polished_blackstone_bricks", - "blockRuntimeId" : 6000 - }, - { - "id" : "minecraft:cracked_polished_blackstone_bricks", - "blockRuntimeId" : 3770 - }, - { - "id" : "minecraft:gilded_blackstone", - "blockRuntimeId" : 4882 - }, - { - "id" : "minecraft:chiseled_polished_blackstone", - "blockRuntimeId" : 1131 - }, - { - "id" : "minecraft:deepslate_tiles", - "blockRuntimeId" : 4460 - }, - { - "id" : "minecraft:cracked_deepslate_tiles", - "blockRuntimeId" : 3768 - }, - { - "id" : "minecraft:deepslate_bricks", - "blockRuntimeId" : 4277 - }, - { - "id" : "minecraft:cracked_deepslate_bricks", - "blockRuntimeId" : 3767 - }, - { - "id" : "minecraft:chiseled_deepslate", - "blockRuntimeId" : 1129 - }, - { - "id" : "minecraft:cobblestone", - "blockRuntimeId" : 1318 - }, - { - "id" : "minecraft:mossy_cobblestone", - "blockRuntimeId" : 5667 - }, - { - "id" : "minecraft:cobbled_deepslate", - "blockRuntimeId" : 1143 - }, - { - "id" : "minecraft:smooth_stone", - "blockRuntimeId" : 6911 - }, - { - "id" : "minecraft:sandstone", - "blockRuntimeId" : 6706 - }, - { - "id" : "minecraft:sandstone", - "blockRuntimeId" : 6707 - }, - { - "id" : "minecraft:sandstone", - "blockRuntimeId" : 6708 - }, - { - "id" : "minecraft:sandstone", - "blockRuntimeId" : 6709 - }, - { - "id" : "minecraft:red_sandstone", - "blockRuntimeId" : 6633 - }, - { - "id" : "minecraft:red_sandstone", - "blockRuntimeId" : 6634 - }, - { - "id" : "minecraft:red_sandstone", - "blockRuntimeId" : 6635 - }, - { - "id" : "minecraft:red_sandstone", - "blockRuntimeId" : 6636 - }, - { - "id" : "minecraft:coal_block", "blockRuntimeId" : 1141 }, { - "id" : "minecraft:dried_kelp_block", - "blockRuntimeId" : 4584 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1144 }, { - "id" : "minecraft:gold_block", - "blockRuntimeId" : 4975 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1145 }, { - "id" : "minecraft:iron_block", - "blockRuntimeId" : 5134 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1153 }, { - "id" : "minecraft:copper_block", - "blockRuntimeId" : 3677 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1149 }, { - "id" : "minecraft:exposed_copper", - "blockRuntimeId" : 4752 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1143 }, { - "id" : "minecraft:weathered_copper", - "blockRuntimeId" : 7741 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1151 }, { - "id" : "minecraft:oxidized_copper", - "blockRuntimeId" : 5754 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1150 }, { - "id" : "minecraft:waxed_copper", - "blockRuntimeId" : 7685 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1142 }, { - "id" : "minecraft:waxed_exposed_copper", - "blockRuntimeId" : 7699 + "id" : "minecraft:stained_glass", + "blockRuntimeId" : 1146 }, { - "id" : "minecraft:waxed_weathered_copper", - "blockRuntimeId" : 7727 + "id" : "minecraft:tinted_glass", + "blockRuntimeId" : 5899 }, { - "id" : "minecraft:waxed_oxidized_copper", - "blockRuntimeId" : 7713 + "id" : "minecraft:glass_pane", + "blockRuntimeId" : 5189 }, { - "id" : "minecraft:cut_copper", - "blockRuntimeId" : 3910 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4808 }, { - "id" : "minecraft:exposed_cut_copper", - "blockRuntimeId" : 4753 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4816 }, { - "id" : "minecraft:weathered_cut_copper", - "blockRuntimeId" : 7742 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4815 }, { - "id" : "minecraft:oxidized_cut_copper", - "blockRuntimeId" : 5755 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4823 }, { - "id" : "minecraft:waxed_cut_copper", - "blockRuntimeId" : 7686 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4820 }, { - "id" : "minecraft:waxed_exposed_cut_copper", - "blockRuntimeId" : 7700 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4822 }, { - "id" : "minecraft:waxed_weathered_cut_copper", - "blockRuntimeId" : 7728 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4809 }, { - "id" : "minecraft:waxed_oxidized_cut_copper", - "blockRuntimeId" : 7714 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4812 }, { - "id" : "minecraft:emerald_block", - "blockRuntimeId" : 4717 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4813 }, { - "id" : "minecraft:diamond_block", - "blockRuntimeId" : 4474 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4821 }, { - "id" : "minecraft:lapis_block", - "blockRuntimeId" : 5365 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4817 }, { - "id" : "minecraft:raw_iron_block", - "blockRuntimeId" : 6579 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4811 }, { - "id" : "minecraft:raw_copper_block", - "blockRuntimeId" : 6577 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4819 }, { - "id" : "minecraft:raw_gold_block", - "blockRuntimeId" : 6578 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4818 }, { - "id" : "minecraft:quartz_block", - "blockRuntimeId" : 6545 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4810 }, { - "id" : "minecraft:quartz_block", - "blockRuntimeId" : 6547 + "id" : "minecraft:stained_glass_pane", + "blockRuntimeId" : 4814 }, { - "id" : "minecraft:quartz_block", - "blockRuntimeId" : 6546 + "id" : "minecraft:ladder", + "blockRuntimeId" : 8204 }, { - "id" : "minecraft:quartz_block", - "blockRuntimeId" : 6548 + "id" : "minecraft:scaffolding", + "blockRuntimeId" : 3576 }, { - "id" : "minecraft:prismarine", + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 249 + }, + { + "id" : "minecraft:double_stone_slab4", + "blockRuntimeId" : 6632 + }, + { + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 252 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6603 + }, + { + "id" : "minecraft:wooden_slab", + "blockRuntimeId" : 5220 + }, + { + "id" : "minecraft:wooden_slab", + "blockRuntimeId" : 5221 + }, + { + "id" : "minecraft:wooden_slab", + "blockRuntimeId" : 5222 + }, + { + "id" : "minecraft:wooden_slab", + "blockRuntimeId" : 5223 + }, + { + "id" : "minecraft:wooden_slab", + "blockRuntimeId" : 5224 + }, + { + "id" : "minecraft:wooden_slab", + "blockRuntimeId" : 5225 + }, + { + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 254 + }, + { + "id" : "minecraft:double_stone_slab4", + "blockRuntimeId" : 6630 + }, + { + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 250 + }, + { + "id" : "minecraft:double_stone_slab4", + "blockRuntimeId" : 6633 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6604 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6598 + }, + { + "id" : "minecraft:double_stone_slab4", + "blockRuntimeId" : 6634 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6615 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6620 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6621 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6618 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6619 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6617 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6616 + }, + { + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 253 + }, + { + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 256 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6605 + }, + { + "id" : "minecraft:double_stone_slab3", + "blockRuntimeId" : 6614 + }, + { + "id" : "minecraft:double_stone_slab", + "blockRuntimeId" : 255 + }, + { + "id" : "minecraft:double_stone_slab4", + "blockRuntimeId" : 6631 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6599 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6600 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6601 + }, + { + "id" : "minecraft:double_stone_slab2", + "blockRuntimeId" : 6602 + }, + { + "id" : "minecraft:crimson_slab", + "blockRuntimeId" : 5824 + }, + { + "id" : "minecraft:warped_slab", + "blockRuntimeId" : 6375 + }, + { + "id" : "minecraft:blackstone_slab", + "blockRuntimeId" : 918 + }, + { + "id" : "minecraft:polished_blackstone_slab", + "blockRuntimeId" : 5942 + }, + { + "id" : "minecraft:polished_blackstone_brick_slab", + "blockRuntimeId" : 4175 + }, + { + "id" : "minecraft:cut_copper_slab", + "blockRuntimeId" : 5191 + }, + { + "id" : "minecraft:exposed_cut_copper_slab", + "blockRuntimeId" : 6491 + }, + { + "id" : "minecraft:weathered_cut_copper_slab", + "blockRuntimeId" : 5977 + }, + { + "id" : "minecraft:oxidized_cut_copper_slab", + "blockRuntimeId" : 5232 + }, + { + "id" : "minecraft:waxed_cut_copper_slab", + "blockRuntimeId" : 7757 + }, + { + "id" : "minecraft:waxed_exposed_cut_copper_slab", + "blockRuntimeId" : 247 + }, + { + "id" : "minecraft:waxed_weathered_cut_copper_slab", + "blockRuntimeId" : 6436 + }, + { + "id" : "minecraft:waxed_oxidized_cut_copper_slab", + "blockRuntimeId" : 716 + }, + { + "id" : "minecraft:cobbled_deepslate_slab", + "blockRuntimeId" : 7252 + }, + { + "id" : "minecraft:polished_deepslate_slab", + "blockRuntimeId" : 302 + }, + { + "id" : "minecraft:deepslate_tile_slab", + "blockRuntimeId" : 4239 + }, + { + "id" : "minecraft:deepslate_brick_slab", + "blockRuntimeId" : 3721 + }, + { + "id" : "minecraft:brick_block", + "blockRuntimeId" : 4721 + }, + { + "id" : "minecraft:chiseled_nether_bricks", + "blockRuntimeId" : 7191 + }, + { + "id" : "minecraft:cracked_nether_bricks", + "blockRuntimeId" : 4484 + }, + { + "id" : "minecraft:quartz_bricks", + "blockRuntimeId" : 6316 + }, + { + "id" : "minecraft:stonebrick", "blockRuntimeId" : 6438 }, { - "id" : "minecraft:prismarine", + "id" : "minecraft:stonebrick", "blockRuntimeId" : 6439 }, + { + "id" : "minecraft:stonebrick", + "blockRuntimeId" : 6440 + }, + { + "id" : "minecraft:stonebrick", + "blockRuntimeId" : 6441 + }, + { + "id" : "minecraft:end_bricks", + "blockRuntimeId" : 295 + }, + { + "id" : "minecraft:prismarine", + "blockRuntimeId" : 6011 + }, + { + "id" : "minecraft:polished_blackstone_bricks", + "blockRuntimeId" : 4636 + }, + { + "id" : "minecraft:cracked_polished_blackstone_bricks", + "blockRuntimeId" : 7156 + }, + { + "id" : "minecraft:gilded_blackstone", + "blockRuntimeId" : 4518 + }, + { + "id" : "minecraft:chiseled_polished_blackstone", + "blockRuntimeId" : 5018 + }, + { + "id" : "minecraft:deepslate_tiles", + "blockRuntimeId" : 4513 + }, + { + "id" : "minecraft:cracked_deepslate_tiles", + "blockRuntimeId" : 4149 + }, + { + "id" : "minecraft:deepslate_bricks", + "blockRuntimeId" : 5414 + }, + { + "id" : "minecraft:cracked_deepslate_bricks", + "blockRuntimeId" : 5314 + }, + { + "id" : "minecraft:chiseled_deepslate", + "blockRuntimeId" : 5190 + }, + { + "id" : "minecraft:cobblestone", + "blockRuntimeId" : 3620 + }, + { + "id" : "minecraft:mossy_cobblestone", + "blockRuntimeId" : 266 + }, + { + "id" : "minecraft:cobbled_deepslate", + "blockRuntimeId" : 6544 + }, + { + "id" : "minecraft:smooth_stone", + "blockRuntimeId" : 4514 + }, + { + "id" : "minecraft:sandstone", + "blockRuntimeId" : 3658 + }, + { + "id" : "minecraft:sandstone", + "blockRuntimeId" : 3659 + }, + { + "id" : "minecraft:sandstone", + "blockRuntimeId" : 3660 + }, + { + "id" : "minecraft:sandstone", + "blockRuntimeId" : 3661 + }, + { + "id" : "minecraft:red_sandstone", + "blockRuntimeId" : 6471 + }, + { + "id" : "minecraft:red_sandstone", + "blockRuntimeId" : 6472 + }, + { + "id" : "minecraft:red_sandstone", + "blockRuntimeId" : 6473 + }, + { + "id" : "minecraft:red_sandstone", + "blockRuntimeId" : 6474 + }, + { + "id" : "minecraft:coal_block", + "blockRuntimeId" : 5348 + }, + { + "id" : "minecraft:dried_kelp_block", + "blockRuntimeId" : 7921 + }, + { + "id" : "minecraft:gold_block", + "blockRuntimeId" : 305 + }, + { + "id" : "minecraft:iron_block", + "blockRuntimeId" : 8203 + }, + { + "id" : "minecraft:copper_block", + "blockRuntimeId" : 4607 + }, + { + "id" : "minecraft:exposed_copper", + "blockRuntimeId" : 601 + }, + { + "id" : "minecraft:weathered_copper", + "blockRuntimeId" : 8188 + }, + { + "id" : "minecraft:oxidized_copper", + "blockRuntimeId" : 3558 + }, + { + "id" : "minecraft:waxed_copper", + "blockRuntimeId" : 7676 + }, + { + "id" : "minecraft:waxed_exposed_copper", + "blockRuntimeId" : 702 + }, + { + "id" : "minecraft:waxed_weathered_copper", + "blockRuntimeId" : 715 + }, + { + "id" : "minecraft:waxed_oxidized_copper", + "blockRuntimeId" : 7484 + }, + { + "id" : "minecraft:cut_copper", + "blockRuntimeId" : 4645 + }, + { + "id" : "minecraft:exposed_cut_copper", + "blockRuntimeId" : 6090 + }, + { + "id" : "minecraft:weathered_cut_copper", + "blockRuntimeId" : 7139 + }, + { + "id" : "minecraft:oxidized_cut_copper", + "blockRuntimeId" : 5428 + }, + { + "id" : "minecraft:waxed_cut_copper", + "blockRuntimeId" : 7235 + }, + { + "id" : "minecraft:waxed_exposed_cut_copper", + "blockRuntimeId" : 3814 + }, + { + "id" : "minecraft:waxed_weathered_cut_copper", + "blockRuntimeId" : 4807 + }, + { + "id" : "minecraft:waxed_oxidized_cut_copper", + "blockRuntimeId" : 214 + }, + { + "id" : "minecraft:emerald_block", + "blockRuntimeId" : 1164 + }, + { + "id" : "minecraft:diamond_block", + "blockRuntimeId" : 286 + }, + { + "id" : "minecraft:lapis_block", + "blockRuntimeId" : 4234 + }, + { + "id" : "minecraft:raw_iron_block", + "blockRuntimeId" : 8202 + }, + { + "id" : "minecraft:raw_copper_block", + "blockRuntimeId" : 5219 + }, + { + "id" : "minecraft:raw_gold_block", + "blockRuntimeId" : 371 + }, + { + "id" : "minecraft:quartz_block", + "blockRuntimeId" : 3701 + }, + { + "id" : "minecraft:quartz_block", + "blockRuntimeId" : 3703 + }, + { + "id" : "minecraft:quartz_block", + "blockRuntimeId" : 3702 + }, + { + "id" : "minecraft:quartz_block", + "blockRuntimeId" : 3704 + }, + { + "id" : "minecraft:prismarine", + "blockRuntimeId" : 6009 + }, + { + "id" : "minecraft:prismarine", + "blockRuntimeId" : 6010 + }, { "id" : "minecraft:slime", - "blockRuntimeId" : 6864 + "blockRuntimeId" : 4197 }, { "id" : "minecraft:honey_block", - "blockRuntimeId" : 5112 + "blockRuntimeId" : 900 }, { "id" : "minecraft:honeycomb_block", - "blockRuntimeId" : 5113 + "blockRuntimeId" : 4424 }, { "id" : "minecraft:hay_block", - "blockRuntimeId" : 5084 + "blockRuntimeId" : 703 }, { "id" : "minecraft:bone_block", - "blockRuntimeId" : 692 + "blockRuntimeId" : 4198 }, { "id" : "minecraft:nether_brick", - "blockRuntimeId" : 5688 + "blockRuntimeId" : 7214 }, { "id" : "minecraft:red_nether_brick", - "blockRuntimeId" : 6624 + "blockRuntimeId" : 146 }, { "id" : "minecraft:netherite_block", - "blockRuntimeId" : 5705 + "blockRuntimeId" : 3780 }, { "id" : "minecraft:lodestone", - "blockRuntimeId" : 5563 + "blockRuntimeId" : 8201 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7915 + "blockRuntimeId" : 3463 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7923 + "blockRuntimeId" : 3471 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7922 + "blockRuntimeId" : 3470 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7930 + "blockRuntimeId" : 3478 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7927 + "blockRuntimeId" : 3475 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7929 + "blockRuntimeId" : 3477 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7916 + "blockRuntimeId" : 3464 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7919 + "blockRuntimeId" : 3467 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7920 + "blockRuntimeId" : 3468 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7928 + "blockRuntimeId" : 3476 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7924 + "blockRuntimeId" : 3472 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7918 + "blockRuntimeId" : 3466 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7926 + "blockRuntimeId" : 3474 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7925 + "blockRuntimeId" : 3473 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7917 + "blockRuntimeId" : 3465 }, { "id" : "minecraft:wool", - "blockRuntimeId" : 7921 + "blockRuntimeId" : 3469 + }, + { + "id" : "minecraft:carpet", + "blockRuntimeId" : 956 + }, + { + "id" : "minecraft:carpet", + "blockRuntimeId" : 964 }, { "id" : "minecraft:carpet", @@ -1155,53 +1163,29 @@ "id" : "minecraft:carpet", "blockRuntimeId" : 971 }, - { - "id" : "minecraft:carpet", - "blockRuntimeId" : 970 - }, - { - "id" : "minecraft:carpet", - "blockRuntimeId" : 978 - }, - { - "id" : "minecraft:carpet", - "blockRuntimeId" : 975 - }, - { - "id" : "minecraft:carpet", - "blockRuntimeId" : 977 - }, - { - "id" : "minecraft:carpet", - "blockRuntimeId" : 964 - }, - { - "id" : "minecraft:carpet", - "blockRuntimeId" : 967 - }, { "id" : "minecraft:carpet", "blockRuntimeId" : 968 }, { "id" : "minecraft:carpet", - "blockRuntimeId" : 976 + "blockRuntimeId" : 970 }, { "id" : "minecraft:carpet", - "blockRuntimeId" : 972 + "blockRuntimeId" : 957 }, { "id" : "minecraft:carpet", - "blockRuntimeId" : 966 + "blockRuntimeId" : 960 }, { "id" : "minecraft:carpet", - "blockRuntimeId" : 974 + "blockRuntimeId" : 961 }, { "id" : "minecraft:carpet", - "blockRuntimeId" : 973 + "blockRuntimeId" : 969 }, { "id" : "minecraft:carpet", @@ -1209,667 +1193,683 @@ }, { "id" : "minecraft:carpet", - "blockRuntimeId" : 969 + "blockRuntimeId" : 959 + }, + { + "id" : "minecraft:carpet", + "blockRuntimeId" : 967 + }, + { + "id" : "minecraft:carpet", + "blockRuntimeId" : 966 + }, + { + "id" : "minecraft:carpet", + "blockRuntimeId" : 958 + }, + { + "id" : "minecraft:carpet", + "blockRuntimeId" : 962 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3660 + "blockRuntimeId" : 6229 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3668 + "blockRuntimeId" : 6237 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3667 + "blockRuntimeId" : 6236 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3675 + "blockRuntimeId" : 6244 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3672 + "blockRuntimeId" : 6241 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3674 + "blockRuntimeId" : 6243 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3661 + "blockRuntimeId" : 6230 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3664 + "blockRuntimeId" : 6233 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3665 + "blockRuntimeId" : 6234 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3673 + "blockRuntimeId" : 6242 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3669 + "blockRuntimeId" : 6238 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3663 + "blockRuntimeId" : 6232 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3671 + "blockRuntimeId" : 6240 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3670 + "blockRuntimeId" : 6239 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3662 + "blockRuntimeId" : 6231 }, { "id" : "minecraft:concrete_powder", - "blockRuntimeId" : 3666 + "blockRuntimeId" : 6235 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3644 + "blockRuntimeId" : 668 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3652 + "blockRuntimeId" : 676 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3651 + "blockRuntimeId" : 675 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3659 + "blockRuntimeId" : 683 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3656 + "blockRuntimeId" : 680 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3658 + "blockRuntimeId" : 682 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3645 + "blockRuntimeId" : 669 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3648 + "blockRuntimeId" : 672 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3649 + "blockRuntimeId" : 673 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3657 + "blockRuntimeId" : 681 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3653 + "blockRuntimeId" : 677 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3647 + "blockRuntimeId" : 671 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3655 + "blockRuntimeId" : 679 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3654 + "blockRuntimeId" : 678 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3646 + "blockRuntimeId" : 670 }, { "id" : "minecraft:concrete", - "blockRuntimeId" : 3650 + "blockRuntimeId" : 674 }, { "id" : "minecraft:clay", - "blockRuntimeId" : 1139 + "blockRuntimeId" : 7066 }, { "id" : "minecraft:hardened_clay", - "blockRuntimeId" : 5083 + "blockRuntimeId" : 649 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7120 + "blockRuntimeId" : 6099 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7128 + "blockRuntimeId" : 6107 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7127 + "blockRuntimeId" : 6106 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7135 + "blockRuntimeId" : 6114 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7132 + "blockRuntimeId" : 6111 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7134 + "blockRuntimeId" : 6113 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7121 + "blockRuntimeId" : 6100 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7124 + "blockRuntimeId" : 6103 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7125 + "blockRuntimeId" : 6104 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7133 + "blockRuntimeId" : 6112 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7129 + "blockRuntimeId" : 6108 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7123 + "blockRuntimeId" : 6102 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7131 + "blockRuntimeId" : 6110 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7130 + "blockRuntimeId" : 6109 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7122 + "blockRuntimeId" : 6101 }, { "id" : "minecraft:stained_hardened_clay", - "blockRuntimeId" : 7126 + "blockRuntimeId" : 6105 }, { "id" : "minecraft:white_glazed_terracotta", - "blockRuntimeId" : 7800 + "blockRuntimeId" : 5523 }, { "id" : "minecraft:silver_glazed_terracotta", - "blockRuntimeId" : 6846 + "blockRuntimeId" : 3536 }, { "id" : "minecraft:gray_glazed_terracotta", - "blockRuntimeId" : 5010 + "blockRuntimeId" : 8195 }, { "id" : "minecraft:black_glazed_terracotta", - "blockRuntimeId" : 488 + "blockRuntimeId" : 5758 }, { "id" : "minecraft:brown_glazed_terracotta", - "blockRuntimeId" : 894 + "blockRuntimeId" : 3552 }, { "id" : "minecraft:red_glazed_terracotta", - "blockRuntimeId" : 6601 + "blockRuntimeId" : 4150 }, { "id" : "minecraft:orange_glazed_terracotta", - "blockRuntimeId" : 5748 + "blockRuntimeId" : 1156 }, { "id" : "minecraft:yellow_glazed_terracotta", - "blockRuntimeId" : 7942 + "blockRuntimeId" : 921 }, { "id" : "minecraft:lime_glazed_terracotta", - "blockRuntimeId" : 5532 + "blockRuntimeId" : 221 }, { "id" : "minecraft:green_glazed_terracotta", - "blockRuntimeId" : 5026 + "blockRuntimeId" : 6501 }, { "id" : "minecraft:cyan_glazed_terracotta", - "blockRuntimeId" : 3931 + "blockRuntimeId" : 5308 }, { "id" : "minecraft:light_blue_glazed_terracotta", - "blockRuntimeId" : 5484 + "blockRuntimeId" : 5421 }, { "id" : "minecraft:blue_glazed_terracotta", - "blockRuntimeId" : 685 + "blockRuntimeId" : 5415 }, { "id" : "minecraft:purple_glazed_terracotta", - "blockRuntimeId" : 6519 + "blockRuntimeId" : 6965 }, { "id" : "minecraft:magenta_glazed_terracotta", - "blockRuntimeId" : 5596 + "blockRuntimeId" : 972 }, { "id" : "minecraft:pink_glazed_terracotta", - "blockRuntimeId" : 5779 + "blockRuntimeId" : 6430 }, { "id" : "minecraft:purpur_block", - "blockRuntimeId" : 6525 + "blockRuntimeId" : 7656 }, { "id" : "minecraft:purpur_block", - "blockRuntimeId" : 6527 + "blockRuntimeId" : 7658 }, { "id" : "minecraft:nether_wart_block", - "blockRuntimeId" : 5704 + "blockRuntimeId" : 4241 }, { "id" : "minecraft:warped_wart_block", - "blockRuntimeId" : 7667 + "blockRuntimeId" : 5829 }, { "id" : "minecraft:shroomlight", - "blockRuntimeId" : 6829 + "blockRuntimeId" : 5017 }, { "id" : "minecraft:crimson_nylium", - "blockRuntimeId" : 3839 + "blockRuntimeId" : 4172 }, { "id" : "minecraft:warped_nylium", - "blockRuntimeId" : 7597 + "blockRuntimeId" : 6314 }, { "id" : "minecraft:basalt", - "blockRuntimeId" : 214 + "blockRuntimeId" : 4297 }, { "id" : "minecraft:polished_basalt", - "blockRuntimeId" : 5822 + "blockRuntimeId" : 24 }, { "id" : "minecraft:smooth_basalt", - "blockRuntimeId" : 6886 + "blockRuntimeId" : 1162 }, { "id" : "minecraft:soul_soil", - "blockRuntimeId" : 6956 + "blockRuntimeId" : 5738 }, { "id" : "minecraft:dirt", - "blockRuntimeId" : 4484 + "blockRuntimeId" : 5701 }, { "id" : "minecraft:dirt", - "blockRuntimeId" : 4485 + "blockRuntimeId" : 5702 }, { "id" : "minecraft:farmland", - "blockRuntimeId" : 4766 + "blockRuntimeId" : 3901 }, { "id" : "minecraft:grass", - "blockRuntimeId" : 4997 + "blockRuntimeId" : 6891 }, { "id" : "minecraft:grass_path", - "blockRuntimeId" : 4998 + "blockRuntimeId" : 8023 }, { "id" : "minecraft:podzol", - "blockRuntimeId" : 5803 + "blockRuntimeId" : 4606 }, { "id" : "minecraft:mycelium", - "blockRuntimeId" : 5685 + "blockRuntimeId" : 3688 }, { "id" : "minecraft:stone", - "blockRuntimeId" : 7180 + "blockRuntimeId" : 661 }, { "id" : "minecraft:iron_ore", - "blockRuntimeId" : 5167 + "blockRuntimeId" : 4646 }, { "id" : "minecraft:gold_ore", - "blockRuntimeId" : 4976 - }, - { - "id" : "minecraft:diamond_ore", - "blockRuntimeId" : 4475 - }, - { - "id" : "minecraft:lapis_ore", - "blockRuntimeId" : 5366 - }, - { - "id" : "minecraft:redstone_ore", - "blockRuntimeId" : 6647 - }, - { - "id" : "minecraft:coal_ore", - "blockRuntimeId" : 1142 - }, - { - "id" : "minecraft:copper_ore", - "blockRuntimeId" : 3678 - }, - { - "id" : "minecraft:emerald_ore", - "blockRuntimeId" : 4718 - }, - { - "id" : "minecraft:quartz_ore", - "blockRuntimeId" : 6558 - }, - { - "id" : "minecraft:nether_gold_ore", - "blockRuntimeId" : 5698 - }, - { - "id" : "minecraft:ancient_debris", - "blockRuntimeId" : 143 - }, - { - "id" : "minecraft:deepslate_iron_ore", - "blockRuntimeId" : 4283 - }, - { - "id" : "minecraft:deepslate_gold_ore", - "blockRuntimeId" : 4282 - }, - { - "id" : "minecraft:deepslate_diamond_ore", - "blockRuntimeId" : 4280 - }, - { - "id" : "minecraft:deepslate_lapis_ore", - "blockRuntimeId" : 4284 - }, - { - "id" : "minecraft:deepslate_redstone_ore", - "blockRuntimeId" : 4285 - }, - { - "id" : "minecraft:deepslate_emerald_ore", - "blockRuntimeId" : 4281 - }, - { - "id" : "minecraft:deepslate_coal_ore", - "blockRuntimeId" : 4278 - }, - { - "id" : "minecraft:deepslate_copper_ore", - "blockRuntimeId" : 4279 - }, - { - "id" : "minecraft:gravel", - "blockRuntimeId" : 4999 - }, - { - "id" : "minecraft:stone", - "blockRuntimeId" : 7181 - }, - { - "id" : "minecraft:stone", - "blockRuntimeId" : 7183 - }, - { - "id" : "minecraft:stone", - "blockRuntimeId" : 7185 - }, - { - "id" : "minecraft:blackstone", - "blockRuntimeId" : 494 - }, - { - "id" : "minecraft:deepslate", - "blockRuntimeId" : 4100 - }, - { - "id" : "minecraft:stone", - "blockRuntimeId" : 7182 - }, - { - "id" : "minecraft:stone", - "blockRuntimeId" : 7184 - }, - { - "id" : "minecraft:stone", - "blockRuntimeId" : 7186 - }, - { - "id" : "minecraft:polished_blackstone", - "blockRuntimeId" : 5825 - }, - { - "id" : "minecraft:polished_deepslate", - "blockRuntimeId" : 6203 - }, - { - "id" : "minecraft:sand", - "blockRuntimeId" : 6704 - }, - { - "id" : "minecraft:sand", - "blockRuntimeId" : 6705 - }, - { - "id" : "minecraft:cactus", "blockRuntimeId" : 920 }, + { + "id" : "minecraft:diamond_ore", + "blockRuntimeId" : 4309 + }, + { + "id" : "minecraft:lapis_ore", + "blockRuntimeId" : 7641 + }, + { + "id" : "minecraft:redstone_ore", + "blockRuntimeId" : 4237 + }, + { + "id" : "minecraft:coal_ore", + "blockRuntimeId" : 4235 + }, + { + "id" : "minecraft:copper_ore", + "blockRuntimeId" : 3559 + }, + { + "id" : "minecraft:emerald_ore", + "blockRuntimeId" : 7289 + }, + { + "id" : "minecraft:quartz_ore", + "blockRuntimeId" : 4433 + }, + { + "id" : "minecraft:nether_gold_ore", + "blockRuntimeId" : 27 + }, + { + "id" : "minecraft:ancient_debris", + "blockRuntimeId" : 6031 + }, + { + "id" : "minecraft:deepslate_iron_ore", + "blockRuntimeId" : 7215 + }, + { + "id" : "minecraft:deepslate_gold_ore", + "blockRuntimeId" : 6030 + }, + { + "id" : "minecraft:deepslate_diamond_ore", + "blockRuntimeId" : 7980 + }, + { + "id" : "minecraft:deepslate_lapis_ore", + "blockRuntimeId" : 7204 + }, + { + "id" : "minecraft:deepslate_redstone_ore", + "blockRuntimeId" : 6507 + }, + { + "id" : "minecraft:deepslate_emerald_ore", + "blockRuntimeId" : 6315 + }, + { + "id" : "minecraft:deepslate_coal_ore", + "blockRuntimeId" : 7138 + }, + { + "id" : "minecraft:deepslate_copper_ore", + "blockRuntimeId" : 105 + }, + { + "id" : "minecraft:gravel", + "blockRuntimeId" : 8226 + }, + { + "id" : "minecraft:stone", + "blockRuntimeId" : 662 + }, + { + "id" : "minecraft:stone", + "blockRuntimeId" : 664 + }, + { + "id" : "minecraft:stone", + "blockRuntimeId" : 666 + }, + { + "id" : "minecraft:blackstone", + "blockRuntimeId" : 7527 + }, + { + "id" : "minecraft:deepslate", + "blockRuntimeId" : 267 + }, + { + "id" : "minecraft:stone", + "blockRuntimeId" : 663 + }, + { + "id" : "minecraft:stone", + "blockRuntimeId" : 665 + }, + { + "id" : "minecraft:stone", + "blockRuntimeId" : 667 + }, + { + "id" : "minecraft:polished_blackstone", + "blockRuntimeId" : 3687 + }, + { + "id" : "minecraft:polished_deepslate", + "blockRuntimeId" : 7696 + }, + { + "id" : "minecraft:sand", + "blockRuntimeId" : 4178 + }, + { + "id" : "minecraft:sand", + "blockRuntimeId" : 4179 + }, + { + "id" : "minecraft:cactus", + "blockRuntimeId" : 6940 + }, { "id" : "minecraft:log", - "blockRuntimeId" : 5564 + "blockRuntimeId" : 6546 }, { "id" : "minecraft:stripped_oak_log", - "blockRuntimeId" : 7319 + "blockRuntimeId" : 7485 }, { "id" : "minecraft:log", - "blockRuntimeId" : 5565 + "blockRuntimeId" : 6547 }, { "id" : "minecraft:stripped_spruce_log", - "blockRuntimeId" : 7322 + "blockRuntimeId" : 6253 }, { "id" : "minecraft:log", - "blockRuntimeId" : 5566 + "blockRuntimeId" : 6548 }, { "id" : "minecraft:stripped_birch_log", - "blockRuntimeId" : 7304 + "blockRuntimeId" : 5896 }, { "id" : "minecraft:log", - "blockRuntimeId" : 5567 + "blockRuntimeId" : 6549 }, { "id" : "minecraft:stripped_jungle_log", - "blockRuntimeId" : 7316 + "blockRuntimeId" : 650 }, { "id" : "minecraft:log2", - "blockRuntimeId" : 5576 + "blockRuntimeId" : 3835 }, { "id" : "minecraft:stripped_acacia_log", - "blockRuntimeId" : 7301 + "blockRuntimeId" : 5772 }, { "id" : "minecraft:log2", - "blockRuntimeId" : 5577 - }, - { - "id" : "minecraft:stripped_dark_oak_log", - "blockRuntimeId" : 7313 - }, - { - "id" : "minecraft:crimson_stem", - "blockRuntimeId" : 3884 - }, - { - "id" : "minecraft:stripped_crimson_stem", - "blockRuntimeId" : 7310 - }, - { - "id" : "minecraft:warped_stem", - "blockRuntimeId" : 7642 - }, - { - "id" : "minecraft:stripped_warped_stem", - "blockRuntimeId" : 7328 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7807 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7813 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7808 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7814 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7809 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7815 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7810 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7816 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7811 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7817 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7812 - }, - { - "id" : "minecraft:wood", - "blockRuntimeId" : 7818 - }, - { - "id" : "minecraft:crimson_hyphae", "blockRuntimeId" : 3836 }, + { + "id" : "minecraft:stripped_dark_oak_log", + "blockRuntimeId" : 216 + }, + { + "id" : "minecraft:crimson_stem", + "blockRuntimeId" : 5821 + }, + { + "id" : "minecraft:stripped_crimson_stem", + "blockRuntimeId" : 6864 + }, + { + "id" : "minecraft:warped_stem", + "blockRuntimeId" : 6377 + }, + { + "id" : "minecraft:stripped_warped_stem", + "blockRuntimeId" : 7342 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3479 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3485 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3480 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3486 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3481 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3487 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3482 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3488 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3483 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3489 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3484 + }, + { + "id" : "minecraft:wood", + "blockRuntimeId" : 3490 + }, + { + "id" : "minecraft:crimson_hyphae", + "blockRuntimeId" : 4242 + }, { "id" : "minecraft:stripped_crimson_hyphae", - "blockRuntimeId" : 7307 + "blockRuntimeId" : 6390 }, { "id" : "minecraft:warped_hyphae", - "blockRuntimeId" : 7594 + "blockRuntimeId" : 5826 }, { "id" : "minecraft:stripped_warped_hyphae", - "blockRuntimeId" : 7325 + "blockRuntimeId" : 5529 }, { "id" : "minecraft:leaves", - "blockRuntimeId" : 5410 + "blockRuntimeId" : 6014 }, { "id" : "minecraft:leaves", - "blockRuntimeId" : 5411 + "blockRuntimeId" : 6015 }, { "id" : "minecraft:leaves", - "blockRuntimeId" : 5412 + "blockRuntimeId" : 6016 }, { "id" : "minecraft:leaves", - "blockRuntimeId" : 5413 + "blockRuntimeId" : 6017 }, { "id" : "minecraft:leaves2", - "blockRuntimeId" : 5426 + "blockRuntimeId" : 4301 }, { "id" : "minecraft:leaves2", - "blockRuntimeId" : 5427 + "blockRuntimeId" : 4302 }, { "id" : "minecraft:azalea_leaves", - "blockRuntimeId" : 169 + "blockRuntimeId" : 7652 }, { "id" : "minecraft:azalea_leaves_flowered", - "blockRuntimeId" : 173 + "blockRuntimeId" : 6304 }, { "id" : "minecraft:sapling", - "blockRuntimeId" : 6718 + "blockRuntimeId" : 720 }, { "id" : "minecraft:sapling", - "blockRuntimeId" : 6719 + "blockRuntimeId" : 721 }, { "id" : "minecraft:sapling", - "blockRuntimeId" : 6720 + "blockRuntimeId" : 722 }, { "id" : "minecraft:sapling", - "blockRuntimeId" : 6721 + "blockRuntimeId" : 723 }, { "id" : "minecraft:sapling", - "blockRuntimeId" : 6722 + "blockRuntimeId" : 724 }, { "id" : "minecraft:sapling", - "blockRuntimeId" : 6723 + "blockRuntimeId" : 725 }, { "id" : "minecraft:bee_nest", - "blockRuntimeId" : 236 + "blockRuntimeId" : 5704 }, { "id" : "minecraft:wheat_seeds" @@ -1912,7 +1912,7 @@ }, { "id" : "minecraft:melon_block", - "blockRuntimeId" : 5609 + "blockRuntimeId" : 402 }, { "id" : "minecraft:melon_slice" @@ -1928,200 +1928,200 @@ }, { "id" : "minecraft:pumpkin", - "blockRuntimeId" : 6457 + "blockRuntimeId" : 4509 }, { "id" : "minecraft:carved_pumpkin", - "blockRuntimeId" : 988 + "blockRuntimeId" : 7320 }, { "id" : "minecraft:lit_pumpkin", - "blockRuntimeId" : 5551 + "blockRuntimeId" : 6559 }, { "id" : "minecraft:honeycomb" }, { "id" : "minecraft:tallgrass", - "blockRuntimeId" : 7349 + "blockRuntimeId" : 937 }, { "id" : "minecraft:double_plant", - "blockRuntimeId" : 4504 + "blockRuntimeId" : 5405 }, { "id" : "minecraft:tallgrass", - "blockRuntimeId" : 7348 + "blockRuntimeId" : 936 }, { "id" : "minecraft:double_plant", - "blockRuntimeId" : 4503 + "blockRuntimeId" : 5404 }, { "id" : "minecraft:nether_sprouts" }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3682 + "blockRuntimeId" : 6383 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3680 + "blockRuntimeId" : 6381 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3681 + "blockRuntimeId" : 6382 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3679 + "blockRuntimeId" : 6380 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3683 + "blockRuntimeId" : 6384 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3687 + "blockRuntimeId" : 6388 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3685 + "blockRuntimeId" : 6386 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3686 + "blockRuntimeId" : 6387 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3684 + "blockRuntimeId" : 6385 }, { "id" : "minecraft:coral", - "blockRuntimeId" : 3688 + "blockRuntimeId" : 6389 }, { "id" : "minecraft:coral_fan", - "blockRuntimeId" : 3702 + "blockRuntimeId" : 4540 }, { "id" : "minecraft:coral_fan", - "blockRuntimeId" : 3700 + "blockRuntimeId" : 4538 }, { "id" : "minecraft:coral_fan", - "blockRuntimeId" : 3701 + "blockRuntimeId" : 4539 }, { "id" : "minecraft:coral_fan", - "blockRuntimeId" : 3699 + "blockRuntimeId" : 4537 }, { "id" : "minecraft:coral_fan", - "blockRuntimeId" : 3703 + "blockRuntimeId" : 4541 }, { "id" : "minecraft:coral_fan_dead", - "blockRuntimeId" : 3712 + "blockRuntimeId" : 69 }, { "id" : "minecraft:coral_fan_dead", - "blockRuntimeId" : 3710 + "blockRuntimeId" : 67 }, { "id" : "minecraft:coral_fan_dead", - "blockRuntimeId" : 3711 + "blockRuntimeId" : 68 }, { "id" : "minecraft:coral_fan_dead", - "blockRuntimeId" : 3709 + "blockRuntimeId" : 66 }, { "id" : "minecraft:coral_fan_dead", - "blockRuntimeId" : 3713 + "blockRuntimeId" : 70 }, { "id" : "minecraft:kelp" }, { "id" : "minecraft:seagrass", - "blockRuntimeId" : 6825 + "blockRuntimeId" : 244 }, { "id" : "minecraft:crimson_roots", - "blockRuntimeId" : 3857 + "blockRuntimeId" : 7515 }, { "id" : "minecraft:warped_roots", - "blockRuntimeId" : 7615 + "blockRuntimeId" : 4310 }, { "id" : "minecraft:yellow_flower", - "blockRuntimeId" : 7941 + "blockRuntimeId" : 316 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6590 + "blockRuntimeId" : 3621 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6591 + "blockRuntimeId" : 3622 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6592 + "blockRuntimeId" : 3623 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6593 + "blockRuntimeId" : 3624 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6594 + "blockRuntimeId" : 3625 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6595 + "blockRuntimeId" : 3626 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6596 + "blockRuntimeId" : 3627 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6597 + "blockRuntimeId" : 3628 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6598 + "blockRuntimeId" : 3629 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6599 + "blockRuntimeId" : 3630 }, { "id" : "minecraft:red_flower", - "blockRuntimeId" : 6600 + "blockRuntimeId" : 3631 }, { "id" : "minecraft:double_plant", - "blockRuntimeId" : 4501 + "blockRuntimeId" : 5402 }, { "id" : "minecraft:double_plant", - "blockRuntimeId" : 4502 + "blockRuntimeId" : 5403 }, { "id" : "minecraft:double_plant", - "blockRuntimeId" : 4505 + "blockRuntimeId" : 5406 }, { "id" : "minecraft:double_plant", - "blockRuntimeId" : 4506 + "blockRuntimeId" : 5407 }, { "id" : "minecraft:wither_rose", - "blockRuntimeId" : 7806 + "blockRuntimeId" : 6089 }, { "id" : "minecraft:white_dye" @@ -2188,127 +2188,127 @@ }, { "id" : "minecraft:vine", - "blockRuntimeId" : 7502 + "blockRuntimeId" : 902 }, { "id" : "minecraft:weeping_vines", - "blockRuntimeId" : 7756 + "blockRuntimeId" : 5429 }, { "id" : "minecraft:twisting_vines", - "blockRuntimeId" : 7430 + "blockRuntimeId" : 5641 }, { "id" : "minecraft:waterlily", - "blockRuntimeId" : 7684 + "blockRuntimeId" : 1163 }, { "id" : "minecraft:deadbush", - "blockRuntimeId" : 4099 + "blockRuntimeId" : 4633 }, { "id" : "minecraft:bamboo", - "blockRuntimeId" : 177 + "blockRuntimeId" : 3689 }, { "id" : "minecraft:snow", - "blockRuntimeId" : 6912 + "blockRuntimeId" : 4177 }, { "id" : "minecraft:ice", - "blockRuntimeId" : 5126 + "blockRuntimeId" : 6563 }, { "id" : "minecraft:packed_ice", - "blockRuntimeId" : 5768 + "blockRuntimeId" : 296 }, { "id" : "minecraft:blue_ice", - "blockRuntimeId" : 691 + "blockRuntimeId" : 6981 }, { "id" : "minecraft:snow_layer", - "blockRuntimeId" : 6913 + "blockRuntimeId" : 155 }, { "id" : "minecraft:pointed_dripstone", - "blockRuntimeId" : 5809 + "blockRuntimeId" : 7358 }, { "id" : "minecraft:dripstone_block", - "blockRuntimeId" : 4585 + "blockRuntimeId" : 901 }, { "id" : "minecraft:moss_carpet", - "blockRuntimeId" : 5666 + "blockRuntimeId" : 300 }, { "id" : "minecraft:moss_block", - "blockRuntimeId" : 5665 + "blockRuntimeId" : 6429 }, { "id" : "minecraft:dirt_with_roots", - "blockRuntimeId" : 4486 + "blockRuntimeId" : 5347 }, { "id" : "minecraft:hanging_roots", - "blockRuntimeId" : 5048 + "blockRuntimeId" : 205 }, { "id" : "minecraft:big_dripleaf", - "blockRuntimeId" : 328 + "blockRuntimeId" : 5904 }, { "id" : "minecraft:small_dripleaf_block", - "blockRuntimeId" : 6878 + "blockRuntimeId" : 4268 }, { "id" : "minecraft:spore_blossom", - "blockRuntimeId" : 6965 + "blockRuntimeId" : 7254 }, { "id" : "minecraft:azalea", - "blockRuntimeId" : 168 + "blockRuntimeId" : 6804 }, { "id" : "minecraft:flowering_azalea", - "blockRuntimeId" : 4815 + "blockRuntimeId" : 5427 }, { "id" : "minecraft:glow_lichen", - "blockRuntimeId" : 4972 + "blockRuntimeId" : 5634 }, { "id" : "minecraft:amethyst_block", - "blockRuntimeId" : 136 + "blockRuntimeId" : 304 }, { "id" : "minecraft:budding_amethyst", - "blockRuntimeId" : 919 + "blockRuntimeId" : 6956 }, { "id" : "minecraft:amethyst_cluster", - "blockRuntimeId" : 137 + "blockRuntimeId" : 7752 }, { "id" : "minecraft:large_amethyst_bud", - "blockRuntimeId" : 5367 + "blockRuntimeId" : 4684 }, { "id" : "minecraft:medium_amethyst_bud", - "blockRuntimeId" : 5603 + "blockRuntimeId" : 4324 }, { "id" : "minecraft:small_amethyst_bud", - "blockRuntimeId" : 6865 + "blockRuntimeId" : 318 }, { "id" : "minecraft:tuff", - "blockRuntimeId" : 7417 + "blockRuntimeId" : 360 }, { "id" : "minecraft:calcite", - "blockRuntimeId" : 943 + "blockRuntimeId" : 215 }, { "id" : "minecraft:chicken" @@ -2339,35 +2339,35 @@ }, { "id" : "minecraft:brown_mushroom", - "blockRuntimeId" : 900 + "blockRuntimeId" : 3551 }, { "id" : "minecraft:red_mushroom", - "blockRuntimeId" : 6607 + "blockRuntimeId" : 4517 }, { "id" : "minecraft:crimson_fungus", - "blockRuntimeId" : 3835 + "blockRuntimeId" : 7695 }, { "id" : "minecraft:warped_fungus", - "blockRuntimeId" : 7593 + "blockRuntimeId" : 301 }, { "id" : "minecraft:brown_mushroom_block", - "blockRuntimeId" : 915 + "blockRuntimeId" : 7304 }, { "id" : "minecraft:red_mushroom_block", - "blockRuntimeId" : 6622 + "blockRuntimeId" : 3616 }, { "id" : "minecraft:brown_mushroom_block", - "blockRuntimeId" : 916 + "blockRuntimeId" : 7305 }, { "id" : "minecraft:brown_mushroom_block", - "blockRuntimeId" : 901 + "blockRuntimeId" : 7290 }, { "id" : "minecraft:egg" @@ -2386,50 +2386,50 @@ }, { "id" : "minecraft:web", - "blockRuntimeId" : 7755 + "blockRuntimeId" : 6587 }, { "id" : "minecraft:spider_eye" }, { "id" : "minecraft:mob_spawner", - "blockRuntimeId" : 5658 + "blockRuntimeId" : 411 }, { "id" : "minecraft:monster_egg", - "blockRuntimeId" : 5659 + "blockRuntimeId" : 4133 }, { "id" : "minecraft:monster_egg", - "blockRuntimeId" : 5660 + "blockRuntimeId" : 4134 }, { "id" : "minecraft:monster_egg", - "blockRuntimeId" : 5661 + "blockRuntimeId" : 4135 }, { "id" : "minecraft:monster_egg", - "blockRuntimeId" : 5662 + "blockRuntimeId" : 4136 }, { "id" : "minecraft:monster_egg", - "blockRuntimeId" : 5663 + "blockRuntimeId" : 4137 }, { "id" : "minecraft:monster_egg", - "blockRuntimeId" : 5664 + "blockRuntimeId" : 4138 }, { "id" : "minecraft:infested_deepslate", - "blockRuntimeId" : 5127 + "blockRuntimeId" : 4597 }, { "id" : "minecraft:dragon_egg", - "blockRuntimeId" : 4583 + "blockRuntimeId" : 7213 }, { "id" : "minecraft:turtle_egg", - "blockRuntimeId" : 7418 + "blockRuntimeId" : 7939 }, { "id" : "minecraft:chicken_spawn_egg" @@ -2631,42 +2631,42 @@ }, { "id" : "minecraft:obsidian", - "blockRuntimeId" : 5737 + "blockRuntimeId" : 436 }, { "id" : "minecraft:crying_obsidian", - "blockRuntimeId" : 3909 + "blockRuntimeId" : 6596 }, { "id" : "minecraft:bedrock", - "blockRuntimeId" : 234 + "blockRuntimeId" : 6971 }, { "id" : "minecraft:soul_sand", - "blockRuntimeId" : 6955 + "blockRuntimeId" : 5739 }, { "id" : "minecraft:netherrack", - "blockRuntimeId" : 5706 + "blockRuntimeId" : 6991 }, { "id" : "minecraft:magma", - "blockRuntimeId" : 5602 + "blockRuntimeId" : 7951 }, { "id" : "minecraft:nether_wart" }, { "id" : "minecraft:end_stone", - "blockRuntimeId" : 4745 + "blockRuntimeId" : 3841 }, { "id" : "minecraft:chorus_flower", - "blockRuntimeId" : 1132 + "blockRuntimeId" : 4462 }, { "id" : "minecraft:chorus_plant", - "blockRuntimeId" : 1138 + "blockRuntimeId" : 5455 }, { "id" : "minecraft:chorus_fruit" @@ -2676,51 +2676,51 @@ }, { "id" : "minecraft:sponge", - "blockRuntimeId" : 6963 + "blockRuntimeId" : 637 }, { "id" : "minecraft:sponge", - "blockRuntimeId" : 6964 + "blockRuntimeId" : 638 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3689 + "blockRuntimeId" : 5193 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3690 + "blockRuntimeId" : 5194 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3691 + "blockRuntimeId" : 5195 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3692 + "blockRuntimeId" : 5196 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3693 + "blockRuntimeId" : 5197 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3694 + "blockRuntimeId" : 5198 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3695 + "blockRuntimeId" : 5199 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3696 + "blockRuntimeId" : 5200 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3697 + "blockRuntimeId" : 5201 }, { "id" : "minecraft:coral_block", - "blockRuntimeId" : 3698 + "blockRuntimeId" : 5202 }, { "id" : "minecraft:leather_helmet" @@ -3747,111 +3747,110 @@ }, { "id" : "minecraft:torch", - "blockRuntimeId" : 7357 + "blockRuntimeId" : 732 }, { "id" : "minecraft:soul_torch", - "blockRuntimeId" : 6957 + "blockRuntimeId" : 4600 }, { "id" : "minecraft:sea_pickle", - "blockRuntimeId" : 6817 + "blockRuntimeId" : 5779 }, { "id" : "minecraft:lantern", - "blockRuntimeId" : 5363 + "blockRuntimeId" : 7016 }, { "id" : "minecraft:soul_lantern", - "blockRuntimeId" : 6953 + "blockRuntimeId" : 5699 }, { "id" : "minecraft:candle", - "blockRuntimeId" : 953 + "blockRuntimeId" : 7345 }, { "id" : "minecraft:white_candle", - "blockRuntimeId" : 7790 + "blockRuntimeId" : 5250 }, { "id" : "minecraft:orange_candle", - "blockRuntimeId" : 5738 + "blockRuntimeId" : 372 }, { "id" : "minecraft:magenta_candle", - "blockRuntimeId" : 5586 + "blockRuntimeId" : 428 }, { "id" : "minecraft:light_blue_candle", - "blockRuntimeId" : 5474 + "blockRuntimeId" : 4501 }, { "id" : "minecraft:yellow_candle", - "blockRuntimeId" : 7931 + "blockRuntimeId" : 6115 }, { "id" : "minecraft:lime_candle", - "blockRuntimeId" : 5522 + "blockRuntimeId" : 6333 }, { "id" : "minecraft:pink_candle", - "blockRuntimeId" : 5769 + "blockRuntimeId" : 7312 }, { "id" : "minecraft:gray_candle", - "blockRuntimeId" : 5000 + "blockRuntimeId" : 947 }, { "id" : "minecraft:light_gray_candle", - "blockRuntimeId" : 5490 + "blockRuntimeId" : 6147 }, { "id" : "minecraft:cyan_candle", - "blockRuntimeId" : 3921 + "blockRuntimeId" : 7668 }, { "id" : "minecraft:purple_candle", - "blockRuntimeId" : 6509 + "blockRuntimeId" : 6992 }, { - "id" : "minecraft:blue_candle", - "blockRuntimeId" : 675 + "id" : "minecraft:blue_candle" }, { "id" : "minecraft:brown_candle", - "blockRuntimeId" : 884 + "blockRuntimeId" : 5799 }, { "id" : "minecraft:green_candle", - "blockRuntimeId" : 5016 + "blockRuntimeId" : 694 }, { "id" : "minecraft:red_candle", - "blockRuntimeId" : 6580 + "blockRuntimeId" : 4637 }, { "id" : "minecraft:black_candle", - "blockRuntimeId" : 478 + "blockRuntimeId" : 171 }, { "id" : "minecraft:crafting_table", - "blockRuntimeId" : 3771 + "blockRuntimeId" : 5778 }, { "id" : "minecraft:cartography_table", - "blockRuntimeId" : 987 + "blockRuntimeId" : 8227 }, { "id" : "minecraft:fletching_table", - "blockRuntimeId" : 4812 + "blockRuntimeId" : 5757 }, { "id" : "minecraft:smithing_table", - "blockRuntimeId" : 6879 + "blockRuntimeId" : 3731 }, { "id" : "minecraft:beehive", - "blockRuntimeId" : 260 + "blockRuntimeId" : 6032 }, { "id" : "minecraft:campfire" @@ -3861,152 +3860,152 @@ }, { "id" : "minecraft:furnace", - "blockRuntimeId" : 4876 + "blockRuntimeId" : 7744 }, { "id" : "minecraft:blast_furnace", - "blockRuntimeId" : 669 + "blockRuntimeId" : 7509 }, { "id" : "minecraft:smoker", - "blockRuntimeId" : 6880 + "blockRuntimeId" : 655 }, { "id" : "minecraft:respawn_anchor", - "blockRuntimeId" : 6699 + "blockRuntimeId" : 689 }, { "id" : "minecraft:brewing_stand" }, { "id" : "minecraft:anvil", - "blockRuntimeId" : 152 + "blockRuntimeId" : 6508 }, { "id" : "minecraft:anvil", - "blockRuntimeId" : 156 + "blockRuntimeId" : 6512 }, { "id" : "minecraft:anvil", - "blockRuntimeId" : 160 + "blockRuntimeId" : 6516 }, { "id" : "minecraft:grindstone", - "blockRuntimeId" : 5032 + "blockRuntimeId" : 7981 }, { "id" : "minecraft:enchanting_table", - "blockRuntimeId" : 4719 + "blockRuntimeId" : 6597 }, { "id" : "minecraft:bookshelf", - "blockRuntimeId" : 704 + "blockRuntimeId" : 6545 }, { "id" : "minecraft:lectern", - "blockRuntimeId" : 5434 + "blockRuntimeId" : 6856 }, { "id" : "minecraft:cauldron" }, { "id" : "minecraft:composter", - "blockRuntimeId" : 3635 + "blockRuntimeId" : 5365 }, { "id" : "minecraft:chest", - "blockRuntimeId" : 1123 + "blockRuntimeId" : 7057 }, { "id" : "minecraft:trapped_chest", - "blockRuntimeId" : 7379 + "blockRuntimeId" : 5533 }, { "id" : "minecraft:ender_chest", - "blockRuntimeId" : 4746 + "blockRuntimeId" : 4317 }, { "id" : "minecraft:barrel", - "blockRuntimeId" : 201 + "blockRuntimeId" : 4450 }, { "id" : "minecraft:undyed_shulker_box", - "blockRuntimeId" : 7462 + "blockRuntimeId" : 3686 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6830 + "blockRuntimeId" : 5266 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6838 + "blockRuntimeId" : 5274 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6837 + "blockRuntimeId" : 5273 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6845 + "blockRuntimeId" : 5281 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6842 + "blockRuntimeId" : 5278 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6844 + "blockRuntimeId" : 5280 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6831 + "blockRuntimeId" : 5267 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6834 + "blockRuntimeId" : 5270 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6835 + "blockRuntimeId" : 5271 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6843 + "blockRuntimeId" : 5279 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6839 + "blockRuntimeId" : 5275 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6833 + "blockRuntimeId" : 5269 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6841 + "blockRuntimeId" : 5277 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6840 + "blockRuntimeId" : 5276 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6832 + "blockRuntimeId" : 5268 }, { "id" : "minecraft:shulker_box", - "blockRuntimeId" : 6836 + "blockRuntimeId" : 5272 }, { "id" : "minecraft:armor_stand" }, { "id" : "minecraft:noteblock", - "blockRuntimeId" : 5716 + "blockRuntimeId" : 359 }, { "id" : "minecraft:jukebox", - "blockRuntimeId" : 5208 + "blockRuntimeId" : 4830 }, { "id" : "minecraft:music_disc_13" @@ -4044,6 +4043,9 @@ { "id" : "minecraft:music_disc_wait" }, + { + "id" : "minecraft:music_disc_otherside" + }, { "id" : "minecraft:music_disc_pigstep" }, @@ -4052,15 +4054,15 @@ }, { "id" : "minecraft:glowstone", - "blockRuntimeId" : 4974 + "blockRuntimeId" : 3874 }, { "id" : "minecraft:redstone_lamp", - "blockRuntimeId" : 6646 + "blockRuntimeId" : 265 }, { - "id" : "minecraft:sealantern", - "blockRuntimeId" : 6828 + "id" : "minecraft:sea_lantern", + "blockRuntimeId" : 7488 }, { "id" : "minecraft:oak_sign" @@ -4159,23 +4161,23 @@ }, { "id" : "minecraft:beacon", - "blockRuntimeId" : 217 + "blockRuntimeId" : 145 }, { "id" : "minecraft:bell", - "blockRuntimeId" : 292 + "blockRuntimeId" : 6824 }, { "id" : "minecraft:conduit", - "blockRuntimeId" : 3676 + "blockRuntimeId" : 4196 }, { "id" : "minecraft:stonecutter_block", - "blockRuntimeId" : 7295 + "blockRuntimeId" : 7516 }, { "id" : "minecraft:end_portal_frame", - "blockRuntimeId" : 4731 + "blockRuntimeId" : 6001 }, { "id" : "minecraft:coal" @@ -4311,11 +4313,11 @@ }, { "id" : "minecraft:end_rod", - "blockRuntimeId" : 4739 + "blockRuntimeId" : 5815 }, { "id" : "minecraft:lightning_rod", - "blockRuntimeId" : 5516 + "blockRuntimeId" : 1181 }, { "id" : "minecraft:end_crystal" @@ -4777,19 +4779,19 @@ }, { "id" : "minecraft:rail", - "blockRuntimeId" : 6567 + "blockRuntimeId" : 3909 }, { "id" : "minecraft:golden_rail", - "blockRuntimeId" : 4977 + "blockRuntimeId" : 5282 }, { "id" : "minecraft:detector_rail", - "blockRuntimeId" : 4462 + "blockRuntimeId" : 4121 }, { "id" : "minecraft:activator_rail", - "blockRuntimeId" : 122 + "blockRuntimeId" : 323 }, { "id" : "minecraft:minecart" @@ -4808,114 +4810,115 @@ }, { "id" : "minecraft:redstone_block", - "blockRuntimeId" : 6645 + "blockRuntimeId" : 3781 }, { "id" : "minecraft:redstone_torch", - "blockRuntimeId" : 6648 + "blockRuntimeId" : 3530 }, { "id" : "minecraft:lever", - "blockRuntimeId" : 5442 + "blockRuntimeId" : 6405 }, { "id" : "minecraft:wooden_button", - "blockRuntimeId" : 7843 + "blockRuntimeId" : 6356 }, { "id" : "minecraft:spruce_button", - "blockRuntimeId" : 6966 + "blockRuntimeId" : 4269 }, { "id" : "minecraft:birch_button", - "blockRuntimeId" : 356 + "blockRuntimeId" : 7708 }, { "id" : "minecraft:jungle_button", - "blockRuntimeId" : 5209 + "blockRuntimeId" : 116 }, { - "id" : "minecraft:acacia_button" + "id" : "minecraft:acacia_button", + "blockRuntimeId" : 7173 }, { "id" : "minecraft:dark_oak_button", - "blockRuntimeId" : 3937 + "blockRuntimeId" : 93 }, { "id" : "minecraft:stone_button", - "blockRuntimeId" : 7195 + "blockRuntimeId" : 604 }, { "id" : "minecraft:crimson_button", - "blockRuntimeId" : 3772 + "blockRuntimeId" : 4380 }, { "id" : "minecraft:warped_button", - "blockRuntimeId" : 7530 + "blockRuntimeId" : 7192 }, { "id" : "minecraft:polished_blackstone_button", - "blockRuntimeId" : 6001 + "blockRuntimeId" : 7732 }, { "id" : "minecraft:tripwire_hook", - "blockRuntimeId" : 7401 + "blockRuntimeId" : 5838 }, { "id" : "minecraft:wooden_pressure_plate", - "blockRuntimeId" : 7887 + "blockRuntimeId" : 8005 }, { "id" : "minecraft:spruce_pressure_plate", - "blockRuntimeId" : 7026 + "blockRuntimeId" : 3764 }, { "id" : "minecraft:birch_pressure_plate", - "blockRuntimeId" : 416 + "blockRuntimeId" : 3560 }, { "id" : "minecraft:jungle_pressure_plate", - "blockRuntimeId" : 5269 + "blockRuntimeId" : 3640 }, { "id" : "minecraft:acacia_pressure_plate", - "blockRuntimeId" : 60 + "blockRuntimeId" : 5203 }, { "id" : "minecraft:dark_oak_pressure_plate", - "blockRuntimeId" : 3997 + "blockRuntimeId" : 5880 }, { "id" : "minecraft:crimson_pressure_plate", - "blockRuntimeId" : 3841 + "blockRuntimeId" : 8210 }, { "id" : "minecraft:warped_pressure_plate", - "blockRuntimeId" : 7599 + "blockRuntimeId" : 270 }, { "id" : "minecraft:stone_pressure_plate", - "blockRuntimeId" : 7207 + "blockRuntimeId" : 3875 }, { "id" : "minecraft:light_weighted_pressure_plate", - "blockRuntimeId" : 5500 + "blockRuntimeId" : 3670 }, { "id" : "minecraft:heavy_weighted_pressure_plate", - "blockRuntimeId" : 5096 + "blockRuntimeId" : 1165 }, { "id" : "minecraft:polished_blackstone_pressure_plate", - "blockRuntimeId" : 6015 + "blockRuntimeId" : 6197 }, { "id" : "minecraft:observer", - "blockRuntimeId" : 5725 + "blockRuntimeId" : 3518 }, { "id" : "minecraft:daylight_detector", - "blockRuntimeId" : 4067 + "blockRuntimeId" : 4180 }, { "id" : "minecraft:repeater" @@ -4928,30 +4931,30 @@ }, { "id" : "minecraft:dropper", - "blockRuntimeId" : 4589 + "blockRuntimeId" : 7327 }, { "id" : "minecraft:dispenser", - "blockRuntimeId" : 4490 + "blockRuntimeId" : 7955 }, { "id" : "minecraft:piston", - "blockRuntimeId" : 5786 + "blockRuntimeId" : 930 }, { "id" : "minecraft:sticky_piston", - "blockRuntimeId" : 7169 + "blockRuntimeId" : 4312 }, { "id" : "minecraft:tnt", - "blockRuntimeId" : 7353 + "blockRuntimeId" : 6581 }, { "id" : "minecraft:name_tag" }, { "id" : "minecraft:loom", - "blockRuntimeId" : 5582 + "blockRuntimeId" : 3831 }, { "id" : "minecraft:banner" @@ -5042,6 +5045,9 @@ { "id" : "minecraft:piglin_banner_pattern" }, + { + "id" : "minecraft:globe_banner_pattern" + }, { "id" : "minecraft:firework_rocket", "nbt_b64" : "CgAACgkARmlyZXdvcmtzCQoARXhwbG9zaW9ucwAAAAAAAQYARmxpZ2h0AQAA" @@ -5194,13 +5200,10 @@ }, { "id" : "minecraft:target", - "blockRuntimeId" : 7351 + "blockRuntimeId" : 6355 }, { "id" : "minecraft:lodestone_compass" - }, - { - "id" : "minecraft:debug_stick" } ] } \ No newline at end of file diff --git a/core/src/main/resources/bedrock/runtime_item_states.1_17_40.json b/core/src/main/resources/bedrock/runtime_item_states.1_18_30.json similarity index 96% rename from core/src/main/resources/bedrock/runtime_item_states.1_17_40.json rename to core/src/main/resources/bedrock/runtime_item_states.1_18_30.json index 342a45afb..4e609c7c0 100644 --- a/core/src/main/resources/bedrock/runtime_item_states.1_17_40.json +++ b/core/src/main/resources/bedrock/runtime_item_states.1_18_30.json @@ -7,6 +7,10 @@ "name" : "minecraft:acacia_button", "id" : -140 }, + { + "name" : "minecraft:acacia_chest_boat", + "id" : 637 + }, { "name" : "minecraft:acacia_door", "id" : 556 @@ -51,6 +55,10 @@ "name" : "minecraft:air", "id" : -158 }, + { + "name" : "minecraft:allay_spawn_egg", + "id" : 630 + }, { "name" : "minecraft:allow", "id" : 210 @@ -133,7 +141,7 @@ }, { "name" : "minecraft:banner_pattern", - "id" : 628 + "id" : 642 }, { "name" : "minecraft:barrel", @@ -207,6 +215,10 @@ "name" : "minecraft:birch_button", "id" : -141 }, + { + "name" : "minecraft:birch_chest_boat", + "id" : 634 + }, { "name" : "minecraft:birch_door", "id" : 554 @@ -317,7 +329,7 @@ }, { "name" : "minecraft:boat", - "id" : 626 + "id" : 640 }, { "name" : "minecraft:bone", @@ -363,10 +375,6 @@ "name" : "minecraft:brewing_stand", "id" : 431 }, - { - "name" : "minecraft:brewingstandblock", - "id" : 117 - }, { "name" : "minecraft:brick", "id" : 383 @@ -433,7 +441,7 @@ }, { "name" : "minecraft:campfire", - "id" : 588 + "id" : 589 }, { "name" : "minecraft:candle", @@ -493,7 +501,7 @@ }, { "name" : "minecraft:chain", - "id" : 618 + "id" : 619 }, { "name" : "minecraft:chain_command_block", @@ -531,6 +539,10 @@ "name" : "minecraft:chest", "id" : 54 }, + { + "name" : "minecraft:chest_boat", + "id" : 639 + }, { "name" : "minecraft:chest_minecart", "id" : 389 @@ -797,7 +809,7 @@ }, { "name" : "minecraft:crimson_door", - "id" : 615 + "id" : 616 }, { "name" : "minecraft:crimson_double_slab", @@ -837,7 +849,7 @@ }, { "name" : "minecraft:crimson_sign", - "id" : 613 + "id" : 614 }, { "name" : "minecraft:crimson_slab", @@ -907,6 +919,10 @@ "name" : "minecraft:dark_oak_button", "id" : -142 }, + { + "name" : "minecraft:dark_oak_chest_boat", + "id" : 638 + }, { "name" : "minecraft:dark_oak_door", "id" : 557 @@ -955,10 +971,6 @@ "name" : "minecraft:deadbush", "id" : 32 }, - { - "name" : "minecraft:debug_stick", - "id" : 590 - }, { "name" : "minecraft:deepslate", "id" : -378 @@ -1177,7 +1189,7 @@ }, { "name" : "minecraft:dye", - "id" : 627 + "id" : 641 }, { "name" : "minecraft:egg", @@ -1705,7 +1717,7 @@ }, { "name" : "minecraft:end_crystal", - "id" : 630 + "id" : 644 }, { "name" : "minecraft:end_gateway", @@ -1811,6 +1823,10 @@ "name" : "minecraft:fire_charge", "id" : 509 }, + { + "name" : "minecraft:firefly_spawn_egg", + "id" : 632 + }, { "name" : "minecraft:firework_rocket", "id" : 519 @@ -1863,6 +1879,14 @@ "name" : "minecraft:frame", "id" : 513 }, + { + "name" : "minecraft:frog_spawn", + "id" : -468 + }, + { + "name" : "minecraft:frog_spawn_egg", + "id" : 627 + }, { "name" : "minecraft:frosted_ice", "id" : 207 @@ -1899,13 +1923,17 @@ "name" : "minecraft:glistering_melon_slice", "id" : 434 }, + { + "name" : "minecraft:globe_banner_pattern", + "id" : 588 + }, { "name" : "minecraft:glow_berries", - "id" : 631 + "id" : 645 }, { "name" : "minecraft:glow_frame", - "id" : 622 + "id" : 623 }, { "name" : "minecraft:glow_ink_sac", @@ -1921,7 +1949,7 @@ }, { "name" : "minecraft:glow_stick", - "id" : 166 + "id" : 601 }, { "name" : "minecraft:glowingobsidian", @@ -1935,10 +1963,6 @@ "name" : "minecraft:glowstone_dust", "id" : 394 }, - { - "name" : "minecraft:goat_horn", - "id" : 623 - }, { "name" : "minecraft:goat_spawn_egg", "id" : 501 @@ -2168,7 +2192,7 @@ "id" : 413 }, { - "name" : "minecraft:invisiblebedrock", + "name" : "minecraft:invisible_bedrock", "id" : 95 }, { @@ -2255,6 +2279,10 @@ "name" : "minecraft:item.birch_door", "id" : 194 }, + { + "name" : "minecraft:item.brewing_stand", + "id" : 117 + }, { "name" : "minecraft:item.cake", "id" : 92 @@ -2363,6 +2391,10 @@ "name" : "minecraft:jungle_button", "id" : -143 }, + { + "name" : "minecraft:jungle_chest_boat", + "id" : 635 + }, { "name" : "minecraft:jungle_door", "id" : 555 @@ -2577,7 +2609,7 @@ }, { "name" : "minecraft:lodestone_compass", - "id" : 601 + "id" : 602 }, { "name" : "minecraft:log", @@ -2619,6 +2651,18 @@ "name" : "minecraft:magma_cube_spawn_egg", "id" : 455 }, + { + "name" : "minecraft:mangrove_leaves", + "id" : -472 + }, + { + "name" : "minecraft:mangrove_propagule", + "id" : -474 + }, + { + "name" : "minecraft:mangrove_propagule_hanging", + "id" : -476 + }, { "name" : "minecraft:medicine", "id" : 599 @@ -2688,9 +2732,33 @@ "id" : -175 }, { - "name" : "minecraft:movingblock", + "name" : "minecraft:moving_block", "id" : 250 }, + { + "name" : "minecraft:mud", + "id" : -473 + }, + { + "name" : "minecraft:mud_brick_double_slab", + "id" : -479 + }, + { + "name" : "minecraft:mud_brick_slab", + "id" : -478 + }, + { + "name" : "minecraft:mud_brick_stairs", + "id" : -480 + }, + { + "name" : "minecraft:mud_brick_wall", + "id" : -481 + }, + { + "name" : "minecraft:mud_bricks", + "id" : -475 + }, { "name" : "minecraft:mule_spawn_egg", "id" : 466 @@ -2731,9 +2799,13 @@ "name" : "minecraft:music_disc_mellohi", "id" : 540 }, + { + "name" : "minecraft:music_disc_otherside", + "id" : 626 + }, { "name" : "minecraft:music_disc_pigstep", - "id" : 619 + "id" : 620 }, { "name" : "minecraft:music_disc_stal", @@ -2759,14 +2831,6 @@ "name" : "minecraft:mycelium", "id" : 110 }, - { - "name" : "minecraft:mysterious_frame", - "id" : -466 - }, - { - "name" : "minecraft:mysterious_frame_slot", - "id" : -467 - }, { "name" : "minecraft:name_tag", "id" : 548 @@ -2793,7 +2857,7 @@ }, { "name" : "minecraft:nether_sprouts", - "id" : 620 + "id" : 621 }, { "name" : "minecraft:nether_star", @@ -2813,7 +2877,7 @@ }, { "name" : "minecraft:netherite_axe", - "id" : 606 + "id" : 607 }, { "name" : "minecraft:netherite_block", @@ -2821,43 +2885,43 @@ }, { "name" : "minecraft:netherite_boots", - "id" : 611 - }, - { - "name" : "minecraft:netherite_chestplate", - "id" : 609 - }, - { - "name" : "minecraft:netherite_helmet", - "id" : 608 - }, - { - "name" : "minecraft:netherite_hoe", - "id" : 607 - }, - { - "name" : "minecraft:netherite_ingot", - "id" : 602 - }, - { - "name" : "minecraft:netherite_leggings", - "id" : 610 - }, - { - "name" : "minecraft:netherite_pickaxe", - "id" : 605 - }, - { - "name" : "minecraft:netherite_scrap", "id" : 612 }, + { + "name" : "minecraft:netherite_chestplate", + "id" : 610 + }, + { + "name" : "minecraft:netherite_helmet", + "id" : 609 + }, + { + "name" : "minecraft:netherite_hoe", + "id" : 608 + }, + { + "name" : "minecraft:netherite_ingot", + "id" : 603 + }, + { + "name" : "minecraft:netherite_leggings", + "id" : 611 + }, + { + "name" : "minecraft:netherite_pickaxe", + "id" : 606 + }, + { + "name" : "minecraft:netherite_scrap", + "id" : 613 + }, { "name" : "minecraft:netherite_shovel", - "id" : 604 + "id" : 605 }, { "name" : "minecraft:netherite_sword", - "id" : 603 + "id" : 604 }, { "name" : "minecraft:netherrack", @@ -2883,6 +2947,10 @@ "name" : "minecraft:oak_boat", "id" : 375 }, + { + "name" : "minecraft:oak_chest_boat", + "id" : 633 + }, { "name" : "minecraft:oak_sign", "id" : 358 @@ -2903,6 +2971,10 @@ "name" : "minecraft:ocelot_spawn_egg", "id" : 451 }, + { + "name" : "minecraft:ochre_froglight", + "id" : -471 + }, { "name" : "minecraft:orange_candle", "id" : -414 @@ -2943,6 +3015,10 @@ "name" : "minecraft:packed_ice", "id" : 174 }, + { + "name" : "minecraft:packed_mud", + "id" : -477 + }, { "name" : "minecraft:painting", "id" : 357 @@ -2959,6 +3035,10 @@ "name" : "minecraft:parrot_spawn_egg", "id" : 478 }, + { + "name" : "minecraft:pearlescent_froglight", + "id" : -469 + }, { "name" : "minecraft:phantom_membrane", "id" : 574 @@ -3008,7 +3088,7 @@ "id" : 33 }, { - "name" : "minecraft:pistonarmcollision", + "name" : "minecraft:piston_arm_collision", "id" : 34 }, { @@ -3387,6 +3467,10 @@ "name" : "minecraft:redstone_wire", "id" : 55 }, + { + "name" : "minecraft:reinforced_deepslate", + "id" : -466 + }, { "name" : "minecraft:repeater", "id" : 419 @@ -3467,6 +3551,10 @@ "name" : "minecraft:scute", "id" : 572 }, + { + "name" : "minecraft:sea_lantern", + "id" : 169 + }, { "name" : "minecraft:sea_pickle", "id" : -156 @@ -3475,10 +3563,6 @@ "name" : "minecraft:seagrass", "id" : -130 }, - { - "name" : "minecraft:sealantern", - "id" : 169 - }, { "name" : "minecraft:shears", "id" : 421 @@ -3593,7 +3677,7 @@ }, { "name" : "minecraft:soul_campfire", - "id" : 621 + "id" : 622 }, { "name" : "minecraft:soul_fire", @@ -3621,7 +3705,7 @@ }, { "name" : "minecraft:spawn_egg", - "id" : 629 + "id" : 643 }, { "name" : "minecraft:spider_eye", @@ -3651,6 +3735,10 @@ "name" : "minecraft:spruce_button", "id" : -144 }, + { + "name" : "minecraft:spruce_chest_boat", + "id" : 636 + }, { "name" : "minecraft:spruce_door", "id" : 553 @@ -3720,7 +3808,7 @@ "id" : 29 }, { - "name" : "minecraft:stickypistonarmcollision", + "name" : "minecraft:sticky_piston_arm_collision", "id" : -217 }, { @@ -3845,7 +3933,7 @@ }, { "name" : "minecraft:suspicious_stew", - "id" : 589 + "id" : 590 }, { "name" : "minecraft:sweet_berries", @@ -3855,6 +3943,14 @@ "name" : "minecraft:sweet_berry_bush", "id" : -207 }, + { + "name" : "minecraft:tadpole_bucket", + "id" : 629 + }, + { + "name" : "minecraft:tadpole_spawn_egg", + "id" : 628 + }, { "name" : "minecraft:tallgrass", "id" : 31 @@ -3896,7 +3992,7 @@ "id" : 546 }, { - "name" : "minecraft:tripwire", + "name" : "minecraft:trip_wire", "id" : 132 }, { @@ -3959,6 +4055,10 @@ "name" : "minecraft:unpowered_repeater", "id" : 93 }, + { + "name" : "minecraft:verdant_froglight", + "id" : -470 + }, { "name" : "minecraft:vex_spawn_egg", "id" : 476 @@ -3987,13 +4087,17 @@ "name" : "minecraft:wandering_trader_spawn_egg", "id" : 492 }, + { + "name" : "minecraft:warden_spawn_egg", + "id" : 631 + }, { "name" : "minecraft:warped_button", "id" : -261 }, { "name" : "minecraft:warped_door", - "id" : 616 + "id" : 617 }, { "name" : "minecraft:warped_double_slab", @@ -4013,7 +4117,7 @@ }, { "name" : "minecraft:warped_fungus_on_a_stick", - "id" : 617 + "id" : 618 }, { "name" : "minecraft:warped_hyphae", @@ -4037,7 +4141,7 @@ }, { "name" : "minecraft:warped_sign", - "id" : 614 + "id" : 615 }, { "name" : "minecraft:warped_slab",