From 829462d3b6d22800d9055acece74ac6e24215e7d Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Thu, 24 Jul 2025 12:44:47 -0500
Subject: [PATCH] refactor: move direction & edible into entity submodule

---
 src/entity/blinky.rs          | 2 +-
 src/{ => entity}/direction.rs | 0
 src/{ => entity}/edible.rs    | 2 +-
 src/entity/ghost.rs           | 2 +-
 src/entity/mod.rs             | 4 +++-
 src/entity/pacman.rs          | 3 +--
 src/game.rs                   | 4 ++--
 src/main.rs                   | 2 --
 src/texture/animated.rs       | 2 +-
 src/texture/atlas.rs          | 2 +-
 src/texture/mod.rs            | 2 +-
 11 files changed, 12 insertions(+), 13 deletions(-)
 rename src/{ => entity}/direction.rs (100%)
 rename src/{ => entity}/edible.rs (98%)

diff --git a/src/entity/blinky.rs b/src/entity/blinky.rs
index 7245571..fcfef47 100644
--- a/src/entity/blinky.rs
+++ b/src/entity/blinky.rs
@@ -4,7 +4,7 @@ use std::rc::Rc;
 use sdl2::render::{Canvas, Texture};
 use sdl2::video::Window;
 
-use crate::direction::Direction;
+use crate::entity::direction::Direction;
 use crate::entity::ghost::{Ghost, GhostMode, GhostType};
 use crate::entity::pacman::Pacman;
 use crate::entity::{Entity, Moving, Renderable, StaticEntity};
diff --git a/src/direction.rs b/src/entity/direction.rs
similarity index 100%
rename from src/direction.rs
rename to src/entity/direction.rs
diff --git a/src/edible.rs b/src/entity/edible.rs
similarity index 98%
rename from src/edible.rs
rename to src/entity/edible.rs
index d8306bd..93ecb97 100644
--- a/src/edible.rs
+++ b/src/entity/edible.rs
@@ -1,6 +1,6 @@
 //! Edible entity for Pac-Man: pellets, power pellets, and fruits.
 use crate::constants::{FruitType, MapTile, BOARD_HEIGHT, BOARD_WIDTH};
-use crate::direction::Direction;
+use crate::entity::direction::Direction;
 use crate::entity::{Entity, Renderable, StaticEntity};
 use crate::map::Map;
 use crate::texture::atlas::AtlasTexture;
diff --git a/src/entity/ghost.rs b/src/entity/ghost.rs
index e33bfbc..4363462 100644
--- a/src/entity/ghost.rs
+++ b/src/entity/ghost.rs
@@ -3,7 +3,7 @@ use rand::Rng;
 use rand::SeedableRng;
 
 use crate::constants::{MapTile, BOARD_WIDTH};
-use crate::direction::Direction;
+use crate::entity::direction::Direction;
 use crate::entity::pacman::Pacman;
 use crate::entity::{Entity, MovableEntity, Moving, Renderable};
 use crate::map::Map;
diff --git a/src/entity/mod.rs b/src/entity/mod.rs
index c80028d..3c876d3 100644
--- a/src/entity/mod.rs
+++ b/src/entity/mod.rs
@@ -1,10 +1,12 @@
 pub mod blinky;
+pub mod direction;
+pub mod edible;
 pub mod ghost;
 pub mod pacman;
 
 use crate::{
     constants::{MapTile, BOARD_OFFSET, BOARD_WIDTH, CELL_SIZE},
-    direction::Direction,
+    entity::direction::Direction,
     map::Map,
     modulation::SimpleTickModulator,
 };
diff --git a/src/entity/pacman.rs b/src/entity/pacman.rs
index bccd487..ec2ad70 100644
--- a/src/entity/pacman.rs
+++ b/src/entity/pacman.rs
@@ -8,8 +8,7 @@ use sdl2::{
 };
 
 use crate::{
-    direction::Direction,
-    entity::{Entity, MovableEntity, Moving, Renderable, StaticEntity},
+    entity::{direction::Direction, Entity, MovableEntity, Moving, Renderable, StaticEntity},
     map::Map,
     modulation::{SimpleTickModulator, TickModulator},
     texture::animated::AnimatedAtlasTexture,
diff --git a/src/game.rs b/src/game.rs
index 4e28938..73708b2 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -19,9 +19,9 @@ use crate::asset::{get_asset_bytes, Asset};
 use crate::audio::Audio;
 use crate::constants::RAW_BOARD;
 use crate::debug::{DebugMode, DebugRenderer};
-use crate::direction::Direction;
-use crate::edible::{reconstruct_edibles, Edible, EdibleKind};
 use crate::entity::blinky::Blinky;
+use crate::entity::direction::Direction;
+use crate::entity::edible::{reconstruct_edibles, Edible, EdibleKind};
 use crate::entity::pacman::Pacman;
 use crate::entity::Renderable;
 use crate::map::Map;
diff --git a/src/main.rs b/src/main.rs
index 1024588..904de9b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -56,8 +56,6 @@ mod asset;
 mod audio;
 mod constants;
 mod debug;
-mod direction;
-mod edible;
 #[cfg(target_os = "emscripten")]
 mod emscripten;
 mod entity;
diff --git a/src/texture/animated.rs b/src/texture/animated.rs
index d8e4b05..6156aba 100644
--- a/src/texture/animated.rs
+++ b/src/texture/animated.rs
@@ -4,7 +4,7 @@ use sdl2::{
     video::Window,
 };
 
-use crate::direction::Direction;
+use crate::entity::direction::Direction;
 use crate::texture::atlas::AtlasTexture;
 use crate::texture::FrameDrawn;
 
diff --git a/src/texture/atlas.rs b/src/texture/atlas.rs
index 8a27fa7..7838d39 100644
--- a/src/texture/atlas.rs
+++ b/src/texture/atlas.rs
@@ -4,7 +4,7 @@ use sdl2::{
     video::Window,
 };
 
-use crate::{direction::Direction, texture::FrameDrawn};
+use crate::{entity::direction::Direction, texture::FrameDrawn};
 
 /// A texture atlas abstraction for static (non-animated) rendering.
 pub struct AtlasTexture<'a> {
diff --git a/src/texture/mod.rs b/src/texture/mod.rs
index 01683a8..e7ea1ed 100644
--- a/src/texture/mod.rs
+++ b/src/texture/mod.rs
@@ -1,6 +1,6 @@
 use sdl2::{render::Canvas, video::Window};
 
-use crate::direction::Direction;
+use crate::entity::direction::Direction;
 
 /// Trait for drawable atlas-based textures
 pub trait FrameDrawn {