Skip to content

Commit 80070aa

Browse files
committed
Merge remote-tracking branch 'origin/1.21.1' into 1.21.4
2 parents 2f97782 + 6531b69 commit 80070aa

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class SurfaceRulesContextMixin {
3535
* @reason Reuse supplier object instead of creating new ones every time
3636
*/
3737
@Overwrite
38-
protected void updateY(int stoneDepthAbove, int stoneDepthBelow, int waterHeight, int blockX, int blockY, int blockZ) {
38+
public void updateY(int stoneDepthAbove, int stoneDepthBelow, int waterHeight, int blockX, int blockY, int blockZ) {
3939
++this.lastUpdateY;
4040
var getter = this.biome;
4141
if(getter == null) {

common/src/main/resources/assets/modernfix/lang/en_us.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"modernfix.no_lazydfu": "LazyDFU is not installed. If Minecraft needs to update game data from an older version, there may be noticeable lag.",
66
"modernfix.no_ferritecore": "FerriteCore is not installed. Memory usage will be very high.",
77
"modernfix.connectedness_dynresoruces": "Connectedness and ModernFix's dynamic resources option are not compatible. Remove Connectedness or disable dynamic resources in the ModernFix config.",
8-
"modernfix.perf_mod_warning": "It is recommended to install the mods, but the warning(s) can be disabled in the ModernFix config.",
8+
"modernfix.perf_mod_warning": "ModernFix mod warnings can be disabled by turning off mixin.feature.warn_missing_perf_mods in the ModernFix config.",
9+
"modernfix.redirector_installed": "ModernFix detected that Redirector is installed. Redirector is known to cause many strange and hard-to-debug issues, and removing it is strongly recommended.",
910
"modernfix.config": "ModernFix mixin config",
1011
"modernfix.config.done_restart": "Done (restart required)",
1112
"modernfix.config.wiki": "Open wiki",

0 commit comments

Comments
 (0)