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

Merge remote-tracking branch 'origin/main' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-04-25 12:07:59 -04:00
commit a60f9ffc61
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java
View File

@ -41,6 +41,9 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
this.logger.info("Loaded configuration file for ModernFix: {} options available, {} override(s) found", this.logger.info("Loaded configuration file for ModernFix: {} options available, {} override(s) found",
config.getOptionCount(), config.getOptionOverrideCount()); config.getOptionCount(), config.getOptionOverrideCount());
if(ModernFixEarlyConfig.OPTIFINE_PRESENT)
this.logger.fatal("OptiFine detected. Use of ModernFix with OptiFine is not supported due to its impact on launch time and breakage of Forge features.");
FastAccessTransformerList.attemptReplace(); FastAccessTransformerList.attemptReplace();
DFUBlaster.blastMaps(); DFUBlaster.blastMaps();

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

@ -15,8 +15,23 @@ public class ModernFixEarlyConfig {
private final Map<String, Option> options = new HashMap<>(); private final Map<String, Option> options = new HashMap<>();
public static final boolean OPTIFINE_PRESENT;
static {
boolean hasOfClass = false;
try {
Class.forName("optifine.OptiFineTransformationService");
hasOfClass = true;
} catch(Throwable e) {
}
OPTIFINE_PRESENT = hasOfClass;
}
private static boolean modPresent(String modId) { private static boolean modPresent(String modId) {
return FMLLoader.getLoadingModList().getModFileById(modId) != null; if(modId.equals("optifine"))
return OPTIFINE_PRESENT;
else
return FMLLoader.getLoadingModList().getModFileById(modId) != null;
} }
private ModernFixEarlyConfig() { private ModernFixEarlyConfig() {
@ -71,11 +86,12 @@ public class ModernFixEarlyConfig {
disableIfModPresent("mixin.perf.compress_biome_container", "chocolate", "betterendforge"); disableIfModPresent("mixin.perf.compress_biome_container", "chocolate", "betterendforge");
disableIfModPresent("mixin.bugfix.mc218112", "performant"); disableIfModPresent("mixin.bugfix.mc218112", "performant");
disableIfModPresent("mixin.perf.reuse_datapacks", "tac"); disableIfModPresent("mixin.perf.reuse_datapacks", "tac");
disableIfModPresent("mixin.launch.class_search_cache", "optifine");
} }
private void disableIfModPresent(String configName, String... ids) { private void disableIfModPresent(String configName, String... ids) {
for(String id : ids) { for(String id : ids) {
if(FMLLoader.getLoadingModList().getModFileById(id) != null) { if(modPresent(id)) {
Option option = this.options.get(configName); Option option = this.options.get(configName);
if(option != null) if(option != null)
option.addModOverride(false, id); option.addModOverride(false, id);