add translate fallback, fix text position
This commit is contained in:
parent
e348fe8c81
commit
b0c9e6d48b
1 changed files with 381 additions and 342 deletions
|
|
@ -27,30 +27,99 @@ function simplify (data) {
|
|||
}
|
||||
}
|
||||
|
||||
function processNbtMessage (msg) {
|
||||
try {
|
||||
if (!msg || msg.type === 'end') return null;
|
||||
if (typeof msg === 'string') return msg
|
||||
|
||||
const simplified = simplify(msg); // Ensure nbt is defined elsewhere
|
||||
const json = JSON.stringify(simplified, (key, val) => {
|
||||
if (key === 'id' && Array.isArray(val)) return uuidFromIntArray(val);
|
||||
return val;
|
||||
});
|
||||
|
||||
return json;
|
||||
} catch (e) {
|
||||
return e;
|
||||
function formatfunction(comp, text) {
|
||||
if (text === undefined) return '';
|
||||
return text = parseMinecraftColor(comp.color) + parseMinecraftFormat(comp) + text + parseMinecraftColor(comp.color) + parseMinecraftFormat(comp);
|
||||
}
|
||||
|
||||
function parseMinecraftColor(color) {
|
||||
if (typeof color === 'string' && ansiColorCodes[color] && !color.startsWith('#')) {
|
||||
return ansiColorCodes[color];
|
||||
} else if (typeof color === 'string' && color.startsWith('#')) {
|
||||
const hexRegex = /#?([a-fA-F\d]{2})([a-fA-F\d]{2})([a-fA-F\d]{2})/;
|
||||
const hexCodes = hexRegex.exec(color);
|
||||
if (hexCodes) {
|
||||
const red = parseInt(hexCodes[1], 16);
|
||||
const green = parseInt(hexCodes[2], 16);
|
||||
const blue = parseInt(hexCodes[3], 16);
|
||||
const ansiColor = `\u001b[38;2;${red};${green};${blue}m`;
|
||||
return ansiColor;
|
||||
}
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
function parseMinecraftFormat(format) {
|
||||
let result = '';
|
||||
if (format.bold && format.bold === 1) result += ansiFormatCodes['bold'];
|
||||
if (format.italic && format.italic === 1) result += ansiFormatCodes['italic'];
|
||||
if (format.underlined && format.underlined === 1) result += ansiFormatCodes['underlined'];
|
||||
if (format.strikethrough && format.strikethrough === 1) result += ansiFormatCodes['strikethrough'];
|
||||
if (format.obfuscated && format.obfuscated === 1) result += ansiFormatCodes['obfuscated'];
|
||||
return result;
|
||||
}
|
||||
|
||||
function inject(bot) {
|
||||
|
||||
let playerchat = {}; // im think this can fix memory leak.
|
||||
let playerchat = {};
|
||||
let systemchat = {};
|
||||
let profilelesschat = {};
|
||||
let actionbar = {};
|
||||
let bossbar = {};
|
||||
|
||||
bot.on('end', () => { // ok keep this
|
||||
playerchat = {}; delete playerchat;
|
||||
systemchat = {}; delete systemchat;
|
||||
profilelesschat = {}; delete profilelesschat;
|
||||
actionbar = {}; delete actionbar;
|
||||
bossbar = {}; delete bossbar;
|
||||
})
|
||||
|
||||
bot.on('boss_bar', (packet) => {
|
||||
|
||||
bossbar = {};
|
||||
bossbar.uuid = packet.entityUUID;
|
||||
bossbar.action = packet.action;
|
||||
|
||||
switch (bossbar.action) {
|
||||
case 1: // bossbar remove || bossbar visible false || bossbar player !botName
|
||||
break;
|
||||
case 0: // bossbar visible true || bossbar player botName
|
||||
bossbar.title = parseMinecraftMessage(simplify(packet.title));
|
||||
bossbar.nocolor_title = parseMinecraftMessageNoColor(simplify(packet.title));
|
||||
bossbar.health = packet.health;
|
||||
bossbar.color = packet.color;
|
||||
bossbar.dividers = packet.dividers;
|
||||
bossbar.flags = packet.flags;
|
||||
break;
|
||||
|
||||
case 2: // bossbar set max || bossbar set value, 1 mean full
|
||||
bossbar.health = packet.health;
|
||||
break;
|
||||
|
||||
case 3: // bossbar set name
|
||||
bossbar.title = parseMinecraftMessage(simplify(packet.title));
|
||||
bossbar.nocolor_title = parseMinecraftMessageNoColor(simplify(packet.title));
|
||||
break;
|
||||
|
||||
case 4:
|
||||
bossbar.color = packet.color; // bossbar set color
|
||||
bossbar.dividers = packet.dividers; // bossbar set style
|
||||
break;
|
||||
|
||||
case 5: // wither, ender dragon etc... , chayapak found it
|
||||
bossbar.flags = packet.flags;
|
||||
break;
|
||||
|
||||
default:
|
||||
console.log(packet);
|
||||
break;
|
||||
}
|
||||
|
||||
bot.emit('custom_bossbar', bossbar.title, bossbar, packet);
|
||||
bot.emit('custom_allchat', 'bossbar', bossbar.title, bossbar, packet);
|
||||
});
|
||||
|
||||
bot.on('action_bar', (packet) => {
|
||||
actionbar = {};
|
||||
|
|
@ -60,16 +129,16 @@ bot.on('action_bar', (packet) => {
|
|||
bot.emit('custom_allchat', 'actionbar', actionbar.message, actionbar, packet);
|
||||
});
|
||||
|
||||
bot.on('system_chat', (packet) => { // system
|
||||
if (packet.isActionBar) return;
|
||||
|
||||
bot.on('system_chat', (packet) => { // system
|
||||
if (packet.isActionBar) return; // useless i guess
|
||||
systemchat = {};
|
||||
systemchat.jsonMsg = simplify(packet.content);
|
||||
systemchat.message = parseMinecraftMessage(simplify(packet.content));
|
||||
systemchat.nocolor_message = parseMinecraftMessageNoColor(simplify(packet.content));
|
||||
|
||||
bot.emit('custom_systemchat', systemchat.message, systemchat, packet);
|
||||
bot.emit('custom_allchat', 'system', systemchat.message, systemchat, packet);
|
||||
bot.emit('custom_allchat', 'systemchat', systemchat.message, systemchat, packet);
|
||||
|
||||
});
|
||||
|
||||
|
|
@ -78,7 +147,7 @@ bot.on('profileless_chat', (packet) => { // kinda player_chat
|
|||
|
||||
profilelesschat = {};
|
||||
|
||||
profilelesschat.type = packet.type
|
||||
profilelesschat.type = packet.type.registryIndex;
|
||||
|
||||
profilelesschat.formattedMessage = simplify(packet.message);
|
||||
profilelesschat.senderName = simplify(packet.name);
|
||||
|
|
@ -101,7 +170,7 @@ bot.on('profileless_chat', (packet) => { // kinda player_chat
|
|||
profilelesschat.message = parseMinecraftMessage(profilelesschat.formattedMessage);
|
||||
profilelesschat.nocolor_msg = parseMinecraftMessageNoColor(profilelesschat.formattedMessage);
|
||||
break;
|
||||
case 5: //
|
||||
case 5: // /say
|
||||
profilelesschat.message = parseMinecraftMessage({ translate: 'chat.type.announcement', with: [ profilelesschat.senderName, profilelesschat.formattedMessage ]});
|
||||
profilelesschat.nocolor_msg = parseMinecraftMessageNoColor({ translate: 'chat.type.announcement', with: [ profilelesschat.senderName, profilelesschat.formattedMessage ]});
|
||||
break;
|
||||
|
|
@ -114,13 +183,13 @@ bot.on('profileless_chat', (packet) => { // kinda player_chat
|
|||
profilelesschat.nocolor_msg = parseMinecraftMessageNoColor({ translate: 'chat.type.team.sent', with: [ profilelesschat.targetName, profilelesschat.senderName, profilelesschat.formattedMessage ]});
|
||||
break;
|
||||
default:
|
||||
console.log(`Unknown player_chat packet. Type: ${playerchat.type}`);
|
||||
console.log(`Unknown profilelesschat packet. Type: ${playerchat.type}`);
|
||||
console.log(packet);
|
||||
break;
|
||||
}
|
||||
|
||||
bot.emit('custom_profilelesschat', profilelesschat.message, profilelesschat, packet)
|
||||
bot.emit('custom_allchat', 'profileless', profilelesschat.message, profilelesschat, packet)
|
||||
bot.emit('custom_allchat', 'profilelesschat', profilelesschat.message, profilelesschat, packet)
|
||||
})
|
||||
|
||||
|
||||
|
|
@ -128,16 +197,16 @@ bot.on('player_chat', (packet) => { // player
|
|||
playerchat = {};
|
||||
|
||||
playerchat.plainMessage = packet.plainMessage;
|
||||
playerchat.type = packet.type;
|
||||
playerchat.type = packet.type.registryIndex;
|
||||
playerchat.sender = packet.senderUuid;
|
||||
|
||||
playerchat.unsignedContent = simplify(packet.unsignedChatContent);
|
||||
playerchat.senderName = simplify(packet.networkName);
|
||||
playerchat.targetName = simplify(packet.networkTargetName);
|
||||
|
||||
playerchat.nocolor_unsignedContent = parseMinecraftMessageNoColor(simplify(packet.unsignedChatContent));
|
||||
playerchat.nocolor_senderName = parseMinecraftMessageNoColor(simplify(packet.networkName));
|
||||
playerchat.nocolor_targetName = parseMinecraftMessageNoColor(simplify(packet.networkTargetName));
|
||||
|
||||
switch (playerchat.type) { // vanish off
|
||||
case 1: // /minecraft:me
|
||||
playerchat.message = parseMinecraftMessage({ "translate": "chat.type.emote", "with": [ playerchat.senderName, playerchat.plainMessage ]});
|
||||
|
|
@ -155,7 +224,7 @@ bot.on('player_chat', (packet) => { // player
|
|||
playerchat.message = parseMinecraftMessage(playerchat.unsignedContent);
|
||||
playerchat.nocolor_msg = parseMinecraftMessageNoColor(playerchat.unsignedContent);
|
||||
break;
|
||||
case 5: //
|
||||
case 5: // /say
|
||||
playerchat.message = parseMinecraftMessage({ translate: 'chat.type.announcement', with: [ playerchat.senderName, playerchat.plainMessage ]});
|
||||
playerchat.nocolor_msg = parseMinecraftMessageNoColor({ translate: 'chat.type.announcement', with: [ playerchat.senderName, playerchat.plainMessage ]});
|
||||
break;
|
||||
|
|
@ -173,7 +242,7 @@ bot.on('player_chat', (packet) => { // player
|
|||
break;
|
||||
}
|
||||
bot.emit('custom_playerchat', playerchat.message, playerchat, packet);
|
||||
bot.emit('custom_allchat', 'player', playerchat.message, playerchat, packet)
|
||||
bot.emit('custom_allchat', 'playerchat', playerchat.message, playerchat, packet)
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -210,14 +279,8 @@ function parseMinecraftMessage(component) {
|
|||
return comp;
|
||||
}
|
||||
|
||||
if (comp.extra) {
|
||||
if (!Array.isArray(comp.extra)) comp.extra = [comp.extra]
|
||||
comp.extra.forEach(subComp => {
|
||||
text += formatfunction(comp, extractText(subComp));
|
||||
});
|
||||
}
|
||||
|
||||
if (comp.translate) {
|
||||
if (comp.fallback && !lang[comp.translate]) return text += formatfunction(comp, comp.fallback);
|
||||
let translateString = lang[comp.translate] || comp.translate;
|
||||
let DefaultTranslateString = lang[comp.translate] || comp.translate;
|
||||
let DefaultMsg = false;
|
||||
|
|
@ -233,7 +296,7 @@ function parseMinecraftMessage(component) {
|
|||
}
|
||||
|
||||
if (usedReplacements < withArgs.length) {
|
||||
if (translateString.length + formatfunction(comp, withArgs[usedReplacements]).length > 2048) return 'Translate Crash'; // Prevent translate crash
|
||||
if (translateString.length + formatfunction(comp, withArgs[usedReplacements]).length > 16384) return 'Translate Crash'; // Prevent translate crash
|
||||
return `thing__placeholder__${usedReplacements++}`;
|
||||
}
|
||||
|
||||
|
|
@ -252,12 +315,12 @@ function parseMinecraftMessage(component) {
|
|||
if (stringindex > 0 && string[stringindex - 1] === '%') {
|
||||
return match;
|
||||
}
|
||||
if (translateString.length + formatfunction(comp, withArgs[argIndex]).length > 2048) return 'Translate Crash'; // Prevent translate crash
|
||||
if (translateString.length + formatfunction(comp, withArgs[argIndex]).length > 16384) return 'Translate Crash'; // Prevent translate crash
|
||||
return `thing__placeholder__${argIndex}`;
|
||||
});
|
||||
|
||||
for (let i = 0; i < withArgs.length; i++) {
|
||||
if (translateString.length + formatfunction(comp, withArgs[i]).length > 2048) return 'Translate Crash'; // Prevent translate crash
|
||||
if (translateString.length + formatfunction(comp, withArgs[i]).length > 16384) return 'Translate Crash'; // Prevent translate crash
|
||||
translateString = translateString.replace(new RegExp(`thing__placeholder__${i}`, 'g'), (match) => {
|
||||
const formattedArg = formatfunction(comp, withArgs[i]);
|
||||
return formattedArg;
|
||||
|
|
@ -273,7 +336,15 @@ function parseMinecraftMessage(component) {
|
|||
}
|
||||
}
|
||||
|
||||
if (comp.extra) {
|
||||
if (!Array.isArray(comp.extra)) comp.extra = [comp.extra]
|
||||
comp.extra.forEach(subComp => {
|
||||
text += formatfunction(comp, extractText(subComp));
|
||||
});
|
||||
}
|
||||
|
||||
text = parseMinecraftColor(comp.color) + parseMinecraftFormat(comp) + text + ansiFormatCodes['reset'];
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
|
|
@ -297,14 +368,8 @@ function parseMinecraftMessageNoColor(component) {
|
|||
return comp;
|
||||
}
|
||||
|
||||
if (comp.extra) {
|
||||
if (!Array.isArray(comp.extra)) comp.extra = [comp.extra]
|
||||
comp.extra.forEach(subComp => {
|
||||
text += extractText(subComp);
|
||||
});
|
||||
}
|
||||
|
||||
if (comp.translate) {
|
||||
if (comp.fallback && !lang[comp.translate]) return text += comp.fallback;
|
||||
let translateString = lang[comp.translate] || comp.translate;
|
||||
let DefaultTranslateString = lang[comp.translate] || comp.translate;
|
||||
let DefaultMsg = false;
|
||||
|
|
@ -320,7 +385,7 @@ function parseMinecraftMessageNoColor(component) {
|
|||
}
|
||||
|
||||
if (usedReplacements < withArgs.length) {
|
||||
if (translateString.length + withArgs[usedReplacements].length > 2048) return 'Translate Crash'; // Prevent translate crash
|
||||
if (translateString.length + withArgs[usedReplacements].length > 16384) return 'Translate Crash'; // Prevent translate crash
|
||||
return `thing__placeholder__${usedReplacements++}`;
|
||||
}
|
||||
|
||||
|
|
@ -340,12 +405,12 @@ function parseMinecraftMessageNoColor(component) {
|
|||
return match;
|
||||
}
|
||||
|
||||
if (translateString.length + withArgs[argIndex].length > 2048) return 'Translate Crash'; // Prevent translate crash
|
||||
if (translateString.length + withArgs[argIndex].length > 16384) return 'Translate Crash'; // Prevent translate crash
|
||||
return `thing__placeholder__${argIndex}`;
|
||||
});
|
||||
|
||||
for (let i = 0; i < withArgs.length; i++) {
|
||||
if (translateString.length + withArgs[i].length > 2048) return 'Translate Crash'; // Prevent translate crash
|
||||
if (translateString.length + withArgs[i].length > 16384) return 'Translate Crash'; // Prevent translate crash
|
||||
translateString = translateString.replace(new RegExp(`thing__placeholder__${i}`, 'g'), (match) => {
|
||||
const formattedArg = withArgs[i];
|
||||
return formattedArg;
|
||||
|
|
@ -361,43 +426,17 @@ function parseMinecraftMessageNoColor(component) {
|
|||
}
|
||||
}
|
||||
|
||||
if (comp.extra) {
|
||||
if (!Array.isArray(comp.extra)) comp.extra = [comp.extra]
|
||||
comp.extra.forEach(subComp => {
|
||||
text += extractText(subComp);
|
||||
});
|
||||
}
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
return extractText(component);
|
||||
}
|
||||
|
||||
function formatfunction(comp, text) {
|
||||
if (text === undefined) return '';
|
||||
return text = parseMinecraftColor(comp.color) + parseMinecraftFormat(comp) + text + parseMinecraftColor(comp.color) + parseMinecraftFormat(comp);
|
||||
}
|
||||
|
||||
function parseMinecraftColor(color) {
|
||||
if (color && ansiColorCodes[color] && !color.startsWith('#')) {
|
||||
return ansiColorCodes[color];
|
||||
} else if (color && color.startsWith('#')) {
|
||||
const hexRegex = /#?([a-fA-F\d]{2})([a-fA-F\d]{2})([a-fA-F\d]{2})/;
|
||||
const hexCodes = hexRegex.exec(color);
|
||||
if (hexCodes) {
|
||||
const red = parseInt(hexCodes[1], 16);
|
||||
const green = parseInt(hexCodes[2], 16);
|
||||
const blue = parseInt(hexCodes[3], 16);
|
||||
const ansiColor = `\u001b[38;2;${red};${green};${blue}m`;
|
||||
return ansiColor;
|
||||
}
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
function parseMinecraftFormat(format) {
|
||||
let result = '';
|
||||
if (format.bold && format.bold === 1) result += ansiFormatCodes['bold'];
|
||||
if (format.italic && format.italic === 1) result += ansiFormatCodes['italic'];
|
||||
if (format.underlined && format.underlined === 1) result += ansiFormatCodes['underlined'];
|
||||
if (format.strikethrough && format.strikethrough === 1) result += ansiFormatCodes['strikethrough'];
|
||||
if (format.obfuscated && format.obfuscated === 1) result += ansiFormatCodes['obfuscated'];
|
||||
return result;
|
||||
}
|
||||
|
||||
module.exports = { inject };
|
||||
Loading…
Reference in a new issue