finish integrating mtutils

perkinslr · Aug 8, 2022 · b27c76f · b27c76f
1 parent d0c51ad
commit b27c76f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 35 deletions.
diff --git a/library/mtscript/public/InitAthena.mts b/library/mtscript/public/InitAthena.mts
@@ -0,0 +1,5 @@
+[h: args=(base64.decode(macro.args))]
+[h: ns=json.get(args, 0)]
+[h: serverName=json.get(args, 1)]
+
+[h: js.evalNS(ns, "initAthena(MTScript.getMTScriptCallingArgs()[0])", serverName)]
diff --git a/library/mtscript/public/SetServer.mts b/library/mtscript/public/SetServer.mts
@@ -1,5 +1 @@
-[h: args=(base64.decode(macro.args))]
-[h: ns=json.get(args, 0)]
-[h: serverName=json.get(args, 1)]
-
-[h: js.evalNS(ns, "initAthena(MTScript.getMTScriptCallingArgs()[0])", serverName)]
+[h: js.setServer(macro.args)]
diff --git a/library/public/athena.js b/library/public/athena.js
@@ -57,36 +57,6 @@ catch (e) {
     MapTool.chat.broadcast(e.stack)
 }
 
-/*
-let playerName = MTScript.evalMacro('[r: playerName()]')
-let athenaServer = null
-let athenaClient
-
-
-
-if (isServer) {
-    load("com.lp-programming.maptool.athena", "/public/athenaServer.js")
-    athenaServer = new AthenaServer()
-    athenaClient = new AthenaClient(true, athenaServer)
-}
-else
-{
-    let link = "macro://GetServer@lib:com.lp-programming.maptool.utils/none/Impersonated?SetServer,com.lp-programming.maptool.athena,"+playerName
-    MTScript.setVariable("link", link)
-    MTScript.evalMacro(`[h: execLink(link, 1, "all")]`)
-}
-
-function initAthena() {
-    serverName = MTScript.getMTScriptCallingArgs()[0]
-    athenaClient = new AthenaClient(false, serverName)
-}
-
-
-
-
-*/
-
-
 function load(namespace, scriptName) {
     MTScript.setVariable("namespace", namespace);
     MTScript.setVariable("scriptName", scriptName);

diff --git a/library/public/setServer.js b/library/public/setServer.js
@@ -11,6 +11,7 @@ function errorWrapper(fn) {
     return fn
 }
 
+console.log("loading athena");
 try {
     let serverInfo = JSON.parse(""+MTScript.evalMacro(`[r: getInfo("server")]`))
     let isServer = serverInfo['personal server'] || serverInfo['hosting server']
@@ -28,6 +29,7 @@ try {
     }
 
     function setServer(name) {
+	console.log("setting server name to "+name);
 	serverName = name
     }
 
@@ -41,6 +43,7 @@ try {
 	    let target_name = args[2]
 
 	    if (isServer) {
+		console.log("responding with server name");
 		let playerName = MTScript.evalMacro(`[r: getPlayerName()]`)
 		let link = `macro://${response_macro}@lib:${macro_library}/none/Impersonated?${playerName}`
 		MTScript.setVariable("link", link)
@@ -60,6 +63,7 @@ try {
     MTScript.registerMacro("sendServer", errorWrapper(sendServer))
 
     if (!isServer) {
+	console.log("requesting server info");
 	let playerName = MTScript.evalMacro(`[r: getPlayerName()]`)
 	let link = "macro://GetServer@lib:com.lp-programming.maptool.athena/none/Impersonated?SetServer,com.lp-programming.maptool.athena," + playerName
 	MTScript.setVariable("link", link)