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

better global scripts pathing

Browse Source
This commit is contained in:
gnembon committed 2026-09-17 22:31:40 +02:00
1 parent e7671bd022
commit 199efb19a9
2 files changed
+52 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetScriptServer.java
+49 -2
View File
@@ -159,7 +159,7 @@ public class CarpetScriptServer extends ScriptServer
}
}
Module globalModule = Carpet.fetchGlobalModule(name, allowLibraries);
Module globalModule = fetchGlobalModule(server, name, allowLibraries);
if (globalModule != null)
{
return globalModule;
@@ -179,6 +179,53 @@ public class CarpetScriptServer extends ScriptServer
return null;
}
public static @Nullable Module fetchGlobalModule(MinecraftServer server, String name, boolean allowLibraries) throws IOException
{
Path globalFolder = Carpet.fetchGlobalPath(server);
if (globalFolder == null)
{
return null;
}
if (!Files.exists(globalFolder))
{
Files.createDirectories(globalFolder);
}
try (Stream<Path> folderWalker = Files.walk(globalFolder))
{
Optional<Path> scriptPath = folderWalker
.filter(script -> script.getFileName().toString().equalsIgnoreCase(name + ".sc") ||
(allowLibraries && script.getFileName().toString().equalsIgnoreCase(name + ".scl")))
.findFirst();
if (scriptPath.isPresent())
{
return Module.fromPath(scriptPath.get());
}
}
return null;
}
public static void addGlobalModules(final MinecraftServer server, final List<String> moduleNames, boolean includeBuiltIns) throws IOException
{
if (!includeBuiltIns)
{
return;
}
final Path globalScripts = Carpet.fetchGlobalPath(server);
if (globalScripts == null) {
return;
}
if (!Files.exists(globalScripts))
{
Files.createDirectories(globalScripts);
}
try (Stream<Path> folderWalker = Files.walk(globalScripts, FileVisitOption.FOLLOW_LINKS))
{
folderWalker
.filter(f -> f.toString().endsWith(".sc"))
.forEach(f -> moduleNames.add(f.getFileName().toString().replaceFirst("\\.sc$", "").toLowerCase(Locale.ROOT)));
}
}
public Module getRuleModule(String name)
{
for (Module moduleData : ruleModuleData)
@@ -218,7 +265,7 @@ public class CarpetScriptServer extends ScriptServer
.forEach(f -> moduleNames.add(f.getFileName().toString().replaceFirst("\\.sc$", "").toLowerCase(Locale.ROOT)));
}
Carpet.addGlobalModules(moduleNames, includeBuiltIns);
addGlobalModules(server, moduleNames, includeBuiltIns);
}
catch (IOException e)
src/main/java/carpet/script/external/Carpet.java
Vendored
+3 -38
View File
@@ -147,49 +147,14 @@ public class Carpet
return CarpetSettings.superSecretSetting;
}
@Nullable
public static Module fetchGlobalModule(String name, boolean allowLibraries) throws IOException
{
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT)
{
public static @Nullable Path fetchGlobalPath(MinecraftServer server) {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
Path globalFolder = FabricLoader.getInstance().getConfigDir().resolve("carpet/scripts");
if (!Files.exists(globalFolder))
{
Files.createDirectories(globalFolder);
}
try (Stream<Path> folderWalker = Files.walk(globalFolder))
{
Optional<Path> scriptPath = folderWalker
.filter(script -> script.getFileName().toString().equalsIgnoreCase(name + ".sc") ||
(allowLibraries && script.getFileName().toString().equalsIgnoreCase(name + ".scl")))
.findFirst();
if (scriptPath.isPresent())
{
return Module.fromPath(scriptPath.get());
}
}
return globalFolder;
}
return null;
}
public static void addGlobalModules(final List<String> moduleNames, boolean includeBuiltIns) throws IOException
{
if (includeBuiltIns && (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT))
{
Path globalScripts = FabricLoader.getInstance().getConfigDir().resolve("carpet/scripts");
if (!Files.exists(globalScripts))
{
Files.createDirectories(globalScripts);
}
try (Stream<Path> folderWalker = Files.walk(globalScripts, FileVisitOption.FOLLOW_LINKS))
{
folderWalker
.filter(f -> f.toString().endsWith(".sc"))
.forEach(f -> moduleNames.add(f.getFileName().toString().replaceFirst("\\.sc$", "").toLowerCase(Locale.ROOT)));
}
}
}
public static void assertRequirementMet(CarpetScriptHost host, String requiredModId, String stringPredicate)
{
VersionPredicate predicate;