Compare commits
35 Commits
@@ -11,8 +11,6 @@ jobs:
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- uses: xmake-io/github-action-setup-xmake@v1
|
||||
with:
|
||||
xmake-version: "2.9.3"
|
||||
|
||||
- run: |
|
||||
xmake repo -u
|
||||
@@ -23,14 +21,8 @@ jobs:
|
||||
- run: |
|
||||
xmake -w -y
|
||||
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
|
||||
path: |
|
||||
bin/DLL/
|
||||
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: PDB
|
||||
path: |
|
||||
bin/PDB/
|
||||
bin/
|
||||
@@ -11,8 +11,6 @@ jobs:
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- uses: xmake-io/github-action-setup-xmake@v1
|
||||
with:
|
||||
xmake-version: "2.9.3"
|
||||
|
||||
- run: |
|
||||
xmake repo -u
|
||||
@@ -23,17 +21,11 @@ jobs:
|
||||
- run: |
|
||||
xmake -w -y
|
||||
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
|
||||
path: |
|
||||
bin/DLL/
|
||||
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: PDB
|
||||
path: |
|
||||
bin/PDB/
|
||||
bin/
|
||||
|
||||
upload-to-release:
|
||||
needs:
|
||||
@@ -45,32 +37,23 @@ jobs:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Download Plugin
|
||||
uses: actions/download-artifact@v3
|
||||
- name: Download Mod
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
|
||||
path: release/Plugin/
|
||||
|
||||
- name: Download PDB
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: PDB
|
||||
path: release/PDB/
|
||||
path: artifact
|
||||
|
||||
- name: Copy additional files
|
||||
run: |
|
||||
cp LICENSE README.md release/Plugin/
|
||||
cp -v LICENSE README.md artifact/
|
||||
|
||||
- name: Archive release
|
||||
run: |
|
||||
cd release/Plugin
|
||||
zip -r ../${{ github.event.repository.name }}-windows-x64.zip *
|
||||
cd ..
|
||||
working-directory: artifact
|
||||
|
||||
- name: Create GitHub Release
|
||||
id: create_release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
release/${{ github.event.repository.name }}-windows-x64.zip
|
||||
release/PDB/${{ github.event.repository.name }}.pdb
|
||||
${{ github.event.repository.name }}-windows-x64.zip
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
declare class PAPI {
|
||||
export class PAPI {
|
||||
/** 注册一个玩家PAPI变量 */
|
||||
static registerPlayerPlaceholder(
|
||||
/** PAPI调用函数 */
|
||||
|
||||
Vendored
+857
-214
File diff suppressed because it is too large
Load Diff
+168
-26
@@ -1,28 +1,170 @@
|
||||
/** 事件创建函数 @type {function(string,string):boolean} */
|
||||
const CallEvent = ll.import("GMLIB_Event_API", "callCustomEvent");
|
||||
/** 获取事件ID函数 @type {function():string} */
|
||||
const getNextEventId = ll.import("GMLIB_Event_API", "getNextScriptEventId");
|
||||
|
||||
/** 事件类 */
|
||||
class Event {
|
||||
constructor() { throw new Error("Static class cannot be instantiated"); }
|
||||
|
||||
/**
|
||||
* 监听事件
|
||||
* @param {string} event 事件名称
|
||||
* @param {function} callback 回调
|
||||
* @returns {boolean} 是否创建成功
|
||||
*/
|
||||
static listen(event, callback) {
|
||||
let eventId = getNextEventId();
|
||||
ll.export(callback, event, eventId);
|
||||
let result = CallEvent(event, eventId);
|
||||
if (!result) {
|
||||
logger.error(`Cannot listen event "${event}" !`);
|
||||
logger.error(`GMLIB Script Event "${event}" does not exist !`);
|
||||
}
|
||||
return result;
|
||||
/**
|
||||
* @returns {string}
|
||||
*/
|
||||
const getPluginName = () => {
|
||||
try {
|
||||
throw new Error("getPluginName");
|
||||
} catch (error) {
|
||||
return error.stack.trim().match(/plugins\\(.*)\\.*\.js:[0-9]+\)$/i)?.[1] || "Unknown";
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = { Event };
|
||||
module.exports = {
|
||||
Event: {
|
||||
/**
|
||||
* 事件订阅记录
|
||||
* 例如: {事件名: [事件ID, ...], ...}
|
||||
* @type {Object.<string, number[]>}
|
||||
*/
|
||||
mEventData: {},
|
||||
/**
|
||||
* 事件异常处理回调
|
||||
* @param {Error} error
|
||||
* @param {string} eventName
|
||||
* @param {number} eventID
|
||||
* @param {string} pluginName
|
||||
* @returns {void}
|
||||
*/
|
||||
mErrorHanlerCallback: (error, eventName, eventID, pluginName) => {
|
||||
logger.error(`Info: ${pluginName}-${eventName}-${eventID} Exception: ${error.message}\n${error.stack}`);
|
||||
},
|
||||
|
||||
/**
|
||||
* 监听事件(兼容旧版)
|
||||
* @param {string} eventName
|
||||
* @param {function} callback
|
||||
* @param {boolean}
|
||||
*/
|
||||
listen: function (eventName, callback) {
|
||||
try {
|
||||
if (typeof callback !== "function") return false;
|
||||
const eventReflection = {
|
||||
onServerStopping: "ll::ServerStoppingEvent",
|
||||
onClientLogin: "gmlib::ClientLoginAfterEvent",
|
||||
onWeatherChange: "gmlib::WeatherUpdateBeforeEvent",
|
||||
onMobPick: "gmlib::MobPickupItemBeforeEvent",
|
||||
onItemTrySpawn: "gmlib::ItemActorSpawnBeforeEvent",
|
||||
onItemSpawned: "gmlib::ItemActorSpawnAfterEvent",
|
||||
onEntityTryChangeDim: "gmlib::ActorChangeDimensionBeforeEvent",
|
||||
onLeaveBed: "gmlib::PlayerStopSleepBeforeEvent",
|
||||
onDeathMessage: "gmlib::DeathMessageAfterEvent",
|
||||
onMobHurted: "gmlib::MobHurtAfterEvent",
|
||||
onEndermanTake: "gmlib::EndermanTakeBlockBeforeEvent",
|
||||
onEntityChangeDim: "gmlib::ActorChangeDimensionAfterEvent",
|
||||
onDragonRespawn: "gmlib::DragonRespawnBeforeEvent",
|
||||
onProjectileTryCreate: "gmlib::ProjectileCreateBeforeEvent",
|
||||
onProjectileCreate: "gmlib::ProjectileCreateAfterEvent",
|
||||
onSpawnWanderingTrader: "gmlib::SpawnWanderingTraderBeforeEvent",
|
||||
onHandleRequestAction: "gmlib::HandleRequestActionBeforeEvent",
|
||||
onSendContainerClosePacket: "gmlib::ContainerClosePacketSendAfterEvent"
|
||||
};
|
||||
this.emplaceListener(eventReflection[eventName] ?? eventName, event => {
|
||||
const result = callback(...event.params);
|
||||
if (typeof (result) === "boolean" && !result) event.cancel();
|
||||
});
|
||||
return true;
|
||||
} catch { }
|
||||
return false;
|
||||
},
|
||||
|
||||
/**
|
||||
* 订阅事件
|
||||
* @param {string} eventName
|
||||
* @param {function} callback
|
||||
* @param {number?} priority
|
||||
* @param {string?} pluginName
|
||||
* @returns {number}
|
||||
*/
|
||||
emplaceListener: function (eventName, callback, priority = this.EventPriority.Normal, pluginName = getPluginName()) {
|
||||
if (typeof callback !== "function") throw new Error("callback must be a function!");
|
||||
const /** @type {number} */ eventId = ll.imports("GMLIB_Event_API", "emplaceListener")(pluginName, eventName, priority);
|
||||
if (eventId === -1) throw new Error(`Event ${eventName} creation failed!`);
|
||||
ll.exports((...data) => {
|
||||
let /** @type {boolean} */ result = typeof (data.slice(-1)[0]) === "boolean" ? data.pop() : false;
|
||||
try {
|
||||
callback({
|
||||
params: data,
|
||||
cancel: () => result = true,
|
||||
setCancelled: (/** @type {boolean} */value) => { result = value; },
|
||||
isCancelled: () => result,
|
||||
getId: () => eventId,
|
||||
getEventType: () => eventName
|
||||
});
|
||||
} catch (error) {
|
||||
try {
|
||||
this.mErrorHanlerCallback(error, eventName, eventId, pluginName);
|
||||
} catch { }
|
||||
}
|
||||
return result;
|
||||
}, pluginName, eventName + "_" + eventId);
|
||||
(this.mEventData[eventName] ??= []).push(eventId);
|
||||
return eventId;
|
||||
},
|
||||
|
||||
/**
|
||||
* 取消事件订阅
|
||||
* @param {number} eventId
|
||||
* @param {boolean}
|
||||
*/
|
||||
removeListener: function (eventId) {
|
||||
const result = ll.imports("GMLIB_Event_API", "removeListener")(eventId);
|
||||
if (result) {
|
||||
for (let [eventName, eventIds] of Object.entries(this.mEventData)) {
|
||||
this.mEventData[eventName] = eventIds.filter(id => id !== eventId);
|
||||
if (this.mEventData[eventName].length === 0) delete this.mEventData[eventName];
|
||||
}
|
||||
}
|
||||
return result;
|
||||
},
|
||||
|
||||
/**
|
||||
* 判断事件订阅是否存在
|
||||
* @param {number} eventId
|
||||
* @returns {boolean}
|
||||
*/
|
||||
hasListener: function (eventId) {
|
||||
return ll.imports("GMLIB_Event_API", "hasListener")(eventId);
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取订阅事件优先级
|
||||
* @param {number} eventId
|
||||
* @returns {number?}
|
||||
*/
|
||||
getListenerPriority: function (eventId) {
|
||||
const priority = ll.imports("GMLIB_Event_API", "getListenerPriority")(eventId);
|
||||
return priority === -1 ? undefined : priority;
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取订阅事件列表
|
||||
* @param {string | undefined} eventName
|
||||
* @returns {number[] | Object.<string, number[]>}
|
||||
*/
|
||||
getListener: function (eventName) {
|
||||
return eventName === undefined ? this.mEventData : this.mEventData[eventName] ?? [];
|
||||
},
|
||||
|
||||
/**
|
||||
* 设置异常处理回调
|
||||
* @param {function(Error, string, number, string): void} callback
|
||||
* @returns {boolean}
|
||||
*/
|
||||
setErrorHanlerCallback: function (callback) {
|
||||
if (callback === undefined || typeof callback !== "function") return false;
|
||||
this.mErrorHanlerCallback = callback;
|
||||
return true;
|
||||
},
|
||||
|
||||
/**
|
||||
* 事件优先级
|
||||
*/
|
||||
EventPriority: {
|
||||
Highest: 0,
|
||||
High: 100,
|
||||
Normal: 200,
|
||||
Low: 300,
|
||||
Lowest: 400
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,182 @@
|
||||
// // const getNextCallbackId = ll.import("GMLIB_FormAPI", "getNextFormCallbackId");
|
||||
|
||||
// class ServerSettingForm {
|
||||
// constructor() {
|
||||
// throw new Error("Static class cannot be instantiated");
|
||||
// }
|
||||
|
||||
// static getDefaultPriority() {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "getDefaultPriority")();
|
||||
// }
|
||||
|
||||
// static hasTitle() {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "hasTitle")();
|
||||
// }
|
||||
|
||||
// static getTitle() {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "getTitle")();
|
||||
// }
|
||||
|
||||
// static setTitle(title, forceModify = false) {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "setTitle")(title, forceModify);
|
||||
// }
|
||||
|
||||
// static hasIcon() {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "hasIcon")();
|
||||
// }
|
||||
|
||||
// static getIconData() {
|
||||
// return hasIcon() ? ll.import("GMLIB_ServerSettingForm", "getIconData")() : null;
|
||||
// }
|
||||
|
||||
// static getIconType() {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "getIconType")();
|
||||
// }
|
||||
|
||||
// static setIcon(data, type = 0, forceModify = false) {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "setIcon")(data, type, forceModify);
|
||||
// }
|
||||
|
||||
// static addLabel(
|
||||
// text,
|
||||
// playerDetector = (pl) => { return true; },
|
||||
// priority = this.getDefaultPriority()
|
||||
// ) {
|
||||
// let detectorId = getNextCallbackId();
|
||||
// ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
|
||||
// return ll.import("GMLIB_ServerSettingForm", "addLabel")(text, detectorId, priority);
|
||||
// }
|
||||
|
||||
|
||||
// static addInput(
|
||||
// text,
|
||||
// placeholder,
|
||||
// defaultVal,
|
||||
// callback = (pl, input) => { },
|
||||
// playerDetector = (pl) => { return true; },
|
||||
// priority = this.getDefaultPriority()
|
||||
// ) {
|
||||
// let callbackId = getNextCallbackId();
|
||||
// ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// let detectorId = getNextCallbackId();
|
||||
// ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
|
||||
// return ll.import("GMLIB_ServerSettingForm", "addInput")(text, placeholder, defaultVal, callbackId, detectorId, priority);
|
||||
// }
|
||||
|
||||
// static addToggle(
|
||||
// text,
|
||||
// defaultVal = false,
|
||||
// callback = (pl, input) => { },
|
||||
// playerDetector = (pl) => { return true; },
|
||||
// priority = this.getDefaultPriority()
|
||||
// ) {
|
||||
// let callbackId = getNextCallbackId();
|
||||
// ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// let detectorId = getNextCallbackId();
|
||||
// ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
|
||||
// return ll.import("GMLIB_ServerSettingForm", "addToggle")(text, defaultVal, callbackId, detectorId, priority);
|
||||
// }
|
||||
|
||||
// static addDropdown(
|
||||
// text,
|
||||
// options,
|
||||
// defaultVal = 0,
|
||||
// callback = (pl, input) => { },
|
||||
// playerDetector = (pl) => { return true; },
|
||||
// priority = this.getDefaultPriority()
|
||||
// ) {
|
||||
// let callbackId = getNextCallbackId();
|
||||
// ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// let detectorId = getNextCallbackId();
|
||||
// ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
|
||||
// return ll.import("GMLIB_ServerSettingForm", "addDropdown")(text, options, defaultVal, callbackId, detectorId, priority);
|
||||
// }
|
||||
|
||||
// static addSlider(
|
||||
// text,
|
||||
// min,
|
||||
// max,
|
||||
// step = 0.0,
|
||||
// defaultVal = 0.0,
|
||||
// callback = (pl, input) => { },
|
||||
// playerDetector = (pl) => { return true; },
|
||||
// priority = this.getDefaultPriority()
|
||||
// ) {
|
||||
// let callbackId = getNextCallbackId();
|
||||
// ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// let detectorId = getNextCallbackId();
|
||||
// ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
|
||||
// return ll.import("GMLIB_ServerSettingForm", "addSlider")(text, min, max, step, defaultVal, callbackId, detectorId, priority);
|
||||
// }
|
||||
|
||||
// static addStepSlider(
|
||||
// text,
|
||||
// steps,
|
||||
// defaultVal = 0,
|
||||
// callback = (pl, input) => { },
|
||||
// playerDetector = (pl) => { return true; },
|
||||
// priority = this.getDefaultPriority()
|
||||
// ) {
|
||||
// let callbackId = getNextCallbackId();
|
||||
// ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// let detectorId = getNextCallbackId();
|
||||
// ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
|
||||
// return ll.import("GMLIB_ServerSettingForm", "addStepSlider")(text, steps, defaultVal, callbackId, detectorId, priority);
|
||||
// }
|
||||
|
||||
// static removeElement(id) {
|
||||
// return ll.import("GMLIB_ServerSettingForm", "removeElement")(id);
|
||||
// }
|
||||
// }
|
||||
|
||||
// class NpcDialogueForm {
|
||||
// constructor(npcName, sceneName, dialogue) {
|
||||
// this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
|
||||
// }
|
||||
|
||||
// addButton(button) {
|
||||
// return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
|
||||
// }
|
||||
|
||||
// sendTo(pl, callback = (pl, index, type) => { }, free = true) {
|
||||
// let callbackId = getNextCallbackId();
|
||||
// ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
|
||||
// if (free) {
|
||||
// this.destroy();
|
||||
// }
|
||||
// }
|
||||
|
||||
// destroy() {
|
||||
// ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
|
||||
// }
|
||||
// }
|
||||
|
||||
// class ChestForm {
|
||||
// constructor(npcName, sceneName, dialogue) {
|
||||
// this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
|
||||
// }
|
||||
|
||||
// addButton(button) {
|
||||
// return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
|
||||
// }
|
||||
|
||||
// sendTo(pl, free = true) {
|
||||
// //let callbackId = getNextCallbackId();
|
||||
// //ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
|
||||
// //ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
|
||||
// //if (free) {
|
||||
// // this.destroy();
|
||||
// //}
|
||||
// }
|
||||
|
||||
// destroy() {
|
||||
// //ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
|
||||
// }
|
||||
// }
|
||||
|
||||
// module.exports = {
|
||||
// ServerSettingForm,
|
||||
// NpcDialogueForm,
|
||||
// ChestForm
|
||||
// };
|
||||
Vendored
+480
-19
@@ -1,5 +1,5 @@
|
||||
/** 静态悬浮字类 */
|
||||
declare class StaticFloatingText {
|
||||
export class StaticFloatingText {
|
||||
constructor(
|
||||
/** 生成的坐标 */
|
||||
pos: FloatPos,
|
||||
@@ -73,7 +73,7 @@ declare class StaticFloatingText {
|
||||
}
|
||||
|
||||
/** 动态悬浮字类 */
|
||||
declare class DynamicFloatingText extends StaticFloatingText {
|
||||
export class DynamicFloatingText extends StaticFloatingText {
|
||||
constructor(
|
||||
/** 生成的坐标 */
|
||||
pos: FloatPos,
|
||||
@@ -113,7 +113,7 @@ declare class DynamicFloatingText extends StaticFloatingText {
|
||||
}
|
||||
|
||||
/** 基础游戏API类 */
|
||||
declare class Minecraft {
|
||||
export class Minecraft {
|
||||
private constructor();
|
||||
|
||||
/** 获取服务器平均tps */
|
||||
@@ -393,7 +393,7 @@ declare class Minecraft {
|
||||
}
|
||||
|
||||
/** 合成表类 */
|
||||
declare class Recipes {
|
||||
export class Recipes {
|
||||
private constructor();
|
||||
|
||||
/** 注销合成表 */
|
||||
@@ -534,7 +534,7 @@ declare class Recipes {
|
||||
}
|
||||
|
||||
/** 实验性功能类 */
|
||||
declare class Experiments {
|
||||
export class Experiments {
|
||||
private constructor();
|
||||
|
||||
/** 获取所有实验的id */
|
||||
@@ -568,7 +568,7 @@ declare class Experiments {
|
||||
}
|
||||
|
||||
/** 计分板类 */
|
||||
declare class Scoreboard {
|
||||
export class Scoreboard {
|
||||
private constructor();
|
||||
|
||||
/** 获取所有跟踪实体 */
|
||||
@@ -788,7 +788,7 @@ declare class Scoreboard {
|
||||
}
|
||||
|
||||
/** 仿LSE的JsonConfigFile类 */
|
||||
declare class JsonConfig {
|
||||
export class JsonConfig {
|
||||
constructor(
|
||||
/** 文件路径 */
|
||||
path: string,
|
||||
@@ -832,7 +832,7 @@ declare class JsonConfig {
|
||||
}
|
||||
|
||||
/** JSON语言文件 */
|
||||
declare class JsonLanguage extends JsonConfig {
|
||||
export class JsonLanguage extends JsonConfig {
|
||||
/** 创建或打开一个 Json 语言文件 */
|
||||
constructor(
|
||||
/** 文件路径 */
|
||||
@@ -851,7 +851,7 @@ declare class JsonLanguage extends JsonConfig {
|
||||
}
|
||||
|
||||
/** JSON版翻译类 */
|
||||
declare class JsonI18n {
|
||||
export class JsonI18n {
|
||||
/** 加载翻译数据目录 */
|
||||
constructor(
|
||||
/** 目录 */
|
||||
@@ -895,7 +895,7 @@ declare class JsonI18n {
|
||||
}
|
||||
|
||||
/** 版本类 */
|
||||
declare class Version {
|
||||
export class Version {
|
||||
/** 创建版本对象 */
|
||||
constructor(
|
||||
/** 主版本号 */
|
||||
@@ -944,7 +944,7 @@ declare class Version {
|
||||
}
|
||||
|
||||
/** 翻译API类 */
|
||||
declare class I18nAPI {
|
||||
export class I18nAPI {
|
||||
private constructor();
|
||||
|
||||
/** 获取键翻译 */
|
||||
@@ -1005,7 +1005,7 @@ declare class I18nAPI {
|
||||
}
|
||||
|
||||
/** 玩家信息存储类 */
|
||||
declare class UserCache {
|
||||
export class UserCache {
|
||||
private constructor();
|
||||
|
||||
/** 根据uuid查xuid */
|
||||
@@ -1054,6 +1054,458 @@ declare class UserCache {
|
||||
static getAllPlayerInfo(): { Xuid: String; Uuid: string; Name: string; }[]
|
||||
}
|
||||
|
||||
type PacketDataItem = (
|
||||
{
|
||||
id: number,
|
||||
type: 0x0 | 0x1 | 0x2 | 0x3 | 0x7,
|
||||
value: number
|
||||
}
|
||||
| {
|
||||
id: number,
|
||||
type: 0x4,
|
||||
value: string
|
||||
}
|
||||
| {
|
||||
id: number,
|
||||
type: 0x5,
|
||||
value: NbtCompound
|
||||
}
|
||||
| {
|
||||
id: number,
|
||||
type: 0x6 | 0x8,
|
||||
value: IntPos | FloatPos
|
||||
}
|
||||
);
|
||||
|
||||
type PacketData = (
|
||||
| { type: "", value: PacketData | PacketData[] }
|
||||
| { type: "Item", value: Item }
|
||||
| { type: "CompoundTag", value: NbtCompound }
|
||||
| {
|
||||
type: "DataItem",
|
||||
value: PacketDataItem[],
|
||||
}
|
||||
| {
|
||||
type: "ActorLink",
|
||||
value: {
|
||||
mA: number,
|
||||
mB: number,
|
||||
mType: number,
|
||||
mImmediate: boolean,
|
||||
mPassengerInitiated: boolean,
|
||||
},
|
||||
}
|
||||
| { type: "Vec3" | "BlockPos", value: FloatPos | IntPos }
|
||||
| { type: "Vec2", value: DirectionAngle }
|
||||
| { type: "String" | "Uuid", value: string }
|
||||
| { type: "Bool", value: boolean }
|
||||
| {
|
||||
type:
|
||||
"PacketHeader"
|
||||
| "Byte"
|
||||
| "Double"
|
||||
| "Float"
|
||||
| "SignedBigEndianInt"
|
||||
| "SignedInt"
|
||||
| "SignedInt64"
|
||||
| "SignedShort"
|
||||
| "UnsignedChar"
|
||||
| "UnsignedInt"
|
||||
| "UnsignedInt64"
|
||||
| "UnsignedShort"
|
||||
| "UnsignedVarInt"
|
||||
| "UnsignedVarInt64"
|
||||
| "VarInt"
|
||||
| "VarInt64",
|
||||
value: number,
|
||||
}
|
||||
);
|
||||
|
||||
/** 二进制流数据包类 */
|
||||
export class GMLIB_BinaryStream {
|
||||
/** 数据包ID */
|
||||
#id: number;
|
||||
/** 数据包是否被销毁 */
|
||||
#destroy: boolean;
|
||||
|
||||
/** 构造二进流数据包 */
|
||||
constructor(
|
||||
/** 数据包数据 */
|
||||
data: PacketData[]?
|
||||
);
|
||||
|
||||
/** 拷贝二进制流数据包 */
|
||||
constructor(
|
||||
/** 要拷贝的二进制流数据包 */
|
||||
stream: GMLIB_BinaryStream
|
||||
);
|
||||
|
||||
/** 获取数据包的ID */
|
||||
getId(): number;
|
||||
|
||||
/** 发送数据包 */
|
||||
sendTo(
|
||||
/** 要发送数据包的玩家对象 */
|
||||
player: Player | Entity,
|
||||
/** 数据包发送后是否销毁 */
|
||||
free: boolean = true
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 发送数据包到玩家数组 */
|
||||
sendToPlayers(
|
||||
/** 要发送数据包的玩家对象数组 */
|
||||
players: Player[] | Entity[],
|
||||
/** 数据包发送后是否销毁 */
|
||||
free: boolean = true
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 发送数据包到所有玩家 */
|
||||
sendToAll(
|
||||
/** 数据包发送后是否销毁 */
|
||||
free: boolean = true
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 发送数据包到维度 */
|
||||
sendToDimension(
|
||||
/** 维度ID */
|
||||
dimid: number,
|
||||
/** 数据包发送后是否销毁 */
|
||||
free: boolean = true
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 销毁数据包 */
|
||||
destroy(): GMLIB_BinaryStream;
|
||||
|
||||
/** 数据包是否已被销毁 */
|
||||
isDestroy(): boolean;
|
||||
|
||||
/** 重置数据包 */
|
||||
reset(): GMLIB_BinaryStream;
|
||||
|
||||
/** 转换成字符串 */
|
||||
toString(): string;
|
||||
|
||||
/** 写入数据 */
|
||||
write(
|
||||
/** 数据 */
|
||||
data: PacketData | PacketData[]?
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入数据包头部 */
|
||||
writePacketHeader(
|
||||
/** 数据包ID */
|
||||
id: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入UUID */
|
||||
writeUuid(
|
||||
/** UUID */
|
||||
value: string
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入物品 */
|
||||
writeItem(
|
||||
/** 物品对象 */
|
||||
value: Item
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入NBT */
|
||||
writeCompoundTag(
|
||||
/** NBT */
|
||||
value: NbtCompound
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeDataItem(
|
||||
/** 数据项 */
|
||||
value: PacketDataItem[]
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
writeActorLink(
|
||||
/** 数据项 */
|
||||
value: { "mA": number, "mB": number, "mType": number, "mImmediate": boolean, "mPassengerInitiated": boolean }
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入浮点数坐标对象 */
|
||||
writeVec3(
|
||||
/** 浮点数坐标对象 */
|
||||
value: FloatPos
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入整数坐标对象 */
|
||||
writeBlockPos(
|
||||
/** 整数坐标对象 */
|
||||
value: IntPos
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeVec2(
|
||||
/** 数据 */
|
||||
value: { "x": number, "z": number }
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入字符串 */
|
||||
writeString(
|
||||
/** 字符串 */
|
||||
value: string
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入布尔值 */
|
||||
writeBool(
|
||||
/** 布尔值 */
|
||||
value: boolean
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入字节 */
|
||||
writeByte(
|
||||
/** 字节 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入(双精度)浮点数 */
|
||||
writeDouble(
|
||||
/** 浮点数 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入(单精度)浮点数 */
|
||||
writeFloat(
|
||||
/** 浮点数 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeSignedBigEndianInt(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeSignedInt(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** 写入 */
|
||||
writeSignedInt64(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeSignedShort(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeUnsignedChar(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeUnsignedInt(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeUnsignedInt64(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeUnsignedShort(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeUnsignedVarInt(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeUnsignedVarInt64(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeVarInt(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
|
||||
/** */
|
||||
writeVarInt64(
|
||||
/** 数值 */
|
||||
value: number
|
||||
): GMLIB_BinaryStream;
|
||||
}
|
||||
|
||||
export enum ActorType {
|
||||
Undefined = 1,
|
||||
TypeMask = 0b11111111,
|
||||
None = 0,
|
||||
Mob = 1 << 8,
|
||||
PathfinderMob = 1 << 9 | Mob,
|
||||
UnknownType = 1 << 10,
|
||||
Monster = 1 << 11 | PathfinderMob,
|
||||
Animal = 1 << 12 | PathfinderMob,
|
||||
WaterAnimal = 1 << 13 | PathfinderMob,
|
||||
TamableAnimal = 1 << 14 | Animal,
|
||||
Ambient = 1 << 15 | Mob,
|
||||
UndeadMob = 1 << 16 | Monster,
|
||||
ZombieMonster = 1 << 17 | UndeadMob,
|
||||
Arthropod = 1 << 18 | Monster,
|
||||
Minecart = 1 << 19,
|
||||
SkeletonMonster = 1 << 20 | UndeadMob,
|
||||
EquineAnimal = 1 << 21 | TamableAnimal,
|
||||
Projectile = 1 << 22,
|
||||
AbstractArrow = 1 << 23,
|
||||
VillagerBase = 1 << 24 | PathfinderMob,
|
||||
|
||||
Chicken = 10 | Animal,
|
||||
Cow = 11 | Animal,
|
||||
Pig = 12 | Animal,
|
||||
Sheep = 13 | Animal,
|
||||
Wolf = 14 | TamableAnimal,
|
||||
Villager = 15 | VillagerBase,
|
||||
MushroomCow = 16 | Animal,
|
||||
Squid = 17 | WaterAnimal,
|
||||
Rabbit = 18 | Animal,
|
||||
Bat = 19 | Ambient,
|
||||
IronGolem = 20 | PathfinderMob,
|
||||
SnowGolem = 21 | PathfinderMob,
|
||||
Ocelot = 22 | TamableAnimal,
|
||||
Horse = 23 | EquineAnimal,
|
||||
Donkey = 24 | EquineAnimal,
|
||||
Mule = 25 | EquineAnimal,
|
||||
SkeletonHorse = 26 | EquineAnimal | UndeadMob,
|
||||
ZombieHorse = 27 | EquineAnimal | UndeadMob,
|
||||
PolarBear = 28 | Animal,
|
||||
Llama = 29 | Animal,
|
||||
Parrot = 30 | TamableAnimal,
|
||||
Dolphin = 31 | WaterAnimal,
|
||||
Zombie = 32 | ZombieMonster,
|
||||
Creeper = 33 | Monster,
|
||||
Skeleton = 34 | SkeletonMonster,
|
||||
Spider = 35 | Arthropod,
|
||||
PigZombie = 36 | UndeadMob,
|
||||
Slime = 37 | Monster,
|
||||
EnderMan = 38 | Monster,
|
||||
Silverfish = 39 | Arthropod,
|
||||
CaveSpider = 40 | Arthropod,
|
||||
Ghast = 41 | Monster,
|
||||
LavaSlime = 42 | Monster,
|
||||
Blaze = 43 | Monster,
|
||||
ZombieVillager = 44 | ZombieMonster,
|
||||
Witch = 45 | Monster,
|
||||
Stray = 46 | SkeletonMonster,
|
||||
Husk = 47 | ZombieMonster,
|
||||
WitherSkeleton = 48 | SkeletonMonster,
|
||||
Guardian = 49 | Monster,
|
||||
ElderGuardian = 50 | Monster,
|
||||
Npc = 51 | Mob,
|
||||
WitherBoss = 52 | UndeadMob,
|
||||
Dragon = 53 | Monster,
|
||||
Shulker = 54 | Monster,
|
||||
Endermite = 55 | Arthropod,
|
||||
Agent = 56 | Mob,
|
||||
Vindicator = 57 | Monster,
|
||||
Phantom = 58 | UndeadMob,
|
||||
IllagerBeast = 59 | Monster,
|
||||
UNUSED60 = 60,
|
||||
ArmorStand = 61 | Mob,
|
||||
TripodCamera = 62 | Mob,
|
||||
Player = 63 | Mob,
|
||||
ItemEntity = 64 | None,
|
||||
PrimedTnt = 65 | None,
|
||||
FallingBlock = 66 | None,
|
||||
MovingBlock = 67 | None,
|
||||
ExperiencePotion = 68 | Projectile,
|
||||
Experience = 69 | None,
|
||||
EyeOfEnder = 70 | None,
|
||||
EnderCrystal = 71 | None,
|
||||
FireworksRocket = 72 | None,
|
||||
Trident = 73 | Projectile | AbstractArrow,
|
||||
Turtle = 74 | Animal,
|
||||
Cat = 75 | TamableAnimal,
|
||||
ShulkerBullet = 76 | Projectile,
|
||||
FishingHook = 77 | None,
|
||||
Chalkboard = 78 | None,
|
||||
DragonFireball = 79 | Projectile,
|
||||
Arrow = 80 | Projectile | AbstractArrow,
|
||||
Snowball = 81 | Projectile,
|
||||
ThrownEgg = 82 | Projectile,
|
||||
Painting = 83 | None,
|
||||
MinecartRideable = 84 | Minecart,
|
||||
LargeFireball = 85 | Projectile,
|
||||
ThrownPotion = 86 | Projectile,
|
||||
Enderpearl = 87 | Projectile,
|
||||
LeashKnot = 88 | None,
|
||||
WitherSkull = 89 | Projectile,
|
||||
BoatRideable = 90 | None,
|
||||
WitherSkullDangerous = 91 | Projectile,
|
||||
UNUSED92 = 92,
|
||||
LightningBolt = 93 | None,
|
||||
SmallFireball = 94 | Projectile,
|
||||
AreaEffectCloud = 95 | None,
|
||||
MinecartHopper = 96 | Minecart,
|
||||
MinecartTNT = 97 | Minecart,
|
||||
MinecartChest = 98 | Minecart,
|
||||
MinecartFurnace = 99 | Minecart,
|
||||
MinecartCommandBlock = 100 | Minecart,
|
||||
LingeringPotion = 101 | Projectile,
|
||||
LlamaSpit = 102 | Projectile,
|
||||
EvocationFang = 103 | Projectile,
|
||||
EvocationIllager = 104 | Monster,
|
||||
Vex = 105 | Monster,
|
||||
IceBomb = 106 | Projectile,
|
||||
Balloon = 107 | None,
|
||||
Pufferfish = 108 | WaterAnimal,
|
||||
Salmon = 109 | WaterAnimal,
|
||||
Drowned = 110 | ZombieMonster,
|
||||
Tropicalfish = 111 | WaterAnimal,
|
||||
Fish = 112 | WaterAnimal,
|
||||
Panda = 113 | Animal,
|
||||
Pillager = 114 | Monster,
|
||||
VillagerV2 = 115 | VillagerBase,
|
||||
ZombieVillagerV2 = 116 | ZombieMonster,
|
||||
Shield = 117 | None,
|
||||
WanderingTrader = 118 | PathfinderMob,
|
||||
Lectern = 119 | None,
|
||||
ElderGuardianGhost = 120 | Monster,
|
||||
Fox = 121 | Animal,
|
||||
Bee = 122 | Mob,
|
||||
Piglin = 123 | Mob,
|
||||
Hoglin = 124 | Animal,
|
||||
Strider = 125 | Animal,
|
||||
Zoglin = 126 | UndeadMob,
|
||||
PiglinBrute = 127 | Mob,
|
||||
Goat = 128 | Animal,
|
||||
GlowSquid = 129 | WaterAnimal,
|
||||
Axolotl = 130 | Animal,
|
||||
Warden = 131 | Monster,
|
||||
Frog = 132 | Animal,
|
||||
Tadpole = 133 | WaterAnimal,
|
||||
Allay = 134 | Mob,
|
||||
ChestBoatRideable = 136 | BoatRideable,
|
||||
TraderLlama = 137 | Llama,
|
||||
Camel = 138 | Animal,
|
||||
Sniffer = 139 | Animal,
|
||||
Breeze = 140 | Monster,
|
||||
BreezeWindChargeProjectile = 141 | Projectile,
|
||||
Armadillo = 142 | Animal,
|
||||
WindChargeProjectile = 143 | Projectile,
|
||||
Bogged = 144 | SkeletonMonster,
|
||||
OminousItemSpawner = 145
|
||||
}
|
||||
|
||||
interface Player {
|
||||
/** (GMLIB)转换成实体对象 */
|
||||
toEntity(): Entity;
|
||||
@@ -1081,7 +1533,7 @@ interface Player {
|
||||
/** (GMLIB)获取玩家的rumtimeId */
|
||||
getRuntimeId(): number;
|
||||
|
||||
/** (GMLIB)获取玩家饱食度 */
|
||||
/** (GMLIB)获取玩家饥饿值 */
|
||||
getHungry(): number;
|
||||
|
||||
/** (GMLIB)获取玩家盔甲覆盖百分比 */
|
||||
@@ -1226,6 +1678,21 @@ interface Entity {
|
||||
/** 是否显示粒子效果 */
|
||||
ShowParticles: boolean
|
||||
}[];
|
||||
|
||||
/** 实体是否为某类型 */
|
||||
isType(
|
||||
/** 实体类型 */
|
||||
type: ActorType
|
||||
): boolean;
|
||||
|
||||
/** 实体是否包含某类型 */
|
||||
hasType(
|
||||
/** 实体类型 */
|
||||
type: ActorType
|
||||
): boolean;
|
||||
|
||||
/** 获取实体类型ID */
|
||||
getEntityTypeId(): ActorType;
|
||||
}
|
||||
|
||||
interface Block {
|
||||
@@ -1250,9 +1717,6 @@ interface Block {
|
||||
/** (GMLIB) */
|
||||
canDropWithAnyTool(): boolean;
|
||||
|
||||
/** (GMLIB)方块是否不需要工具采集 */
|
||||
isAlwaysDestroyable(): boolean;
|
||||
|
||||
/** (GMLIB)检测方块是否能被玩家挖掘(比如插件拦截) */
|
||||
playerWillDestroy(
|
||||
/** 挖掘的玩家对象 */
|
||||
@@ -1291,9 +1755,6 @@ interface Item {
|
||||
block: Block
|
||||
): boolean;
|
||||
|
||||
/** (GMLIB)获取物品可以拥有的附魔 */
|
||||
getLegalEnchants(): string[]
|
||||
|
||||
/** (GMLIB)添加附魔 */
|
||||
applyEnchant(
|
||||
/** 附魔的命名空间ID */
|
||||
|
||||
+742
-89
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "${pluginName}",
|
||||
"entry": "${pluginFile}",
|
||||
"version": "0.13.3",
|
||||
"version": "0.13.6",
|
||||
"author": "GroupMountain",
|
||||
"type": "native",
|
||||
"passive": true,
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
#include "Global.h"
|
||||
using namespace ll::hash_utils;
|
||||
|
||||
class LegacyScriptBinaryStreamManager {
|
||||
private:
|
||||
int64 mNextBinaryStreamId = 0;
|
||||
std::unordered_map<uint64, std::shared_ptr<GMLIB_BinaryStream>> mBinaryStream;
|
||||
|
||||
public:
|
||||
uint getNextId() { return mNextBinaryStreamId++; }
|
||||
|
||||
void cretateBinaryStream(uint id) { mBinaryStream[id] = std::make_shared<GMLIB_BinaryStream>(); }
|
||||
|
||||
uint64 copyBinaryStream(uint id) {
|
||||
auto nextId = getNextId();
|
||||
cretateBinaryStream(nextId);
|
||||
if(auto bs = getBinaryStream(nextId); bs !=nullptr){
|
||||
getBinaryStream(nextId)->mBuffer = getBinaryStream(id)->mBuffer;
|
||||
}
|
||||
return nextId;
|
||||
}
|
||||
|
||||
void removeBinaryStream(uint64 id) { mBinaryStream.erase(id); }
|
||||
|
||||
std::shared_ptr<GMLIB_BinaryStream> getBinaryStream(uint64 id) {
|
||||
return mBinaryStream.contains(id) ? mBinaryStream.at(id) : nullptr;
|
||||
}
|
||||
|
||||
public:
|
||||
static LegacyScriptBinaryStreamManager& getInstance() {
|
||||
static std::unique_ptr<LegacyScriptBinaryStreamManager> instance;
|
||||
if (!instance) instance = std::make_unique<LegacyScriptBinaryStreamManager>();
|
||||
return *instance;
|
||||
}
|
||||
};
|
||||
|
||||
#define BinaryStreamManager LegacyScriptBinaryStreamManager::getInstance()
|
||||
#define EXPORTAPI(funcName, type, fuc) \
|
||||
RemoteCall::exportAs("GMLIB_BinaryStream_API", funcName, [](uint64 id, type value) -> void { \
|
||||
auto bs = BinaryStreamManager.getBinaryStream(id); \
|
||||
if (bs != nullptr) fuc; \
|
||||
})
|
||||
|
||||
template <typename T>
|
||||
struct Info;
|
||||
template <typename T, typename R, typename A, typename... AS>
|
||||
struct Info<R (T::*)(A, AS...)> {
|
||||
using ArgT = A;
|
||||
};
|
||||
#define EXPORTAPI2(T) EXPORTAPI(#T, Info<decltype(&GMLIB_BinaryStream::T)>::ArgT, bs->T(value))
|
||||
|
||||
void Export_BinaryStream_API() {
|
||||
RemoteCall::exportAs("GMLIB_BinaryStream_API", "create", []() -> uint64 {
|
||||
auto id = BinaryStreamManager.getNextId();
|
||||
BinaryStreamManager.cretateBinaryStream(id);
|
||||
return id;
|
||||
});
|
||||
RemoteCall::exportAs("GMLIB_BinaryStream_API", "copy", [](uint64 id) -> uint64 {
|
||||
return BinaryStreamManager.copyBinaryStream(id);
|
||||
});
|
||||
RemoteCall::exportAs("GMLIB_BinaryStream_API", "reset", [](uint64 id) -> void {
|
||||
if (BinaryStreamManager.getBinaryStream(id) == nullptr) BinaryStreamManager.cretateBinaryStream(id);
|
||||
else BinaryStreamManager.getBinaryStream(id)->reset();
|
||||
});
|
||||
RemoteCall::exportAs("GMLIB_BinaryStream_API", "sendTo", [](uint64 id, Player* player) -> void {
|
||||
if (auto bs = BinaryStreamManager.getBinaryStream(id); bs != nullptr) bs->sendTo(*player);
|
||||
});
|
||||
RemoteCall::exportAs("GMLIB_BinaryStream_API", "destroy", [](uint64 id) -> void {
|
||||
BinaryStreamManager.removeBinaryStream(id);
|
||||
});
|
||||
EXPORTAPI("writePacketHeader", int, bs->writePacketHeader((MinecraftPacketIds)value));
|
||||
EXPORTAPI("writeUuid", std::string const&, bs->writeUuid(mce::UUID::fromString(value)));
|
||||
EXPORTAPI("writeItem", ItemStack*, bs->writeType(NetworkItemStackDescriptor(*value)));
|
||||
EXPORTAPI("writeString", std::string const&, bs->writeString(value));
|
||||
EXPORTAPI("writeCompoundTag", CompoundTag*, bs->writeCompoundTag(*value));
|
||||
EXPORTAPI2(writeBool);
|
||||
EXPORTAPI2(writeByte);
|
||||
EXPORTAPI2(writeDouble);
|
||||
EXPORTAPI2(writeFloat);
|
||||
EXPORTAPI2(writeSignedBigEndianInt);
|
||||
EXPORTAPI2(writeSignedInt);
|
||||
EXPORTAPI2(writeSignedInt64);
|
||||
EXPORTAPI2(writeSignedShort);
|
||||
EXPORTAPI2(writeUnsignedChar);
|
||||
EXPORTAPI2(writeUnsignedInt);
|
||||
EXPORTAPI2(writeUnsignedInt64);
|
||||
EXPORTAPI2(writeUnsignedShort);
|
||||
EXPORTAPI2(writeUnsignedVarInt);
|
||||
EXPORTAPI2(writeUnsignedVarInt64);
|
||||
EXPORTAPI2(writeVarInt);
|
||||
EXPORTAPI2(writeVarInt64);
|
||||
}
|
||||
+250
-349
File diff suppressed because it is too large
Load Diff
+13
-12
@@ -1,12 +1,10 @@
|
||||
#include "Entry.h"
|
||||
#include "Global.h"
|
||||
|
||||
ll::Logger logger(PLUGIN_NAME);
|
||||
namespace gmlib {
|
||||
|
||||
namespace GMLIB {
|
||||
|
||||
std::unique_ptr<LegacyRemoteCallApi>& LegacyRemoteCallApi::getInstance() {
|
||||
static std::unique_ptr<LegacyRemoteCallApi> instance;
|
||||
LegacyRemoteCallApi& LegacyRemoteCallApi::getInstance() {
|
||||
static LegacyRemoteCallApi instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
@@ -16,14 +14,17 @@ bool LegacyRemoteCallApi::load() {
|
||||
Export_Compatibility_API();
|
||||
ExportPAPI();
|
||||
Export_Event_API();
|
||||
logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
|
||||
logger.info(
|
||||
Export_BinaryStream_API();
|
||||
// Export_Form_API();
|
||||
auto logger = ll::io::LoggerRegistry::getInstance().getOrCreate(PLUGIN_NAME);
|
||||
logger->info("GMLIB-LegacyRemoteCallApi Loaded!");
|
||||
logger->info(
|
||||
"Loaded Version: {} with {}",
|
||||
fmt::format(fg(fmt::color::pink), "GMLIB-" + Version::getLibVersionString()),
|
||||
fmt::format(fg(fmt::color::pink), "GMLIB-" + GMLIB::Version::getLibVersionString()),
|
||||
fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-" + LIB_VERSION.asString())
|
||||
);
|
||||
logger.info("Author: GroupMountain");
|
||||
logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
|
||||
logger->info("Author: GroupMountain");
|
||||
logger->info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -31,6 +32,6 @@ bool LegacyRemoteCallApi::enable() { return true; }
|
||||
|
||||
bool LegacyRemoteCallApi::disable() { return true; }
|
||||
|
||||
} // namespace GMLIB
|
||||
} // namespace gmlib
|
||||
|
||||
LL_REGISTER_MOD(LegacyRemoteCallApi, LegacyRemoteCallApi::getInstance());
|
||||
LL_REGISTER_MOD(gmlib::LegacyRemoteCallApi, gmlib::LegacyRemoteCallApi::getInstance());
|
||||
|
||||
+4
-4
@@ -2,14 +2,14 @@
|
||||
#include <ll/api/mod/NativeMod.h>
|
||||
#include <ll/api/mod/RegisterHelper.h>
|
||||
|
||||
namespace GMLIB {
|
||||
namespace gmlib {
|
||||
|
||||
class LegacyRemoteCallApi {
|
||||
|
||||
public:
|
||||
static std::unique_ptr<LegacyRemoteCallApi>& getInstance();
|
||||
static LegacyRemoteCallApi& getInstance();
|
||||
|
||||
LegacyRemoteCallApi(ll::mod::NativeMod& self) : mSelf(self) {}
|
||||
LegacyRemoteCallApi() : mSelf(*ll::mod::NativeMod::current()) {}
|
||||
|
||||
[[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }
|
||||
|
||||
@@ -30,4 +30,4 @@ private:
|
||||
ll::mod::NativeMod& mSelf;
|
||||
};
|
||||
|
||||
} // namespace GMLIB
|
||||
} // namespace gmlib
|
||||
|
||||
+270
-156
@@ -1,242 +1,356 @@
|
||||
#include "Global.h"
|
||||
using namespace ll::hash_utils;
|
||||
|
||||
class LegacyScriptEventManager {
|
||||
class EventManager {
|
||||
private:
|
||||
int64 mNextEventId = 0;
|
||||
std::unordered_map<int64, ll::event::ListenerPtr> mEventListeners;
|
||||
std::unordered_map<ullong, ll::event::ListenerPtr> mEventIds;
|
||||
|
||||
public:
|
||||
std::string getNextEventId() {
|
||||
mNextEventId++;
|
||||
return "GMLIB_EVENT_" + std::to_string(mNextEventId);
|
||||
}
|
||||
|
||||
void emplaceListener(std::string const& scriptEventId, ll::event::ListenerPtr listenerPtr) {
|
||||
mEventListeners[doHash(scriptEventId)] = listenerPtr;
|
||||
}
|
||||
|
||||
void removeListener(std::string const& scriptEventId) {
|
||||
ll::event::EventBus::getInstance().removeListener(mEventListeners[doHash(scriptEventId)]);
|
||||
mEventListeners.erase(doHash(scriptEventId));
|
||||
}
|
||||
|
||||
public:
|
||||
static LegacyScriptEventManager& getInstance() {
|
||||
static std::unique_ptr<LegacyScriptEventManager> instance;
|
||||
if (!instance) {
|
||||
instance = std::make_unique<LegacyScriptEventManager>();
|
||||
}
|
||||
static EventManager& getInstance() {
|
||||
static std::unique_ptr<EventManager> instance;
|
||||
if (!instance) instance = std::make_unique<EventManager>();
|
||||
return *instance;
|
||||
}
|
||||
|
||||
ullong getNextId() {
|
||||
auto id = mEventIds.size();
|
||||
mEventIds.emplace(id, nullptr);
|
||||
return id;
|
||||
}
|
||||
|
||||
bool addListener(ullong id, ll::event::ListenerPtr const& listener) {
|
||||
if (mEventIds.contains(id) && mEventIds[id]) return false;
|
||||
mEventIds[id] = listener;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool removeListener(ullong id) {
|
||||
if (ll::event::EventBus::getInstance().removeListener(mEventIds[id])) {
|
||||
mEventIds[id] = nullptr;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool hasListener(ullong id) { return mEventIds.contains(id) && mEventIds[id]; }
|
||||
|
||||
ll::event::ListenerPtr getListener(ullong id) { return mEventIds.contains(id) ? mEventIds[id] : nullptr; }
|
||||
};
|
||||
|
||||
#define REGISTER_EVENT_LISTEN(eventType, callFunction, eventParams, cancelFunction, otherFunction) \
|
||||
eventManager.emplaceListener( \
|
||||
eventId, \
|
||||
eventBus.emplaceListener<eventType>([eventName, eventId, &eventBus, &eventManager](eventType& ev) -> void { \
|
||||
if (!RemoteCall::hasFunc(eventName, eventId)) { \
|
||||
eventManager.removeListener(eventId); \
|
||||
#define REGISTER_EVENT_LISTEN(eventType, paramType, params, cancelFun, ...) \
|
||||
auto eventPtr = ll::event::EventBus::getInstance().emplaceListener<eventType>( \
|
||||
[pluginName, eventName, eventId](eventType& event) -> void { \
|
||||
if (!RemoteCall::hasFunc(pluginName, eventName + "_" + std::to_string(eventId))) { \
|
||||
EventManager::getInstance().removeListener(eventId); \
|
||||
return; \
|
||||
} \
|
||||
bool result = true; \
|
||||
try { \
|
||||
otherFunction; \
|
||||
result = RemoteCall::importAs<bool callFunction>(eventName, eventId) eventParams; \
|
||||
__VA_ARGS__ \
|
||||
auto result = \
|
||||
RemoteCall::importAs<bool paramType>(pluginName, eventName + "_" + std::to_string(eventId)) \
|
||||
params; \
|
||||
cancelFun \
|
||||
} catch (...) {} \
|
||||
if (!result) cancelFunction; \
|
||||
}) \
|
||||
}, \
|
||||
ll::event::EventPriority(priority) \
|
||||
); \
|
||||
return true;
|
||||
return eventId
|
||||
|
||||
void Export_Event_API() {
|
||||
RemoteCall::exportAs("GMLIB_Event_API", "getNextScriptEventId", []() -> std::string {
|
||||
return LegacyScriptEventManager::getInstance().getNextEventId();
|
||||
RemoteCall::exportAs("GMLIB_Event_API", "removeListener", [](ll::event::ListenerId eventId) -> bool {
|
||||
return EventManager::getInstance().removeListener(eventId);
|
||||
});
|
||||
auto& eventBus = ll::event::EventBus::getInstance();
|
||||
auto& eventManager = LegacyScriptEventManager::getInstance();
|
||||
|
||||
RemoteCall::exportAs("GMLIB_Event_API", "hasListener", [](ll::event::ListenerId eventId) -> bool {
|
||||
return EventManager::getInstance().hasListener(eventId);
|
||||
});
|
||||
|
||||
RemoteCall::exportAs("GMLIB_Event_API", "getListenerPriority", [](ll::event::ListenerId eventId) -> int {
|
||||
if (auto event = EventManager::getInstance().getListener(eventId); event != nullptr) {
|
||||
return (int)event->getPriority();
|
||||
}
|
||||
return -1;
|
||||
});
|
||||
|
||||
RemoteCall::exportAs(
|
||||
"GMLIB_Event_API",
|
||||
"callCustomEvent",
|
||||
[&eventBus, &eventManager](std::string const& eventName, std::string const& eventId) -> bool {
|
||||
if (!RemoteCall::hasFunc(eventName, eventId)) return false;
|
||||
"emplaceListener",
|
||||
[](std::string const& pluginName, std::string const& eventName, int priority) -> llong {
|
||||
auto eventId = EventManager::getInstance().getNextId();
|
||||
switch (doHash(eventName)) {
|
||||
case doHash("onClientLogin"): {
|
||||
case doHash("ll::ServerStoppingEvent"): {
|
||||
REGISTER_EVENT_LISTEN(ll::event::ServerStoppingEvent, (), (), , );
|
||||
}
|
||||
case doHash("gmlib::ClientLoginAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::PacketEvent::ClientLoginAfterEvent,
|
||||
GMLIB::Event::PacketEvent::ClientLoginAfterEvent,
|
||||
(std::string const& realName,
|
||||
std::string const& uuid,
|
||||
std::string const& serverXuid,
|
||||
std::string const& clientXuid),
|
||||
(ev.getRealName(), ev.getUuid().asString(), ev.getServerAuthXuid(), ev.getClientAuthXuid()),
|
||||
logger.error("Event \"onClientLogin\" cannot be intercepted"),
|
||||
(event.getRealName(),
|
||||
event.getUuid().asString(),
|
||||
event.getServerAuthXuid(),
|
||||
event.getClientAuthXuid()),
|
||||
if (result) event.disConnectClient();
|
||||
);
|
||||
}
|
||||
case doHash("onWeatherChange"): {
|
||||
case doHash("gmlib::WeatherUpdateBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::LevelEvent::WeatherUpdateBeforeEvent,
|
||||
(int lightningLevel, int rainLevel, int lightningLast, int rainLast),
|
||||
(ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()),
|
||||
ev.cancel(),
|
||||
GMLIB::Event::LevelEvent::WeatherUpdateBeforeEvent,
|
||||
(float rainLevel, int rainTime, float lightningLevel, int lightningTime, bool isCancelled),
|
||||
(event.getRainLevel(),
|
||||
event.getRainingLastTick(),
|
||||
event.getLightningLevel(),
|
||||
event.getLightningLastTick(),
|
||||
event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("onMobPick"): {
|
||||
case doHash("gmlib::WeatherUpdateAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::MobPickupItemBeforeEvent,
|
||||
GMLIB::Event::LevelEvent::WeatherUpdateAfterEvent,
|
||||
(float rainLevel, int rainTime, float lightningLevel, int lightningTime),
|
||||
(event.getRainLevel(),
|
||||
event.getRainingLastTick(),
|
||||
event.getLightningLevel(),
|
||||
event.getLightningLastTick()),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::MobPickupItemBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::EntityEvent::MobPickupItemBeforeEvent,
|
||||
(Actor * mob, Actor * item, bool isCancelled),
|
||||
(&event.self(), (Actor*)&event.getItemActor(), event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::MobPickupItemAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::EntityEvent::MobPickupItemAfterEvent,
|
||||
(Actor * mob, Actor * item),
|
||||
(&ev.self(), (Actor*)&ev.getItemActor()),
|
||||
ev.cancel(),
|
||||
(&event.self(), (Actor*)&event.getItemActor()),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("onItemTrySpawn"): {
|
||||
case doHash("gmlib::ItemActorSpawnBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::ItemActorSpawnBeforeEvent,
|
||||
(const ItemStack* item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
|
||||
(&ev.getItem(),
|
||||
{ev.getPosition(), ev.getBlockSource().getDimensionId().id},
|
||||
ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
|
||||
ev.cancel(),
|
||||
GMLIB::Event::EntityEvent::ItemActorSpawnBeforeEvent,
|
||||
(ItemStack * item, std::pair<Vec3, int> position, int64 spawnerUniqueId, bool isCancelled),
|
||||
(&event.getItem(),
|
||||
{event.getPosition(), event.getBlockSource().getDimensionId().id},
|
||||
event.getSpawner().has_value() ? event.getSpawner()->getOrCreateUniqueID().rawID : -1,
|
||||
event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("onItemSpawned"): {
|
||||
case doHash("gmlib::ItemActorSpawnAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::ItemActorSpawnAfterEvent,
|
||||
(const ItemStack* item, Actor* itemActor, std::pair<Vec3, int> position, int64 spawnerUniqueId),
|
||||
(&ev.getItem(),
|
||||
(Actor*)&ev.getItemActor(),
|
||||
{ev.getPosition(), ev.getBlockSource().getDimensionId().id},
|
||||
ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
|
||||
logger.error("Event \"onItemSpawned\" cannot be intercepted"),
|
||||
GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent,
|
||||
(Actor * item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
|
||||
(&event.self(),
|
||||
{event.getPosition(), event.getBlockSource().getDimensionId().id},
|
||||
event.getSpawner().has_value() ? event.getSpawner()->getOrCreateUniqueID().rawID : -1),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("onEntityTryChangeDim"): {
|
||||
case doHash("gmlib::ActorChangeDimensionBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::ActorChangeDimensionBeforeEvent,
|
||||
(Actor * entity, int toDimId),
|
||||
(&ev.self(), ev.getToDimensionId()),
|
||||
ev.cancel(),
|
||||
GMLIB::Event::EntityEvent::ActorChangeDimensionBeforeEvent,
|
||||
(Actor * entity, int toDimId, bool isCancelled),
|
||||
(&event.self(), event.getToDimensionId(), event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("onLeaveBed"): {
|
||||
case doHash("gmlib::ActorChangeDimensionAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::PlayerEvent::PlayerStopSleepBeforeEvent,
|
||||
(Player * pl),
|
||||
(&ev.self()),
|
||||
ev.cancel(),
|
||||
GMLIB::Event::EntityEvent::ActorChangeDimensionAfterEvent,
|
||||
(Actor * entity, int fromDimId, int toDimId),
|
||||
(&event.self(), event.getFromDimensionId(), event.getToDimensionId()),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("onDeathMessage"): {
|
||||
case doHash("gmlib::PlayerStartSleepBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::DeathMessageAfterEvent,
|
||||
GMLIB::Event::PlayerEvent::PlayerStartSleepBeforeEvent,
|
||||
(Player * entity, BlockPos pos, bool isCancelled),
|
||||
(&event.self(), event.getPosition(), event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::PlayerStartSleepAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::PlayerEvent::PlayerStartSleepAfterEvent,
|
||||
(Player * entity, BlockPos pos, int result),
|
||||
(&event.self(), event.getPosition(), (int)event.getResult()),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::PlayerStopSleepBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::PlayerEvent::PlayerStopSleepBeforeEvent,
|
||||
(Player * entity, bool forcefulWakeUp, bool updateLevelList, bool isCancelled),
|
||||
(&event.self(), event.isForcefulWakeUp(), event.isUpdateLevelList(), event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::PlayerStopSleepAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::PlayerEvent::PlayerStopSleepAfterEvent,
|
||||
(Player * entity, bool forcefulWakeUp, bool updateLevelList, bool),
|
||||
(&event.self(), event.isForcefulWakeUp(), event.isUpdateLevelList(), false),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::DeathMessageAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::EntityEvent::DeathMessageAfterEvent,
|
||||
(std::string const& message, std::vector<std::string>, Actor* dead),
|
||||
(ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()),
|
||||
logger.error("Event \"onDeathMessage\" cannot be intercepted"),
|
||||
(event.getDeathMessage().first, event.getDeathMessage().second, &event.self()),
|
||||
,
|
||||
);
|
||||
}
|
||||
case doHash("onMobHurted"): {
|
||||
case doHash("gmlib::MobHurtAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::MobHurtAfterEvent,
|
||||
GMLIB::Event::EntityEvent::MobHurtAfterEvent,
|
||||
(Actor * mob, Actor * source, float damage, int cause),
|
||||
(&ev.self(), source, ev.getDamage(), (int)damageSource.getCause()),
|
||||
logger.error("Event \"onMobHurted\" cannot be intercepted"),
|
||||
auto& damageSource = ev.getSource();
|
||||
(&event.self(), source, -event.getDamage(), (int)damageSource.getCause()),
|
||||
,
|
||||
auto& damageSource = event.getSource();
|
||||
Actor* source = nullptr;
|
||||
if (damageSource.isEntitySource()) {
|
||||
auto uniqueId = damageSource.getDamagingEntityUniqueID();
|
||||
source = ll::service::getLevel()->fetchEntity(uniqueId);
|
||||
source = ll::service::getLevel()->fetchEntity(uniqueId, false);
|
||||
if (source->getOwner()) source = source->getOwner();
|
||||
}
|
||||
);
|
||||
}
|
||||
case doHash("onEndermanTake"): {
|
||||
case doHash("gmlib::EndermanTakeBlockBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::EndermanTakeBlockBeforeEvent,
|
||||
GMLIB::Event::EntityEvent::EndermanTakeBlockBeforeEvent,
|
||||
(Actor * mob, bool isCancelled),
|
||||
(&event.self(), event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::DragonRespawnBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::EntityEvent::DragonRespawnBeforeEvent,
|
||||
(bool isCancelled),
|
||||
(event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("gmlib::DragonRespawnAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::EntityEvent::DragonRespawnAfterEvent,
|
||||
(Actor * mob),
|
||||
(&ev.self()),
|
||||
ev.cancel(),
|
||||
(event.getEnderDragon()),
|
||||
);
|
||||
}
|
||||
case doHash("onEntityChangeDim"): {
|
||||
case doHash("gmlib::ProjectileCreateBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::ActorChangeDimensionAfterEvent,
|
||||
(Actor * mob, int fromDimId),
|
||||
(&ev.self(), ev.getFromDimensionId()),
|
||||
logger.error("Event \"onEntityChangeDim\" cannot be intercepted"),
|
||||
GMLIB::Event::EntityEvent::ProjectileCreateBeforeEvent,
|
||||
(Actor * mob, int64 uniqueId, bool isCancelled),
|
||||
(&event.self(),
|
||||
event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1,
|
||||
event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("onDragonRespawn"): {
|
||||
case doHash("gmlib::ProjectileCreateAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::DragonRespawnBeforeEvent,
|
||||
(int64 enderDragonUniqueID),
|
||||
(ev.getEnderDragon().id),
|
||||
ev.cancel(),
|
||||
)
|
||||
}
|
||||
case doHash("onProjectileTryCreate"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::ProjectileCreateBeforeEvent,
|
||||
GMLIB::Event::EntityEvent::ProjectileCreateAfterEvent,
|
||||
(Actor * mob, int64 uniqueId),
|
||||
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
|
||||
ev.cancel(),
|
||||
(&event.self(), event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1),
|
||||
);
|
||||
}
|
||||
case doHash("onProjectileCreate"): {
|
||||
case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::ProjectileCreateAfterEvent,
|
||||
(Actor * mob, int64 uniqueId),
|
||||
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
|
||||
logger.error("Event \"onProjectileCreate\" cannot be intercepted"),
|
||||
GMLIB::Event::EntityEvent::SpawnWanderingTraderBeforeEvent,
|
||||
(std::pair<BlockPos, int> pos, bool isCancelled),
|
||||
({event.getPos(), event.getRegion().getDimensionId()}, event.isCancelled()),
|
||||
event.setCancelled(result);
|
||||
);
|
||||
}
|
||||
case doHash("onSpawnWanderingTrader"): {
|
||||
case doHash("gmlib::SpawnWanderingTraderAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::EntityEvent::SpawnWanderingTraderBeforeEvent,
|
||||
GMLIB::Event::EntityEvent::SpawnWanderingTraderAfterEvent,
|
||||
(std::pair<BlockPos, int> pos),
|
||||
({ev.getPos(), ev.getRegion().getDimensionId()}),
|
||||
ev.cancel(),
|
||||
({event.getPos(), event.getRegion().getDimensionId()}),
|
||||
);
|
||||
}
|
||||
case doHash("onHandleRequestAction"): {
|
||||
REGISTER_EVENT_LISTEN(Event::PlayerEvent::HandleRequestActionBeforeEvent,
|
||||
(Player * player,
|
||||
std::string const& actionType,
|
||||
int count,
|
||||
std::string const& sourceContainerNetId,
|
||||
int sourceSlot,
|
||||
std::string const& destinationContainerNetId,
|
||||
int destinationSlot),
|
||||
((Player*)&ev.self(),
|
||||
magic_enum::enum_name(requestAction->mActionType).data(),
|
||||
(int)requestAction->mAmount,
|
||||
magic_enum::enum_name(requestAction->mSrc.mOpenContainerNetId).data(),
|
||||
(int)requestAction->mSrc.mSlot,
|
||||
magic_enum::enum_name(requestAction->mDst.mOpenContainerNetId).data(),
|
||||
(int)requestAction->mDst.mSlot),
|
||||
ev.cancel(),
|
||||
auto requestAction = (ItemStackRequestActionTransferBase*)&ev.getRequestAction();
|
||||
);
|
||||
case doHash("gmlib::HandleRequestActionBeforeEvent"): {
|
||||
// clang-format off
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::PlayerEvent::HandleRequestActionBeforeEvent,
|
||||
(
|
||||
Player * player,
|
||||
std::string const& actionType,
|
||||
int count,
|
||||
std::string const& sourceContainerNetId,
|
||||
int sourceSlot,
|
||||
std::string const& destinationContainerNetId,
|
||||
int destinationSlot,
|
||||
bool isCancelled
|
||||
),
|
||||
(
|
||||
(Player*)&event.self(),
|
||||
magic_enum::enum_name(requestAction.mActionType).data(),
|
||||
(int)requestAction.mAmount,
|
||||
magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(),
|
||||
(int)requestAction.mSrc->mSlot,
|
||||
magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(),
|
||||
(int)requestAction.mDst->mSlot,
|
||||
event.isCancelled()
|
||||
),
|
||||
event.setCancelled(result);,
|
||||
auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction();
|
||||
);
|
||||
// clang-format on
|
||||
}
|
||||
case doHash("onSendContainerClosePacket"): {
|
||||
case doHash("gmlib::HandleRequestActionAfterEvent"): {
|
||||
// clang-format off
|
||||
REGISTER_EVENT_LISTEN(
|
||||
GMLIB::Event::PlayerEvent::HandleRequestActionAfterEvent,
|
||||
(
|
||||
Player * player,
|
||||
std::string const& actionType,
|
||||
int count,
|
||||
std::string const& sourceContainerNetId,
|
||||
int sourceSlot,
|
||||
std::string const& destinationContainerNetId,
|
||||
int destinationSlot
|
||||
),
|
||||
(
|
||||
(Player*)&event.self(),
|
||||
magic_enum::enum_name(requestAction.mActionType).data(),
|
||||
(int)requestAction.mAmount,
|
||||
magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(),
|
||||
(int)requestAction.mSrc->mSlot,
|
||||
magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(),
|
||||
(int)requestAction.mDst->mSlot
|
||||
),
|
||||
,
|
||||
auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction();
|
||||
);
|
||||
// clang-format on
|
||||
}
|
||||
case doHash("gmlib::ContainerClosePacketSendAfterEvent"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
Event::PacketEvent::ContainerClosePacketSendAfterEvent,
|
||||
(Player * player, int ContainerNetId),
|
||||
(ev.getServerNetworkHandler()
|
||||
.getServerPlayer(ev.getNetworkIdentifier(), ev.getPacket().mClientSubId),
|
||||
(int)ev.getPacket().mContainerId),
|
||||
logger.error("Event \"onSendContainerClosePacket\" cannot be intercepted"),
|
||||
)
|
||||
}
|
||||
case doHash("onServerStopping"): {
|
||||
REGISTER_EVENT_LISTEN(
|
||||
ll::event::server::ServerStoppingEvent,
|
||||
(),
|
||||
(),
|
||||
logger.error("Event \"onServerStopping\" cannot be intercepted"),
|
||||
GMLIB::Event::PacketEvent::ContainerClosePacketSendAfterEvent,
|
||||
(Player * player, int containerId, bool serverInitiatedClose, bool),
|
||||
(event.getServerNetworkHandler()
|
||||
._getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId),
|
||||
(int)event.getPacket().mContainerId,
|
||||
event.getPacket().mServerInitiatedClose,
|
||||
false),
|
||||
,
|
||||
);
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
);
|
||||
}
|
||||
+288
@@ -0,0 +1,288 @@
|
||||
// #include "Global.h"
|
||||
|
||||
// using namespace ll::hash_utils;
|
||||
|
||||
// class LegacyScriptFormManager {
|
||||
// private:
|
||||
// int64 mNextFormCallbackId = 0;
|
||||
// int64 mNextFormId = 0;
|
||||
// std::unordered_map<int64, std::unique_ptr<gmlib::form::NpcDialogueForm>> mNpcDialogueForms;
|
||||
// // std::unordered_map<int64, std::unique_ptr<ChestForm>> mChestForms;
|
||||
|
||||
// public:
|
||||
// // std::string getNextFormCallbackId() {
|
||||
// // return "GMLIB_FormApi_" + std::to_string(mNextFormCallbackId++);
|
||||
// // }
|
||||
|
||||
// int64 getNextFormId() {
|
||||
// mNextFormId++;
|
||||
// return mNextFormId;
|
||||
// }
|
||||
|
||||
// int64 createNpcDialogueForm(std::string const& npcName, std::string const& sceneName, std::string const& dialogue) {
|
||||
// auto formId = LegacyScriptFormManager::getInstance().getNextFormId();
|
||||
// auto formPtr = std::make_unique<gmlib::form::NpcDialogueForm>(npcName, sceneName, dialogue);
|
||||
// mNpcDialogueForms[formId] = std::move(formPtr);
|
||||
// return formId;
|
||||
// }
|
||||
|
||||
// bool destroyNpcDialogueForm(int64 formId) {
|
||||
// if (mNpcDialogueForms.contains(formId)) {
|
||||
// mNpcDialogueForms.erase(formId);
|
||||
// return true;
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
|
||||
// optional_ref<gmlib::form::NpcDialogueForm> getNpcDialogueForm(int64 formId) {
|
||||
// if (mNpcDialogueForms.contains(formId)) {
|
||||
// return mNpcDialogueForms[formId].get();
|
||||
// }
|
||||
// return {};
|
||||
// }
|
||||
|
||||
// /*
|
||||
// int64 createChestForm(std::string const& npcName, std::string const& sceneName, std::string const& dialogue) {
|
||||
// auto formId = LegacyScriptFormManager::getInstance().getNextFormId();
|
||||
// auto formPtr = std::make_unique<ChestForm>(npcName, sceneName, dialogue);
|
||||
// mChestForms[formId] = std::move(formPtr);
|
||||
// return formId;
|
||||
// }
|
||||
|
||||
// bool destroyChestForm(int64 formId) {
|
||||
// if (mChestForms.contains(formId)) {
|
||||
// mChestForms.erase(formId);
|
||||
// return true;
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
|
||||
// optional_ref<ChestForm> getChestForm(int64 formId) {
|
||||
// if (mChestForms.contains(formId)) {
|
||||
// return mChestForms[formId].get();
|
||||
// }
|
||||
// return {};
|
||||
// }
|
||||
|
||||
// */
|
||||
// public:
|
||||
// static LegacyScriptFormManager& getInstance() {
|
||||
// static std::unique_ptr<LegacyScriptFormManager> instance;
|
||||
// if (!instance) {
|
||||
// instance = std::make_unique<LegacyScriptFormManager>();
|
||||
// }
|
||||
// return *instance;
|
||||
// }
|
||||
// };
|
||||
|
||||
// #define PLAYER_DETECROR \
|
||||
// [detectorId, result](::Player& pl) -> bool { \
|
||||
// try { \
|
||||
// if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", detectorId)) { \
|
||||
// auto const& detector = RemoteCall::importAs<bool(::Player*)>("GMLIB_FORM_CALLBACK", detectorId); \
|
||||
// return detector(&pl); \
|
||||
// } else { \
|
||||
// gmlib::form::ServerSettingForm::removeElement(result); \
|
||||
// } \
|
||||
// } catch (...) {} \
|
||||
// return false; \
|
||||
// }
|
||||
|
||||
// #define CALLBACK_TYPE(type) \
|
||||
// [callbackId, result](Player& pl, type data) { \
|
||||
// try { \
|
||||
// if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", callbackId)) { \
|
||||
// auto const& callback = RemoteCall::importAs<void(Player*, type)>("GMLIB_FORM_CALLBACK", callbackId); \
|
||||
// callback(&pl, data); \
|
||||
// } else { \
|
||||
// gmlib::form::ServerSettingForm::removeElement(result); \
|
||||
// } \
|
||||
// } catch (...) {} \
|
||||
// }
|
||||
|
||||
// #define CALLBACK_TYPE_NORMAL \
|
||||
// [callbackId](::Player& pl) { \
|
||||
// try { \
|
||||
// if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", callbackId)) { \
|
||||
// auto const& callback = RemoteCall::importAs<void(::Player*)>("GMLIB_FORM_CALLBACK", callbackId); \
|
||||
// callback(&pl); \
|
||||
// } \
|
||||
// } catch (...) {} \
|
||||
// }
|
||||
|
||||
|
||||
// void Export_Form_API() {
|
||||
// //////////////////////////////// Form Manager /////////////////////////////////
|
||||
// // RemoteCall::exportAs("GMLIB_FormAPI", "getNextFormCallbackId", []() -> std::string {
|
||||
// // return LegacyScriptFormManager::getInstance().getNextFormCallbackId();
|
||||
// // });
|
||||
// ////////////////////////////// ServerSettingForm //////////////////////////////
|
||||
// RemoteCall::exportAs("GMLIB_ServerSettingForm", "getDefaultPriority", []() -> int {
|
||||
// return gmlib::form::ServerSettingForm::getDefaultPriority();
|
||||
// });
|
||||
// RemoteCall::exportAs("GMLIB_ServerSettingForm", "hasTitle", []() -> bool { return gmlib::form::ServerSettingForm::hasTitle(); });
|
||||
// RemoteCall::exportAs("GMLIB_ServerSettingForm", "getTitle", []() -> std::string {
|
||||
// return gmlib::form::ServerSettingForm::getTitle();
|
||||
// });
|
||||
// RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "setTitle", [](std::string const& title, bool forceModify) -> bool {
|
||||
// return gmlib::form::ServerSettingForm::setTitle(title, forceModify);
|
||||
// });
|
||||
// RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "hasIcon", []() -> bool { return gmlib::form::ServerSettingForm::hasIcon(); });
|
||||
// RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "getIconData", []() -> std::string {
|
||||
// return gmlib::form::ServerSettingForm::getIconData().value_or("");
|
||||
// });
|
||||
// RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "getIconType", []() -> int {
|
||||
// return gmlib::form::ServerSettingForm::getIconType()
|
||||
// .transform([](gmlib::form::IconType&& type) -> int { return (int)type; })
|
||||
// .value_or(-1);
|
||||
// });
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "setIcon",
|
||||
// [](std::string const& title, uchar type, bool forceModify) -> bool {
|
||||
// return gmlib::form::ServerSettingForm::setIcon(title, gmlib::form::IconType(type), forceModify);
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "addLabel",
|
||||
// [](std::string const& text, std::string const& detectorId, int priority) -> uint {
|
||||
// uint result = gmlib::form::ServerSettingForm::addLabel(text, PLAYER_DETECROR, priority);
|
||||
// return result;
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "addInput",
|
||||
// [](std::string const& text,
|
||||
// std::string const& placeholder,
|
||||
// std::string const& defaultVal,
|
||||
// std::string const& callbackId,
|
||||
// std::string const& detectorId,
|
||||
// int priority) -> uint {
|
||||
// uint result = gmlib::form::ServerSettingForm::addInput(
|
||||
// text,
|
||||
// placeholder,
|
||||
// defaultVal,
|
||||
// CALLBACK_TYPE(std::string const&),
|
||||
// PLAYER_DETECROR,
|
||||
// priority
|
||||
// );
|
||||
// return result;
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "addToggle",
|
||||
// [](std::string const& text,
|
||||
// bool defaultVal,
|
||||
// std::string const& callbackId,
|
||||
// std::string const& detectorId,
|
||||
// int priority) -> uint {
|
||||
// uint result = gmlib::form::ServerSettingForm::addToggle(text, defaultVal, CALLBACK_TYPE(bool), PLAYER_DETECROR, priority);
|
||||
// return result;
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "addDropdown",
|
||||
// [](std::string const& text,
|
||||
// std::vector<std::string> options,
|
||||
// int64 defaultVal,
|
||||
// std::string const& callbackId,
|
||||
// std::string const& detectorId,
|
||||
// int priority) -> uint {
|
||||
// uint result = gmlib::form::ServerSettingForm::addDropdown(
|
||||
// text,
|
||||
// options,
|
||||
// defaultVal,
|
||||
// CALLBACK_TYPE(int64),
|
||||
// PLAYER_DETECROR,
|
||||
// priority
|
||||
// );
|
||||
// return result;
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "addSlider",
|
||||
// [](std::string const& text,
|
||||
// double min,
|
||||
// double max,
|
||||
// double step,
|
||||
// double defaultVal,
|
||||
// std::string const& callbackId,
|
||||
// std::string const& detectorId,
|
||||
// int priority) -> uint {
|
||||
// uint result = gmlib::form::ServerSettingForm::addSlider(
|
||||
// text,
|
||||
// min,
|
||||
// max,
|
||||
// step,
|
||||
// defaultVal,
|
||||
// CALLBACK_TYPE(double),
|
||||
// PLAYER_DETECROR,
|
||||
// priority
|
||||
// );
|
||||
// return result;
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_gmlib::form::ServerSettingForm",
|
||||
// "addStepSlider",
|
||||
// [](std::string const& text,
|
||||
// std::vector<std::string> steps,
|
||||
// int64 defaultVal,
|
||||
// std::string const& callbackId,
|
||||
// std::string const& detectorId,
|
||||
// int priority) -> uint {
|
||||
// uint result = gmlib::form::ServerSettingForm::addStepSlider(
|
||||
// text,
|
||||
// steps,
|
||||
// defaultVal,
|
||||
// CALLBACK_TYPE(int64),
|
||||
// PLAYER_DETECROR,
|
||||
// priority
|
||||
// );
|
||||
// return result;
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "removeElement", [](uint id) -> bool {
|
||||
// return gmlib::form::ServerSettingForm::removeElement(id);
|
||||
// });
|
||||
// ////////////////////////////// NpcDialogueForm //////////////////////////////
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_NpcDialogueForm",
|
||||
// "createForm",
|
||||
// [](std::string const& npcName, std::string const& sceneName, std::string const& dialogue) -> int64 {
|
||||
// return LegacyScriptFormManager::getInstance().createNpcDialogueForm(npcName, sceneName, dialogue);
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs("GMLIB_NpcDialogueForm", "destroyForm", [](int64 formId) -> bool {
|
||||
// return LegacyScriptFormManager::getInstance().destroyNpcDialogueForm(formId);
|
||||
// });
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_NpcDialogueForm",
|
||||
// "addButton",
|
||||
// [](int64 formId, std::string const& button, std::string const& callbackId) -> void {
|
||||
// if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
|
||||
// formPtr->addButton(button, CALLBACK_TYPE_NORMAL);
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs(
|
||||
// "GMLIB_NpcDialogueForm",
|
||||
// "onPlayerClose",
|
||||
// [](int64 formId, std::string const& callbackId) -> void {
|
||||
// if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
|
||||
// formPtr->onPlayerClose(CALLBACK_TYPE_NORMAL);
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
// RemoteCall::exportAs("GMLIB_NpcDialogueForm", "sendTo", [](int64 formId, ::Player* pl) -> void {
|
||||
// if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
|
||||
// formPtr->sendTo(*pl);
|
||||
// }
|
||||
// });
|
||||
// ////////////////////////////// ChestForm //////////////////////////////
|
||||
// }
|
||||
+4
-8
@@ -3,22 +3,18 @@
|
||||
|
||||
#include <RemoteCallAPI.h>
|
||||
|
||||
using namespace GMLIB;
|
||||
using namespace Server;
|
||||
using namespace Mod;
|
||||
|
||||
#define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
|
||||
|
||||
#define LIB_VERSION_MAJOR 0
|
||||
#define LIB_VERSION_MINOR 13
|
||||
#define LIB_VERSION_PATCH 3
|
||||
#define LIB_VERSION_PATCH 6
|
||||
|
||||
#define LIB_VERSION Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
|
||||
|
||||
extern ll::Logger logger;
|
||||
#define LIB_VERSION GMLIB::Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
|
||||
|
||||
extern void Export_Legacy_GMLib_ModAPI();
|
||||
extern void Export_Legacy_GMLib_ServerAPI();
|
||||
extern void Export_Compatibility_API();
|
||||
extern void ExportPAPI();
|
||||
extern void Export_Event_API();
|
||||
extern void Export_BinaryStream_API();
|
||||
// extern void Export_Form_API();
|
||||
|
||||
+58
-70
@@ -3,13 +3,8 @@
|
||||
std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
|
||||
|
||||
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string const& key) {
|
||||
if (HardCodedKeys.count(key)) {
|
||||
return key;
|
||||
}
|
||||
std::vector<RecipeIngredient> result;
|
||||
auto item = RecipeIngredient(key, 0, 1);
|
||||
result.emplace_back(item);
|
||||
return result;
|
||||
if (HardCodedKeys.count(key)) return key;
|
||||
return std::vector<RecipeIngredient>({RecipeIngredient(key, 0, 1)});
|
||||
}
|
||||
|
||||
void Export_Legacy_GMLib_ModAPI() {
|
||||
@@ -22,18 +17,17 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::string const& result,
|
||||
int count,
|
||||
std::string const& unlock) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
std::vector<RecipeIngredient> types;
|
||||
for (auto ing : ingredients) {
|
||||
auto key = RecipeIngredient(ing, 0, 1);
|
||||
types.push_back(key);
|
||||
types.emplace_back(ing, 0, 1);
|
||||
}
|
||||
auto res = RecipeIngredient(result, 0, count);
|
||||
auto unl = makeRecipeUnlockingKey(unlock);
|
||||
JsonRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, res, unl);
|
||||
GMLIB::Mod::JsonRecipe::registerShapelessCraftingTableRecipe(
|
||||
recipe_id,
|
||||
types,
|
||||
RecipeIngredient(result, 0, count),
|
||||
makeRecipeUnlockingKey(unlock)
|
||||
);
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -45,18 +39,18 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::string const& result,
|
||||
int count,
|
||||
std::string const& unlock) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
std::vector<RecipeIngredient> types;
|
||||
for (auto ing : ingredients) {
|
||||
auto key = RecipeIngredient(ing, 0, 1);
|
||||
types.push_back(key);
|
||||
types.push_back(RecipeIngredient(ing, 0, 1));
|
||||
}
|
||||
auto res = RecipeIngredient(result, 0, count);
|
||||
auto unl = makeRecipeUnlockingKey(unlock);
|
||||
JsonRecipe::registerShapedCraftingTableRecipe(recipe_id, shape, types, res, unl);
|
||||
GMLIB::Mod::JsonRecipe::registerShapedCraftingTableRecipe(
|
||||
recipe_id,
|
||||
shape,
|
||||
types,
|
||||
RecipeIngredient(result, 0, count),
|
||||
makeRecipeUnlockingKey(unlock)
|
||||
);
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -66,13 +60,13 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::string const& input,
|
||||
std::string const& output,
|
||||
std::vector<std::string> tags) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
auto inp = RecipeIngredient(input, 0, 1);
|
||||
auto outp = RecipeIngredient(output, 0, 1);
|
||||
JsonRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
GMLIB::Mod::JsonRecipe::registerFurnaceRecipe(
|
||||
recipe_id,
|
||||
RecipeIngredient(input, 0, 1),
|
||||
RecipeIngredient(output, 0, 1),
|
||||
tags
|
||||
);
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -80,12 +74,8 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
"registerBrewingMixRecipe",
|
||||
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
|
||||
) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
auto rea = RecipeIngredient(reagent, 0, 1);
|
||||
JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
GMLIB::Mod::JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, RecipeIngredient(reagent, 0, 1));
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -93,14 +83,13 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
"registerBrewingContainerRecipe",
|
||||
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
|
||||
) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
auto inp = RecipeIngredient(input, 0, 1);
|
||||
auto outp = RecipeIngredient(output, 0, 1);
|
||||
auto rea = RecipeIngredient(reagent, 0, 1);
|
||||
JsonRecipe::registerBrewingContainerRecipe(recipe_id, inp, outp, rea);
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
GMLIB::Mod::JsonRecipe::registerBrewingContainerRecipe(
|
||||
recipe_id,
|
||||
RecipeIngredient(input, 0, 1),
|
||||
RecipeIngredient(output, 0, 1),
|
||||
RecipeIngredient(reagent, 0, 1)
|
||||
);
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -111,11 +100,14 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::string const& base,
|
||||
std::string const& addition,
|
||||
std::string const& result) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
JsonRecipe::registerSmithingTransformRecipe(recipe_id, smithing_template, base, addition, result);
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
GMLIB::Mod::JsonRecipe::registerSmithingTransformRecipe(
|
||||
recipe_id,
|
||||
smithing_template,
|
||||
base,
|
||||
addition,
|
||||
result
|
||||
);
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -125,11 +117,8 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::string const& smithing_template,
|
||||
std::string const& base,
|
||||
std::string const& addition) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
GMLIB::Mod::JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs(
|
||||
@@ -141,18 +130,17 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::string const& output,
|
||||
int output_data,
|
||||
int output_count) -> void {
|
||||
auto level = GMLIB_Level::getInstance();
|
||||
if (!level) {
|
||||
return;
|
||||
}
|
||||
auto inp = RecipeIngredient(input, 0, 1);
|
||||
auto outp = RecipeIngredient(output, 0, 1);
|
||||
JsonRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
|
||||
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||
GMLIB::Mod::JsonRecipe::registerStoneCutterRecipe(
|
||||
recipe_id,
|
||||
RecipeIngredient(input, 0, 1),
|
||||
RecipeIngredient(output, 0, 1)
|
||||
);
|
||||
}
|
||||
);
|
||||
// 错误方块清理
|
||||
RemoteCall::exportAs("GMLib_ModAPI", "setUnknownBlockCleaner", []() -> void {
|
||||
VanillaFix::setAutoCleanUnknownBlockEnabled();
|
||||
GMLIB::Mod::VanillaFix::setAutoCleanUnknownBlockEnabled();
|
||||
});
|
||||
// 实验性
|
||||
RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
|
||||
@@ -161,7 +149,7 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
if (set.contains((AllExperiments)experiment_id)) {
|
||||
GMLIB_Level::addExperimentsRequire((AllExperiments)experiment_id);
|
||||
} else {
|
||||
ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
|
||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Server")->error("Experiment ID '{}' does not exist!", experiment_id);
|
||||
}
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void {
|
||||
@@ -170,7 +158,7 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::unordered_set<AllExperiments> set(list.begin(), list.end());
|
||||
if (set.contains((AllExperiments)experiment_id)) {
|
||||
GMLIB_Level::getInstance()->setExperimentEnabled(((AllExperiments)experiment_id), value);
|
||||
} else ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
|
||||
} else ll::io::LoggerRegistry::getInstance().getOrCreate("Server")->error("Experiment ID '{}' does not exist!", experiment_id);
|
||||
}
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ModAPI", "getExperimentEnabled", [](int experiment_id) -> bool {
|
||||
@@ -179,12 +167,12 @@ void Export_Legacy_GMLib_ModAPI() {
|
||||
std::unordered_set<AllExperiments> set(list.begin(), list.end());
|
||||
if (set.contains((AllExperiments)experiment_id)) {
|
||||
return GMLIB_Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id));
|
||||
} else {
|
||||
ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
|
||||
return false;
|
||||
}
|
||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Server")->error("Experiment ID '{}' does not exist!", experiment_id);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void { VanillaFix::setFixI18nEnabled(); });
|
||||
RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
|
||||
GMLIB::Mod::VanillaFix::setFixI18nEnabled();
|
||||
});
|
||||
}
|
||||
+12
-15
@@ -15,10 +15,9 @@ void Export_Legacy_GMLib_ServerAPI() {
|
||||
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
|
||||
if (auto level = GMLIB_Level::getInstance()) {
|
||||
return level->getLevelName();
|
||||
}
|
||||
return {};
|
||||
return GMLIB_Level::getInstance()
|
||||
.transform([](GMLIB_Level& level) -> std::string { return level.getLevelName(); })
|
||||
.value_or("");
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
|
||||
if (auto level = GMLIB_Level::getInstance()) {
|
||||
@@ -26,10 +25,9 @@ void Export_Legacy_GMLib_ServerAPI() {
|
||||
}
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelSeed", []() -> std::string {
|
||||
if (auto level = GMLIB_Level::getInstance()) {
|
||||
return std::to_string(level->getSeed());
|
||||
}
|
||||
return {};
|
||||
return GMLIB_Level::getInstance()
|
||||
.transform([](GMLIB_Level& level) -> std::string { return std::to_string(level.getSeed()); })
|
||||
.value_or("");
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
|
||||
return GMLIB_Level::setFakeSeed(seed);
|
||||
@@ -62,19 +60,18 @@ void Export_Legacy_GMLib_ServerAPI() {
|
||||
"GMLib_ServerAPI",
|
||||
"addFakeList",
|
||||
[](const std::string& name, const std::string& xuid) -> bool {
|
||||
return FakeList::addFakeList(name, xuid, ActorUniqueID(-1));
|
||||
return GMLIB::Server::FakeList::addFakeList(name, xuid, ActorUniqueID(-1));
|
||||
}
|
||||
);
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "removeFakeList", [](const std::string& nameOrXuid) -> bool {
|
||||
return FakeList::removeFakeList(nameOrXuid);
|
||||
return GMLIB::Server::FakeList::removeFakeList(nameOrXuid);
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "removeAllFakeList", []() -> void {
|
||||
return FakeList::removeAllFakeLists();
|
||||
return GMLIB::Server::FakeList::removeAllFakeLists();
|
||||
});
|
||||
RemoteCall::exportAs("GMLib_ServerAPI", "getMaxPlayers", []() -> int {
|
||||
if (auto level = GMLIB_Level::getInstance()) {
|
||||
return level->getMaxPlayerCount();
|
||||
}
|
||||
return {};
|
||||
return GMLIB_Level::getInstance().transform(
|
||||
[](GMLIB_Level& level) -> int { return level.getMaxPlayerCount(); }
|
||||
).value_or(0);
|
||||
});
|
||||
}
|
||||
|
||||
+30
-15
@@ -13,9 +13,11 @@ bool isParameters(std::string const& str) {
|
||||
return std::regex_search(removeBrackets(str), reg);
|
||||
}
|
||||
|
||||
std::string GetValue(std::string const& from) { return PlaceholderAPI::getValue(from); }
|
||||
std::string GetValue(std::string const& from) { return GMLIB::Server::PlaceholderAPI::getValue(from); }
|
||||
|
||||
std::string GetValueWithPlayer(std::string const& key, Player* player) { return PlaceholderAPI::getValue(key, player); }
|
||||
std::string GetValueWithPlayer(std::string const& key, Player* player) {
|
||||
return GMLIB::Server::PlaceholderAPI::getValue(key, player);
|
||||
}
|
||||
|
||||
bool registerPlayerPlaceholder(
|
||||
std::string const& PluginName,
|
||||
@@ -23,20 +25,24 @@ bool registerPlayerPlaceholder(
|
||||
std::string const& PAPIName
|
||||
) {
|
||||
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
||||
PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||
GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||
if (isParameters(PAPIName)) {
|
||||
auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
|
||||
PluginName,
|
||||
FuncName
|
||||
);
|
||||
PlaceholderAPI::registerPlayerPlaceholder(
|
||||
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
|
||||
PAPIName,
|
||||
[Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, map); },
|
||||
PluginName
|
||||
);
|
||||
} else {
|
||||
auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
|
||||
PlaceholderAPI::registerPlayerPlaceholder(PAPIName, [Call](Player* sp) { return Call(sp); }, PluginName);
|
||||
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
|
||||
PAPIName,
|
||||
[Call](Player* sp) { return Call(sp); },
|
||||
PluginName
|
||||
);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -49,18 +55,18 @@ bool registerServerPlaceholder(
|
||||
std::string const& PAPIName
|
||||
) {
|
||||
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
||||
PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||
GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||
if (isParameters(PAPIName)) {
|
||||
auto Call =
|
||||
RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
|
||||
PlaceholderAPI::registerServerPlaceholder(
|
||||
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
|
||||
PAPIName,
|
||||
[Call](std::unordered_map<std::string, std::string> map) { return Call(map); },
|
||||
PluginName
|
||||
);
|
||||
} else {
|
||||
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
|
||||
PlaceholderAPI::registerServerPlaceholder(PAPIName, [Call]() { return Call(); }, PluginName);
|
||||
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(PAPIName, [Call]() { return Call(); }, PluginName);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -74,13 +80,22 @@ bool registerStaticPlaceholder(
|
||||
int num
|
||||
) {
|
||||
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
||||
PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||
GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||
if (isParameters(PAPIName)) {
|
||||
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
|
||||
if (num == -1) {
|
||||
PlaceholderAPI::registerStaticPlaceholder(PAPIName, [Call] { return Call(); }, PluginName);
|
||||
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
|
||||
PAPIName,
|
||||
[Call] { return Call(); },
|
||||
PluginName
|
||||
);
|
||||
} else {
|
||||
PlaceholderAPI::registerStaticPlaceholder(PAPIName, num, [Call] { return Call(); }, PluginName);
|
||||
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
|
||||
PAPIName,
|
||||
num,
|
||||
[Call] { return Call(); },
|
||||
PluginName
|
||||
);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
@@ -89,14 +104,14 @@ bool registerStaticPlaceholder(
|
||||
}
|
||||
|
||||
std::string translateStringWithPlayer(std::string const& str, Player* pl) {
|
||||
return PlaceholderAPI::translateString(str, pl);
|
||||
return GMLIB::Server::PlaceholderAPI::translateString(str, pl);
|
||||
}
|
||||
|
||||
std::string translateString(std::string const& str) { return PlaceholderAPI::translateString(str); }
|
||||
std::string translateString(std::string const& str) { return GMLIB::Server::PlaceholderAPI::translateString(str); }
|
||||
|
||||
bool unRegisterPlaceholder(std::string const& str) { return PlaceholderAPI::unregisterPlaceholder(str); }
|
||||
bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(str); }
|
||||
|
||||
std::vector<std::string> getAllPAPI() { return PlaceholderAPI::getAllPAPI(); }
|
||||
std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); }
|
||||
|
||||
} // namespace PAPIRemoteCall
|
||||
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"format_version": 2,
|
||||
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
|
||||
"version": "0.13.3",
|
||||
"version": "0.13.6",
|
||||
"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.13.3/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
|
||||
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.13.6/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
|
||||
"dependencies": {
|
||||
"github.com/GroupMountain/GMLIB": ">=0.13.0"
|
||||
"github.com/GroupMountain/GMLIB": ">=0.13.9"
|
||||
},
|
||||
"files": {
|
||||
"place": [
|
||||
|
||||
@@ -7,43 +7,12 @@ if not has_config("vs_runtime") then
|
||||
set_runtimes("MD")
|
||||
end
|
||||
|
||||
-- Option 1: Use the latest version of LeviLamina released on GitHub.
|
||||
add_requires("levilaminalibrary")
|
||||
add_requires("levilamina", {configs = {target_type = "server"}})
|
||||
add_requires("legacyremotecall")
|
||||
add_requires("gmlib")
|
||||
add_requires("levibuildscript")
|
||||
|
||||
-- Option 2: Use a specific version of LeviLamina released on GitHub.
|
||||
-- add_requires("levilamina x.x.x")
|
||||
|
||||
-- Option 3: Use the latest commit of LeviLamina on GitHub.
|
||||
-- -- Here, "develop" is the branch name. You can change it to any branch name you want.
|
||||
-- add_requires("levilamina develop")
|
||||
-- -- You can also use debug build of LeviLamina.
|
||||
-- -- add_requires("levilamina develop", {debug = true})
|
||||
-- package("levilamina")
|
||||
-- add_urls("https://github.com/LiteLDev/LeviLamina.git")
|
||||
|
||||
-- add_deps("ctre 3.8.1")
|
||||
-- add_deps("entt 3.12.2")
|
||||
-- add_deps("fmt 10.1.1")
|
||||
-- add_deps("gsl 4.0.0")
|
||||
-- add_deps("leveldb 1.23")
|
||||
-- add_deps("magic_enum 0.9.0")
|
||||
-- add_deps("nlohmann_json 3.11.2")
|
||||
-- add_deps("rapidjson 1.1.0")
|
||||
-- add_deps("pcg_cpp 1.0.0")
|
||||
-- add_deps("pfr 2.1.1")
|
||||
-- add_deps("preloader 1.4.0")
|
||||
-- add_deps("symbolprovider 1.1.0")
|
||||
|
||||
-- -- You may need to change this to the target BDS version of your choice.
|
||||
-- add_deps("bdslibrary 1.20.50.03")
|
||||
|
||||
-- on_install(function (package)
|
||||
-- import("package.tools.xmake").install(package)
|
||||
-- end)
|
||||
|
||||
target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
|
||||
target("GMLIB-LegacyRemoteCallApi")
|
||||
add_cxflags(
|
||||
"/EHa",
|
||||
"/utf-8"
|
||||
@@ -59,14 +28,12 @@ target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
|
||||
"src"
|
||||
)
|
||||
add_packages(
|
||||
"levilaminalibrary",
|
||||
"levilamina",
|
||||
"legacyremotecall",
|
||||
"gmlib"
|
||||
)
|
||||
add_shflags(
|
||||
"/DELAYLOAD:bedrock_server.dll" -- Magic to import symbols from BDS
|
||||
)
|
||||
set_exceptions("none") -- To avoid conflicts with /EHa
|
||||
add_rules("@levibuildscript/linkrule")
|
||||
set_exceptions("none")
|
||||
set_kind("shared")
|
||||
set_languages("c++23")
|
||||
set_symbols("debug")
|
||||
|
||||
Reference in New Issue
Block a user