Merge 1.19.2 into 1.20

This commit is contained in:
embeddedt 2023-12-27 15:20:17 -05:00
commit c96f7ecf11
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -231,6 +231,7 @@ public class ModernFixEarlyConfig {
}
checkBlockstateCacheRebuilds();
checkModelDataManager();
}
private void checkBlockstateCacheRebuilds() {
@ -249,6 +250,16 @@ public class ModernFixEarlyConfig {
}
}
private void checkModelDataManager() {
if(!isFabric && modPresent("rubidium") && !modPresent("embeddium")) {
Option option = this.options.get("mixin.bugfix.model_data_manager_cme");
if(option != null) {
LOGGER.warn("ModelDataManager bugfixes have been disabled to prevent broken rendering with Rubidium installed. Please migrate to Embeddium.");
option.addModOverride(false, "rubidium");
}
}
}
private void disableIfModPresent(String configName, String... ids) {
for(String id : ids) {
if(!ModernFixPlatformHooks.INSTANCE.isEarlyLoadingNormally() || modPresent(id)) {