This commit is contained in:
Jared committed 2016-09-20 13:00:27 +02:00
1 parent 7d229a78a3
commit 829444388c
5 files changed
+38 -37

No files matched your search

@@ -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<IScriptIterator> getScripts() {
return Collections.<IScriptIterator>singleton(new CustomScriptIterator()).iterator();
}
@@ -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<IScriptIterator> getScripts() {
List<IScriptIterator> scripts = new ArrayList<IScriptIterator>();
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<IScriptIterator> getScripts() {
List<IScriptIterator> scripts = new ArrayList<IScriptIterator>();
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();
}
}