From 6eee543a3367d38a6f0e9bffb457a2bd76a8f9cc Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Sat, 12 Nov 2022 23:54:05 -0600 Subject: Pathfinder (#25) Pathfinding is very much not done, but it works enough and I want to get this merged. TODO: fast replanning, goals that aren't a single node, falling moves (it should be able to play the dropper), parkour moves --- codegen/.gitignore | 0 codegen/README.md | 0 codegen/genblocks.py | 0 codegen/genregistries.py | 0 codegen/lib/code/blocks.py | 0 codegen/lib/code/entity.py | 36 +++++++++++++++++++++++++++++++++++- codegen/lib/code/packet.py | 0 codegen/lib/code/registry.py | 0 codegen/lib/code/shapes.py | 0 codegen/lib/code/utils.py | 0 codegen/lib/code/version.py | 0 codegen/lib/download.py | 0 codegen/lib/extract.py | 0 codegen/lib/mappings.py | 0 codegen/lib/utils.py | 0 codegen/migrate.py | 0 codegen/newpacket.py | 0 17 files changed, 35 insertions(+), 1 deletion(-) mode change 100644 => 100755 codegen/.gitignore mode change 100644 => 100755 codegen/README.md mode change 100644 => 100755 codegen/genblocks.py mode change 100644 => 100755 codegen/genregistries.py mode change 100644 => 100755 codegen/lib/code/blocks.py mode change 100644 => 100755 codegen/lib/code/packet.py mode change 100644 => 100755 codegen/lib/code/registry.py mode change 100644 => 100755 codegen/lib/code/shapes.py mode change 100644 => 100755 codegen/lib/code/utils.py mode change 100644 => 100755 codegen/lib/code/version.py mode change 100644 => 100755 codegen/lib/download.py mode change 100644 => 100755 codegen/lib/extract.py mode change 100644 => 100755 codegen/lib/mappings.py mode change 100644 => 100755 codegen/lib/utils.py mode change 100644 => 100755 codegen/migrate.py mode change 100644 => 100755 codegen/newpacket.py (limited to 'codegen') diff --git a/codegen/.gitignore b/codegen/.gitignore old mode 100644 new mode 100755 diff --git a/codegen/README.md b/codegen/README.md old mode 100644 new mode 100755 diff --git a/codegen/genblocks.py b/codegen/genblocks.py old mode 100644 new mode 100755 diff --git a/codegen/genregistries.py b/codegen/genregistries.py old mode 100644 new mode 100755 diff --git a/codegen/lib/code/blocks.py b/codegen/lib/code/blocks.py old mode 100644 new mode 100755 diff --git a/codegen/lib/code/entity.py b/codegen/lib/code/entity.py index 13f99022..9b976ef6 100644 --- a/codegen/lib/code/entity.py +++ b/codegen/lib/code/entity.py @@ -44,7 +44,7 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings): code.append('use azalea_block::BlockState;') code.append('use azalea_chat::Component;') code.append('use azalea_core::{BlockPos, Direction, Particle, Slot};') - code.append('use std::{collections::VecDeque, ops::Deref};') + code.append('use std::{collections::VecDeque, ops::{Deref, DerefMut}};') code.append('use uuid::Uuid;') code.append('') @@ -271,6 +271,10 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings): code.append( f'fn deref(&self) -> &Self::Target {{ &self.{parent_field_name} }}') code.append('}') + code.append(f'impl DerefMut for {struct_name} {{') + code.append( + f'fn deref_mut(&mut self) -> &mut Self::Target {{ &mut self.{parent_field_name} }}') + code.append('}') code.append('') # make the EntityMetadata enum from entity_structs @@ -309,6 +313,36 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings): code.append('}') code.append('') + # impl Deref for EntityMetadata { + # type Target = AbstractEntity; + # fn deref(&self) -> &Self::Target { + # match self { + # EntityMetadata::Allay(entity) => entity, + # _ => {} + # } + # } + # } + code.append('impl Deref for EntityMetadata {') + code.append('type Target = AbstractEntity;') + code.append('fn deref(&self) -> &Self::Target {') + code.append('match self {') + for struct_name in entity_structs: + code.append( + f'EntityMetadata::{struct_name}(entity) => entity,') + code.append('}') + code.append('}') + code.append('}') + code.append('impl DerefMut for EntityMetadata {') + code.append('fn deref_mut(&mut self) -> &mut Self::Target {') + code.append('match self {') + for struct_name in entity_structs: + code.append( + f'EntityMetadata::{struct_name}(entity) => entity,') + code.append('}') + code.append('}') + code.append('}') + code.append('') + with open(METADATA_RS_DIR, 'w') as f: f.write('\n'.join(code)) diff --git a/codegen/lib/code/packet.py b/codegen/lib/code/packet.py old mode 100644 new mode 100755 diff --git a/codegen/lib/code/registry.py b/codegen/lib/code/registry.py old mode 100644 new mode 100755 diff --git a/codegen/lib/code/shapes.py b/codegen/lib/code/shapes.py old mode 100644 new mode 100755 diff --git a/codegen/lib/code/utils.py b/codegen/lib/code/utils.py old mode 100644 new mode 100755 diff --git a/codegen/lib/code/version.py b/codegen/lib/code/version.py old mode 100644 new mode 100755 diff --git a/codegen/lib/download.py b/codegen/lib/download.py old mode 100644 new mode 100755 diff --git a/codegen/lib/extract.py b/codegen/lib/extract.py old mode 100644 new mode 100755 diff --git a/codegen/lib/mappings.py b/codegen/lib/mappings.py old mode 100644 new mode 100755 diff --git a/codegen/lib/utils.py b/codegen/lib/utils.py old mode 100644 new mode 100755 diff --git a/codegen/migrate.py b/codegen/migrate.py old mode 100644 new mode 100755 diff --git a/codegen/newpacket.py b/codegen/newpacket.py old mode 100644 new mode 100755 -- cgit v1.2.3