JfMods
/
Inceptum
1
0
Fork 0
Code Issues 2 Packages Projects Releases Activity

Fix logs and openZipFile

This commit is contained in:
Johannes Frohnmeyer 2022-07-01 15:16:35 +02:00
parent 450eb83c13
commit fdc1394493
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -40,8 +40,7 @@ allprojects {
ext {
lwjglVersion = '3.3.1'
imguiVersion = '1.86.4'
slf4jVersion = '1.7.36'
logbackVersion = '1.2.11'
logbackVersion = '1.3.0-alpha15'
jfCommonsVersion = '2022.6.27+12-28-9'
jgitVersion = '6.1.0.202203080745-r'
flavorProp = project.hasProperty('flavor') ? project.getProperty('flavor') : 'custom'
@ -65,7 +64,6 @@ if (flavor == 'custom') {
}
dependencies {
implementation "org.slf4j:slf4j-api:$slf4jVersion"
implementation "ch.qos.logback:logback-classic:$logbackVersion"
implementation "io.gitlab.jfronny:commons:$jfCommonsVersion"
implementation "io.gitlab.jfronny:commons-gson:$jfCommonsVersion"

1
wrapper/build.gradle
View File

@ -18,7 +18,6 @@ repositories {
}
dependencies {
implementation "org.slf4j:slf4j-api:${rootProject.slf4jVersion}"
implementation "ch.qos.logback:logback-classic:${rootProject.logbackVersion}"
implementation "io.gitlab.jfronny:commons:${rootProject.jfCommonsVersion}"
implementation "io.gitlab.jfronny:commons-gson:${rootProject.jfCommonsVersion}"

2
wrapper/src/main/java/io/gitlab/jfronny/inceptum/util/Utils.java
View File

@ -261,7 +261,7 @@ public class Utils {
private static final Map<Path, MultiAccessFileSystem> zipFsCache = new HashMap<>();
public static FileSystem openZipFile(Path zip, boolean create) throws IOException, URISyntaxException {
synchronized (zipFsCache) {
if (!zipFsCache.containsKey(zip) || !zipFsCache.get(zip).isClosed()) {
if (!zipFsCache.containsKey(zip) || zipFsCache.get(zip).isClosed()) {
URI fileUri = zip.toUri();
zipFsCache.put(zip, MultiAccessFileSystem.create(new URI("jar:" + fileUri.getScheme(), fileUri.getPath(), null), create ? Map.of("create", "true") : Map.of(), WrapperStrap.SYSTEM_LOADER));
}