mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

add mod name to js print() (#1677)

Browse Source 
* add mod name to js print()

* add mod name to errors
This commit is contained in:
Anuken 2020-03-05 15:58:10 -05:00 committed by GitHub
parent 0534a4da45
commit 89a5c957fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/scripts/base.js
View File

@ -5,7 +5,7 @@ const log = function(context, obj){
var scriptName = "base.js" var scriptName = "base.js"
var modName = "none" var modName = "none"
const print = text => log(scriptName, text); const print = text => log(modName + "/" + scriptName, text);
const extendContent = function(classType, name, params){ const extendContent = function(classType, name, params){
return new JavaAdapter(classType, params, name) return new JavaAdapter(classType, params, name)

3
core/src/mindustry/mod/Scripts.java
View File

@ -91,6 +91,9 @@ public class Scripts implements Disposable{
context.evaluateString(scope, script, file, 1, null); context.evaluateString(scope, script, file, 1, null);
return true; return true;
}catch(Throwable t){ }catch(Throwable t){
if(currentMod != null){
file = currentMod.name + "/" + file;
}
log(LogLevel.err, file, "" + getError(t)); log(LogLevel.err, file, "" + getError(t));
return false; return false;
} }