chore: remove some todo

LiteLDev · Jan 18, 2024 · d27dd7e · d27dd7e
1 parent 26de3e8
commit d27dd7e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 42 deletions.
diff --git a/src/api/PlayerAPI.cpp b/src/api/PlayerAPI.cpp
@@ -1682,7 +1682,6 @@ Local<Value> PlayerClass::getEnderChest(const Arguments &args) {
     if (!player)
       return Local<Value>();
 
-    // Todo
     return ContainerClass::newContainer(player->getEnderChestContainer());
   }
   CATCH("Fail in getEnderChest!");
@@ -2165,43 +2164,43 @@ Local<Value> PlayerClass::setSidebar(const Arguments &args) {
     if (!player)
       return Local<Value>();
 
-    // std::vector<std::pair<std::string, int>> data;
-    // auto source = args[1].asObject();
-    // auto keys = source.getKeyNames();
-    // for (auto &key : keys) {
-    //   data.push_back(make_pair(key, source.get(key).toInt()));
-    // }
+    std::vector<std::pair<std::string, int>> data;
+    auto source = args[1].asObject();
+    auto keys = source.getKeyNames();
+    for (auto &key : keys) {
+      data.push_back(make_pair(key, source.get(key).toInt()));
+    }
 
-    // int sortOrder = 1;
-    // if (args.size() >= 3)
-    //   sortOrder = args[2].toInt();
-
-    // SetDisplayObjectivePacket disObjPkt = SetDisplayObjectivePacket(
-    //     "sidebar", "FakeScoreObj", args[0].asString().toString(), "dummy",
-    //     (ObjectiveSortOrder)sortOrder);
-    // player->sendNetworkPacket(disObjPkt);
-    // std::vector<ScorePacketInfo> info;
-    // static std::set<uint64_t> scoreIds; // Store scoreboard ids
-    // uint64_t Id = 0;
-    // do {
-    //   Id = (uint64_t)((rand() << 16) + rand() + 1145140);
-    // } while (scoreIds.find(Id) != scoreIds.end()); // Generate random id
-    // const ScoreboardId &boardId = ScoreboardId(Id);
-    // for (auto &i : data) {
-    //   ScorePacketInfo pktInfo = ScorePacketInfo();
-    //   pktInfo.mScoreboardId = boardId;
-    //   pktInfo.mObjectiveName = "FakeScoreObj";
-    //   pktInfo.mIdentityType = IdentityDefinition::Type::FakePlayer;
-    //   pktInfo.mScoreValue = i.second;
-    //   pktInfo.mFakePlayerName = i.first;
-    //   info.emplace_back(pktInfo);
-    // }
-    // SetScorePacket setPkt = SetScorePacket();
-    // setPkt.mType = ScorePacketType::Change;
-    // setPkt.mScoreInfo = info;
+    int sortOrder = 1;
+    if (args.size() >= 3)
+      sortOrder = args[2].toInt();
 
-    // player->sendNetworkPacket(disObjPkt);
-    return Boolean::newBoolean(false); // Todo
+    SetDisplayObjectivePacket disObjPkt = SetDisplayObjectivePacket(
+        "sidebar", "FakeScoreObj", args[0].asString().toString(), "dummy",
+        (ObjectiveSortOrder)sortOrder);
+    player->sendNetworkPacket(disObjPkt);
+    std::vector<ScorePacketInfo> info;
+    static std::set<uint64_t> scoreIds; // Store scoreboard ids
+    uint64_t Id = 0;
+    do {
+      Id = (uint64_t)((rand() << 16) + rand() + 1145140);
+    } while (scoreIds.find(Id) != scoreIds.end()); // Generate random id
+    const ScoreboardId &boardId = ScoreboardId(Id);
+    for (auto &i : data) {
+      ScorePacketInfo pktInfo = ScorePacketInfo();
+      pktInfo.mScoreboardId = boardId;
+      pktInfo.mObjectiveName = "FakeScoreObj";
+      pktInfo.mIdentityType = IdentityDefinition::Type::FakePlayer;
+      pktInfo.mScoreValue = i.second;
+      pktInfo.mFakePlayerName = i.first;
+      info.emplace_back(pktInfo);
+    }
+    SetScorePacket setPkt = SetScorePacket();
+    setPkt.mType = ScorePacketType::Change;
+    setPkt.mScoreInfo = info;
+
+    player->sendNetworkPacket(disObjPkt);
+    return Boolean::newBoolean(true);
   }
   CATCH("Fail in setSidebar!")
 }
@@ -2243,7 +2242,8 @@ Local<Value> PlayerClass::setBossBar(const Arguments &args) {
       AddEntityPacket entityPkt = AddEntityPacket();
       // Todo
       // AddEntityPacket(uid, "player", Vec3(getPos().x, (float)-70,
-      // getPos().z), Vec2{0, 0}, 0)
+      // getPos().z),
+      //                 Vec2{0, 0}, 0);
 
       BossBarColor color = (BossBarColor)args[3].toInt();
       BossEventPacket pkt = BossEventPacket();

diff --git a/xmake.lua b/xmake.lua
@@ -5,11 +5,9 @@ add_repositories("local-repo repo")
 
 -- Packages from xmake-repo
 add_requires("asio 1.28.0")
-add_requires("zlib")
-add_requires("openssl 1.1.1-t")
 add_requires("simpleini v4.19")
 add_requires("toml++ v3.4.0")
-add_requires("cpp-httplib v0.14.0")
+add_requires("cpp-httplib v0.14.0", {configs = {ssl=true, zlib=true}})
 add_requires("sqlite3 3.43.0+200")
 add_requires("mariadb-connector-c 3.3.4")
 
@@ -59,8 +57,6 @@ target("LeviScript")
     -- Packages from xmake-repo
     add_packages(
         "nlohmann_json",
-        "openssl",
-        "zlib",
         "gsl",
         "simpleini",
         "toml++",