refactor: move ServerLevel and ServerPlayer to bedrock/server

EndstoneMC · May 27, 2024 · bf38fb7 · bf38fb7
1 parent 16f5c46
commit bf38fb7
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 → include/bedrock/server/server_level.h b/include/bedrock/server/level/server_level.h → include/bedrock/server/server_level.h
diff --git a/include/bedrock/server/level/server_player.h → include/bedrock/server/server_player.h b/include/bedrock/server/level/server_player.h → include/bedrock/server/server_player.h
diff --git 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/...syncher/synced_player_movement_settings.h → .../player/synced_player_movement_settings.h b/...syncher/synced_player_movement_settings.h → .../player/synced_player_movement_settings.h
diff --git a/...ncher/synched_actor_data_entity_wrapper.h → ...actor/synched_actor_data_entity_wrapper.h b/...ncher/synched_actor_data_entity_wrapper.h → ...actor/synched_actor_data_entity_wrapper.h
diff --git a/...ime/bedrock/server/level/server_level.cpp → ...e_runtime/bedrock/server/server_level.cpp b/...ime/bedrock/server/level/server_level.cpp → ...e_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/...me/bedrock/server/level/server_player.cpp → ..._runtime/bedrock/server/server_player.cpp b/...me/bedrock/server/level/server_player.cpp → ..._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"