From c458c77322a4b2a73cd4a43a70ad4401a8d8cdf9 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sun, 2 Feb 2020 13:40:53 +0000 Subject: [PATCH] cleanup --- core/src/mindustry/mod/Scripts.java | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 8062c9cdc2..ad67fb3b8d 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -107,7 +107,7 @@ public class Scripts implements Disposable{ } private class ScriptModuleProvider extends UrlModuleSourceProvider{ - private Pattern directory = Pattern.compile("^(.+?)/(.+)"); + private Pattern directory = Pattern.compile("^(.+?)/(.+)"); public ScriptModuleProvider(){ super(null, null); } @@ -119,19 +119,19 @@ public class Scripts implements Disposable{ } private ModuleSource loadSource(LoadedMod mod, String moduleId, Fi root, Object validator) throws IOException, URISyntaxException{ - Matcher matched = directory.matcher(moduleId); - if(matched.find()){ - LoadedMod required = Vars.mods.locateMod(matched.group(1)); - String script = matched.group(2); - if(required == null || root == required.root.child("scripts")){ // Mod not found, or already using a mod - Fi dir = root.child(matched.group(1)); - if(dir == null) return null; // Mod and folder not found - return loadSource(mod, script, dir, validator); - } - return loadSource(required, script, required.root.child("scripts"), validator); - } + Matcher matched = directory.matcher(moduleId); + if(matched.find()){ + LoadedMod required = Vars.mods.locateMod(matched.group(1)); + String script = matched.group(2); + if(required == null || root == required.root.child("scripts")){ // Mod not found, or already using a mod + Fi dir = root.child(matched.group(1)); + if(dir == null) return null; // Mod and folder not found + return loadSource(mod, script, dir, validator); + } + return loadSource(required, script, required.root.child("scripts"), validator); + } - Fi module = root.child(moduleId + ".js"); + Fi module = root.child(moduleId + ".js"); if(!module.exists() || module.isDirectory()) return null; return new ModuleSource( new InputStreamReader(new ByteArrayInputStream((fillWrapper(module)).getBytes())),