Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

let scripts require from the same mod (#1698)

Browse Source 
it seems fine to have
`require("mymod/script")`
e.g. if mods require a lot of scripts and want to organise it
This commit is contained in:
DeltaNedas
2020-03-26 22:30:34 +00:00
committed by GitHub
parent 935b22bf4a
commit b077cd7fb0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ public class Scripts implements Disposable{
if(matched.find()){ if(matched.find()){
LoadedMod required = Vars.mods.locateMod(matched.group(1)); LoadedMod required = Vars.mods.locateMod(matched.group(1));
String script = matched.group(2); String script = matched.group(2);
if(required == null || root.equals(required.root.child("scripts"))){ // Mod not found, or already using a mod if(required == null){ // Mod not found, treat it as a folder
Fi dir = root.child(matched.group(1)); Fi dir = root.child(matched.group(1));
if(!dir.exists()) return null; // Mod and folder not found if(!dir.exists()) return null; // Mod and folder not found
return loadSource(script, dir, validator); return loadSource(script, dir, validator);