refactor: refactoring Item

LiteLDev · Aug 6, 2024 · 84e7d5c · 84e7d5c
1 parent 183fad6
commit 84e7d5c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/legacy/api/CommandOriginAPI.cpp b/src/legacy/api/CommandOriginAPI.cpp
@@ -15,7 +15,6 @@
 
 #include <magic_enum.hpp>
 
-
 //////////////////// Class Definition ////////////////////
 ClassDefine<void> OriginTypeStaticBuilder = EnumDefineBuilder<CommandOriginType>::build("OriginType");
 
@@ -39,7 +38,7 @@ ClassDefine<CommandOriginClass> CommandOriginClassBuilder =
 
 CommandOriginClass::CommandOriginClass(CommandOrigin const* p)
 : ScriptClass(ScriptClass::ConstructFromCpp<CommandOriginClass>{}),
-  ptr(p){};
+  ptr(p) {};
 
 Local<Object> CommandOriginClass::newCommandOrigin(CommandOrigin const* p) {
     auto newp = new CommandOriginClass(p);

diff --git a/src/legacy/api/EntityAPI.cpp b/src/legacy/api/EntityAPI.cpp
@@ -925,7 +925,7 @@ Local<Value> EntityClass::toItem(const Arguments& args) {
         if (!entity || !entity->hasCategory(ActorCategory::Item)) {
             return Local<Value>();
         } else {
-            return ItemClass::newItem(&((ItemActor*)entity)->item(), false);
+            return ItemClass::newItem(&static_cast<ItemActor*>(entity)->item(), false);
         }
     }
     CATCH("Fail in toItem!");

diff --git a/src/legacy/api/ItemAPI.cpp b/src/legacy/api/ItemAPI.cpp
@@ -73,7 +73,7 @@ ClassDefine<ItemClass> ItemClassBuilder = defineClass<ItemClass>("LLSE_Item")
 
 ItemClass::ItemClass(ItemStack* p, bool isNew) : ScriptClass(ScriptClass::ConstructFromCpp<ItemClass>{}) {
     if (isNew) {
-        item = std::unique_ptr<ItemStack>(p);
+        item = std::shared_ptr<ItemStack>(p);
     } else {
         item = p;
     }
@@ -314,8 +314,8 @@ Local<Value> ItemClass::set(const Arguments& args) {
         if (!itemNew) return Local<Value>(); // Null
 
         auto tag = itemNew->save();
-        if (std::holds_alternative<std::unique_ptr<ItemStack>>(item)) {
-            std::get<std::unique_ptr<ItemStack>>(item)->load(*tag);
+        if (std::holds_alternative<std::shared_ptr<ItemStack>>(item)) {
+            std::get<std::shared_ptr<ItemStack>>(item)->load(*tag);
         } else {
             std::get<ItemStack*>(item)->load(*tag);
         }

diff --git a/src/legacy/api/ItemAPI.h b/src/legacy/api/ItemAPI.h
@@ -8,25 +8,25 @@ class ItemStack;
 
 class ItemClass : public ScriptClass {
 private:
-    std::variant<std::unique_ptr<ItemStack>, ItemStack*> item;
+    std::variant<std::shared_ptr<ItemStack>, ItemStack*> item;
 
     // Pre data
     std::string name, type;
     int         id, count, aux;
 
 public:
-    explicit ItemClass(ItemStack* p, bool isNew);
+    explicit ItemClass(ItemStack* p, bool isNew = false);
     void preloadData();
 
     ItemStack* get() {
-        if (std::holds_alternative<std::unique_ptr<ItemStack>>(item)) {
-            return std::get<std::unique_ptr<ItemStack>>(item).get();
+        if (std::holds_alternative<std::shared_ptr<ItemStack>>(item)) {
+            return std::get<std::shared_ptr<ItemStack>>(item).get();
         } else {
             return std::get<ItemStack*>(item);
         }
     }
 
-    static Local<Object> newItem(ItemStack* p, bool isNew);
+    static Local<Object> newItem(ItemStack* p, bool isNew = false);
     static ItemStack*    extract(Local<Value> v);
     Local<Value>         asPointer(const Arguments& args);