Compare commits
35 Commits
Vendored
+6
-6
@@ -55,8 +55,8 @@ declare class Event {
|
|||||||
item: Item,
|
item: Item,
|
||||||
/** 尝试生成的坐标对象 */
|
/** 尝试生成的坐标对象 */
|
||||||
pos: FloatPos,
|
pos: FloatPos,
|
||||||
/** 创建掉落物的实体对象 */
|
/** 创建掉落物的实体uniqueId */
|
||||||
spawnerEntity: Entity
|
spawnerUniqueId: number
|
||||||
) => boolean | void
|
) => boolean | void
|
||||||
): boolean;
|
): boolean;
|
||||||
|
|
||||||
@@ -72,15 +72,15 @@ declare class Event {
|
|||||||
entity: Entity,
|
entity: Entity,
|
||||||
/** 实体生成的坐标 */
|
/** 实体生成的坐标 */
|
||||||
pos: FloatPos,
|
pos: FloatPos,
|
||||||
/** 创建掉落物的实体对象 */
|
/** 创建掉落物的实体uniqueId */
|
||||||
spawnerEntity: Entity
|
spawnerUniqueId: number
|
||||||
) => void
|
) => void
|
||||||
): boolean;
|
): boolean;
|
||||||
|
|
||||||
/** 实体切换维度 */
|
/** 实体切换维度 */
|
||||||
static listen(
|
static listen(
|
||||||
/** 事件名 */
|
/** 事件名 */
|
||||||
event: "onEntityChangeDim",
|
event: "onEntityTryChangeDim",
|
||||||
/** 回调函数 */
|
/** 回调函数 */
|
||||||
listener: (
|
listener: (
|
||||||
/** 切换维度的实体对象 */
|
/** 切换维度的实体对象 */
|
||||||
@@ -93,7 +93,7 @@ declare class Event {
|
|||||||
/** 实体切换维度后(不可拦截) */
|
/** 实体切换维度后(不可拦截) */
|
||||||
static listen(
|
static listen(
|
||||||
/** 事件名 */
|
/** 事件名 */
|
||||||
event: "onEntityChangeDimAfter",
|
event: "onEntityChangeDim",
|
||||||
/** 回调函数 */
|
/** 回调函数 */
|
||||||
listener: (
|
listener: (
|
||||||
/** 切换维度的实体对象 */
|
/** 切换维度的实体对象 */
|
||||||
|
|||||||
+7
-21
@@ -1,23 +1,11 @@
|
|||||||
/** 事件创建函数 @type {function(string,string):boolean} */
|
/** 事件创建函数 @type {function(string,string):boolean} */
|
||||||
const CallEvent = ll.import("GMLIB_API", "callCustomEvent");
|
const CallEvent = ll.import("GMLIB_Event_API", "callCustomEvent");
|
||||||
|
/** 获取事件ID函数 @type {function():string} */
|
||||||
/** 事件ID @type {number} */
|
const getNextEventId = ll.import("GMLIB_Event_API", "getNextScriptEventId");
|
||||||
let NextEventId = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取事件ID标识名
|
|
||||||
* @returns {string} 事件ID标识名
|
|
||||||
*/
|
|
||||||
function getNextEventId() {
|
|
||||||
NextEventId++;
|
|
||||||
return "GMLIB_Event_" + NextEventId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 事件类 */
|
/** 事件类 */
|
||||||
class Event {
|
class Event {
|
||||||
constructor() {
|
constructor() { throw new Error("Static class cannot be instantiated"); }
|
||||||
throw new Error("Static class cannot be instantiated");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 监听事件
|
* 监听事件
|
||||||
@@ -30,13 +18,11 @@ class Event {
|
|||||||
ll.export(callback, event, eventId);
|
ll.export(callback, event, eventId);
|
||||||
let result = CallEvent(event, eventId);
|
let result = CallEvent(event, eventId);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
logger.error(`Cannot listen event "${event}"!`);
|
logger.error(`Cannot listen event "${event}" !`);
|
||||||
logger.error(`Event "${event}" No Found!`);
|
logger.error(`GMLIB Script Event "${event}" does not exist !`);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = { Event };
|
||||||
Event
|
|
||||||
};
|
|
||||||
@@ -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
+306
-1
@@ -509,6 +509,28 @@ declare class Recipes {
|
|||||||
/** 解锁条件(也可以填物品命名空间ID) */
|
/** 解锁条件(也可以填物品命名空间ID) */
|
||||||
unlock: "AlwaysUnlocked" | "PlayerHasManyItems" | "PlayerInWater" | "None" | undefined
|
unlock: "AlwaysUnlocked" | "PlayerHasManyItems" | "PlayerInWater" | "None" | undefined
|
||||||
): boolean;
|
): boolean;
|
||||||
|
|
||||||
|
/** 注册自定义有序合成表 */
|
||||||
|
static registerCustomShapedRecipe(
|
||||||
|
/** 合成表唯一标识符 */
|
||||||
|
recipeId: string,
|
||||||
|
/** 合成表摆放方式,数组元素为字符串 */
|
||||||
|
shape: [string, string, string],
|
||||||
|
/** 材料数组 */
|
||||||
|
ingredients: string[],
|
||||||
|
/** 合成结果 */
|
||||||
|
result: Item
|
||||||
|
): boolean;
|
||||||
|
|
||||||
|
/** 注册自定义无序合成表 */
|
||||||
|
static registerCustomShapelessRecipe(
|
||||||
|
/** 合成表唯一标识符 */
|
||||||
|
recipeId: string,
|
||||||
|
/** 合成材料 */
|
||||||
|
ingredients: string[],
|
||||||
|
/** 合成结果 */
|
||||||
|
result: Item
|
||||||
|
): boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 实验性功能类 */
|
/** 实验性功能类 */
|
||||||
@@ -1032,6 +1054,289 @@ declare class UserCache {
|
|||||||
static getAllPlayerInfo(): { Xuid: String; Uuid: string; Name: string; }[]
|
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,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
/** 二进制流数据包类 */
|
||||||
|
declare class GMLIB_BinaryStream {
|
||||||
|
/** 数据包ID */
|
||||||
|
#id: number;
|
||||||
|
/** 数据包是否被销毁 */
|
||||||
|
#destroy: boolean;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
/** 数据包数据 */
|
||||||
|
data: PacketData[]?
|
||||||
|
);
|
||||||
|
|
||||||
|
/** 发送数据包 */
|
||||||
|
sendTo(
|
||||||
|
/** 要发送数据包的玩家对象 */
|
||||||
|
player: Player,
|
||||||
|
/** 数据包发送后是否销毁 */
|
||||||
|
free: boolean = true
|
||||||
|
): GMLIB_BinaryStream;
|
||||||
|
|
||||||
|
/** 发送数据包到玩家数组 */
|
||||||
|
sendToPlayers(
|
||||||
|
/** 要发送数据包的玩家对象数组 */
|
||||||
|
players: Player[],
|
||||||
|
/** 数据包发送后是否销毁 */
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
interface Player {
|
interface Player {
|
||||||
/** (GMLIB)转换成实体对象 */
|
/** (GMLIB)转换成实体对象 */
|
||||||
toEntity(): Entity;
|
toEntity(): Entity;
|
||||||
@@ -1059,7 +1364,7 @@ interface Player {
|
|||||||
/** (GMLIB)获取玩家的rumtimeId */
|
/** (GMLIB)获取玩家的rumtimeId */
|
||||||
getRuntimeId(): number;
|
getRuntimeId(): number;
|
||||||
|
|
||||||
/** (GMLIB)获取玩家饱食度 */
|
/** (GMLIB)获取玩家饥饿值 */
|
||||||
getHungry(): number;
|
getHungry(): number;
|
||||||
|
|
||||||
/** (GMLIB)获取玩家盔甲覆盖百分比 */
|
/** (GMLIB)获取玩家盔甲覆盖百分比 */
|
||||||
|
|||||||
+502
-8
@@ -96,6 +96,10 @@ const GMLIB_API = {
|
|||||||
registerShapedRecipe: ll.import("GMLib_ModAPI", "registerShapedRecipe"),
|
registerShapedRecipe: ll.import("GMLib_ModAPI", "registerShapedRecipe"),
|
||||||
/** 注册无序合成表 @type {function(string,Array.<string>,Array.<string>,string,number,string)} */
|
/** 注册无序合成表 @type {function(string,Array.<string>,Array.<string>,string,number,string)} */
|
||||||
registerShapelessRecipe: ll.import("GMLib_ModAPI", "registerShapelessRecipe"),
|
registerShapelessRecipe: ll.import("GMLib_ModAPI", "registerShapelessRecipe"),
|
||||||
|
/** 注册有序合成表 @type {function(string,Array.<string>,Array.<string>,string,number,string)} */
|
||||||
|
registerCustomShapedRecipe: ll.import("GMLIB_API", "registerCustomShapedRecipe"),
|
||||||
|
/** 注册无序合成表 @type {function(string,Array.<string>,Array.<string>,string,number,string)} */
|
||||||
|
registerCustomShapelessRecipe: ll.import("GMLIB_API", "registerCustomShapelessRecipe"),
|
||||||
/** 检测LRCA版本是否大于或等于此版本 @type {function(number,number,number):boolean} */
|
/** 检测LRCA版本是否大于或等于此版本 @type {function(number,number,number):boolean} */
|
||||||
isVersionMatched: ll.import("GMLIB_API", "isVersionMatched"),
|
isVersionMatched: ll.import("GMLIB_API", "isVersionMatched"),
|
||||||
/** 获取LRCA版本 @type {function():string} */
|
/** 获取LRCA版本 @type {function():string} */
|
||||||
@@ -312,7 +316,7 @@ const GMLIB_API = {
|
|||||||
getItemCanPlaceOn: ll.import("GMLIB_API", "getItemCanPlaceOn"),
|
getItemCanPlaceOn: ll.import("GMLIB_API", "getItemCanPlaceOn"),
|
||||||
/** 设置物品冒险模式下能放置在什么方块上 @type {function(Item,Array.<string>):void} */
|
/** 设置物品冒险模式下能放置在什么方块上 @type {function(Item,Array.<string>):void} */
|
||||||
setItemCanPlaceOn: ll.import("GMLIB_API", "setItemCanPlaceOn"),
|
setItemCanPlaceOn: ll.import("GMLIB_API", "setItemCanPlaceOn"),
|
||||||
/** 获取玩家饱食度 @type {function(Player):number} */
|
/** 获取玩家饥饿值 @type {function(Player):number} */
|
||||||
getPlayerHungry: ll.import("GMLIB_API", "getPlayerHungry"),
|
getPlayerHungry: ll.import("GMLIB_API", "getPlayerHungry"),
|
||||||
/** 获取玩家盔甲覆盖百分比 @type {function(Player):number} */
|
/** 获取玩家盔甲覆盖百分比 @type {function(Player):number} */
|
||||||
getPlayerArmorCoverPercentage: ll.import("GMLIB_API", "getPlayerArmorCoverPercentage"),
|
getPlayerArmorCoverPercentage: ll.import("GMLIB_API", "getPlayerArmorCoverPercentage"),
|
||||||
@@ -370,7 +374,61 @@ const GMLIB_API = {
|
|||||||
getDefaultGameMode: ll.import("GMLIB_API", "getDefaultGameMode"),
|
getDefaultGameMode: ll.import("GMLIB_API", "getDefaultGameMode"),
|
||||||
/** 设置默认游戏模式 @type {function(mode):void} */
|
/** 设置默认游戏模式 @type {function(mode):void} */
|
||||||
setDefaultGameMode: ll.import("GMLIB_API", "setDefaultGameMode"),
|
setDefaultGameMode: ll.import("GMLIB_API", "setDefaultGameMode"),
|
||||||
}
|
};
|
||||||
|
|
||||||
|
/** LRCA的二进制流数据包导出接口 */
|
||||||
|
const GMLIB_BinaryStream_API = {
|
||||||
|
/** 创建二进制流数据包 @type {function():number} */
|
||||||
|
create: ll.import("GMLIB_BinaryStream_API", "create"),
|
||||||
|
/** 发送二进制流数据包 @type {function(number,player):void} */
|
||||||
|
sendTo: ll.import("GMLIB_BinaryStream_API", "sendTo"),
|
||||||
|
/** 销毁二进制流数据包 @type {function(number):void} */
|
||||||
|
destroy: ll.import("GMLIB_BinaryStream_API", "destroy"),
|
||||||
|
/** 重置二进制流数据包 @type {function(number):void} */
|
||||||
|
reset: ll.import("GMLIB_BinaryStream_API", "reset"),
|
||||||
|
/** 写入二进制流数据包头部 @type {function(number, number):void} */
|
||||||
|
writePacketHeader: ll.import("GMLIB_BinaryStream_API", "writePacketHeader"),
|
||||||
|
/** 写入UUID @type {function(number, string):void} */
|
||||||
|
writeUuid: ll.import("GMLIB_BinaryStream_API", "writeUuid"),
|
||||||
|
/** 写入物品 @type {function(number, Item):void} */
|
||||||
|
writeItem: ll.import("GMLIB_BinaryStream_API", "writeItem"),
|
||||||
|
/** 写入NBT @type {function(NbtCompound, Item):void} */
|
||||||
|
writeCompoundTag: ll.import("GMLIB_BinaryStream_API", "writeCompoundTag"),
|
||||||
|
/** 写入字符串 @type {function(number, string):void} */
|
||||||
|
writeString: ll.import("GMLIB_BinaryStream_API", "writeString"),
|
||||||
|
/** 写入布尔值 @type {function(number, boolean):void} */
|
||||||
|
writeBool: ll.import("GMLIB_BinaryStream_API", "writeBool"),
|
||||||
|
/** 写入字节 @type {function(number, number):void} */
|
||||||
|
writeByte: ll.import("GMLIB_BinaryStream_API", "writeByte"),
|
||||||
|
/** 写入双精度浮点数 @type {function(number, number):void} */
|
||||||
|
writeDouble: ll.import("GMLIB_BinaryStream_API", "writeDouble"),
|
||||||
|
/** 写入浮点数 @type {function(number, number):void} */
|
||||||
|
writeFloat: ll.import("GMLIB_BinaryStream_API", "writeFloat"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeSignedBigEndianInt: ll.import("GMLIB_BinaryStream_API", "writeSignedBigEndianInt"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeSignedInt: ll.import("GMLIB_BinaryStream_API", "writeSignedInt"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeSignedInt64: ll.import("GMLIB_BinaryStream_API", "writeSignedInt64"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeSignedShort: ll.import("GMLIB_BinaryStream_API", "writeSignedShort"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeUnsignedChar: ll.import("GMLIB_BinaryStream_API", "writeUnsignedChar"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeUnsignedInt: ll.import("GMLIB_BinaryStream_API", "writeUnsignedInt"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeUnsignedInt64: ll.import("GMLIB_BinaryStream_API", "writeUnsignedInt64"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeUnsignedShort: ll.import("GMLIB_BinaryStream_API", "writeUnsignedShort"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeUnsignedVarInt: ll.import("GMLIB_BinaryStream_API", "writeUnsignedVarInt"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeUnsignedVarInt64: ll.import("GMLIB_BinaryStream_API", "writeUnsignedVarInt64"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeVarInt: ll.import("GMLIB_BinaryStream_API", "writeVarInt"),
|
||||||
|
/** @type {function(number, number):void} */
|
||||||
|
writeVarInt64: ll.import("GMLIB_BinaryStream_API", "writeVarInt64"),
|
||||||
|
};
|
||||||
|
|
||||||
/** 静态悬浮字类列表 @type {Map<number,StaticFloatingText>} */
|
/** 静态悬浮字类列表 @type {Map<number,StaticFloatingText>} */
|
||||||
const mStaticFloatingTextMap = new Map();
|
const mStaticFloatingTextMap = new Map();
|
||||||
@@ -539,9 +597,7 @@ class DynamicFloatingText extends StaticFloatingText {
|
|||||||
* @param {boolean} [papi=true] 是否使用PAPI变量
|
* @param {boolean} [papi=true] 是否使用PAPI变量
|
||||||
*/
|
*/
|
||||||
constructor(pos, text, updateRate = 1, papi = true) {
|
constructor(pos, text, updateRate = 1, papi = true) {
|
||||||
this.mPosition = pos;
|
super(pos, text, papi);
|
||||||
this.mText = text;
|
|
||||||
this.mPlaceholderAPI = papi;
|
|
||||||
this.mRuntimeId = GMLIB_API.createFloatingText(this.mPosition, this.mText, this.mPlaceholderAPI);
|
this.mRuntimeId = GMLIB_API.createFloatingText(this.mPosition, this.mText, this.mPlaceholderAPI);
|
||||||
this.mUpdateRate = updateRate;
|
this.mUpdateRate = updateRate;
|
||||||
this.mTaskId = null;
|
this.mTaskId = null;
|
||||||
@@ -1196,6 +1252,18 @@ class Recipes {
|
|||||||
return GMLIB_API.registerShapedRecipe(recipeId, shape, ingredients, result, count, unlock);
|
return GMLIB_API.registerShapedRecipe(recipeId, shape, ingredients, result, count, unlock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 注册自定义有序合成表
|
||||||
|
* @param {string} recipeId 合成表唯一标识
|
||||||
|
* @param {[string,string,string]} shape 合成表摆放方式,数组元素为字符串
|
||||||
|
* @param {Array.<string>} ingredients 材料数组
|
||||||
|
* @param {Item} result 合成结果
|
||||||
|
* @returns {boolean} 是否注册成功
|
||||||
|
*/
|
||||||
|
static registerCustomShapedRecipe(recipeId, shape, ingredients, result) {
|
||||||
|
return GMLIB_API.registerCustomShapedRecipe(recipeId, shape, ingredients, result);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 注册无序合成表
|
* 注册无序合成表
|
||||||
* @param {string} recipeId 合成表唯一标识
|
* @param {string} recipeId 合成表唯一标识
|
||||||
@@ -1208,6 +1276,17 @@ class Recipes {
|
|||||||
static registerShapelessRecipe(recipeId, ingredients, result, count = 1, unlock = "AlwaysUnlocked") {
|
static registerShapelessRecipe(recipeId, ingredients, result, count = 1, unlock = "AlwaysUnlocked") {
|
||||||
return GMLIB_API.registerShapelessRecipe(recipeId, ingredients, result, count, unlock);
|
return GMLIB_API.registerShapelessRecipe(recipeId, ingredients, result, count, unlock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 注册自定义无序合成表
|
||||||
|
* @param {string} recipeId 合成表唯一标识
|
||||||
|
* @param {Array.<string>} ingredients 合成材料
|
||||||
|
* @param {Item} result 合成结果
|
||||||
|
* @returns {boolean} 是否注册成功
|
||||||
|
*/
|
||||||
|
static registerCustomShapelessRecipe(recipeId, ingredients, result) {
|
||||||
|
return GMLIB_API.registerCustomShapelessRecipe(recipeId, ingredients, result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 实验性功能类 */
|
/** 实验性功能类 */
|
||||||
@@ -2027,6 +2106,420 @@ class UserCache {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** 二进制数据包API类 */
|
||||||
|
class GMLIB_BinaryStream {
|
||||||
|
|
||||||
|
/** 数据包ID @type {number} */
|
||||||
|
#id = null;
|
||||||
|
/** 数据包是否被销毁 @type {boolean} */
|
||||||
|
#destroy = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建二进制流数据包
|
||||||
|
* @param {{"type":string,"value":any}[]?} value 写入数据
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
constructor(value) {
|
||||||
|
this.#id = GMLIB_BinaryStream_API.create();
|
||||||
|
if (Array.isArray(value)) this.write(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送数据包
|
||||||
|
* @param {Player} player 玩家
|
||||||
|
* @param {boolean} [free=true] 发送后销毁数据包
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
sendTo(player, free = true) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.sendTo(this.#id, player);
|
||||||
|
if (free) this.destroy();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送数据包到玩家
|
||||||
|
* @param {Player[]} players 玩家对象数组
|
||||||
|
* @param {boolean} free 发送后销毁数据包
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
sendToPlayers(players, free = true) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
players.forEach(player => this.sendTo(player, false));
|
||||||
|
if (free) this.destroy();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送数据包到所有玩家
|
||||||
|
* @param {boolean} [free=true] 发送后销毁数据包
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
sendToAll(free = true) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
mc.getOnlinePlayers().forEach(player => this.sendTo(player, false));
|
||||||
|
if (free) this.destroy();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送数据包到维度
|
||||||
|
* @param {number} dimid 维度ID
|
||||||
|
* @param {boolean} [free=true] 发送后销毁数据包
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
sendToDimension(dimid, free = true) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
mc.getOnlinePlayers().filter(player => player.pos.dimid === dimid).forEach(player => this.sendTo(player, false));
|
||||||
|
if (free) this.destroy();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 销毁数据包
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
destroy() {
|
||||||
|
GMLIB_BinaryStream_API.destroy(this.#id);
|
||||||
|
this.#destroy = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据包是否已被销毁
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
isDestroy() {
|
||||||
|
return this.#destroy;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 重置数据包
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
reset() {
|
||||||
|
GMLIB_BinaryStream_API.reset(this.#id);
|
||||||
|
this.#destroy = false;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 转换成字符串
|
||||||
|
* @returns {string} 字符串
|
||||||
|
*/
|
||||||
|
toString(){
|
||||||
|
return `<GMLIB_BinaryStream#${this.#id}>`
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入数据
|
||||||
|
* @param {{"type":string,"value":any}[]|{"type":string,"value":any}} value 数据
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
write(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
if (Array.isArray(value)) value.forEach(v => this.write(v));
|
||||||
|
if (value?.type != null && value?.value != null) this[`write${value.type}`]?.(value.value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入数据包头部
|
||||||
|
* @param {number} id 数据包ID
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writePacketHeader(id) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writePacketHeader(this.#id, id);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入UUID
|
||||||
|
* @param {string} value UUID
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUuid(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUuid(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入物品
|
||||||
|
* @param {Item} value 物品
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeItem(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeItem(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入NBT
|
||||||
|
* @param {NbtCompound} value NBT
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeCompoundTag(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeCompoundTag(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {{"id":number,"type":number,"value":string|IntPos|FloatPos|number|NbtCompound}[]} value 数据
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeDataItem(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
this.writeUnsignedVarInt(value.length);
|
||||||
|
for (const data of value) {
|
||||||
|
this.writeUnsignedVarInt(data.id);
|
||||||
|
this.writeUnsignedVarInt(data.type);
|
||||||
|
switch (data.type) {
|
||||||
|
case 0: this.writeByte(data.value); break;
|
||||||
|
case 1: this.writeSignedShort(data.value); break;
|
||||||
|
case 2: this.writeSignedInt(data.value); break;
|
||||||
|
case 3: this.writeFloat(data.value); break;
|
||||||
|
case 4: this.writeString(data.value); break;
|
||||||
|
case 5: this.writeCompoundTag(data.value); break;
|
||||||
|
case 6: this.writeBlockPos(data.value); break;
|
||||||
|
case 7: this.writeSignedInt64(data.value); break;
|
||||||
|
case 8: this.writeVec3(data.value); break;
|
||||||
|
default: throw new Error("Unknown data type");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {{"mA":number,"mB":number,"mType":number,"mImmediate":boolean,"mPassengerInitiated":boolean}} value 数据
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeActorLink(value) {
|
||||||
|
this.writeVarInt64(value.mA);
|
||||||
|
this.writeVarInt64(value.mB);
|
||||||
|
this.writeUnsignedChar(value.mType);
|
||||||
|
this.writeBool(value.mImmediate);
|
||||||
|
this.writeBool(value.mPassengerInitiated);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入字符串
|
||||||
|
* @param {string} value 字符串
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeString(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeString(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入布尔值
|
||||||
|
* @param {boolean} value 布尔值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeBool(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeBool(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入字节
|
||||||
|
* @param {number} value 字节
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeByte(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeByte(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入(双精度)浮点数
|
||||||
|
* @param {number} value 浮点数
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeDouble(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeDouble(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入(单精度)浮点数
|
||||||
|
* @param {number} value 浮点数
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeFloat(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeFloat(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入浮点数坐标对象
|
||||||
|
* @param {FloatPos} value 浮点数坐标对象
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeVec3({ x, y, z }) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
this.writeFloat(x);
|
||||||
|
this.writeFloat(y);
|
||||||
|
this.writeFloat(z);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写入整数坐标对象
|
||||||
|
* @param {IntPos} value 整数坐标对象
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeBlockPos({ x, y, z }) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
this.writeVarInt(x);
|
||||||
|
this.writeUnsignedVarInt(y);
|
||||||
|
this.writeVarInt(z);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param {{"x":number,"z":number}} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeVec2({ x, z }) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
this.writeFloat(x);
|
||||||
|
this.writeFloat(z);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeSignedBigEndianInt(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeSignedBigEndianInt(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeSignedInt(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeSignedInt(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeSignedInt64(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeSignedInt64(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeSignedShort(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeSignedShort(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUnsignedChar(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUnsignedChar(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUnsignedInt(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUnsignedInt(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUnsignedInt64(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUnsignedInt64(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUnsignedShort(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUnsignedShort(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUnsignedVarInt(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUnsignedVarInt(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeUnsignedVarInt64(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeUnsignedVarInt64(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeVarInt(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeVarInt(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} value 数值
|
||||||
|
* @returns {GMLIB_BinaryStream}
|
||||||
|
*/
|
||||||
|
writeVarInt64(value) {
|
||||||
|
if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
|
||||||
|
GMLIB_BinaryStream_API.writeVarInt64(this.#id, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
LLSE_Player.prototype.toEntity =
|
LLSE_Player.prototype.toEntity =
|
||||||
/**
|
/**
|
||||||
* 获取实体对象
|
* 获取实体对象
|
||||||
@@ -2445,7 +2938,7 @@ LLSE_Item.prototype.setCanPlaceOn =
|
|||||||
|
|
||||||
LLSE_Player.prototype.getHungry =
|
LLSE_Player.prototype.getHungry =
|
||||||
/**
|
/**
|
||||||
* 获取玩家饱食度
|
* 获取玩家饥饿值
|
||||||
* @returns {number}
|
* @returns {number}
|
||||||
*/
|
*/
|
||||||
function () {
|
function () {
|
||||||
@@ -2470,7 +2963,7 @@ LLSE_Player.prototype.getArmorValue =
|
|||||||
return GMLIB_API.getPlayerArmorValue(this);
|
return GMLIB_API.getPlayerArmorValue(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
LLSE_Player.prototype.getEntityOwner =
|
LLSE_Entity.prototype.getEntityOwner =
|
||||||
/**
|
/**
|
||||||
* 获取实体的主人
|
* 获取实体的主人
|
||||||
* @returns {Entity|null}
|
* @returns {Entity|null}
|
||||||
@@ -2636,5 +3129,6 @@ module.exports = {
|
|||||||
JsonI18n,
|
JsonI18n,
|
||||||
Version,
|
Version,
|
||||||
I18nAPI,
|
I18nAPI,
|
||||||
UserCache
|
UserCache,
|
||||||
|
GMLIB_BinaryStream
|
||||||
};
|
};
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "${pluginName}",
|
"name": "${pluginName}",
|
||||||
"entry": "${pluginFile}",
|
"entry": "${pluginFile}",
|
||||||
"version": "0.13.2",
|
"version": "0.13.4",
|
||||||
"author": "GroupMountain",
|
"author": "GroupMountain",
|
||||||
"type": "native",
|
"type": "native",
|
||||||
"passive": true,
|
"passive": true,
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
#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>(); }
|
||||||
|
|
||||||
|
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", "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);
|
||||||
|
}
|
||||||
+226
-306
@@ -1,6 +1,5 @@
|
|||||||
#include "Global.h"
|
#include "Global.h"
|
||||||
#include <regex>
|
#include <regex>
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
bool isInteger(const std::string& str) {
|
bool isInteger(const std::string& str) {
|
||||||
std::regex pattern("^[+-]?\\d+$");
|
std::regex pattern("^[+-]?\\d+$");
|
||||||
@@ -8,80 +7,61 @@ bool isInteger(const std::string& str) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ActorUniqueID parseScriptUniqueID(std::string const& uniqueId) {
|
ActorUniqueID parseScriptUniqueID(std::string const& uniqueId) {
|
||||||
if (!isInteger(uniqueId)) {
|
return isInteger(uniqueId) ? ActorUniqueID(std::stoll(uniqueId)) : ActorUniqueID::INVALID_ID;
|
||||||
return ActorUniqueID::INVALID_ID;
|
|
||||||
}
|
|
||||||
return ActorUniqueID(std::stoll(uniqueId));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Export_Compatibility_API() {
|
void Export_Compatibility_API() {
|
||||||
RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string const& id) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string const& id) -> bool {
|
||||||
auto level = GMLIB_Level::getInstance();
|
return GMLIB_Level::getInstance().has_value() ? GMLIB::Mod::CustomRecipe::unregisterRecipe(id) : false;
|
||||||
if (!level) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return CustomRecipe::unregisterRecipe(id);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string const& path) -> void {
|
RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string const& path) -> void {
|
||||||
CustomPacks::addCustomPackPath(path);
|
GMLIB::Mod::CustomPacks::addCustomPackPath(path);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float {
|
RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> double {
|
||||||
auto level = GMLIB_Level::getInstance();
|
return GMLIB_Level::getInstance().transform(
|
||||||
if (!level) {
|
[](GMLIB_Level& level) -> double { return level.getServerMspt(); }
|
||||||
return 0.0f;
|
).value_or(0.0);
|
||||||
}
|
|
||||||
return level->getServerMspt();
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
|
RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
|
||||||
auto level = GMLIB_Level::getInstance();
|
return GMLIB_Level::getInstance()
|
||||||
if (!level) {
|
.transform([](GMLIB_Level& level) -> float { return level.getServerCurrentTps(); })
|
||||||
return 0.0f;
|
.value_or(0.0);
|
||||||
}
|
|
||||||
return level->getServerCurrentTps();
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> float {
|
RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> double {
|
||||||
auto level = GMLIB_Level::getInstance();
|
return GMLIB_Level::getInstance()
|
||||||
if (!level) {
|
.transform([](GMLIB_Level& level) -> double { return level.getServerAverageTps(); })
|
||||||
return 0.0f;
|
.value_or(0.0);
|
||||||
}
|
|
||||||
return level->getServerAverageTps();
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
|
||||||
std::vector<std::string> result;
|
std::vector<std::string> result;
|
||||||
std::vector<mce::UUID> uuids = GMLIB_Player::getAllUuids();
|
for (auto& uuid : GMLIB_Player::getAllUuids()) {
|
||||||
for (auto& uuid : uuids) {
|
|
||||||
result.push_back(uuid.asString());
|
result.push_back(uuid.asString());
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string const& uuid) -> std::unique_ptr<CompoundTag> {
|
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string const& uuid) -> std::unique_ptr<CompoundTag> {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return std::move(GMLIB_Player::getPlayerNbt(mce::UUID::fromString(uuid)));
|
||||||
return std::move(GMLIB_Player::getPlayerNbt(uid));
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"setPlayerNbt",
|
"setPlayerNbt",
|
||||||
[](std::string const& uuid, CompoundTag* nbt, bool forceCreate) -> bool {
|
[](std::string const& uuid, CompoundTag* nbt, bool forceCreate) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::setPlayerNbt(mce::UUID::fromString(uuid), (GMLIB_CompoundTag&)*nbt, forceCreate);
|
||||||
return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"setPlayerNbtTags",
|
"setPlayerNbtTags",
|
||||||
[](std::string const& uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
|
[](std::string const& uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::setPlayerNbtTags(mce::UUID::fromString(uuid), (GMLIB_CompoundTag&)*nbt, tags);
|
||||||
return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "deletePlayerNbt", [](std::string const& uuid) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "deletePlayerNbt", [](std::string const& uuid) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::deletePlayerNbt(mce::UUID::fromString(uuid));
|
||||||
return GMLIB_Player::deletePlayerNbt(uid);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
|
RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
|
||||||
auto list = GMLIB_Level::getAllExperiments();
|
|
||||||
std::vector<int> result;
|
std::vector<int> result;
|
||||||
for (auto& key : list) {
|
for (auto& key : GMLIB_Level::getAllExperiments()) {
|
||||||
result.push_back((int)key);
|
result.push_back((int)key);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@@ -97,71 +77,83 @@ void Export_Compatibility_API() {
|
|||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"createFloatingText",
|
"createFloatingText",
|
||||||
[](std::pair<Vec3, int> pos, std::string const& text, bool papi) -> int {
|
[](std::pair<Vec3, int> pos, std::string const& text, bool papi) -> int {
|
||||||
auto& manager = FloatingTextManager::getInstance();
|
auto ft = GMLIB::Server::FloatingTextManager::createStatic(text, pos.first, pos.second, papi);
|
||||||
auto ft = manager.createStatic(text, pos.first, pos.second, papi);
|
GMLIB::Server::FloatingTextManager::getInstance().add(ft);
|
||||||
manager.add(ft);
|
|
||||||
return ft->getRuntimeID();
|
return ft->getRuntimeID();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string const& text) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string const& text) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->setText(text);
|
.getFloatingText(id)
|
||||||
|
.transform([&text](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.setText(text);
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool {
|
||||||
return FloatingTextManager::getInstance().remove(id);
|
return GMLIB::Server::FloatingTextManager::getInstance().remove(id);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->sendTo(*pl);
|
.getFloatingText(id)
|
||||||
|
.transform([&pl](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.sendTo(*pl);
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->sendToClients();
|
.getFloatingText(id)
|
||||||
|
.transform([](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.sendToClients();
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->removeFrom(*pl);
|
.getFloatingText(id)
|
||||||
|
.transform([&pl](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.removeFrom(*pl);
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->removeFromClients();
|
.getFloatingText(id)
|
||||||
|
.transform([](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.removeFromClients();
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->update(*pl);
|
.getFloatingText(id)
|
||||||
|
.transform([&pl](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.update(*pl);
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool {
|
||||||
if (auto ft = FloatingTextManager::getInstance().getFloatingText(id)) {
|
return GMLIB::Server::FloatingTextManager::getInstance()
|
||||||
ft->updateClients();
|
.getFloatingText(id)
|
||||||
|
.transform([](GMLIB::Server::FloatingTextBase& ft) -> bool {
|
||||||
|
ft.updateClients();
|
||||||
return true;
|
return true;
|
||||||
}
|
})
|
||||||
return false;
|
.has_value();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](int a, int b, int c) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](int a, int b, int c) -> bool {
|
||||||
auto version = Version(a, b, c, "", "");
|
return LIB_VERSION >= GMLIB::Version(a, b, c, "", "");
|
||||||
return LIB_VERSION >= version;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.asString(); });
|
RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.asString(); });
|
||||||
RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
|
||||||
return Version::getLibVersionString();
|
return GMLIB::Version::getLibVersionString();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
@@ -181,16 +173,10 @@ void Export_Compatibility_API() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
|
||||||
if (GMLIB_Level::getInstance()) {
|
return GMLIB_Level::getInstance().has_value() ? I18nAPI::getCurrentLanguageCode() : "unknown";
|
||||||
return I18nAPI::getCurrentLanguageCode();
|
|
||||||
}
|
|
||||||
return "unknown";
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getSupportedLanguages", []() -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getSupportedLanguages", []() -> std::vector<std::string> {
|
||||||
if (GMLIB_Level::getInstance()) {
|
return GMLIB_Level::getInstance() ? I18nAPI::getSupportedLanguageCodes() : std::vector<std::string>();
|
||||||
return I18nAPI::getSupportedLanguageCodes();
|
|
||||||
}
|
|
||||||
return {};
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string const& code, std::string const& lang) -> void {
|
RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string const& code, std::string const& lang) -> void {
|
||||||
if (GMLIB_Level::getInstance()) {
|
if (GMLIB_Level::getInstance()) {
|
||||||
@@ -213,188 +199,132 @@ void Export_Compatibility_API() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string const& uuid) -> std::pair<BlockPos, int> {
|
RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string const& uuid) -> std::pair<BlockPos, int> {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::getPlayerPosition(mce::UUID::fromString(uuid))
|
||||||
auto pos = GMLIB_Player::getPlayerPosition(uid);
|
.value_or(std::pair<BlockPos, int>({0, 0, 0}, -1));
|
||||||
if (pos.has_value()) {
|
|
||||||
return pos.value();
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
{0, 0, 0},
|
|
||||||
-1
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"setPlayerPosition",
|
"setPlayerPosition",
|
||||||
[](std::string const& uuid, std::pair<BlockPos, int> pos) -> bool {
|
[](std::string const& uuid, std::pair<BlockPos, int> pos) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::setPlayerPosition(mce::UUID::fromString(uuid), pos.first, pos.second);
|
||||||
return GMLIB_Player::setPlayerPosition(uid, pos.first, pos.second);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "playerHasScore", [](std::string const& uuid, std::string const& obj) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "playerHasScore", [](std::string const& uuid, std::string const& obj) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::getPlayerScore(mce::UUID::fromString(uuid), obj).has_value();
|
||||||
if (auto result = GMLIB_Player::getPlayerScore(uid, obj)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getPlayerScore", [](std::string const& uuid, std::string const& obj) -> int {
|
RemoteCall::exportAs("GMLIB_API", "getPlayerScore", [](std::string const& uuid, std::string const& obj) -> int {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::getPlayerScore(mce::UUID::fromString(uuid), obj).value_or(0);
|
||||||
if (auto result = GMLIB_Player::getPlayerScore(uid, obj)) {
|
|
||||||
return result.value();
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"addPlayerScore",
|
"addPlayerScore",
|
||||||
[](std::string const& uuid, std::string const& obj, int value) -> bool {
|
[](std::string const& uuid, std::string const& obj, int value) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::setPlayerScore(mce::UUID::fromString(uuid), obj, value, PlayerScoreSetFunction::Add)
|
||||||
if (auto res = GMLIB_Player::setPlayerScore(uid, obj, value, PlayerScoreSetFunction::Add)) {
|
.has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"reducePlayerScore",
|
"reducePlayerScore",
|
||||||
[](std::string const& uuid, std::string const& obj, int value) -> bool {
|
[](std::string const& uuid, std::string const& obj, int value) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::setPlayerScore(
|
||||||
if (auto res = GMLIB_Player::setPlayerScore(uid, obj, value, PlayerScoreSetFunction::Subtract)) {
|
mce::UUID::fromString(uuid),
|
||||||
return true;
|
obj,
|
||||||
}
|
value,
|
||||||
return false;
|
PlayerScoreSetFunction::Subtract
|
||||||
|
)
|
||||||
|
.has_value();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"setPlayerScore",
|
"setPlayerScore",
|
||||||
[](std::string const& uuid, std::string const& obj, int value) -> bool {
|
[](std::string const& uuid, std::string const& obj, int value) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::setPlayerScore(mce::UUID::fromString(uuid), obj, value).has_value();
|
||||||
if (auto res = GMLIB_Player::setPlayerScore(uid, obj, value)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "resetPlayerScore", [](std::string const& uuid, std::string const& obj) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "resetPlayerScore", [](std::string const& uuid, std::string const& obj) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::resetPlayerScore(mce::UUID::fromString(uuid), obj);
|
||||||
return GMLIB_Player::resetPlayerScore(uid, obj);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "resetPlayerScores", [](std::string const& uuid) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "resetPlayerScores", [](std::string const& uuid) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::resetPlayerScore(mce::UUID::fromString(uuid));
|
||||||
return GMLIB_Player::resetPlayerScore(uid);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"entityHasScore",
|
"entityHasScore",
|
||||||
[](std::string const& uniqueId, std::string const& obj) -> bool {
|
[](std::string const& uniqueId, std::string const& obj) -> bool {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()->getScore(obj, parseScriptUniqueID(uniqueId)).has_value();
|
||||||
if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, auid)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "getEntityScore", [](std::string const& uniqueId, std::string const& obj) -> int {
|
RemoteCall::exportAs("GMLIB_API", "getEntityScore", [](std::string const& uniqueId, std::string const& obj) -> int {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()->getScore(obj, parseScriptUniqueID(uniqueId)).value_or(0);
|
||||||
if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, auid)) {
|
|
||||||
return result.value();
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"addEntityScore",
|
"addEntityScore",
|
||||||
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
|
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()
|
||||||
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value, PlayerScoreSetFunction::Add)) {
|
->setScore(obj, parseScriptUniqueID(uniqueId), value, PlayerScoreSetFunction::Add)
|
||||||
return true;
|
.has_value();
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"reduceEntityScore",
|
"reduceEntityScore",
|
||||||
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
|
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()
|
||||||
if (auto res =
|
->setScore(obj, parseScriptUniqueID(uniqueId), value, PlayerScoreSetFunction::Subtract)
|
||||||
GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value, PlayerScoreSetFunction::Subtract)) {
|
.has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"setEntityScore",
|
"setEntityScore",
|
||||||
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
|
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()->setScore(obj, parseScriptUniqueID(uniqueId), value).has_value();
|
||||||
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"resetEntityScore",
|
"resetEntityScore",
|
||||||
[](std::string const& uniqueId, std::string const& obj) -> bool {
|
[](std::string const& uniqueId, std::string const& obj) -> bool {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()->resetScore(obj, parseScriptUniqueID(uniqueId));
|
||||||
return GMLIB_Scoreboard::getInstance()->resetScore(obj, auid);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "resetEntityScores", [](std::string const& uniqueId) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "resetEntityScores", [](std::string const& uniqueId) -> bool {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return GMLIB_Scoreboard::getInstance()->resetScore(parseScriptUniqueID(uniqueId));
|
||||||
return GMLIB_Scoreboard::getInstance()->resetScore(auid);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"fakePlayerHasScore",
|
"fakePlayerHasScore",
|
||||||
[](std::string const& name, std::string const& obj) -> bool {
|
[](std::string const& name, std::string const& obj) -> bool {
|
||||||
if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, name)) {
|
return GMLIB_Scoreboard::getInstance()->getScore(obj, name).has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "getFakePlayerScore", [](std::string const& name, std::string const& obj) -> int {
|
RemoteCall::exportAs("GMLIB_API", "getFakePlayerScore", [](std::string const& name, std::string const& obj) -> int {
|
||||||
if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, name)) {
|
return GMLIB_Scoreboard::getInstance()->getScore(obj, name).value_or(0);
|
||||||
return result.value();
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"addFakePlayerScore",
|
"addFakePlayerScore",
|
||||||
[](std::string const& name, std::string const& obj, int value) -> bool {
|
[](std::string const& name, std::string const& obj, int value) -> bool {
|
||||||
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Add)) {
|
return GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Add).has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"reduceFakePlayerScore",
|
"reduceFakePlayerScore",
|
||||||
[](std::string const& name, std::string const& obj, int value) -> bool {
|
[](std::string const& name, std::string const& obj, int value) -> bool {
|
||||||
if (auto res =
|
return GMLIB_Scoreboard::getInstance()
|
||||||
GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Subtract)) {
|
->setScore(obj, name, value, PlayerScoreSetFunction::Subtract)
|
||||||
return true;
|
.has_value();
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"setFakePlayerScore",
|
"setFakePlayerScore",
|
||||||
[](std::string const& name, std::string const& obj, int value) -> bool {
|
[](std::string const& name, std::string const& obj, int value) -> bool {
|
||||||
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, name, value)) {
|
return GMLIB_Scoreboard::getInstance()->setScore(obj, name, value).has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -408,26 +338,17 @@ void Export_Compatibility_API() {
|
|||||||
return GMLIB_Scoreboard::getInstance()->resetScore(name);
|
return GMLIB_Scoreboard::getInstance()->resetScore(name);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string const& obj) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string const& obj) -> bool {
|
||||||
if (auto res = GMLIB_Scoreboard::getInstance()->addObjective(obj)) {
|
return GMLIB_Scoreboard::getInstance()->addObjective(obj).has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"addObjectiveWithDisplayName",
|
"addObjectiveWithDisplayName",
|
||||||
[](std::string const& obj, std::string const& displayName) -> bool {
|
[](std::string const& obj, std::string const& displayName) -> bool {
|
||||||
if (auto res = GMLIB_Scoreboard::getInstance()->addObjective(obj, displayName)) {
|
return GMLIB_Scoreboard::getInstance()->addObjective(obj, displayName).has_value();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string const& obj) -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string const& obj) -> std::string {
|
||||||
if (auto result = GMLIB_Scoreboard::getInstance()->getObjectiveDisplayName(obj)) {
|
return GMLIB_Scoreboard::getInstance()->getObjectiveDisplayName(obj).value_or("");
|
||||||
return result.value();
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
@@ -450,33 +371,29 @@ void Export_Compatibility_API() {
|
|||||||
return GMLIB_Scoreboard::getInstance()->clearObjectiveDisplay(slot);
|
return GMLIB_Scoreboard::getInstance()->clearObjectiveDisplay(slot);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getAllObjectives", []() -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getAllObjectives", []() -> std::vector<std::string> {
|
||||||
auto objs = GMLIB_Scoreboard::getInstance()->getObjectives();
|
|
||||||
std::vector<std::string> result;
|
std::vector<std::string> result;
|
||||||
for (auto& obj : objs) {
|
for (auto& obj : GMLIB_Scoreboard::getInstance()->getObjectives()) {
|
||||||
result.push_back(obj->getName());
|
result.push_back(obj->getName());
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardPlayers", []() -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardPlayers", []() -> std::vector<std::string> {
|
||||||
auto uuids = GMLIB_Scoreboard::getInstance()->getAllPlayerUuids();
|
|
||||||
std::vector<std::string> result;
|
std::vector<std::string> result;
|
||||||
for (auto& uuid : uuids) {
|
for (auto& uuid : GMLIB_Scoreboard::getInstance()->getAllPlayerUuids()) {
|
||||||
result.push_back(uuid.asString());
|
result.push_back(uuid.asString());
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardFakePlayers", []() -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardFakePlayers", []() -> std::vector<std::string> {
|
||||||
auto names = GMLIB_Scoreboard::getInstance()->getAllFakePlayers();
|
|
||||||
std::vector<std::string> result;
|
std::vector<std::string> result;
|
||||||
for (auto& name : names) {
|
for (auto& name : GMLIB_Scoreboard::getInstance()->getAllFakePlayers()) {
|
||||||
result.push_back(name);
|
result.push_back(name);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardEntities", []() -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardEntities", []() -> std::vector<std::string> {
|
||||||
auto uniqueIds = GMLIB_Scoreboard::getInstance()->getAllEntities();
|
|
||||||
std::vector<std::string> result;
|
std::vector<std::string> result;
|
||||||
for (auto& uniqueId : uniqueIds) {
|
for (auto& uniqueId : GMLIB_Scoreboard::getInstance()->getAllEntities()) {
|
||||||
result.push_back(std::to_string(uniqueId.id));
|
result.push_back(std::to_string(uniqueId.id));
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@@ -486,26 +403,23 @@ void Export_Compatibility_API() {
|
|||||||
"getAllTrackedTargets",
|
"getAllTrackedTargets",
|
||||||
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
|
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
|
||||||
std::vector<std::unordered_map<std::string, std::string>> result;
|
std::vector<std::unordered_map<std::string, std::string>> result;
|
||||||
auto uuids = GMLIB_Scoreboard::getInstance()->getAllPlayerUuids();
|
for (auto& uuid : GMLIB_Scoreboard::getInstance()->getAllPlayerUuids()) {
|
||||||
for (auto& uuid : uuids) {
|
result.push_back({
|
||||||
std::unordered_map<std::string, std::string> data;
|
{"Type", "Player" },
|
||||||
data["Type"] = "Player";
|
{"Uuid", uuid.asString()}
|
||||||
data["Uuid"] = uuid.asString();
|
});
|
||||||
result.push_back(data);
|
|
||||||
}
|
}
|
||||||
auto names = GMLIB_Scoreboard::getInstance()->getAllFakePlayers();
|
for (auto& name : GMLIB_Scoreboard::getInstance()->getAllFakePlayers()) {
|
||||||
for (auto& name : names) {
|
result.push_back({
|
||||||
std::unordered_map<std::string, std::string> data;
|
{"Type", "FakePlayer"},
|
||||||
data["Type"] = "FakePlayer";
|
{"Name", name }
|
||||||
data["Name"] = name;
|
});
|
||||||
result.push_back(data);
|
|
||||||
}
|
}
|
||||||
auto uniqueIds = GMLIB_Scoreboard::getInstance()->getAllEntities();
|
for (auto& uniqueId : GMLIB_Scoreboard::getInstance()->getAllEntities()) {
|
||||||
for (auto& uniqueId : uniqueIds) {
|
result.push_back({
|
||||||
std::unordered_map<std::string, std::string> data;
|
{"Type", "Entity" },
|
||||||
data["Type"] = "Entity";
|
{"UniqueId", std::to_string(uniqueId.id)}
|
||||||
data["UniqueId"] = std::to_string(uniqueId.id);
|
});
|
||||||
result.push_back(data);
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -514,35 +428,28 @@ void Export_Compatibility_API() {
|
|||||||
return ll::service::getLevel()->getPlayer(mce::UUID::fromString(uuid));
|
return ll::service::getLevel()->getPlayer(mce::UUID::fromString(uuid));
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUniqueId", [](std::string const& uniqueId) -> Actor* {
|
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUniqueId", [](std::string const& uniqueId) -> Actor* {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return ll::service::getLevel()->getPlayer(parseScriptUniqueID(uniqueId));
|
||||||
return ll::service::getLevel()->getPlayer(auid);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getEntityFromUniqueId", [](std::string const& uniqueId) -> Actor* {
|
RemoteCall::exportAs("GMLIB_API", "getEntityFromUniqueId", [](std::string const& uniqueId) -> Actor* {
|
||||||
auto auid = parseScriptUniqueID(uniqueId);
|
return ll::service::getLevel()->fetchEntity(parseScriptUniqueID(uniqueId));
|
||||||
return ll::service::getLevel()->fetchEntity(auid);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getWorldSpawn", []() -> std::pair<BlockPos, int> {
|
RemoteCall::exportAs("GMLIB_API", "getWorldSpawn", []() -> std::pair<BlockPos, int> {
|
||||||
return {GMLIB_Level::getInstance()->getWorldSpawn(), 0};
|
return {GMLIB_Level::getInstance()->getWorldSpawn(), 0};
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "setWorldSpawn", [](std::pair<BlockPos, int> pos) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "setWorldSpawn", [](std::pair<BlockPos, int> pos) -> bool {
|
||||||
if (pos.second != 0) {
|
if (pos.second != 0) return false;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
GMLIB_Level::getInstance()->setWorldSpawn(pos.first);
|
GMLIB_Level::getInstance()->setWorldSpawn(pos.first);
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getPlayerSpawnPoint", [](Player* pl) -> std::pair<BlockPos, int> {
|
RemoteCall::exportAs("GMLIB_API", "getPlayerSpawnPoint", [](Player* pl) -> std::pair<BlockPos, int> {
|
||||||
auto player = (GMLIB_Player*)pl;
|
auto res = ((GMLIB_Player*)pl)->getSpawnPoint();
|
||||||
auto res = player->getSpawnPoint();
|
|
||||||
return {res.first, res.second};
|
return {res.first, res.second};
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "setPlayerSpawnPoint", [](Player* pl, std::pair<BlockPos, int> pos) -> void {
|
RemoteCall::exportAs("GMLIB_API", "setPlayerSpawnPoint", [](Player* pl, std::pair<BlockPos, int> pos) -> void {
|
||||||
auto player = (GMLIB_Player*)pl;
|
((GMLIB_Player*)pl)->setSpawnPoint(pos.first, pos.second);
|
||||||
player->setSpawnPoint(pos.first, pos.second);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "clearPlayerSpawnPoint", [](Player* pl) -> void {
|
RemoteCall::exportAs("GMLIB_API", "clearPlayerSpawnPoint", [](Player* pl) -> void {
|
||||||
auto player = (GMLIB_Player*)pl;
|
((GMLIB_Player*)pl)->clearSpawnPoint();
|
||||||
player->clearSpawnPoint();
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
@@ -555,55 +462,46 @@ void Export_Compatibility_API() {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string const& uuid) -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string const& uuid) -> std::string {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB::UserCache::getXuidByUuid(mce::UUID::fromString(uuid)).value_or("");
|
||||||
auto result = UserCache::getXuidByUuid(uid);
|
|
||||||
return result ? result.value() : "";
|
|
||||||
});
|
|
||||||
RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string const& uuid) -> std::string {
|
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
|
||||||
auto result = UserCache::getNameByUuid(uid);
|
|
||||||
return result ? result.value() : "";
|
|
||||||
});
|
|
||||||
RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
|
|
||||||
auto result = UserCache::getUuidByXuid(xuid);
|
|
||||||
return result ? result.value().asString() : "";
|
|
||||||
});
|
|
||||||
RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
|
|
||||||
auto result = UserCache::getNameByXuid(xuid);
|
|
||||||
return result ? result.value() : "";
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
|
||||||
auto result = UserCache::getXuidByName(name);
|
return GMLIB::UserCache::getXuidByName(name).value_or("");
|
||||||
return result ? result.value() : "";
|
});
|
||||||
|
RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string const& uuid) -> std::string {
|
||||||
|
return GMLIB::UserCache::getNameByUuid(mce::UUID::fromString(uuid)).value_or("");
|
||||||
|
});
|
||||||
|
RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
|
||||||
|
return GMLIB::UserCache::getNameByXuid(xuid).value_or("");
|
||||||
|
});
|
||||||
|
RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
|
||||||
|
return GMLIB::UserCache::getUuidByXuid(xuid)
|
||||||
|
.transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); })
|
||||||
|
.value_or("");
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
|
||||||
auto result = UserCache::getUuidByName(name);
|
return GMLIB::UserCache::getUuidByName(name)
|
||||||
return result ? result.value().asString() : "";
|
.transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); })
|
||||||
});
|
.value_or("");
|
||||||
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
|
|
||||||
auto result = UserCache::getUuidByName(name);
|
|
||||||
return result ? result.value().asString() : "";
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"getAllPlayerInfo",
|
"getAllPlayerInfo",
|
||||||
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
|
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
|
||||||
std::vector<std::unordered_map<std::string, std::string>> result;
|
std::vector<std::unordered_map<std::string, std::string>> result;
|
||||||
UserCache::forEach([&result](const UserCache::UserCacheEntry& entry) {
|
GMLIB::UserCache::forEach([&result](const GMLIB::UserCache::UserCacheEntry& entry) -> void {
|
||||||
std::unordered_map<std::string, std::string> info;
|
result.push_back({
|
||||||
info["Name"] = entry.mName;
|
{"Name", entry.mName },
|
||||||
info["Xuid"] = entry.mXuid;
|
{"Xuid", entry.mXuid },
|
||||||
info["Uuid"] = entry.mUuid.asString();
|
{"Uuid", entry.mUuid.asString()}
|
||||||
result.push_back(info);
|
});
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "getBlockRuntimeId", [](std::string const& blockName, short legacyData) -> uint {
|
RemoteCall::exportAs("GMLIB_API", "getBlockRuntimeId", [](std::string const& blockName, short legacyData) -> uint {
|
||||||
if (auto block = Block::tryGetFromRegistry(blockName, legacyData)) {
|
return Block::tryGetFromRegistry(blockName, legacyData)
|
||||||
return block->getRuntimeId();
|
.transform([](const Block& block) -> uint { return block.getRuntimeId(); })
|
||||||
}
|
.value_or(0);
|
||||||
return 0;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKey", [](Block const* block) -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKey", [](Block const* block) -> std::string {
|
||||||
return block->buildDescriptionId();
|
return block->buildDescriptionId();
|
||||||
@@ -676,55 +574,57 @@ void Export_Compatibility_API() {
|
|||||||
return player->pullInEntity(*entity);
|
return player->pullInEntity(*entity);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKeyFromName", [](std::string const& blockName) -> std::string {
|
RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKeyFromName", [](std::string const& blockName) -> std::string {
|
||||||
if (auto block = Block::tryGetFromRegistry(blockName)) {
|
return Block::tryGetFromRegistry(blockName)
|
||||||
return block->buildDescriptionId();
|
.transform([](const Block& block) -> std::string { return block.buildDescriptionId(); })
|
||||||
}
|
.value_or("tile.unknown.name");
|
||||||
return "tile.unknown.name";
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"getBlockLightEmission",
|
"getBlockLightEmission",
|
||||||
[](std::string const& blockName, short legacyData) -> char {
|
[](std::string const& blockName, short legacyData) -> char {
|
||||||
if (auto block = Block::tryGetFromRegistry(blockName, legacyData)) {
|
return Block::tryGetFromRegistry(blockName)
|
||||||
return (char)block->getLightEmission().value;
|
.transform([](const Block& block) -> char { return (char)block.getLightEmission().value; })
|
||||||
}
|
.value_or(-1);
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"getGameRules",
|
"getGameRules",
|
||||||
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
|
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
|
||||||
auto gameRules = ll::service::getLevel()->getGameRules().getRules();
|
|
||||||
std::vector<std::unordered_map<std::string, std::string>> result;
|
std::vector<std::unordered_map<std::string, std::string>> result;
|
||||||
for (auto& gameRule : gameRules) {
|
for (auto& gameRule : ll::service::getLevel()->getGameRules().getRules()) {
|
||||||
std::unordered_map<std::string, std::string> data;
|
|
||||||
data["Name"] = gameRule.getName();
|
|
||||||
switch (gameRule.getType()) {
|
switch (gameRule.getType()) {
|
||||||
case GameRule::Type::Bool:
|
case GameRule::Type::Bool:
|
||||||
data["Type"] = "Bool";
|
result.push_back({
|
||||||
data["Value"] = std::to_string(gameRule.getBool());
|
{"Name", gameRule.getName() },
|
||||||
|
{"Type", "Bool" },
|
||||||
|
{"Value", std::to_string(gameRule.getBool())}
|
||||||
|
});
|
||||||
break;
|
break;
|
||||||
case GameRule::Type::Float:
|
case GameRule::Type::Float:
|
||||||
data["Type"] = "Float";
|
result.push_back({
|
||||||
data["Value"] = std::to_string(gameRule.getFloat());
|
{"Name", gameRule.getName() },
|
||||||
|
{"Type", "Float" },
|
||||||
|
{"Value", std::to_string(gameRule.getFloat())}
|
||||||
|
});
|
||||||
break;
|
break;
|
||||||
case GameRule::Type::Int:
|
case GameRule::Type::Int:
|
||||||
data["Type"] = "Int";
|
result.push_back({
|
||||||
data["Value"] = std::to_string(gameRule.getInt());
|
{"Name", gameRule.getName() },
|
||||||
|
{"Type", "Int" },
|
||||||
|
{"Value", std::to_string(gameRule.getInt())}
|
||||||
|
});
|
||||||
break;
|
break;
|
||||||
case GameRule::Type::Invalid:
|
case GameRule::Type::Invalid:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
result.push_back(data);
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "getLegalEnchants", [](ItemStack const* item) -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getLegalEnchants", [](ItemStack const* item) -> std::vector<std::string> {
|
||||||
std::vector<int> enchants = EnchantUtils::getLegalEnchants(item->getItem());
|
|
||||||
std::vector<std::string> result;
|
std::vector<std::string> result;
|
||||||
for (auto& enchant : enchants) {
|
for (auto& enchant : EnchantUtils::getLegalEnchants(item->getItem())) {
|
||||||
result.push_back(Enchant::getEnchant((Enchant::Type)enchant)->getStringId());
|
result.push_back(Enchant::getEnchant((Enchant::Type)enchant)->getStringId());
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@@ -738,29 +638,23 @@ void Export_Compatibility_API() {
|
|||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
"applyEnchant",
|
"applyEnchant",
|
||||||
[](ItemStack const* item, std::string const& typeName, int level, bool allowNonVanilla) -> bool {
|
[](ItemStack* item, std::string const& typeName, int level, bool allowNonVanilla) -> bool {
|
||||||
return EnchantUtils::applyEnchant(
|
return EnchantUtils::applyEnchant(
|
||||||
*(const_cast<ItemStack*>(item)),
|
*item,
|
||||||
Enchant::getEnchantTypeFromName(HashedString(typeName)),
|
Enchant::getEnchantTypeFromName(HashedString(typeName)),
|
||||||
level,
|
level,
|
||||||
allowNonVanilla
|
allowNonVanilla
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack const* item) -> void {
|
RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void {
|
||||||
EnchantUtils::removeEnchants((ItemStack&)*item);
|
EnchantUtils::removeEnchants(*item);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "hasEnchant", [](ItemStack const* item, std::string const& typeName) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "hasEnchant", [](ItemStack* item, std::string const& typeName) -> bool {
|
||||||
return EnchantUtils::hasEnchant(
|
return EnchantUtils::hasEnchant(Enchant::getEnchantTypeFromName(HashedString(typeName)), *item);
|
||||||
Enchant::getEnchantTypeFromName(HashedString(typeName)),
|
|
||||||
*(const_cast<ItemStack*>(item))
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getEnchantLevel", [](ItemStack const* item, std::string const& typeName) -> int {
|
RemoteCall::exportAs("GMLIB_API", "getEnchantLevel", [](ItemStack* item, std::string const& typeName) -> int {
|
||||||
return EnchantUtils::getEnchantLevel(
|
return EnchantUtils::getEnchantLevel(Enchant::getEnchantTypeFromName(HashedString(typeName)), *item);
|
||||||
Enchant::getEnchantTypeFromName(HashedString(typeName)),
|
|
||||||
*(const_cast<ItemStack*>(item))
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_API",
|
||||||
@@ -804,8 +698,8 @@ void Export_Compatibility_API() {
|
|||||||
RemoteCall::exportAs("GMLIB_API", "getItemRepairCost", [](ItemStack const* item) -> int {
|
RemoteCall::exportAs("GMLIB_API", "getItemRepairCost", [](ItemStack const* item) -> int {
|
||||||
return item->getBaseRepairCost();
|
return item->getBaseRepairCost();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "setItemRepairCost", [](ItemStack const* item, int cost) -> void {
|
RemoteCall::exportAs("GMLIB_API", "setItemRepairCost", [](ItemStack* item, int cost) -> void {
|
||||||
(*(const_cast<ItemStack*>(item))).setRepairCost(cost);
|
(*item).setRepairCost(cost);
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getItemCanDestroy", [](ItemStack const* item) -> std::vector<std::string> {
|
RemoteCall::exportAs("GMLIB_API", "getItemCanDestroy", [](ItemStack const* item) -> std::vector<std::string> {
|
||||||
std::vector<std::string> result = {};
|
std::vector<std::string> result = {};
|
||||||
@@ -879,8 +773,7 @@ void Export_Compatibility_API() {
|
|||||||
return magic_enum::enum_name(container->getContainerType()).data();
|
return magic_enum::enum_name(container->getContainerType()).data();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool {
|
RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool {
|
||||||
auto uid = mce::UUID::fromString(uuid);
|
return GMLIB_Player::getPlayerNbt(mce::UUID::fromString(uuid)) != nullptr;
|
||||||
return GMLIB_Player::getPlayerNbt(uid) ? true : false;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getItemMaxCount", [](ItemStack const* item) -> int {
|
RemoteCall::exportAs("GMLIB_API", "getItemMaxCount", [](ItemStack const* item) -> int {
|
||||||
return item->getMaxStackSize();
|
return item->getMaxStackSize();
|
||||||
@@ -937,10 +830,9 @@ void Export_Compatibility_API() {
|
|||||||
return entity->hasEffect(*MobEffect::getById(effectId));
|
return entity->hasEffect(*MobEffect::getById(effectId));
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getGameDifficulty", []() -> int {
|
RemoteCall::exportAs("GMLIB_API", "getGameDifficulty", []() -> int {
|
||||||
if (auto level = ll::service::getLevel()) {
|
return ll::service::getLevel().transform(
|
||||||
return (int)level->getDifficulty();
|
[](Level& level) -> int { return (int)level.getDifficulty(); }
|
||||||
}
|
).value_or(-1);
|
||||||
return -1;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "setGameDifficulty", [](int difficulty) -> void {
|
RemoteCall::exportAs("GMLIB_API", "setGameDifficulty", [](int difficulty) -> void {
|
||||||
if (auto level = ll::service::getLevel()) {
|
if (auto level = ll::service::getLevel()) {
|
||||||
@@ -948,14 +840,42 @@ void Export_Compatibility_API() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "getDefaultGameMode", []() -> int {
|
RemoteCall::exportAs("GMLIB_API", "getDefaultGameMode", []() -> int {
|
||||||
if (auto level = ll::service::getLevel()) {
|
return ll::service::getLevel().transform(
|
||||||
return (int)level->getDefaultGameType();
|
[](Level& level) -> int { return (int)level.getDefaultGameType(); }
|
||||||
}
|
).value_or(-1);
|
||||||
return -1;
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLIB_API", "setDefaultGameMode", [](int gameMode) -> void {
|
RemoteCall::exportAs("GMLIB_API", "setDefaultGameMode", [](int gameMode) -> void {
|
||||||
if (auto level = ll::service::getLevel()) {
|
if (auto level = ll::service::getLevel()) {
|
||||||
level->setDefaultGameType((GameType)gameMode);
|
level->setDefaultGameType((GameType)gameMode);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
RemoteCall::exportAs(
|
||||||
|
"GMLIB_API",
|
||||||
|
"registerCustomShapelessRecipe",
|
||||||
|
[](std::string const& recipe_id, std::vector<std::string> ingredients, ItemStack* result) -> void {
|
||||||
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
|
std::vector<Recipes::Type> types;
|
||||||
|
char rt = 'A';
|
||||||
|
for (auto& ing : ingredients) {
|
||||||
|
types.emplace_back(ing, rt++, 1, 0);
|
||||||
|
}
|
||||||
|
GMLIB::Mod::CustomRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, *result);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
RemoteCall::exportAs(
|
||||||
|
"GMLIB_API",
|
||||||
|
"registerCustomShapedRecipe",
|
||||||
|
[](std::string const& recipe_id,
|
||||||
|
std::vector<std::string> shape,
|
||||||
|
std::vector<std::string> ingredients,
|
||||||
|
ItemStack* result) -> void {
|
||||||
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
|
std::vector<Recipes::Type> types;
|
||||||
|
char rt = 'A';
|
||||||
|
for (auto& ing : ingredients) {
|
||||||
|
types.emplace_back(ing, rt++, 1, 0);
|
||||||
|
}
|
||||||
|
GMLIB::Mod::CustomRecipe::registerShapedCraftingTableRecipe(recipe_id, shape, types, *result);
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
+6
-4
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
ll::Logger logger(PLUGIN_NAME);
|
ll::Logger logger(PLUGIN_NAME);
|
||||||
|
|
||||||
namespace GMLIB {
|
namespace gmlib {
|
||||||
|
|
||||||
std::unique_ptr<LegacyRemoteCallApi>& LegacyRemoteCallApi::getInstance() {
|
std::unique_ptr<LegacyRemoteCallApi>& LegacyRemoteCallApi::getInstance() {
|
||||||
static std::unique_ptr<LegacyRemoteCallApi> instance;
|
static std::unique_ptr<LegacyRemoteCallApi> instance;
|
||||||
@@ -16,10 +16,12 @@ bool LegacyRemoteCallApi::load() {
|
|||||||
Export_Compatibility_API();
|
Export_Compatibility_API();
|
||||||
ExportPAPI();
|
ExportPAPI();
|
||||||
Export_Event_API();
|
Export_Event_API();
|
||||||
|
Export_BinaryStream_API();
|
||||||
|
// Export_Form_API();
|
||||||
logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
|
logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
|
||||||
logger.info(
|
logger.info(
|
||||||
"Loaded Version: {} with {}",
|
"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())
|
fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-" + LIB_VERSION.asString())
|
||||||
);
|
);
|
||||||
logger.info("Author: GroupMountain");
|
logger.info("Author: GroupMountain");
|
||||||
@@ -31,6 +33,6 @@ bool LegacyRemoteCallApi::enable() { return true; }
|
|||||||
|
|
||||||
bool LegacyRemoteCallApi::disable() { 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());
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
#include <ll/api/mod/NativeMod.h>
|
#include <ll/api/mod/NativeMod.h>
|
||||||
#include <ll/api/mod/RegisterHelper.h>
|
#include <ll/api/mod/RegisterHelper.h>
|
||||||
|
|
||||||
namespace GMLIB {
|
namespace gmlib {
|
||||||
|
|
||||||
class LegacyRemoteCallApi {
|
class LegacyRemoteCallApi {
|
||||||
|
|
||||||
@@ -30,4 +30,4 @@ private:
|
|||||||
ll::mod::NativeMod& mSelf;
|
ll::mod::NativeMod& mSelf;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace GMLIB
|
} // namespace gmlib
|
||||||
|
|||||||
+185
-269
@@ -1,271 +1,206 @@
|
|||||||
#include "Global.h"
|
#include "Global.h"
|
||||||
using namespace ll::hash_utils;
|
using namespace ll::hash_utils;
|
||||||
|
|
||||||
|
class LegacyScriptEventManager {
|
||||||
|
private:
|
||||||
|
int64 mNextEventId = 0;
|
||||||
|
std::unordered_map<uint64, ll::event::ListenerPtr> mEventListeners;
|
||||||
|
|
||||||
|
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)] = std::move(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>();
|
||||||
|
}
|
||||||
|
return *instance;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#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); \
|
||||||
|
return; \
|
||||||
|
} \
|
||||||
|
bool result = true; \
|
||||||
|
try { \
|
||||||
|
otherFunction; \
|
||||||
|
result = RemoteCall::importAs<bool callFunction>(eventName, eventId) eventParams; \
|
||||||
|
} catch (...) {} \
|
||||||
|
if (!result) cancelFunction; \
|
||||||
|
}) \
|
||||||
|
); \
|
||||||
|
return true;
|
||||||
|
|
||||||
void Export_Event_API() {
|
void Export_Event_API() {
|
||||||
auto eventBus = &ll::event::EventBus::getInstance();
|
RemoteCall::exportAs("GMLIB_Event_API", "getNextScriptEventId", []() -> std::string {
|
||||||
|
return LegacyScriptEventManager::getInstance().getNextEventId();
|
||||||
|
});
|
||||||
|
auto& eventBus = ll::event::EventBus::getInstance();
|
||||||
|
auto& eventManager = LegacyScriptEventManager::getInstance();
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
"GMLIB_API",
|
"GMLIB_Event_API",
|
||||||
"callCustomEvent",
|
"callCustomEvent",
|
||||||
[eventBus](std::string const& eventName, std::string const& eventId) -> bool {
|
[&eventBus, &eventManager](std::string const& eventName, std::string const& eventId) -> bool {
|
||||||
if (!RemoteCall::hasFunc(eventName, eventId)) return false;
|
if (!RemoteCall::hasFunc(eventName, eventId)) return false;
|
||||||
switch (doHash(eventName)) {
|
switch (doHash(eventName)) {
|
||||||
case doHash("onClientLogin"): {
|
case doHash("onClientLogin"): {
|
||||||
auto Call = RemoteCall::importAs<bool(
|
REGISTER_EVENT_LISTEN(
|
||||||
std::string const& realName,
|
GMLIB::Event::PacketEvent::ClientLoginAfterEvent,
|
||||||
|
(std::string const& realName,
|
||||||
std::string const& uuid,
|
std::string const& uuid,
|
||||||
std::string const& serverXuid,
|
std::string const& serverXuid,
|
||||||
std::string const& clientXuid
|
std::string const& clientXuid),
|
||||||
)>(eventName, eventId);
|
(ev.getRealName(), ev.getUuid().asString(), ev.getServerAuthXuid(), ev.getClientAuthXuid()),
|
||||||
eventBus->emplaceListener<Event::PacketEvent::ClientLoginAfterEvent>(
|
logger.error("Event \"onClientLogin\" cannot be intercepted"),
|
||||||
[Call](Event::PacketEvent::ClientLoginAfterEvent& ev) {
|
)
|
||||||
try {
|
|
||||||
Call(
|
|
||||||
ev.getRealName(),
|
|
||||||
ev.getUuid().asString(),
|
|
||||||
ev.getServerAuthXuid(),
|
|
||||||
ev.getClientAuthXuid()
|
|
||||||
);
|
|
||||||
} catch (...) {}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onWeatherChange"): {
|
case doHash("onWeatherChange"): {
|
||||||
auto Call =
|
REGISTER_EVENT_LISTEN(
|
||||||
RemoteCall::importAs<bool(int lightningLevel, int rainLevel, int lightningLast, int rainLast)>(
|
GMLIB::Event::LevelEvent::WeatherUpdateBeforeEvent,
|
||||||
eventName,
|
(int lightningLevel, int rainLevel, int lightningLast, int rainLast),
|
||||||
eventId
|
(ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()),
|
||||||
);
|
ev.cancel(),
|
||||||
eventBus->emplaceListener<Event::LevelEvent::WeatherUpdateBeforeEvent>(
|
)
|
||||||
[Call](Event::LevelEvent::WeatherUpdateBeforeEvent& ev) {
|
|
||||||
bool result = true;
|
|
||||||
try {
|
|
||||||
result = Call(
|
|
||||||
ev.getLightningLevel(),
|
|
||||||
ev.getRainLevel(),
|
|
||||||
ev.getLightningLastTick(),
|
|
||||||
ev.getRainingLastTick()
|
|
||||||
);
|
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onMobPick"): {
|
case doHash("onMobPick"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * mob, Actor * item)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::EntityEvent::MobPickupItemBeforeEvent>(
|
GMLIB::Event::EntityEvent::MobPickupItemBeforeEvent,
|
||||||
[Call](Event::EntityEvent::MobPickupItemBeforeEvent& ev) {
|
(Actor * mob, Actor * item),
|
||||||
bool result = true;
|
(&ev.self(), (Actor*)&ev.getItemActor()),
|
||||||
try {
|
ev.cancel(),
|
||||||
result = Call(&ev.self(), (Actor*)&ev.getItemActor());
|
)
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onItemTrySpawn"): {
|
case doHash("onItemTrySpawn"): {
|
||||||
auto Call =
|
REGISTER_EVENT_LISTEN(
|
||||||
RemoteCall::importAs<bool(const ItemStack* item, std::pair<Vec3, int> position, Actor* spawner)>(
|
GMLIB::Event::EntityEvent::ItemActorSpawnBeforeEvent,
|
||||||
eventName,
|
(const ItemStack* item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
|
||||||
eventId
|
(&ev.getItem(),
|
||||||
);
|
{ev.getPosition(), ev.getBlockSource().getDimensionId().id},
|
||||||
eventBus->emplaceListener<Event::EntityEvent::ItemActorSpawnBeforeEvent>(
|
ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
|
||||||
[Call](Event::EntityEvent::ItemActorSpawnBeforeEvent& ev) {
|
ev.cancel(),
|
||||||
auto pos = ev.getPosition();
|
)
|
||||||
auto dimid = ev.getBlockSource().getDimensionId().id;
|
|
||||||
std::pair<Vec3, int> lsePos = {pos, dimid};
|
|
||||||
bool result = true;
|
|
||||||
try {
|
|
||||||
result = Call(&ev.getItem(), lsePos, ev.getSpawner());
|
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onItemSpawned"): {
|
case doHash("onItemSpawned"): {
|
||||||
auto Call = RemoteCall::importAs<
|
REGISTER_EVENT_LISTEN(
|
||||||
bool(const ItemStack* item, Actor* itemActor, std::pair<Vec3, int> position, Actor* spawner)>(
|
GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent,
|
||||||
eventName,
|
(const ItemStack* item, Actor* itemActor, std::pair<Vec3, int> position, int64 spawnerUniqueId),
|
||||||
eventId
|
(&ev.getItem(),
|
||||||
);
|
(Actor*)&ev.getItemActor(),
|
||||||
eventBus->emplaceListener<Event::EntityEvent::ItemActorSpawnAfterEvent>(
|
{ev.getPosition(), ev.getBlockSource().getDimensionId().id},
|
||||||
[Call](Event::EntityEvent::ItemActorSpawnAfterEvent& ev) {
|
ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
|
||||||
auto pos = ev.getPosition();
|
logger.error("Event \"onItemSpawned\" cannot be intercepted"),
|
||||||
auto dimid = ev.getBlockSource().getDimensionId().id;
|
)
|
||||||
std::pair<Vec3, int> lsePos = {pos, dimid};
|
|
||||||
try {
|
|
||||||
Call(&ev.getItem(), (Actor*)&ev.getItemActor(), lsePos, ev.getSpawner());
|
|
||||||
} catch (...) {}
|
|
||||||
}
|
}
|
||||||
);
|
case doHash("onEntityTryChangeDim"): {
|
||||||
return true;
|
REGISTER_EVENT_LISTEN(
|
||||||
}
|
GMLIB::Event::EntityEvent::ActorChangeDimensionBeforeEvent,
|
||||||
case doHash("onEntityChangeDim"): {
|
(Actor * entity, int toDimId),
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * entity, int toDimId)>(eventName, eventId);
|
(&ev.self(), ev.getToDimensionId()),
|
||||||
eventBus->emplaceListener<Event::EntityEvent::ActorChangeDimensionBeforeEvent>(
|
ev.cancel(),
|
||||||
[Call](Event::EntityEvent::ActorChangeDimensionBeforeEvent& ev) {
|
)
|
||||||
bool result = true;
|
|
||||||
try {
|
|
||||||
result = Call(&ev.self(), ev.getToDimensionId());
|
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onLeaveBed"): {
|
case doHash("onLeaveBed"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Player * pl)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::PlayerEvent::PlayerStopSleepBeforeEvent>(
|
GMLIB::Event::PlayerEvent::PlayerStopSleepBeforeEvent,
|
||||||
[Call](Event::PlayerEvent::PlayerStopSleepBeforeEvent& ev) {
|
(Player * pl),
|
||||||
bool result = true;
|
(&ev.self()),
|
||||||
try {
|
ev.cancel(),
|
||||||
result = Call(&ev.self());
|
)
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onDeathMessage"): {
|
case doHash("onDeathMessage"): {
|
||||||
auto Call =
|
REGISTER_EVENT_LISTEN(
|
||||||
RemoteCall::importAs<bool(std::string const& message, std::vector<std::string>, Actor* dead)>(
|
GMLIB::Event::EntityEvent::DeathMessageAfterEvent,
|
||||||
eventName,
|
(std::string const& message, std::vector<std::string>, Actor* dead),
|
||||||
eventId
|
(ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()),
|
||||||
);
|
logger.error("Event \"onDeathMessage\" cannot be intercepted"),
|
||||||
eventBus->emplaceListener<Event::EntityEvent::DeathMessageAfterEvent>(
|
)
|
||||||
[Call](Event::EntityEvent::DeathMessageAfterEvent& ev) {
|
|
||||||
auto msg = ev.getDeathMessage();
|
|
||||||
auto source = ev.getDamageSource();
|
|
||||||
try {
|
|
||||||
Call(msg.first, msg.second, &ev.self());
|
|
||||||
} catch (...) {}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onMobHurted"): {
|
case doHash("onMobHurted"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * mob, Actor * source, float damage, int cause)>(
|
REGISTER_EVENT_LISTEN(
|
||||||
eventName,
|
GMLIB::Event::EntityEvent::MobHurtAfterEvent,
|
||||||
eventId
|
(Actor * mob, Actor * source, float damage, int cause),
|
||||||
);
|
(&ev.self(), source, ev.getDamage(), (int)damageSource.getCause()),
|
||||||
eventBus->emplaceListener<Event::EntityEvent::MobHurtAfterEvent>(
|
logger.error("Event \"onMobHurted\" cannot be intercepted"),
|
||||||
[Call](Event::EntityEvent::MobHurtAfterEvent& ev) {
|
|
||||||
auto& damageSource = ev.getSource();
|
auto& damageSource = ev.getSource();
|
||||||
Actor* source = nullptr;
|
Actor* source = nullptr;
|
||||||
if (damageSource.isEntitySource()) {
|
if (damageSource.isEntitySource()) {
|
||||||
auto uniqueId = damageSource.getDamagingEntityUniqueID();
|
auto uniqueId = damageSource.getDamagingEntityUniqueID();
|
||||||
source = ll::service::getLevel()->fetchEntity(uniqueId);
|
source = ll::service::getLevel()->fetchEntity(uniqueId);
|
||||||
if (source->getOwner()) {
|
if (source->getOwner()) source = source->getOwner();
|
||||||
source = source->getOwner();
|
|
||||||
}
|
}
|
||||||
}
|
)
|
||||||
try {
|
|
||||||
Call(&ev.self(), source, ev.getDamage(), (int)damageSource.getCause());
|
|
||||||
} catch (...) {}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onEndermanTake"): {
|
case doHash("onEndermanTake"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * mob)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::EntityEvent::EndermanTakeBlockBeforeEvent>(
|
GMLIB::Event::EntityEvent::EndermanTakeBlockBeforeEvent,
|
||||||
[Call](Event::EntityEvent::EndermanTakeBlockBeforeEvent& ev) {
|
(Actor * mob),
|
||||||
bool result = true;
|
(&ev.self()),
|
||||||
try {
|
ev.cancel(),
|
||||||
result = Call(&ev.self());
|
)
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
}
|
||||||
}
|
case doHash("onEntityChangeDim"): {
|
||||||
);
|
REGISTER_EVENT_LISTEN(
|
||||||
return true;
|
GMLIB::Event::EntityEvent::ActorChangeDimensionAfterEvent,
|
||||||
}
|
(Actor * mob, int fromDimId),
|
||||||
case doHash("onEntityChangeDimAfter"): {
|
(&ev.self(), ev.getFromDimensionId()),
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * mob, int fromDimId)>(eventName, eventId);
|
logger.error("Event \"onEntityChangeDim\" cannot be intercepted"),
|
||||||
eventBus->emplaceListener<Event::EntityEvent::ActorChangeDimensionAfterEvent>(
|
)
|
||||||
[Call](Event::EntityEvent::ActorChangeDimensionAfterEvent& ev) {
|
|
||||||
bool result = true;
|
|
||||||
try {
|
|
||||||
result = Call(&ev.self(), ev.getFromDimensionId());
|
|
||||||
} catch (...) {}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onDragonRespawn"): {
|
case doHash("onDragonRespawn"): {
|
||||||
auto Call = RemoteCall::importAs<bool(int64 enderDragonUniqueID)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::EntityEvent::DragonRespawnBeforeEvent>(
|
GMLIB::Event::EntityEvent::DragonRespawnBeforeEvent,
|
||||||
[Call](Event::EntityEvent::DragonRespawnBeforeEvent& ev) {
|
(int64 enderDragonUniqueID),
|
||||||
bool result = true;
|
(ev.getEnderDragon().id),
|
||||||
try {
|
ev.cancel(),
|
||||||
result = Call(ev.getEnderDragon().id);
|
)
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onProjectileTryCreate"): {
|
case doHash("onProjectileTryCreate"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * mob, int64 uniqueId)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::EntityEvent::ProjectileCreateBeforeEvent>(
|
GMLIB::Event::EntityEvent::ProjectileCreateBeforeEvent,
|
||||||
[Call](Event::EntityEvent::ProjectileCreateBeforeEvent& ev) {
|
(Actor * mob, int64 uniqueId),
|
||||||
bool result = true;
|
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
|
||||||
try {
|
ev.cancel(),
|
||||||
auto uid = ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1;
|
)
|
||||||
result = Call(&ev.self(), uid);
|
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onProjectileCreate"): {
|
case doHash("onProjectileCreate"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Actor * mob, int64 uniqueId)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::EntityEvent::ProjectileCreateAfterEvent>(
|
GMLIB::Event::EntityEvent::ProjectileCreateAfterEvent,
|
||||||
[Call](Event::EntityEvent::ProjectileCreateAfterEvent& ev) {
|
(Actor * mob, int64 uniqueId),
|
||||||
try {
|
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
|
||||||
auto uid = ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1;
|
logger.error("Event \"onProjectileCreate\" cannot be intercepted"),
|
||||||
Call(&ev.self(), uid);
|
)
|
||||||
} catch (...) {}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onSpawnWanderingTrader"): {
|
case doHash("onSpawnWanderingTrader"): {
|
||||||
auto Call = RemoteCall::importAs<bool(std::pair<BlockPos, int> pos)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::EntityEvent::SpawnWanderingTraderBeforeEvent>(
|
GMLIB::Event::EntityEvent::SpawnWanderingTraderBeforeEvent,
|
||||||
[Call](Event::EntityEvent::SpawnWanderingTraderBeforeEvent& ev) {
|
(std::pair<BlockPos, int> pos),
|
||||||
bool result = true;
|
({ev.getPos(), ev.getRegion().getDimensionId()}),
|
||||||
try {
|
ev.cancel(),
|
||||||
result = Call({ev.getPos(), ev.getRegion().getDimensionId()});
|
)
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onHandleRequestAction"): {
|
case doHash("onHandleRequestAction"): {
|
||||||
auto Call = RemoteCall::importAs<bool(
|
// clang-format off
|
||||||
|
REGISTER_EVENT_LISTEN(
|
||||||
|
GMLIB::Event::PlayerEvent::HandleRequestActionBeforeEvent,
|
||||||
|
(
|
||||||
Player * player,
|
Player * player,
|
||||||
std::string const& actionType,
|
std::string const& actionType,
|
||||||
int count,
|
int count,
|
||||||
@@ -273,57 +208,38 @@ void Export_Event_API() {
|
|||||||
int sourceSlot,
|
int sourceSlot,
|
||||||
std::string const& destinationContainerNetId,
|
std::string const& destinationContainerNetId,
|
||||||
int destinationSlot
|
int destinationSlot
|
||||||
)>(eventName, eventId);
|
),
|
||||||
eventBus->emplaceListener<Event::PlayerEvent::HandleRequestActionBeforeEvent>(
|
(
|
||||||
[Call](Event::PlayerEvent::HandleRequestActionBeforeEvent& ev) {
|
(Player*)&ev.self(),
|
||||||
bool result = true;
|
magic_enum::enum_name(requestAction.mActionType).data(),
|
||||||
try {
|
(int)requestAction.mAmount,
|
||||||
auto requestAction = (ItemStackRequestActionTransferBase*)&ev.getRequestAction();
|
magic_enum::enum_name(requestAction.mSrc.mOpenContainerNetId).data(),
|
||||||
auto source = requestAction->getSrc();
|
(int)requestAction.mSrc.mSlot,
|
||||||
// TODO: The next version of LeviLamina changes to a member function
|
magic_enum::enum_name(requestAction.mDst.mOpenContainerNetId).data(),
|
||||||
auto destination = ll::memory::dAccess<ItemStackRequestSlotInfo>(requestAction, 56);
|
(int)requestAction.mDst.mSlot
|
||||||
result = Call(
|
),
|
||||||
&ev.self(),
|
ev.cancel(),
|
||||||
magic_enum::enum_name(requestAction->mActionType).data(),
|
auto& requestAction = (ItemStackRequestActionTransferBase&)ev.getRequestAction();
|
||||||
ll::memory::dAccess<uchar>(requestAction, 18),
|
)
|
||||||
magic_enum::enum_name(source.mOpenContainerNetId).data(),
|
// clang-format on
|
||||||
source.mSlot,
|
|
||||||
magic_enum::enum_name(destination.mOpenContainerNetId).data(),
|
|
||||||
destination.mSlot
|
|
||||||
);
|
|
||||||
} catch (...) {}
|
|
||||||
if (!result) {
|
|
||||||
ev.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onSendContainerClosePacket"): {
|
case doHash("onSendContainerClosePacket"): {
|
||||||
auto Call = RemoteCall::importAs<bool(Player * player, int ContainerNetId)>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<Event::PacketEvent::ContainerClosePacketSendAfterEvent>(
|
GMLIB::Event::PacketEvent::ContainerClosePacketSendAfterEvent,
|
||||||
[Call](Event::PacketEvent::ContainerClosePacketSendAfterEvent& ev) {
|
(Player * player, int ContainerNetId),
|
||||||
try {
|
(ev.getServerNetworkHandler()
|
||||||
Call(
|
|
||||||
ev.getServerNetworkHandler()
|
|
||||||
.getServerPlayer(ev.getNetworkIdentifier(), ev.getPacket().mClientSubId),
|
.getServerPlayer(ev.getNetworkIdentifier(), ev.getPacket().mClientSubId),
|
||||||
(int)ev.getPacket().mContainerId
|
(int)ev.getPacket().mContainerId),
|
||||||
);
|
logger.error("Event \"onSendContainerClosePacket\" cannot be intercepted"),
|
||||||
} catch (...) {}
|
)
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
case doHash("onServerStopping"): {
|
case doHash("onServerStopping"): {
|
||||||
auto Call = RemoteCall::importAs<bool()>(eventName, eventId);
|
REGISTER_EVENT_LISTEN(
|
||||||
eventBus->emplaceListener<ll::event::server::ServerStoppingEvent>(
|
ll::event::server::ServerStoppingEvent,
|
||||||
[Call](ll::event::server::ServerStoppingEvent& ev) {
|
(),
|
||||||
try {
|
(),
|
||||||
Call();
|
logger.error("Event \"onServerStopping\" cannot be intercepted"),
|
||||||
} catch (...) {}
|
)
|
||||||
}
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
+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
-6
@@ -3,17 +3,13 @@
|
|||||||
|
|
||||||
#include <RemoteCallAPI.h>
|
#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 PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
|
||||||
|
|
||||||
#define LIB_VERSION_MAJOR 0
|
#define LIB_VERSION_MAJOR 0
|
||||||
#define LIB_VERSION_MINOR 13
|
#define LIB_VERSION_MINOR 13
|
||||||
#define LIB_VERSION_PATCH 2
|
#define LIB_VERSION_PATCH 4
|
||||||
|
|
||||||
#define LIB_VERSION Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
|
#define LIB_VERSION GMLIB::Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
|
||||||
|
|
||||||
extern ll::Logger logger;
|
extern ll::Logger logger;
|
||||||
|
|
||||||
@@ -22,3 +18,5 @@ extern void Export_Legacy_GMLib_ServerAPI();
|
|||||||
extern void Export_Compatibility_API();
|
extern void Export_Compatibility_API();
|
||||||
extern void ExportPAPI();
|
extern void ExportPAPI();
|
||||||
extern void Export_Event_API();
|
extern void Export_Event_API();
|
||||||
|
extern void Export_BinaryStream_API();
|
||||||
|
// extern void Export_Form_API();
|
||||||
|
|||||||
+48
-68
@@ -3,13 +3,8 @@
|
|||||||
std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
|
std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
|
||||||
|
|
||||||
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string const& key) {
|
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string const& key) {
|
||||||
if (HardCodedKeys.count(key)) {
|
if (HardCodedKeys.count(key)) return key;
|
||||||
return key;
|
return std::vector<RecipeIngredient>({RecipeIngredient(key, 0, 1)});
|
||||||
}
|
|
||||||
std::vector<RecipeIngredient> result;
|
|
||||||
auto item = RecipeIngredient(key, 0, 1);
|
|
||||||
result.emplace_back(item);
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Export_Legacy_GMLib_ModAPI() {
|
void Export_Legacy_GMLib_ModAPI() {
|
||||||
@@ -22,18 +17,17 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::string const& result,
|
std::string const& result,
|
||||||
int count,
|
int count,
|
||||||
std::string const& unlock) -> void {
|
std::string const& unlock) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
std::vector<RecipeIngredient> types;
|
std::vector<RecipeIngredient> types;
|
||||||
for (auto ing : ingredients) {
|
for (auto ing : ingredients) {
|
||||||
auto key = RecipeIngredient(ing, 0, 1);
|
types.emplace_back(ing, 0, 1);
|
||||||
types.push_back(key);
|
|
||||||
}
|
}
|
||||||
auto res = RecipeIngredient(result, 0, count);
|
GMLIB::Mod::JsonRecipe::registerShapelessCraftingTableRecipe(
|
||||||
auto unl = makeRecipeUnlockingKey(unlock);
|
recipe_id,
|
||||||
JsonRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, res, unl);
|
types,
|
||||||
|
RecipeIngredient(result, 0, count),
|
||||||
|
makeRecipeUnlockingKey(unlock)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -45,18 +39,18 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::string const& result,
|
std::string const& result,
|
||||||
int count,
|
int count,
|
||||||
std::string const& unlock) -> void {
|
std::string const& unlock) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
std::vector<RecipeIngredient> types;
|
std::vector<RecipeIngredient> types;
|
||||||
for (auto ing : ingredients) {
|
for (auto ing : ingredients) {
|
||||||
auto key = RecipeIngredient(ing, 0, 1);
|
types.push_back(RecipeIngredient(ing, 0, 1));
|
||||||
types.push_back(key);
|
|
||||||
}
|
}
|
||||||
auto res = RecipeIngredient(result, 0, count);
|
GMLIB::Mod::JsonRecipe::registerShapedCraftingTableRecipe(
|
||||||
auto unl = makeRecipeUnlockingKey(unlock);
|
recipe_id,
|
||||||
JsonRecipe::registerShapedCraftingTableRecipe(recipe_id, shape, types, res, unl);
|
shape,
|
||||||
|
types,
|
||||||
|
RecipeIngredient(result, 0, count),
|
||||||
|
makeRecipeUnlockingKey(unlock)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -66,13 +60,13 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::string const& input,
|
std::string const& input,
|
||||||
std::string const& output,
|
std::string const& output,
|
||||||
std::vector<std::string> tags) -> void {
|
std::vector<std::string> tags) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
GMLIB::Mod::JsonRecipe::registerFurnaceRecipe(
|
||||||
return;
|
recipe_id,
|
||||||
}
|
RecipeIngredient(input, 0, 1),
|
||||||
auto inp = RecipeIngredient(input, 0, 1);
|
RecipeIngredient(output, 0, 1),
|
||||||
auto outp = RecipeIngredient(output, 0, 1);
|
tags
|
||||||
JsonRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -80,12 +74,8 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
"registerBrewingMixRecipe",
|
"registerBrewingMixRecipe",
|
||||||
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
|
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
|
||||||
) -> void {
|
) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
GMLIB::Mod::JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, RecipeIngredient(reagent, 0, 1));
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto rea = RecipeIngredient(reagent, 0, 1);
|
|
||||||
JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -93,14 +83,13 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
"registerBrewingContainerRecipe",
|
"registerBrewingContainerRecipe",
|
||||||
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
|
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
|
||||||
) -> void {
|
) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
GMLIB::Mod::JsonRecipe::registerBrewingContainerRecipe(
|
||||||
return;
|
recipe_id,
|
||||||
}
|
RecipeIngredient(input, 0, 1),
|
||||||
auto inp = RecipeIngredient(input, 0, 1);
|
RecipeIngredient(output, 0, 1),
|
||||||
auto outp = RecipeIngredient(output, 0, 1);
|
RecipeIngredient(reagent, 0, 1)
|
||||||
auto rea = RecipeIngredient(reagent, 0, 1);
|
);
|
||||||
JsonRecipe::registerBrewingContainerRecipe(recipe_id, inp, outp, rea);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -111,11 +100,8 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::string const& base,
|
std::string const& base,
|
||||||
std::string const& addition,
|
std::string const& addition,
|
||||||
std::string const& result) -> void {
|
std::string const& result) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
GMLIB::Mod::JsonRecipe::registerSmithingTransformRecipe(
|
||||||
return;
|
|
||||||
}
|
|
||||||
JsonRecipe::registerSmithingTransformRecipe(
|
|
||||||
recipe_id,
|
recipe_id,
|
||||||
smithing_template,
|
smithing_template,
|
||||||
base,
|
base,
|
||||||
@@ -131,11 +117,8 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::string const& smithing_template,
|
std::string const& smithing_template,
|
||||||
std::string const& base,
|
std::string const& base,
|
||||||
std::string const& addition) -> void {
|
std::string const& addition) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
GMLIB::Mod::JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
|
||||||
return;
|
|
||||||
}
|
|
||||||
JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
RemoteCall::exportAs(
|
RemoteCall::exportAs(
|
||||||
@@ -147,18 +130,17 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::string const& output,
|
std::string const& output,
|
||||||
int output_data,
|
int output_data,
|
||||||
int output_count) -> void {
|
int output_count) -> void {
|
||||||
auto level = GMLIB_Level::getInstance();
|
if (!GMLIB_Level::getInstance().has_value()) return;
|
||||||
if (!level) {
|
GMLIB::Mod::JsonRecipe::registerStoneCutterRecipe(
|
||||||
return;
|
recipe_id,
|
||||||
}
|
RecipeIngredient(input, 0, 1),
|
||||||
auto inp = RecipeIngredient(input, 0, 1);
|
RecipeIngredient(output, 0, 1)
|
||||||
auto outp = RecipeIngredient(output, 0, 1);
|
);
|
||||||
JsonRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
// 错误方块清理
|
// 错误方块清理
|
||||||
RemoteCall::exportAs("GMLib_ModAPI", "setUnknownBlockCleaner", []() -> void {
|
RemoteCall::exportAs("GMLib_ModAPI", "setUnknownBlockCleaner", []() -> void {
|
||||||
VanillaFix::setAutoCleanUnknownBlockEnabled();
|
GMLIB::Mod::VanillaFix::setAutoCleanUnknownBlockEnabled();
|
||||||
});
|
});
|
||||||
// 实验性
|
// 实验性
|
||||||
RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
|
RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
|
||||||
@@ -185,14 +167,12 @@ void Export_Legacy_GMLib_ModAPI() {
|
|||||||
std::unordered_set<AllExperiments> set(list.begin(), list.end());
|
std::unordered_set<AllExperiments> set(list.begin(), list.end());
|
||||||
if (set.contains((AllExperiments)experiment_id)) {
|
if (set.contains((AllExperiments)experiment_id)) {
|
||||||
return GMLIB_Level::getInstance()->getExperimentEnabled(((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::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
|
RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
|
||||||
VanillaFix::setFixI18nEnabled();
|
GMLIB::Mod::VanillaFix::setFixI18nEnabled();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
+12
-15
@@ -15,10 +15,9 @@ void Export_Legacy_GMLib_ServerAPI() {
|
|||||||
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
|
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
|
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
|
||||||
if (auto level = GMLIB_Level::getInstance()) {
|
return GMLIB_Level::getInstance()
|
||||||
return level->getLevelName();
|
.transform([](GMLIB_Level& level) -> std::string { return level.getLevelName(); })
|
||||||
}
|
.value_or("");
|
||||||
return {};
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
|
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
|
||||||
if (auto level = GMLIB_Level::getInstance()) {
|
if (auto level = GMLIB_Level::getInstance()) {
|
||||||
@@ -26,10 +25,9 @@ void Export_Legacy_GMLib_ServerAPI() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelSeed", []() -> std::string {
|
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelSeed", []() -> std::string {
|
||||||
if (auto level = GMLIB_Level::getInstance()) {
|
return GMLIB_Level::getInstance()
|
||||||
return std::to_string(level->getSeed());
|
.transform([](GMLIB_Level& level) -> std::string { return std::to_string(level.getSeed()); })
|
||||||
}
|
.value_or("");
|
||||||
return {};
|
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
|
RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
|
||||||
return GMLIB_Level::setFakeSeed(seed);
|
return GMLIB_Level::setFakeSeed(seed);
|
||||||
@@ -62,19 +60,18 @@ void Export_Legacy_GMLib_ServerAPI() {
|
|||||||
"GMLib_ServerAPI",
|
"GMLib_ServerAPI",
|
||||||
"addFakeList",
|
"addFakeList",
|
||||||
[](const std::string& name, const std::string& xuid) -> bool {
|
[](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 {
|
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 {
|
RemoteCall::exportAs("GMLib_ServerAPI", "removeAllFakeList", []() -> void {
|
||||||
return FakeList::removeAllFakeLists();
|
return GMLIB::Server::FakeList::removeAllFakeLists();
|
||||||
});
|
});
|
||||||
RemoteCall::exportAs("GMLib_ServerAPI", "getMaxPlayers", []() -> int {
|
RemoteCall::exportAs("GMLib_ServerAPI", "getMaxPlayers", []() -> int {
|
||||||
if (auto level = GMLIB_Level::getInstance()) {
|
return GMLIB_Level::getInstance().transform(
|
||||||
return level->getMaxPlayerCount();
|
[](GMLIB_Level& level) -> int { return level.getMaxPlayerCount(); }
|
||||||
}
|
).value_or(0);
|
||||||
return {};
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-16
@@ -13,10 +13,10 @@ bool isParameters(std::string const& str) {
|
|||||||
return std::regex_search(removeBrackets(str), reg);
|
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& a1, std::string const& a2) {
|
std::string GetValueWithPlayer(std::string const& key, Player* player) {
|
||||||
return PlaceholderAPI::getValue(a1, ll::service::bedrock::getLevel()->getPlayer(a2));
|
return GMLIB::Server::PlaceholderAPI::getValue(key, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool registerPlayerPlaceholder(
|
bool registerPlayerPlaceholder(
|
||||||
@@ -25,20 +25,20 @@ bool registerPlayerPlaceholder(
|
|||||||
std::string const& PAPIName
|
std::string const& PAPIName
|
||||||
) {
|
) {
|
||||||
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
||||||
PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||||
if (isParameters(PAPIName)) {
|
if (isParameters(PAPIName)) {
|
||||||
auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
|
auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
|
||||||
PluginName,
|
PluginName,
|
||||||
FuncName
|
FuncName
|
||||||
);
|
);
|
||||||
PlaceholderAPI::registerPlayerPlaceholder(
|
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
|
||||||
PAPIName,
|
PAPIName,
|
||||||
[Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, map); },
|
[Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, map); },
|
||||||
PluginName
|
PluginName
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
|
auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
|
||||||
PlaceholderAPI::registerPlayerPlaceholder(
|
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
|
||||||
PAPIName,
|
PAPIName,
|
||||||
[Call](Player* sp) { return Call(sp); },
|
[Call](Player* sp) { return Call(sp); },
|
||||||
PluginName
|
PluginName
|
||||||
@@ -55,18 +55,18 @@ bool registerServerPlaceholder(
|
|||||||
std::string const& PAPIName
|
std::string const& PAPIName
|
||||||
) {
|
) {
|
||||||
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
||||||
PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||||
if (isParameters(PAPIName)) {
|
if (isParameters(PAPIName)) {
|
||||||
auto Call =
|
auto Call =
|
||||||
RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
|
RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
|
||||||
PlaceholderAPI::registerServerPlaceholder(
|
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
|
||||||
PAPIName,
|
PAPIName,
|
||||||
[Call](std::unordered_map<std::string, std::string> map) { return Call(map); },
|
[Call](std::unordered_map<std::string, std::string> map) { return Call(map); },
|
||||||
PluginName
|
PluginName
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -80,17 +80,17 @@ bool registerStaticPlaceholder(
|
|||||||
int num
|
int num
|
||||||
) {
|
) {
|
||||||
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
if (RemoteCall::hasFunc(PluginName, FuncName)) {
|
||||||
PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
|
||||||
if (isParameters(PAPIName)) {
|
if (isParameters(PAPIName)) {
|
||||||
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
|
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
|
||||||
if (num == -1) {
|
if (num == -1) {
|
||||||
PlaceholderAPI::registerStaticPlaceholder(
|
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
|
||||||
PAPIName,
|
PAPIName,
|
||||||
[Call] { return Call(); },
|
[Call] { return Call(); },
|
||||||
PluginName
|
PluginName
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
PlaceholderAPI::registerStaticPlaceholder(
|
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
|
||||||
PAPIName,
|
PAPIName,
|
||||||
num,
|
num,
|
||||||
[Call] { return Call(); },
|
[Call] { return Call(); },
|
||||||
@@ -104,14 +104,14 @@ bool registerStaticPlaceholder(
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string translateStringWithPlayer(std::string const& str, Player* pl) {
|
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
|
} // namespace PAPIRemoteCall
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"format_version": 2,
|
"format_version": 2,
|
||||||
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
|
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
|
||||||
"version": "0.13.2",
|
"version": "0.13.4",
|
||||||
"info": {
|
"info": {
|
||||||
"name": "GMLIB-LegacyRemoteCallApi",
|
"name": "GMLIB-LegacyRemoteCallApi",
|
||||||
"description": "Legacy RemoteCall API for GMLIB",
|
"description": "Legacy RemoteCall API for GMLIB",
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
"library"
|
"library"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.13.2/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
|
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.13.4/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"github.com/GroupMountain/GMLIB": ">=0.13.0"
|
"github.com/GroupMountain/GMLIB": ">=0.13.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ end
|
|||||||
-- Option 1: Use the latest version of LeviLamina released on GitHub.
|
-- Option 1: Use the latest version of LeviLamina released on GitHub.
|
||||||
add_requires("levilaminalibrary")
|
add_requires("levilaminalibrary")
|
||||||
add_requires("legacyremotecall")
|
add_requires("legacyremotecall")
|
||||||
add_requires("gmlib")
|
add_requires("gmlib 0.13.7")
|
||||||
|
|
||||||
-- Option 2: Use a specific version of LeviLamina released on GitHub.
|
-- Option 2: Use a specific version of LeviLamina released on GitHub.
|
||||||
-- add_requires("levilamina x.x.x")
|
-- add_requires("levilamina x.x.x")
|
||||||
|
|||||||
Reference in New Issue
Block a user