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-10-25 14:24:16 -04:00
commit 04a72f4d90
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,7 @@ public class ModernFixEarlyConfig {
disableIfModPresent("mixin.launch.class_search_cache", "optifine"); disableIfModPresent("mixin.launch.class_search_cache", "optifine");
disableIfModPresent("mixin.perf.faster_texture_stitching", "optifine"); disableIfModPresent("mixin.perf.faster_texture_stitching", "optifine");
disableIfModPresent("mixin.perf.datapack_reload_exceptions", "cyanide"); disableIfModPresent("mixin.perf.datapack_reload_exceptions", "cyanide");
disableIfModPresent("mixin.bugfix.buffer_builder_leak", "isometric-renders");
disableIfModPresent("mixin.perf.faster_texture_loading", "stitch", "optifine", "changed"); disableIfModPresent("mixin.perf.faster_texture_loading", "stitch", "optifine", "changed");
if(isFabric) { if(isFabric) {
disableIfModPresent("mixin.bugfix.packet_leak", "memoryleakfix"); disableIfModPresent("mixin.bugfix.packet_leak", "memoryleakfix");
@ -235,7 +236,7 @@ public class ModernFixEarlyConfig {
if(!ModernFixPlatformHooks.INSTANCE.isDevEnv()) if(!ModernFixPlatformHooks.INSTANCE.isDevEnv())
return; return;
try { try {
if(ModernFixEarlyConfig.class.getResource("/net/minecraft/world/level/Level.class") == null) { if(ModernFixEarlyConfig.class.getClassLoader().getResource("/net/minecraft/world/level/Level.class") == null) {
LOGGER.warn("We are in a non-Mojmap dev environment. Disabling blockstate cache patch"); LOGGER.warn("We are in a non-Mojmap dev environment. Disabling blockstate cache patch");
this.options.get("mixin.perf.reduce_blockstate_cache_rebuilds").addModOverride(false, "[not mojmap]"); this.options.get("mixin.perf.reduce_blockstate_cache_rebuilds").addModOverride(false, "[not mojmap]");
} }