Scope Improved

Add this object as global scoped
 - world: World
 - system: System
 - afterEvents: EfterEvents
 - beforeEvents: BeforeEvents
 - systemEvents: SystemEvents

Author: conmaster2112

behavior_pack/manifest.json

@@ -5,7 +5,7 @@
 		"description": "Terminal with JS prompts by ConMaster2112",
 		"uuid": "4997eb94-8968-4158-864b-74f1999192f7",
 		"version": "1.0.0-beta",
-		"min_engine_version": [1, 20, 0]
+		"min_engine_version": [1, 20, 10]
 	},
 	"modules": [
 		{
@@ -16,7 +16,7 @@
 		}
 	],
 	"dependencies": [
-		{"module_name": "@minecraft/server","version": "1.3.0-beta"},
+		{"module_name": "@minecraft/server","version": "1.4.0-beta"},
         {"module_name": "@minecraft/server-ui","version": "1.1.0-beta"},
         {"module_name": "@minecraft/server-gametest","version": "1.0.0-beta"}
 	],

behavior_pack/scripts/con-terminal.d.ts

@@ -8,7 +8,7 @@ export declare enum LogTypes {
     error = 1,
     warn = 2
 }
-export declare function TerminalInput<s>(source: s, message: string, o?: (this: s, type: LogTypes, ...params: any[]) => void): Promise<{
+export declare function TerminalInput<s>(source: s, message: string, scope?: never[], o?: (this: s, type: LogTypes, ...params: any[]) => void): Promise<{
     type: OutputType;
     value: any;
     formatView: string;

behavior_pack/scripts/con-terminal.js

@@ -46,8 +46,8 @@ function consoleLike(type, ...texts) {
 function formatView(type, object) {
     return getView[typeof object](ViewStyle.Full, object);
 }
-export async function TerminalInput(source, message, o = consoleLike) {
-    const a = await RunCode(message, true, { console: { log: o.bind(source, LogTypes.log), Map, Set, warn: o.bind(source, LogTypes.warn), error: o.bind(source, LogTypes.error) }, print: o.bind(source, LogTypes.log), self: source, setTimeout, setInterval, clearInterval: clearRun, clearTimeout: clearRun });
+export async function TerminalInput(source, message, scope = [], o = consoleLike) {
+    const a = await RunCode(message, true, { console: { log: o.bind(source, LogTypes.log), Map, Set, warn: o.bind(source, LogTypes.warn), error: o.bind(source, LogTypes.error) }, print: o.bind(source, LogTypes.log), self: source, setTimeout, setInterval, clearInterval: clearRun, clearTimeout: clearRun }, ...scope);
     const { multicommand, startTime } = a;
     if (a.syntaxError)
         return { type: OutputType.SyntaxError, value: a.syntaxError, formatView: formatView(OutputType.SyntaxError, a.syntaxError), multicommand, startTime };

behavior_pack/scripts/index.js

@@ -8,7 +8,7 @@ world.beforeEvents.chatSend.subscribe(async (ev) => {
     if (reg !== null && sender.isOp() && sender.getDynamicProperty(propertyName)) {
         ev.cancel = true;
         const code = message.substring(reg[0].length);
-        const task = TerminalInput(sender, code).catch(er=>console.error(er,er.stack));
+        const task = TerminalInput(sender, code,[{system,world,beforeEvents:world.beforeEvents,afterEvents:world.afterEvents,systemEvents:system.events}]).catch(er=>console.error(er,er.stack));
         sender.sendMessage("  §l§h> §r§7" + code);
         const out = await task;
         switch (out.type) {
@@ -20,7 +20,7 @@ world.beforeEvents.chatSend.subscribe(async (ev) => {
                 return sender.sendMessage("  §l§4> §6" + out.value.message);
             case OutputType.Error:
             case 1:
-                return sender.sendMessage("  §l§6< §7" + out.value);
+                return sender.sendMessage("  §l§6< §7" + out.value);                                                                     
             default:
                 break;
         }

con-terminal.ts

@@ -45,8 +45,8 @@ function consoleLike(this: any, type: LogTypes,...texts: any[]): void{
 function formatView(type: OutputType, object: any): string{
     return getView[typeof object](ViewStyle.Full, object);
 }
-export async function TerminalInput<s>(source: s, message: string, o:(this: s, type: LogTypes,...params: any[])=>void = consoleLike){
-    const a = await RunCode(message, true, {console:{log:o.bind(source,LogTypes.log),Map,Set,warn:o.bind(source,LogTypes.warn),error:o.bind(source,LogTypes.error)},print:o.bind(source,LogTypes.log), self:source, setTimeout, setInterval, clearInterval:clearRun, clearTimeout:clearRun});
+export async function TerminalInput<s>(source: s, message: string, scope = [], o:(this: s, type: LogTypes,...params: any[])=>void = consoleLike){
+    const a = await RunCode(message, true, {console:{log:o.bind(source,LogTypes.log),Map,Set,warn:o.bind(source,LogTypes.warn),error:o.bind(source,LogTypes.error)},print:o.bind(source,LogTypes.log), self:source, setTimeout, setInterval, clearInterval:clearRun, clearTimeout:clearRun},...scope);
     const {multicommand, startTime} = a;
     if(a.syntaxError) return {type: OutputType.SyntaxError, value: a.syntaxError, formatView: formatView(OutputType.SyntaxError, a.syntaxError),multicommand, startTime};
     const output = await a.promise;