Add data from MCUtils for 1.21

EngineHub · Jun 15, 2024 · e5ca016 · e5ca016
1 parent 8d40de2
commit e5ca016
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 1 deletion.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java
@@ -85,4 +85,9 @@ private Constants() {
      */
     public static final int DATA_VERSION_MC_1_20 = 3463;
 
+    /**
+     * The DataVersion for Minecraft 1.21
+     */
+    public static final int DATA_VERSION_MC_1_21 = 3953;
+
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeCategories.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeCategories.java
@@ -56,6 +56,7 @@ public final class BiomeCategories {
     public static final BiomeCategory HAS_STRUCTURE_STRONGHOLD = get("minecraft:has_structure/stronghold");
     public static final BiomeCategory HAS_STRUCTURE_SWAMP_HUT = get("minecraft:has_structure/swamp_hut");
     public static final BiomeCategory HAS_STRUCTURE_TRAIL_RUINS = get("minecraft:has_structure/trail_ruins");
+    public static final BiomeCategory HAS_STRUCTURE_TRIAL_CHAMBERS = get("minecraft:has_structure/trial_chambers");
     public static final BiomeCategory HAS_STRUCTURE_VILLAGE_DESERT = get("minecraft:has_structure/village_desert");
     public static final BiomeCategory HAS_STRUCTURE_VILLAGE_PLAINS = get("minecraft:has_structure/village_plains");
     public static final BiomeCategory HAS_STRUCTURE_VILLAGE_SAVANNA = get("minecraft:has_structure/village_savanna");

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategories.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategories.java
@@ -27,6 +27,7 @@
 @SuppressWarnings("unused")
 public final class BlockCategories {
     public static final BlockCategory ACACIA_LOGS = get("minecraft:acacia_logs");
+    public static final BlockCategory AIR = get("minecraft:air");
     public static final BlockCategory ALL_HANGING_SIGNS = get("minecraft:all_hanging_signs");
     public static final BlockCategory ALL_SIGNS = get("minecraft:all_signs");
     public static final BlockCategory ANCIENT_CITY_REPLACEABLE = get("minecraft:ancient_city_replaceable");
@@ -48,6 +49,7 @@ public final class BlockCategories {
     public static final BlockCategory BEEHIVES = get("minecraft:beehives");
     public static final BlockCategory BIG_DRIPLEAF_PLACEABLE = get("minecraft:big_dripleaf_placeable");
     public static final BlockCategory BIRCH_LOGS = get("minecraft:birch_logs");
+    public static final BlockCategory BLOCKS_WIND_CHARGE_EXPLOSIONS = get("minecraft:blocks_wind_charge_explosions");
     public static final BlockCategory BUTTONS = get("minecraft:buttons");
     public static final BlockCategory CAMEL_SAND_STEP_SOUND_BLOCKS = get("minecraft:camel_sand_step_sound_blocks");
     public static final BlockCategory CAMPFIRES = get("minecraft:campfires");
@@ -132,6 +134,7 @@ public final class BlockCategories {
     public static final BlockCategory MINEABLE_HOE = get("minecraft:mineable/hoe");
     public static final BlockCategory MINEABLE_PICKAXE = get("minecraft:mineable/pickaxe");
     public static final BlockCategory MINEABLE_SHOVEL = get("minecraft:mineable/shovel");
+    public static final BlockCategory MOB_INTERACTABLE_DOORS = get("minecraft:mob_interactable_doors");
     public static final BlockCategory MOOSHROOMS_SPAWNABLE_ON = get("minecraft:mooshrooms_spawnable_on");
     public static final BlockCategory MOSS_REPLACEABLE = get("minecraft:moss_replaceable");
     public static final BlockCategory MUSHROOM_GROW_BLOCK = get("minecraft:mushroom_grow_block");

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java
@@ -81,6 +81,7 @@ public final class ItemCategories {
     public static final ItemCategory ENCHANTABLE_FOOT_ARMOR = get("minecraft:enchantable/foot_armor");
     public static final ItemCategory ENCHANTABLE_HEAD_ARMOR = get("minecraft:enchantable/head_armor");
     public static final ItemCategory ENCHANTABLE_LEG_ARMOR = get("minecraft:enchantable/leg_armor");
+    public static final ItemCategory ENCHANTABLE_MACE = get("minecraft:enchantable/mace");
     public static final ItemCategory ENCHANTABLE_MINING = get("minecraft:enchantable/mining");
     public static final ItemCategory ENCHANTABLE_MINING_LOOT = get("minecraft:enchantable/mining_loot");
     public static final ItemCategory ENCHANTABLE_SHARP_WEAPON = get("minecraft:enchantable/sharp_weapon");
@@ -118,7 +119,7 @@ public final class ItemCategories {
     public static final ItemCategory LOGS_THAT_BURN = get("minecraft:logs_that_burn");
     public static final ItemCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
     public static final ItemCategory MEAT = get("minecraft:meat");
-    public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs");
+    @Deprecated public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs");
     public static final ItemCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood");
     public static final ItemCategory NOTEBLOCK_TOP_INSTRUMENTS = get("minecraft:noteblock_top_instruments");
     public static final ItemCategory OAK_LOGS = get("minecraft:oak_logs");

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java
@@ -792,11 +792,14 @@ public final class ItemTypes {
     @Nullable public static final ItemType MUSIC_DISC_BLOCKS = get("minecraft:music_disc_blocks");
     @Nullable public static final ItemType MUSIC_DISC_CAT = get("minecraft:music_disc_cat");
     @Nullable public static final ItemType MUSIC_DISC_CHIRP = get("minecraft:music_disc_chirp");
+    @Nullable public static final ItemType MUSIC_DISC_CREATOR = get("minecraft:music_disc_creator");
+    @Nullable public static final ItemType MUSIC_DISC_CREATOR_MUSIC_BOX = get("minecraft:music_disc_creator_music_box");
     @Nullable public static final ItemType MUSIC_DISC_FAR = get("minecraft:music_disc_far");
     @Nullable public static final ItemType MUSIC_DISC_MALL = get("minecraft:music_disc_mall");
     @Nullable public static final ItemType MUSIC_DISC_MELLOHI = get("minecraft:music_disc_mellohi");
     @Nullable public static final ItemType MUSIC_DISC_OTHERSIDE = get("minecraft:music_disc_otherside");
     @Nullable public static final ItemType MUSIC_DISC_PIGSTEP = get("minecraft:music_disc_pigstep");
+    @Nullable public static final ItemType MUSIC_DISC_PRECIPICE = get("minecraft:music_disc_precipice");
     @Nullable public static final ItemType MUSIC_DISC_RELIC = get("minecraft:music_disc_relic");
     @Nullable public static final ItemType MUSIC_DISC_STAL = get("minecraft:music_disc_stal");
     @Nullable public static final ItemType MUSIC_DISC_STRAD = get("minecraft:music_disc_strad");

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledRegistries.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledRegistries.java
@@ -44,6 +44,7 @@ public class BundledRegistries implements Registries {
     static {
         TreeRangeMap<Integer, String> versionMap = TreeRangeMap.create();
         versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_20), "120");
+        versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_21), "121");
         VERSION_MAP = ImmutableRangeMap.copyOf(versionMap);
     }
 

diff --git a/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.121.json b/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.121.json
diff --git a/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.121.json b/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.121.json