fix: fix something

Author: ShrBox

src/legacy/api/CommandOriginAPI.cpp

@@ -11,8 +11,6 @@
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/level/dimension/Dimension.h"
 
-#include <magic_enum.hpp>
-
 //////////////////// Class Definition ////////////////////
 ClassDefine<void> OriginTypeStaticBuilder = EnumDefineBuilder<CommandOriginType>::build("OriginType");
 

src/legacy/api/DeviceAPI.cpp

@@ -34,23 +34,21 @@ ClassDefine<DeviceClass> DeviceClassBuilder = defineClass<DeviceClass>("LLSE_Dev
 //////////////////// Classes ////////////////////
 
 // 生成函数
-Local<Object> DeviceClass::newDevice(Player* player) {
-    auto newp = new DeviceClass(player);
-    return newp->getScriptObject();
-}
-
-// 成员函数
-void DeviceClass::setPlayer(Player* player) {
+DeviceClass::DeviceClass(Player* player) : ScriptClass(ScriptClass::ConstructFromCpp<DeviceClass>{}) {
     try {
         if (player) {
             mWeakEntity = player->getWeakEntity();
             mValid      = true;
         }
-    } catch (...) {
-        mValid = false;
-    }
+    } catch (...) {}
 }
 
+Local<Object> DeviceClass::newDevice(Player* player) {
+    auto newp = new DeviceClass(player);
+    return newp->getScriptObject();
+}
+
+// 成员函数
 Player* DeviceClass::getPlayer() {
     if (mValid) {
         return mWeakEntity.tryUnwrap<Player>().as_ptr();

src/legacy/api/DeviceAPI.h

@@ -11,11 +11,8 @@ class DeviceClass : public ScriptClass {
     bool                   mValid;
 
 public:
-    explicit DeviceClass(Player* player) : ScriptClass(ScriptClass::ConstructFromCpp<DeviceClass>{}) {
-        setPlayer(player);
-    }
+    explicit DeviceClass(Player* player);
 
-    void    setPlayer(Player* player);
     Player* getPlayer();
 
     static Local<Object> newDevice(Player* player);

src/legacy/api/EntityAPI.cpp

@@ -161,6 +161,15 @@ ClassDefine<EntityClass> EntityClassBuilder =
 
 //////////////////// Classes ////////////////////
 
+EntityClass::EntityClass(Actor* actor) : ScriptClass(ScriptClass::ConstructFromCpp<EntityClass>{}) {
+    try {
+        if (actor) {
+            mWeakEntity = actor->getWeakEntity();
+            mValid      = true;
+        }
+    } catch (...) {}
+}
+
 // 生成函数
 Local<Object> EntityClass::newEntity(Actor* actor) {
     auto newp = new EntityClass(actor);
@@ -180,17 +189,6 @@ Actor* EntityClass::tryExtractActor(Local<Value> v) {
 }
 
 // 成员函数
-void EntityClass::set(Actor* actor) {
-    try {
-        if (actor) {
-            mWeakEntity = actor->getWeakEntity();
-            mValid      = true;
-        }
-    } catch (...) {
-        mValid = false;
-    }
-}
-
 Actor* EntityClass::get() {
     if (mValid) {
         return mWeakEntity.tryUnwrap<Actor>().as_ptr();

src/legacy/api/EntityAPI.h

@@ -1,19 +1,18 @@
 #pragma once
 #include "api/APIHelp.h"
-#include "mc/legacy/ActorRuntimeID.h"
 #include "mc/deps/ecs/WeakEntityRef.h"
+#include "mc/legacy/ActorRuntimeID.h"
 
 //////////////////// Classes ////////////////////
 class Actor;
 class EntityClass : public ScriptClass {
 private:
     WeakRef<EntityContext> mWeakEntity;
-    bool                   mValid;
+    bool                   mValid = false;
 
 public:
-    explicit EntityClass(Actor* actor) : ScriptClass(ScriptClass::ConstructFromCpp<EntityClass>{}) { set(actor); }
+    explicit EntityClass(Actor* actor);
 
-    void   set(Actor* actor);
     Actor* get();
 
     static Local<Object> newEntity(Actor* actor);

src/legacy/api/NbtAPI.cpp

@@ -5,7 +5,6 @@
 #include "mc/nbt/ByteArrayTag.h"
 #include "mc/nbt/ByteTag.h"
 #include "mc/nbt/CompoundTag.h"
-#include "mc/nbt/CompoundTagVariant.h"
 #include "mc/nbt/DoubleTag.h"
 #include "mc/nbt/EndTag.h"
 #include "mc/nbt/FloatTag.h"
@@ -19,7 +18,6 @@
 #include <memory>
 #include <string>
 #include <string_view>
-#include <vector>
 
 using magic_enum::enum_cast;
 

src/legacy/api/PlayerAPI.cpp

@@ -340,7 +340,14 @@ ClassDefine<PlayerClass> PlayerClassBuilder =
 //////////////////// Classes ////////////////////
 
 // 生成函数
-PlayerClass::PlayerClass(Player* player) : ScriptClass(ScriptClass::ConstructFromCpp<PlayerClass>{}) { set(player); }
+PlayerClass::PlayerClass(Player* player) : ScriptClass(ScriptClass::ConstructFromCpp<PlayerClass>{}) {
+    try {
+        if (player) {
+            mWeakEntity = player->getWeakEntity();
+            mValid      = true;
+        }
+    } catch (...) {}
+}
 
 Local<Object> PlayerClass::newPlayer(Player* player) {
     auto newp = new PlayerClass(player);
@@ -742,17 +749,6 @@ Local<Value> McClass::broadcast(const Arguments& args) {
 }
 
 // 成员函数
-void PlayerClass::set(Player* player) {
-    try {
-        if (player) {
-            mWeakEntity = player->getWeakEntity();
-            mValid      = true;
-        }
-    } catch (...) {
-        mValid = false;
-    }
-}
-
 Player* PlayerClass::get() {
     if (mValid) {
         return mWeakEntity.tryUnwrap<Player>().as_ptr();

src/legacy/api/PlayerAPI.h

@@ -15,7 +15,6 @@ class PlayerClass : public ScriptClass {
 public:
     explicit PlayerClass(Player* player);
 
-    void             set(Player* player);
     Player*          get();
     SimulatedPlayer* asSimulatedPlayer();
 

src/lse/api/AttributeHelper.h

@@ -9,5 +9,5 @@ class AttributeHelper {
     static void setCurrentValue(MutableAttributeWithContext& attribute, float value);
     static void setMaxValue(MutableAttributeWithContext& attribute, float value);
     static void setDefaultValue(MutableAttributeWithContext& attribute, float value);
-}
+};
 } // namespace lse::api