icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

host tweaks

Browse Source
This commit is contained in:
gnembon committed 2019-07-20 19:05:11 -03:00
1 parent 3c96345a60
commit 34bfe2e996
2 files changed
+14 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/commands/ScriptCommand.java
+1 -1
View File
@@ -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
+13 -17
View File
@@ -56,6 +56,17 @@ public class CarpetScriptServer
ModuleInterface getModule(String name)
{
File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
CarpetServer.minecraft_server.getLevelName(), "scripts");
File[] listOfFiles = folder.listFiles();
if (listOfFiles != null)
for (File script : listOfFiles)
{
if (script.getName().equalsIgnoreCase(name+".sc"))
{
return new FileModule(script);
}
}
for (ModuleInterface moduleData : bundledModuleData)
{
if (moduleData.getName().equalsIgnoreCase(name))
@@ -63,19 +74,6 @@ public class CarpetScriptServer
return moduleData;
}
}
File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
CarpetServer.minecraft_server.getLevelName(), "scripts");
File[] listOfFiles = folder.listFiles();
if (listOfFiles == null)
return null;
for (File script : listOfFiles)
{
if (script.getName().equalsIgnoreCase(name+".sc"))
{
return new FileModule(script);
}
}
return null;
}
@@ -84,8 +82,7 @@ public class CarpetScriptServer
List<String> moduleNames = new ArrayList<>();
for (ModuleInterface mi: bundledModuleData)
{
if (!modules.containsKey(mi.getName()))
moduleNames.add(mi.getName());
moduleNames.add(mi.getName());
}
File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
CarpetServer.minecraft_server.getLevelName(), "scripts");
@@ -97,8 +94,7 @@ public class CarpetScriptServer
if (script.getName().endsWith(".sc"))
{
String name = script.getName().replaceFirst("\\.sc","").toLowerCase(Locale.ROOT);
if (!modules.containsKey(name))
moduleNames.add(name);
moduleNames.add(name);
}
}
return moduleNames;