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

fix: < 26.1 Support

Browse Source
This commit is contained in:
Alexander Medvedev 2026-03-31 09:44:08 +02:00
parent 3c43f9715e
commit a111cf3f20
6 changed files with 14860 additions and 12617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/viaversion/data/mappings-1.21.11to26.1.nbt Normal file
View File

Binary file not shown.

1
pumpkin-codegen/Cargo.lock generated
View File

@ -615,6 +615,7 @@ name = "pumpkin-codecs"
version = "0.1.0-dev+26.1" version = "0.1.0-dev+26.1"
dependencies = [ dependencies = [
"dashmap", "dashmap",
"either",
"serde_json", "serde_json",
"tracing", "tracing",
] ]

7
pumpkin-codegen/src/remap/block_state.rs
View File

@ -42,6 +42,11 @@ pub fn build() -> TokenStream {
value: "../assets/viaversion/data/mappings-1.21.9to1.21.11.nbt", value: "../assets/viaversion/data/mappings-1.21.9to1.21.11.nbt",
child: Some(&node_1_21_7), child: Some(&node_1_21_7),
}; };
let node_1_21_11 = MappingNode {
version: MinecraftVersion::V_1_21_11,
value: "../assets/viaversion/data/mappings-1.21.11to26.1.nbt",
child: Some(&node_1_21_9),
};
let remapper: Remapper<_, Option<Vec<u16>>> = Remapper { let remapper: Remapper<_, Option<Vec<u16>>> = Remapper {
version: MinecraftVersion::V_26_1, version: MinecraftVersion::V_26_1,
@ -66,7 +71,7 @@ pub fn build() -> TokenStream {
}, },
}; };
let all_mappings = remapper.process(&node_1_21_9); let all_mappings = remapper.process(&node_1_21_11);
let mut static_values = TokenStream::new(); let mut static_values = TokenStream::new();
let mut match_arms = TokenStream::new(); let mut match_arms = TokenStream::new();

27461
pumpkin-data/src/generated/block_state_remap.rs
View File

File diff suppressed because it is too large Load Diff

2
pumpkin-protocol/src/java/client/play/chunk_data.rs
View File

@ -61,8 +61,10 @@ impl ClientPacket for CChunkData<'_> {
for (block_palette, biome_palette) in block_sections.iter().zip(biome_sections.iter()) { for (block_palette, biome_palette) in block_sections.iter().zip(biome_sections.iter()) {
let non_empty_block_count = block_palette.non_air_block_count() as i16; let non_empty_block_count = block_palette.non_air_block_count() as i16;
blocks_and_biomes_buf.write_i16_be(non_empty_block_count)?; blocks_and_biomes_buf.write_i16_be(non_empty_block_count)?;
if version >= &MinecraftVersion::V_26_1 {
// TODO: New in 26.1, fluid count // TODO: New in 26.1, fluid count
blocks_and_biomes_buf.write_i16_be(0)?; blocks_and_biomes_buf.write_i16_be(0)?;
}
let mut block_network = block_palette.convert_network(); let mut block_network = block_palette.convert_network();
match &mut block_network.palette { match &mut block_network.palette {

2
pumpkin/src/net/java/config.rs
View File

@ -181,7 +181,7 @@ impl JavaClient {
]; ];
// optionally include timeline/dimension_type if there are any tags to send // optionally include timeline/dimension_type if there are any tags to send
if self.version.load().protocol_version() >= MinecraftVersion::V_26_1.protocol_version() if self.version.load().protocol_version() >= MinecraftVersion::V_1_21_11.protocol_version()
&& let Some(map) = pumpkin_data::tag::get_registry_key_tags( && let Some(map) = pumpkin_data::tag::get_registry_key_tags(
self.version.load(), self.version.load(),
pumpkin_data::tag::RegistryKey::Timeline, pumpkin_data::tag::RegistryKey::Timeline,