1.20.4: Update entity, item and block palette

MinecraftClient/Inventory/ItemType.cs

@@ -154,6 +154,7 @@
         BrainCoralBlock,
         BrainCoralFan,
         Bread,
+        BreezeSpawnEgg,
         BrewerPotterySherd,
         BrewingStand,
         Brick,
@@ -228,6 +229,7 @@
         ChickenSpawnEgg,
         ChippedAnvil,
         ChiseledBookshelf,
+        ChiseledCopper,
         ChiseledDeepslate,
         ChiseledNetherBricks,
         ChiseledPolishedBlackstone,
@@ -235,6 +237,8 @@
         ChiseledRedSandstone,
         ChiseledSandstone,
         ChiseledStoneBricks,
+        ChiseledTuff,
+        ChiseledTuffBricks,
         ChorusFlower,
         ChorusFruit,
         ChorusPlant,
@@ -274,8 +278,12 @@
         CookedSalmon,
         Cookie,
         CopperBlock,
+        CopperBulb,
+        CopperDoor,
+        CopperGrate,
         CopperIngot,
         CopperOre,
+        CopperTrapdoor,
         Cornflower,
         CowSpawnEgg,
         CrackedDeepslateBricks,
@@ -283,6 +291,7 @@
         CrackedNetherBricks,
         CrackedPolishedBlackstoneBricks,
         CrackedStoneBricks,
+        Crafter,
         CraftingTable,
         CreeperBannerPattern,
         CreeperHead,
@@ -444,7 +453,12 @@
         EvokerSpawnEgg,
         ExperienceBottle,
         ExplorerPotterySherd,
+        ExposedChiseledCopper,
         ExposedCopper,
+        ExposedCopperBulb,
+        ExposedCopperDoor,
+        ExposedCopperGrate,
+        ExposedCopperTrapdoor,
         ExposedCutCopper,
         ExposedCutCopperSlab,
         ExposedCutCopperStairs,
@@ -511,7 +525,7 @@
         GraniteSlab,
         GraniteStairs,
         GraniteWall,
-        Grass,
+        Grass, // 1.20.3+ renamed to ShortGrass
         GrassBlock,
         Gravel,
         GrayBanner,
@@ -826,7 +840,12 @@
         OrangeTulip,
         OrangeWool,
         OxeyeDaisy,
+        OxidizedChiseledCopper,
         OxidizedCopper,
+        OxidizedCopperBulb,
+        OxidizedCopperDoor,
+        OxidizedCopperGrate,
+        OxidizedCopperTrapdoor,
         OxidizedCutCopper,
         OxidizedCutCopperSlab,
         OxidizedCutCopperStairs,
@@ -895,6 +914,10 @@
         PolishedGranite,
         PolishedGraniteSlab,
         PolishedGraniteStairs,
+        PolishedTuff,
+        PolishedTuffSlab,
+        PolishedTuffStairs,
+        PolishedTuffWall,
         PoppedChorusFruit,
         Poppy,
         Porkchop,
@@ -1020,6 +1043,7 @@
         SheepSpawnEgg,
         ShelterPotterySherd,
         Shield,
+        ShortGrass,
         Shroomlight,
         ShulkerBox,
         ShulkerShell,
@@ -1156,6 +1180,8 @@
         TotemOfUndying,
         TraderLlamaSpawnEgg,
         TrappedChest,
+        TrialKey,
+        TrialSpawner,
         Trident,
         TripwireHook,
         TropicalFish,
@@ -1165,6 +1191,13 @@
         TubeCoralBlock,
         TubeCoralFan,
         Tuff,
+        TuffBrickSlab,
+        TuffBrickStairs,
+        TuffBrickWall,
+        TuffBricks,
+        TuffSlab,
+        TuffStairs,
+        TuffWall,
         TurtleEgg,
         TurtleHelmet,
         TurtleSpawnEgg,
@@ -1197,24 +1230,49 @@
         WarpedTrapdoor,
         WarpedWartBlock,
         WaterBucket,
+        WaxedChiseledCopper,
         WaxedCopperBlock,
+        WaxedCopperBulb,
+        WaxedCopperDoor,
+        WaxedCopperGrate,
+        WaxedCopperTrapdoor,
         WaxedCutCopper,
         WaxedCutCopperSlab,
         WaxedCutCopperStairs,
