Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.21.7

Browse Source
This commit is contained in:
Alexander Medvedev 2025-06-30 23:41:23 +02:00
parent 637aada913
commit c67d4cfd2e
18 changed files with 23767 additions and 23693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Cargo.lock generated
View File

@ -224,9 +224,9 @@ dependencies = [
[[package]]
name = "bumpalo"
version = "3.18.1"
version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
[[package]]
name = "bytes"
@ -539,9 +539,9 @@ dependencies = [
[[package]]
name = "crunchy"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "crypto-bigint"
@ -991,9 +991,9 @@ dependencies = [
[[package]]
name = "h2"
version = "0.4.10"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
dependencies = [
"atomic-waker",
"bytes",
@ -1890,7 +1890,7 @@ dependencies = [
[[package]]
name = "pumpkin"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"async-trait",
"base64",
@ -1938,7 +1938,7 @@ dependencies = [
[[package]]
name = "pumpkin-api-macros"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"proc-macro-error2",
"proc-macro2",
@ -1948,7 +1948,7 @@ dependencies = [
[[package]]
name = "pumpkin-config"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"log",
"pumpkin-util",
@ -1959,7 +1959,7 @@ dependencies = [
[[package]]
name = "pumpkin-data"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"heck",
"proc-macro2",
@ -1973,7 +1973,7 @@ dependencies = [
[[package]]
name = "pumpkin-inventory"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"async-trait",
"crossbeam-utils",
@ -1990,7 +1990,7 @@ dependencies = [
[[package]]
name = "pumpkin-macros"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"heck",
"proc-macro-error2",
@ -2001,7 +2001,7 @@ dependencies = [
[[package]]
name = "pumpkin-nbt"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"bytes",
"cesu8",
@ -2013,7 +2013,7 @@ dependencies = [
[[package]]
name = "pumpkin-protocol"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"aes",
"async-compression",
@ -2036,7 +2036,7 @@ dependencies = [
[[package]]
name = "pumpkin-registry"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"indexmap",
"pumpkin-data",
@ -2049,7 +2049,7 @@ dependencies = [
[[package]]
name = "pumpkin-util"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"bytes",
"colored",
@ -2069,7 +2069,7 @@ dependencies = [
[[package]]
name = "pumpkin-world"
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
dependencies = [
"async-trait",
"bitflags 2.9.1",
@ -2267,9 +2267,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
version = "0.12.20"
version = "0.12.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
checksum = "4c8cea6b35bcceb099f30173754403d2eba0a5dc18cea3630fccd88251909288"
dependencies = [
"base64",
"bytes",
@ -3393,9 +3393,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
[[package]]
name = "windows-registry"
version = "0.5.2"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
dependencies = [
"windows-link",
"windows-result",

2
Cargo.toml
View File

@ -14,7 +14,7 @@ members = [
]
[workspace.package]
version = "0.1.0-dev+1.21.6"
version = "0.1.0-dev+1.21.7"
edition = "2024"

2
README.md
View File

@ -5,7 +5,7 @@
![CI](https://github.com/Snowiiii/Pumpkin/actions/workflows/rust.yml/badge.svg)
[![Discord](https://img.shields.io/discord/1268592337445978193.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/wT8XjrjKkf)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
![Current version)](https://img.shields.io/badge/current_version-1.21.6-blue)
![Current version)](https://img.shields.io/badge/current_version-1.21.7-blue)
</div>

1706
assets/blocks.json
View File

File diff suppressed because it is too large Load Diff

1726
assets/density_function.json
View File

File diff suppressed because it is too large Load Diff

5
assets/en_us.json
View File

@ -4355,6 +4355,8 @@
"item.minecraft.music_disc_creator.desc": "Lena Raine - Creator",
"item.minecraft.music_disc_far": "Music Disc",
"item.minecraft.music_disc_far.desc": "C418 - far",
"item.minecraft.music_disc_lava_chicken": "Music Disc",
"item.minecraft.music_disc_lava_chicken.desc": "Hyper Potions - Lava Chicken",
"item.minecraft.music_disc_mall": "Music Disc",
"item.minecraft.music_disc_mall.desc": "C418 - mall",
"item.minecraft.music_disc_mellohi": "Music Disc",
@ -4751,6 +4753,7 @@
"jukebox_song.minecraft.creator": "Lena Raine - Creator",
"jukebox_song.minecraft.creator_music_box": "Lena Raine - Creator (Music Box)",
"jukebox_song.minecraft.far": "C418 - far",
"jukebox_song.minecraft.lava_chicken": "Hyper Potions - Lava Chicken",
"jukebox_song.minecraft.mall": "C418 - mall",
"jukebox_song.minecraft.mellohi": "C418 - mellohi",
"jukebox_song.minecraft.otherside": "Lena Raine - otherside",
@ -5816,6 +5819,8 @@
"painting.minecraft.courbet.title": "Bonjour Monsieur Courbet",
"painting.minecraft.creebet.author": "Kristoffer Zetterstrand",
"painting.minecraft.creebet.title": "Creebet",
"painting.minecraft.dennis.author": "Sarah Boeving",
"painting.minecraft.dennis.title": "Dennis",
"painting.minecraft.donkey_kong.author": "Kristoffer Zetterstrand",
"painting.minecraft.donkey_kong.title": "Kong",
"painting.minecraft.earth.author": "Mojang",

27
assets/entities.json
View File

@ -6448,6 +6448,33 @@
"condition": "minecraft:random_chance_with_enchanted_bonus"
}
]
},
{
"rolls": 1.0,
"bonus_rolls": 0.0,
"entries": [
{
"name": "minecraft:music_disc_lava_chicken",
"type": "minecraft:item"
}
],
"conditions": [
{
"condition": "minecraft:killed_by_player"
},
{
"predicate": {
"vehicle": {
"type": "minecraft:chicken"
},
"flags": {
"is_baby": true
}
},
"entity": "this",
"condition": "minecraft:entity_properties"
}
]
}
]
},

23326
assets/items.json
View File

File diff suppressed because it is too large Load Diff

2
assets/packets.json
View File

@ -1,5 +1,5 @@
{
"version": 771,
"version": 772,
"serverbound": {
"handshake": [
"intention"

76
assets/properties.json
View File

@ -210,7 +210,7 @@
"type": "boolean"
},
{
"hash_key": 347116706,
"hash_key": 1113709830,
"enum_name": "horizontal_axis",
"serialized_name": "axis",
"type": "enum",
@ -220,7 +220,7 @@
]
},
{
"hash_key": -1818407380,
"hash_key": -929870136,
"enum_name": "axis",
"serialized_name": "axis",
"type": "enum",
@ -267,7 +267,7 @@
"type": "boolean"
},
{
"hash_key": -149681896,
"hash_key": 615899206,
"enum_name": "facing",
"serialized_name": "facing",
"type": "enum",
@ -281,7 +281,7 @@
]
},
{
"hash_key": -381020761,
"hash_key": -1836519164,
"enum_name": "hopper_facing",
"serialized_name": "facing",
"type": "enum",
@ -294,7 +294,7 @@
]
},
{
"hash_key": 552315733,
"hash_key": 1449460846,
"enum_name": "horizontal_facing",
"serialized_name": "facing",
"type": "enum",
@ -322,7 +322,7 @@
"max": 4
},
{
"hash_key": 1361129526,
"hash_key": 704752987,
"enum_name": "orientation",
"serialized_name": "orientation",
"type": "enum",
@ -342,7 +342,7 @@
]
},
{
"hash_key": 2101252584,
"hash_key": -589629896,
"enum_name": "block_face",
"serialized_name": "face",
"type": "enum",
@ -353,7 +353,7 @@
]
},
{
"hash_key": -2113430785,
"hash_key": -706159110,
"enum_name": "attachment",
"serialized_name": "attachment",
"type": "enum",
@ -365,7 +365,7 @@
]
},
{
"hash_key": -1120959615,
"hash_key": -1010454105,
"enum_name": "east_wall_shape",
"serialized_name": "east",
"type": "enum",
@ -376,7 +376,7 @@
]
},
{
"hash_key": 2037989241,
"hash_key": -2146472545,
"enum_name": "north_wall_shape",
"serialized_name": "north",
"type": "enum",
@ -387,7 +387,7 @@
]
},
{
"hash_key": -2113742927,
"hash_key": -2003237417,
"enum_name": "south_wall_shape",
"serialized_name": "south",
"type": "enum",
@ -398,7 +398,7 @@
]
},
{
"hash_key": -1104217073,
"hash_key": -993711563,
"enum_name": "west_wall_shape",
"serialized_name": "west",
"type": "enum",
@ -409,7 +409,7 @@
]
},
{
"hash_key": 406520518,
"hash_key": -891207346,
"enum_name": "east_wire_connection",
"serialized_name": "east",
"type": "enum",
@ -420,7 +420,7 @@
]
},
{
"hash_key": -729497922,
"hash_key": -2027225786,
"enum_name": "north_wire_connection",
"serialized_name": "north",
"type": "enum",
@ -431,7 +431,7 @@
]
},
{
"hash_key": -586262794,
"hash_key": -1883990658,
"enum_name": "south_wire_connection",
"serialized_name": "south",
"type": "enum",
@ -442,7 +442,7 @@
]
},
{
"hash_key": 423263060,
"hash_key": -874464804,
"enum_name": "west_wire_connection",
"serialized_name": "west",
"type": "enum",
@ -453,7 +453,7 @@
]
},
{
"hash_key": -308005712,
"hash_key": 1994141019,
"enum_name": "double_block_half",
"serialized_name": "half",
"type": "enum",
@ -463,7 +463,7 @@
]
},
{
"hash_key": 1979767873,
"hash_key": 1394210966,
"enum_name": "block_half",
"serialized_name": "half",
"type": "enum",
@ -473,7 +473,7 @@
]
},
{
"hash_key": -814604287,
"hash_key": -862394631,
"enum_name": "rail_shape",
"serialized_name": "shape",
"type": "enum",
@ -491,7 +491,7 @@
]
},
{
"hash_key": -993960287,
"hash_key": -460429633,
"enum_name": "straight_rail_shape",
"serialized_name": "shape",
"type": "enum",
@ -737,7 +737,7 @@
"max": 15
},
{
"hash_key": -1895516851,
"hash_key": -73964960,
"enum_name": "bed_part",
"serialized_name": "part",
"type": "enum",
@ -747,7 +747,7 @@
]
},
{
"hash_key": 1073637128,
"hash_key": 1679311508,
"enum_name": "chest_type",
"serialized_name": "type",
"type": "enum",
@ -758,7 +758,7 @@
]
},
{
"hash_key": 767997821,
"hash_key": -2002778816,
"enum_name": "comparator_mode",
"serialized_name": "mode",
"type": "enum",
@ -768,7 +768,7 @@
]
},
{
"hash_key": -670463916,
"hash_key": -1919073909,
"enum_name": "door_hinge",
"serialized_name": "hinge",
"type": "enum",
@ -778,7 +778,7 @@
]
},
{
"hash_key": -1071798941,
"hash_key": 33001972,
"enum_name": "instrument",
"serialized_name": "instrument",
"type": "enum",
@ -809,7 +809,7 @@
]
},
{
"hash_key": 707419896,
"hash_key": 1871285261,
"enum_name": "piston_type",
"serialized_name": "type",
"type": "enum",
@ -819,7 +819,7 @@
]
},
{
"hash_key": 1852158516,
"hash_key": -905394011,
"enum_name": "slab_type",
"serialized_name": "type",
"type": "enum",
@ -830,7 +830,7 @@
]
},
{
"hash_key": -694595114,
"hash_key": -1740411902,
"enum_name": "stair_shape",
"serialized_name": "shape",
"type": "enum",
@ -843,7 +843,7 @@
]
},
{
"hash_key": 1654439448,
"hash_key": -1314672541,
"enum_name": "structure_block_mode",
"serialized_name": "mode",
"type": "enum",
@ -855,7 +855,7 @@
]
},
{
"hash_key": -222226720,
"hash_key": -920727949,
"enum_name": "bamboo_leaves",
"serialized_name": "leaves",
"type": "enum",
@ -866,7 +866,7 @@
]
},
{
"hash_key": -1800582664,
"hash_key": 2128694890,
"enum_name": "tilt",
"serialized_name": "tilt",
"type": "enum",
@ -878,7 +878,7 @@
]
},
{
"hash_key": 2124793625,
"hash_key": -1223244732,
"enum_name": "vertical_direction",
"serialized_name": "vertical_direction",
"type": "enum",
@ -888,7 +888,7 @@
]
},
{
"hash_key": -287736382,
"hash_key": -533147979,
"enum_name": "thickness",
"serialized_name": "thickness",
"type": "enum",
@ -901,7 +901,7 @@
]
},
{
"hash_key": -1749501666,
"hash_key": -1245005409,
"enum_name": "sculk_sensor_phase",
"serialized_name": "sculk_sensor_phase",
"type": "enum",
@ -968,7 +968,7 @@
"type": "boolean"
},
{
"hash_key": 1455798416,
"hash_key": -357089177,
"enum_name": "trial_spawner_state",
"serialized_name": "trial_spawner_state",
"type": "enum",
@ -982,7 +982,7 @@
]
},
{
"hash_key": -164080597,
"hash_key": 1811178115,
"enum_name": "vault_state",
"serialized_name": "vault_state",
"type": "enum",
@ -994,7 +994,7 @@
]
},
{
"hash_key": 34481979,
"hash_key": -336895357,
"enum_name": "creaking_heart_state",
"serialized_name": "creaking_heart_state",
"type": "enum",
@ -1011,7 +1011,7 @@
"type": "boolean"
},
{
"hash_key": 1067806639,
"hash_key": 1836955881,
"enum_name": "test_block_mode",
"serialized_name": "mode",
"type": "enum",

1
assets/sounds.json
View File

@ -938,6 +938,7 @@
"music_disc.cat",
"music_disc.chirp",
"music_disc.far",
"music_disc.lava_chicken",
"music_disc.mall",
"music_disc.mellohi",
"music_disc.pigstep",

156
assets/spawn_egg.json
View File

@ -1,84 +1,84 @@
{
"1114": "guardian",
"1151": "turtle",
"1147": "strider",
"1142": "sniffer",
"1131": "polar_bear",
"1132": "pufferfish",
"1124": "panda",
"1106": "endermite",
"1135": "salmon",
"1155": "wandering_trader",
"1165": "zombie_villager",
"1085": "armadillo",
"1111": "happy_ghast",
"1097": "cod",
"1161": "zoglin",
"1163": "zombie",
"1137": "shulker",
"1121": "mooshroom",
"1100": "dolphin",
"1096": "chicken",
"1090": "blaze",
"1141": "slime",
"1148": "tadpole",
"1093": "cat",
"1102": "drowned",
"1118": "iron_golem",
"1133": "rabbit",
"1125": "parrot",
"1138": "silverfish",
"1105": "enderman",
"1166": "zombified_piglin",
"1095": "cave_spider",
"1136": "sheep",
"1144": "spider",
"1128": "piglin",
"1134": "ravager",
"1127": "pig",
"1139": "skeleton",
"1156": "warden",
"1120": "magma_cube",
"1150": "tropical_fish",
"1103": "elder_guardian",
"1099": "creeper",
"1108": "fox",
"1119": "llama",
"1089": "bee",
"1092": "breeze",
"1115": "hoglin",
"1126": "phantom",
"1160": "wolf",
"1159": "wither_skeleton",
"1117": "husk",
"1153": "villager",
"1113": "goat",
"1094": "camel",
"1112": "glow_squid",
"1140": "skeleton_horse",
"1104": "ender_dragon",
"1110": "ghast",
"1143": "snow_golem",
"1091": "bogged",
"1158": "wither",
"1122": "mule",
"1086": "allay",
"1129": "piglin_brute",
"1130": "pillager",
"1145": "squid",
"1107": "evoker",
"1146": "stray",
"1149": "trader_llama",
"1152": "vex",
"1123": "ocelot",
"1154": "vindicator",
"1157": "witch",
"1162": "creaking",
"1109": "frog",
"1164": "zombie_horse",
"1104": "ender_dragon",
"1116": "horse",
"1150": "tropical_fish",
"1099": "creeper",
"1153": "villager",
"1090": "blaze",
"1161": "zoglin",
"1146": "stray",
"1155": "wandering_trader",
"1162": "creaking",
"1106": "endermite",
"1127": "pig",
"1103": "elder_guardian",
"1156": "warden",
"1132": "pufferfish",
"1121": "mooshroom",
"1122": "mule",
"1144": "spider",
"1131": "polar_bear",
"1164": "zombie_horse",
"1147": "strider",
"1086": "allay",
"1143": "snow_golem",
"1092": "breeze",
"1097": "cod",
"1087": "axolotl",
"1137": "shulker",
"1108": "fox",
"1085": "armadillo",
"1114": "guardian",
"1140": "skeleton_horse",
"1136": "sheep",
"1111": "happy_ghast",
"1110": "ghast",
"1154": "vindicator",
"1094": "camel",
"1138": "silverfish",
"1117": "husk",
"1119": "llama",
"1134": "ravager",
"1089": "bee",
"1107": "evoker",
"1113": "goat",
"1124": "panda",
"1151": "turtle",
"1163": "zombie",
"1091": "bogged",
"1125": "parrot",
"1149": "trader_llama",
"1159": "wither_skeleton",
"1109": "frog",
"1157": "witch",
"1128": "piglin",
"1123": "ocelot",
"1105": "enderman",
"1093": "cat",
"1129": "piglin_brute",
"1133": "rabbit",
"1135": "salmon",
"1165": "zombie_villager",
"1112": "glow_squid",
"1142": "sniffer",
"1141": "slime",
"1130": "pillager",
"1148": "tadpole",
"1160": "wolf",
"1101": "donkey",
"1088": "bat",
"1118": "iron_golem",
"1158": "wither",
"1126": "phantom",
"1152": "vex",
"1120": "magma_cube",
"1115": "hoglin",
"1096": "chicken",
"1166": "zombified_piglin",
"1098": "cow",
"1087": "axolotl"
"1095": "cave_spider",
"1139": "skeleton",
"1088": "bat",
"1102": "drowned",
"1100": "dolphin"
}

21
assets/synced_registries.json
View File

@ -2315,6 +2315,19 @@
"width": 2,
"height": 1
},
"dennis": {
"asset_id": "minecraft:dennis",
"title": {
"translate": "painting.minecraft.dennis.title",
"color": "yellow"
},
"author": {
"translate": "painting.minecraft.dennis.author",
"color": "gray"
},
"width": 3,
"height": 3
},
"donkey_kong": {
"asset_id": "minecraft:donkey_kong",
"title": {
@ -5475,6 +5488,14 @@
"length_in_seconds": 174.0,
"comparator_output": 5
},
"lava_chicken": {
"sound_event": "minecraft:music_disc.lava_chicken",
"description": {
"translate": "jukebox_song.minecraft.lava_chicken"
},
"length_in_seconds": 134.0,
"comparator_output": 9
},
"mall": {
"sound_event": "minecraft:music_disc.mall",
"description": {

20356
assets/tags.json
View File

File diff suppressed because it is too large Load Diff

4
pumpkin-world/src/chunk/format/anvil.rs
View File

@ -37,8 +37,8 @@ pub const CHUNK_COUNT: usize = REGION_SIZE * REGION_SIZE;
/// The number of bytes in a sector (4 KiB)
const SECTOR_BYTES: usize = 4096;
// 1.21.6
pub const WORLD_DATA_VERSION: i32 = 4435;
// 1.21.7
pub const WORLD_DATA_VERSION: i32 = 4438;
#[derive(Clone, Default)]
pub struct AnvilChunkFormat;

4
pumpkin-world/src/world_info/mod.rs
View File

@ -11,8 +11,8 @@ use crate::generation::Seed;
pub mod anvil;
// Constraint: disk biome palette serialization changed in 1.21.5
pub const MINIMUM_SUPPORTED_WORLD_DATA_VERSION: i32 = 4435; // 1.21.6
pub const MAXIMUM_SUPPORTED_WORLD_DATA_VERSION: i32 = 4435; // 1.21.6
pub const MINIMUM_SUPPORTED_WORLD_DATA_VERSION: i32 = 4435; // 1.21.7
pub const MAXIMUM_SUPPORTED_WORLD_DATA_VERSION: i32 = 4438; // 1.21.7
pub trait WorldInfoReader {
fn read_world_info(&self, level_folder: &Path) -> Result<LevelData, WorldInfoError>;

2
pumpkin/src/net/bedrock/connection.rs
View File

@ -1,4 +1,4 @@
use std::{net::SocketAddr, time::UNIX_EPOCH};
use std::time::UNIX_EPOCH;
use pumpkin_protocol::{
bedrock::{

2
pumpkin/src/server/mod.rs
View File

@ -53,7 +53,7 @@ pub mod seasonal_events;
pub mod tick_rate_manager;
pub mod ticker;
pub const CURRENT_MC_VERSION: &str = "1.21.6";
pub const CURRENT_MC_VERSION: &str = "1.21.7";
/// Represents a Minecraft server instance.
pub struct Server {