diff --git a/bot/configuration.go b/bot/configuration.go index 3d1abde..84c1a4e 100644 --- a/bot/configuration.go +++ b/bot/configuration.go @@ -43,7 +43,7 @@ func (c *Client) joinConfiguration(conn *net.Conn) error { } switch packetid.ClientboundPacketID(p.ID) { - case packetid.ClientboundConfigCustomPayload: + case packetid.ClientboundCustomPayload: var channel pk.Identifier var data pk.PluginMessageData err := p.Scan(&channel, &data) @@ -52,7 +52,7 @@ func (c *Client) joinConfiguration(conn *net.Conn) error { } // TODO: Provide configuration custom data handling interface - case packetid.ClientboundConfigDisconnect: + case packetid.ClientboundDisconnect: var reason chat.Message err := p.Scan(&reason) if err != nil { diff --git a/bot/mcbot.go b/bot/mcbot.go index 8e45c33..b8b87c8 100644 --- a/bot/mcbot.go +++ b/bot/mcbot.go @@ -19,7 +19,7 @@ import ( // ProtocolVersion is the protocol version number of minecraft net protocol const ( - ProtocolVersion = 764 + ProtocolVersion = 765 DefaultPort = mcnet.DefaultPort ) diff --git a/data/packetid/clientboundpacketid_string.go b/data/packetid/clientboundpacketid_string.go index dd5ac15..c2762a6 100644 --- a/data/packetid/clientboundpacketid_string.go +++ b/data/packetid/clientboundpacketid_string.go @@ -8,6 +8,22 @@ 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[ClientboundLoginDisconnect-0] + _ = x[ClientboundLoginEncryptionRequest-1] + _ = x[ClientboundLoginSuccess-2] + _ = x[ClientboundLoginCompression-3] + _ = x[ClientboundLoginPluginRequest-4] + _ = x[ClientboundStatusResponse-0] + _ = x[ClientboundStatusPongResponse-1] + _ = x[ClientboundConfigCustomPayload-0] + _ = x[ClientboundConfigDisconnect-1] + _ = x[ClientboundConfigFinishConfiguration-2] + _ = x[ClientboundConfigKeepAlive-3] + _ = x[ClientboundConfigPing-4] + _ = x[ClientboundConfigRegistryData-5] + _ = x[ClientboundConfigResourcePack-6] + _ = x[ClientboundConfigUpdateEnabledFeatures-7] + _ = x[ClientboundConfigUpdateTags-8] _ = x[BundleDelimiter-0] _ = x[ClientboundAddEntity-1] _ = x[ClientboundAddExperienceOrb-2] @@ -74,58 +90,63 @@ func _() { _ = x[ClientboundRecipe-63] _ = x[ClientboundRemoveEntities-64] _ = x[ClientboundRemoveMobEffect-65] - _ = x[ClientboundResourcePack-66] - _ = x[ClientboundRespawn-67] - _ = x[ClientboundRotateHead-68] - _ = x[ClientboundSectionBlocksUpdate-69] - _ = x[ClientboundSelectAdvancementsTab-70] - _ = x[ClientboundServerData-71] - _ = x[ClientboundSetActionBarText-72] - _ = x[ClientboundSetBorderCenter-73] - _ = x[ClientboundSetBorderLerpSize-74] - _ = x[ClientboundSetBorderSize-75] - _ = x[ClientboundSetBorderWarningDelay-76] - _ = x[ClientboundSetBorderWarningDistance-77] - _ = x[ClientboundSetCamera-78] - _ = x[ClientboundSetCarriedItem-79] - _ = x[ClientboundSetChunkCacheCenter-80] - _ = x[ClientboundSetChunkCacheRadius-81] - _ = x[ClientboundSetDefaultSpawnPosition-82] - _ = x[ClientboundSetDisplayObjective-83] - _ = x[ClientboundSetEntityData-84] - _ = x[ClientboundSetEntityLink-85] - _ = x[ClientboundSetEntityMotion-86] - _ = x[ClientboundSetEquipment-87] - _ = x[ClientboundSetExperience-88] - _ = x[ClientboundSetHealth-89] - _ = x[ClientboundSetObjective-90] - _ = x[ClientboundSetPassengers-91] - _ = x[ClientboundSetPlayerTeam-92] - _ = x[ClientboundSetScore-93] - _ = x[ClientboundSetSimulationDistance-94] - _ = x[ClientboundSetSubtitleText-95] - _ = x[ClientboundSetTime-96] - _ = x[ClientboundSetTitleText-97] - _ = x[ClientboundSetTitlesAnimation-98] - _ = x[ClientboundSoundEntity-99] - _ = x[ClientboundSound-100] - _ = x[ClientboundStartConfiguration-101] - _ = x[ClientboundStopSound-102] - _ = x[ClientboundSystemChat-103] - _ = x[ClientboundTabList-104] - _ = x[ClientboundTagQuery-105] - _ = x[ClientboundTakeItemEntity-106] - _ = x[ClientboundTeleportEntity-107] - _ = x[ClientboundUpdateAdvancements-108] - _ = x[ClientboundUpdateAttributes-109] - _ = x[ClientboundUpdateMobEffect-110] - _ = x[ClientboundUpdateRecipes-111] - _ = x[ClientboundUpdateTags-112] + _ = x[ClientboundResetScore-66] + _ = x[ClientboundResourcePackPop-67] + _ = x[ClientboundResourcePackPush-68] + _ = x[ClientboundRespawn-69] + _ = x[ClientboundRotateHead-70] + _ = x[ClientboundSectionBlocksUpdate-71] + _ = x[ClientboundSelectAdvancementsTab-72] + _ = x[ClientboundServerData-73] + _ = x[ClientboundSetActionBarText-74] + _ = x[ClientboundSetBorderCenter-75] + _ = x[ClientboundSetBorderLerpSize-76] + _ = x[ClientboundSetBorderSize-77] + _ = x[ClientboundSetBorderWarningDelay-78] + _ = x[ClientboundSetBorderWarningDistance-79] + _ = x[ClientboundSetCamera-80] + _ = x[ClientboundSetCarriedItem-81] + _ = x[ClientboundSetChunkCacheCenter-82] + _ = x[ClientboundSetChunkCacheRadius-83] + _ = x[ClientboundSetDefaultSpawnPosition-84] + _ = x[ClientboundSetDisplayObjective-85] + _ = x[ClientboundSetEntityData-86] + _ = x[ClientboundSetEntityLink-87] + _ = x[ClientboundSetEntityMotion-88] + _ = x[ClientboundSetEquipment-89] + _ = x[ClientboundSetExperience-90] + _ = x[ClientboundSetHealth-91] + _ = x[ClientboundSetObjective-92] + _ = x[ClientboundSetPassengers-93] + _ = x[ClientboundSetPlayerTeam-94] + _ = x[ClientboundSetScore-95] + _ = x[ClientboundSetSimulationDistance-96] + _ = x[ClientboundSetSubtitleText-97] + _ = x[ClientboundSetTime-98] + _ = x[ClientboundSetTitleText-99] + _ = x[ClientboundSetTitlesAnimation-100] + _ = x[ClientboundSoundEntity-101] + _ = x[ClientboundSound-102] + _ = x[ClientboundStartConfiguration-103] + _ = x[ClientboundStopSound-104] + _ = x[ClientboundSystemChat-105] + _ = x[ClientboundTabList-106] + _ = x[ClientboundTagQuery-107] + _ = x[ClientboundTakeItemEntity-108] + _ = x[ClientboundTeleportEntity-109] + _ = x[ClientboundTickingState-110] + _ = x[ClientboundTickingStep-111] + _ = x[ClientboundUpdateAdvancements-112] + _ = x[ClientboundUpdateAttributes-113] + _ = x[ClientboundUpdateMobEffect-114] + _ = x[ClientboundUpdateRecipes-115] + _ = x[ClientboundUpdateTags-116] + _ = x[ClientboundPacketIDGuard-117] } -const _ClientboundPacketID_name = "BundleDelimiterClientboundAddEntityClientboundAddExperienceOrbClientboundAnimateClientboundAwardStatsClientboundBlockChangedAckClientboundBlockDestructionClientboundBlockEntityDataClientboundBlockEventClientboundBlockUpdateClientboundBossEventClientboundChangeDifficultyClientboundChunkBatchFinishedClientboundChunkBatchStartClientboundChunksBiomesClientboundClearTitlesClientboundCommandSuggestionsClientboundCommandsClientboundContainerCloseClientboundContainerSetContentClientboundContainerSetDataClientboundContainerSetSlotClientboundCooldownClientboundCustomChatCompletionsClientboundCustomPayloadClientboundDamageEventClientboundDeleteChatClientboundDisconnectClientboundDisguisedChatClientboundEntityEventClientboundExplodeClientboundForgetLevelChunkClientboundGameEventClientboundHorseScreenOpenClientboundHurtAnimationClientboundInitializeBorderClientboundKeepAliveClientboundLevelChunkWithLightClientboundLevelEventClientboundLevelParticlesClientboundLightUpdateClientboundLoginClientboundMapItemDataClientboundMerchantOffersClientboundMoveEntityPosClientboundMoveEntityPosRotClientboundMoveEntityRotClientboundMoveVehicleClientboundOpenBookClientboundOpenScreenClientboundOpenSignEditorClientboundPingClientboundPongResponseClientboundPlaceGhostRecipeClientboundPlayerAbilitiesClientboundPlayerChatClientboundPlayerCombatEndClientboundPlayerCombatEnterClientboundPlayerCombatKillClientboundPlayerInfoRemoveClientboundPlayerInfoUpdateClientboundPlayerLookAtClientboundPlayerPositionClientboundRecipeClientboundRemoveEntitiesClientboundRemoveMobEffectClientboundResourcePackClientboundRespawnClientboundRotateHeadClientboundSectionBlocksUpdateClientboundSelectAdvancementsTabClientboundServerDataClientboundSetActionBarTextClientboundSetBorderCenterClientboundSetBorderLerpSizeClientboundSetBorderSizeClientboundSetBorderWarningDelayClientboundSetBorderWarningDistanceClientboundSetCameraClientboundSetCarriedItemClientboundSetChunkCacheCenterClientboundSetChunkCacheRadiusClientboundSetDefaultSpawnPositionClientboundSetDisplayObjectiveClientboundSetEntityDataClientboundSetEntityLinkClientboundSetEntityMotionClientboundSetEquipmentClientboundSetExperienceClientboundSetHealthClientboundSetObjectiveClientboundSetPassengersClientboundSetPlayerTeamClientboundSetScoreClientboundSetSimulationDistanceClientboundSetSubtitleTextClientboundSetTimeClientboundSetTitleTextClientboundSetTitlesAnimationClientboundSoundEntityClientboundSoundClientboundStartConfigurationClientboundStopSoundClientboundSystemChatClientboundTabListClientboundTagQueryClientboundTakeItemEntityClientboundTeleportEntityClientboundUpdateAdvancementsClientboundUpdateAttributesClientboundUpdateMobEffectClientboundUpdateRecipesClientboundUpdateTags" +const _ClientboundPacketID_name = "ClientboundLoginDisconnectClientboundLoginEncryptionRequestClientboundLoginSuccessClientboundLoginCompressionClientboundLoginPluginRequestClientboundConfigRegistryDataClientboundConfigResourcePackClientboundConfigUpdateEnabledFeaturesClientboundConfigUpdateTagsClientboundBlockUpdateClientboundBossEventClientboundChangeDifficultyClientboundChunkBatchFinishedClientboundChunkBatchStartClientboundChunksBiomesClientboundClearTitlesClientboundCommandSuggestionsClientboundCommandsClientboundContainerCloseClientboundContainerSetContentClientboundContainerSetDataClientboundContainerSetSlotClientboundCooldownClientboundCustomChatCompletionsClientboundCustomPayloadClientboundDamageEventClientboundDeleteChatClientboundDisconnectClientboundDisguisedChatClientboundEntityEventClientboundExplodeClientboundForgetLevelChunkClientboundGameEventClientboundHorseScreenOpenClientboundHurtAnimationClientboundInitializeBorderClientboundKeepAliveClientboundLevelChunkWithLightClientboundLevelEventClientboundLevelParticlesClientboundLightUpdateClientboundLoginClientboundMapItemDataClientboundMerchantOffersClientboundMoveEntityPosClientboundMoveEntityPosRotClientboundMoveEntityRotClientboundMoveVehicleClientboundOpenBookClientboundOpenScreenClientboundOpenSignEditorClientboundPingClientboundPongResponseClientboundPlaceGhostRecipeClientboundPlayerAbilitiesClientboundPlayerChatClientboundPlayerCombatEndClientboundPlayerCombatEnterClientboundPlayerCombatKillClientboundPlayerInfoRemoveClientboundPlayerInfoUpdateClientboundPlayerLookAtClientboundPlayerPositionClientboundRecipeClientboundRemoveEntitiesClientboundRemoveMobEffectClientboundResetScoreClientboundResourcePackPopClientboundResourcePackPushClientboundRespawnClientboundRotateHeadClientboundSectionBlocksUpdateClientboundSelectAdvancementsTabClientboundServerDataClientboundSetActionBarTextClientboundSetBorderCenterClientboundSetBorderLerpSizeClientboundSetBorderSizeClientboundSetBorderWarningDelayClientboundSetBorderWarningDistanceClientboundSetCameraClientboundSetCarriedItemClientboundSetChunkCacheCenterClientboundSetChunkCacheRadiusClientboundSetDefaultSpawnPositionClientboundSetDisplayObjectiveClientboundSetEntityDataClientboundSetEntityLinkClientboundSetEntityMotionClientboundSetEquipmentClientboundSetExperienceClientboundSetHealthClientboundSetObjectiveClientboundSetPassengersClientboundSetPlayerTeamClientboundSetScoreClientboundSetSimulationDistanceClientboundSetSubtitleTextClientboundSetTimeClientboundSetTitleTextClientboundSetTitlesAnimationClientboundSoundEntityClientboundSoundClientboundStartConfigurationClientboundStopSoundClientboundSystemChatClientboundTabListClientboundTagQueryClientboundTakeItemEntityClientboundTeleportEntityClientboundTickingStateClientboundTickingStepClientboundUpdateAdvancementsClientboundUpdateAttributesClientboundUpdateMobEffectClientboundUpdateRecipesClientboundUpdateTagsClientboundPacketIDGuard" -var _ClientboundPacketID_index = [...]uint16{0, 15, 35, 62, 80, 101, 127, 154, 180, 201, 223, 243, 270, 299, 325, 348, 370, 399, 418, 443, 473, 500, 527, 546, 578, 602, 624, 645, 666, 690, 712, 730, 757, 777, 803, 827, 854, 874, 904, 925, 950, 972, 988, 1010, 1035, 1059, 1086, 1110, 1132, 1151, 1172, 1197, 1212, 1235, 1262, 1288, 1309, 1335, 1363, 1390, 1417, 1444, 1467, 1492, 1509, 1534, 1560, 1583, 1601, 1622, 1652, 1684, 1705, 1732, 1758, 1786, 1810, 1842, 1877, 1897, 1922, 1952, 1982, 2016, 2046, 2070, 2094, 2120, 2143, 2167, 2187, 2210, 2234, 2258, 2277, 2309, 2335, 2353, 2376, 2405, 2427, 2443, 2472, 2492, 2513, 2531, 2550, 2575, 2600, 2629, 2656, 2682, 2706, 2727} +var _ClientboundPacketID_index = [...]uint16{0, 26, 59, 82, 109, 138, 167, 196, 234, 261, 283, 303, 330, 359, 385, 408, 430, 459, 478, 503, 533, 560, 587, 606, 638, 662, 684, 705, 726, 750, 772, 790, 817, 837, 863, 887, 914, 934, 964, 985, 1010, 1032, 1048, 1070, 1095, 1119, 1146, 1170, 1192, 1211, 1232, 1257, 1272, 1295, 1322, 1348, 1369, 1395, 1423, 1450, 1477, 1504, 1527, 1552, 1569, 1594, 1620, 1641, 1667, 1694, 1712, 1733, 1763, 1795, 1816, 1843, 1869, 1897, 1921, 1953, 1988, 2008, 2033, 2063, 2093, 2127, 2157, 2181, 2205, 2231, 2254, 2278, 2298, 2321, 2345, 2369, 2388, 2420, 2446, 2464, 2487, 2516, 2538, 2554, 2583, 2603, 2624, 2642, 2661, 2686, 2711, 2734, 2756, 2785, 2812, 2838, 2862, 2883, 2907} func (i ClientboundPacketID) String() string { if i < 0 || i >= ClientboundPacketID(len(_ClientboundPacketID_index)-1) { diff --git a/data/packetid/packetid.go b/data/packetid/packetid.go index 4c6cd8e..5d26034 100644 --- a/data/packetid/packetid.go +++ b/data/packetid/packetid.go @@ -127,7 +127,9 @@ const ( ClientboundRecipe ClientboundRemoveEntities ClientboundRemoveMobEffect - ClientboundResourcePack + ClientboundResetScore + ClientboundResourcePackPop + ClientboundResourcePackPush ClientboundRespawn ClientboundRotateHead ClientboundSectionBlocksUpdate @@ -169,6 +171,8 @@ const ( ClientboundTagQuery ClientboundTakeItemEntity ClientboundTeleportEntity + ClientboundTickingState + ClientboundTickingStep ClientboundUpdateAdvancements ClientboundUpdateAttributes ClientboundUpdateMobEffect @@ -194,6 +198,7 @@ const ( ServerboundContainerButtonClick ServerboundContainerClick ServerboundContainerClose + ServerboundContainerSlotStateChanged ServerboundCustomPayload ServerboundEditBook ServerboundEntityTagQuery @@ -233,5 +238,4 @@ const ( ServerboundTeleportToEntity ServerboundUseItemOn ServerboundUseItem - ServerboundPacketIDGuard ) diff --git a/data/packetid/serverboundpacketid_string.go b/data/packetid/serverboundpacketid_string.go index 22d63d6..0a1ead8 100644 --- a/data/packetid/serverboundpacketid_string.go +++ b/data/packetid/serverboundpacketid_string.go @@ -8,6 +8,18 @@ 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[ServerboundLoginStart-0] + _ = x[ServerboundLoginEncryptionResponse-1] + _ = x[ServerboundLoginPluginResponse-2] + _ = x[ServerboundLoginAcknowledged-3] + _ = x[ServerboundStatusRequest-0] + _ = x[ServerboundStatusPingRequest-1] + _ = x[ServerboundConfigClientInformation-0] + _ = x[ServerboundConfigCustomPayload-1] + _ = x[ServerboundConfigFinishConfiguration-2] + _ = x[ServerboundConfigKeepAlive-3] + _ = x[ServerboundConfigPong-4] + _ = x[ServerboundConfigResourcePack-5] _ = x[ServerboundAcceptTeleportation-0] _ = x[ServerboundBlockEntityTagQuery-1] _ = x[ServerboundChangeDifficulty-2] @@ -23,50 +35,51 @@ func _() { _ = x[ServerboundContainerButtonClick-12] _ = x[ServerboundContainerClick-13] _ = x[ServerboundContainerClose-14] - _ = x[ServerboundCustomPayload-15] - _ = x[ServerboundEditBook-16] - _ = x[ServerboundEntityTagQuery-17] - _ = x[ServerboundInteract-18] - _ = x[ServerboundJigsawGenerate-19] - _ = x[ServerboundKeepAlive-20] - _ = x[ServerboundLockDifficulty-21] - _ = x[ServerboundMovePlayerPos-22] - _ = x[ServerboundMovePlayerPosRot-23] - _ = x[ServerboundMovePlayerRot-24] - _ = x[ServerboundMovePlayerStatusOnly-25] - _ = x[ServerboundMoveVehicle-26] - _ = x[ServerboundPaddleBoat-27] - _ = x[ServerboundPickItem-28] - _ = x[ServerboundPingRequest-29] - _ = x[ServerboundPlaceRecipe-30] - _ = x[ServerboundPlayerAbilities-31] - _ = x[ServerboundPlayerAction-32] - _ = x[ServerboundPlayerCommand-33] - _ = x[ServerboundPlayerInput-34] - _ = x[ServerboundPong-35] - _ = x[ServerboundRecipeBookChangeSettings-36] - _ = x[ServerboundRecipeBookSeenRecipe-37] - _ = x[ServerboundRenameItem-38] - _ = x[ServerboundResourcePack-39] - _ = x[ServerboundSeenAdvancements-40] - _ = x[ServerboundSelectTrade-41] - _ = x[ServerboundSetBeacon-42] - _ = x[ServerboundSetCarriedItem-43] - _ = x[ServerboundSetCommandBlock-44] - _ = x[ServerboundSetCommandMinecart-45] - _ = x[ServerboundSetCreativeModeSlot-46] - _ = x[ServerboundSetJigsawBlock-47] - _ = x[ServerboundSetStructureBlock-48] - _ = x[ServerboundSignUpdate-49] - _ = x[ServerboundSwing-50] - _ = x[ServerboundTeleportToEntity-51] - _ = x[ServerboundUseItemOn-52] - _ = x[ServerboundUseItem-53] + _ = x[ServerboundContainerSlotStateChanged-15] + _ = x[ServerboundCustomPayload-16] + _ = x[ServerboundEditBook-17] + _ = x[ServerboundEntityTagQuery-18] + _ = x[ServerboundInteract-19] + _ = x[ServerboundJigsawGenerate-20] + _ = x[ServerboundKeepAlive-21] + _ = x[ServerboundLockDifficulty-22] + _ = x[ServerboundMovePlayerPos-23] + _ = x[ServerboundMovePlayerPosRot-24] + _ = x[ServerboundMovePlayerRot-25] + _ = x[ServerboundMovePlayerStatusOnly-26] + _ = x[ServerboundMoveVehicle-27] + _ = x[ServerboundPaddleBoat-28] + _ = x[ServerboundPickItem-29] + _ = x[ServerboundPingRequest-30] + _ = x[ServerboundPlaceRecipe-31] + _ = x[ServerboundPlayerAbilities-32] + _ = x[ServerboundPlayerAction-33] + _ = x[ServerboundPlayerCommand-34] + _ = x[ServerboundPlayerInput-35] + _ = x[ServerboundPong-36] + _ = x[ServerboundRecipeBookChangeSettings-37] + _ = x[ServerboundRecipeBookSeenRecipe-38] + _ = x[ServerboundRenameItem-39] + _ = x[ServerboundResourcePack-40] + _ = x[ServerboundSeenAdvancements-41] + _ = x[ServerboundSelectTrade-42] + _ = x[ServerboundSetBeacon-43] + _ = x[ServerboundSetCarriedItem-44] + _ = x[ServerboundSetCommandBlock-45] + _ = x[ServerboundSetCommandMinecart-46] + _ = x[ServerboundSetCreativeModeSlot-47] + _ = x[ServerboundSetJigsawBlock-48] + _ = x[ServerboundSetStructureBlock-49] + _ = x[ServerboundSignUpdate-50] + _ = x[ServerboundSwing-51] + _ = x[ServerboundTeleportToEntity-52] + _ = x[ServerboundUseItemOn-53] + _ = x[ServerboundUseItem-54] } -const _ServerboundPacketID_name = "ServerboundAcceptTeleportationServerboundBlockEntityTagQueryServerboundChangeDifficultyServerboundChatAckServerboundChatCommandServerboundChatServerboundChatSessionUpdateServerboundChunkBatchReceivedServerboundClientCommandServerboundClientInformationServerboundCommandSuggestionServerboundConfigurationAcknowledgedServerboundContainerButtonClickServerboundContainerClickServerboundContainerCloseServerboundCustomPayloadServerboundEditBookServerboundEntityTagQueryServerboundInteractServerboundJigsawGenerateServerboundKeepAliveServerboundLockDifficultyServerboundMovePlayerPosServerboundMovePlayerPosRotServerboundMovePlayerRotServerboundMovePlayerStatusOnlyServerboundMoveVehicleServerboundPaddleBoatServerboundPickItemServerboundPingRequestServerboundPlaceRecipeServerboundPlayerAbilitiesServerboundPlayerActionServerboundPlayerCommandServerboundPlayerInputServerboundPongServerboundRecipeBookChangeSettingsServerboundRecipeBookSeenRecipeServerboundRenameItemServerboundResourcePackServerboundSeenAdvancementsServerboundSelectTradeServerboundSetBeaconServerboundSetCarriedItemServerboundSetCommandBlockServerboundSetCommandMinecartServerboundSetCreativeModeSlotServerboundSetJigsawBlockServerboundSetStructureBlockServerboundSignUpdateServerboundSwingServerboundTeleportToEntityServerboundUseItemOnServerboundUseItem" +const _ServerboundPacketID_name = "ServerboundLoginStartServerboundLoginEncryptionResponseServerboundLoginPluginResponseServerboundLoginAcknowledgedServerboundConfigPongServerboundConfigResourcePackServerboundChatSessionUpdateServerboundChunkBatchReceivedServerboundClientCommandServerboundClientInformationServerboundCommandSuggestionServerboundConfigurationAcknowledgedServerboundContainerButtonClickServerboundContainerClickServerboundContainerCloseServerboundContainerSlotStateChangedServerboundCustomPayloadServerboundEditBookServerboundEntityTagQueryServerboundInteractServerboundJigsawGenerateServerboundKeepAliveServerboundLockDifficultyServerboundMovePlayerPosServerboundMovePlayerPosRotServerboundMovePlayerRotServerboundMovePlayerStatusOnlyServerboundMoveVehicleServerboundPaddleBoatServerboundPickItemServerboundPingRequestServerboundPlaceRecipeServerboundPlayerAbilitiesServerboundPlayerActionServerboundPlayerCommandServerboundPlayerInputServerboundPongServerboundRecipeBookChangeSettingsServerboundRecipeBookSeenRecipeServerboundRenameItemServerboundResourcePackServerboundSeenAdvancementsServerboundSelectTradeServerboundSetBeaconServerboundSetCarriedItemServerboundSetCommandBlockServerboundSetCommandMinecartServerboundSetCreativeModeSlotServerboundSetJigsawBlockServerboundSetStructureBlockServerboundSignUpdateServerboundSwingServerboundTeleportToEntityServerboundUseItemOnServerboundUseItem" -var _ServerboundPacketID_index = [...]uint16{0, 30, 60, 87, 105, 127, 142, 170, 199, 223, 251, 279, 315, 346, 371, 396, 420, 439, 464, 483, 508, 528, 553, 577, 604, 628, 659, 681, 702, 721, 743, 765, 791, 814, 838, 860, 875, 910, 941, 962, 985, 1012, 1034, 1054, 1079, 1105, 1134, 1164, 1189, 1217, 1238, 1254, 1281, 1301, 1319} +var _ServerboundPacketID_index = [...]uint16{0, 21, 55, 85, 113, 134, 163, 191, 220, 244, 272, 300, 336, 367, 392, 417, 453, 477, 496, 521, 540, 565, 585, 610, 634, 661, 685, 716, 738, 759, 778, 800, 822, 848, 871, 895, 917, 932, 967, 998, 1019, 1042, 1069, 1091, 1111, 1136, 1162, 1191, 1221, 1246, 1274, 1295, 1311, 1338, 1358, 1376} func (i ServerboundPacketID) String() string { if i < 0 || i >= ServerboundPacketID(len(_ServerboundPacketID_index)-1) { diff --git a/level/block/block_entities.nbt b/level/block/block_entities.nbt index 44a12ac..ad6153d 100644 Binary files a/level/block/block_entities.nbt and b/level/block/block_entities.nbt differ diff --git a/level/block/block_states.nbt b/level/block/block_states.nbt index 61ce2e7..a0d0d97 100644 Binary files a/level/block/block_states.nbt and b/level/block/block_states.nbt differ diff --git a/level/block/blockentities.go b/level/block/blockentities.go index f401453..8e9ea69 100644 --- a/level/block/blockentities.go +++ b/level/block/blockentities.go @@ -44,6 +44,8 @@ var EntityList = [...]Entity{ ChiseledBookshelfEntity{}, BrushableBlockEntity{}, DecoratedPotEntity{}, + // CrafterEntity{}, + // TrialSpawnerEntity{}, } func (FurnaceEntity) ID() string { return "minecraft:furnace" } @@ -87,6 +89,8 @@ func (SculkShriekerEntity) ID() string { return "minecraft:sculk_shrieke func (ChiseledBookshelfEntity) ID() string { return "minecraft:chiseled_bookshelf" } func (BrushableBlockEntity) ID() string { return "minecraft:brushable_block" } func (DecoratedPotEntity) ID() string { return "minecraft:decorated_pot" } +// func (CrafterEntity) ID() string { return "minecraft:crafter" } +// func (TrialSpawnerEntity) ID() string { return "minecraft:trial_spawner" } func (f FurnaceEntity) IsValidBlock(block Block) bool { return block.ID() == "minecraft:furnace" @@ -423,3 +427,11 @@ func (b BrushableBlockEntity) IsValidBlock(block Block) bool { func (d DecoratedPotEntity) IsValidBlock(block Block) bool { return block.ID() == "minecraft:decorated_pot" } + +// func (c CrafterEntity) IsValidBlock(block Block) bool { +// return block.ID() == "minecraft:crafter" +// } +// +// func (t TrialSpawnerEntity) IsValidBlock(block Block) bool { +// return block.ID() == "minecraft:trial_spawner" +// } diff --git a/level/block/blocks.go b/level/block/blocks.go index 2c17cbe..4ae6f77 100644 --- a/level/block/blocks.go +++ b/level/block/blocks.go @@ -351,7 +351,7 @@ type ( Facing Direction `nbt:"facing"` } Cobweb struct{} - Grass struct{} + ShortGrass struct{} Fern struct{} DeadBush struct{} Seagrass struct{} @@ -741,7 +741,6 @@ type ( Waterlogged Boolean `nbt:"waterlogged"` West Boolean `nbt:"west"` } - Pumpkin struct{} Netherrack struct{} SoulSand struct{} SoulSoil struct{} @@ -907,6 +906,7 @@ type ( Waterlogged Boolean `nbt:"waterlogged"` West Boolean `nbt:"west"` } + Pumpkin struct{} Melon struct{} AttachedPumpkinStem struct { Facing Direction `nbt:"facing"` @@ -2928,11 +2928,69 @@ type ( Facing Direction `nbt:"facing"` Waterlogged Boolean `nbt:"waterlogged"` } - Tuff struct{} - Calcite struct{} - TintedGlass struct{} - PowderSnow struct{} - SculkSensor struct { + Tuff struct{} + TuffSlab struct { + Type SlabType `nbt:"type"` + Waterlogged Boolean `nbt:"waterlogged"` + } + TuffStairs struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Shape StairsShape `nbt:"shape"` + Waterlogged Boolean `nbt:"waterlogged"` + } + TuffWall struct { + East WallSide `nbt:"east"` + North WallSide `nbt:"north"` + South WallSide `nbt:"south"` + Up Boolean `nbt:"up"` + Waterlogged Boolean `nbt:"waterlogged"` + West WallSide `nbt:"west"` + } + PolishedTuff struct{} + PolishedTuffSlab struct { + Type SlabType `nbt:"type"` + Waterlogged Boolean `nbt:"waterlogged"` + } + PolishedTuffStairs struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Shape StairsShape `nbt:"shape"` + Waterlogged Boolean `nbt:"waterlogged"` + } + PolishedTuffWall struct { + East WallSide `nbt:"east"` + North WallSide `nbt:"north"` + South WallSide `nbt:"south"` + Up Boolean `nbt:"up"` + Waterlogged Boolean `nbt:"waterlogged"` + West WallSide `nbt:"west"` + } + ChiseledTuff struct{} + TuffBricks struct{} + TuffBrickSlab struct { + Type SlabType `nbt:"type"` + Waterlogged Boolean `nbt:"waterlogged"` + } + TuffBrickStairs struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Shape StairsShape `nbt:"shape"` + Waterlogged Boolean `nbt:"waterlogged"` + } + TuffBrickWall struct { + East WallSide `nbt:"east"` + North WallSide `nbt:"north"` + South WallSide `nbt:"south"` + Up Boolean `nbt:"up"` + Waterlogged Boolean `nbt:"waterlogged"` + West WallSide `nbt:"west"` + } + ChiseledTuffBricks struct{} + Calcite struct{} + TintedGlass struct{} + PowderSnow struct{} + SculkSensor struct { Power Integer `nbt:"power"` Sculk_sensor_phase SculkSensorPhase `nbt:"sculk_sensor_phase"` Waterlogged Boolean `nbt:"waterlogged"` @@ -2961,17 +3019,25 @@ type ( Shrieking Boolean `nbt:"shrieking"` Waterlogged Boolean `nbt:"waterlogged"` } - OxidizedCopper struct{} - WeatheredCopper struct{} - ExposedCopper struct{} - CopperBlock struct{} - CopperOre struct{} - DeepslateCopperOre struct{} - OxidizedCutCopper struct{} - WeatheredCutCopper struct{} - ExposedCutCopper struct{} - CutCopper struct{} - OxidizedCutCopperStairs struct { + CopperBlock struct{} + ExposedCopper struct{} + WeatheredCopper struct{} + OxidizedCopper struct{} + CopperOre struct{} + DeepslateCopperOre struct{} + OxidizedCutCopper struct{} + WeatheredCutCopper struct{} + ExposedCutCopper struct{} + CutCopper struct{} + OxidizedChiseledCopper struct{} + WeatheredChiseledCopper struct{} + ExposedChiseledCopper struct{} + ChiseledCopper struct{} + WaxedOxidizedChiseledCopper struct{} + WaxedWeatheredChiseledCopper struct{} + WaxedExposedChiseledCopper struct{} + WaxedChiseledCopper struct{} + OxidizedCutCopperStairs struct { Facing Direction `nbt:"facing"` Half Half `nbt:"half"` Shape StairsShape `nbt:"shape"` @@ -3059,6 +3125,174 @@ type ( Type SlabType `nbt:"type"` Waterlogged Boolean `nbt:"waterlogged"` } + CopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + ExposedCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + OxidizedCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + WeatheredCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + WaxedCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + WaxedExposedCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + WaxedOxidizedCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + WaxedWeatheredCopperDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } + CopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + ExposedCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + OxidizedCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WeatheredCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedExposedCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedOxidizedCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedWeatheredCopperTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } + CopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + ExposedCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + WeatheredCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + OxidizedCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedExposedCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedWeatheredCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + WaxedOxidizedCopperGrate struct { + Waterlogged Boolean `nbt:"waterlogged"` + } + CopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + ExposedCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + WeatheredCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + OxidizedCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + WaxedCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + WaxedExposedCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + WaxedWeatheredCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } + WaxedOxidizedCopperBulb struct { + Lit Boolean `nbt:"lit"` + Powered Boolean `nbt:"powered"` + } LightningRod struct { Facing Direction `nbt:"facing"` Powered Boolean `nbt:"powered"` @@ -3212,6 +3446,14 @@ type ( Facing Direction `nbt:"facing"` Waterlogged Boolean `nbt:"waterlogged"` } + Crafter struct { + Crafting Boolean `nbt:"crafting"` + Orientation FrontAndTop `nbt:"orientation"` + Triggered Boolean `nbt:"triggered"` + } + TrialSpawner struct { + Trial_spawner_state TrialSpawnerState `nbt:"trial_spawner_state"` + } ) func (Air) ID() string { return "minecraft:air" } @@ -3337,7 +3579,7 @@ func (PoweredRail) ID() string { return "minecraft:powered_rail" func (DetectorRail) ID() string { return "minecraft:detector_rail" } func (StickyPiston) ID() string { return "minecraft:sticky_piston" } func (Cobweb) ID() string { return "minecraft:cobweb" } -func (Grass) ID() string { return "minecraft:grass" } +func (ShortGrass) ID() string { return "minecraft:short_grass" } func (Fern) ID() string { return "minecraft:fern" } func (DeadBush) ID() string { return "minecraft:dead_bush" } func (Seagrass) ID() string { return "minecraft:seagrass" } @@ -3469,7 +3711,6 @@ func (Clay) ID() string { return "minecraft:clay" } func (SugarCane) ID() string { return "minecraft:sugar_cane" } func (Jukebox) ID() string { return "minecraft:jukebox" } func (OakFence) ID() string { return "minecraft:oak_fence" } -func (Pumpkin) ID() string { return "minecraft:pumpkin" } func (Netherrack) ID() string { return "minecraft:netherrack" } func (SoulSand) ID() string { return "minecraft:soul_sand" } func (SoulSoil) ID() string { return "minecraft:soul_soil" } @@ -3526,6 +3767,7 @@ func (MushroomStem) ID() string { return "minecraft:mushroom_stem func (IronBars) ID() string { return "minecraft:iron_bars" } func (Chain) ID() string { return "minecraft:chain" } func (GlassPane) ID() string { return "minecraft:glass_pane" } +func (Pumpkin) ID() string { return "minecraft:pumpkin" } func (Melon) ID() string { return "minecraft:melon" } func (AttachedPumpkinStem) ID() string { return "minecraft:attached_pumpkin_stem" } func (AttachedMelonStem) ID() string { return "minecraft:attached_melon_stem" } @@ -4128,6 +4370,19 @@ func (LargeAmethystBud) ID() string { return "minecraft:large_amethy func (MediumAmethystBud) ID() string { return "minecraft:medium_amethyst_bud" } func (SmallAmethystBud) ID() string { return "minecraft:small_amethyst_bud" } func (Tuff) ID() string { return "minecraft:tuff" } +func (TuffSlab) ID() string { return "minecraft:tuff_slab" } +func (TuffStairs) ID() string { return "minecraft:tuff_stairs" } +func (TuffWall) ID() string { return "minecraft:tuff_wall" } +func (PolishedTuff) ID() string { return "minecraft:polished_tuff" } +func (PolishedTuffSlab) ID() string { return "minecraft:polished_tuff_slab" } +func (PolishedTuffStairs) ID() string { return "minecraft:polished_tuff_stairs" } +func (PolishedTuffWall) ID() string { return "minecraft:polished_tuff_wall" } +func (ChiseledTuff) ID() string { return "minecraft:chiseled_tuff" } +func (TuffBricks) ID() string { return "minecraft:tuff_bricks" } +func (TuffBrickSlab) ID() string { return "minecraft:tuff_brick_slab" } +func (TuffBrickStairs) ID() string { return "minecraft:tuff_brick_stairs" } +func (TuffBrickWall) ID() string { return "minecraft:tuff_brick_wall" } +func (ChiseledTuffBricks) ID() string { return "minecraft:chiseled_tuff_bricks" } func (Calcite) ID() string { return "minecraft:calcite" } func (TintedGlass) ID() string { return "minecraft:tinted_glass" } func (PowderSnow) ID() string { return "minecraft:powder_snow" } @@ -4137,16 +4392,24 @@ func (Sculk) ID() string { return "minecraft:sculk" } func (SculkVein) ID() string { return "minecraft:sculk_vein" } func (SculkCatalyst) ID() string { return "minecraft:sculk_catalyst" } func (SculkShrieker) ID() string { return "minecraft:sculk_shrieker" } -func (OxidizedCopper) ID() string { return "minecraft:oxidized_copper" } -func (WeatheredCopper) ID() string { return "minecraft:weathered_copper" } -func (ExposedCopper) ID() string { return "minecraft:exposed_copper" } func (CopperBlock) ID() string { return "minecraft:copper_block" } +func (ExposedCopper) ID() string { return "minecraft:exposed_copper" } +func (WeatheredCopper) ID() string { return "minecraft:weathered_copper" } +func (OxidizedCopper) ID() string { return "minecraft:oxidized_copper" } func (CopperOre) ID() string { return "minecraft:copper_ore" } func (DeepslateCopperOre) ID() string { return "minecraft:deepslate_copper_ore" } func (OxidizedCutCopper) ID() string { return "minecraft:oxidized_cut_copper" } func (WeatheredCutCopper) ID() string { return "minecraft:weathered_cut_copper" } func (ExposedCutCopper) ID() string { return "minecraft:exposed_cut_copper" } func (CutCopper) ID() string { return "minecraft:cut_copper" } +func (OxidizedChiseledCopper) ID() string { return "minecraft:oxidized_chiseled_copper" } +func (WeatheredChiseledCopper) ID() string { return "minecraft:weathered_chiseled_copper" } +func (ExposedChiseledCopper) ID() string { return "minecraft:exposed_chiseled_copper" } +func (ChiseledCopper) ID() string { return "minecraft:chiseled_copper" } +func (WaxedOxidizedChiseledCopper) ID() string { return "minecraft:waxed_oxidized_chiseled_copper" } +func (WaxedWeatheredChiseledCopper) ID() string { return "minecraft:waxed_weathered_chiseled_copper" } +func (WaxedExposedChiseledCopper) ID() string { return "minecraft:waxed_exposed_chiseled_copper" } +func (WaxedChiseledCopper) ID() string { return "minecraft:waxed_chiseled_copper" } func (OxidizedCutCopperStairs) ID() string { return "minecraft:oxidized_cut_copper_stairs" } func (WeatheredCutCopperStairs) ID() string { return "minecraft:weathered_cut_copper_stairs" } func (ExposedCutCopperStairs) ID() string { return "minecraft:exposed_cut_copper_stairs" } @@ -4167,62 +4430,96 @@ func (WaxedOxidizedCutCopperStairs) ID() string { return "minecraft:waxed_oxidiz func (WaxedWeatheredCutCopperStairs) ID() string { return "minecraft:waxed_weathered_cut_copper_stairs" } -func (WaxedExposedCutCopperStairs) ID() string { return "minecraft:waxed_exposed_cut_copper_stairs" } -func (WaxedCutCopperStairs) ID() string { return "minecraft:waxed_cut_copper_stairs" } -func (WaxedOxidizedCutCopperSlab) ID() string { return "minecraft:waxed_oxidized_cut_copper_slab" } -func (WaxedWeatheredCutCopperSlab) ID() string { return "minecraft:waxed_weathered_cut_copper_slab" } -func (WaxedExposedCutCopperSlab) ID() string { return "minecraft:waxed_exposed_cut_copper_slab" } -func (WaxedCutCopperSlab) ID() string { return "minecraft:waxed_cut_copper_slab" } -func (LightningRod) ID() string { return "minecraft:lightning_rod" } -func (PointedDripstone) ID() string { return "minecraft:pointed_dripstone" } -func (DripstoneBlock) ID() string { return "minecraft:dripstone_block" } -func (CaveVines) ID() string { return "minecraft:cave_vines" } -func (CaveVinesPlant) ID() string { return "minecraft:cave_vines_plant" } -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" } -func (SmallDripleaf) ID() string { return "minecraft:small_dripleaf" } -func (HangingRoots) ID() string { return "minecraft:hanging_roots" } -func (RootedDirt) ID() string { return "minecraft:rooted_dirt" } -func (Mud) ID() string { return "minecraft:mud" } -func (Deepslate) ID() string { return "minecraft:deepslate" } -func (CobbledDeepslate) ID() string { return "minecraft:cobbled_deepslate" } -func (CobbledDeepslateStairs) ID() string { return "minecraft:cobbled_deepslate_stairs" } -func (CobbledDeepslateSlab) ID() string { return "minecraft:cobbled_deepslate_slab" } -func (CobbledDeepslateWall) ID() string { return "minecraft:cobbled_deepslate_wall" } -func (PolishedDeepslate) ID() string { return "minecraft:polished_deepslate" } -func (PolishedDeepslateStairs) ID() string { return "minecraft:polished_deepslate_stairs" } -func (PolishedDeepslateSlab) ID() string { return "minecraft:polished_deepslate_slab" } -func (PolishedDeepslateWall) ID() string { return "minecraft:polished_deepslate_wall" } -func (DeepslateTiles) ID() string { return "minecraft:deepslate_tiles" } -func (DeepslateTileStairs) ID() string { return "minecraft:deepslate_tile_stairs" } -func (DeepslateTileSlab) ID() string { return "minecraft:deepslate_tile_slab" } -func (DeepslateTileWall) ID() string { return "minecraft:deepslate_tile_wall" } -func (DeepslateBricks) ID() string { return "minecraft:deepslate_bricks" } -func (DeepslateBrickStairs) ID() string { return "minecraft:deepslate_brick_stairs" } -func (DeepslateBrickSlab) ID() string { return "minecraft:deepslate_brick_slab" } -func (DeepslateBrickWall) ID() string { return "minecraft:deepslate_brick_wall" } -func (ChiseledDeepslate) ID() string { return "minecraft:chiseled_deepslate" } -func (CrackedDeepslateBricks) ID() string { return "minecraft:cracked_deepslate_bricks" } -func (CrackedDeepslateTiles) ID() string { return "minecraft:cracked_deepslate_tiles" } -func (InfestedDeepslate) ID() string { return "minecraft:infested_deepslate" } -func (SmoothBasalt) ID() string { return "minecraft:smooth_basalt" } -func (RawIronBlock) ID() string { return "minecraft:raw_iron_block" } -func (RawCopperBlock) ID() string { return "minecraft:raw_copper_block" } -func (RawGoldBlock) ID() string { return "minecraft:raw_gold_block" } -func (PottedAzaleaBush) ID() string { return "minecraft:potted_azalea_bush" } -func (PottedFloweringAzaleaBush) ID() string { return "minecraft:potted_flowering_azalea_bush" } -func (OchreFroglight) ID() string { return "minecraft:ochre_froglight" } -func (VerdantFroglight) ID() string { return "minecraft:verdant_froglight" } -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" } +func (WaxedExposedCutCopperStairs) ID() string { return "minecraft:waxed_exposed_cut_copper_stairs" } +func (WaxedCutCopperStairs) ID() string { return "minecraft:waxed_cut_copper_stairs" } +func (WaxedOxidizedCutCopperSlab) ID() string { return "minecraft:waxed_oxidized_cut_copper_slab" } +func (WaxedWeatheredCutCopperSlab) ID() string { return "minecraft:waxed_weathered_cut_copper_slab" } +func (WaxedExposedCutCopperSlab) ID() string { return "minecraft:waxed_exposed_cut_copper_slab" } +func (WaxedCutCopperSlab) ID() string { return "minecraft:waxed_cut_copper_slab" } +func (CopperDoor) ID() string { return "minecraft:copper_door" } +func (ExposedCopperDoor) ID() string { return "minecraft:exposed_copper_door" } +func (OxidizedCopperDoor) ID() string { return "minecraft:oxidized_copper_door" } +func (WeatheredCopperDoor) ID() string { return "minecraft:weathered_copper_door" } +func (WaxedCopperDoor) ID() string { return "minecraft:waxed_copper_door" } +func (WaxedExposedCopperDoor) ID() string { return "minecraft:waxed_exposed_copper_door" } +func (WaxedOxidizedCopperDoor) ID() string { return "minecraft:waxed_oxidized_copper_door" } +func (WaxedWeatheredCopperDoor) ID() string { return "minecraft:waxed_weathered_copper_door" } +func (CopperTrapdoor) ID() string { return "minecraft:copper_trapdoor" } +func (ExposedCopperTrapdoor) ID() string { return "minecraft:exposed_copper_trapdoor" } +func (OxidizedCopperTrapdoor) ID() string { return "minecraft:oxidized_copper_trapdoor" } +func (WeatheredCopperTrapdoor) ID() string { return "minecraft:weathered_copper_trapdoor" } +func (WaxedCopperTrapdoor) ID() string { return "minecraft:waxed_copper_trapdoor" } +func (WaxedExposedCopperTrapdoor) ID() string { return "minecraft:waxed_exposed_copper_trapdoor" } +func (WaxedOxidizedCopperTrapdoor) ID() string { return "minecraft:waxed_oxidized_copper_trapdoor" } +func (WaxedWeatheredCopperTrapdoor) ID() string { return "minecraft:waxed_weathered_copper_trapdoor" } +func (CopperGrate) ID() string { return "minecraft:copper_grate" } +func (ExposedCopperGrate) ID() string { return "minecraft:exposed_copper_grate" } +func (WeatheredCopperGrate) ID() string { return "minecraft:weathered_copper_grate" } +func (OxidizedCopperGrate) ID() string { return "minecraft:oxidized_copper_grate" } +func (WaxedCopperGrate) ID() string { return "minecraft:waxed_copper_grate" } +func (WaxedExposedCopperGrate) ID() string { return "minecraft:waxed_exposed_copper_grate" } +func (WaxedWeatheredCopperGrate) ID() string { return "minecraft:waxed_weathered_copper_grate" } +func (WaxedOxidizedCopperGrate) ID() string { return "minecraft:waxed_oxidized_copper_grate" } +func (CopperBulb) ID() string { return "minecraft:copper_bulb" } +func (ExposedCopperBulb) ID() string { return "minecraft:exposed_copper_bulb" } +func (WeatheredCopperBulb) ID() string { return "minecraft:weathered_copper_bulb" } +func (OxidizedCopperBulb) ID() string { return "minecraft:oxidized_copper_bulb" } +func (WaxedCopperBulb) ID() string { return "minecraft:waxed_copper_bulb" } +func (WaxedExposedCopperBulb) ID() string { return "minecraft:waxed_exposed_copper_bulb" } +func (WaxedWeatheredCopperBulb) ID() string { return "minecraft:waxed_weathered_copper_bulb" } +func (WaxedOxidizedCopperBulb) ID() string { return "minecraft:waxed_oxidized_copper_bulb" } +func (LightningRod) ID() string { return "minecraft:lightning_rod" } +func (PointedDripstone) ID() string { return "minecraft:pointed_dripstone" } +func (DripstoneBlock) ID() string { return "minecraft:dripstone_block" } +func (CaveVines) ID() string { return "minecraft:cave_vines" } +func (CaveVinesPlant) ID() string { return "minecraft:cave_vines_plant" } +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" } +func (SmallDripleaf) ID() string { return "minecraft:small_dripleaf" } +func (HangingRoots) ID() string { return "minecraft:hanging_roots" } +func (RootedDirt) ID() string { return "minecraft:rooted_dirt" } +func (Mud) ID() string { return "minecraft:mud" } +func (Deepslate) ID() string { return "minecraft:deepslate" } +func (CobbledDeepslate) ID() string { return "minecraft:cobbled_deepslate" } +func (CobbledDeepslateStairs) ID() string { return "minecraft:cobbled_deepslate_stairs" } +func (CobbledDeepslateSlab) ID() string { return "minecraft:cobbled_deepslate_slab" } +func (CobbledDeepslateWall) ID() string { return "minecraft:cobbled_deepslate_wall" } +func (PolishedDeepslate) ID() string { return "minecraft:polished_deepslate" } +func (PolishedDeepslateStairs) ID() string { return "minecraft:polished_deepslate_stairs" } +func (PolishedDeepslateSlab) ID() string { return "minecraft:polished_deepslate_slab" } +func (PolishedDeepslateWall) ID() string { return "minecraft:polished_deepslate_wall" } +func (DeepslateTiles) ID() string { return "minecraft:deepslate_tiles" } +func (DeepslateTileStairs) ID() string { return "minecraft:deepslate_tile_stairs" } +func (DeepslateTileSlab) ID() string { return "minecraft:deepslate_tile_slab" } +func (DeepslateTileWall) ID() string { return "minecraft:deepslate_tile_wall" } +func (DeepslateBricks) ID() string { return "minecraft:deepslate_bricks" } +func (DeepslateBrickStairs) ID() string { return "minecraft:deepslate_brick_stairs" } +func (DeepslateBrickSlab) ID() string { return "minecraft:deepslate_brick_slab" } +func (DeepslateBrickWall) ID() string { return "minecraft:deepslate_brick_wall" } +func (ChiseledDeepslate) ID() string { return "minecraft:chiseled_deepslate" } +func (CrackedDeepslateBricks) ID() string { return "minecraft:cracked_deepslate_bricks" } +func (CrackedDeepslateTiles) ID() string { return "minecraft:cracked_deepslate_tiles" } +func (InfestedDeepslate) ID() string { return "minecraft:infested_deepslate" } +func (SmoothBasalt) ID() string { return "minecraft:smooth_basalt" } +func (RawIronBlock) ID() string { return "minecraft:raw_iron_block" } +func (RawCopperBlock) ID() string { return "minecraft:raw_copper_block" } +func (RawGoldBlock) ID() string { return "minecraft:raw_gold_block" } +func (PottedAzaleaBush) ID() string { return "minecraft:potted_azalea_bush" } +func (PottedFloweringAzaleaBush) ID() string { return "minecraft:potted_flowering_azalea_bush" } +func (OchreFroglight) ID() string { return "minecraft:ochre_froglight" } +func (VerdantFroglight) ID() string { return "minecraft:verdant_froglight" } +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" } +func (Crafter) ID() string { return "minecraft:crafter" } +func (TrialSpawner) ID() string { return "minecraft:trial_spawner" } var FromID = map[string]Block{ "minecraft:air": Air{}, @@ -4348,7 +4645,7 @@ var FromID = map[string]Block{ "minecraft:detector_rail": DetectorRail{}, "minecraft:sticky_piston": StickyPiston{}, "minecraft:cobweb": Cobweb{}, - "minecraft:grass": Grass{}, + "minecraft:short_grass": ShortGrass{}, "minecraft:fern": Fern{}, "minecraft:dead_bush": DeadBush{}, "minecraft:seagrass": Seagrass{}, @@ -4480,7 +4777,6 @@ var FromID = map[string]Block{ "minecraft:sugar_cane": SugarCane{}, "minecraft:jukebox": Jukebox{}, "minecraft:oak_fence": OakFence{}, - "minecraft:pumpkin": Pumpkin{}, "minecraft:netherrack": Netherrack{}, "minecraft:soul_sand": SoulSand{}, "minecraft:soul_soil": SoulSoil{}, @@ -4537,6 +4833,7 @@ var FromID = map[string]Block{ "minecraft:iron_bars": IronBars{}, "minecraft:chain": Chain{}, "minecraft:glass_pane": GlassPane{}, + "minecraft:pumpkin": Pumpkin{}, "minecraft:melon": Melon{}, "minecraft:attached_pumpkin_stem": AttachedPumpkinStem{}, "minecraft:attached_melon_stem": AttachedMelonStem{}, @@ -5135,6 +5432,19 @@ var FromID = map[string]Block{ "minecraft:medium_amethyst_bud": MediumAmethystBud{}, "minecraft:small_amethyst_bud": SmallAmethystBud{}, "minecraft:tuff": Tuff{}, + "minecraft:tuff_slab": TuffSlab{}, + "minecraft:tuff_stairs": TuffStairs{}, + "minecraft:tuff_wall": TuffWall{}, + "minecraft:polished_tuff": PolishedTuff{}, + "minecraft:polished_tuff_slab": PolishedTuffSlab{}, + "minecraft:polished_tuff_stairs": PolishedTuffStairs{}, + "minecraft:polished_tuff_wall": PolishedTuffWall{}, + "minecraft:chiseled_tuff": ChiseledTuff{}, + "minecraft:tuff_bricks": TuffBricks{}, + "minecraft:tuff_brick_slab": TuffBrickSlab{}, + "minecraft:tuff_brick_stairs": TuffBrickStairs{}, + "minecraft:tuff_brick_wall": TuffBrickWall{}, + "minecraft:chiseled_tuff_bricks": ChiseledTuffBricks{}, "minecraft:calcite": Calcite{}, "minecraft:tinted_glass": TintedGlass{}, "minecraft:powder_snow": PowderSnow{}, @@ -5144,16 +5454,24 @@ var FromID = map[string]Block{ "minecraft:sculk_vein": SculkVein{}, "minecraft:sculk_catalyst": SculkCatalyst{}, "minecraft:sculk_shrieker": SculkShrieker{}, - "minecraft:oxidized_copper": OxidizedCopper{}, - "minecraft:weathered_copper": WeatheredCopper{}, - "minecraft:exposed_copper": ExposedCopper{}, "minecraft:copper_block": CopperBlock{}, + "minecraft:exposed_copper": ExposedCopper{}, + "minecraft:weathered_copper": WeatheredCopper{}, + "minecraft:oxidized_copper": OxidizedCopper{}, "minecraft:copper_ore": CopperOre{}, "minecraft:deepslate_copper_ore": DeepslateCopperOre{}, "minecraft:oxidized_cut_copper": OxidizedCutCopper{}, "minecraft:weathered_cut_copper": WeatheredCutCopper{}, "minecraft:exposed_cut_copper": ExposedCutCopper{}, "minecraft:cut_copper": CutCopper{}, + "minecraft:oxidized_chiseled_copper": OxidizedChiseledCopper{}, + "minecraft:weathered_chiseled_copper": WeatheredChiseledCopper{}, + "minecraft:exposed_chiseled_copper": ExposedChiseledCopper{}, + "minecraft:chiseled_copper": ChiseledCopper{}, + "minecraft:waxed_oxidized_chiseled_copper": WaxedOxidizedChiseledCopper{}, + "minecraft:waxed_weathered_chiseled_copper": WaxedWeatheredChiseledCopper{}, + "minecraft:waxed_exposed_chiseled_copper": WaxedExposedChiseledCopper{}, + "minecraft:waxed_chiseled_copper": WaxedChiseledCopper{}, "minecraft:oxidized_cut_copper_stairs": OxidizedCutCopperStairs{}, "minecraft:weathered_cut_copper_stairs": WeatheredCutCopperStairs{}, "minecraft:exposed_cut_copper_stairs": ExposedCutCopperStairs{}, @@ -5178,6 +5496,38 @@ var FromID = map[string]Block{ "minecraft:waxed_weathered_cut_copper_slab": WaxedWeatheredCutCopperSlab{}, "minecraft:waxed_exposed_cut_copper_slab": WaxedExposedCutCopperSlab{}, "minecraft:waxed_cut_copper_slab": WaxedCutCopperSlab{}, + "minecraft:copper_door": CopperDoor{}, + "minecraft:exposed_copper_door": ExposedCopperDoor{}, + "minecraft:oxidized_copper_door": OxidizedCopperDoor{}, + "minecraft:weathered_copper_door": WeatheredCopperDoor{}, + "minecraft:waxed_copper_door": WaxedCopperDoor{}, + "minecraft:waxed_exposed_copper_door": WaxedExposedCopperDoor{}, + "minecraft:waxed_oxidized_copper_door": WaxedOxidizedCopperDoor{}, + "minecraft:waxed_weathered_copper_door": WaxedWeatheredCopperDoor{}, + "minecraft:copper_trapdoor": CopperTrapdoor{}, + "minecraft:exposed_copper_trapdoor": ExposedCopperTrapdoor{}, + "minecraft:oxidized_copper_trapdoor": OxidizedCopperTrapdoor{}, + "minecraft:weathered_copper_trapdoor": WeatheredCopperTrapdoor{}, + "minecraft:waxed_copper_trapdoor": WaxedCopperTrapdoor{}, + "minecraft:waxed_exposed_copper_trapdoor": WaxedExposedCopperTrapdoor{}, + "minecraft:waxed_oxidized_copper_trapdoor": WaxedOxidizedCopperTrapdoor{}, + "minecraft:waxed_weathered_copper_trapdoor": WaxedWeatheredCopperTrapdoor{}, + "minecraft:copper_grate": CopperGrate{}, + "minecraft:exposed_copper_grate": ExposedCopperGrate{}, + "minecraft:weathered_copper_grate": WeatheredCopperGrate{}, + "minecraft:oxidized_copper_grate": OxidizedCopperGrate{}, + "minecraft:waxed_copper_grate": WaxedCopperGrate{}, + "minecraft:waxed_exposed_copper_grate": WaxedExposedCopperGrate{}, + "minecraft:waxed_weathered_copper_grate": WaxedWeatheredCopperGrate{}, + "minecraft:waxed_oxidized_copper_grate": WaxedOxidizedCopperGrate{}, + "minecraft:copper_bulb": CopperBulb{}, + "minecraft:exposed_copper_bulb": ExposedCopperBulb{}, + "minecraft:weathered_copper_bulb": WeatheredCopperBulb{}, + "minecraft:oxidized_copper_bulb": OxidizedCopperBulb{}, + "minecraft:waxed_copper_bulb": WaxedCopperBulb{}, + "minecraft:waxed_exposed_copper_bulb": WaxedExposedCopperBulb{}, + "minecraft:waxed_weathered_copper_bulb": WaxedWeatheredCopperBulb{}, + "minecraft:waxed_oxidized_copper_bulb": WaxedOxidizedCopperBulb{}, "minecraft:lightning_rod": LightningRod{}, "minecraft:pointed_dripstone": PointedDripstone{}, "minecraft:dripstone_block": DripstoneBlock{}, @@ -5228,4 +5578,6 @@ var FromID = map[string]Block{ "minecraft:frogspawn": Frogspawn{}, "minecraft:reinforced_deepslate": ReinforcedDeepslate{}, "minecraft:decorated_pot": DecoratedPot{}, + "minecraft:crafter": Crafter{}, + "minecraft:trial_spawner": TrialSpawner{}, } diff --git a/level/block/blocks.nbt b/level/block/blocks.nbt index 6551917..65e2337 100644 Binary files a/level/block/blocks.nbt and b/level/block/blocks.nbt differ diff --git a/level/block/properties_enum.go b/level/block/properties_enum.go index a5a5aba..fad14bd 100644 --- a/level/block/properties_enum.go +++ b/level/block/properties_enum.go @@ -1000,3 +1000,14 @@ func (f *FrontAndTop) UnmarshalText(text []byte) error { } return nil } + +type TrialSpawnerState = string + +const ( + TrailSpawnerActive = "active" + TrailSpawnerCooldown = "cooldown" + TrailSpawnerEjectingReward = "ejecting_reward" + TrailSpawnerInactive = "inactive" + TrailSpawnerWaitingForPlayers = "waiting_for_players" + TrailSpawnerWaitingForRewardEjection = "waiting_for_reward_ejection" +) \ No newline at end of file