+        WaxedExposedChiseledCopper,
         WaxedExposedCopper,
+        WaxedExposedCopperBulb,
+        WaxedExposedCopperDoor,
+        WaxedExposedCopperGrate,
+        WaxedExposedCopperTrapdoor,
         WaxedExposedCutCopper,
         WaxedExposedCutCopperSlab,
         WaxedExposedCutCopperStairs,
+        WaxedOxidizedChiseledCopper,
         WaxedOxidizedCopper,
+        WaxedOxidizedCopperBulb,
+        WaxedOxidizedCopperDoor,
+        WaxedOxidizedCopperGrate,
+        WaxedOxidizedCopperTrapdoor,
         WaxedOxidizedCutCopper,
         WaxedOxidizedCutCopperSlab,
         WaxedOxidizedCutCopperStairs,
+        WaxedWeatheredChiseledCopper,
         WaxedWeatheredCopper,
+        WaxedWeatheredCopperBulb,
+        WaxedWeatheredCopperDoor,
+        WaxedWeatheredCopperGrate,
+        WaxedWeatheredCopperTrapdoor,
         WaxedWeatheredCutCopper,
         WaxedWeatheredCutCopperSlab,
         WaxedWeatheredCutCopperStairs,
         WayfinderArmorTrimSmithingTemplate,
+        WeatheredChiseledCopper,
         WeatheredCopper,
+        WeatheredCopperBulb,
+        WeatheredCopperDoor,
+        WeatheredCopperGrate,
+        WeatheredCopperTrapdoor,
         WeatheredCutCopper,
         WeatheredCutCopperSlab,
         WeatheredCutCopperStairs,

MinecraftClient/Mapping/EntityPalettes/EntityPalette1204.cs

