From 829444388c976599037f20a5ae33c4196fa86c74 Mon Sep 17 00:00:00 2001 From: Jared Date: Tue, 20 Sep 2016 13:00:27 +0200 Subject: [PATCH] close #43 --- .../providers/ScriptProviderCustom.java | 8 +-- .../providers/ScriptProviderDirectory.java | 61 ++++++++++--------- .../minetweaker/mc1102/MineTweakerMod.java | 2 +- .../minetweaker/mc1710/MineTweakerMod.java | 2 +- .../java/minetweaker/mc18/MineTweakerMod.java | 2 +- 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderCustom.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderCustom.java index 78d0891..f1706d3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderCustom.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderCustom.java @@ -6,18 +6,17 @@ package minetweaker.runtime.providers; +import minetweaker.runtime.IScriptIterator; +import minetweaker.runtime.IScriptProvider; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; -import minetweaker.runtime.IScriptIterator; -import minetweaker.runtime.IScriptProvider; /** * @@ -44,6 +43,7 @@ public class ScriptProviderCustom implements IScriptProvider { @Override public Iterator getScripts() { + return Collections.singleton(new CustomScriptIterator()).iterator(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java index be1c5c5..d062bc4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java @@ -6,47 +6,48 @@ package minetweaker.runtime.providers; +import minetweaker.MineTweakerAPI; +import minetweaker.runtime.IScriptIterator; +import minetweaker.runtime.IScriptProvider; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import minetweaker.MineTweakerAPI; -import minetweaker.runtime.IScriptIterator; -import minetweaker.runtime.IScriptProvider; /** - * * @author Stan */ public class ScriptProviderDirectory implements IScriptProvider { - private final File directory; + private final File directory; - public ScriptProviderDirectory(File directory) { - if (directory == null) - throw new IllegalArgumentException("directory cannot be null"); + public ScriptProviderDirectory(File directory) { + if (directory == null) + throw new IllegalArgumentException("directory cannot be null"); - this.directory = directory; - } + this.directory = directory; + } - @Override - public Iterator getScripts() { - List scripts = new ArrayList(); - if (directory.exists()) { - for (File file : directory.listFiles()) { - if (file.isDirectory()) { - scripts.add(new ScriptIteratorDirectory(file)); - } else if (file.getName().endsWith(".zs")) { - scripts.add(new ScriptIteratorSingle(file)); - } else if (file.getName().endsWith(".zip")) { - try { - scripts.add(new ScriptIteratorZip(file)); - } catch (IOException ex) { - MineTweakerAPI.logError("Could not load " + file.getName() + ": " + ex.getMessage()); - } - } - } - } - return scripts.iterator(); - } + @Override + public Iterator getScripts() { + List scripts = new ArrayList(); + if (directory.exists()) { + for (File file : directory.listFiles()) { + if (file.isDirectory()) { + scripts.add(new ScriptIteratorDirectory(file)); + } else if (file.getName().endsWith(".zs")) { + scripts.add(new ScriptIteratorSingle(file)); + } else if (file.getName().endsWith(".zip")) { + try { + scripts.add(new ScriptIteratorZip(file)); + } catch (IOException ex) { + MineTweakerAPI.logError("Could not load " + file.getName() + ": " + ex.getMessage()); + } + } + } + } + scripts.sort((sc, sc1) -> sc.getName().compareTo(sc1.getName())); + return scripts.iterator(); + } } diff --git a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java index 11f38bf..9d7f87c 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java @@ -154,7 +154,7 @@ public class MineTweakerMod { } IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); - IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsLocal, scriptsGlobal); + IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsGlobal,scriptsLocal); MineTweakerImplementationAPI.setScriptProvider(cascaded); MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index 9082106..ced8f27 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -161,7 +161,7 @@ public class MineTweakerMod { } IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); - IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsLocal, scriptsGlobal); + IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsGlobal,scriptsLocal); MineTweakerImplementationAPI.setScriptProvider(cascaded); MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java index 8da51b4..6aaf8a2 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java @@ -162,7 +162,7 @@ public class MineTweakerMod { } IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); - IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsLocal, scriptsGlobal); + IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsGlobal,scriptsLocal); MineTweakerImplementationAPI.setScriptProvider(cascaded); MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer()));