Compare commits

..

No commits in common. "master" and "v2.0.4" have entirely different histories.

101 changed files with 722 additions and 2197 deletions

1
.gitignore vendored
View File

@ -12,4 +12,3 @@ build-windows/*
!build-linux/assets/ !build-linux/assets/
!build-windows/MorriCraft.exe !build-windows/MorriCraft.exe
!build-windows/assets/ !build-windows/assets/
!build-windows/MorriCraft-Windows.zip

View File

@ -20,7 +20,6 @@ add_executable(MorriCraft src/main.cpp)
target_link_libraries(MorriCraft PRIVATE raylib) target_link_libraries(MorriCraft PRIVATE raylib)
if(WIN32) if(WIN32)
target_link_libraries(MorriCraft PRIVATE ws2_32) target_link_libraries(MorriCraft PRIVATE ws2_32)
target_link_options(MorriCraft PRIVATE -static-libgcc -static-libstdc++ -static)
endif() endif()
# Copy assets to build directory # Copy assets to build directory

Binary file not shown.

258
README.md
View File

@ -1,192 +1,114 @@
# 🟦 MorriCraft # MorriCraft
![MorriCraft](assets/TitleImage.png) ![MorriCraft](assets/TitleImage.png)
**MorriCraft** is a high-performance, multiplayer-ready voxel engine built from the ground up using **C++** and **Raylib**. Inspired by classic survival games, it features a custom physics engine, real-time world synchronization, and a deep crafting system. MorriCraft is a high-performance voxel engine built with C++ and Raylib. It features a custom physics engine, dynamic world generation, and an interactive inventory and crafting system.
--- ## Features
- **Custom Physics**: Stable "Ground-Lock" system prevents camera jitter and ensures smooth movement.
- **Dynamic World Generation**: Multi-octave Perlin noise (FBM) for realistic terrain, including biomes like grass, sand, and forests.
- **Advanced Crafting**: Includes both a 2x2 player inventory grid and a 3x3 workbench system.
- **Optimized Rendering**: Texture batching and neighbor-chunk caching for stable 60+ FPS.
- **Cross-Platform**: Builds for both Linux and Windows.
## 🌟 Key Features ## Version History
### ⚔️ Combat & Survival ### v2.0.4 - Full Synchronization Milestone (Latest)
- **PvP Combat**: Real-time melee combat with synchronized hit registration, knockback, and audio feedback. * **Robust Data Streaming**: Implemented `RecvAll` with multi-platform error handling (Winsock/POSIX) to guarantee entire packet bodies are read.
- **Health System**: 8-heart health system with a visual HUD and damage mechanics. * **Real-Time Sync Fixes**: Resolved critical bugs that caused chat, notifications, and block changes to fail under certain network conditions.
- **Survival Mechanics**: Block-breaking progress and material-specific dig times. * **Protocol Hardening**: Integrated strict packet validation and discard logic for malformed or unknown data streams.
### 👥 Multiplayer & LAN ### v2.0.3 - Multiplayer Protocol Hardening
- **P2P Architecture**: Cross-platform networking stack using standard sockets (Windows/Linux). * **Protocol Synchronization**: Overhauled the packet processing loop to prevent data drift and 'ghosting' blocks.
- **Instant LAN Hosting**: Host your world with a single click from the pause menu. * **Notification Debouncing**: Implemented filters to ensure join/leave messages are only triggered once per action.
- **Skin Personalization**: Built-in skin editor to customize your character's shirt and pants, fully synchronized across the network. * **Cross-Platform Stability**: Replaced non-portable socket flags with a robust `select()`-based architecture for Windows/Linux parity.
- **Global Chat**: Press `Enter` to communicate with other players in real-time. * **Body Validation**: Hardened the data reception logic to ensure complete packet consumption and prevent buffer overflows.
### 🔨 Crafting & Inventory ### v2.0.2 - The Social & Sync Update
- **20+ Recipes**: Full crafting tree from logs to tools — wooden & stone tier tools, furnace, chest, doors, fences, ladders, and more. * **Integrated Chat System**: Press `Enter` to open the chat box and communicate with other players in real-time.
- **Dual Crafting Modes**: 2×2 player inventory grid and 3×3 Workbench with pattern matching. * **Player Notifications**: Added automated alerts for players joining or leaving the session.
- **Smart Stacking**: Left-click merges same-type stacks, right-click picks up or places one item at a time. * **Multi-Player Visibility**: Fixed player tracking to ensure all peers are correctly identified and rendered for all clients.
- **Inventory Tooltips**: Hover over any item to see its name. * **Handshake Optimization**: Host now pushes seed, time, and existing player states instantly upon connection.
* **Update Integrity**: Fixed the auto-update system to correctly write version files after a successful download.
### 🌲 World & Visuals ### v2.0.1 - World State Synchronization
- **Multi-Texture Blocks**: Oak logs render with bark sides and ringed tops/bottoms. Grass has separate top/side/bottom faces. * **Real-Time Block Sync**: Introduced `NetSetBlock` to synchronize all mining and placement actions across peers.
- **High-Detail Foliage**: Custom leaf textures with natural green tinting. * **Time Sync**: Host acts as the master clock, ensuring identical day/night cycles for everyone.
- **Dynamic Lighting**: Full day/night cycle with atmospheric color shifts. * **Seed Sync**: Corrected world generation so that clients automatically adopt the host's seed.
- **Optimized Rendering**: Texture batching, neighbor-chunk caching, and frustum culling for 60+ FPS.
### ⚙️ Technical ### v2.0.0 - The Multiplayer Milestone
- **Dynamic World Gen**: Multi-octave Perlin noise (FBM) with forests, sand beaches, and ore veins. * **P2P Architecture**: Implemented a cross-platform peer-to-peer networking stack using standard sockets.
- **Cross-Platform**: Standalone binaries for Windows and Linux with zero external DLL dependencies. * **Direct Connect**: Added the ability to join servers via IP and Port from the main menu.
- **Auto-Update System**: Built-in version checking and download support. * **Remote Avatars**: Introduced 3D representation for other players with dynamic floating nameplates.
* **Server Mode**: Integrated a non-blocking host listener into the standard world generation flow.
--- ### v1.9.1 - The Connectivity & Polish Update
* **Persistent Configuration**: Added `config.cfg` to save player preferences and identity.
* **Player Identity**: Implemented a required name-entry sequence on first launch.
* **Auto-Update System**: Integrated version-checking, update notes viewer, and download progress simulation.
* **Multiplayer Preparation**: Added Server Mode toggle and Direct Connect interface foundation.
* **Performance Fixes**: Resolved edge-case frustum culling artifacts.
* **Audio Refinement**: Fixed music transitions between menus and gameplay states.
* **UI Polish**: Optimized layout for the Options and Main Menu screens.
## 🚀 Getting Started ### v1.6.6 (Latest)
- **Tool Scaling**: Increased the size of held items (Axes/Sticks) in first-person for better visibility.
- **Custom Assets**: Integrated a high-detail community wooden axe asset.
- **Visual Polish**: Improved the viewmodel orientation and stability.
### Prerequisites ### v1.6.5
- **Linux**: `libpulse-dev`, `glfw` development headers. - **Audio Optimization**: Implemented a rapid-crossfade system for cleaner day/night music transitions.
- **Windows**: Download the pre-built zip from Releases, or cross-compile with MinGW-w64. - **UI Bug Fixes**: Resolved music state issues when entering the Options and Crafting menus.
### Build Instructions ### v1.6.4
- **Immersive Audio**: Added material-specific digging sounds (Grass, Wood, Stone, Sand).
- **Viewmodel Overhaul**: Held blocks are now rendered as 3D textured cubes instead of white boxes.
- **Audio Sync**: Tied digging sounds to mining progress for better tactile feedback.
#### 🐧 Linux ### v1.6.3
```bash
mkdir build-linux && cd build-linux
cmake ..
make -j$(nproc)
./MorriCraft
```
#### 🪟 Windows (Cross-compile) ### v1.5.2
```bash - **Stability Fixes**: Resolved texture corruption and state-management bugs with workstations.
mkdir build-windows && cd build-windows - **In-Game Clock**: Added a 12-hour AM/PM HUD clock and day/night status indicator.
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain-windows.cmake .. - **Lighting Engine**: Implemented a global day/night cycle (300s) with dynamic sun/moon and world tinting.
make -j$(nproc)
```
A pre-built `MorriCraft-Windows.zip` is available in the repository root.
--- ### v1.4.2
- **UI Redesign**: Overhauled the inventory and crafting windows to match the classic Minecraft layout.
- **Character Preview**: Added a player preview placeholder in the inventory.
- **Centered Layout**: All UI grids are now symmetrically centered.
## 🎮 Controls ### v1.4.1
| Key | Action | - **Texture Fixes**: Corrected leaf and log textures.
|-----|--------| - **Inventory Stability**: Fixed the double-toggle bug when pressing 'E'.
| **WASD** | Movement | - **Bug Fixes**: Resolved grass rendering issues and fixed tree generation.
| **Space** | Jump |
| **Mouse** | Look / Aim |
| **Left Click** | Attack / Destroy Block |
| **Right Click** | Place Block / Use Workbench |
| **E** | Open Inventory |
| **Enter** | Open Chat |
| **1-9** | Hotbar Selection |
| **ESC** | Pause / Menu |
--- ### v1.4.0
- **Crafting Table**: Implemented the Crafting Table block and 3x3 grid interaction.
- **Advanced UI**: Centered stack counts and added red versioning to the title screen.
## 📜 Crafting Recipes ### v1.3.x
- **Physics**: Implemented "Ground-Lock" stabilization.
- **Inventory**: Added basic drag-and-drop support.
- **Wireframes**: Added real-time block selection highlights.
### 2×2 Player Grid ## Build Instructions
| Input | Output |
|-------|--------|
| 1 Log | 4 Planks |
| 4 Planks (2×2) | 1 Crafting Table |
| 2 Planks (vertical) | 4 Sticks |
### 3×3 Crafting Table ### Linux
| Recipe | Output | Recipe | Output | 1. `mkdir build-linux && cd build-linux`
|--------|--------|--------|--------| 2. `cmake ..`
| PPP / .S. / .S. | Wooden Pickaxe | CCC / .S. / .S. | Stone Pickaxe | 3. `make -j$(nproc)`
| PP. / PS. / .S. | Wooden Axe | CC. / CS. / .S. | Stone Axe |
| .P. / .P. / .S. | Wooden Sword | .C. / .C. / .S. | Stone Sword |
| .P. / .S. / .S. | Wooden Shovel | .C. / .S. / .S. | Stone Shovel |
| PP. / .S. / .S. | Wooden Hoe | CC. / .S. / .S. | Stone Hoe |
| CCC / C.C / CCC | Furnace | PPP / P.P / PPP | Chest |
| PP. / PP. / PP. | Door ×3 | PSP / PSP | Fence ×3 |
| S.S / SSS / S.S | Ladder ×3 | ... / ... / CCC | Stone Slab ×6 |
*P = Plank, S = Stick, C = Cobblestone. Mirrored variants supported.* ### Windows (Cross-compile from Linux)
1. `mkdir build-windows && cd build-windows`
2. `cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain-windows.cmake ..`
3. `make -j$(nproc)`
--- ## Controls
- **WASD**: Movement
## 📜 Version History - **Space**: Jump
- **Mouse**: Look / Aim
### v2.3.7 - Major Update: High-Quality 3D Torches & Asset Redesign (Current) - **Left Click**: Destroy Block
- **Hunger System**: Added player hunger bar, starvation mechanics, and health regeneration when full. - **Right Click**: Place Block / Use Crafting Table
- **Apple Item**: Added edible Apple item to restore hunger. - **E**: Toggle Inventory
- **Grass Texture**: Improved `grass_top` texture with better pixel art. - **1-9**: Hotbar Selection
- **World Spawn Fix**: Fixed missing terrain chunks behind the player on new world generation. - **ESC**: Pause Menu / Close Inventory
### v2.2.26 - Hunger & World Gen Patch
- **'E' Key Bug Fix**: Resolved an issue where the inventory overlay would get out of sync with container/cheat GUIs, preventing the menu from staying open or resulting in a missing cursor.
- **/test Command**: Refined the `/test` command to grant exactly 1x Crafting Table and 64x Oak Logs with descriptive feedback.
- **Help Command**: Updated `/help` to include all debug commands (`/test`, `/cheat`, `/fly`, `/seed`).
- **/fly Command**: Added a simple toggle behavior to the `/fly` command.
### v2.2.23 - Persistence & Viewmodel Fixes
### v2.2.22 - World Generation Polish
### v2.2.21 - Save Fix & Updater Polish
### v2.2.20 - UI Polish & Spawn Fixes
### v2.2.19 - Torch & persistence Overhaul
### v2.2.18 - Persistence & UI Fixes
### v2.2.6 - World Management
- **7:00 AM Spawn**: New worlds now start in the morning for immediate daylight.
- **Naming System**: Cleaner sequential naming (`World`, `World 1`, `World 2`) instead of nested parentheses.
- **Anti-Stuck Physics**: Active collision resolution pushes players out of blocks if they overlap.
- **Build Path**: Windows artifacts are now stored in `build-windows/` for easier deployment.
### v2.2.5 - UX & Inventory Polish
- **Shift-Click**: Holding Shift and clicking picks up entire item stacks instantly.
- **Scrollable Menus**: Added scroll bars and mouse-wheel support for the "Load World" menu.
- **UI Padding**: Increased padding across all panels to ensure text never overlaps borders.
### v2.2.4 - Visual & Update Stability
- **X-Ray Fix**: Neighborhood chunk dirtying ensures internal faces are culled immediately.
- **Smart Updates**: Client only prompts for updates if the remote version is strictly higher.
- **15x15 Pre-Gen**: Expanded spawn area pre-generation (225 chunks) to eliminate horizon drop-offs.
### v2.2.3 - Async Generation & Help
- **Loading Screen**: Added a progress bar for asynchronous world generation/loading.
- **Help Command**: Added `/help` to chat to display all available console commands.
- **Spawn Surface**: Guaranteed surface placement after full chunk pre-generation.
### v2.2.1 - World & Seed Polish
- **Cliff Fix**: Resolved issues where new worlds would spawn with missing chunks.
- **Render Distance**: Increased default render distance to 4 for a more expansive view.
- **Auto-Updater**: Platform-aware updates target Windows vs Linux binaries.
### v2.2.0 - Biome & Generation Update
- **Seed Fix**: Proper avalanche-hash for seeds, making every world truly unique.
- **Biomes**: Added Grassland, Desert, and Rocky biomes with sand beaches at sea level.
- **Commands**: Added `/seed` command to view the world seed in chat.
### v2.1.9 - Crafting Overhaul
- **20+ Recipes**: Added Log→Planks and full wooden/stone tool tier crafting.
- **Smart Inventory**: Left-click stacks same items, right-click picks up or places one.
- **Future Item IDs**: Added furnace, chest, ladder, fence, torch, door, and stone slab types.
### v2.1.8 - Forest Fidelity
- **HQ Leaves**: New high-definition leaf texture with proper green tinting.
- **Tree Fix**: Corrected log rendering to use multi-texture bark/ring mapping.
### v2.1.7 - Log Realism
- **Oak Log Textures**: Dedicated bark (side) and ring (top) textures for logs.
### v2.1.6 - Inventory Insight
- **Item Tooltips**: Mouse-over identification for all inventory items.
### v2.1.2 - Combat & Health
- **PvP Melee**: Ray-traced hit detection with knockback and audio feedback.
- **Heart HUD**: 8-heart health system.
### v2.1.0 - Personalization
- **Skin Editor**: Shirt and pants color customization, synced across network.
- **Humanoid Models**: Multi-cube player avatars replacing placeholder blobs.
### v2.0.0 - Multiplayer
- **P2P Networking**: Cross-platform sockets with direct connect and LAN hosting.
- **Chat System**: Real-time text communication between players.
---
*Developed by the MorriCraft Team. Built with Raylib 5.0.*

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 MiB