@@ -0,0 +1,144 @@
+using System.Collections.Generic;
+
+namespace MinecraftClient.Mapping.EntityPalettes
+{
+    public class EntityPalette1204 : EntityPalette
+    {
+        private static readonly Dictionary<int, EntityType> mappings = new();
+
+        static EntityPalette1204()
+        {
+            mappings[0] = EntityType.Allay;
+            mappings[1] = EntityType.AreaEffectCloud;
+            mappings[2] = EntityType.ArmorStand;
+            mappings[3] = EntityType.Arrow;
+            mappings[4] = EntityType.Axolotl;
+            mappings[5] = EntityType.Bat;
+            mappings[6] = EntityType.Bee;
+            mappings[7] = EntityType.Blaze;
+            mappings[8] = EntityType.BlockDisplay;
+            mappings[9] = EntityType.Boat;
+            mappings[10] = EntityType.Breeze;
+            mappings[11] = EntityType.Camel;
+            mappings[12] = EntityType.Cat;
+            mappings[13] = EntityType.CaveSpider;
+            mappings[14] = EntityType.ChestBoat;
+            mappings[15] = EntityType.ChestMinecart;
+            mappings[16] = EntityType.Chicken;
+            mappings[17] = EntityType.Cod;
+            mappings[18] = EntityType.CommandBlockMinecart;
+            mappings[19] = EntityType.Cow;
+            mappings[20] = EntityType.Creeper;
+            mappings[21] = EntityType.Dolphin;
+            mappings[22] = EntityType.Donkey;
+            mappings[23] = EntityType.DragonFireball;
+            mappings[24] = EntityType.Drowned;
+            mappings[25] = EntityType.Egg;
+            mappings[26] = EntityType.ElderGuardian;
+            mappings[27] = EntityType.EndCrystal;
+            mappings[28] = EntityType.EnderDragon;
+            mappings[29] = EntityType.EnderPearl;
+            mappings[30] = EntityType.Enderman;
+            mappings[31] = EntityType.Endermite;
+            mappings[32] = EntityType.Evoker;
+            mappings[33] = EntityType.EvokerFangs;
+            mappings[34] = EntityType.ExperienceBottle;
+            mappings[35] = EntityType.ExperienceOrb;
+            mappings[36] = EntityType.EyeOfEnder;
+            mappings[37] = EntityType.FallingBlock;
+            mappings[58] = EntityType.Fireball;
+            mappings[38] = EntityType.FireworkRocket;
+            mappings[125] = EntityType.FishingBobber;
+            mappings[39] = EntityType.Fox;
+            mappings[40] = EntityType.Frog;
+            mappings[41] = EntityType.FurnaceMinecart;
+            mappings[42] = EntityType.Ghast;
+            mappings[43] = EntityType.Giant;
+            mappings[44] = EntityType.GlowItemFrame;
+            mappings[45] = EntityType.GlowSquid;
+            mappings[46] = EntityType.Goat;
+            mappings[47] = EntityType.Guardian;
+            mappings[48] = EntityType.Hoglin;
+            mappings[49] = EntityType.HopperMinecart;
+            mappings[50] = EntityType.Horse;
+            mappings[51] = EntityType.Husk;
+            mappings[52] = EntityType.Illusioner;
+            mappings[53] = EntityType.Interaction;
+            mappings[54] = EntityType.IronGolem;
+            mappings[55] = EntityType.Item;
+            mappings[56] = EntityType.ItemDisplay;
+            mappings[57] = EntityType.ItemFrame;
+            mappings[59] = EntityType.LeashKnot;
+            mappings[60] = EntityType.LightningBolt;
+            mappings[61] = EntityType.Llama;
+            mappings[62] = EntityType.LlamaSpit;
+            mappings[63] = EntityType.MagmaCube;
+            mappings[64] = EntityType.Marker;
+            mappings[65] = EntityType.Minecart;
+            mappings[66] = EntityType.Mooshroom;
+            mappings[67] = EntityType.Mule;
+            mappings[68] = EntityType.Ocelot;
+            mappings[69] = EntityType.Painting;
+            mappings[70] = EntityType.Panda;
+            mappings[71] = EntityType.Parrot;
+            mappings[72] = EntityType.Phantom;
+            mappings[73] = EntityType.Pig;
+            mappings[74] = EntityType.Piglin;
+            mappings[75] = EntityType.PiglinBrute;
+            mappings[76] = EntityType.Pillager;
+            mappings[124] = EntityType.Player;
+            mappings[77] = EntityType.PolarBear;
+            mappings[78] = EntityType.Potion;
+            mappings[79] = EntityType.Pufferfish;
+            mappings[80] = EntityType.Rabbit;
+            mappings[81] = EntityType.Ravager;
+            mappings[82] = EntityType.Salmon;
+            mappings[83] = EntityType.Sheep;
+            mappings[84] = EntityType.Shulker;
+            mappings[85] = EntityType.ShulkerBullet;
+            mappings[86] = EntityType.Silverfish;
+            mappings[87] = EntityType.Skeleton;
+            mappings[88] = EntityType.SkeletonHorse;
+            mappings[89] = EntityType.Slime;
+            mappings[90] = EntityType.SmallFireball;
+            mappings[91] = EntityType.Sniffer;
+            mappings[92] = EntityType.SnowGolem;
+            mappings[93] = EntityType.Snowball;
+            mappings[94] = EntityType.SpawnerMinecart;
+            mappings[95] = EntityType.SpectralArrow;
+            mappings[96] = EntityType.Spider;
+            mappings[97] = EntityType.Squid;
+            mappings[98] = EntityType.Stray;
+            mappings[99] = EntityType.Strider;
+            mappings[100] = EntityType.Tadpole;
+            mappings[101] = EntityType.TextDisplay;
+            mappings[102] = EntityType.Tnt;
+            mappings[103] = EntityType.TntMinecart;
+            mappings[104] = EntityType.TraderLlama;
+            mappings[105] = EntityType.Trident;
+            mappings[106] = EntityType.TropicalFish;
+            mappings[107] = EntityType.Turtle;
+            mappings[108] = EntityType.Vex;
+            mappings[109] = EntityType.Villager;
+            mappings[110] = EntityType.Vindicator;
+            mappings[111] = EntityType.WanderingTrader;
+            mappings[112] = EntityType.Warden;
+            mappings[113] = EntityType.WindCharge;
+            mappings[114] = EntityType.Witch;
+            mappings[115] = EntityType.Wither;
+            mappings[116] = EntityType.WitherSkeleton;
+            mappings[117] = EntityType.WitherSkull;
+            mappings[118] = EntityType.Wolf;
+            mappings[119] = EntityType.Zoglin;
+            mappings[120] = EntityType.Zombie;
+            mappings[121] = EntityType.ZombieHorse;
+            mappings[122] = EntityType.ZombieVillager;
+            mappings[123] = EntityType.ZombifiedPiglin;
+        }
+
+        protected override Dictionary<int, EntityType> GetDict()
+        {
+            return mappings;
+        }
+    }
+}

