From e848e6f1f7d0b59eae8677ca9784b00193cf069f Mon Sep 17 00:00:00 2001
From: Vincent <magicdroidx@gmail.com>
Date: Tue, 1 Oct 2024 13:35:15 +0100
Subject: [PATCH] feat: add PermissibleFactory

---
 .../endstone/detail/permissions/permissible.h | 46 +++++++++++++++++++
 .../detail/permissions/permissible_base.h     |  6 +--
 include/endstone/permissions/permissible.h    | 12 -----
 src/endstone_core/actor/actor.cpp             |  3 +-
 src/endstone_core/actor/mob.cpp               |  3 +-
 src/endstone_core/command/command_adapter.cpp |  3 +-
 .../command/console_command_sender.cpp        |  3 +-
 .../permissions/permissible_base.cpp          |  6 ++-
 src/endstone_core/player.cpp                  |  3 +-
 9 files changed, 62 insertions(+), 23 deletions(-)
 create mode 100644 include/endstone/detail/permissions/permissible.h

diff --git a/include/endstone/detail/permissions/permissible.h b/include/endstone/detail/permissions/permissible.h
new file mode 100644
index 000000000..a4e6daa19
--- /dev/null
+++ b/include/endstone/detail/permissions/permissible.h
@@ -0,0 +1,46 @@
+// 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
+
+namespace endstone::detail {
+
+class PermissibleFactory {
+public:
+    enum class Option {
+        Normal,
+        Lazy
+    };
+
+    template <Option Option, typename Derived, typename... Args>
+    static std::shared_ptr<Derived> create(Args &&...args)
+    {
+        struct Impl : Derived {
+            explicit Impl(Args &&...args) : Derived(std::forward<Args>(args)...) {}
+        };
+        auto result = std::make_shared<Impl>(std::forward<Args>(args)...);
+        if constexpr (Option == Option::Normal) {
+            result->recalculatePermissions();
+        }
+        return result;
+    }
+
+    template <typename Derived, typename... Args>
+    static std::shared_ptr<Derived> create(Args &&...args)
+    {
+        return create<Option::Normal, Derived>(std::forward<Args>(args)...);
+    }
+};
+
+}  // namespace endstone::detail
diff --git a/include/endstone/detail/permissions/permissible_base.h b/include/endstone/detail/permissions/permissible_base.h
index 799f56392..153d12b72 100644
--- a/include/endstone/detail/permissions/permissible_base.h
+++ b/include/endstone/detail/permissions/permissible_base.h
@@ -31,12 +31,10 @@ namespace endstone::detail {
  * Base Permissible for use in any Permissible object via proxy or extension
  */
 class PermissibleBase : public Permissible {
-    struct Private {
-        explicit Private() = default;
-    };
+protected:
+    explicit PermissibleBase(Permissible *opable);
 
 public:
-    explicit PermissibleBase(Private, Permissible *opable);
     [[nodiscard]] bool isOp() const override;
     void setOp(bool value) override;
     [[nodiscard]] bool isPermissionSet(std::string name) const override;
diff --git a/include/endstone/permissions/permissible.h b/include/endstone/permissions/permissible.h
index a4eb19b21..a76d7465d 100644
--- a/include/endstone/permissions/permissible.h
+++ b/include/endstone/permissions/permissible.h
@@ -123,17 +123,5 @@ class Permissible {
     [[nodiscard]] virtual std::unordered_set<PermissionAttachmentInfo *> getEffectivePermissions() const = 0;
 
     [[nodiscard]] virtual CommandSender *asCommandSender() const = 0;
-
-protected:
-    template <typename Derived, typename... Args>
-    static std::shared_ptr<Derived> create0(Args &&...args)
-    {
-        struct make_shared_enabler : Derived {
-            explicit make_shared_enabler(Args &&...args) : Derived(std::forward<Args>(args)...) {}
-        };
-        auto result = std::make_shared<make_shared_enabler>(std::forward<Args>(args)...);
-        result->recalculatePermissions();
-        return result;
-    }
 };
 }  // namespace endstone
diff --git a/src/endstone_core/actor/actor.cpp b/src/endstone_core/actor/actor.cpp
index d6c44193f..3d28b3dd8 100644
--- a/src/endstone_core/actor/actor.cpp
+++ b/src/endstone_core/actor/actor.cpp
@@ -22,6 +22,7 @@
 #include "bedrock/world/level/dimension/vanilla_dimensions.h"
 #include "endstone/detail/level/dimension.h"
 #include "endstone/detail/level/level.h"
+#include "endstone/detail/permissions/permissible.h"
 
 namespace endstone::detail {
 
@@ -209,7 +210,7 @@ ::Actor &EndstoneActor::getActor() const
 
 std::shared_ptr<EndstoneActor> EndstoneActor::create(EndstoneServer &server, ::Actor &actor)
 {
-    return create0<EndstoneActor>(server, actor);
+    return PermissibleFactory::create<EndstoneActor>(server, actor);
 }
 
 }  // namespace endstone::detail
diff --git a/src/endstone_core/actor/mob.cpp b/src/endstone_core/actor/mob.cpp
index 43e1f9cbc..7209fe0fd 100644
--- a/src/endstone_core/actor/mob.cpp
+++ b/src/endstone_core/actor/mob.cpp
@@ -14,6 +14,7 @@
 
 #include "endstone/detail/actor/mob.h"
 
+#include "endstone/detail/permissions/permissible.h"
 #include "endstone/detail/server.h"
 
 namespace endstone::detail {
@@ -168,7 +169,7 @@ bool EndstoneMob::isGliding() const
 
 std::shared_ptr<EndstoneMob> EndstoneMob::create(EndstoneServer &server, ::Mob &mob)
 {
-    return create0<EndstoneMob>(server, mob);
+    return PermissibleFactory::create<EndstoneMob>(server, mob);
 }
 
 }  // namespace endstone::detail
diff --git a/src/endstone_core/command/command_adapter.cpp b/src/endstone_core/command/command_adapter.cpp
index 274e53d17..0e6d6d005 100644
--- a/src/endstone_core/command/command_adapter.cpp
+++ b/src/endstone_core/command/command_adapter.cpp
@@ -21,6 +21,7 @@
 #include <entt/entt.hpp>
 
 #include "endstone/detail/message.h"
+#include "endstone/detail/permissions/permissible.h"
 
 namespace endstone::detail {
 CommandSenderAdapter::CommandSenderAdapter(const CommandOrigin &origin, CommandOutput &output)
@@ -70,7 +71,7 @@ void CommandSenderAdapter::setOp(bool value)
 
 std::shared_ptr<CommandSenderAdapter> CommandSenderAdapter::create(const CommandOrigin &origin, CommandOutput &output)
 {
-    return Permissible::create0<CommandSenderAdapter>(origin, output);
+    return PermissibleFactory::create<CommandSenderAdapter>(origin, output);
 }
 
 void CommandAdapter::execute(const CommandOrigin &origin, CommandOutput &output) const
diff --git a/src/endstone_core/command/console_command_sender.cpp b/src/endstone_core/command/console_command_sender.cpp
index c700a76a1..723129b35 100644
--- a/src/endstone_core/command/console_command_sender.cpp
+++ b/src/endstone_core/command/console_command_sender.cpp
@@ -15,6 +15,7 @@
 #include "endstone/detail/command/console_command_sender.h"
 
 #include "endstone/detail/message.h"
+#include "endstone/detail/permissions/permissible.h"
 #include "endstone/detail/server.h"
 
 namespace endstone::detail {
@@ -102,7 +103,7 @@ std::unordered_set<PermissionAttachmentInfo *> EndstoneConsoleCommandSender::get
 
 std::shared_ptr<EndstoneConsoleCommandSender> EndstoneConsoleCommandSender::create()
 {
-    return create0<EndstoneConsoleCommandSender>();
+    return PermissibleFactory::create<EndstoneConsoleCommandSender>();
 }
 
 }  // namespace endstone::detail
diff --git a/src/endstone_core/permissions/permissible_base.cpp b/src/endstone_core/permissions/permissible_base.cpp
index 862683eeb..061c5aa77 100644
--- a/src/endstone_core/permissions/permissible_base.cpp
+++ b/src/endstone_core/permissions/permissible_base.cpp
@@ -16,6 +16,8 @@
 
 #include <memory>
 
+#include <endstone/detail/permissions/permissible.h>
+
 #include "endstone/detail/server.h"
 #include "endstone/detail/util/error.h"
 #include "endstone/permissions/permission.h"
@@ -23,7 +25,7 @@
 
 namespace endstone::detail {
 
-PermissibleBase::PermissibleBase(Private, Permissible *opable) : opable_(opable), parent_(opable ? *opable : *this) {}
+PermissibleBase::PermissibleBase(Permissible *opable) : opable_(opable), parent_(opable ? *opable : *this) {}
 
 bool PermissibleBase::isOp() const
 {
@@ -216,7 +218,7 @@ void PermissibleBase::clearPermissions()
 
 std::shared_ptr<PermissibleBase> PermissibleBase::create(Permissible *opable)
 {
-    return std::make_shared<PermissibleBase>(Private(), opable);
+    return PermissibleFactory::create<PermissibleFactory::Option::Lazy, PermissibleBase>(opable);
 }
 
 }  // namespace endstone::detail
diff --git a/src/endstone_core/player.cpp b/src/endstone_core/player.cpp
index 3aabb2652..d9cda433a 100644
--- a/src/endstone_core/player.cpp
+++ b/src/endstone_core/player.cpp
@@ -38,6 +38,7 @@
 #include "endstone/detail/base64.h"
 #include "endstone/detail/form/form_codec.h"
 #include "endstone/detail/network/packet_adapter.h"
+#include "endstone/detail/permissions/permissible.h"
 #include "endstone/detail/server.h"
 #include "endstone/detail/util/error.h"
 #include "endstone/detail/util/uuid.h"
@@ -741,7 +742,7 @@ ::Player &EndstonePlayer::getHandle() const
 
 std::shared_ptr<EndstonePlayer> EndstonePlayer::create(EndstoneServer &server, ::Player &player)
 {
-    return create0<EndstonePlayer>(server, player);
+    return PermissibleFactory::create<EndstonePlayer>(server, player);
 }
 
 }  // namespace endstone::detail