R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-06-27 15:29:25 -04:00
commit 470f8aed5b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -60,7 +60,7 @@ public class ModernFixEarlyConfig {
private final Set<String> mixinOptions = new ObjectOpenHashSet<>(); private final Set<String> mixinOptions = new ObjectOpenHashSet<>();
private final Map<String, String> mixinsMissingMods = new Object2ObjectOpenHashMap<>(); private final Map<String, String> mixinsMissingMods = new Object2ObjectOpenHashMap<>();
public static boolean isFabric = false; public static boolean isFabric = ModernFixEarlyConfig.class.getClassLoader().getResourceAsStream("modernfix-fabric.mixins.json") != null;
public Map<String, String> getPermanentlyDisabledMixins() { public Map<String, String> getPermanentlyDisabledMixins() {
return mixinsMissingMods; return mixinsMissingMods;
@ -74,8 +74,6 @@ public class ModernFixEarlyConfig {
if(stream == null) if(stream == null)
continue; continue;
try(Reader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { try(Reader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
if(configFile.contains("fabric"))
isFabric = true;
JsonObject configObject = (JsonObject)new JsonParser().parse(reader); JsonObject configObject = (JsonObject)new JsonParser().parse(reader);
JsonArray mixinList = configObject.getAsJsonArray("mixins"); JsonArray mixinList = configObject.getAsJsonArray("mixins");
String packageName = configObject.get("package").getAsString().replace('.', '/'); String packageName = configObject.get("package").getAsString().replace('.', '/');