diff options
| author | SHsuperCM <shsupercm@gmail.com> | 2022-03-18 14:30:04 +0200 |
|---|---|---|
| committer | SHsuperCM <shsupercm@gmail.com> | 2022-03-18 14:30:04 +0200 |
| commit | 95f3661f582f2a9fb509af0009827c66626edde3 (patch) | |
| tree | b77b648c974ab144a35d2db5848bbf471cf72196 /src/main/java/shcm/shsupercm/fabric/citresewn/pack | |
| parent | c969ba6afc51906b1b361013d262a40b6f797811 (diff) | |
| download | CITResewn-95f3661f582f2a9fb509af0009827c66626edde3.tar.gz CITResewn-95f3661f582f2a9fb509af0009827c66626edde3.tar.bz2 CITResewn-95f3661f582f2a9fb509af0009827c66626edde3.zip | |
Fixed global properties breaking weird mod resourcepacks
Fixes #117 and #118
Diffstat (limited to 'src/main/java/shcm/shsupercm/fabric/citresewn/pack')
| -rw-r--r-- | src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java index 9f57760..cd85af1 100644 --- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java +++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/PackParser.java @@ -17,7 +17,6 @@ import shcm.shsupercm.fabric.citresewn.pack.format.PropertyKey; import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue; import java.io.FileNotFoundException; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -44,9 +43,10 @@ public final class PackParser { private PackParser() {} for (String root : ROOTS) { Identifier identifier = new Identifier(namespace, root + "/cit.properties"); try { - globalProperties.load(pack.getName(), identifier, pack.open(ResourceType.CLIENT_RESOURCES, identifier)); + if (pack.contains(ResourceType.CLIENT_RESOURCES, identifier)) + globalProperties.load(pack.getName(), identifier, pack.open(ResourceType.CLIENT_RESOURCES, identifier)); } catch (FileNotFoundException ignored) { - } catch (IOException e) { + } catch (Exception e) { CITResewn.logErrorLoading("Errored while loading global properties: " + identifier + " from " + pack.getName()); e.printStackTrace(); } |
