cleanup
This commit is contained in:
1 parent
e93c7d442c
commit
70a59ccedd
3 files changed
+3
-33
No files matched your search
@@ -1,7 +1,6 @@
|
||||
package carpet.script;
|
||||
|
||||
import carpet.CarpetServer;
|
||||
import carpet.script.api.Apps;
|
||||
import carpet.script.api.Auxiliary;
|
||||
import carpet.script.api.BlockIterators;
|
||||
import carpet.script.api.Entities;
|
||||
@@ -45,7 +44,6 @@ public class CarpetExpression
|
||||
Auxiliary.apply(this.expr);
|
||||
Threading.apply(this.expr);
|
||||
Scoreboards.apply(this.expr);
|
||||
Apps.apply(this.expr);
|
||||
Monitoring.apply(this.expr);
|
||||
CarpetServer.extensions.forEach(e -> e.scarpetApi(this));
|
||||
}
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
package carpet.script.api;
|
||||
|
||||
import carpet.script.CarpetScriptHost;
|
||||
import carpet.script.Expression;
|
||||
import carpet.script.value.MapValue;
|
||||
import carpet.script.value.NumericValue;
|
||||
import carpet.script.value.StringValue;
|
||||
import carpet.script.value.Value;
|
||||
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class Apps {
|
||||
public static void apply(Expression expression)
|
||||
{
|
||||
//todo doc and test all
|
||||
expression.addLazyFunction("loaded_apps", 0, (c, t, lv) ->
|
||||
{
|
||||
// return a set of all loaded apps
|
||||
Value ret = new MapValue(((CarpetScriptHost) c.host).getScriptServer().modules.keySet().stream().map(StringValue::new).collect(Collectors.toSet()));
|
||||
return (cc, tt) -> ret;
|
||||
});
|
||||
|
||||
expression.addLazyFunction("is_app_loaded", 1, (c, t, lv) ->
|
||||
{
|
||||
Value ret = new NumericValue(((CarpetScriptHost) c.host).getScriptServer().modules.containsKey(lv.get(0).evalValue(c).getString()));
|
||||
return (cc, tt) -> ret;
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user