Update to 26.2

coredex-source · coredex-source · commit 4611771a7b8a · 2026-06-18T19:59:33.000+05:30
diff --git a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java
@@ -21,6 +21,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 
+import org.embeddedt.modernfix.annotation.IgnoreMixin;
 import org.fury_phoenix.mixinAp.config.MixinConfig;
 
 @SupportedAnnotationTypes({"org.spongepowered.asm.mixin.Mixin", "org.embeddedt.modernfix.annotation.ClientOnlyMixin"})
@@ -69,17 +70,18 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
     private void processMixins(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         for (TypeElement annotation : annotations) {
-            Set<? extends Element> annotatedMixins = roundEnv.getElementsAnnotatedWith(annotation);
+            List<TypeElement> annotatedMixins = roundEnv.getElementsAnnotatedWith(annotation)
+            .stream()
+            .map(TypeElement.class::cast)
+            .filter(e -> e.getAnnotation(IgnoreMixin.class) == null)
+            .collect(Collectors.toList());
 
-            Stream<TypeElement> mixinStream =
-            annotatedMixins.stream()
-            .map(TypeElement.class::cast);
+            Stream<TypeElement> mixinStream = annotatedMixins.stream();
 
             validateCommonMixins(annotation, mixinStream);
 
             List<String> mixins =
             annotatedMixins.stream()
-            .map(TypeElement.class::cast)
             .map(e -> processingEnv.getElementUtils().getBinaryName(e).toString())
             .collect(Collectors.toList());
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("net.neoforged.moddev") version("2.0.140")
+    id("net.neoforged.moddev") version("2.0.141")
     id("me.modmuss50.mod-publish-plugin") version("1.1.0")
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -5,9 +5,9 @@ junit_version=5.10.0-M1
 mixinextras_version=0.4.1
 
 mod_id=modernfix
-minecraft_version=26.1.2
+minecraft_version=26.2
 enabled_platforms=neoforge
-forge_version=26.1.2.73
+forge_version=26.2.0.2-beta
 parchment_version=2025.12.20
 parchment_mc_version=1.21.11
 refined_storage_version=4392788
@@ -18,7 +18,7 @@ ctm_version=5587515
 ldlib_version=5782845
 kubejs_version=2101.7.1-build.181
 rhino_version=2101.2.7-build.74
-supported_minecraft_versions=26.1
+supported_minecraft_versions=26.2
 
 fabric_loader_version=0.16.10
 fabric_api_version=0.102.1+1.21.1
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java
@@ -18,7 +18,7 @@ public class WorldSelectionListMixin {
 
     @Inject(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList$WorldListEntry;doDeleteWorld()V", ordinal = 0, shift = At.Shift.AFTER), cancellable = true)
     private void preventClosingCreateScreenAfterDelete(CallbackInfo ci) {
-        if(minecraft.screen instanceof CreateWorldScreen)
+        if(minecraft.gui.screen() instanceof CreateWorldScreen)
             ci.cancel();
     }
 }
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java
@@ -16,7 +16,7 @@ public class MinecraftMixin {
      * @reason avoid exception stacktrace being printed in dev
      */
     @Overwrite
-    private UserApiService createUserApiService(YggdrasilAuthenticationService yggdrasilAuthenticationService, GameConfig arg) {
+    private static UserApiService createUserApiService(YggdrasilAuthenticationService yggdrasilAuthenticationService, GameConfig arg) {
         return UserApiService.OFFLINE;
     }
 }
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java
@@ -1,10 +1,10 @@
 package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Overlay;
+import net.minecraft.client.gui.Gui;
 import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,11 +16,11 @@
 @ClientOnlyMixin
 public class MinecraftMixin {
     // TODO re-add datapack reload time measurement
-    @Shadow @Nullable public Overlay overlay;
+    @Shadow @Final public Gui gui;
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void onClientTick(CallbackInfo ci) {
-        if(this.overlay == null && ModernFixClient.INSTANCE != null) {
+        if(this.gui.screen() == null && ModernFixClient.INSTANCE != null) {
             ModernFixClient.INSTANCE.onGameLaunchFinish();
         }
     }
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/BiomeConditionSourceMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/BiomeConditionSourceMixin.java
@@ -3,6 +3,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.SurfaceRules;
+import org.embeddedt.modernfix.annotation.IgnoreMixin;
 import org.embeddedt.modernfix.world.gen.ExtendedSurfaceContext;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,6 +16,7 @@
 import java.util.Set;
 
 @Mixin(SurfaceRules.BiomeConditionSource.class)
+@IgnoreMixin
 public class BiomeConditionSourceMixin {
     @Shadow
     @Final
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/NoiseBasedChunkGeneratorMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/NoiseBasedChunkGeneratorMixin.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.world.level.levelgen.RandomState;
+import org.embeddedt.modernfix.annotation.IgnoreMixin;
 import org.embeddedt.modernfix.chunk.ExtendedPalettedContainer;
 import org.embeddedt.modernfix.world.gen.ExtendedSurfaceContext;
 import org.spongepowered.asm.mixin.Mixin;
@@ -22,6 +23,7 @@
 import java.util.Set;
 
 @Mixin(NoiseBasedChunkGenerator.class)
+@IgnoreMixin
 public class NoiseBasedChunkGeneratorMixin {
     @SuppressWarnings("unchecked")
     private static void mfix$accumulate(Set<ResourceKey<Biome>> chunkBiomes, LevelChunkSection section) {
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/SurfaceRulesContextMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/SurfaceRulesContextMixin.java
@@ -3,13 +3,15 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.SurfaceRules;
+import org.embeddedt.modernfix.annotation.IgnoreMixin;
 import org.embeddedt.modernfix.world.gen.ExtendedSurfaceContext;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.util.Set;
 
 @Mixin(SurfaceRules.Context.class)
+@IgnoreMixin
 public class SurfaceRulesContextMixin implements ExtendedSurfaceContext {
     @Nullable Set<ResourceKey<Biome>> mfix$possibleBiomes;
 
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/SurfaceSystemMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/optimize_surface_rules/SurfaceSystemMixin.java
@@ -5,7 +5,6 @@
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
-import net.minecraft.core.Registry;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.chunk.BlockColumn;
@@ -16,7 +15,6 @@
 import net.minecraft.world.level.levelgen.SurfaceSystem;
 import net.minecraft.world.level.levelgen.WorldGenerationContext;
 import org.embeddedt.modernfix.world.gen.ChunkBiomeLookup;
-import org.embeddedt.modernfix.world.gen.ExtendedSurfaceContext;
 import org.embeddedt.modernfix.world.gen.PrefetchingBlockColumn;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,14 +23,15 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Set;
 import java.util.function.Function;
 
 @Mixin(value = SurfaceSystem.class, priority = 2000)
 public class SurfaceSystemMixin {
     private static final ThreadLocal<ChunkBiomeLookup> MFIX_LOOKUP_CACHE = ThreadLocal.withInitial(ChunkBiomeLookup::new);
     private static final ThreadLocal<PrefetchingBlockColumn> MFIX_BLOCK_COLUMN = new ThreadLocal<>();
 
-    @ModifyArg(method = "buildSurface", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/SurfaceRules$Context;<init>(Lnet/minecraft/world/level/levelgen/SurfaceSystem;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/levelgen/NoiseChunk;Ljava/util/function/Function;Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/WorldGenerationContext;)V"), index = 4)
+    @ModifyArg(method = "buildSurface", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/SurfaceRules$Context;<init>(Lnet/minecraft/world/level/levelgen/SurfaceSystem;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/levelgen/NoiseChunk;Ljava/util/function/Function;Lnet/minecraft/world/level/levelgen/WorldGenerationContext;Ljava/util/Set;)V"), index = 4)
     private Function<BlockPos, Holder<Biome>> useFasterLookup(Function<BlockPos, Holder<Biome>> biomeGetter,
                                                               @Local(ordinal = 0, argsOnly = true) BiomeManager manager,
                                                               @Local(ordinal = 0, argsOnly = true) ChunkAccess chunk,
@@ -44,13 +43,8 @@ private Function<BlockPos, Holder<Biome>> useFasterLookup(Function<BlockPos, Hol
         return lookup;
     }
 
-    @Inject(method = "buildSurface", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/SurfaceRules$RuleSource;apply(Ljava/lang/Object;)Ljava/lang/Object;", ordinal = 0))
-    private void injectBiomesOnContext(CallbackInfo ci, @Local(ordinal = 0) SurfaceRules.Context surfacerules$context) {
-        ((ExtendedSurfaceContext)(Object) surfacerules$context).mfix$applyPossibleBiomes();
-    }
-
     @Inject(method = "buildSurface", at = @At("TAIL"))
-    private void finishAndDisposeLookups(RandomState randomState, BiomeManager biomeManager, Registry<Biome> biomes, boolean p_224652_, WorldGenerationContext context, ChunkAccess chunk, NoiseChunk noiseChunk, SurfaceRules.RuleSource ruleSource, CallbackInfo ci) {
+    private void finishAndDisposeLookups(RandomState randomState, BiomeManager biomeManager, boolean p_224652_, WorldGenerationContext context, ChunkAccess chunk, NoiseChunk noiseChunk, SurfaceRules.RuleSource ruleSource, Set<Holder<Biome>> possibleBiomes, CallbackInfo ci) {
         MFIX_LOOKUP_CACHE.get().dispose();
         var column = MFIX_BLOCK_COLUMN.get();
         if (column != null) {
@@ -63,7 +57,7 @@ private Holder<Biome> useFasterLookup(BiomeManager instance, BlockPos pos, @Shar
         return lookupRef.get().apply(pos);
     }
 
-    @Inject(method = "buildSurface", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/SurfaceRules$Context;<init>(Lnet/minecraft/world/level/levelgen/SurfaceSystem;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/levelgen/NoiseChunk;Ljava/util/function/Function;Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/WorldGenerationContext;)V"))
+    @Inject(method = "buildSurface", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/SurfaceRules$Context;<init>(Lnet/minecraft/world/level/levelgen/SurfaceSystem;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/levelgen/NoiseChunk;Ljava/util/function/Function;Lnet/minecraft/world/level/levelgen/WorldGenerationContext;Ljava/util/Set;)V"))
     private void captureRealBlockColumn(CallbackInfo ci, @Local(ordinal = 0) LocalRef<BlockColumn> column,
                                         @Local(ordinal = 0, argsOnly = true) ChunkAccess chunk,
                                         @Share("prefetchColumn") LocalRef<PrefetchingBlockColumn> prefetchRef) {
@@ -77,8 +71,8 @@ private void captureRealBlockColumn(CallbackInfo ci, @Local(ordinal = 0) LocalRe
     }
 
     @Inject(method = "buildSurface", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/BlockPos$MutableBlockPos;setZ(I)Lnet/minecraft/core/BlockPos$MutableBlockPos;", ordinal = 0, shift = At.Shift.AFTER))
-    private void prefetchBlockArray(RandomState randomState, BiomeManager biomeManager, Registry<Biome> biomes, boolean p_224652_,
-                                    WorldGenerationContext context, ChunkAccess chunk, NoiseChunk noiseChunk, SurfaceRules.RuleSource ruleSource, CallbackInfo ci,
+    private void prefetchBlockArray(RandomState randomState, BiomeManager biomeManager, boolean p_224652_,
+                                    WorldGenerationContext context, ChunkAccess chunk, NoiseChunk noiseChunk, SurfaceRules.RuleSource ruleSource, Set<Holder<Biome>> possibleBiomes, CallbackInfo ci,
                                     @Local(ordinal = 0) BlockColumn column,
                                     @Local(ordinal = 0) BlockPos.MutableBlockPos cursor) {
         ((PrefetchingBlockColumn)column).prefetch(chunk, cursor.getX() & 15, cursor.getZ() & 15);
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/IntegratedServerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/IntegratedServerMixin.java
@@ -10,6 +10,7 @@
 import net.minecraft.server.Services;
 import net.minecraft.server.WorldStem;
 import net.minecraft.server.level.progress.LevelLoadListener;
+import net.minecraft.server.notifications.NotificationManager;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.storage.LevelStorageSource;
@@ -35,8 +36,8 @@ public abstract class IntegratedServerMixin extends MinecraftServer implements I
     private int mfix$numTickServerCalls = 0;
     private final AtomicBoolean mfix$hasPrimaryClientJoined = new AtomicBoolean(false);
 
-    public IntegratedServerMixin(Thread serverThread, LevelStorageSource.LevelStorageAccess storageSource, PackRepository packRepository, WorldStem worldStem, Optional<GameRules> gameRules, Proxy proxy, DataFixer fixerUpper, Services services, LevelLoadListener levelLoadListener, boolean propagatesCrashes) {
-        super(serverThread, storageSource, packRepository, worldStem, gameRules, proxy, fixerUpper, services, levelLoadListener, propagatesCrashes);
+    public IntegratedServerMixin(Thread serverThread, LevelStorageSource.LevelStorageAccess storageSource, PackRepository packRepository, WorldStem worldStem, Optional<GameRules> gameRules, Proxy proxy, DataFixer fixerUpper, Services services, LevelLoadListener levelLoadListener, boolean propagatesCrashes, NotificationManager notificationManager) {
+        super(serverThread, storageSource, packRepository, worldStem, gameRules, proxy, fixerUpper, services, levelLoadListener, propagatesCrashes, notificationManager);
     }
 
     /**
diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java
@@ -3,6 +3,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.world.level.biome.Biome;
+import org.embeddedt.modernfix.annotation.IgnoreMixin;
 import org.embeddedt.modernfix.world.gen.PositionalBiomeGetter;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,6 +14,7 @@
 import java.util.function.Supplier;
 
 @Mixin(targets = {"net/minecraft/world/level/levelgen/SurfaceRules$Context"}, priority = 100)
+@IgnoreMixin
 public class SurfaceRulesContextMixin {
     @Shadow private long lastUpdateY;
 
diff --git a/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java b/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
@@ -12,7 +12,6 @@
 import net.neoforged.fml.ModLoadingIssue;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
-import net.neoforged.fml.loading.LoadingModList;
 import net.neoforged.fml.loading.TracingPrintStream;
 import net.neoforged.fml.loading.moddiscovery.ModInfo;
 import net.neoforged.neoforge.common.NeoForge;
@@ -63,7 +62,7 @@ public MinecraftServer getCurrentServer() {
     }
 
     public boolean isEarlyLoadingNormally() {
-        var issues = LoadingModList.get().getModLoadingIssues();
+        var issues = FMLLoader.getCurrent().getLoadingModList().getModLoadingIssues();
         if (issues.isEmpty()) {
             return true;
         }
@@ -108,7 +107,7 @@ public void onServerCommandRegister(Consumer<CommandDispatcher<CommandSourceStac
     public Multimap<String, String> getCustomModOptions() {
         if(modOptions == null) {
             modOptions = ArrayListMultimap.create();
-            for (ModInfo meta : LoadingModList.get().getMods()) {
+            for (ModInfo meta : FMLLoader.getCurrent().getLoadingModList().getMods()) {
                 meta.getConfigElement(IntegrationConstants.INTEGRATIONS_KEY).ifPresent(optionsObj -> {
                     if(optionsObj instanceof Map) {
                         Map<Object, Object> options = (Map<Object, Object>)optionsObj;
diff --git a/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java b/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java
@@ -37,7 +37,7 @@ protected void init() {
 
     @Override
     public void onClose() {
-        this.minecraft.setScreen(lastScreen);
+        this.minecraft.gui.setScreen(lastScreen);
     }
 
     @Override
diff --git a/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java b/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java
@@ -29,7 +29,7 @@ protected void init() {
 
     @Override
     public void onClose() {
-        this.minecraft.setScreen(lastScreen);
+        this.minecraft.gui.setScreen(lastScreen);
     }
 
     private void drawMultilineString(GuiGraphicsExtractor guiGraphics, Font fr, Component str, int x, int y) {
diff --git a/src/main/java/org/embeddedt/modernfix/screen/OptionList.java b/src/main/java/org/embeddedt/modernfix/screen/OptionList.java
@@ -12,7 +12,7 @@
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.input.MouseButtonEvent;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.MutableComponent;
@@ -41,7 +41,7 @@ public class OptionList extends ContainerObjectSelectionList<OptionList.Entry> {
     private static MutableComponent getOptionComponent(Option option) {
         String friendlyKey = "modernfix.option.name." + option.getName();
         MutableComponent baseComponent = Component.literal(option.getSelfName());
-        if(I18n.exists(friendlyKey))
+        if(Language.getInstance().has(friendlyKey))
             return Component.translatable(friendlyKey).withStyle(style -> style.withHoverEvent(new HoverEvent.ShowText(baseComponent)));
         else
             return baseComponent;
@@ -107,7 +107,7 @@ public CategoryEntry(Component component) {
 
         public void extractContent(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, boolean isMouseOver, float partialTicks) {
             Font var10000 = OptionList.this.minecraft.font;
-            float x = (float)(OptionList.this.minecraft.screen.width / 2 - this.width / 2);
+            float x = (float)(OptionList.this.minecraft.gui.screen().width / 2 - this.width / 2);
             int y = getY() + getHeight() - 10;
             guiGraphics.text(var10000, this.name, (int)x, y, -1);
             /*
@@ -164,9 +164,9 @@ public OptionEntry(String optionName, Option option) {
             updateStatus();
             this.helpButton = new Button.Builder(Component.literal("?"), (arg) -> {
                 mainScreen.setLastScrollAmount(scrollAmount());
-                Minecraft.getInstance().setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
+                Minecraft.getInstance().gui.setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
             }).pos(75, 0).size(20, 20).build();
-            if(!I18n.exists("modernfix.option." + optionName)) {
+            if(!Language.getInstance().has("modernfix.option." + optionName)) {
                 this.helpButton.active = false;
                 if(ModernFixPlatformHooks.INSTANCE.isDevEnv() && OPTIONS_MISSING_HELP.add(optionName))
                     ModernFix.LOGGER.warn("Missing help for {}", optionName);
diff --git a/src/main/java/org/embeddedt/modernfix/world/gen/PrefetchingBlockColumn.java b/src/main/java/org/embeddedt/modernfix/world/gen/PrefetchingBlockColumn.java
@@ -90,7 +90,7 @@ private void markPostprocessing(int y) {
                 y,
                 SectionPos.sectionToBlockCoord(chunk.getPos().z(), localZ)
         );
-        chunk.markPosForPostprocessing(cursor);
+        chunk.markPosForPostProcessing(cursor);
     }
 
     private void updateHeightmap(Heightmap.Types type, int y, BlockState newState) {
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("net.neoforged.moddev") version("2.0.140")`
	`2`	`+ id("net.neoforged.moddev") version("2.0.141")`
`3`	`3`	`id("me.modmuss50.mod-publish-plugin") version("1.1.0")`
`4`	`4`	`}`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class WorldSelectionListMixin {`
`18`	`18`
`19`	`19`	`@Inject(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList$WorldListEntry;doDeleteWorld()V", ordinal = 0, shift = At.Shift.AFTER), cancellable = true)`
`20`	`20`	`private void preventClosingCreateScreenAfterDelete(CallbackInfo ci) {`
`21`		`- if(minecraft.screen instanceof CreateWorldScreen)`
	`21`	`+ if(minecraft.gui.screen() instanceof CreateWorldScreen)`
`22`	`22`	`ci.cancel();`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class MinecraftMixin {`
`16`	`16`	`* @reason avoid exception stacktrace being printed in dev`
`17`	`17`	`*/`
`18`	`18`	`@Overwrite`
`19`		`- private UserApiService createUserApiService(YggdrasilAuthenticationService yggdrasilAuthenticationService, GameConfig arg) {`
	`19`	`+ private static UserApiService createUserApiService(YggdrasilAuthenticationService yggdrasilAuthenticationService, GameConfig arg) {`
`20`	`20`	`return UserApiService.OFFLINE;`
`21`	`21`	`}`
`22`	`22`	`}`