Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22

Browse Source 
filesystems: This  makes it so that datapacks can be reloaded with /reload
This commit is contained in:
Sangar
2021-01-19 00:58:03 +01:00
committed by GitHub
parent f138660ee8 c2685fc97a
commit bcac91f551
2 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/common/CommonSetup.java
View File

@@ -29,6 +29,7 @@ public final class CommonSetup {
FMLJavaModLoadingContext.get().getModEventBus().addListener(IMC::handleIMCMessages);
MinecraftForge.EVENT_BUS.addListener(CommonSetup::handleServerAboutToStart);
MinecraftForge.EVENT_BUS.addListener(CommonSetup::handleServerStopped);
MinecraftForge.EVENT_BUS.addListener(FileSystems::addReloadListenerEvent);
ServerScheduler.register();
addBuiltinRPCMethodParameterTypeAdapters();
@@ -38,7 +39,6 @@ public final class CommonSetup {
private static void handleServerAboutToStart(final FMLServerAboutToStartEvent event) {
BlobStorage.setServer(event.getServer());
FileSystems.initialize(event.getServer());
}
private static void handleServerStopped(final FMLServerStoppedEvent event) {

89
src/main/java/li/cil/oc2/common/bus/device/data/FileSystems.java
View File

@@ -1,5 +1,7 @@
package li.cil.oc2.common.bus.device.data;
import java.util.concurrent.Executor;
import java.util.concurrent.CompletableFuture;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import li.cil.oc2.common.vm.fs.LayeredFileSystem;
@@ -7,8 +9,11 @@ import li.cil.oc2.common.vm.fs.ResourceFileSystem;
import li.cil.sedna.fs.FileSystem;
import net.minecraft.resources.IResource;
import net.minecraft.resources.IResourceManager;
import net.minecraft.resources.IFutureReloadListener;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.profiler.IProfiler;
import net.minecraftforge.event.AddReloadListenerEvent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -17,47 +22,63 @@ import java.util.Collection;
public final class FileSystems {
private static final Logger LOGGER = LogManager.getLogger();
private static final LayeredFileSystem LAYERED_FILE_SYSTEM = new LayeredFileSystem();
private static final IFutureReloadListener RELOAD_LISTENER = new IFutureReloadListener() {
@Override
public String getSimpleName() {
return "oc2:file_system";
};
@Override
public CompletableFuture<Void> reload(IFutureReloadListener.IStage stage, IResourceManager resourceManager, IProfiler preparaationsProfiler, IProfiler reloadProfiler, Executor backgroundExecutor, Executor gameExecutor) {
return CompletableFuture.runAsync(() -> {
LAYERED_FILE_SYSTEM.clear();
LOGGER.info("Searching for datapack filesystems!");
final Collection<ResourceLocation> fileSystemDescriptorLocations = resourceManager
.getAllResourceLocations("file_systems", s -> s.endsWith(".fs.json"));
for (final ResourceLocation fileSystemDescriptorLocation : fileSystemDescriptorLocations) {
LOGGER.info("Found [{}]", fileSystemDescriptorLocation);
try {
final IResource fileSystemDescriptor = resourceManager.getResource(fileSystemDescriptorLocation);
final JsonObject json = new JsonParser().parse(new InputStreamReader(fileSystemDescriptor.getInputStream())).getAsJsonObject();
final String type = json.getAsJsonPrimitive("type").getAsString();
switch (type) {
case "virtio-9p": {
final ResourceLocation location = new ResourceLocation(json.getAsJsonPrimitive("location").getAsString());
final ResourceFileSystem fileSystem = new ResourceFileSystem(resourceManager, location);
LAYERED_FILE_SYSTEM.addLayer(fileSystem);
break;
}
case "virtio-blk": {
LOGGER.error("Not yet implemented.");
break;
}
default: {
LOGGER.error("Unsupported file system type [{}].", type);
break;
}
}
} catch (final Throwable e) {
LOGGER.error(e);
}
}
}, backgroundExecutor)
.thenCompose(stage::markCompleteAwaitingOthers);
}
};
public static FileSystem getLayeredFileSystem() {
return LAYERED_FILE_SYSTEM;
}
public static void initialize(final MinecraftServer server) {
reset();
final IResourceManager resourceManager = server.getDataPackRegistries().getResourceManager();
final Collection<ResourceLocation> fileSystemDescriptorLocations = resourceManager
.getAllResourceLocations("file_systems", s -> s.endsWith(".fs.json"));
for (final ResourceLocation fileSystemDescriptorLocation : fileSystemDescriptorLocations) {
try {
final IResource fileSystemDescriptor = resourceManager.getResource(fileSystemDescriptorLocation);
final JsonObject json = new JsonParser().parse(new InputStreamReader(fileSystemDescriptor.getInputStream())).getAsJsonObject();
final String type = json.getAsJsonPrimitive("type").getAsString();
switch (type) {
case "virtio-9p": {
final ResourceLocation location = new ResourceLocation(json.getAsJsonPrimitive("location").getAsString());
final ResourceFileSystem fileSystem = new ResourceFileSystem(resourceManager, location);
LAYERED_FILE_SYSTEM.addLayer(fileSystem);
break;
}
case "virtio-blk": {
LOGGER.error("Not yet implemented.");
break;
}
default: {
LOGGER.error("Unsupported file system type [{}].", type);
break;
}
}
} catch (final Throwable e) {
LOGGER.error(e);
}
}
}
public static void addReloadListenerEvent(final AddReloadListenerEvent event) {
event.addListener(RELOAD_LISTENER);
};
public static void reset() {
LAYERED_FILE_SYSTEM.clear();