From 70a59ccedd6ba2091778509e3dafce2b4e075a7c Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Thu, 15 Oct 2020 03:20:10 -0300
Subject: [PATCH] cleanup

---
 .../PistonHandler_customStickyMixin.java      |  4 ++-
 .../java/carpet/script/CarpetExpression.java  |  2 --
 src/main/java/carpet/script/api/Apps.java     | 30 -------------------
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/java/carpet/script/api/Apps.java

diff --git a/src/main/java/carpet/mixins/PistonHandler_customStickyMixin.java b/src/main/java/carpet/mixins/PistonHandler_customStickyMixin.java
index 96704b65..48f7fae0 100644
--- a/src/main/java/carpet/mixins/PistonHandler_customStickyMixin.java
+++ b/src/main/java/carpet/mixins/PistonHandler_customStickyMixin.java
@@ -15,7 +15,9 @@ import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index 9df9d7c3..94c3cf10 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -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));
     }
diff --git a/src/main/java/carpet/script/api/Apps.java b/src/main/java/carpet/script/api/Apps.java
deleted file mode 100644
index 75574737..00000000
--- a/src/main/java/carpet/script/api/Apps.java
+++ /dev/null
@@ -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;
-        });
-
-    }
-}