MinecraftClient/Mapping/EntityPalettes/EntityPaletteGenerator.cs

@@ -11,7 +11,10 @@ namespace MinecraftClient.Mapping.EntityPalettes
         /// Generate EntityType.cs from Minecraft registries.json
         /// </summary>
         /// <param name="registriesJsonFile">path to registries.json</param>
-        /// <remarks>java -cp minecraft_server.jar net.minecraft.data.Main --reports</remarks>
+        /// <remarks>
+        /// java -cp minecraft_server.jar net.minecraft.data.Main --reports</remarks>
+        /// For 1.18+: java -DbundlerMainClass=net.minecraft.data.Main -jar minecraft_server.jar --reports
+        /// </remarks>
         public static void GenerateEntityTypes(string registriesJsonFile)
         {
             DataTypeGenerator.GenerateEnumWithPalette(registriesJsonFile, "minecraft:entity_type", "EntityType", "MinecraftClient.Mapping", "EntityPalette", "MinecraftClient.Mapping.EntityPalettes");

MinecraftClient/Mapping/EntityType.cs

@@ -24,6 +24,7 @@
         Blaze,
         BlockDisplay,
         Boat,
+        Breeze,
         Camel,
         Cat,
         CaveSpider,
@@ -128,6 +129,7 @@
         Vindicator,
         WanderingTrader,
         Warden,
+        WindCharge,
         Witch,
         Wither,
         WitherSkeleton,

MinecraftClient/Mapping/Material.cs

@@ -198,6 +198,7 @@
         Chest,
         ChippedAnvil,
         ChiseledBookshelf,
+        ChiseledCopper,
         ChiseledDeepslate,
         ChiseledNetherBricks,
         ChiseledPolishedBlackstone,
@@ -205,6 +206,8 @@
         ChiseledRedSandstone,
         ChiseledSandstone,
         ChiseledStoneBricks,
+        ChiseledTuff,
+        ChiseledTuffBricks,
         ChorusFlower,
         ChorusPlant,
         Clay,
@@ -226,13 +229,18 @@
         Composter,
         Conduit,
         CopperBlock,
+        CopperBulb,
+        CopperDoor,
+        CopperGrate,
         CopperOre,
+        CopperTrapdoor,
         Cornflower,
         CrackedDeepslateBricks,
         CrackedDeepslateTiles,
         CrackedNetherBricks,
         CrackedPolishedBlackstoneBricks,
         CrackedStoneBricks,
+        Crafter,
         CraftingTable,
         CreeperHead,
         CreeperWallHead,
@@ -367,7 +375,12 @@
         EndStoneBrickWall,
         EndStoneBricks,
         EnderChest,
+        ExposedChiseledCopper,
         ExposedCopper,
+        ExposedCopperBulb,
+        ExposedCopperDoor,
+        ExposedCopperGrate,
+        ExposedCopperTrapdoor,
         ExposedCutCopper,
         ExposedCutCopperSlab,
         ExposedCutCopperStairs,
@@ -396,7 +409,7 @@
         GraniteSlab,
         GraniteStairs,
         GraniteWall,
-        Grass,
+        Grass, // 1.20.3+ renamed to ShortGrass
         GrassBlock,
         Gravel,
         GrayBanner,
@@ -638,7 +651,12 @@
         OrangeWallBanner,
         OrangeWool,
         OxeyeDaisy,
+        OxidizedChiseledCopper,
         OxidizedCopper,
+        OxidizedCopperBulb,
+        OxidizedCopperDoor,
+        OxidizedCopperGrate,
+        OxidizedCopperTrapdoor,
         OxidizedCutCopper,
         OxidizedCutCopperSlab,
         OxidizedCutCopperStairs,
@@ -697,6 +715,10 @@
         PolishedGranite,
         PolishedGraniteSlab,
         PolishedGraniteStairs,
+        PolishedTuff,
+        PolishedTuffSlab,
+        PolishedTuffStairs,
+        PolishedTuffWall,
         Poppy,
         Potatoes,
         PottedAcaciaSapling,
@@ -824,6 +846,7 @@
         SeaLantern,
         SeaPickle,
         Seagrass,
+        ShortGrass,
         Shroomlight,
         ShulkerBox,
         SkeletonSkull,
@@ -924,6 +947,7 @@
         Torchflower,
         TorchflowerCrop,
         TrappedChest,
+        TrialSpawner,
         Tripwire,
         TripwireHook,
         TubeCoral,
@@ -931,6 +955,13 @@
         TubeCoralFan,
         TubeCoralWallFan,
         Tuff,
+        TuffBrickSlab,
+        TuffBrickStairs,
+        TuffBrickWall,
+        TuffBricks,
+        TuffSlab,
+        TuffStairs,
+        TuffWall,
         TurtleEgg,
         TwistingVines,
         TwistingVinesPlant,
@@ -959,23 +990,48 @@
         WarpedWartBlock,
         Water,
         WaterCauldron,
+        WaxedChiseledCopper,
         WaxedCopperBlock,
+        WaxedCopperBulb,
+        WaxedCopperDoor,
+        WaxedCopperGrate,
+        WaxedCopperTrapdoor,
         WaxedCutCopper,
         WaxedCutCopperSlab,
         WaxedCutCopperStairs,
+        WaxedExposedChiseledCopper,
         WaxedExposedCopper,
+        WaxedExposedCopperBulb,
+        WaxedExposedCopperDoor,
+        WaxedExposedCopperGrate,
+        WaxedExposedCopperTrapdoor,
         WaxedExposedCutCopper,
         WaxedExposedCutCopperSlab,
         WaxedExposedCutCopperStairs,
+        WaxedOxidizedChiseledCopper,
         WaxedOxidizedCopper,
+        WaxedOxidizedCopperBulb,
+        WaxedOxidizedCopperDoor,
+        WaxedOxidizedCopperGrate,
+        WaxedOxidizedCopperTrapdoor,
         WaxedOxidizedCutCopper,
         WaxedOxidizedCutCopperSlab,
         WaxedOxidizedCutCopperStairs,
+        WaxedWeatheredChiseledCopper,
         WaxedWeatheredCopper,
+        WaxedWeatheredCopperBulb,
+        WaxedWeatheredCopperDoor,
+        WaxedWeatheredCopperGrate,
+        WaxedWeatheredCopperTrapdoor,
         WaxedWeatheredCutCopper,
         WaxedWeatheredCutCopperSlab,
         WaxedWeatheredCutCopperStairs,
+        WeatheredChiseledCopper,
         WeatheredCopper,
+        WeatheredCopperBulb,
+        WeatheredCopperDoor,
+        WeatheredCopperGrate,
+        WeatheredCopperTrapdoor,
         WeatheredCutCopper,
         WeatheredCutCopperSlab,
         WeatheredCutCopperStairs,

MinecraftClient/Protocol/Handlers/Protocol18.cs

@@ -146,6 +146,7 @@ namespace MinecraftClient.Protocol.Handlers
                 // Block palette
                 > MC_1_20_4_Version when handler.GetTerrainEnabled() =>
                     throw new NotImplementedException(Translations.exception_palette_block),
+                >= MC_1_20_4_Version => new Palette1204(),
                 >= MC_1_20_Version => new Palette120(),
                 MC_1_19_4_Version => new Palette1194(),
                 MC_1_19_3_Version => new Palette1193(),
@@ -163,6 +164,7 @@ namespace MinecraftClient.Protocol.Handlers
                 // Entity palette
                 > MC_1_20_4_Version when handler.GetEntityHandlingEnabled() =>
                     throw new NotImplementedException(Translations.exception_palette_entity),
+                >= MC_1_20_4_Version => new EntityPalette1204(),
                 >= MC_1_20_Version => new EntityPalette120(),
                 MC_1_19_4_Version => new EntityPalette1194(),
                 MC_1_19_3_Version => new EntityPalette1193(),
@@ -184,6 +186,7 @@ namespace MinecraftClient.Protocol.Handlers
                 // Item palette
                 > MC_1_20_4_Version when handler.GetInventoryEnabled() =>
                     throw new NotImplementedException(Translations.exception_palette_item),
+                >= MC_1_20_4_Version => new ItemPalette1204(),
                 >= MC_1_20_Version => new ItemPalette120(),
                 MC_1_19_4_Version => new ItemPalette1194(),
                 MC_1_19_3_Version => new ItemPalette1193(),