refactor: move headers

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

Hide file tree

Showing 96 changed files with 204 additions and 186 deletions.
diff --git a/include/bedrock/common/common.h → include/bedrock/common.h b/include/bedrock/common/common.h → include/bedrock/common.h
diff --git a/...de/bedrock/common/app_platform_listener.h → include/bedrock/core/app_platform_listener.h b/...de/bedrock/common/app_platform_listener.h → include/bedrock/core/app_platform_listener.h
diff --git a/include/bedrock/automatic_id.h → include/bedrock/core/automatic_id.h b/include/bedrock/automatic_id.h → include/bedrock/core/automatic_id.h
diff --git a/include/bedrock/bedrock_log.h → include/bedrock/core/bedrock_log.h b/include/bedrock/bedrock_log.h → include/bedrock/core/bedrock_log.h
diff --git a/include/bedrock/callstack.h → include/bedrock/core/callstack.h b/include/bedrock/callstack.h → include/bedrock/core/callstack.h
@@ -16,7 +16,7 @@
 
 #include <optional>
 
-#include "bedrock/bedrock_log.h"
+#include "bedrock/core/bedrock_log.h"
 
 namespace Bedrock {
 

diff --git a/include/bedrock/details.h → include/bedrock/core/details.h b/include/bedrock/details.h → include/bedrock/core/details.h
diff --git a/include/bedrock/error_info.h → include/bedrock/core/error_info.h b/include/bedrock/error_info.h → include/bedrock/core/error_info.h
@@ -17,7 +17,7 @@
 #include <system_error>
 
 #include "bedrock/bedrock.h"
-#include "bedrock/callstack.h"
+#include "bedrock/core/callstack.h"
 
 namespace Bedrock {
 template <typename E = std::error_code>

diff --git a/include/bedrock/core.h → include/bedrock/core/file.h b/include/bedrock/core.h → include/bedrock/core/file.h
diff --git a/include/bedrock/hashed_string.h → include/bedrock/core/hashed_string.h b/include/bedrock/hashed_string.h → include/bedrock/core/hashed_string.h
diff --git a/include/bedrock/io/data_output.h → include/bedrock/core/math/color.h b/include/bedrock/io/data_output.h → include/bedrock/core/math/color.h
@@ -14,19 +14,13 @@
 
 #pragma once
 
-#include <cstdint>
-#include <string>
-
-class IDataOutput {
+namespace mce {
+class Color {
 public:
-    virtual ~IDataOutput() = default;
-    virtual void writeString(std::string_view v) = 0;
-    virtual void writeLongString(std::string_view v) = 0;
-    virtual void writeFloat(float v) = 0;
-    virtual void writeDouble(double v) = 0;
-    virtual void writeByte(std::uint8_t v) = 0;
-    virtual void writeShort(std::int16_t v) = 0;
-    virtual void writeInt(std::int32_t v) = 0;
-    virtual void writeLongLong(std::int64_t v) = 0;
-    virtual void writeBytes(void const *data, std::uint64_t bytes) = 0;
+    float r;
+    float g;
+    float b;
+    float a;
 };
+
+}  // namespace mce
diff --git a/include/bedrock/world/math/vec2.h → include/bedrock/core/math/vec2.h b/include/bedrock/world/math/vec2.h → include/bedrock/core/math/vec2.h
diff --git a/include/bedrock/world/math/vec3.h → include/bedrock/core/math/vec3.h b/include/bedrock/world/math/vec3.h → include/bedrock/core/math/vec3.h
diff --git a/include/bedrock/core/memory.h b/include/bedrock/core/memory.h
@@ -0,0 +1,45 @@
+// Copyright (c) 2024, The Endstone Project. (https://endstone.dev) All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+template <typename T>
+class OwnerPtr;
+
+template <typename T>
+class WeakRef {
+public:
+    T &operator*() const
+    {
+        if (auto lock = ref_.lock()) {
+            return *lock;
+        }
+        throw std::bad_weak_ptr();
+    }
+
+    T *operator->() const noexcept
+    {
+        return ref_.lock().get();
+    }
+
+private:
+    std::weak_ptr<T> ref_;
+};
+
+template <typename T>
+class WeakPtr {
+    void *rep_;  // reference counter block
+};
diff --git a/include/bedrock/result.h → include/bedrock/core/result.h b/include/bedrock/result.h → include/bedrock/core/result.h
@@ -19,7 +19,7 @@
 #include <nonstd/expected.hpp>
 
 #include "bedrock/bedrock.h"
-#include "bedrock/error_info.h"
+#include "bedrock/core/error_info.h"
 
 namespace Bedrock {
 

diff --git a/include/bedrock/threading.h → include/bedrock/core/threading.h b/include/bedrock/threading.h → include/bedrock/core/threading.h
diff --git a/include/bedrock/type_id.h → include/bedrock/core/type_id.h b/include/bedrock/type_id.h → include/bedrock/core/type_id.h
diff --git a/include/bedrock/io/data_input.h → include/bedrock/core/utility/data_io.h b/include/bedrock/io/data_input.h → include/bedrock/core/utility/data_io.h
@@ -17,7 +17,7 @@
 #include <cstdint>
 #include <string>
 
-#include "bedrock/result.h"
+#include "bedrock/core/result.h"
 
 class IDataInput {
 public:
@@ -33,3 +33,17 @@ class IDataInput {
     virtual Bedrock::Result<void> readBytesResult(void *, std::uint64_t) = 0;
     [[nodiscard]] virtual std::uint64_t numBytesLeft() const = 0;
 };
+
+class IDataOutput {
+public:
+    virtual ~IDataOutput() = default;
+    virtual void writeString(std::string_view v) = 0;
+    virtual void writeLongString(std::string_view v) = 0;
+    virtual void writeFloat(float v) = 0;
+    virtual void writeDouble(double v) = 0;
+    virtual void writeByte(std::uint8_t v) = 0;
+    virtual void writeShort(std::int16_t v) = 0;
+    virtual void writeInt(std::int32_t v) = 0;
+    virtual void writeLongLong(std::int64_t v) = 0;
+    virtual void writeBytes(void const *data, std::uint64_t bytes) = 0;
+};
diff --git a/include/bedrock/memory.h → .../bedrock/core/utility/non_owner_pointer.h b/include/bedrock/memory.h → .../bedrock/core/utility/non_owner_pointer.h
@@ -16,29 +16,6 @@
 
 #include <memory>
 
-template <typename T>
-class OwnerPtr;
-
-template <typename T>
-class WeakRef {
-public:
-    T &operator*() const
-    {
-        if (auto lock = ref_.lock()) {
-            return *lock;
-        }
-        throw std::bad_weak_ptr();
-    }
-
-    T *operator->() const noexcept
-    {
-        return ref_.lock().get();
-    }
-
-private:
-    std::weak_ptr<T> ref_;
-};
-
 namespace Bedrock {
 
 template <class T>
@@ -82,11 +59,6 @@ class EnableNonOwnerReferences {
 
 }  // namespace Bedrock
 
-template <typename T>
-class WeakPtr {
-    void *rep_;  // reference counter block
-};
-
 namespace std {
 template <class T1, class T2>
 [[nodiscard]] Bedrock::NonOwnerPointer<T1> static_pointer_cast(const Bedrock::NonOwnerPointer<T2> &other) noexcept

diff --git a/include/bedrock/social.h → include/bedrock/core/utility/observer.h b/include/bedrock/social.h → include/bedrock/core/utility/observer.h
diff --git a/include/bedrock/io/print_stream.h → include/bedrock/core/utility/print_stream.h b/include/bedrock/io/print_stream.h → include/bedrock/core/utility/print_stream.h
diff --git a/include/bedrock/mce.h → include/bedrock/core/utility/uuid.h b/include/bedrock/mce.h → include/bedrock/core/utility/uuid.h
@@ -56,12 +56,4 @@ class UUID {
 };
 BEDROCK_STATIC_ASSERT_SIZE(UUID, 16, 16);
 
-class Color {
-public:
-    float r;
-    float g;
-    float b;
-    float a;
-};
-
 }  // namespace mce
diff --git a/...ld/actor/components/abilities_component.h → ...k/entity/components/abilities_component.h b/...ld/actor/components/abilities_component.h → ...k/entity/components/abilities_component.h
diff --git a/...or/components/actor_game_type_component.h → ...ty/components/actor_game_type_component.h b/...or/components/actor_game_type_component.h → ...ty/components/actor_game_type_component.h
diff --git a/.../actor/components/actor_owner_component.h → ...entity/components/actor_owner_component.h b/.../actor/components/actor_owner_component.h → ...entity/components/actor_owner_component.h
diff --git a/...or/components/actor_unique_id_component.h → ...ty/components/actor_unique_id_component.h b/...or/components/actor_unique_id_component.h → ...ty/components/actor_unique_id_component.h
diff --git a/...or/components/built_in_actor_components.h → ...ty/components/built_in_actor_components.h b/...or/components/built_in_actor_components.h → ...ty/components/built_in_actor_components.h
@@ -15,9 +15,9 @@
 #pragma once
 
 #include "bedrock/bedrock.h"
-#include "bedrock/world/math/aabb.h"
-#include "bedrock/world/math/vec2.h"
-#include "bedrock/world/math/vec3.h"
+#include "bedrock/core/math/vec2.h"
+#include "bedrock/core/math/vec3.h"
+#include "bedrock/world/phys/aabb.h"
 
 struct StateVectorComponent {
     Vec3 position;        // +0

diff --git a/...k/world/actor/components/flag_component.h → ...edrock/entity/components/flag_component.h b/...k/world/actor/components/flag_component.h → ...edrock/entity/components/flag_component.h
diff --git a/...orld/actor/components/offsets_component.h → ...ock/entity/components/offsets_component.h b/...orld/actor/components/offsets_component.h → ...ock/entity/components/offsets_component.h
diff --git a/...ld/actor/components/passenger_component.h → ...k/entity/components/passenger_component.h b/...ld/actor/components/passenger_component.h → ...k/entity/components/passenger_component.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
+#include "bedrock/entity/strict_entity_context.h"
 #include "bedrock/world/actor/actor_unique_id.h"
-#include "bedrock/world/actor/registry/strict_entity_context.h"
 
 struct PassengerComponent : public StrictEntityContext {
     ActorUniqueID vehicle_id;  // +8

diff --git a/...ents/post_tick_position_delta_component.h → ...ents/post_tick_position_delta_component.h b/...ents/post_tick_position_delta_component.h → ...ents/post_tick_position_delta_component.h
@@ -14,6 +14,6 @@
 
 #pragma once
 
-#include "bedrock/world/actor/components/vec3_component.h"
+#include "bedrock/entity/components/vec3_component.h"
 
 struct PostTickPositionDeltaComponent : public Vec3Component {};
diff --git a/...d/actor/components/runtime_id_component.h → .../entity/components/runtime_id_component.h b/...d/actor/components/runtime_id_component.h → .../entity/components/runtime_id_component.h
diff --git a/...onents/user_entity_identifier_component.h → ...onents/user_entity_identifier_component.h b/...onents/user_entity_identifier_component.h → ...onents/user_entity_identifier_component.h
@@ -17,7 +17,7 @@
 #include <entt/entt.hpp>
 
 #include "bedrock/certificates/certificate.h"
-#include "bedrock/mce.h"
+#include "bedrock/core/utility/uuid.h"
 #include "bedrock/network/network_identifier.h"
 #include "bedrock/network/sub_client_id.h"
 

diff --git a/...k/world/actor/components/vec3_component.h → ...edrock/entity/components/vec3_component.h b/...k/world/actor/components/vec3_component.h → ...edrock/entity/components/vec3_component.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "bedrock/world/math/vec3.h"
+#include "bedrock/core/math/vec3.h"
 
 struct Vec3Component {
     Vec3 value;

diff --git a/...ock/world/actor/registry/entity_context.h → include/bedrock/entity/entity_context.h b/...ock/world/actor/registry/entity_context.h → include/bedrock/entity/entity_context.h
@@ -20,8 +20,8 @@
 #include <entt/entt.hpp>
 
 #include "bedrock/bedrock.h"
-#include "bedrock/memory.h"
-#include "bedrock/world/actor/registry/entity_registry.h"
+#include "bedrock/core/memory.h"
+#include "bedrock/entity/entity_registry.h"
 
 class EntityContext {
 public:

diff --git a/...ck/world/actor/registry/entity_registry.h → include/bedrock/entity/entity_registry.h b/...ck/world/actor/registry/entity_registry.h → include/bedrock/entity/entity_registry.h
diff --git a/...ld/actor/registry/strict_entity_context.h → ...de/bedrock/entity/strict_entity_context.h b/...ld/actor/registry/strict_entity_context.h → ...de/bedrock/entity/strict_entity_context.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "bedrock/world/actor/registry/entity_registry.h"
+#include "bedrock/entity/entity_registry.h"
 
 class StrictEntityContext {
 public:

diff --git a/include/bedrock/forward.h b/include/bedrock/forward.h
@@ -15,7 +15,6 @@
 #pragma once
 
 // Classes
-class Abilities;
 class ActorAnimationControllerGroup;
 class ActorAnimationGroup;
 class ActorChunkTransferEntry;
@@ -45,7 +44,6 @@ class BlockClimberDefinition;
 class BlockComponentFactory;
 class BlockDefinitionGroup;
 class BlockLegacy;
-class BlockPos;
 class BlockPalette;
 class BlockReducer;
 class BlockSource;
@@ -101,11 +99,9 @@ class ItemInstance;
 class ItemRegistryRef;
 class ItemUseMethod;
 class JigsawStructureRegistry;
-class LayeredAbilities;
 class LevelChunk;
 class LevelData;
 class LevelEventListener;
-class LevelSettings;
 class LevelSoundManager;
 class LevelStorage;
 class Localization;

diff --git a/include/bedrock/i18n.h → include/bedrock/locale/i18n.h b/include/bedrock/i18n.h → include/bedrock/locale/i18n.h
@@ -22,8 +22,9 @@
 #include <gsl/gsl>
 
 #include "bedrock/bedrock.h"
+#include "bedrock/core/memory.h"
+#include "bedrock/core/utility/non_owner_pointer.h"
 #include "bedrock/forward.h"
-#include "bedrock/memory.h"
 
 class I18n {
 public:

diff --git a/include/bedrock/nbt/tag.h b/include/bedrock/nbt/tag.h
@@ -14,10 +14,9 @@
 
 #pragma once
 
-#include "bedrock/io/data_input.h"
-#include "bedrock/io/data_output.h"
-#include "bedrock/io/print_stream.h"
-#include "bedrock/result.h"
+#include "bedrock/core/result.h"
+#include "bedrock/core/utility/data_io.h"
+#include "bedrock/core/utility/print_stream.h"
 
 class Tag {
 public:

diff --git a/include/bedrock/network/net_event_callback.h b/include/bedrock/network/net_event_callback.h
@@ -14,6 +14,6 @@
 
 #pragma once
 
-#include "bedrock/memory.h"
+#include "bedrock/core/utility/non_owner_pointer.h"
 
 class NetEventCallback : public Bedrock::EnableNonOwnerReferences {};
diff --git a/include/bedrock/network/packet/move_actor_absolute_data.h b/include/bedrock/network/packet/move_actor_absolute_data.h
@@ -17,8 +17,8 @@
 #include <cstdint>
 
 #include "bedrock/bedrock.h"
+#include "bedrock/core/math/vec3.h"
 #include "bedrock/world/actor/actor_runtime_id.h"
-#include "bedrock/world/math/vec3.h"
 
 class MoveActorAbsoluteData {
 public:

diff --git a/include/bedrock/network/packet/start_game_packet.h b/include/bedrock/network/packet/start_game_packet.h
@@ -18,18 +18,18 @@
 #include <vector>
 
 #include "bedrock/bedrock.h"
+#include "bedrock/core/math/vec2.h"
+#include "bedrock/core/math/vec3.h"
+#include "bedrock/core/utility/uuid.h"
 #include "bedrock/forward.h"
-#include "bedrock/mce.h"
 #include "bedrock/nbt/compound_tag.h"
 #include "bedrock/network/packet.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"
-#include "bedrock/world/math/vec3.h"
+#include "bedrock/world/level/level_settings.h"
 
 class NetworkPermissions {
 public:

diff --git a/include/bedrock/network/server_network_handler.h b/include/bedrock/network/server_network_handler.h
@@ -15,14 +15,14 @@
 #pragma once
 
 #include "bedrock/bedrock.h"
-#include "bedrock/memory.h"
+#include "bedrock/core/memory.h"
+#include "bedrock/core/threading.h"
+#include "bedrock/core/utility/observer.h"
 #include "bedrock/network/connection.h"
 #include "bedrock/network/net_event_callback.h"
 #include "bedrock/server/server_player.h"
-#include "bedrock/social.h"
-#include "bedrock/threading.h"
 #include "bedrock/world/actor/player/player.h"
-#include "bedrock/world/level/event/server_event.h"
+#include "bedrock/world/events/server_event.h"
 #include "bedrock/world/level/level_listener.h"
 
 class ServerNetworkHandler : public Bedrock::Threading::EnableQueueForMainThread,

diff --git a/include/bedrock/server/commands/command_origin.h b/include/bedrock/server/commands/command_origin.h
@@ -18,18 +18,19 @@
 
 #include <json/json.h>
 
-#include "bedrock/mce.h"
-#include "bedrock/memory.h"
+#include "bedrock/core/math/vec2.h"
+#include "bedrock/core/math/vec3.h"
+#include "bedrock/core/memory.h"
+#include "bedrock/core/utility/uuid.h"
 #include "bedrock/network/network_identifier.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"
 #include "bedrock/server/commands/command_permission_level.h"
 #include "bedrock/world/actor/player/abilities/abilities_index.h"
+#include "bedrock/world/level/block_pos.h"
 #include "bedrock/world/level/dimension/dimension.h"
-#include "bedrock/world/math/vec2.h"
-#include "bedrock/world/math/vec3.h"
 
 class Actor;
 class Level;

diff --git a/include/bedrock/server/commands/command_origin_data.h b/include/bedrock/server/commands/command_origin_data.h
@@ -16,7 +16,7 @@
 #include <cstdint>
 #include <string>
 
-#include "bedrock/mce.h"
+#include "bedrock/core/utility/uuid.h"
 #include "bedrock/server/commands/command_origin_type.h"
 
 struct CommandOriginData {