From 7d901e39bc10a855b545d7b6c167f45148a1fb0a Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:09:58 -0600 Subject: 1.19.3 (#34) * start updating to 22w42a * work a bit more on 22w42a * player chat packet * serverbound hello packet * Update mod.rs * add more stuff to clientbound player chat packet * ClientboundPlayerInfoUpdatePacket * features enabled and container closed * serverbound chat packets * make it compile * 22w43a * ServerboundChatSessionUpdatePacket * profile_public_key isn't Option anymore * Update bitset.rs * joining a server works * fix entitydatavalue * backtraces + fix clientbound chat message * fix some warnings and add more ecomments * 22w44a * generate en_us.json * add updating guide to codegen/readme * fix some markdown * update list of generated things * metadata stuff * Replace PJS generator mod with PixLyzer (#38) * pixlizer extractor * start working on shape extraction * fix generating language * fix pixlyzer shape generation * use empty_shape * generate blocks and shapes * update pixlyzer dir * Revert "update pixlyzer dir" This reverts commit ee9a0e7a49936dd8569c610ba9b6455895eeff71. * fix * fix * Revert "fix" This reverts commit ad12ddcb009ccc4eeb13ddef0871db1d9322ab7d. * fix * detect pixlyzer fail * fix pixlyzer * 22w45a * gen entities * add async-trait dep * update codegen/readme.md * explain when rust_log should be used * remove some unused code * start fixing pixlyzer issues * fix a thing in codegen * almost fixed * more progress towards 1.19.3 * 1.19.3-pre2 * fixes * revert some hardcoded property names * Delete clientbound_player_info_packet.rs * handle 1.19.3 player info packets * handle playerinforemove * start updating to 1.19.3-rc1 * optional registries work * fix some issues with 1.19.3 chat doesn't work yet * aaaaaaaaaaaaaaaaa * oh * ignore unused shapes * uncomment generate_blocks * fix migrate * 1.19.3-rc2 * fix clippy warnings * 1.19.3-rc3 * split the azalea-buf macro into separate modules * improve Recipe in protocol * 1.19.3 --- codegen/lib/code/registry.py | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'codegen/lib/code/registry.py') diff --git a/codegen/lib/code/registry.py b/codegen/lib/code/registry.py index c22eefe9..4df82c09 100755 --- a/codegen/lib/code/registry.py +++ b/codegen/lib/code/registry.py @@ -9,8 +9,45 @@ REGISTRIES_DIR = get_dir_location('../azalea-registry/src/lib.rs') def generate_registries(registries: dict): code = [] - code.append('use azalea_registry_macros::registry;') - code.append('') + code.append('''// This file is automatically generated in codegen/lib/code/registry.py + +use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable}; +use azalea_registry_macros::registry; +use std::io::{Cursor, Write}; + +pub trait Registry +where + Self: Sized, +{ + fn from_u32(value: u32) -> Option; + fn to_u32(&self) -> u32; +} + +/// A registry that might not be present. This is transmitted as a single +/// varint in the protocol. +#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +pub struct OptionalRegistry(Option); + +impl McBufReadable for OptionalRegistry { + fn read_from(buf: &mut Cursor<&[u8]>) -> Result { + Ok(OptionalRegistry(match u32::var_read_from(buf)? { + 0 => None, + value => Some( + T::from_u32(value - 1) + .ok_or(BufReadError::UnexpectedEnumVariant { id: value as i32 })?, + ), + })) + } +} +impl McBufWritable for OptionalRegistry { + fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + match &self.0 { + None => 0u32.var_write_into(buf), + Some(value) => (value.to_u32() + 1).var_write_into(buf), + } + } +} +''') for registry_name, registry in registries.items(): # registry!(Block, { -- cgit v1.2.3