diff --git a/scripts/commands/handler.js b/scripts/commands/handler.js index 93c7efaf5..9b0808bae 100644 --- a/scripts/commands/handler.js +++ b/scripts/commands/handler.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import config from "../data/config.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; // import all our commands import { kick } from "./moderation/kick.js"; @@ -104,6 +103,6 @@ export function commandHandler(player, message) { else return; } catch (error) { console.warn(`${new Date()} | ` + error); - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"There was an error while trying to run this command. Please read console output"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"There was an error while trying to run this command. Please read console output"}]}`); } } diff --git a/scripts/commands/moderation/ban.js b/scripts/commands/moderation/ban.js index c5f674970..94695a135 100644 --- a/scripts/commands/moderation/ban.js +++ b/scripts/commands/moderation/ban.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name ban @@ -21,37 +20,37 @@ export function ban(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to ban!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to ban!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl.nameTag; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); // make sure they dont ban themselves - if (member === player.nameTag) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You cannot ban yourself."}]}`, World.getDimension("overworld")); + if (member === player.nameTag) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You cannot ban yourself."}]}`); - let tags = Commands.run(`tag "${member}" list`, World.getDimension('overworld')).statusMessage.replace(/§./g, '').match(/(?<=: ).*$/g); + let tags = World.getDimension("overworld").runCommand(`tag "${member}" list`, World.getDimension('overworld')).statusMessage.replace(/§./g, '').match(/(?<=: ).*$/g); if (tags) tags = String(tags).split(/[,]/); // this removes old ban stuff tags.forEach(t => { - if(t.startsWith(" reason:")) Commands.run(`tag "${member}" remove "${t.slice(1)}"`, World.getDimension("overworld")); - if(t.startsWith(" by:")) Commands.run(`tag "${member}" remove "${t.slice(1)}"`, World.getDimension("overworld")); + if(t.startsWith(" reason:")) World.getDimension("overworld").runCommand(`tag "${member}" remove "${t.slice(1)}"`); + if(t.startsWith(" by:")) World.getDimension("overworld").runCommand(`tag "${member}" remove "${t.slice(1)}"`); }); try { - Commands.run(`tag "${member}" add "reason:${reason}"`, World.getDimension("overworld")); - Commands.run(`tag "${member}" add "by:${player.nameTag}"`, World.getDimension("overworld")); - Commands.run(`tag "${member}" add isBanned`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`tag "${member}" add "reason:${reason}"`); + World.getDimension("overworld").runCommand(`tag "${member}" add "by:${player.nameTag}"`); + World.getDimension("overworld").runCommand(`tag "${member}" add isBanned`); } catch (error) { console.warn(`${new Date()} | ` + error); - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to ban that player! Error: ${error}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to ban that player! Error: ${error}"}]}`); } - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has banned ${member}. Reason: ${reason}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has banned ${member}. Reason: ${reason}"}]}`); } diff --git a/scripts/commands/moderation/credits.js b/scripts/commands/moderation/credits.js index 763a22ac0..e21afb33a 100644 --- a/scripts/commands/moderation/credits.js +++ b/scripts/commands/moderation/credits.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name credits @@ -17,10 +16,10 @@ export function credits(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function credits`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function credits`); } diff --git a/scripts/commands/moderation/deop.js b/scripts/commands/moderation/deop.js index 09583b6cb..a922214c9 100644 --- a/scripts/commands/moderation/deop.js +++ b/scripts/commands/moderation/deop.js @@ -2,8 +2,7 @@ /* eslint no-redeclare: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name deop @@ -21,15 +20,15 @@ export function deop(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } // try to find the player requested if (args.length) for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); - return Commands.run(`execute "${member.nameTag}" ~~~ function deop`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${member.nameTag}" ~~~ function deop`); } diff --git a/scripts/commands/moderation/help.js b/scripts/commands/moderation/help.js index 533923320..f53732d89 100644 --- a/scripts/commands/moderation/help.js +++ b/scripts/commands/moderation/help.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name help @@ -17,10 +16,10 @@ export function help(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function help`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function help`); } diff --git a/scripts/commands/moderation/kick.js b/scripts/commands/moderation/kick.js index cad282490..c2e9db4f3 100644 --- a/scripts/commands/moderation/kick.js +++ b/scripts/commands/moderation/kick.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name kick @@ -24,27 +23,27 @@ export function kick(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to kick!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to kick!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl.nameTag; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); // make sure they dont kick themselves - if (member === player.nameTag) return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You cannot kick yourself."}]}`, World.getDimension("overworld")); + if (member === player.nameTag) return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You cannot kick yourself."}]}`); try { - if (!isSilent) Commands.run(`kick "${member}" ${reason}`, World.getDimension("overworld")); - else Commands.run(`event entity "${member}" paradox:kick`, World.getDimension("overworld")); + if (!isSilent) World.getDimension("overworld").runCommand(`kick "${member}" ${reason}`); + else World.getDimension("overworld").runCommand(`event entity "${member}" paradox:kick`); } catch (error) { console.warn(`${new Date()} | ` + error); - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to ban that player! Error: ${error}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to ban that player! Error: ${error}"}]}`); } - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has kicked ${member} (Silent:${isSilent}). Reason: ${reason}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has kicked ${member} (Silent:${isSilent}). Reason: ${reason}"}]}`); } diff --git a/scripts/commands/moderation/mute.js b/scripts/commands/moderation/mute.js index d4e52dd8a..5776e6178 100644 --- a/scripts/commands/moderation/mute.js +++ b/scripts/commands/moderation/mute.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name mute @@ -21,27 +20,27 @@ export function mute(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to mute!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to mute!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl.nameTag; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); // make sure they dont mute themselves - if (member === player.nameTag) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You cannot mute yourself."}]}`, World.getDimension("overworld")); + if (member === player.nameTag) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You cannot mute yourself."}]}`); try { - Commands.run(`ability "${member}" mute true`, World.getDimension("overworld")); - Commands.run(`tellraw "${member}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You have been muted. Reason: ${reason}"}]}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`ability "${member}" mute true`); + World.getDimension("overworld").runCommand(`tellraw "${member}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You have been muted. Reason: ${reason}"}]}`); } catch (error) { console.warn(`${new Date()} | ` + error); - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to mute that player! You most likely dont have education edition enabled."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to mute that player! You most likely dont have education edition enabled."}]}`); } - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has muted ${member}. Reason: ${reason}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has muted ${member}. Reason: ${reason}"}]}`); } diff --git a/scripts/commands/moderation/notify.js b/scripts/commands/moderation/notify.js index fdaedd9f2..405524454 100644 --- a/scripts/commands/moderation/notify.js +++ b/scripts/commands/moderation/notify.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name notify @@ -17,10 +16,10 @@ export function notify(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function notify`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function notify`); } diff --git a/scripts/commands/moderation/op.js b/scripts/commands/moderation/op.js index 4e5a7de16..be876e797 100644 --- a/scripts/commands/moderation/op.js +++ b/scripts/commands/moderation/op.js @@ -2,8 +2,7 @@ /* eslint no-redeclare: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name op @@ -21,15 +20,15 @@ export function op(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } // try to find the player requested if (args.length) for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); - return Commands.run(`execute "${member.nameTag}" ~~~ function op`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${member.nameTag}" ~~~ function op`); } diff --git a/scripts/commands/moderation/unmute.js b/scripts/commands/moderation/unmute.js index 5504b6c8f..25e41bd75 100644 --- a/scripts/commands/moderation/unmute.js +++ b/scripts/commands/moderation/unmute.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name unmute @@ -21,24 +20,24 @@ export function unmute(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to mute!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide who to mute!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl.nameTag; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); try { - Commands.run(`ability "${member}" mute false`, World.getDimension("overworld")); - Commands.run(`tellraw "${member}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You have been unmuted."}]}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`ability "${member}" mute false`); + World.getDimension("overworld").runCommand(`tellraw "${member}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You have been unmuted."}]}`); } catch (error) { console.warn(`${new Date()} | ` + error); - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to unmute that player! You most likely dont have education edition enabled."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"I was unable to unmute that player! You most likely dont have education edition enabled."}]}`); } - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has unmuted ${member}. Reason: ${reason}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has unmuted ${member}. Reason: ${reason}"}]}`); } diff --git a/scripts/commands/settings/allowgma.js b/scripts/commands/settings/allowgma.js index 8bd46b0f1..b44c00da3 100644 --- a/scripts/commands/settings/allowgma.js +++ b/scripts/commands/settings/allowgma.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name allowgma @@ -17,10 +16,10 @@ export function allowgma(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/allowGMA`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/allowGMA`); } diff --git a/scripts/commands/settings/allowgmc.js b/scripts/commands/settings/allowgmc.js index 54ad07054..0e6941ca4 100644 --- a/scripts/commands/settings/allowgmc.js +++ b/scripts/commands/settings/allowgmc.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name allowgmc @@ -17,10 +16,10 @@ export function allowgmc(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/allowGMC`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/allowGMC`); } diff --git a/scripts/commands/settings/allowgms.js b/scripts/commands/settings/allowgms.js index e5cf70f3f..f25257fb8 100644 --- a/scripts/commands/settings/allowgms.js +++ b/scripts/commands/settings/allowgms.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name allowgms @@ -17,10 +16,10 @@ export function allowgms(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/allowGMS`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/allowGMS`); } diff --git a/scripts/commands/settings/antikb.js b/scripts/commands/settings/antikb.js index 5e9e3b62d..aa869cdfe 100644 --- a/scripts/commands/settings/antikb.js +++ b/scripts/commands/settings/antikb.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name antikb @@ -17,10 +16,10 @@ export function antikb(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/antikb`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/antikb`); } diff --git a/scripts/commands/settings/autoaura.js b/scripts/commands/settings/autoaura.js index 91af5c5de..652a41fa9 100644 --- a/scripts/commands/settings/autoaura.js +++ b/scripts/commands/settings/autoaura.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name autoaura @@ -17,10 +16,10 @@ export function autoaura(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/autoaura`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/autoaura`); } diff --git a/scripts/commands/settings/autoclicker.js b/scripts/commands/settings/autoclicker.js index 0545a3e35..44e55dcba 100644 --- a/scripts/commands/settings/autoclicker.js +++ b/scripts/commands/settings/autoclicker.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name autoclicker @@ -17,10 +16,10 @@ export function autoclicker(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/autoclicker`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/autoclicker`); } diff --git a/scripts/commands/settings/bedrockvalidate.js b/scripts/commands/settings/bedrockvalidate.js index 22176ec8f..f43f9b6f6 100644 --- a/scripts/commands/settings/bedrockvalidate.js +++ b/scripts/commands/settings/bedrockvalidate.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name bedrockvalidate @@ -17,10 +16,10 @@ export function bedrockvalidate(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/bedrockValidate`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/bedrockValidate`); } diff --git a/scripts/commands/settings/enchantedarmor.js b/scripts/commands/settings/enchantedarmor.js index 7092a0db9..736f27901 100644 --- a/scripts/commands/settings/enchantedarmor.js +++ b/scripts/commands/settings/enchantedarmor.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name enchantedarmor @@ -17,10 +16,10 @@ export function enchantedarmor(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/enchantedArmor`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/enchantedArmor`); } \ No newline at end of file diff --git a/scripts/commands/settings/jesus.js b/scripts/commands/settings/jesus.js index 3a38fbc90..96224227e 100644 --- a/scripts/commands/settings/jesus.js +++ b/scripts/commands/settings/jesus.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name jesus @@ -17,10 +16,10 @@ export function jesus(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/jesus`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/jesus`); } diff --git a/scripts/commands/settings/modules.js b/scripts/commands/settings/modules.js index b49b3e84f..76a8f7486 100644 --- a/scripts/commands/settings/modules.js +++ b/scripts/commands/settings/modules.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name modules @@ -17,10 +16,10 @@ export function modules(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/modules`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/modules`); } diff --git a/scripts/commands/settings/nofrostwalker.js b/scripts/commands/settings/nofrostwalker.js index c8d913879..8f5f3277d 100644 --- a/scripts/commands/settings/nofrostwalker.js +++ b/scripts/commands/settings/nofrostwalker.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name nofrostwalker @@ -17,10 +16,10 @@ export function nofrostwalker(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/nofrostwalker`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/nofrostwalker`); } diff --git a/scripts/commands/settings/npc.js b/scripts/commands/settings/npc.js index 555f9e33a..9cbc3976c 100644 --- a/scripts/commands/settings/npc.js +++ b/scripts/commands/settings/npc.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name npc @@ -17,10 +16,10 @@ export function npc(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/npc`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/npc`); } diff --git a/scripts/commands/settings/overidecommandblocksenabled.js b/scripts/commands/settings/overidecommandblocksenabled.js index b14834fd7..80485bcfe 100644 --- a/scripts/commands/settings/overidecommandblocksenabled.js +++ b/scripts/commands/settings/overidecommandblocksenabled.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name overidecommandblocksenabled @@ -17,10 +16,10 @@ export function overidecommandblocksenabled(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/overideCommandBlocksEnabled`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/overideCommandBlocksEnabled`); } diff --git a/scripts/commands/settings/phase.js b/scripts/commands/settings/phase.js index 10b860156..f799aff50 100644 --- a/scripts/commands/settings/phase.js +++ b/scripts/commands/settings/phase.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name phase @@ -17,10 +16,10 @@ export function phase(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/phase`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/phase`); } diff --git a/scripts/commands/settings/removecommandblocks.js b/scripts/commands/settings/removecommandblocks.js index a35435a1e..e87d06af8 100644 --- a/scripts/commands/settings/removecommandblocks.js +++ b/scripts/commands/settings/removecommandblocks.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name removecommandblocks @@ -17,10 +16,10 @@ export function removecommandblocks(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/removeCommandBlocks`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/removeCommandBlocks`); } diff --git a/scripts/commands/settings/worldborder.js b/scripts/commands/settings/worldborder.js index 45e113403..11f1d3f40 100644 --- a/scripts/commands/settings/worldborder.js +++ b/scripts/commands/settings/worldborder.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name worldborder @@ -17,10 +16,10 @@ export function worldborder(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/worldborder`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/worldborder`); } diff --git a/scripts/commands/settings/xray.js b/scripts/commands/settings/xray.js index 868439be7..941e71eec 100644 --- a/scripts/commands/settings/xray.js +++ b/scripts/commands/settings/xray.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name xray @@ -17,10 +16,10 @@ export function xray(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function settings/xray`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function settings/xray`); } diff --git a/scripts/commands/utility/auracheck.js b/scripts/commands/utility/auracheck.js index 55df3dd96..0457cf6b4 100644 --- a/scripts/commands/utility/auracheck.js +++ b/scripts/commands/utility/auracheck.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name auracheck @@ -20,17 +19,17 @@ export function auracheck(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide which target to check killaura!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide which target to check killaura!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); - return Commands.run(`execute "${member.nameTag}" ~~~ function tools/auracheck`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${member.nameTag}" ~~~ function tools/auracheck`); } diff --git a/scripts/commands/utility/clearchat.js b/scripts/commands/utility/clearchat.js index 011037b40..10afd47da 100644 --- a/scripts/commands/utility/clearchat.js +++ b/scripts/commands/utility/clearchat.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name clearchat @@ -17,10 +16,10 @@ export function clearchat(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function tools/clearchat`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function tools/clearchat`); } diff --git a/scripts/commands/utility/ecwipe.js b/scripts/commands/utility/ecwipe.js index fb7c1b6c5..435de18b0 100644 --- a/scripts/commands/utility/ecwipe.js +++ b/scripts/commands/utility/ecwipe.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name ecwipe @@ -20,17 +19,17 @@ export function ecwipe(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide whos ender chest inventory to wipe!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide whos ender chest inventory to wipe!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); - return Commands.run(`execute "${member.nameTag}" ~~~ function tools/ecwipe`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${member.nameTag}" ~~~ function tools/ecwipe`); } diff --git a/scripts/commands/utility/fly.js b/scripts/commands/utility/fly.js index e057ae6c5..57923c693 100644 --- a/scripts/commands/utility/fly.js +++ b/scripts/commands/utility/fly.js @@ -2,8 +2,7 @@ /* eslint no-redeclare: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name fly @@ -20,9 +19,9 @@ export function fly(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } // try to find the player requested @@ -30,23 +29,23 @@ export function fly(message, args) { if (!member) var member = player.nameTag; - Commands.run(`execute "${member}" ~~~ function tools/fly`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute "${member}" ~~~ function tools/fly`); // I find try/catch to be completely unorthodox for this lol try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=flying]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=flying]`); if (player.nameTag === member) { - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has enabled fly mode for themselves."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has enabled fly mode for themselves."}]}`); } else if (player.nameTag != member) { - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has enabled fly mode for ${member}."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has enabled fly mode for ${member}."}]}`); } else { return } } catch { if (player.nameTag === member) { - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has disabled fly mode for themselves."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has disabled fly mode for themselves."}]}`); } else if (player.nameTag != member) { - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has disabled fly mode for ${member}."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.nameTag} has disabled fly mode for ${member}."}]}`); } else { return } diff --git a/scripts/commands/utility/freeze.js b/scripts/commands/utility/freeze.js index 75675fc6e..fde5a2a84 100644 --- a/scripts/commands/utility/freeze.js +++ b/scripts/commands/utility/freeze.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name freeze @@ -20,17 +19,17 @@ export function freeze(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide which target to freeze!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide which target to freeze!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); - return Commands.run(`execute "${member.nameTag}" ~~~ function tools/freeze`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${member.nameTag}" ~~~ function tools/freeze`); } diff --git a/scripts/commands/utility/fullreport.js b/scripts/commands/utility/fullreport.js index 1a9f9adca..0153d317f 100644 --- a/scripts/commands/utility/fullreport.js +++ b/scripts/commands/utility/fullreport.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name fullreport @@ -18,10 +17,10 @@ export function fullreport(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute @a ~~~ function tools/stats`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute @a ~~~ function tools/stats`); } diff --git a/scripts/commands/utility/invsee.js b/scripts/commands/utility/invsee.js index 4eac9f6bd..63176e232 100644 --- a/scripts/commands/utility/invsee.js +++ b/scripts/commands/utility/invsee.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; // found the inventory viewing scipt in the bedrock addons discord, unsure of the original owner (not my code) /** @@ -21,23 +20,23 @@ export function invsee(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide whos inventory to view!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide whos inventory to view!"}]}`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); let container = member.getComponent('inventory').container; - Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${member.nameTag}'s inventory:\n\n"}]}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${member.nameTag}'s inventory:\n\n"}]}`); for (let i = 0; i < container.size; i++) if (container.getItem(i)) { let o = container.getItem(i); - Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Slot ${i}: ${o.id}:${o.data} x${o.amount}"}]}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Slot ${i}: ${o.id}:${o.data} x${o.amount}"}]}`); } } diff --git a/scripts/commands/utility/notify.js b/scripts/commands/utility/notify.js index 578c83508..419fac5f7 100644 --- a/scripts/commands/utility/notify.js +++ b/scripts/commands/utility/notify.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name notify @@ -17,10 +16,10 @@ export function notify(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function notify`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function notify`); } diff --git a/scripts/commands/utility/stats.js b/scripts/commands/utility/stats.js index b5f0aa329..d98717583 100644 --- a/scripts/commands/utility/stats.js +++ b/scripts/commands/utility/stats.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name stats @@ -20,17 +19,17 @@ export function stats(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - if (!args.length) return Commands.run(`execute "${player.nameTag}" ~~~ function tools/stats`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function tools/stats`); // try to find the player requested for (let pl of World.getPlayers()) if (pl.nameTag.toLowerCase().includes(args[0].toLowerCase().replace("@", "").replace("\"", ""))) var member = pl; - if (!member) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`, World.getDimension("overworld")); + if (!member) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"Couldnt find that player!"}]}`); - return Commands.run(`execute "${member.nameTag}" ~~~ function tools/stats`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${member.nameTag}" ~~~ function tools/stats`); } diff --git a/scripts/commands/utility/tag.js b/scripts/commands/utility/tag.js index a2f49f818..5e8da9fc3 100644 --- a/scripts/commands/utility/tag.js +++ b/scripts/commands/utility/tag.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name tag @@ -22,9 +21,9 @@ export function tag(message, args) { // make sure the user has permissions to run the command try { - Commands.run(`execute @a[name="${player.nameTag}",tag=op] ~~~ list`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute @a[name="${player.nameTag}",tag=op] ~~~ list`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } // check if array contains the string 'reset' @@ -33,7 +32,7 @@ export function tag(message, args) { // reset user nametag if (argcheck === true) { player.nameTag = player.name; - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.name} has reset their nametag"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.name} has reset their nametag"}]}`); } let nametag = `§4[§6${args.join(" ")}§4]§r <${player.name}>`; @@ -41,9 +40,9 @@ export function tag(message, args) { // input sanitization nametag = nametag.replace("\\", "").replace("\"", ""); - if (!args.length) return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide a tag!"}]}`, World.getDimension("overworld")); + if (!args.length) return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to provide a tag!"}]}`); player.nameTag = nametag; - return Commands.run(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.name} has changed their nametag to ${nametag}"}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw @a[tag=op] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"${player.name} has changed their nametag to ${nametag}"}]}`); } diff --git a/scripts/commands/utility/vanish.js b/scripts/commands/utility/vanish.js index cf7edebb8..6ca9e9b82 100644 --- a/scripts/commands/utility/vanish.js +++ b/scripts/commands/utility/vanish.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name vanish @@ -17,10 +16,10 @@ export function vanish(message) { // make sure the user has permissions to run the command try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=op]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=op]`); } catch (error) { - return Commands.run(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`tellraw "${player.nameTag}" {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"text":"You need to be Paradox-Opped to use this command."}]}`); } - return Commands.run(`execute "${player.nameTag}" ~~~ function tools/vanish`, World.getDimension("overworld")); + return World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ function tools/vanish`); } diff --git a/scripts/penrose/beforechatevent/chat/chatfilter.js b/scripts/penrose/beforechatevent/chat/chatfilter.js index e6e51200e..175e45d03 100644 --- a/scripts/penrose/beforechatevent/chat/chatfilter.js +++ b/scripts/penrose/beforechatevent/chat/chatfilter.js @@ -1,7 +1,6 @@ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const ChatFilter = () => { World.events.beforeChat.subscribe(msg => { @@ -11,10 +10,10 @@ const ChatFilter = () => { // add's user custom tags to their messages if it exists or we fall back // also filter for non ASCII characters and remove them in messages if (player.name && player.name !== player.nameTag && !msg.cancel) { - Commands.run(`tellraw @a {"rawtext":[{"text":"${player.nameTag} ${msg.message.replace(/[^\x00-\xFF]/g, "")}"}]}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`tellraw @a {"rawtext":[{"text":"${player.nameTag} ${msg.message.replace(/[^\x00-\xFF]/g, "")}"}]}`); msg.cancel = true; } else if (player.name && player.name === player.nameTag && !msg.cancel) { - Commands.run(`tellraw @a {"rawtext":[{"text":"<${player.nameTag}> ${msg.message.replace(/[^\x00-\xFF]/g, "")}"}]}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`tellraw @a {"rawtext":[{"text":"<${player.nameTag}> ${msg.message.replace(/[^\x00-\xFF]/g, "")}"}]}`); msg.cancel = true; } }) diff --git a/scripts/penrose/beforechatevent/chat/prefixcommand.js b/scripts/penrose/beforechatevent/chat/prefixcommand.js index 9428fe1f6..a87f45f0d 100644 --- a/scripts/penrose/beforechatevent/chat/prefixcommand.js +++ b/scripts/penrose/beforechatevent/chat/prefixcommand.js @@ -1,7 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { commandHandler } from "../../../commands/handler.js"; -const World = Minecraft.World; +const World = Minecraft.world; const PrefixCommand = () => { World.events.beforeChat.subscribe(msg => { diff --git a/scripts/penrose/beforechatevent/spammer/badpackets_2.js b/scripts/penrose/beforechatevent/spammer/badpackets_2.js index a2acd01ec..c1904e890 100644 --- a/scripts/penrose/beforechatevent/spammer/badpackets_2.js +++ b/scripts/penrose/beforechatevent/spammer/badpackets_2.js @@ -2,7 +2,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag } from "../../../util.js"; import config from "../../../data/config.js"; -const World = Minecraft.World; +const World = Minecraft.world; const BadPackets2 = () => { World.events.beforeChat.subscribe(msg => { diff --git a/scripts/penrose/beforechatevent/spammer/spammer_a.js b/scripts/penrose/beforechatevent/spammer/spammer_a.js index 24731b6ec..ce2fd4c2e 100644 --- a/scripts/penrose/beforechatevent/spammer/spammer_a.js +++ b/scripts/penrose/beforechatevent/spammer/spammer_a.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag, getTags } from "../../../util.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const SpammerA = () => { World.events.beforeChat.subscribe(msg => { @@ -15,7 +14,7 @@ const SpammerA = () => { // Spammer/A = checks if someone sends a message while moving and on ground if (playerTags.includes('moving') && playerTags.includes('ground') && !playerTags.includes('jump')) { try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=moving,tag=ground,tag=!jump]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=moving,tag=ground,tag=!jump]`); flag(player, "Spammer", "A", "Movement", false, false, true, msg); } catch (error) {} } diff --git a/scripts/penrose/beforechatevent/spammer/spammer_b.js b/scripts/penrose/beforechatevent/spammer/spammer_b.js index b40afa5e0..dad535cda 100644 --- a/scripts/penrose/beforechatevent/spammer/spammer_b.js +++ b/scripts/penrose/beforechatevent/spammer/spammer_b.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag, getTags } from "../../../util.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const SpammerB = () => { World.events.beforeChat.subscribe(msg => { @@ -15,7 +14,7 @@ const SpammerB = () => { // Spammer/B = checks if someone sends a message while swinging their hand if (playerTags.includes('left')) { try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=left]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=left]`); flag(player, "Spammer", "B", "Combat", false, false, false, msg); } catch (error) {} } diff --git a/scripts/penrose/beforechatevent/spammer/spammer_c.js b/scripts/penrose/beforechatevent/spammer/spammer_c.js index 167c84c63..799514cdd 100644 --- a/scripts/penrose/beforechatevent/spammer/spammer_c.js +++ b/scripts/penrose/beforechatevent/spammer/spammer_c.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag, getTags } from "../../../util.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const SpammerC = () => { World.events.beforeChat.subscribe(msg => { @@ -15,7 +14,7 @@ const SpammerC = () => { // Spammer/C = checks if someone sends a message while using an item if (playerTags.includes('right')) { try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=right]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=right]`); flag(player, "Spammer", "C", "Misc", false, false, false, msg); } catch (error) {} } diff --git a/scripts/penrose/beforechatevent/spammer/spammer_d.js b/scripts/penrose/beforechatevent/spammer/spammer_d.js index cd8a7cde6..587e42bc1 100644 --- a/scripts/penrose/beforechatevent/spammer/spammer_d.js +++ b/scripts/penrose/beforechatevent/spammer/spammer_d.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag, getTags } from "../../../util.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const SpammerD = () => { World.events.beforeChat.subscribe(msg => { @@ -15,7 +14,7 @@ const SpammerD = () => { // Spammer/D = checks if someone sends a message while having a GUI open if (playerTags.includes('hasGUIopen')) { try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=hasGUIopen]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=hasGUIopen]`); flag(player, "Spammer", "D", "Misc", false, false, false, msg); } catch (error) {} } diff --git a/scripts/penrose/tickevent/ban/globalbanlist.js b/scripts/penrose/tickevent/ban/globalbanlist.js index e07086eac..5dd18ef08 100644 --- a/scripts/penrose/tickevent/ban/globalbanlist.js +++ b/scripts/penrose/tickevent/ban/globalbanlist.js @@ -3,8 +3,7 @@ import { banplayer } from "../../../data/globalban.js"; import { banMessage } from "../../../util.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const GlobalBanList = () => { setTickInterval(() => { @@ -19,14 +18,14 @@ const GlobalBanList = () => { try { // test if they have the tag first or global ban will fail if we attempt to tag with an existing tag // if they are not tagged then we do that here before we ban - Commands.run(`testfor @a[name="${player.nameTag}",tag=!"By:Paradox Anticheat"]`, World.getDimension("overworld")); - Commands.run(`tag "${player.nameTag}" add "By:Paradox Anticheat"`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=!"By:Paradox Anticheat"]`); + World.getDimension("overworld").runCommand(`tag "${player.nameTag}" add "By:Paradox Anticheat"`); } catch (error) {} try { // test if they have the tag first or global ban will fail if we attempt to tag with an existing tag // if they are not tagged then we do that here before we ban - Commands.run(`testfor @a[name="${player.nameTag}",tag=!"Reason:You are Paradox Anticheat global banned!"]`, World.getDimension("overworld")); - Commands.run(`tag "${player.nameTag}" add "Reason:You are Paradox Anticheat global banned!"`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=!"Reason:You are Paradox Anticheat global banned!"]`); + World.getDimension("overworld").runCommand(`tag "${player.nameTag}" add "Reason:You are Paradox Anticheat global banned!"`); } catch (error2) {} banMessage(player); } diff --git a/scripts/penrose/tickevent/ban/serverban.js b/scripts/penrose/tickevent/ban/serverban.js index 7bcd58a6d..8a88cdfed 100644 --- a/scripts/penrose/tickevent/ban/serverban.js +++ b/scripts/penrose/tickevent/ban/serverban.js @@ -2,8 +2,7 @@ import * as Minecraft from "mojang-minecraft"; import { banMessage } from "../../../util.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const ServerBan = () => { setTickInterval(() => { @@ -15,7 +14,7 @@ const ServerBan = () => { // Ban message try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=isBanned]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=isBanned]`); banMessage(player); } catch(error) {} } diff --git a/scripts/penrose/tickevent/bedrock/bedrockvalidate.js b/scripts/penrose/tickevent/bedrock/bedrockvalidate.js index 8c0b9a920..87001235f 100644 --- a/scripts/penrose/tickevent/bedrock/bedrockvalidate.js +++ b/scripts/penrose/tickevent/bedrock/bedrockvalidate.js @@ -2,8 +2,7 @@ import * as Minecraft from "mojang-minecraft"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const BedrockValidate = () => { setTickInterval(() => { @@ -17,13 +16,13 @@ const BedrockValidate = () => { if (config.modules.bedrockValidate.overworld) { try { // only run the rest of the commands if the player is in the overworld - Commands.run(`testfor @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}]`); try { - Commands.run(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-20 -64 ~-20 ~20 -64 ~20 bedrock`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-20 -64 ~-20 ~20 -64 ~20 bedrock`); } catch (error) {} try { - Commands.run(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-4 -59 ~-4 ~4 319 ~4 air 0 replace bedrock`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-4 -59 ~-4 ~4 319 ~4 air 0 replace bedrock`); } catch (error) {} } catch (error) {} } @@ -31,17 +30,17 @@ const BedrockValidate = () => { if (config.modules.bedrockValidate.nether) { try { // only run the rest of the commands if the player is in the nether - Commands.run(`testfor @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}]`, World.getDimension("nether")); + World.getDimension("nether").runCommand(`testfor @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}]`); try { - Commands.run(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-10 0 ~-10 ~10 0 ~10 bedrock`, World.getDimension("nether")); + World.getDimension("nether").runCommand(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-10 0 ~-10 ~10 0 ~10 bedrock`); } catch (error) {} try { - Commands.run(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-10 127 ~-10 ~10 127 ~10 bedrock`, World.getDimension("nether")); + World.getDimension("nether").runCommand(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-10 127 ~-10 ~10 127 ~10 bedrock`); } catch (error) {} try { - Commands.run(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-5 5 ~-5 ~5 120 ~5 air 0 replace bedrock`, World.getDimension("nether")); + World.getDimension("nether").runCommand(`execute @a[name="${player.nameTag}",rm=0,scores={bedrock=1..}] ~~~ fill ~-5 5 ~-5 ~5 120 ~5 air 0 replace bedrock`); } catch (error) {} } catch(error) {} } diff --git a/scripts/penrose/tickevent/coordinates/playerposition.js b/scripts/penrose/tickevent/coordinates/playerposition.js index bdede455b..85058f4f9 100644 --- a/scripts/penrose/tickevent/coordinates/playerposition.js +++ b/scripts/penrose/tickevent/coordinates/playerposition.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const PlayerPosition = () => { setTickInterval(() => { @@ -14,9 +13,9 @@ const PlayerPosition = () => { // player position try { - Commands.run(`scoreboard players set "${player.nameTag}" xPos ${Math.floor(player.location.x)}`, World.getDimension("overworld")); - Commands.run(`scoreboard players set "${player.nameTag}" yPos ${Math.floor(player.location.y)}`, World.getDimension("overworld")); - Commands.run(`scoreboard players set "${player.nameTag}" zPos ${Math.floor(player.location.z)}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`scoreboard players set "${player.nameTag}" xPos ${Math.floor(player.location.x)}`); + World.getDimension("overworld").runCommand(`scoreboard players set "${player.nameTag}" yPos ${Math.floor(player.location.y)}`); + World.getDimension("overworld").runCommand(`scoreboard players set "${player.nameTag}" zPos ${Math.floor(player.location.z)}`); } catch(e) {} } }, 20) //Executes every 1 seconds diff --git a/scripts/penrose/tickevent/crasher/crasher_a.js b/scripts/penrose/tickevent/crasher/crasher_a.js index 911e86372..9fddead70 100644 --- a/scripts/penrose/tickevent/crasher/crasher_a.js +++ b/scripts/penrose/tickevent/crasher/crasher_a.js @@ -2,7 +2,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag } from "../../../util.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; +const World = Minecraft.world; const CrasherA = () => { setTickInterval(() => { diff --git a/scripts/penrose/tickevent/fly/fly_a.js b/scripts/penrose/tickevent/fly/fly_a.js index 9433440df..e74a9883b 100644 --- a/scripts/penrose/tickevent/fly/fly_a.js +++ b/scripts/penrose/tickevent/fly/fly_a.js @@ -2,8 +2,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag, getTags } from "../../../util.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const FlyA = () => { setTickInterval(() => { @@ -20,7 +19,7 @@ const FlyA = () => { if(Math.abs(player.velocity.y).toFixed(4) == 0.2250) { if(playerTags.includes('moving') && !playerTags.includes('ground') && !playerTags.includes('gliding') && !playerTags.includes('levitating') && !playerTags.includes('flying')) { try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=moving,tag=!ground,tag=!gliding,tag=!levitating,m=!c,tag=!flying]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=moving,tag=!ground,tag=!gliding,tag=!levitating,m=!c,tag=!flying]`); flag(player, "Fly", "A", "Movement", "yVelocity", Math.abs(player.velocity.y).toFixed(4), true, false); } catch(error) {} } diff --git a/scripts/penrose/tickevent/gametestloaded/gametestcheck.js b/scripts/penrose/tickevent/gametestloaded/gametestcheck.js index 605d226a4..af34461cc 100644 --- a/scripts/penrose/tickevent/gametestloaded/gametestcheck.js +++ b/scripts/penrose/tickevent/gametestloaded/gametestcheck.js @@ -1,8 +1,7 @@ import * as Minecraft from "mojang-minecraft"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; let loaded = false; @@ -13,15 +12,15 @@ const GametestCheck = () => { try { if (!loaded) { const players = World.getPlayers().map(player => player.nameTag); - Commands.run(`testfor @a[name="${players[0]}"]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${players[0]}"]`); try { // (1..) gametest already enabled so set loaded to true and do nothing - Commands.run(`testfor @a[scores={gametestapi=1..}]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[scores={gametestapi=1..}]`); loaded = true; } catch { // (..0) gametest needs to be enabled (1..) then set loaded to true - Commands.run(`testfor @a[scores={gametestapi=..0}]`, World.getDimension("overworld")); - Commands.run(`execute "${players[0]}" ~~~ function checks/gametestapi`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[scores={gametestapi=..0}]`); + World.getDimension("overworld").runCommand(`execute "${players[0]}" ~~~ function checks/gametestapi`); loaded = true; return; } diff --git a/scripts/penrose/tickevent/illegalitems/illegalitems_a.js b/scripts/penrose/tickevent/illegalitems/illegalitems_a.js index 04525c984..b5f0bae53 100644 --- a/scripts/penrose/tickevent/illegalitems/illegalitems_a.js +++ b/scripts/penrose/tickevent/illegalitems/illegalitems_a.js @@ -3,12 +3,12 @@ import { illegalitems } from "../../../data/itemban.js" import { getTags } from "../../../util.js"; import config from "../../../data/config.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const IllegalItemsA = () => { World.events.tick.subscribe(() => { - World.getPlayers().forEach(player => { + var players = World.getPlayers() + for (const player of players) { // fix a disabler method player.nameTag = player.nameTag.replace("\"", ""); @@ -30,13 +30,13 @@ const IllegalItemsA = () => { inventory_items.forEach(item => { if (illegalitems.includes(item) && !playerTags.includes('op') || item > config.modules.illegalitemsA.maxStack && !playerTags.includes('op')) { try { - Commands.run(`clear "${player.nameTag}"`, World.getDimension('overworld')) - Commands.run(`tag "${player.nameTag}" add "isBanned"`, World.getDimension('overworld')) + World.getDimension('overworld').runCommand(`clear "${player.nameTag}"`) + World.getDimension('overworld').runCommand(`tag "${player.nameTag}" add "isBanned"`) } catch (error) {} player.triggerEvent('paradox:kick') } }) - }) + } }) } diff --git a/scripts/penrose/tickevent/invalidsprint/invalidsprint_a.js b/scripts/penrose/tickevent/invalidsprint/invalidsprint_a.js index 0e9973516..f68377fd5 100644 --- a/scripts/penrose/tickevent/invalidsprint/invalidsprint_a.js +++ b/scripts/penrose/tickevent/invalidsprint/invalidsprint_a.js @@ -2,8 +2,7 @@ import * as Minecraft from "mojang-minecraft"; import { flag, getTags } from "../../../util.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const InvalidSprintA = () => { setTickInterval(() => { @@ -19,7 +18,7 @@ const InvalidSprintA = () => { // invalidsprint/a = checks for sprinting with the blindness effect if (player.getEffect(Minecraft.MinecraftEffectTypes.blindness) && playerTags.includes('sprint')) { try { - Commands.run(`testfor @a[name=${player.nameTag},tag=sprint]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name=${player.nameTag},tag=sprint]`); flag(player, "InvalidSprint", "A", "Movement", false, false, true, false); } catch(error) {} } diff --git a/scripts/penrose/tickevent/jesus/jesus_b.js b/scripts/penrose/tickevent/jesus/jesus_b.js index 250b64799..0993bdb2d 100644 --- a/scripts/penrose/tickevent/jesus/jesus_b.js +++ b/scripts/penrose/tickevent/jesus/jesus_b.js @@ -3,8 +3,7 @@ import { flag, getTags } from "../../../util.js"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const JesusB = () => { setTickInterval(() => { @@ -22,9 +21,9 @@ const JesusB = () => { if (Math.abs(player.velocity.y).toFixed(4) <= config.modules.jesusB.maxMotion && Math.abs(player.velocity.y).toFixed(4) >= config.modules.jesusB.minMotion && !player.getEffect(Minecraft.MinecraftEffectTypes.slowFalling)) { try { // Make sure Anti Jesus is turned on - Commands.run(`testfor @a[name="${player.nameTag}",scores={jesus=1..}]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",scores={jesus=1..}]`); if (!playerTags.includes('flying') && !playerTags.includes('jump') && !playerTags.includes('ground') && !playerTags.includes('gliding') && !playerTags.includes('levitating') && !playerTags.includes('vanish') && !playerTags.includes('swimming') ) { - Commands.run(`execute @a[name="${player.nameTag}",tag=!flying,m=!c,tag=!jump,tag=!ground,tag=!gliding,tag=!levitating,tag=!vanish,tag=!swimming] ~~~ detect ~~-1~ water 0 list`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute @a[name="${player.nameTag}",tag=!flying,m=!c,tag=!jump,tag=!ground,tag=!gliding,tag=!levitating,tag=!vanish,tag=!swimming] ~~~ detect ~~-1~ water 0 list`); flag(player, "Jesus", "B", "Movement", "yMotion", Math.abs(player.velocity.y).toFixed(4), true, false); } } catch (error2) {} diff --git a/scripts/penrose/tickevent/knockback/antikb_a.js b/scripts/penrose/tickevent/knockback/antikb_a.js index 45255a40a..63e82dc0a 100644 --- a/scripts/penrose/tickevent/knockback/antikb_a.js +++ b/scripts/penrose/tickevent/knockback/antikb_a.js @@ -3,8 +3,7 @@ import { flag, getTags } from "../../../util.js"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const AntiKnockbackA = () => { setTickInterval(() => { @@ -22,9 +21,9 @@ const AntiKnockbackA = () => { if(playerTags.includes('attacked') && !playerTags.includes('dead') && !playerTags.includes('gliding') && !playerTags.includes('levitating') && !playerTags.includes('flying')) { try { // Make sure Anti Knockback is turned on - Commands.run(`testfor @a[name="${player.nameTag}",scores={antikb=1..}]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",scores={antikb=1..}]`); flag(player, "AntiKB", "A", "Movement", "Magnitude", (player.velocity.y + player.velocity.x + player.velocity.z).toFixed(3), true, false); - Commands.run(`scoreboard players add @a[name="${player.nameTag}"] velocityvl 1`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`scoreboard players add @a[name="${player.nameTag}"] velocityvl 1`); } catch(error) {} } } diff --git a/scripts/penrose/tickevent/namespoof/namespoof_a.js b/scripts/penrose/tickevent/namespoof/namespoof_a.js index 254fbc037..aa880f275 100644 --- a/scripts/penrose/tickevent/namespoof/namespoof_a.js +++ b/scripts/penrose/tickevent/namespoof/namespoof_a.js @@ -3,7 +3,7 @@ import { flag } from "../../../util.js"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; +const World = Minecraft.world; const NamespoofA = () => { setTickInterval(() => { diff --git a/scripts/penrose/tickevent/namespoof/namespoof_b.js b/scripts/penrose/tickevent/namespoof/namespoof_b.js index 12d2e65a7..1a7de7395 100644 --- a/scripts/penrose/tickevent/namespoof/namespoof_b.js +++ b/scripts/penrose/tickevent/namespoof/namespoof_b.js @@ -3,7 +3,7 @@ import { flag } from "../../../util.js"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; +const World = Minecraft.world; const NamespoofB = () => { setTickInterval(() => { diff --git a/scripts/penrose/tickevent/noslow/noslow_a.js b/scripts/penrose/tickevent/noslow/noslow_a.js index 1732c0c15..700da158d 100644 --- a/scripts/penrose/tickevent/noslow/noslow_a.js +++ b/scripts/penrose/tickevent/noslow/noslow_a.js @@ -3,8 +3,7 @@ import { flag, getTags } from "../../../util.js"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const NoSlowA = () => { setTickInterval(() => { @@ -21,7 +20,7 @@ const NoSlowA = () => { if(Math.sqrt(Math.abs(player.velocity.x**2 + player.velocity.z**2)).toFixed(3) >= config.modules.noslowA.speed) { if (!player.getEffect(Minecraft.MinecraftEffectTypes.speed) && playerTags.includes('ground') && playerTags.includes('sprint') && !playerTags.includes('jump') && !playerTags.includes('gliding') && !playerTags.includes('swimming')) { try { - Commands.run(`testfor @a[name="${player.nameTag}",tag=ground,tag=sprint,tag=!jump,tag=!gliding,tag=!swimming]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`testfor @a[name="${player.nameTag}",tag=ground,tag=sprint,tag=!jump,tag=!gliding,tag=!swimming]`); flag(player, "NoSlow", "A", "Movement", "speed", Math.sqrt(Math.abs(player.velocity.x**2 + player.velocity.z**2)).toFixed(3), true, false); } catch(error) {} } diff --git a/scripts/penrose/tickevent/reach/reach_a.js b/scripts/penrose/tickevent/reach/reach_a.js index 255fa3597..ddd6a03c0 100644 --- a/scripts/penrose/tickevent/reach/reach_a.js +++ b/scripts/penrose/tickevent/reach/reach_a.js @@ -3,8 +3,7 @@ import { getTags } from "../../../util.js"; import config from "../../../data/config.js"; import { setTickInterval } from "../../../timer/scheduling.js"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; const ReachA = () => { setTickInterval(() => { @@ -20,10 +19,10 @@ const ReachA = () => { // reach/a if (playerTags.includes('attack')) { try { // we could use r=4 but that wont account for lag - Commands.run(`execute @a[name="${player.nameTag}",tag=attack,m=!c] ~~~ testfor @p[name=!"${player.nameTag}",r=${config.modules.reachA.reach}]`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute @a[name="${player.nameTag}",tag=attack,m=!c] ~~~ testfor @p[name=!"${player.nameTag}",r=${config.modules.reachA.reach}]`); } catch (error) { try { - Commands.run(`execute @a[name="${player.nameTag}",tag=attack,m=!c] ~~~ function checks/alerts/reach`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`execute @a[name="${player.nameTag}",tag=attack,m=!c] ~~~ function checks/alerts/reach`); } catch (error2) {} } } diff --git a/scripts/timer/scheduling.js b/scripts/timer/scheduling.js index 6a7d55e7a..88df57441 100644 --- a/scripts/timer/scheduling.js +++ b/scripts/timer/scheduling.js @@ -3,7 +3,7 @@ */ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; +const World = Minecraft.world; const tickTimeoutMap = new Map(); const tickIntervalMap = new Map(); diff --git a/scripts/util.js b/scripts/util.js index 8b89596be..656e03aa7 100644 --- a/scripts/util.js +++ b/scripts/util.js @@ -1,8 +1,7 @@ /* eslint no-var: "off"*/ import * as Minecraft from "mojang-minecraft"; -const World = Minecraft.World; -const Commands = Minecraft.Commands; +const World = Minecraft.world; /** * @name flag @@ -25,31 +24,31 @@ export function flag(player, check, checkType, hackType, debugName, debug, shoul // make sure the vl objective exists try { - Commands.run(`scoreboard objectives add ${check.toLowerCase()}vl dummy`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`scoreboard objectives add ${check.toLowerCase()}vl dummy`); } catch(error) {} // cancel the message if (message) message.cancel = true; - if(shouldTP && check !== "Crasher") Commands.run(`tp "${player.nameTag}" "${player.nameTag}"`, World.getDimension("overworld")); - else if(shouldTP && check === "Crasher") Commands.run(`tp "${player.nameTag}" 30000000 30000000 30000000`, World.getDimension("overworld")); + if(shouldTP && check !== "Crasher") World.getDimension("overworld").runCommand(`tp "${player.nameTag}" "${player.nameTag}"`); + else if(shouldTP && check === "Crasher") World.getDimension("overworld").runCommand(`tp "${player.nameTag}" 30000000 30000000 30000000`); - Commands.run(`scoreboard players add "${player.nameTag}" ${check.toLowerCase()}vl 1`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`scoreboard players add "${player.nameTag}" ${check.toLowerCase()}vl 1`); try { - if(debug) Commands.run(`execute "${player.nameTag}" ~~~ tellraw @a[tag=notify] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"selector":"@s"},{"text":" §1has failed §7(${hackType}) §4${check}/${checkType} §7(${debugName}=${debug})§4. VL= "},{"score":{"name":"@s","objective":"${check.toLowerCase()}vl"}}]}`, World.getDimension("overworld")); - else Commands.run(`execute "${player.nameTag}" ~~~ tellraw @a[tag=notify] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"selector":"@s"},{"text":" §1has failed §7(${hackType}) §4${check}/${checkType}. VL= "},{"score":{"name":"@s","objective":"${check.toLowerCase()}vl"}}]}`, World.getDimension("overworld")); + if(debug) World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ tellraw @a[tag=notify] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"selector":"@s"},{"text":" §1has failed §7(${hackType}) §4${check}/${checkType} §7(${debugName}=${debug})§4. VL= "},{"score":{"name":"@s","objective":"${check.toLowerCase()}vl"}}]}`); + else World.getDimension("overworld").runCommand(`execute "${player.nameTag}" ~~~ tellraw @a[tag=notify] {"rawtext":[{"text":"§r§4[§6Paradox§4]§r "},{"selector":"@s"},{"text":" §1has failed §7(${hackType}) §4${check}/${checkType}. VL= "},{"score":{"name":"@s","objective":"${check.toLowerCase()}vl"}}]}`); } catch(error) {} if (slot >= 0) { try { - if(slot <= 8) Commands.run(`replaceitem entity "${player.nameTag}" slot.hotbar ${slot} air 1`, World.getDimension("overworld")); - else Commands.run(`replaceitem entity "${player.nameTag}" slot.inventory ${slot - 9} air 1`, World.getDimension("overworld")); + if(slot <= 8) World.getDimension("overworld").runCommand(`replaceitem entity "${player.nameTag}" slot.hotbar ${slot} air 1`); + else World.getDimension("overworld").runCommand(`replaceitem entity "${player.nameTag}" slot.inventory ${slot - 9} air 1`); } catch(error) {console.warn(`${new Date()} | ` + error);} } try { - if (check === "Namespoof") Commands.run(`kick "${player.nameTag}" §r§4[§6Paradox§4]§r Invalid username`, World.getDimension("overworld")); + if (check === "Namespoof") World.getDimension("overworld").runCommand(`kick "${player.nameTag}" §r§4[§6Paradox§4]§r Invalid username`); } catch(error) { // if we cant kick them with /kick then we instant despawn them player.triggerEvent("paradox:kick"); @@ -64,7 +63,7 @@ export function banMessage(player) { // validate that required params are defined if (!player) return console.warn(`${new Date()} | ` + "Error: ${player} isnt defined. Did you forget to pass it? (./util.js:68)"); - let tags = Commands.run(`tag "${player.nameTag}" list`, World.getDimension('overworld')).statusMessage.replace(/§./g, '').match(/(?<=: ).*$/g); + let tags = player.getTags(); if (tags) tags = String(tags).split(/[,]/); var reason; @@ -77,7 +76,7 @@ export function banMessage(player) { }); try { - Commands.run(`kick "${player.nameTag}" §r\n§l§cYOU ARE BANNED!\n§r\n§eBanned By:§r ${by || "N/A"}\n§bReason:§r ${reason || "N/A"}`, World.getDimension("overworld")); + World.getDimension("overworld").runCommand(`kick "${player.nameTag}" §r\n§l§cYOU ARE BANNED!\n§r\n§eBanned By:§r ${by || "N/A"}\n§bReason:§r ${reason || "N/A"}`); } catch(error) { // if we cant kick them with /kick then we instant despawn them player.triggerEvent("paradox:kick"); @@ -92,7 +91,7 @@ export function getTags(player) { // validate that required params are defined if (!player) return console.warn(`${new Date()} | ` + "Error: ${player} isnt defined. Did you forget to pass it? (./util.js:91)"); - let tags = Commands.run(`tag "${player.nameTag}" list`, World.getDimension('overworld')).statusMessage.replace(/§./g, '').match(/(?<=: ).*$/g); + let tags = player.getTags(); return String(tags); } \ No newline at end of file