Merge 1.16 into 1.18
This commit is contained in:
commit
bcd2e80821
|
|
@ -229,6 +229,7 @@ public class ModernFixEarlyConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
checkBlockstateCacheRebuilds();
|
checkBlockstateCacheRebuilds();
|
||||||
|
checkModelDataManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkBlockstateCacheRebuilds() {
|
private void checkBlockstateCacheRebuilds() {
|
||||||
|
|
@ -247,6 +248,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) {
|
private void disableIfModPresent(String configName, String... ids) {
|
||||||
for(String id : ids) {
|
for(String id : ids) {
|
||||||
if(!ModernFixPlatformHooks.INSTANCE.isEarlyLoadingNormally() || modPresent(id)) {
|
if(!ModernFixPlatformHooks.INSTANCE.isEarlyLoadingNormally() || modPresent(id)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user