Update data to 1.19.4

data/packetid/clientboundpacketid_string.go

@@ -8,119 +8,122 @@ func _() {
 	// An "invalid array index" compiler error signifies that the constant values have changed.
 	// Re-run the stringer command to generate them again.
 	var x [1]struct{}
-	_ = x[ClientboundAddEntity-0]
+	_ = x[BundleDelimiter-0]
-	_ = x[ClientboundAddExperienceOrb-1]
+	_ = x[ClientboundAddEntity-1]
-	_ = x[ClientboundAddPlayer-2]
+	_ = x[ClientboundAddExperienceOrb-2]
-	_ = x[ClientboundAnimate-3]
+	_ = x[ClientboundAddPlayer-3]
-	_ = x[ClientboundAwardStats-4]
+	_ = x[ClientboundAnimate-4]
-	_ = x[ClientboundBlockChangedAck-5]
+	_ = x[ClientboundAwardStats-5]
-	_ = x[ClientboundBlockDestruction-6]
+	_ = x[ClientboundBlockChangedAck-6]
-	_ = x[ClientboundBlockEntityData-7]
+	_ = x[ClientboundBlockDestruction-7]
-	_ = x[ClientboundBlockEvent-8]
+	_ = x[ClientboundBlockEntityData-8]
-	_ = x[ClientboundBlockUpdate-9]
+	_ = x[ClientboundBlockEvent-9]
-	_ = x[ClientboundBossEvent-10]
+	_ = x[ClientboundBlockUpdate-10]
-	_ = x[ClientboundChangeDifficulty-11]
+	_ = x[ClientboundBossEvent-11]
-	_ = x[ClientboundClearTitles-12]
+	_ = x[ClientboundChangeDifficulty-12]
-	_ = x[ClientboundCommandSuggestions-13]
+	_ = x[ClientboundChunksBiomes-13]
-	_ = x[ClientboundCommands-14]
+	_ = x[ClientboundClearTitles-14]
-	_ = x[ClientboundContainerClose-15]
+	_ = x[ClientboundCommandSuggestions-15]
-	_ = x[ClientboundContainerSetContent-16]
+	_ = x[ClientboundCommands-16]
-	_ = x[ClientboundContainerSetData-17]
+	_ = x[ClientboundContainerClose-17]
-	_ = x[ClientboundContainerSetSlot-18]
+	_ = x[ClientboundContainerSetContent-18]
-	_ = x[ClientboundCooldown-19]
+	_ = x[ClientboundContainerSetData-19]
-	_ = x[ClientboundCustomChatCompletions-20]
+	_ = x[ClientboundContainerSetSlot-20]
-	_ = x[ClientboundCustomPayload-21]
+	_ = x[ClientboundCooldown-21]
-	_ = x[ClientboundDeleteChat-22]
+	_ = x[ClientboundCustomChatCompletions-22]
-	_ = x[ClientboundDisconnect-23]
+	_ = x[ClientboundCustomPayload-23]
-	_ = x[ClientboundDisguisedChat-24]
+	_ = x[ClientboundDamageEvent-24]
-	_ = x[ClientboundEntityEvent-25]
+	_ = x[ClientboundDeleteChat-25]
-	_ = x[ClientboundExplode-26]
+	_ = x[ClientboundDisconnect-26]
-	_ = x[ClientboundForgetLevelChunk-27]
+	_ = x[ClientboundDisguisedChat-27]
-	_ = x[ClientboundGameEvent-28]
+	_ = x[ClientboundEntityEvent-28]
-	_ = x[ClientboundHorseScreenOpen-29]
+	_ = x[ClientboundExplode-29]
-	_ = x[ClientboundInitializeBorder-30]
+	_ = x[ClientboundForgetLevelChunk-30]
-	_ = x[ClientboundKeepAlive-31]
+	_ = x[ClientboundGameEvent-31]
-	_ = x[ClientboundLevelChunkWithLight-32]
+	_ = x[ClientboundHorseScreenOpen-32]
-	_ = x[ClientboundLevelEvent-33]
+	_ = x[ClientboundHurtAnimation-33]
-	_ = x[ClientboundLevelParticles-34]
+	_ = x[ClientboundInitializeBorder-34]
-	_ = x[ClientboundLightUpdate-35]
+	_ = x[ClientboundKeepAlive-35]
-	_ = x[ClientboundLogin-36]
+	_ = x[ClientboundLevelChunkWithLight-36]
-	_ = x[ClientboundMapItemData-37]
+	_ = x[ClientboundLevelEvent-37]
-	_ = x[ClientboundMerchantOffers-38]
+	_ = x[ClientboundLevelParticles-38]
-	_ = x[ClientboundMoveEntityPos-39]
+	_ = x[ClientboundLightUpdate-39]
-	_ = x[ClientboundMoveEntityPosRot-40]
+	_ = x[ClientboundLogin-40]
-	_ = x[ClientboundMoveEntityRot-41]
+	_ = x[ClientboundMapItemData-41]
-	_ = x[ClientboundMoveVehicle-42]
+	_ = x[ClientboundMerchantOffers-42]
-	_ = x[ClientboundOpenBook-43]
+	_ = x[ClientboundMoveEntityPos-43]
-	_ = x[ClientboundOpenScreen-44]
+	_ = x[ClientboundMoveEntityPosRot-44]
-	_ = x[ClientboundOpenSignEditor-45]
+	_ = x[ClientboundMoveEntityRot-45]
-	_ = x[ClientboundPing-46]
+	_ = x[ClientboundMoveVehicle-46]
-	_ = x[ClientboundPlaceGhostRecipe-47]
+	_ = x[ClientboundOpenBook-47]
-	_ = x[ClientboundPlayerAbilities-48]
+	_ = x[ClientboundOpenScreen-48]
-	_ = x[ClientboundPlayerChat-49]
+	_ = x[ClientboundOpenSignEditor-49]
-	_ = x[ClientboundPlayerCombatEnd-50]
+	_ = x[ClientboundPing-50]
-	_ = x[ClientboundPlayerCombatEnter-51]
+	_ = x[ClientboundPlaceGhostRecipe-51]
-	_ = x[ClientboundPlayerCombatKill-52]
+	_ = x[ClientboundPlayerAbilities-52]
-	_ = x[ClientboundPlayerInfoRemove-53]
+	_ = x[ClientboundPlayerChat-53]
-	_ = x[ClientboundPlayerInfoUpdate-54]
+	_ = x[ClientboundPlayerCombatEnd-54]
-	_ = x[ClientboundPlayerLookAt-55]
+	_ = x[ClientboundPlayerCombatEnter-55]
-	_ = x[ClientboundPlayerPosition-56]
+	_ = x[ClientboundPlayerCombatKill-56]
-	_ = x[ClientboundRecipe-57]
+	_ = x[ClientboundPlayerInfoRemove-57]
-	_ = x[ClientboundRemoveEntities-58]
+	_ = x[ClientboundPlayerInfoUpdate-58]
-	_ = x[ClientboundRemoveMobEffect-59]
+	_ = x[ClientboundPlayerLookAt-59]
-	_ = x[ClientboundResourcePack-60]
+	_ = x[ClientboundPlayerPosition-60]
-	_ = x[ClientboundRespawn-61]
+	_ = x[ClientboundRecipe-61]
-	_ = x[ClientboundRotateHead-62]
+	_ = x[ClientboundRemoveEntities-62]
-	_ = x[ClientboundSectionBlocksUpdate-63]
+	_ = x[ClientboundRemoveMobEffect-63]
-	_ = x[ClientboundSelectAdvancementsTab-64]
+	_ = x[ClientboundResourcePack-64]
-	_ = x[ClientboundServerData-65]
+	_ = x[ClientboundRespawn-65]
-	_ = x[ClientboundSetActionBarText-66]
+	_ = x[ClientboundRotateHead-66]
-	_ = x[ClientboundSetBorderCenter-67]
+	_ = x[ClientboundSectionBlocksUpdate-67]
-	_ = x[ClientboundSetBorderLerpSize-68]
+	_ = x[ClientboundSelectAdvancementsTab-68]
-	_ = x[ClientboundSetBorderSize-69]
+	_ = x[ClientboundServerData-69]
-	_ = x[ClientboundSetBorderWarningDelay-70]
+	_ = x[ClientboundSetActionBarText-70]
-	_ = x[ClientboundSetBorderWarningDistance-71]
+	_ = x[ClientboundSetBorderCenter-71]
-	_ = x[ClientboundSetCamera-72]
+	_ = x[ClientboundSetBorderLerpSize-72]
-	_ = x[ClientboundSetCarriedItem-73]
+	_ = x[ClientboundSetBorderSize-73]
-	_ = x[ClientboundSetChunkCacheCenter-74]
+	_ = x[ClientboundSetBorderWarningDelay-74]
-	_ = x[ClientboundSetChunkCacheRadius-75]
+	_ = x[ClientboundSetBorderWarningDistance-75]
-	_ = x[ClientboundSetDefaultSpawnPosition-76]
+	_ = x[ClientboundSetCamera-76]
-	_ = x[ClientboundSetDisplayObjective-77]
+	_ = x[ClientboundSetCarriedItem-77]
-	_ = x[ClientboundSetEntityData-78]
+	_ = x[ClientboundSetChunkCacheCenter-78]
-	_ = x[ClientboundSetEntityLink-79]
+	_ = x[ClientboundSetChunkCacheRadius-79]
-	_ = x[ClientboundSetEntityMotion-80]
+	_ = x[ClientboundSetDefaultSpawnPosition-80]
-	_ = x[ClientboundSetEquipment-81]
+	_ = x[ClientboundSetDisplayObjective-81]
-	_ = x[ClientboundSetExperience-82]
+	_ = x[ClientboundSetEntityData-82]
-	_ = x[ClientboundSetHealth-83]
+	_ = x[ClientboundSetEntityLink-83]
-	_ = x[ClientboundSetObjective-84]
+	_ = x[ClientboundSetEntityMotion-84]
-	_ = x[ClientboundSetPassengers-85]
+	_ = x[ClientboundSetEquipment-85]
-	_ = x[ClientboundSetPlayerTeam-86]
+	_ = x[ClientboundSetExperience-86]
-	_ = x[ClientboundSetScore-87]
+	_ = x[ClientboundSetHealth-87]
-	_ = x[ClientboundSetSimulationDistance-88]
+	_ = x[ClientboundSetObjective-88]
-	_ = x[ClientboundSetSubtitleText-89]
+	_ = x[ClientboundSetPassengers-89]
-	_ = x[ClientboundSetTime-90]
+	_ = x[ClientboundSetPlayerTeam-90]
-	_ = x[ClientboundSetTitleText-91]
+	_ = x[ClientboundSetScore-91]
-	_ = x[ClientboundSetTitlesAnimation-92]
+	_ = x[ClientboundSetSimulationDistance-92]
-	_ = x[ClientboundSoundEntity-93]
+	_ = x[ClientboundSetSubtitleText-93]
-	_ = x[ClientboundSound-94]
+	_ = x[ClientboundSetTime-94]
-	_ = x[ClientboundStopSound-95]
+	_ = x[ClientboundSetTitleText-95]
-	_ = x[ClientboundSystemChat-96]
+	_ = x[ClientboundSetTitlesAnimation-96]
-	_ = x[ClientboundTabList-97]
+	_ = x[ClientboundSoundEntity-97]
-	_ = x[ClientboundTagQuery-98]
+	_ = x[ClientboundSound-98]
-	_ = x[ClientboundTakeItemEntity-99]
+	_ = x[ClientboundStopSound-99]
-	_ = x[ClientboundTeleportEntity-100]
+	_ = x[ClientboundSystemChat-100]
-	_ = x[ClientboundUpdateAdvancements-101]
+	_ = x[ClientboundTabList-101]
-	_ = x[ClientboundUpdateAttributes-102]
+	_ = x[ClientboundTagQuery-102]
-	_ = x[ClientboundUpdateEnabledFeatures-103]
+	_ = x[ClientboundTakeItemEntity-103]
-	_ = x[ClientboundUpdateMobEffect-104]
+	_ = x[ClientboundTeleportEntity-104]
-	_ = x[ClientboundUpdateRecipes-105]
+	_ = x[ClientboundUpdateAdvancements-105]
-	_ = x[ClientboundUpdateTags-106]
+	_ = x[ClientboundUpdateAttributes-106]
-	_ = x[ClientboundPacketIDGuard-107]
+	_ = x[ClientboundUpdateEnabledFeatures-107]
+	_ = x[ClientboundUpdateMobEffect-108]
+	_ = x[ClientboundUpdateRecipes-109]
+	_ = x[ClientboundUpdateTags-110]
 }
 
