From bf38fb78315279926f3bce4848b26f7fcee67f4f Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 27 May 2024 09:39:15 +0100 Subject: [PATCH] refactor: move ServerLevel and ServerPlayer to bedrock/server --- include/bedrock/network/packet/start_game_packet.h | 2 +- include/bedrock/network/server_network_handler.h | 2 +- include/bedrock/server/commands/command_origin_loader.h | 2 +- include/bedrock/server/{level => }/server_level.h | 0 include/bedrock/server/{level => }/server_player.h | 0 include/bedrock/world/actor/actor.h | 2 +- .../actor/player}/synced_player_movement_settings.h | 0 .../syncher => world/actor}/synched_actor_data_entity_wrapper.h | 0 .../bedrock/server/{level => }/server_level.cpp | 2 +- .../bedrock/server/{level => }/server_player.cpp | 2 +- 10 files changed, 6 insertions(+), 6 deletions(-) rename include/bedrock/server/{level => }/server_level.h (100%) rename include/bedrock/server/{level => }/server_player.h (100%) rename include/bedrock/{network/syncher => world/actor/player}/synced_player_movement_settings.h (100%) rename include/bedrock/{network/syncher => world/actor}/synched_actor_data_entity_wrapper.h (100%) rename src/endstone_runtime/bedrock/server/{level => }/server_level.cpp (96%) rename src/endstone_runtime/bedrock/server/{level => }/server_player.cpp (97%) diff --git a/include/bedrock/network/packet/start_game_packet.h b/include/bedrock/network/packet/start_game_packet.h index 515244c3f..502d2d57a 100644 --- a/include/bedrock/network/packet/start_game_packet.h +++ b/include/bedrock/network/packet/start_game_packet.h @@ -22,10 +22,10 @@ #include "bedrock/mce.h" #include "bedrock/nbt/compound_tag.h" #include "bedrock/network/packet.h" -#include "bedrock/network/syncher/synced_player_movement_settings.h" #include "bedrock/server/packs/content_identity.h" #include "bedrock/world/actor/actor_runtime_id.h" #include "bedrock/world/actor/actor_unique_id.h" +#include "bedrock/world/actor/player/synced_player_movement_settings.h" #include "bedrock/world/level/game_type.h" #include "bedrock/world/level/storage/level_settings.h" #include "bedrock/world/math/vec2.h" diff --git a/include/bedrock/network/server_network_handler.h b/include/bedrock/network/server_network_handler.h index ef1cfcede..465ba4d3a 100644 --- a/include/bedrock/network/server_network_handler.h +++ b/include/bedrock/network/server_network_handler.h @@ -18,7 +18,7 @@ #include "bedrock/memory.h" #include "bedrock/network/connection.h" #include "bedrock/network/net_event_callback.h" -#include "bedrock/server/level/server_player.h" +#include "bedrock/server/server_player.h" #include "bedrock/social.h" #include "bedrock/threading.h" #include "bedrock/world/actor/player/player.h" diff --git a/include/bedrock/server/commands/command_origin_loader.h b/include/bedrock/server/commands/command_origin_loader.h index 75292459e..6e11e1058 100644 --- a/include/bedrock/server/commands/command_origin_loader.h +++ b/include/bedrock/server/commands/command_origin_loader.h @@ -19,7 +19,7 @@ #include "bedrock/bedrock.h" #include "bedrock/nbt/compound_tag.h" #include "bedrock/server/commands/command_origin.h" -#include "bedrock/server/level/server_level.h" +#include "bedrock/server/server_level.h" class CommandOriginLoader { public: diff --git a/include/bedrock/server/level/server_level.h b/include/bedrock/server/server_level.h similarity index 100% rename from include/bedrock/server/level/server_level.h rename to include/bedrock/server/server_level.h diff --git a/include/bedrock/server/level/server_player.h b/include/bedrock/server/server_player.h similarity index 100% rename from include/bedrock/server/level/server_player.h rename to include/bedrock/server/server_player.h diff --git a/include/bedrock/world/actor/actor.h b/include/bedrock/world/actor/actor.h index b145c213c..c8f338402 100644 --- a/include/bedrock/world/actor/actor.h +++ b/include/bedrock/world/actor/actor.h @@ -28,7 +28,6 @@ #include "bedrock/mce.h" #include "bedrock/memory.h" #include "bedrock/network/spatial_actor_network_data.h" -#include "bedrock/network/syncher/synched_actor_data_entity_wrapper.h" #include "bedrock/server/commands/command_permission_level.h" #include "bedrock/world/actor/actor_category.h" #include "bedrock/world/actor/actor_flags.h" @@ -38,6 +37,7 @@ #include "bedrock/world/actor/components/built_in_actor_components.h" #include "bedrock/world/actor/registry/entity_context.h" #include "bedrock/world/actor/registry/entity_registry.h" +#include "bedrock/world/actor/synched_actor_data_entity_wrapper.h" #include "bedrock/world/item/item_stack.h" #include "bedrock/world/level/dimension/dimension.h" #include "bedrock/world/material/material_type.h" diff --git a/include/bedrock/network/syncher/synced_player_movement_settings.h b/include/bedrock/world/actor/player/synced_player_movement_settings.h similarity index 100% rename from include/bedrock/network/syncher/synced_player_movement_settings.h rename to include/bedrock/world/actor/player/synced_player_movement_settings.h diff --git a/include/bedrock/network/syncher/synched_actor_data_entity_wrapper.h b/include/bedrock/world/actor/synched_actor_data_entity_wrapper.h similarity index 100% rename from include/bedrock/network/syncher/synched_actor_data_entity_wrapper.h rename to include/bedrock/world/actor/synched_actor_data_entity_wrapper.h diff --git a/src/endstone_runtime/bedrock/server/level/server_level.cpp b/src/endstone_runtime/bedrock/server/server_level.cpp similarity index 96% rename from src/endstone_runtime/bedrock/server/level/server_level.cpp rename to src/endstone_runtime/bedrock/server/server_level.cpp index e844f68ab..9c2f4ab87 100644 --- a/src/endstone_runtime/bedrock/server/level/server_level.cpp +++ b/src/endstone_runtime/bedrock/server/server_level.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bedrock/server/level/server_level.h" +#include "bedrock/server/server_level.h" #include "bedrock/world/actor/actor_initialization_method.h" #include "endstone/detail/hook.h" diff --git a/src/endstone_runtime/bedrock/server/level/server_player.cpp b/src/endstone_runtime/bedrock/server/server_player.cpp similarity index 97% rename from src/endstone_runtime/bedrock/server/level/server_player.cpp rename to src/endstone_runtime/bedrock/server/server_player.cpp index 26e0572d5..f6feffc4d 100644 --- a/src/endstone_runtime/bedrock/server/level/server_player.cpp +++ b/src/endstone_runtime/bedrock/server/server_player.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "bedrock/server/level/server_player.h" +#include "bedrock/server/server_player.h" #include "endstone/detail/hook.h" #include "endstone/detail/server.h"