refactor: move network headers to bedrock/network

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

Hide file tree

Showing 25 changed files with 24 additions and 24 deletions.
diff --git a/...de/bedrock/network/protocol/certificate.h → include/bedrock/certificates/certificate.h b/...de/bedrock/network/protocol/certificate.h → include/bedrock/certificates/certificate.h
diff --git a/...edrock/network/protocol/compressibility.h → include/bedrock/network/compressibility.h b/...edrock/network/protocol/compressibility.h → include/bedrock/network/compressibility.h
diff --git a/...ude/bedrock/network/protocol/connection.h → include/bedrock/network/connection.h b/...ude/bedrock/network/protocol/connection.h → include/bedrock/network/connection.h
diff --git a/...k/network/protocol/minecraft_packet_ids.h → ...de/bedrock/network/minecraft_packet_ids.h b/...k/network/protocol/minecraft_packet_ids.h → ...de/bedrock/network/minecraft_packet_ids.h
@@ -16,4 +16,4 @@
 
 enum class MinecraftPacketIds {
     Text = 9,
-};
+};
diff --git a/...rock/network/protocol/minecraft_packets.h → include/bedrock/network/minecraft_packets.h b/...rock/network/protocol/minecraft_packets.h → include/bedrock/network/minecraft_packets.h
@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "bedrock/bedrock.h"
-#include "bedrock/network/protocol/packet.h"
+#include "bedrock/network/packet.h"
 
 class MinecraftPackets {
 public:

diff --git a/...ock/network/protocol/net_event_callback.h → include/bedrock/network/net_event_callback.h b/...ock/network/protocol/net_event_callback.h → include/bedrock/network/net_event_callback.h
diff --git a/include/bedrock/network/protocol/packet.h → include/bedrock/network/packet.h b/include/bedrock/network/protocol/packet.h → include/bedrock/network/packet.h
@@ -15,11 +15,11 @@
 #pragma once
 
 #include "bedrock/forward.h"
+#include "bedrock/network/compressibility.h"
+#include "bedrock/network/minecraft_packet_ids.h"
 #include "bedrock/network/network_peer.h"
-#include "bedrock/network/protocol/compressibility.h"
-#include "bedrock/network/protocol/minecraft_packet_ids.h"
-#include "bedrock/network/protocol/sub_client_id.h"
 #include "bedrock/network/raknet/packet_priority.h"
+#include "bedrock/network/sub_client_id.h"
 
 class Packet {
 public:

diff --git a/include/bedrock/network/packet/available_commands_packet.h b/include/bedrock/network/packet/available_commands_packet.h
@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "bedrock/network/protocol/packet.h"
+#include "bedrock/network/packet.h"
 #include "bedrock/server/commands/command_flag.h"
 #include "bedrock/server/commands/command_permission_level.h"
 

diff --git a/...etwork/syncher/move_actor_absolute_data.h → ...network/packet/move_actor_absolute_data.h b/...etwork/syncher/move_actor_absolute_data.h → ...network/packet/move_actor_absolute_data.h
diff --git a/include/bedrock/network/packet/start_game_packet.h b/include/bedrock/network/packet/start_game_packet.h
@@ -21,7 +21,7 @@
 #include "bedrock/forward.h"
 #include "bedrock/mce.h"
 #include "bedrock/nbt/compound_tag.h"
-#include "bedrock/network/protocol/packet.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"

diff --git a/include/bedrock/network/packet/text_packet.h b/include/bedrock/network/packet/text_packet.h
@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "bedrock/network/protocol/packet.h"
+#include "bedrock/network/packet.h"
 
 enum class TextPacketType : char {
     Raw = 0,

diff --git a/.../bedrock/network/protocol/packet_sender.h → include/bedrock/network/packet_sender.h b/.../bedrock/network/protocol/packet_sender.h → include/bedrock/network/packet_sender.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "bedrock/network/protocol/packet.h"
+#include "bedrock/network/packet.h"
 
 class PacketSender {
 public:

diff --git a/...k/server/network/server_network_handler.h → .../bedrock/network/server_network_handler.h b/...k/server/network/server_network_handler.h → .../bedrock/network/server_network_handler.h
@@ -16,8 +16,8 @@
 
 #include "bedrock/bedrock.h"
 #include "bedrock/memory.h"
-#include "bedrock/network/protocol/connection.h"
-#include "bedrock/network/protocol/net_event_callback.h"
+#include "bedrock/network/connection.h"
+#include "bedrock/network/net_event_callback.h"
 #include "bedrock/server/level/server_player.h"
 #include "bedrock/social.h"
 #include "bedrock/threading.h"

diff --git a/...work/syncher/spatial_actor_network_data.h → ...rock/network/spatial_actor_network_data.h b/...work/syncher/spatial_actor_network_data.h → ...rock/network/spatial_actor_network_data.h
@@ -17,7 +17,7 @@
 #include <cstdint>
 #include <unordered_set>
 
-#include "bedrock/network/syncher/move_actor_absolute_data.h"
+#include "bedrock/network/packet/move_actor_absolute_data.h"
 #include "bedrock/world/actor/actor_unique_id.h"
 
 class Actor;

diff --git a/.../bedrock/network/protocol/sub_client_id.h → include/bedrock/network/sub_client_id.h b/.../bedrock/network/protocol/sub_client_id.h → include/bedrock/network/sub_client_id.h
diff --git a/include/bedrock/server/commands/command_origin.h b/include/bedrock/server/commands/command_origin.h
@@ -21,7 +21,7 @@
 #include "bedrock/mce.h"
 #include "bedrock/memory.h"
 #include "bedrock/network/network_identifier.h"
-#include "bedrock/network/protocol/sub_client_id.h"
+#include "bedrock/network/sub_client_id.h"
 #include "bedrock/server/commands/command_origin_data.h"
 #include "bedrock/server/commands/command_origin_identity.h"
 #include "bedrock/server/commands/command_origin_type.h"

diff --git a/include/bedrock/world/actor/actor.h b/include/bedrock/world/actor/actor.h
@@ -27,7 +27,7 @@
 #include "bedrock/hashed_string.h"
 #include "bedrock/mce.h"
 #include "bedrock/memory.h"
-#include "bedrock/network/syncher/spatial_actor_network_data.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"

diff --git a/include/bedrock/world/actor/components/user_entity_identifier_component.h b/include/bedrock/world/actor/components/user_entity_identifier_component.h
@@ -16,10 +16,10 @@
 
 #include <entt/entt.hpp>
 
+#include "bedrock/certificates/certificate.h"
 #include "bedrock/mce.h"
 #include "bedrock/network/network_identifier.h"
-#include "bedrock/network/protocol/certificate.h"
-#include "bedrock/network/protocol/sub_client_id.h"
+#include "bedrock/network/sub_client_id.h"
 
 class UserEntityIdentifierComponent {
 public:

diff --git a/include/bedrock/world/actor/player/player.h b/include/bedrock/world/actor/player/player.h
@@ -18,7 +18,7 @@
 #include <memory>
 
 #include "bedrock/bedrock.h"
-#include "bedrock/network/protocol/packet_sender.h"
+#include "bedrock/network/packet_sender.h"
 #include "bedrock/server/commands/command_permission_level.h"
 #include "bedrock/world/actor/mob/mob.h"
 #include "bedrock/world/level/event/event_coordinator.h"

diff --git a/.../network/item/item_stack_net_id_variant.h → ...ntory/network/item_stack_net_id_variant.h b/.../network/item/item_stack_net_id_variant.h → ...ntory/network/item_stack_net_id_variant.h
diff --git a/include/bedrock/world/item/item_stack.h b/include/bedrock/world/item/item_stack.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "bedrock/bedrock.h"
-#include "bedrock/network/item/item_stack_net_id_variant.h"
+#include "bedrock/world/inventory/network/item_stack_net_id_variant.h"
 #include "bedrock/world/item/item_stack_base.h"
 
 class ItemStack : public ItemStackBase {

diff --git a/include/bedrock/world/level/level_interface.h b/include/bedrock/world/level/level_interface.h
@@ -28,8 +28,8 @@
 #include "bedrock/forward.h"
 #include "bedrock/mce.h"
 #include "bedrock/memory.h"
-#include "bedrock/network/protocol/net_event_callback.h"
-#include "bedrock/network/protocol/packet_sender.h"
+#include "bedrock/network/net_event_callback.h"
+#include "bedrock/network/packet_sender.h"
 #include "bedrock/server/commands/command_origin.h"
 #include "bedrock/server/commands/command_registry.h"
 #include "bedrock/server/player_list_entry.h"

diff --git a/src/endstone_core/player.cpp b/src/endstone_core/player.cpp
@@ -14,13 +14,13 @@
 
 #include "endstone/detail/player.h"
 
+#include "bedrock/network/minecraft_packets.h"
 #include "bedrock/network/packet/text_packet.h"
-#include "bedrock/network/protocol/minecraft_packets.h"
 #include "bedrock/network/raknet/rak_peer_interface.h"
+#include "bedrock/network/server_network_handler.h"
 #include "bedrock/server/commands/command_origin_data.h"
 #include "bedrock/server/commands/command_origin_loader.h"
 #include "bedrock/server/commands/command_position.h"
-#include "bedrock/server/network/server_network_handler.h"
 #include "bedrock/world/actor/components/user_entity_identifier_component.h"
 #include "bedrock/world/actor/player/player.h"
 #include "bedrock/world/level/game_type.h"

diff --git a/src/endstone_runtime/bedrock/network/packet/minecraft_packets.cpp b/src/endstone_runtime/bedrock/network/packet/minecraft_packets.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bedrock/network/protocol/minecraft_packets.h"
+#include "bedrock/network/minecraft_packets.h"
 
 #include "endstone/detail/hook.h"
 

diff --git a/...server/network/server_network_handler.cpp → ...edrock/network/server_network_handler.cpp b/...server/network/server_network_handler.cpp → ...edrock/network/server_network_handler.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bedrock/server/network/server_network_handler.h"
+#include "bedrock/network/server_network_handler.h"
 
 #include <entt/entt.hpp>