-const _ClientboundPacketID_name = "ClientboundAddEntityClientboundAddExperienceOrbClientboundAddPlayerClientboundAnimateClientboundAwardStatsClientboundBlockChangedAckClientboundBlockDestructionClientboundBlockEntityDataClientboundBlockEventClientboundBlockUpdateClientboundBossEventClientboundChangeDifficultyClientboundClearTitlesClientboundCommandSuggestionsClientboundCommandsClientboundContainerCloseClientboundContainerSetContentClientboundContainerSetDataClientboundContainerSetSlotClientboundCooldownClientboundCustomChatCompletionsClientboundCustomPayloadClientboundDeleteChatClientboundDisconnectClientboundDisguisedChatClientboundEntityEventClientboundExplodeClientboundForgetLevelChunkClientboundGameEventClientboundHorseScreenOpenClientboundInitializeBorderClientboundKeepAliveClientboundLevelChunkWithLightClientboundLevelEventClientboundLevelParticlesClientboundLightUpdateClientboundLoginClientboundMapItemDataClientboundMerchantOffersClientboundMoveEntityPosClientboundMoveEntityPosRotClientboundMoveEntityRotClientboundMoveVehicleClientboundOpenBookClientboundOpenScreenClientboundOpenSignEditorClientboundPingClientboundPlaceGhostRecipeClientboundPlayerAbilitiesClientboundPlayerChatClientboundPlayerCombatEndClientboundPlayerCombatEnterClientboundPlayerCombatKillClientboundPlayerInfoRemoveClientboundPlayerInfoUpdateClientboundPlayerLookAtClientboundPlayerPositionClientboundRecipeClientboundRemoveEntitiesClientboundRemoveMobEffectClientboundResourcePackClientboundRespawnClientboundRotateHeadClientboundSectionBlocksUpdateClientboundSelectAdvancementsTabClientboundServerDataClientboundSetActionBarTextClientboundSetBorderCenterClientboundSetBorderLerpSizeClientboundSetBorderSizeClientboundSetBorderWarningDelayClientboundSetBorderWarningDistanceClientboundSetCameraClientboundSetCarriedItemClientboundSetChunkCacheCenterClientboundSetChunkCacheRadiusClientboundSetDefaultSpawnPositionClientboundSetDisplayObjectiveClientboundSetEntityDataClientboundSetEntityLinkClientboundSetEntityMotionClientboundSetEquipmentClientboundSetExperienceClientboundSetHealthClientboundSetObjectiveClientboundSetPassengersClientboundSetPlayerTeamClientboundSetScoreClientboundSetSimulationDistanceClientboundSetSubtitleTextClientboundSetTimeClientboundSetTitleTextClientboundSetTitlesAnimationClientboundSoundEntityClientboundSoundClientboundStopSoundClientboundSystemChatClientboundTabListClientboundTagQueryClientboundTakeItemEntityClientboundTeleportEntityClientboundUpdateAdvancementsClientboundUpdateAttributesClientboundUpdateEnabledFeaturesClientboundUpdateMobEffectClientboundUpdateRecipesClientboundUpdateTagsClientboundPacketIDGuard"
+const _ClientboundPacketID_name = "BundleDelimiterClientboundAddEntityClientboundAddExperienceOrbClientboundAddPlayerClientboundAnimateClientboundAwardStatsClientboundBlockChangedAckClientboundBlockDestructionClientboundBlockEntityDataClientboundBlockEventClientboundBlockUpdateClientboundBossEventClientboundChangeDifficultyClientboundChunksBiomesClientboundClearTitlesClientboundCommandSuggestionsClientboundCommandsClientboundContainerCloseClientboundContainerSetContentClientboundContainerSetDataClientboundContainerSetSlotClientboundCooldownClientboundCustomChatCompletionsClientboundCustomPayloadClientboundDamageEventClientboundDeleteChatClientboundDisconnectClientboundDisguisedChatClientboundEntityEventClientboundExplodeClientboundForgetLevelChunkClientboundGameEventClientboundHorseScreenOpenClientboundHurtAnimationClientboundInitializeBorderClientboundKeepAliveClientboundLevelChunkWithLightClientboundLevelEventClientboundLevelParticlesClientboundLightUpdateClientboundLoginClientboundMapItemDataClientboundMerchantOffersClientboundMoveEntityPosClientboundMoveEntityPosRotClientboundMoveEntityRotClientboundMoveVehicleClientboundOpenBookClientboundOpenScreenClientboundOpenSignEditorClientboundPingClientboundPlaceGhostRecipeClientboundPlayerAbilitiesClientboundPlayerChatClientboundPlayerCombatEndClientboundPlayerCombatEnterClientboundPlayerCombatKillClientboundPlayerInfoRemoveClientboundPlayerInfoUpdateClientboundPlayerLookAtClientboundPlayerPositionClientboundRecipeClientboundRemoveEntitiesClientboundRemoveMobEffectClientboundResourcePackClientboundRespawnClientboundRotateHeadClientboundSectionBlocksUpdateClientboundSelectAdvancementsTabClientboundServerDataClientboundSetActionBarTextClientboundSetBorderCenterClientboundSetBorderLerpSizeClientboundSetBorderSizeClientboundSetBorderWarningDelayClientboundSetBorderWarningDistanceClientboundSetCameraClientboundSetCarriedItemClientboundSetChunkCacheCenterClientboundSetChunkCacheRadiusClientboundSetDefaultSpawnPositionClientboundSetDisplayObjectiveClientboundSetEntityDataClientboundSetEntityLinkClientboundSetEntityMotionClientboundSetEquipmentClientboundSetExperienceClientboundSetHealthClientboundSetObjectiveClientboundSetPassengersClientboundSetPlayerTeamClientboundSetScoreClientboundSetSimulationDistanceClientboundSetSubtitleTextClientboundSetTimeClientboundSetTitleTextClientboundSetTitlesAnimationClientboundSoundEntityClientboundSoundClientboundStopSoundClientboundSystemChatClientboundTabListClientboundTagQueryClientboundTakeItemEntityClientboundTeleportEntityClientboundUpdateAdvancementsClientboundUpdateAttributesClientboundUpdateEnabledFeaturesClientboundUpdateMobEffectClientboundUpdateRecipesClientboundUpdateTags"
 
