upd
This commit is contained in:
1 parent
f29153c3d2
commit
10009a9381
4 files changed
+6
-13
No files matched your search
@@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(Main.class)
|
@Mixin(Main.class)
|
||||||
public class Main_clientCoreMixin
|
public class Main_clientCoreMixin
|
||||||
{
|
{
|
||||||
|
@SuppressWarnings("UnresolvedMixinReference")
|
||||||
@Inject(method = "main", at = @At( // little bit later giving extensions time to react an join the train
|
@Inject(method = "main", at = @At( // little bit later giving extensions time to react an join the train
|
||||||
value = "INVOKE",
|
value = "INVOKE",
|
||||||
target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;")
|
target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;")
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(Main.class)
|
@Mixin(Main.class)
|
||||||
public class Main_serverCoreMixin
|
public class Main_serverCoreMixin
|
||||||
{
|
{
|
||||||
|
@SuppressWarnings("UnresolvedMixinReference")
|
||||||
@Inject(method = "main", at = @At( // little bit later than main to add chance for extensions to register.
|
@Inject(method = "main", at = @At( // little bit later than main to add chance for extensions to register.
|
||||||
value = "INVOKE",
|
value = "INVOKE",
|
||||||
target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;")
|
target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;")
|
||||||
|
|||||||
@@ -54,12 +54,12 @@ public class CarpetScriptServer
|
|||||||
|
|
||||||
public CarpetScriptServer(MinecraftServer server)
|
public CarpetScriptServer(MinecraftServer server)
|
||||||
{
|
{
|
||||||
|
this.server = server;
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void init()
|
private void init()
|
||||||
{
|
{
|
||||||
this.server = server;
|
|
||||||
ScriptHost.systemGlobals.clear();
|
ScriptHost.systemGlobals.clear();
|
||||||
events = new CarpetEventServer(server);
|
events = new CarpetEventServer(server);
|
||||||
modules = new HashMap<>();
|
modules = new HashMap<>();
|
||||||
@@ -84,9 +84,7 @@ public class CarpetScriptServer
|
|||||||
|
|
||||||
public Module getModule(String name, boolean allowLibraries)
|
public Module getModule(String name, boolean allowLibraries)
|
||||||
{
|
{
|
||||||
File folder = CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
|
File folder = server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
|
||||||
File folder = server.getLevelStorage().resolveFile(
|
|
||||||
server.getLevelName(), "scripts");
|
|
||||||
File[] listOfFiles = folder.listFiles();
|
File[] listOfFiles = folder.listFiles();
|
||||||
if (listOfFiles != null)
|
if (listOfFiles != null)
|
||||||
for (File script : listOfFiles)
|
for (File script : listOfFiles)
|
||||||
@@ -120,9 +118,7 @@ public class CarpetScriptServer
|
|||||||
if (!mi.isLibrary()) moduleNames.add(mi.getName());
|
if (!mi.isLibrary()) moduleNames.add(mi.getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File folder = CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
|
File folder = server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
|
||||||
File folder = server.getLevelStorage().resolveFile(
|
|
||||||
server.getLevelName(), "scripts");
|
|
||||||
File[] listOfFiles = folder.listFiles();
|
File[] listOfFiles = folder.listFiles();
|
||||||
if (listOfFiles == null)
|
if (listOfFiles == null)
|
||||||
return moduleNames;
|
return moduleNames;
|
||||||
|
|||||||
@@ -35,8 +35,6 @@ public abstract class Module
|
|||||||
{
|
{
|
||||||
File dataFile = resolveResource(module, file, "nbt", isShared);
|
File dataFile = resolveResource(module, file, "nbt", isShared);
|
||||||
if (dataFile == null) return null;
|
if (dataFile == null) return null;
|
||||||
if (!isShared && (module == null || module.getName() == null)) return null;
|
|
||||||
File dataFile = CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, file, isShared)+".nbt").toFile();
|
|
||||||
if (!Files.exists(dataFile.toPath()) || !(dataFile.isFile())) return null;
|
if (!Files.exists(dataFile.toPath()) || !(dataFile.isFile())) return null;
|
||||||
synchronized (writeIOSync) { return FileModule.read(dataFile); }
|
synchronized (writeIOSync) { return FileModule.read(dataFile); }
|
||||||
}
|
}
|
||||||
@@ -45,8 +43,6 @@ public abstract class Module
|
|||||||
{
|
{
|
||||||
File dataFile = resolveResource(module, file, "nbt", isShared);
|
File dataFile = resolveResource(module, file, "nbt", isShared);
|
||||||
if (dataFile == null) return false;
|
if (dataFile == null) return false;
|
||||||
if (!isShared && (module == null || module.getName() == null)) return false;
|
|
||||||
File dataFile =CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, file, isShared)+".nbt").toFile();
|
|
||||||
if (!Files.exists(dataFile.toPath().getParent()) && !dataFile.getParentFile().mkdirs()) return false;
|
if (!Files.exists(dataFile.toPath().getParent()) && !dataFile.getParentFile().mkdirs()) return false;
|
||||||
synchronized (writeIOSync) { return FileModule.write(globalState, dataFile); }
|
synchronized (writeIOSync) { return FileModule.write(globalState, dataFile); }
|
||||||
}
|
}
|
||||||
@@ -77,8 +73,7 @@ public abstract class Module
|
|||||||
private static File resolveResource(Module module, String resourceName, String ext, boolean isShared)
|
private static File resolveResource(Module module, String resourceName, String ext, boolean isShared)
|
||||||
{
|
{
|
||||||
if (!isShared && (module == null || module.getName() == null)) return null;
|
if (!isShared && (module == null || module.getName() == null)) return null;
|
||||||
return CarpetServer.minecraft_server.getLevelStorage().resolveFile(
|
return CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, resourceName, isShared)+"."+ext).toFile();
|
||||||
CarpetServer.minecraft_server.getLevelName(), "scripts/"+getDescriptor(module, resourceName, isShared)+"."+ext);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in new issue
Block a user