From 9d55944eee0c2b592775b065aa60bafa25c48146 Mon Sep 17 00:00:00 2001 From: JFronny Date: Wed, 8 Dec 2021 21:50:32 +0100 Subject: [PATCH] Skip unloadable libraries --- src/main/java/io/gitlab/jfronny/inceptum/Inceptum.java | 7 ++++++- .../jfronny/inceptum/install/steps/DownloadClientStep.java | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/gitlab/jfronny/inceptum/Inceptum.java b/src/main/java/io/gitlab/jfronny/inceptum/Inceptum.java index f0bfc08..c603185 100644 --- a/src/main/java/io/gitlab/jfronny/inceptum/Inceptum.java +++ b/src/main/java/io/gitlab/jfronny/inceptum/Inceptum.java @@ -84,7 +84,12 @@ public class Inceptum { Inceptum.LOGGER.info("Force-Loading libraries:"); Utils.ls(FORCE_LOAD_PATH, path -> { Inceptum.LOGGER.info("Loading " + path); - System.load(path.toAbsolutePath().toString()); + try { + System.load(path.toAbsolutePath().toString()); + } + catch (UnsatisfiedLinkError le) { + LOGGER.error("Could not load library", le); + } }); } diff --git a/src/main/java/io/gitlab/jfronny/inceptum/install/steps/DownloadClientStep.java b/src/main/java/io/gitlab/jfronny/inceptum/install/steps/DownloadClientStep.java index f5b67cb..5a421ef 100644 --- a/src/main/java/io/gitlab/jfronny/inceptum/install/steps/DownloadClientStep.java +++ b/src/main/java/io/gitlab/jfronny/inceptum/install/steps/DownloadClientStep.java @@ -3,20 +3,13 @@ package io.gitlab.jfronny.inceptum.install.steps; import io.gitlab.jfronny.inceptum.Inceptum; import io.gitlab.jfronny.inceptum.install.SetupStepInfo; import io.gitlab.jfronny.inceptum.install.Step; -import io.gitlab.jfronny.inceptum.model.fabric.FabricInstallerVersion; import io.gitlab.jfronny.inceptum.model.inceptum.InstanceMeta; -import io.gitlab.jfronny.inceptum.model.inceptum.LoaderInfo; import io.gitlab.jfronny.inceptum.model.mojang.MojangFileDownload; import io.gitlab.jfronny.inceptum.util.Utils; -import io.gitlab.jfronny.inceptum.util.api.FabricMetaApi; import java.io.IOException; -import java.net.URI; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; public class DownloadClientStep implements Step {