-var _ClientboundPacketID_index = [...]uint16{0, 20, 47, 67, 85, 106, 132, 159, 185, 206, 228, 248, 275, 297, 326, 345, 370, 400, 427, 454, 473, 505, 529, 550, 571, 595, 617, 635, 662, 682, 708, 735, 755, 785, 806, 831, 853, 869, 891, 916, 940, 967, 991, 1013, 1032, 1053, 1078, 1093, 1120, 1146, 1167, 1193, 1221, 1248, 1275, 1302, 1325, 1350, 1367, 1392, 1418, 1441, 1459, 1480, 1510, 1542, 1563, 1590, 1616, 1644, 1668, 1700, 1735, 1755, 1780, 1810, 1840, 1874, 1904, 1928, 1952, 1978, 2001, 2025, 2045, 2068, 2092, 2116, 2135, 2167, 2193, 2211, 2234, 2263, 2285, 2301, 2321, 2342, 2360, 2379, 2404, 2429, 2458, 2485, 2517, 2543, 2567, 2588, 2612}
+var _ClientboundPacketID_index = [...]uint16{0, 15, 35, 62, 82, 100, 121, 147, 174, 200, 221, 243, 263, 290, 313, 335, 364, 383, 408, 438, 465, 492, 511, 543, 567, 589, 610, 631, 655, 677, 695, 722, 742, 768, 792, 819, 839, 869, 890, 915, 937, 953, 975, 1000, 1024, 1051, 1075, 1097, 1116, 1137, 1162, 1177, 1204, 1230, 1251, 1277, 1305, 1332, 1359, 1386, 1409, 1434, 1451, 1476, 1502, 1525, 1543, 1564, 1594, 1626, 1647, 1674, 1700, 1728, 1752, 1784, 1819, 1839, 1864, 1894, 1924, 1958, 1988, 2012, 2036, 2062, 2085, 2109, 2129, 2152, 2176, 2200, 2219, 2251, 2277, 2295, 2318, 2347, 2369, 2385, 2405, 2426, 2444, 2463, 2488, 2513, 2542, 2569, 2601, 2627, 2651, 2672}
 
 func (i ClientboundPacketID) String() string {
 	if i < 0 || i >= ClientboundPacketID(len(_ClientboundPacketID_index)-1) {

data/packetid/generator/Main.java

@@ -1,29 +1,35 @@
-package me.tnze;
+package pers.tnze.gomc.gen;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.PacketFlow;
 
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+
 public class Main {
 
     public static void main(String[] args) throws Exception {
-        handlePackets(ConnectionProtocol.LOGIN.getPacketsByIds(PacketFlow.CLIENTBOUND));
+        try (FileWriter w = new FileWriter("packet_names.txt")) {
+            handlePackets(w, ConnectionProtocol.LOGIN.getPacketsByIds(PacketFlow.CLIENTBOUND));
             System.out.println();
-        handlePackets(ConnectionProtocol.LOGIN.getPacketsByIds(PacketFlow.SERVERBOUND));
+            handlePackets(w, ConnectionProtocol.LOGIN.getPacketsByIds(PacketFlow.SERVERBOUND));
             System.out.println();
             System.out.println();
-        handlePackets(ConnectionProtocol.STATUS.getPacketsByIds(PacketFlow.CLIENTBOUND));
+            handlePackets(w, ConnectionProtocol.STATUS.getPacketsByIds(PacketFlow.CLIENTBOUND));
             System.out.println();
-        handlePackets(ConnectionProtocol.STATUS.getPacketsByIds(PacketFlow.SERVERBOUND));
+            handlePackets(w, ConnectionProtocol.STATUS.getPacketsByIds(PacketFlow.SERVERBOUND));
             System.out.println();
             System.out.println();
-        handlePackets(ConnectionProtocol.PLAY.getPacketsByIds(PacketFlow.CLIENTBOUND));
+            handlePackets(w, ConnectionProtocol.PLAY.getPacketsByIds(PacketFlow.CLIENTBOUND));
             System.out.println();
-        handlePackets(ConnectionProtocol.PLAY.getPacketsByIds(PacketFlow.SERVERBOUND));
+            handlePackets(w, ConnectionProtocol.PLAY.getPacketsByIds(PacketFlow.SERVERBOUND));
+        }
     }
 
-    private static void handlePackets(Int2ObjectMap<Class<? extends Packet<?>>> packets) {
+    private static void handlePackets(Writer w, Int2ObjectMap<Class<? extends Packet<?>>> packets) throws IOException {
         for (int i = 0; i < packets.size(); i++) {
             Class<? extends Packet<?>> c = packets.get(i);
             String className = c.getSimpleName();
@@ -35,6 +41,8 @@ public class Main {
                     className = superClassName.substring(0, superClassName.length() - "Packet".length()) + className;
             }
             System.out.println(className);
-        }
+            w.write(className + "\n");
+        }
+        w.write('\n');
     }
 }

data/packetid/packetid.go

@@ -37,7 +37,8 @@ const (
 
 // Game Clientbound
 const (
-	ClientboundAddEntity ClientboundPacketID = iota
+	BundleDelimiter ClientboundPacketID = iota
+	ClientboundAddEntity
 	ClientboundAddExperienceOrb
 	ClientboundAddPlayer
 	ClientboundAnimate
@@ -49,6 +50,7 @@ const (
 	ClientboundBlockUpdate
 	ClientboundBossEvent
 	ClientboundChangeDifficulty
+	ClientboundChunksBiomes
 	ClientboundClearTitles
 	ClientboundCommandSuggestions
 	ClientboundCommands
@@ -59,6 +61,7 @@ const (
 	ClientboundCooldown
 	ClientboundCustomChatCompletions
 	ClientboundCustomPayload
+	ClientboundDamageEvent
 	ClientboundDeleteChat
 	ClientboundDisconnect
 	ClientboundDisguisedChat
@@ -67,6 +70,7 @@ const (
 	ClientboundForgetLevelChunk
 	ClientboundGameEvent
 	ClientboundHorseScreenOpen
+	ClientboundHurtAnimation
 	ClientboundInitializeBorder
 	ClientboundKeepAlive
 	ClientboundLevelChunkWithLight
@@ -144,7 +148,6 @@ const (
 	ClientboundUpdateMobEffect
 	ClientboundUpdateRecipes
 	ClientboundUpdateTags
-	ClientboundPacketIDGuard
 )
 
 // Game Serverbound
@@ -155,6 +158,7 @@ const (
 	ServerboundChatAck
 	ServerboundChatCommand
 	ServerboundChat
+	ServerboundChatSessionUpdate
 	ServerboundClientCommand
 	ServerboundClientInformation
 	ServerboundCommandSuggestion
@@ -181,7 +185,6 @@ const (
 	ServerboundPlayerCommand
 	ServerboundPlayerInput
 	ServerboundPong
-	ServerboundChatSessionUpdate
 	ServerboundRecipeBookChangeSettings
 	ServerboundRecipeBookSeenRecipe
 	ServerboundRenameItem
@@ -200,5 +203,4 @@ const (
 	ServerboundTeleportToEntity
 	ServerboundUseItemOn
 	ServerboundUseItem
-	ServerboundPacketIDGuard
 )

data/packetid/serverboundpacketid_string.go

@@ -14,33 +14,33 @@ func _() {
 	_ = x[ServerboundChatAck-3]
 	_ = x[ServerboundChatCommand-4]
 	_ = x[ServerboundChat-5]
-	_ = x[ServerboundClientCommand-6]
+	_ = x[ServerboundChatSessionUpdate-6]
-	_ = x[ServerboundClientInformation-7]
+	_ = x[ServerboundClientCommand-7]
-	_ = x[ServerboundCommandSuggestion-8]
+	_ = x[ServerboundClientInformation-8]
-	_ = x[ServerboundContainerButtonClick-9]
+	_ = x[ServerboundCommandSuggestion-9]
-	_ = x[ServerboundContainerClick-10]
+	_ = x[ServerboundContainerButtonClick-10]
-	_ = x[ServerboundContainerClose-11]
+	_ = x[ServerboundContainerClick-11]
-	_ = x[ServerboundCustomPayload-12]
+	_ = x[ServerboundContainerClose-12]
-	_ = x[ServerboundEditBook-13]
+	_ = x[ServerboundCustomPayload-13]
-	_ = x[ServerboundEntityTagQuery-14]
+	_ = x[ServerboundEditBook-14]
-	_ = x[ServerboundInteract-15]
+	_ = x[ServerboundEntityTagQuery-15]
-	_ = x[ServerboundJigsawGenerate-16]
+	_ = x[ServerboundInteract-16]
-	_ = x[ServerboundKeepAlive-17]
+	_ = x[ServerboundJigsawGenerate-17]
-	_ = x[ServerboundLockDifficulty-18]
+	_ = x[ServerboundKeepAlive-18]
-	_ = x[ServerboundMovePlayerPos-19]
+	_ = x[ServerboundLockDifficulty-19]
-	_ = x[ServerboundMovePlayerPosRot-20]
+	_ = x[ServerboundMovePlayerPos-20]
-	_ = x[ServerboundMovePlayerRot-21]
+	_ = x[ServerboundMovePlayerPosRot-21]
-	_ = x[ServerboundMovePlayerStatusOnly-22]
+	_ = x[ServerboundMovePlayerRot-22]
-	_ = x[ServerboundMoveVehicle-23]
+	_ = x[ServerboundMovePlayerStatusOnly-23]
-	_ = x[ServerboundPaddleBoat-24]
+	_ = x[ServerboundMoveVehicle-24]
-	_ = x[ServerboundPickItem-25]
+	_ = x[ServerboundPaddleBoat-25]
-	_ = x[ServerboundPlaceRecipe-26]
+	_ = x[ServerboundPickItem-26]
-	_ = x[ServerboundPlayerAbilities-27]
+	_ = x[ServerboundPlaceRecipe-27]
-	_ = x[ServerboundPlayerAction-28]
+	_ = x[ServerboundPlayerAbilities-28]
-	_ = x[ServerboundPlayerCommand-29]
+	_ = x[ServerboundPlayerAction-29]
-	_ = x[ServerboundPlayerInput-30]
+	_ = x[ServerboundPlayerCommand-30]
-	_ = x[ServerboundPong-31]
+	_ = x[ServerboundPlayerInput-31]
-	_ = x[ServerboundChatSessionUpdate-32]
+	_ = x[ServerboundPong-32]
 	_ = x[ServerboundRecipeBookChangeSettings-33]
 	_ = x[ServerboundRecipeBookSeenRecipe-34]
 	_ = x[ServerboundRenameItem-35]
@@ -59,12 +59,11 @@ func _() {
 	_ = x[ServerboundTeleportToEntity-48]
 	_ = x[ServerboundUseItemOn-49]
 	_ = x[ServerboundUseItem-50]
-	_ = x[ServerboundPacketIDGuard-51]
 }
 
-const _ServerboundPacketID_name = "ServerboundAcceptTeleportationServerboundBlockEntityTagQueryServerboundChangeDifficultyServerboundChatAckServerboundChatCommandServerboundChatServerboundClientCommandServerboundClientInformationServerboundCommandSuggestionServerboundContainerButtonClickServerboundContainerClickServerboundContainerCloseServerboundCustomPayloadServerboundEditBookServerboundEntityTagQueryServerboundInteractServerboundJigsawGenerateServerboundKeepAliveServerboundLockDifficultyServerboundMovePlayerPosServerboundMovePlayerPosRotServerboundMovePlayerRotServerboundMovePlayerStatusOnlyServerboundMoveVehicleServerboundPaddleBoatServerboundPickItemServerboundPlaceRecipeServerboundPlayerAbilitiesServerboundPlayerActionServerboundPlayerCommandServerboundPlayerInputServerboundPongServerboundChatSessionUpdateServerboundRecipeBookChangeSettingsServerboundRecipeBookSeenRecipeServerboundRenameItemServerboundResourcePackServerboundSeenAdvancementsServerboundSelectTradeServerboundSetBeaconServerboundSetCarriedItemServerboundSetCommandBlockServerboundSetCommandMinecartServerboundSetCreativeModeSlotServerboundSetJigsawBlockServerboundSetStructureBlockServerboundSignUpdateServerboundSwingServerboundTeleportToEntityServerboundUseItemOnServerboundUseItemServerboundPacketIDGuard"
+const _ServerboundPacketID_name = "ServerboundAcceptTeleportationServerboundBlockEntityTagQueryServerboundChangeDifficultyServerboundChatAckServerboundChatCommandServerboundChatServerboundChatSessionUpdateServerboundClientCommandServerboundClientInformationServerboundCommandSuggestionServerboundContainerButtonClickServerboundContainerClickServerboundContainerCloseServerboundCustomPayloadServerboundEditBookServerboundEntityTagQueryServerboundInteractServerboundJigsawGenerateServerboundKeepAliveServerboundLockDifficultyServerboundMovePlayerPosServerboundMovePlayerPosRotServerboundMovePlayerRotServerboundMovePlayerStatusOnlyServerboundMoveVehicleServerboundPaddleBoatServerboundPickItemServerboundPlaceRecipeServerboundPlayerAbilitiesServerboundPlayerActionServerboundPlayerCommandServerboundPlayerInputServerboundPongServerboundRecipeBookChangeSettingsServerboundRecipeBookSeenRecipeServerboundRenameItemServerboundResourcePackServerboundSeenAdvancementsServerboundSelectTradeServerboundSetBeaconServerboundSetCarriedItemServerboundSetCommandBlockServerboundSetCommandMinecartServerboundSetCreativeModeSlotServerboundSetJigsawBlockServerboundSetStructureBlockServerboundSignUpdateServerboundSwingServerboundTeleportToEntityServerboundUseItemOnServerboundUseItem"
 
-var _ServerboundPacketID_index = [...]uint16{0, 30, 60, 87, 105, 127, 142, 166, 194, 222, 253, 278, 303, 327, 346, 371, 390, 415, 435, 460, 484, 511, 535, 566, 588, 609, 628, 650, 676, 699, 723, 745, 760, 788, 823, 854, 875, 898, 925, 947, 967, 992, 1018, 1047, 1077, 1102, 1130, 1151, 1167, 1194, 1214, 1232, 1256}
+var _ServerboundPacketID_index = [...]uint16{0, 30, 60, 87, 105, 127, 142, 170, 194, 222, 250, 281, 306, 331, 355, 374, 399, 418, 443, 463, 488, 512, 539, 563, 594, 616, 637, 656, 678, 704, 727, 751, 773, 788, 823, 854, 875, 898, 925, 947, 967, 992, 1018, 1047, 1077, 1102, 1130, 1151, 1167, 1194, 1214, 1232}
 
 func (i ServerboundPacketID) String() string {
 	if i < 0 || i >= ServerboundPacketID(len(_ServerboundPacketID_index)-1) {

level/block/blockentities.go

@@ -41,6 +41,8 @@ var EntityList = [...]Entity{
 	SculkCatalystEntity{},
 	SculkShriekerEntity{},
 	ChiseledBookshelfEntity{},
+	SuspiciousSandEntity{},
+	DecoratedPotEntity{},
 }
 
 func (FurnaceEntity) ID() string           { return "minecraft:furnace" }
@@ -81,6 +83,8 @@ func (SculkSensorEntity) ID() string       { return "minecraft:sculk_sensor" }
 func (SculkCatalystEntity) ID() string     { return "minecraft:sculk_catalyst" }
 func (SculkShriekerEntity) ID() string     { return "minecraft:sculk_shrieker" }
 func (ChiseledBookshelfEntity) ID() string { return "minecraft:chiseled_bookshelf" }
+func (SuspiciousSandEntity) ID() string    { return "minecraft:suspicious_sand" }
+func (DecoratedPotEntity) ID() string      { return "minecraft:decorated_pot" }
 
 func (f FurnaceEntity) IsValidBlock(block Block) bool {
 	return block.ID() == "minecraft:furnace"
@@ -116,12 +120,14 @@ func (s SignEntity) IsValidBlock(block Block) bool {
 		"minecraft:spruce_sign",
 		"minecraft:birch_sign",
 		"minecraft:acacia_sign",
+		"minecraft:cherry_sign",
 		"minecraft:jungle_sign",
 		"minecraft:dark_oak_sign",
 		"minecraft:oak_wall_sign",
 		"minecraft:spruce_wall_sign",
 		"minecraft:birch_wall_sign",
 		"minecraft:acacia_wall_sign",
+		"minecraft:cherry_wall_sign",
 		"minecraft:jungle_wall_sign",
 		"minecraft:dark_oak_wall_sign",
 		"minecraft:crimson_sign",
@@ -144,6 +150,7 @@ func (h HangingSignEntity) IsValidBlock(block Block) bool {
 		"minecraft:spruce_hanging_sign",
 		"minecraft:birch_hanging_sign",
 		"minecraft:acacia_hanging_sign",
+		"minecraft:cherry_hanging_sign",
 		"minecraft:jungle_hanging_sign",
 		"minecraft:dark_oak_hanging_sign",
 		"minecraft:crimson_hanging_sign",
@@ -154,6 +161,7 @@ func (h HangingSignEntity) IsValidBlock(block Block) bool {
 		"minecraft:spruce_wall_hanging_sign",
 		"minecraft:birch_wall_hanging_sign",
 		"minecraft:acacia_wall_hanging_sign",
+		"minecraft:cherry_wall_hanging_sign",
 		"minecraft:jungle_wall_hanging_sign",
 		"minecraft:dark_oak_wall_hanging_sign",
 		"minecraft:crimson_wall_hanging_sign",
@@ -395,3 +403,11 @@ func (s SculkShriekerEntity) IsValidBlock(block Block) bool {
 func (c ChiseledBookshelfEntity) IsValidBlock(block Block) bool {
 	return block.ID() == "minecraft:chiseled_bookshelf"
 }
+
+func (s SuspiciousSandEntity) IsValidBlock(block Block) bool {
+	return block.ID() == "minecraft:suspicious_sand"
+}
+
+func (d DecoratedPotEntity) IsValidBlock(block Block) bool {
+	return block.ID() == "minecraft:decorated_pot"
+}

level/block/blocks.go

@@ -25,6 +25,7 @@ type (
 	BirchPlanks    struct{}
 	JunglePlanks   struct{}
 	AcaciaPlanks   struct{}
+	CherryPlanks   struct{}
 	DarkOakPlanks  struct{}
 	MangrovePlanks struct{}
 	BambooPlanks   struct{}
@@ -44,6 +45,9 @@ type (
 	AcaciaSapling struct {
 		Stage Integer `nbt:"stage"`
 	}
+	CherrySapling struct {
+		Stage Integer `nbt:"stage"`
+	}
 	DarkOakSapling struct {
 		Stage Integer `nbt:"stage"`
 	}
@@ -61,6 +65,9 @@ type (
 		Level Integer `nbt:"level"`
 	}
 	Sand           struct{}
+	SuspiciousSand struct {
+		Dusted Integer `nbt:"dusted"`
+	}
 	RedSand          struct{}
 	Gravel           struct{}
 	GoldOre          struct{}
@@ -85,6 +92,9 @@ type (
 	AcaciaLog struct {
 		Axis Axis `nbt:"axis"`
 	}
+	CherryLog struct {
+		Axis Axis `nbt:"axis"`
+	}
 	DarkOakLog struct {
 		Axis Axis `nbt:"axis"`
 	}
@@ -112,6 +122,9 @@ type (
 	StrippedAcaciaLog struct {
 		Axis Axis `nbt:"axis"`
 	}
+	StrippedCherryLog struct {
+		Axis Axis `nbt:"axis"`
+	}
 	StrippedDarkOakLog struct {
 		Axis Axis `nbt:"axis"`
 	}
@@ -139,6 +152,9 @@ type (
 	AcaciaWood struct {
 		Axis Axis `nbt:"axis"`
 	}
+	CherryWood struct {
+		Axis Axis `nbt:"axis"`
+	}
 	DarkOakWood struct {
 		Axis Axis `nbt:"axis"`
 	}
@@ -160,6 +176,9 @@ type (
 	StrippedAcaciaWood struct {
 		Axis Axis `nbt:"axis"`
 	}
+	StrippedCherryWood struct {
+		Axis Axis `nbt:"axis"`
+	}
 	StrippedDarkOakWood struct {
 		Axis Axis `nbt:"axis"`
 	}
@@ -191,6 +210,11 @@ type (
 		Persistent  Boolean `nbt:"persistent"`
 		Waterlogged Boolean `nbt:"waterlogged"`
 	}
+	CherryLeaves struct {
+		Distance    Integer `nbt:"distance"`
+		Persistent  Boolean `nbt:"persistent"`
+		Waterlogged Boolean `nbt:"waterlogged"`
+	}
 	DarkOakLeaves struct {
 		Distance    Integer `nbt:"distance"`
 		Persistent  Boolean `nbt:"persistent"`
@@ -361,6 +385,7 @@ type (
 		Type   PistonType `nbt:"type"`
 	}
 	Dandelion       struct{}
+	Torchflower     struct{}
 	Poppy           struct{}
 	BlueOrchid      struct{}
 	Allium          struct{}
@@ -455,6 +480,10 @@ type (
 		Rotation    Integer `nbt:"rotation"`
 		Waterlogged Boolean `nbt:"waterlogged"`
 	}
+	CherrySign struct {
+		Rotation    Integer `nbt:"rotation"`
+		Waterlogged Boolean `nbt:"waterlogged"`
+	}
 	JungleSign struct {
 		Rotation    Integer `nbt:"rotation"`
 		Waterlogged Boolean `nbt:"waterlogged"`
@@ -508,6 +537,10 @@ type (
 		Facing      Direction `nbt:"facing"`
 		Waterlogged Boolean   `nbt:"waterlogged"`
 	}
+	CherryWallSign struct {
+		Facing      Direction `nbt:"facing"`
+		Waterlogged Boolean   `nbt:"waterlogged"`
+	}
 	JungleWallSign struct {
 		Facing      Direction `nbt:"facing"`
 		Waterlogged Boolean   `nbt:"waterlogged"`
@@ -544,6 +577,11 @@ type (
 		Rotation    Integer `nbt:"rotation"`
 		Waterlogged Boolean `nbt:"waterlogged"`
 	}
+	CherryHangingSign struct {
+		Attached    Boolean `nbt:"attached"`
+		Rotation    Integer `nbt:"rotation"`
+		Waterlogged Boolean `nbt:"waterlogged"`
+	}
 	JungleHangingSign struct {
 		Attached    Boolean `nbt:"attached"`
 		Rotation    Integer `nbt:"rotation"`
@@ -590,6 +628,10 @@ type (
 		Facing      Direction `nbt:"facing"`
 		Waterlogged Boolean   `nbt:"waterlogged"`
 	}
+	CherryWallHangingSign struct {
+		Facing      Direction `nbt:"facing"`
+		Waterlogged Boolean   `nbt:"waterlogged"`
+	}
 	JungleWallHangingSign struct {
 		Facing      Direction `nbt:"facing"`
 		Waterlogged Boolean   `nbt:"waterlogged"`
@@ -644,6 +686,9 @@ type (
 	AcaciaPressurePlate struct {
 		Powered Boolean `nbt:"powered"`
 	}
+	CherryPressurePlate struct {
+		Powered Boolean `nbt:"powered"`
+	}
 	DarkOakPressurePlate struct {
 		Powered Boolean `nbt:"powered"`
 	}
@@ -777,6 +822,13 @@ type (
 		Powered     Boolean   `nbt:"powered"`
 		Waterlogged Boolean   `nbt:"waterlogged"`
 	}
+	CherryTrapdoor struct {
+		Facing      Direction `nbt:"facing"`
+		Half        Half      `nbt:"half"`
+		Open        Boolean   `nbt:"open"`
+		Powered     Boolean   `nbt:"powered"`
+		Waterlogged Boolean   `nbt:"waterlogged"`
+	}
 	DarkOakTrapdoor struct {
 		Facing      Direction `nbt:"facing"`
 		Half        Half      `nbt:"half"`
@@ -1021,11 +1073,13 @@ type (
 		West        WallSide `nbt:"west"`
 	}
 	FlowerPot               struct{}
+	PottedTorchflower       struct{}
 	PottedOakSapling        struct{}
 	PottedSpruceSapling     struct{}
 	PottedBirchSapling      struct{}
 	PottedJungleSapling     struct{}
 	PottedAcaciaSapling     struct{}
+	PottedCherrySapling     struct{}
 	PottedDarkOakSapling    struct{}
 	PottedMangrovePropagule struct{}
 	PottedFern              struct{}
@@ -1077,6 +1131,11 @@ type (
 		Facing  Direction  `nbt:"facing"`
 		Powered Boolean    `nbt:"powered"`
 	}
+	CherryButton struct {
+		Face    AttachFace `nbt:"face"`
+		Facing  Direction  `nbt:"facing"`
+		Powered Boolean    `nbt:"powered"`
+	}
 	DarkOakButton struct {
 		Face    AttachFace `nbt:"face"`
 		Facing  Direction  `nbt:"facing"`
@@ -1323,6 +1382,12 @@ type (
 		Shape       StairsShape `nbt:"shape"`
 		Waterlogged Boolean     `nbt:"waterlogged"`
 	}
+	CherryStairs struct {
+		Facing      Direction   `nbt:"facing"`
+		Half        Half        `nbt:"half"`
+		Shape       StairsShape `nbt:"shape"`
+		Waterlogged Boolean     `nbt:"waterlogged"`
+	}
 	DarkOakStairs struct {
 		Facing      Direction   `nbt:"facing"`
 		Half        Half        `nbt:"half"`
@@ -1559,6 +1624,10 @@ type (
 		Type        SlabType `nbt:"type"`
 		Waterlogged Boolean  `nbt:"waterlogged"`
 	}
+	CherrySlab struct {
+		Type        SlabType `nbt:"type"`
+		Waterlogged Boolean  `nbt:"waterlogged"`
+	}
 	DarkOakSlab struct {
 		Type        SlabType `nbt:"type"`
 		Waterlogged Boolean  `nbt:"waterlogged"`
@@ -1659,6 +1728,12 @@ type (
 		Open    Boolean   `nbt:"open"`
 		Powered Boolean   `nbt:"powered"`
 	}
+	CherryFenceGate struct {
+		Facing  Direction `nbt:"facing"`
+		In_wall Boolean   `nbt:"in_wall"`
+		Open    Boolean   `nbt:"open"`
+		Powered Boolean   `nbt:"powered"`
+	}
 	DarkOakFenceGate struct {
 		Facing  Direction `nbt:"facing"`
 		In_wall Boolean   `nbt:"in_wall"`
@@ -1705,6 +1780,13 @@ type (
 		Waterlogged Boolean `nbt:"waterlogged"`
 		West        Boolean `nbt:"west"`
 	}
+	CherryFence struct {
+		East        Boolean `nbt:"east"`
+		North       Boolean `nbt:"north"`
+		South       Boolean `nbt:"south"`
+		Waterlogged Boolean `nbt:"waterlogged"`
+		West        Boolean `nbt:"west"`
+	}
 	DarkOakFence struct {
 		East        Boolean `nbt:"east"`
 		North       Boolean `nbt:"north"`
@@ -1754,6 +1836,13 @@ type (
 		Open    Boolean         `nbt:"open"`
 		Powered Boolean         `nbt:"powered"`
 	}
+	CherryDoor struct {
+		Facing  Direction       `nbt:"facing"`
+		Half    DoubleBlockHalf `nbt:"half"`
+		Hinge   DoorHingeSide   `nbt:"hinge"`
+		Open    Boolean         `nbt:"open"`
+		Powered Boolean         `nbt:"powered"`
+	}
 	DarkOakDoor struct {
 		Facing  Direction       `nbt:"facing"`
 		Half    DoubleBlockHalf `nbt:"half"`
@@ -1800,6 +1889,9 @@ type (
 		Waterlogged Boolean     `nbt:"waterlogged"`
 	}
 	EndStoneBricks  struct{}
+	TorchflowerCrop struct {
+		Age Integer `nbt:"age"`
+	}
 	Beetroots struct {
 		Age Integer `nbt:"age"`
 	}
@@ -2954,6 +3046,10 @@ type (
 	Azalea          struct{}
 	FloweringAzalea struct{}
 	MossCarpet      struct{}
+	PinkPetals      struct {
+		Facing        Direction `nbt:"facing"`
+		Flower_amount Integer   `nbt:"flower_amount"`
+	}
 	MossBlock   struct{}
 	BigDripleaf struct {
 		Facing      Direction `nbt:"facing"`
@@ -3076,6 +3172,10 @@ type (
 	}
 	Frogspawn           struct{}
 	ReinforcedDeepslate struct{}
+	DecoratedPot        struct {
+		Facing      Direction `nbt:"facing"`
+		Waterlogged Boolean   `nbt:"waterlogged"`
+	}
 )
 
 func (Air) ID() string                         { return "minecraft:air" }
@@ -3096,6 +3196,7 @@ func (SprucePlanks) ID() string                { return "minecraft:spruce_planks
 func (BirchPlanks) ID() string                 { return "minecraft:birch_planks" }
 func (JunglePlanks) ID() string                { return "minecraft:jungle_planks" }
 func (AcaciaPlanks) ID() string                { return "minecraft:acacia_planks" }
+func (CherryPlanks) ID() string                { return "minecraft:cherry_planks" }
 func (DarkOakPlanks) ID() string               { return "minecraft:dark_oak_planks" }
 func (MangrovePlanks) ID() string              { return "minecraft:mangrove_planks" }
 func (BambooPlanks) ID() string                { return "minecraft:bamboo_planks" }
@@ -3105,12 +3206,14 @@ func (SpruceSapling) ID() string               { return "minecraft:spruce_saplin
 func (BirchSapling) ID() string                { return "minecraft:birch_sapling" }
 func (JungleSapling) ID() string               { return "minecraft:jungle_sapling" }
 func (AcaciaSapling) ID() string               { return "minecraft:acacia_sapling" }
+func (CherrySapling) ID() string               { return "minecraft:cherry_sapling" }
 func (DarkOakSapling) ID() string              { return "minecraft:dark_oak_sapling" }
 func (MangrovePropagule) ID() string           { return "minecraft:mangrove_propagule" }
 func (Bedrock) ID() string                     { return "minecraft:bedrock" }
 func (Water) ID() string                       { return "minecraft:water" }
 func (Lava) ID() string                        { return "minecraft:lava" }
 func (Sand) ID() string                        { return "minecraft:sand" }
+func (SuspiciousSand) ID() string              { return "minecraft:suspicious_sand" }
 func (RedSand) ID() string                     { return "minecraft:red_sand" }
 func (Gravel) ID() string                      { return "minecraft:gravel" }
 func (GoldOre) ID() string                     { return "minecraft:gold_ore" }
@@ -3125,6 +3228,7 @@ func (SpruceLog) ID() string                   { return "minecraft:spruce_log" }
 func (BirchLog) ID() string                    { return "minecraft:birch_log" }
 func (JungleLog) ID() string                   { return "minecraft:jungle_log" }
 func (AcaciaLog) ID() string                   { return "minecraft:acacia_log" }
+func (CherryLog) ID() string                   { return "minecraft:cherry_log" }
 func (DarkOakLog) ID() string                  { return "minecraft:dark_oak_log" }
 func (MangroveLog) ID() string                 { return "minecraft:mangrove_log" }
 func (MangroveRoots) ID() string               { return "minecraft:mangrove_roots" }
@@ -3134,6 +3238,7 @@ func (StrippedSpruceLog) ID() string           { return "minecraft:stripped_spru
 func (StrippedBirchLog) ID() string            { return "minecraft:stripped_birch_log" }
 func (StrippedJungleLog) ID() string           { return "minecraft:stripped_jungle_log" }
 func (StrippedAcaciaLog) ID() string           { return "minecraft:stripped_acacia_log" }
+func (StrippedCherryLog) ID() string           { return "minecraft:stripped_cherry_log" }
 func (StrippedDarkOakLog) ID() string          { return "minecraft:stripped_dark_oak_log" }
 func (StrippedOakLog) ID() string              { return "minecraft:stripped_oak_log" }
 func (StrippedMangroveLog) ID() string         { return "minecraft:stripped_mangrove_log" }
@@ -3143,6 +3248,7 @@ func (SpruceWood) ID() string                  { return "minecraft:spruce_wood"
 func (BirchWood) ID() string                   { return "minecraft:birch_wood" }
 func (JungleWood) ID() string                  { return "minecraft:jungle_wood" }
 func (AcaciaWood) ID() string                  { return "minecraft:acacia_wood" }
+func (CherryWood) ID() string                  { return "minecraft:cherry_wood" }
 func (DarkOakWood) ID() string                 { return "minecraft:dark_oak_wood" }
 func (MangroveWood) ID() string                { return "minecraft:mangrove_wood" }
 func (StrippedOakWood) ID() string             { return "minecraft:stripped_oak_wood" }
@@ -3150,6 +3256,7 @@ func (StrippedSpruceWood) ID() string          { return "minecraft:stripped_spru
 func (StrippedBirchWood) ID() string           { return "minecraft:stripped_birch_wood" }
 func (StrippedJungleWood) ID() string          { return "minecraft:stripped_jungle_wood" }
 func (StrippedAcaciaWood) ID() string          { return "minecraft:stripped_acacia_wood" }
+func (StrippedCherryWood) ID() string          { return "minecraft:stripped_cherry_wood" }
 func (StrippedDarkOakWood) ID() string         { return "minecraft:stripped_dark_oak_wood" }
 func (StrippedMangroveWood) ID() string        { return "minecraft:stripped_mangrove_wood" }
 func (OakLeaves) ID() string                   { return "minecraft:oak_leaves" }
@@ -3157,6 +3264,7 @@ func (SpruceLeaves) ID() string                { return "minecraft:spruce_leaves
 func (BirchLeaves) ID() string                 { return "minecraft:birch_leaves" }
 func (JungleLeaves) ID() string                { return "minecraft:jungle_leaves" }
 func (AcaciaLeaves) ID() string                { return "minecraft:acacia_leaves" }
+func (CherryLeaves) ID() string                { return "minecraft:cherry_leaves" }
 func (DarkOakLeaves) ID() string               { return "minecraft:dark_oak_leaves" }
 func (MangroveLeaves) ID() string              { return "minecraft:mangrove_leaves" }
 func (AzaleaLeaves) ID() string                { return "minecraft:azalea_leaves" }
@@ -3217,6 +3325,7 @@ func (RedWool) ID() string                     { return "minecraft:red_wool" }
 func (BlackWool) ID() string                   { return "minecraft:black_wool" }
 func (MovingPiston) ID() string                { return "minecraft:moving_piston" }
 func (Dandelion) ID() string                   { return "minecraft:dandelion" }
+func (Torchflower) ID() string                 { return "minecraft:torchflower" }
 func (Poppy) ID() string                       { return "minecraft:poppy" }
 func (BlueOrchid) ID() string                  { return "minecraft:blue_orchid" }
 func (Allium) ID() string                      { return "minecraft:allium" }
@@ -3258,6 +3367,7 @@ func (OakSign) ID() string                     { return "minecraft:oak_sign" }
 func (SpruceSign) ID() string                  { return "minecraft:spruce_sign" }
 func (BirchSign) ID() string                   { return "minecraft:birch_sign" }
 func (AcaciaSign) ID() string                  { return "minecraft:acacia_sign" }
+func (CherrySign) ID() string                  { return "minecraft:cherry_sign" }
 func (JungleSign) ID() string                  { return "minecraft:jungle_sign" }
 func (DarkOakSign) ID() string                 { return "minecraft:dark_oak_sign" }
 func (MangroveSign) ID() string                { return "minecraft:mangrove_sign" }
@@ -3270,6 +3380,7 @@ func (OakWallSign) ID() string                 { return "minecraft:oak_wall_sign
 func (SpruceWallSign) ID() string              { return "minecraft:spruce_wall_sign" }
 func (BirchWallSign) ID() string               { return "minecraft:birch_wall_sign" }
 func (AcaciaWallSign) ID() string              { return "minecraft:acacia_wall_sign" }
+func (CherryWallSign) ID() string              { return "minecraft:cherry_wall_sign" }
 func (JungleWallSign) ID() string              { return "minecraft:jungle_wall_sign" }
 func (DarkOakWallSign) ID() string             { return "minecraft:dark_oak_wall_sign" }
 func (MangroveWallSign) ID() string            { return "minecraft:mangrove_wall_sign" }
@@ -3278,6 +3389,7 @@ func (OakHangingSign) ID() string              { return "minecraft:oak_hanging_s
 func (SpruceHangingSign) ID() string           { return "minecraft:spruce_hanging_sign" }
 func (BirchHangingSign) ID() string            { return "minecraft:birch_hanging_sign" }
 func (AcaciaHangingSign) ID() string           { return "minecraft:acacia_hanging_sign" }
+func (CherryHangingSign) ID() string           { return "minecraft:cherry_hanging_sign" }
 func (JungleHangingSign) ID() string           { return "minecraft:jungle_hanging_sign" }
 func (DarkOakHangingSign) ID() string          { return "minecraft:dark_oak_hanging_sign" }
 func (CrimsonHangingSign) ID() string          { return "minecraft:crimson_hanging_sign" }
@@ -3288,6 +3400,7 @@ func (OakWallHangingSign) ID() string          { return "minecraft:oak_wall_hang
 func (SpruceWallHangingSign) ID() string       { return "minecraft:spruce_wall_hanging_sign" }
 func (BirchWallHangingSign) ID() string        { return "minecraft:birch_wall_hanging_sign" }
 func (AcaciaWallHangingSign) ID() string       { return "minecraft:acacia_wall_hanging_sign" }
+func (CherryWallHangingSign) ID() string       { return "minecraft:cherry_wall_hanging_sign" }
 func (JungleWallHangingSign) ID() string       { return "minecraft:jungle_wall_hanging_sign" }
 func (DarkOakWallHangingSign) ID() string      { return "minecraft:dark_oak_wall_hanging_sign" }
 func (MangroveWallHangingSign) ID() string     { return "minecraft:mangrove_wall_hanging_sign" }
@@ -3302,6 +3415,7 @@ func (SprucePressurePlate) ID() string         { return "minecraft:spruce_pressu
 func (BirchPressurePlate) ID() string          { return "minecraft:birch_pressure_plate" }
 func (JunglePressurePlate) ID() string         { return "minecraft:jungle_pressure_plate" }
 func (AcaciaPressurePlate) ID() string         { return "minecraft:acacia_pressure_plate" }
+func (CherryPressurePlate) ID() string         { return "minecraft:cherry_pressure_plate" }
 func (DarkOakPressurePlate) ID() string        { return "minecraft:dark_oak_pressure_plate" }
 func (MangrovePressurePlate) ID() string       { return "minecraft:mangrove_pressure_plate" }
 func (BambooPressurePlate) ID() string         { return "minecraft:bamboo_pressure_plate" }
@@ -3353,6 +3467,7 @@ func (SpruceTrapdoor) ID() string              { return "minecraft:spruce_trapdo
 func (BirchTrapdoor) ID() string               { return "minecraft:birch_trapdoor" }
 func (JungleTrapdoor) ID() string              { return "minecraft:jungle_trapdoor" }
 func (AcaciaTrapdoor) ID() string              { return "minecraft:acacia_trapdoor" }
+func (CherryTrapdoor) ID() string              { return "minecraft:cherry_trapdoor" }
 func (DarkOakTrapdoor) ID() string             { return "minecraft:dark_oak_trapdoor" }
 func (MangroveTrapdoor) ID() string            { return "minecraft:mangrove_trapdoor" }
 func (BambooTrapdoor) ID() string              { return "minecraft:bamboo_trapdoor" }
@@ -3418,11 +3533,13 @@ func (Beacon) ID() string                      { return "minecraft:beacon" }
 func (CobblestoneWall) ID() string             { return "minecraft:cobblestone_wall" }
 func (MossyCobblestoneWall) ID() string        { return "minecraft:mossy_cobblestone_wall" }
 func (FlowerPot) ID() string                   { return "minecraft:flower_pot" }
+func (PottedTorchflower) ID() string           { return "minecraft:potted_torchflower" }
 func (PottedOakSapling) ID() string            { return "minecraft:potted_oak_sapling" }
 func (PottedSpruceSapling) ID() string         { return "minecraft:potted_spruce_sapling" }
 func (PottedBirchSapling) ID() string          { return "minecraft:potted_birch_sapling" }
 func (PottedJungleSapling) ID() string         { return "minecraft:potted_jungle_sapling" }
 func (PottedAcaciaSapling) ID() string         { return "minecraft:potted_acacia_sapling" }
+func (PottedCherrySapling) ID() string         { return "minecraft:potted_cherry_sapling" }
 func (PottedDarkOakSapling) ID() string        { return "minecraft:potted_dark_oak_sapling" }
 func (PottedMangrovePropagule) ID() string     { return "minecraft:potted_mangrove_propagule" }
 func (PottedFern) ID() string                  { return "minecraft:potted_fern" }
@@ -3450,6 +3567,7 @@ func (SpruceButton) ID() string                { return "minecraft:spruce_button
 func (BirchButton) ID() string                 { return "minecraft:birch_button" }
 func (JungleButton) ID() string                { return "minecraft:jungle_button" }
 func (AcaciaButton) ID() string                { return "minecraft:acacia_button" }
+func (CherryButton) ID() string                { return "minecraft:cherry_button" }
 func (DarkOakButton) ID() string               { return "minecraft:dark_oak_button" }
 func (MangroveButton) ID() string              { return "minecraft:mangrove_button" }
 func (BambooButton) ID() string                { return "minecraft:bamboo_button" }
@@ -3517,6 +3635,7 @@ func (GreenStainedGlassPane) ID() string       { return "minecraft:green_stained
 func (RedStainedGlassPane) ID() string         { return "minecraft:red_stained_glass_pane" }
 func (BlackStainedGlassPane) ID() string       { return "minecraft:black_stained_glass_pane" }
 func (AcaciaStairs) ID() string                { return "minecraft:acacia_stairs" }
+func (CherryStairs) ID() string                { return "minecraft:cherry_stairs" }
 func (DarkOakStairs) ID() string               { return "minecraft:dark_oak_stairs" }
 func (MangroveStairs) ID() string              { return "minecraft:mangrove_stairs" }
 func (BambooStairs) ID() string                { return "minecraft:bamboo_stairs" }
@@ -3602,6 +3721,7 @@ func (SpruceSlab) ID() string                  { return "minecraft:spruce_slab"
 func (BirchSlab) ID() string                   { return "minecraft:birch_slab" }
 func (JungleSlab) ID() string                  { return "minecraft:jungle_slab" }
 func (AcaciaSlab) ID() string                  { return "minecraft:acacia_slab" }
+func (CherrySlab) ID() string                  { return "minecraft:cherry_slab" }
 func (DarkOakSlab) ID() string                 { return "minecraft:dark_oak_slab" }
 func (MangroveSlab) ID() string                { return "minecraft:mangrove_slab" }
 func (BambooSlab) ID() string                  { return "minecraft:bamboo_slab" }
@@ -3628,6 +3748,7 @@ func (SpruceFenceGate) ID() string             { return "minecraft:spruce_fence_
 func (BirchFenceGate) ID() string              { return "minecraft:birch_fence_gate" }
 func (JungleFenceGate) ID() string             { return "minecraft:jungle_fence_gate" }
 func (AcaciaFenceGate) ID() string             { return "minecraft:acacia_fence_gate" }
+func (CherryFenceGate) ID() string             { return "minecraft:cherry_fence_gate" }
 func (DarkOakFenceGate) ID() string            { return "minecraft:dark_oak_fence_gate" }
 func (MangroveFenceGate) ID() string           { return "minecraft:mangrove_fence_gate" }
 func (BambooFenceGate) ID() string             { return "minecraft:bamboo_fence_gate" }
@@ -3635,6 +3756,7 @@ func (SpruceFence) ID() string                 { return "minecraft:spruce_fence"
 func (BirchFence) ID() string                  { return "minecraft:birch_fence" }
 func (JungleFence) ID() string                 { return "minecraft:jungle_fence" }
 func (AcaciaFence) ID() string                 { return "minecraft:acacia_fence" }
+func (CherryFence) ID() string                 { return "minecraft:cherry_fence" }
 func (DarkOakFence) ID() string                { return "minecraft:dark_oak_fence" }
 func (MangroveFence) ID() string               { return "minecraft:mangrove_fence" }
 func (BambooFence) ID() string                 { return "minecraft:bamboo_fence" }
@@ -3642,6 +3764,7 @@ func (SpruceDoor) ID() string                  { return "minecraft:spruce_door"
 func (BirchDoor) ID() string                   { return "minecraft:birch_door" }
 func (JungleDoor) ID() string                  { return "minecraft:jungle_door" }
 func (AcaciaDoor) ID() string                  { return "minecraft:acacia_door" }
+func (CherryDoor) ID() string                  { return "minecraft:cherry_door" }
 func (DarkOakDoor) ID() string                 { return "minecraft:dark_oak_door" }
 func (MangroveDoor) ID() string                { return "minecraft:mangrove_door" }
 func (BambooDoor) ID() string                  { return "minecraft:bamboo_door" }
@@ -3652,6 +3775,7 @@ func (PurpurBlock) ID() string                 { return "minecraft:purpur_block"
 func (PurpurPillar) ID() string                { return "minecraft:purpur_pillar" }
 func (PurpurStairs) ID() string                { return "minecraft:purpur_stairs" }
 func (EndStoneBricks) ID() string              { return "minecraft:end_stone_bricks" }
+func (TorchflowerCrop) ID() string             { return "minecraft:torchflower_crop" }
 func (Beetroots) ID() string                   { return "minecraft:beetroots" }
 func (DirtPath) ID() string                    { return "minecraft:dirt_path" }
 func (EndGateway) ID() string                  { return "minecraft:end_gateway" }
@@ -4017,6 +4141,7 @@ func (SporeBlossom) ID() string                { return "minecraft:spore_blossom
 func (Azalea) ID() string                      { return "minecraft:azalea" }
 func (FloweringAzalea) ID() string             { return "minecraft:flowering_azalea" }
 func (MossCarpet) ID() string                  { return "minecraft:moss_carpet" }
+func (PinkPetals) ID() string                  { return "minecraft:pink_petals" }
 func (MossBlock) ID() string                   { return "minecraft:moss_block" }
 func (BigDripleaf) ID() string                 { return "minecraft:big_dripleaf" }
 func (BigDripleafStem) ID() string             { return "minecraft:big_dripleaf_stem" }
@@ -4056,6 +4181,7 @@ func (VerdantFroglight) ID() string            { return "minecraft:verdant_frogl
 func (PearlescentFroglight) ID() string        { return "minecraft:pearlescent_froglight" }
 func (Frogspawn) ID() string                   { return "minecraft:frogspawn" }
 func (ReinforcedDeepslate) ID() string         { return "minecraft:reinforced_deepslate" }
+func (DecoratedPot) ID() string                { return "minecraft:decorated_pot" }
 
 var FromID = map[string]Block{
 	"minecraft:air":                                Air{},
@@ -4076,6 +4202,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_planks":                       BirchPlanks{},
 	"minecraft:jungle_planks":                      JunglePlanks{},
 	"minecraft:acacia_planks":                      AcaciaPlanks{},
+	"minecraft:cherry_planks":                      CherryPlanks{},
 	"minecraft:dark_oak_planks":                    DarkOakPlanks{},
 	"minecraft:mangrove_planks":                    MangrovePlanks{},
 	"minecraft:bamboo_planks":                      BambooPlanks{},
@@ -4085,12 +4212,14 @@ var FromID = map[string]Block{
 	"minecraft:birch_sapling":                      BirchSapling{},
 	"minecraft:jungle_sapling":                     JungleSapling{},
 	"minecraft:acacia_sapling":                     AcaciaSapling{},
+	"minecraft:cherry_sapling":                     CherrySapling{},
 	"minecraft:dark_oak_sapling":                   DarkOakSapling{},
 	"minecraft:mangrove_propagule":                 MangrovePropagule{},
 	"minecraft:bedrock":                            Bedrock{},
 	"minecraft:water":                              Water{},
 	"minecraft:lava":                               Lava{},
 	"minecraft:sand":                               Sand{},
+	"minecraft:suspicious_sand":                    SuspiciousSand{},
 	"minecraft:red_sand":                           RedSand{},
 	"minecraft:gravel":                             Gravel{},
 	"minecraft:gold_ore":                           GoldOre{},
@@ -4105,6 +4234,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_log":                          BirchLog{},
 	"minecraft:jungle_log":                         JungleLog{},
 	"minecraft:acacia_log":                         AcaciaLog{},
+	"minecraft:cherry_log":                         CherryLog{},
 	"minecraft:dark_oak_log":                       DarkOakLog{},
 	"minecraft:mangrove_log":                       MangroveLog{},
 	"minecraft:mangrove_roots":                     MangroveRoots{},
@@ -4114,6 +4244,7 @@ var FromID = map[string]Block{
 	"minecraft:stripped_birch_log":                 StrippedBirchLog{},
 	"minecraft:stripped_jungle_log":                StrippedJungleLog{},
 	"minecraft:stripped_acacia_log":                StrippedAcaciaLog{},
+	"minecraft:stripped_cherry_log":                StrippedCherryLog{},
 	"minecraft:stripped_dark_oak_log":              StrippedDarkOakLog{},
 	"minecraft:stripped_oak_log":                   StrippedOakLog{},
 	"minecraft:stripped_mangrove_log":              StrippedMangroveLog{},
@@ -4123,6 +4254,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_wood":                         BirchWood{},
 	"minecraft:jungle_wood":                        JungleWood{},
 	"minecraft:acacia_wood":                        AcaciaWood{},
+	"minecraft:cherry_wood":                        CherryWood{},
 	"minecraft:dark_oak_wood":                      DarkOakWood{},
 	"minecraft:mangrove_wood":                      MangroveWood{},
 	"minecraft:stripped_oak_wood":                  StrippedOakWood{},
@@ -4130,6 +4262,7 @@ var FromID = map[string]Block{
 	"minecraft:stripped_birch_wood":                StrippedBirchWood{},
 	"minecraft:stripped_jungle_wood":               StrippedJungleWood{},
 	"minecraft:stripped_acacia_wood":               StrippedAcaciaWood{},
+	"minecraft:stripped_cherry_wood":               StrippedCherryWood{},
 	"minecraft:stripped_dark_oak_wood":             StrippedDarkOakWood{},
 	"minecraft:stripped_mangrove_wood":             StrippedMangroveWood{},
 	"minecraft:oak_leaves":                         OakLeaves{},
@@ -4137,6 +4270,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_leaves":                       BirchLeaves{},
 	"minecraft:jungle_leaves":                      JungleLeaves{},
 	"minecraft:acacia_leaves":                      AcaciaLeaves{},
+	"minecraft:cherry_leaves":                      CherryLeaves{},
 	"minecraft:dark_oak_leaves":                    DarkOakLeaves{},
 	"minecraft:mangrove_leaves":                    MangroveLeaves{},
 	"minecraft:azalea_leaves":                      AzaleaLeaves{},
@@ -4197,6 +4331,7 @@ var FromID = map[string]Block{
 	"minecraft:black_wool":                         BlackWool{},
 	"minecraft:moving_piston":                      MovingPiston{},
 	"minecraft:dandelion":                          Dandelion{},
+	"minecraft:torchflower":                        Torchflower{},
 	"minecraft:poppy":                              Poppy{},
 	"minecraft:blue_orchid":                        BlueOrchid{},
 	"minecraft:allium":                             Allium{},
@@ -4238,6 +4373,7 @@ var FromID = map[string]Block{
 	"minecraft:spruce_sign":                        SpruceSign{},
 	"minecraft:birch_sign":                         BirchSign{},
 	"minecraft:acacia_sign":                        AcaciaSign{},
+	"minecraft:cherry_sign":                        CherrySign{},
 	"minecraft:jungle_sign":                        JungleSign{},
 	"minecraft:dark_oak_sign":                      DarkOakSign{},
 	"minecraft:mangrove_sign":                      MangroveSign{},
@@ -4250,6 +4386,7 @@ var FromID = map[string]Block{
 	"minecraft:spruce_wall_sign":                   SpruceWallSign{},
 	"minecraft:birch_wall_sign":                    BirchWallSign{},
 	"minecraft:acacia_wall_sign":                   AcaciaWallSign{},
+	"minecraft:cherry_wall_sign":                   CherryWallSign{},
 	"minecraft:jungle_wall_sign":                   JungleWallSign{},
 	"minecraft:dark_oak_wall_sign":                 DarkOakWallSign{},
 	"minecraft:mangrove_wall_sign":                 MangroveWallSign{},
@@ -4258,6 +4395,7 @@ var FromID = map[string]Block{
 	"minecraft:spruce_hanging_sign":                SpruceHangingSign{},
 	"minecraft:birch_hanging_sign":                 BirchHangingSign{},
 	"minecraft:acacia_hanging_sign":                AcaciaHangingSign{},
+	"minecraft:cherry_hanging_sign":                CherryHangingSign{},
 	"minecraft:jungle_hanging_sign":                JungleHangingSign{},
 	"minecraft:dark_oak_hanging_sign":              DarkOakHangingSign{},
 	"minecraft:crimson_hanging_sign":               CrimsonHangingSign{},
@@ -4268,6 +4406,7 @@ var FromID = map[string]Block{
 	"minecraft:spruce_wall_hanging_sign":           SpruceWallHangingSign{},
 	"minecraft:birch_wall_hanging_sign":            BirchWallHangingSign{},
 	"minecraft:acacia_wall_hanging_sign":           AcaciaWallHangingSign{},
+	"minecraft:cherry_wall_hanging_sign":           CherryWallHangingSign{},
 	"minecraft:jungle_wall_hanging_sign":           JungleWallHangingSign{},
 	"minecraft:dark_oak_wall_hanging_sign":         DarkOakWallHangingSign{},
 	"minecraft:mangrove_wall_hanging_sign":         MangroveWallHangingSign{},
@@ -4282,6 +4421,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_pressure_plate":               BirchPressurePlate{},
 	"minecraft:jungle_pressure_plate":              JunglePressurePlate{},
 	"minecraft:acacia_pressure_plate":              AcaciaPressurePlate{},
+	"minecraft:cherry_pressure_plate":              CherryPressurePlate{},
 	"minecraft:dark_oak_pressure_plate":            DarkOakPressurePlate{},
 	"minecraft:mangrove_pressure_plate":            MangrovePressurePlate{},
 	"minecraft:bamboo_pressure_plate":              BambooPressurePlate{},
@@ -4333,6 +4473,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_trapdoor":                     BirchTrapdoor{},
 	"minecraft:jungle_trapdoor":                    JungleTrapdoor{},
 	"minecraft:acacia_trapdoor":                    AcaciaTrapdoor{},
+	"minecraft:cherry_trapdoor":                    CherryTrapdoor{},
 	"minecraft:dark_oak_trapdoor":                  DarkOakTrapdoor{},
 	"minecraft:mangrove_trapdoor":                  MangroveTrapdoor{},
 	"minecraft:bamboo_trapdoor":                    BambooTrapdoor{},
@@ -4398,11 +4539,13 @@ var FromID = map[string]Block{
 	"minecraft:cobblestone_wall":                   CobblestoneWall{},
 	"minecraft:mossy_cobblestone_wall":             MossyCobblestoneWall{},
 	"minecraft:flower_pot":                         FlowerPot{},
+	"minecraft:potted_torchflower":                 PottedTorchflower{},
 	"minecraft:potted_oak_sapling":                 PottedOakSapling{},
 	"minecraft:potted_spruce_sapling":              PottedSpruceSapling{},
 	"minecraft:potted_birch_sapling":               PottedBirchSapling{},
 	"minecraft:potted_jungle_sapling":              PottedJungleSapling{},
 	"minecraft:potted_acacia_sapling":              PottedAcaciaSapling{},
+	"minecraft:potted_cherry_sapling":              PottedCherrySapling{},
 	"minecraft:potted_dark_oak_sapling":            PottedDarkOakSapling{},
 	"minecraft:potted_mangrove_propagule":          PottedMangrovePropagule{},
 	"minecraft:potted_fern":                        PottedFern{},
@@ -4430,6 +4573,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_button":                       BirchButton{},
 	"minecraft:jungle_button":                      JungleButton{},
 	"minecraft:acacia_button":                      AcaciaButton{},
+	"minecraft:cherry_button":                      CherryButton{},
 	"minecraft:dark_oak_button":                    DarkOakButton{},
 	"minecraft:mangrove_button":                    MangroveButton{},
 	"minecraft:bamboo_button":                      BambooButton{},
@@ -4497,6 +4641,7 @@ var FromID = map[string]Block{
 	"minecraft:red_stained_glass_pane":             RedStainedGlassPane{},
 	"minecraft:black_stained_glass_pane":           BlackStainedGlassPane{},
 	"minecraft:acacia_stairs":                      AcaciaStairs{},
+	"minecraft:cherry_stairs":                      CherryStairs{},
 	"minecraft:dark_oak_stairs":                    DarkOakStairs{},
 	"minecraft:mangrove_stairs":                    MangroveStairs{},
 	"minecraft:bamboo_stairs":                      BambooStairs{},
@@ -4582,6 +4727,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_slab":                         BirchSlab{},
 	"minecraft:jungle_slab":                        JungleSlab{},
 	"minecraft:acacia_slab":                        AcaciaSlab{},
+	"minecraft:cherry_slab":                        CherrySlab{},
 	"minecraft:dark_oak_slab":                      DarkOakSlab{},
 	"minecraft:mangrove_slab":                      MangroveSlab{},
 	"minecraft:bamboo_slab":                        BambooSlab{},
@@ -4608,6 +4754,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_fence_gate":                   BirchFenceGate{},
 	"minecraft:jungle_fence_gate":                  JungleFenceGate{},
 	"minecraft:acacia_fence_gate":                  AcaciaFenceGate{},
+	"minecraft:cherry_fence_gate":                  CherryFenceGate{},
 	"minecraft:dark_oak_fence_gate":                DarkOakFenceGate{},
 	"minecraft:mangrove_fence_gate":                MangroveFenceGate{},
 	"minecraft:bamboo_fence_gate":                  BambooFenceGate{},
@@ -4615,6 +4762,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_fence":                        BirchFence{},
 	"minecraft:jungle_fence":                       JungleFence{},
 	"minecraft:acacia_fence":                       AcaciaFence{},
+	"minecraft:cherry_fence":                       CherryFence{},
 	"minecraft:dark_oak_fence":                     DarkOakFence{},
 	"minecraft:mangrove_fence":                     MangroveFence{},
 	"minecraft:bamboo_fence":                       BambooFence{},
@@ -4622,6 +4770,7 @@ var FromID = map[string]Block{
 	"minecraft:birch_door":                         BirchDoor{},
 	"minecraft:jungle_door":                        JungleDoor{},
 	"minecraft:acacia_door":                        AcaciaDoor{},
+	"minecraft:cherry_door":                        CherryDoor{},
 	"minecraft:dark_oak_door":                      DarkOakDoor{},
 	"minecraft:mangrove_door":                      MangroveDoor{},
 	"minecraft:bamboo_door":                        BambooDoor{},
@@ -4632,6 +4781,7 @@ var FromID = map[string]Block{
 	"minecraft:purpur_pillar":                      PurpurPillar{},
 	"minecraft:purpur_stairs":                      PurpurStairs{},
 	"minecraft:end_stone_bricks":                   EndStoneBricks{},
+	"minecraft:torchflower_crop":                   TorchflowerCrop{},
 	"minecraft:beetroots":                          Beetroots{},
 	"minecraft:dirt_path":                          DirtPath{},
 	"minecraft:end_gateway":                        EndGateway{},
@@ -4991,6 +5141,7 @@ var FromID = map[string]Block{
 	"minecraft:azalea":                             Azalea{},
 	"minecraft:flowering_azalea":                   FloweringAzalea{},
 	"minecraft:moss_carpet":                        MossCarpet{},
+	"minecraft:pink_petals":                        PinkPetals{},
 	"minecraft:moss_block":                         MossBlock{},
 	"minecraft:big_dripleaf":                       BigDripleaf{},
 	"minecraft:big_dripleaf_stem":                  BigDripleafStem{},
@@ -5030,4 +5181,5 @@ var FromID = map[string]Block{
 	"minecraft:pearlescent_froglight":              PearlescentFroglight{},
 	"minecraft:frogspawn":                          Frogspawn{},
 	"minecraft:reinforced_deepslate":               ReinforcedDeepslate{},
+	"minecraft:decorated_pot":                      DecoratedPot{},
 }

level/block/generator/GenBlocks.java

@@ -6,6 +6,7 @@ import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.*;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -18,6 +19,7 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.FileOutputStream;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 
@@ -94,15 +96,15 @@ public class GenBlocks {
 
     private static ListTag genBlockEntities() {
         ListTag list = new ListTag();
-        for (BlockEntityType blockEntity : BuiltInRegistries.BLOCK_ENTITY_TYPE) {
+        for (BlockEntityType<?> blockEntity : BuiltInRegistries.BLOCK_ENTITY_TYPE) {
+            ResourceLocation value = BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(blockEntity);
             ListTag validBlocksList = new ListTag();
-            Set<Block> validBlocks = blockEntity.validBlocks;
+            for (Block validBlock : blockEntity.validBlocks){
-            for (Block validBlock : validBlocks){
                 validBlocksList.add(StringTag.valueOf(BuiltInRegistries.BLOCK.getKey(validBlock).toString()));
             }
             CompoundTag be = new CompoundTag();
-            be.putString("Name", BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(blockEntity).toString());
+            be.putString("Name", Objects.requireNonNull(value).toString());
-            be.putString("ValidBlocks", BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(blockEntity).toString());
+            be.put("ValidBlocks", validBlocksList);
 
             list.add(be);
         }