Merge branch 'develop' of https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi

lib/GMLIB_API-JS.js

@@ -16,6 +16,7 @@ const GMLIB_API = {
     setPlayerNbt: ll.import("GMLIB_API", "setPlayerNbt"),
     setPlayerNbtTags: ll.import("GMLIB_API", "setPlayerNbtTags"),
     resourcePackTranslate: ll.import("GMLIB_API", "resourcePackTranslate"),
+    getResourcePackI18nLanguage: ll.import("GMLIB_API", "getResourcePackI18nLanguage"),
     chooseResourcePackI18nLanguage: ll.import("GMLIB_API", "chooseResourcePackI18nLanguage"),
     setEducationFeatureEnabled: ll.import("GMLib_ServerAPI", "setEducationFeatureEnabled"),
     registerAbilityCommand: ll.import("GMLib_ServerAPI", "registerAbilityCommand"),
@@ -34,6 +35,7 @@ const GMLIB_API = {
     getExperimentTranslatedName: ll.import("GMLIB_API", "getExperimentTranslatedName"),
     getExperimentEnabled: ll.import("GMLib_ModAPI", "getExperimentEnabled"),
     setExperimentEnabled: ll.import("GMLib_ModAPI", "setExperimentEnabled"),
+    unregisterRecipe: ll.import("GMLIB_API", "unregisterRecipe"),
     registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerExperimentsRequire"),
     registerStoneCutterRecipe: ll.import("GMLib_ModAPI", "registerStoneCutterRecipe"),
     registerSmithingTrimRecipe: ll.import("GMLib_ModAPI", "registerSmithingTrimRecipe"),
@@ -87,7 +89,8 @@ const GMLIB_API = {
     setWorldSpawn: ll.import("GMLIB_API", "setWorldSpawn"),
     getPlayerSpawnPoint: ll.import("GMLIB_API", "getPlayerSpawnPoint"),
     setPlayerSpawnPoint: ll.import("GMLIB_API", "setPlayerSpawnPoint"),
-    clearPlayerSpawnPoint: ll.import("GMLIB_API", "clearPlayerSpawnPoint")
+    clearPlayerSpawnPoint: ll.import("GMLIB_API", "clearPlayerSpawnPoint"),
+    setCustomPackPath: ll.import("GMLIB_API", "setCustomPackPath")
 }
 
 const FloatingTextList = [];
@@ -380,10 +383,18 @@ class Minecraft {
         return GMLIB_API.throwEntity(entity, proj, speed = 2, offset = 3);
     }
 
-    static chooseResourcePackI18nLanguage(language) {
+    static getServerLanguage() {
+        return GMLIB_API.getResourcePackI18nLanguage(language);
+    }
+
+    static setServerLanguage(language) {
         return GMLIB_API.chooseResourcePackI18nLanguage(language);
     }
 
+    static setCustomPackPath(path) {
+        GMLIB_API.setCustomPackPath(path);
+    }
+
     static resourcePackTranslate(key, params = []) {
         return GMLIB_API.resourcePackTranslate(key, params);
     }
@@ -394,6 +405,10 @@ class Recipes {
         throw new Error("Static class cannot be instantiated");
     }
 
+    static unregisterRecipe(recipeId) {
+        return GMLIB_API.unregisterRecipe(recipeId);
+    }
+
     static registerStoneCutterRecipe(recipeId, inputName, inputAux, outputName, outputAux, outputCount) {
         return GMLIB_API.registerStoneCutterRecipe(recipeId, inputName, inputAux, outputName, outputAux, outputCount);
     }
@@ -649,6 +664,7 @@ class JsonConfig {
     constructor(path, defultValue = {}) {
         this.mData = defultValue;
         this.mPath = path;
+        this.init();
     }
 
     init() {
@@ -688,6 +704,74 @@ class JsonConfig {
     }
 }
 
+class JsonLanguage extends JsonConfig {
+    constructor(path, defultValue = {}) {
+        super(path, defultValue);
+    }
+
+    translate(key, data = []) {
+        let result = this.get(key);
+        if (result == null) {
+            return key;
+        }
+        data.forEach((val, index) => {
+            let old = `{${index + 1}}`;
+            result = result.split(old).join(val);
+        });
+        return result;
+    }
+}
+
+class JsonI18n {
+    constructor(path, localLangCode = "en_US") {
+        if (!path.endsWith("/") && !path.endsWith("\\")) {
+            path = path + "/";
+        }
+        this.mPath = path;
+        this.mLangCode = localLangCode;
+        this.mAllLanguages = {};
+        this.mDefaultLangCode = "en_US";
+        this.loadAllLanguages();
+    }
+
+    loadAllLanguages() {
+        let exist_list = File.getFilesList(this.mPath);
+        exist_list.forEach((name) => {
+            let code = name.replace(".json", "");
+            let path = this.mPath + name;
+            let language = new JsonLanguage(path);
+            this.mAllLanguages[code] = language;
+        });
+    }
+
+    loadLanguage(langCode, defaultData = {}) {
+        let langPath = this.mPath;
+        langPath = langPath + langCode + ".json";
+        let language = new JsonLanguage(langPath, defaultData);
+        this.mAllLanguages[langCode] = language;
+    }
+
+    chooseLanguage(langCode) {
+        this.mLangCode = langCode;
+    }
+
+    setDefaultLanguage(langCode) {
+        this.mDefaultLangCode = langCode;
+    }
+
+    translate(key, data = [], langCode = this.mLangCode) {
+        let language = this.mAllLanguages[langCode];
+        let result = language.translate(key, data);
+        if (result == key) {
+            let language = this.mAllLanguages[this.mDefaultLangCode];
+            if (language) {
+                result = language.translate(key, data);
+            }
+        }
+        return result;
+    }
+};
+
 module.exports = {
     StaticFloatingText,
     DynamicFloatingText,
@@ -696,5 +780,7 @@ module.exports = {
     Experiments,
     GMLIB,
     Scoreboard,
-    JsonConfig
+    JsonConfig,
+    JsonLanguage,
+    JsonI18n
 };

manifest.json

@@ -1,7 +1,8 @@
 {
     "name": "${pluginName}",
     "entry": "${pluginFile}",
-    "version": "0.9.4",
+    "version": "0.9.5",
+    "author": "GroupMountain",
     "type": "native",
     "dependencies": [
         {

src/CompatibilityApi.cpp

@@ -14,6 +14,16 @@ ActorUniqueID parseScriptUniqueID(std::string uniqueId) {
 }
 
 void Export_Compatibility_API() {
+    RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string id) -> bool {
+        auto level = GMLIB_Level::getInstance();
+        if (!level) {
+            return false;
+        }
+        return GMLIB::Mod::CustomRecipe::unregisterRecipe(id);
+    });
+    RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string path) -> void {
+        GMLIB::Mod::CustomPacks::addCustomPackPath(path);
+    });
     RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float {
         auto level = GMLIB_Level::getInstance();
         if (!level) {
@@ -163,6 +173,9 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string code) -> void {
         I18n::chooseLanguage(code);
     });
+    RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
+        return I18n::getCurrentLanguage()->getFullLanguageCode();
+    });
     RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string uuid) -> std::pair<BlockPos, int> {
         auto uid = mce::UUID::fromString(uuid);
         auto pos = GMLIB_Player::getPlayerPosition(uid);

src/EventAPI.cpp

@@ -105,14 +105,13 @@ void Export_Event_API() {
                     );
                     return true;
                 }
-                case doHash("onTextSend"): {
+                case doHash("onEntityChangeDim"): {
-                    auto Call = RemoteCall::importAs<bool(std::string author, std::string message)>(eventName, eventId);
+                    auto Call = RemoteCall::importAs<bool(Actor * entity, int toDimId)>(eventName, eventId);
-                    eventBus->emplaceListener<GMLIB::Event::PacketEvent::TextPacketSendBeforeEvent>(
+                    eventBus->emplaceListener<GMLIB::Event::EntityEvent::ActorChangeDimensionBeforeEvent>(
-                        [Call](GMLIB::Event::PacketEvent::TextPacketSendBeforeEvent& ev) {
+                        [Call](GMLIB::Event::EntityEvent::ActorChangeDimensionBeforeEvent& ev) {
-                            auto pkt    = ev.getPacket();
                             bool result = true;
                             try {
-                                result = Call(pkt.mAuthor, pkt.mMessage);
+                                result = Call(&ev.self(), ev.getToDimensionId());
                             } catch (...) {}
                             if (!result) {
                                 ev.cancel();
@@ -152,6 +151,29 @@ void Export_Event_API() {
                     );
                     return true;
                 }
+                case doHash("onMobHurted"): {
+                    auto Call = RemoteCall::importAs<bool(Actor * mob, Actor * source, float damage, int cause)>(
+                        eventName,
+                        eventId
+                    );
+                    eventBus->emplaceListener<GMLIB::Event::EntityEvent::MobHurtAfterEvent>(
+                        [Call](GMLIB::Event::EntityEvent::MobHurtAfterEvent& ev) {
+                            auto&  damageSource = ev.getSource();
+                            Actor* source       = nullptr;
+                            if (damageSource.isEntitySource()) {
+                                auto uniqueId = damageSource.getDamagingEntityUniqueID();
+                                source        = ll::service::getLevel()->fetchEntity(uniqueId);
+                                if (source->getOwner()) {
+                                    source = source->getOwner();
+                                }
+                            }
+                            try {
+                                Call(&ev.self(), source, ev.getDamage(), (int)damageSource.getCause());
+                            } catch (...) {}
+                        }
+                    );
+                    return true;
+                }
                 default:
                     return false;
                 }

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "0.9.4",
+    "version": "0.9.5",
     "info": {
         "name": "GMLIB-LegacyRemoteCallApi",
         "description": "Legacy RemoteCall API for GMLIB",
@@ -14,9 +14,9 @@
             "library"
         ]
     },
-    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.9.4/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.9.5/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
     "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.9.6"
+        "github.com/GroupMountain/GMLIB": ">=0.9.8"
     },
     "files": {
         "place": [