After

Width:  |  Height:  |  Size: 6.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 748 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 KiB

View File

@ -1 +0,0 @@
v2.3.7

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 594 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 MiB

After

Width:  |  Height:  |  Size: 6.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 748 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 KiB

View File

@ -1 +1 @@
v2.3.7 v2.0.4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 594 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 MiB

After

Width:  |  Height:  |  Size: 6.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 748 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 KiB

View File

@ -1 +1 @@
v2.3.7 v2.0.4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 594 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 KiB

Binary file not shown.

Binary file not shown.

View File

@ -1 +0,0 @@
v2.3.7

File diff suppressed because it is too large Load Diff

View File

@ -54,14 +54,7 @@ enum PacketType {
PACKET_TIME_SYNC = 3, PACKET_TIME_SYNC = 3,
PACKET_SEED_SYNC = 4, PACKET_SEED_SYNC = 4,
PACKET_CHAT = 5, PACKET_CHAT = 5,
PACKET_DISCONNECT = 6, PACKET_DISCONNECT = 6
PACKET_PLAYER_HIT = 7
};
struct PacketPlayerHit {
uint32_t targetID;
float damage;
float attackerX, attackerZ;
}; };
struct PacketHeader { struct PacketHeader {
@ -71,8 +64,6 @@ struct PacketHeader {
struct PacketHandshake { struct PacketHandshake {
char name[32]; char name[32];
uint8_t shirtR, shirtG, shirtB;
uint8_t pantsR, pantsG, pantsB;
}; };
struct PacketPlayerUpdate { struct PacketPlayerUpdate {

Some files were not shown because too many files have changed in this diff Show More