adapt: adapt GMLIB v0.12. 6

Update v0.12.1

manifest.json

@@ -4,7 +4,7 @@
     "type": "native",
     "author": "GroupMountain",
     "description": "Free Camera",
-    "version": "0.12.0",
+    "version": "0.12.1",
     "dependencies": [
         {
             "name": "GMLIB"

src/Config.h

@@ -1,6 +1,9 @@
 #pragma once
-#include "Global.h"
+#include <iostream>
 
-std::string defaultConfig = R"({
-    "language": "en_US"
-})";
+struct Config {
+    int version = 1;
+
+    std::string language = "zh_CN";
+
+};

src/Entry.cpp

@@ -1,5 +1,6 @@
 #include "Entry.h"
 #include "Global.h"
+#include "Language.h"
 ll::Logger logger(PLUGIN_NAME);
 
 namespace FreeCamera {
@@ -10,7 +11,6 @@ std::unique_ptr<Entry>& Entry::getInstance() {
 }
 
 bool Entry::load() {
-    initLanguage();
     if (Version::getProtocolVersion() != TARGET_PROTOCOL) {
         logger.error(tr("error.protocolMismatch.info"));
         logger.error(
@@ -23,11 +23,21 @@ bool Entry::load() {
 }
 
 bool Entry::enable() {
+    mConfig.emplace();
+    if (!ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / u8"config.json")) {
+        ll::config::saveConfig(*mConfig, getSelf().getConfigDir() / u8"config.json");
+    }
+    mI18n.emplace(getSelf().getLangDir(), mConfig->language);
+    mI18n->updateOrCreateLanguage("en_US", en_US);
+    mI18n->updateOrCreateLanguage("zh_CN", zh_CN);
+    mI18n->loadAllLanguages();
+    mI18n->chooseLanguage(mConfig->language);
     RegisterCommand();
     return true;
 }
 
 bool Entry::disable() {
+    mConfig.reset();
     FreeCamList.clear();
     ll::service::getLevel().get().forEachPlayer([](Player& pl) -> bool {
         FreeCamera::DisableFreeCamera(&pl);
@@ -36,6 +46,14 @@ bool Entry::disable() {
     return true;
 }
 
+Config& Entry::getConfig() { return mConfig.value(); }
+
+LangI18n& Entry::getI18n() { return *mI18n; }
+
 } // namespace FreeCamera
 
-LL_REGISTER_PLUGIN(FreeCamera::Entry, FreeCamera::Entry::getInstance());
+LL_REGISTER_PLUGIN(FreeCamera::Entry, FreeCamera::Entry::getInstance());
+
+std::string tr(std::string const& key, std::vector<std::string> const& data) {
+    return FreeCamera::Entry::getInstance()->getI18n().get(key, data);
+}

src/Entry.h

@@ -1,8 +1,11 @@
 #pragma once
-#include <ll/api/plugin/NativePlugin.h>
+#include "Config.h"
+#include "Global.h"
 
 namespace FreeCamera {
 
+using namespace GMLIB::Files::I18n;
+
 class Entry {
 
 public:
@@ -21,12 +24,14 @@ class Entry {
     /// @return True if the plugin is disabled successfully.
     bool disable();
 
-    // TODO: Implement this method if you need to unload the plugin.
-    // /// @return True if the plugin is unloaded successfully.
-    // bool unload();
+    Config& getConfig();
+
+    LangI18n& getI18n();
 
 private:
     ll::plugin::NativePlugin& mSelf;
+    std::optional<Config>     mConfig;
+    std::optional<LangI18n>   mI18n;
 };
 
 } // namespace FreeCamera

src/FreeCamera.cpp

@@ -16,14 +16,13 @@ void SendFakePlayerPacket(Player* pl) {
     // Update Skin
     auto               skin = pl->getSkin();
     GMLIB_BinaryStream bs;
+    bs.writePacketHeader(MinecraftPacketIds::PlayerSkin);
     bs.writeUuid(randomUuid);
     bs.writeSkin(skin);
     bs.writeString("");
     bs.writeString("");
     bs.writeBool(true);
-    auto pkt2 = MinecraftPackets::createPacket(MinecraftPacketIds::PlayerSkin);
-    pkt2->read(bs);
-    pl->sendNetworkPacket(*pkt2);
+    bs.sendTo(*pl);
 }
 
 void DisableFreeCameraPacket(Player* pl) {

src/Global.h

@@ -9,9 +9,8 @@ using namespace GMLIB;
 extern ll::Logger                 logger;
 extern std::unordered_set<uint64> FreeCamList;
 extern void                       RegisterCommand();
-extern void                       initLanguage();
 
-extern std::string tr(std::string key, std::vector<std::string> data = {});
+extern std::string tr(std::string const& key, std::vector<std::string> const& data = {});
 
 namespace FreeCamera {
 extern void DisableFreeCamera(Player* pl);

src/Language.h

@@ -1,20 +1,20 @@
 #pragma once
 #include "Global.h"
 
-std::string defaultLanguage_en_US = R"({
-    "freecamera.command.desc": "Enable or disable freecamera mode.",
-    "freecamera.command.enabled": "Freecamera mode enabled",
-    "freecamera.command.disabled": "Freecamera mode disabled",
-    "freecamera.command.console": "This command can only execute by players.",
-    "error.protocolMismatch.info":"You are running on an unsupport protocol version! This may result in crash!",
-    "error.protocolMismatch.version":"Support protocol %1$s, current protocol %2$s."
-})";
+std::string en_US = R"(
+    freecamera.command.desc=Enable or disable freecamera mode.
+    freecamera.command.enabled=Freecamera mode enabled.
+    freecamera.command.disabled=Freecamera mode disabled.
+    freecamera.command.console=This command can only execute by players.
+    error.protocolMismatch.info=You are running on an unsupport protocol version! This may result in crash!
+    error.protocolMismatch.version=Support protocol %1$s, current protocol %2$s.
+)";
 
-std::string defaultLanguage_zh_CN = R"({
-    "freecamera.command.desc": "开启或关闭自由视角模式",
-    "freecamera.command.enabled": "自由视角模式已启用",
-    "freecamera.command.disabled": "自由视角模式已禁用",
-    "freecamera.command.console": "该命令只能由玩家执行",
-    "error.protocolMismatch.info":"此插件正在不兼容的版本协议上运行！这可能造成服务器崩溃。",
-    "error.protocolMismatch.version":"此插件支持版本协议 %1$s，服务器版本协议 %2$s。"
-})";
+std::string zh_CN = R"(
+    freecamera.command.desc=开启或关闭自由视角模式。
+    freecamera.command.enabled=自由视角模式已启用。
+    freecamera.command.disabled=自由视角模式已禁用。
+    freecamera.command.console=该命令只能由玩家执行。
+    error.protocolMismatch.info=此插件正在不兼容的版本协议上运行！这可能造成服务器崩溃。
+    error.protocolMismatch.version=此插件支持版本协议 %1$s，服务器版本协议 %2$s。
+)";

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/FreeCamera",
-    "version": "0.12.0",
+    "version": "0.12.1",
     "info": {
         "name": "FreeCamera",
         "description": "Free Camera Plugin on Bedrock Dedicated Server",
@@ -11,7 +11,7 @@
             "freecamera"
         ]
     },
-    "asset_url": "https://github.com/GroupMountain/FreeCamera/releases/download/v0.12.0/FreeCamera-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/FreeCamera/releases/download/v0.12.1/FreeCamera-windows-x64.zip",
     "dependencies": {
         "github.com/GroupMountain/GMLIB": ">=0.12.1"
     },