host tweaks

src/main/java/carpet/commands/ScriptCommand.java

@@ -211,7 +211,7 @@ public class ScriptCommand
                             boolean success = CarpetServer.scriptServer.addScriptHost(cc.getSource(), StringArgumentType.getString(cc, "package"), true);
                             return success?1:0;
                         }).
-                        then(literal("global").
+                        then(literal("shared").
                                 executes((cc) ->
                                 {
                                     boolean success = CarpetServer.scriptServer.addScriptHost(cc.getSource(), StringArgumentType.getString(cc, "package"), false);

src/main/java/carpet/script/CarpetScriptServer.java

@@ -56,19 +56,10 @@ public class CarpetScriptServer
 
     ModuleInterface getModule(String name)
     {
-        for (ModuleInterface moduleData : bundledModuleData)
-        {
-            if (moduleData.getName().equalsIgnoreCase(name))
-            {
-                return moduleData;
-            }
-        }
-
         File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
                 CarpetServer.minecraft_server.getLevelName(), "scripts");
         File[] listOfFiles = folder.listFiles();
-        if (listOfFiles == null)
-            return null;
+        if (listOfFiles != null)
             for (File script : listOfFiles)
             {
                 if (script.getName().equalsIgnoreCase(name+".sc"))
@@ -76,6 +67,13 @@ public class CarpetScriptServer
                     return new FileModule(script);
                 }
             }
+        for (ModuleInterface moduleData : bundledModuleData)
+        {
+            if (moduleData.getName().equalsIgnoreCase(name))
+            {
+                return moduleData;
+            }
+        }
         return null;
     }
 
@@ -84,7 +82,6 @@ public class CarpetScriptServer
         List<String> moduleNames = new ArrayList<>();
         for (ModuleInterface mi: bundledModuleData)
         {
-            if (!modules.containsKey(mi.getName()))
             moduleNames.add(mi.getName());
         }
         File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
@@ -97,7 +94,6 @@ public class CarpetScriptServer
             if (script.getName().endsWith(".sc"))
             {
                 String name = script.getName().replaceFirst("\\.sc","").toLowerCase(Locale.ROOT);
-                if (!modules.containsKey(name))
                 moduleNames.add(name);
             }
         }