Skip to content

Commit 8e89b84

Browse files
committed
fix: discard splash overlay on crafting easter egg language update (fixes #12)
1 parent 46e0cf0 commit 8e89b84

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/main/java/dev/chachy/lazylanguageloader/client/mixin/optimizations/splash/MixinMinecraftClient.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
import net.minecraft.client.gui.screen.Overlay;
55
import net.minecraft.client.gui.screen.Screen;
66
import net.minecraft.client.gui.screen.SplashOverlay;
7+
import net.minecraft.client.gui.screen.ingame.CraftingScreen;
78
import net.minecraft.client.gui.screen.option.LanguageOptionsScreen;
89
import org.jetbrains.annotations.Nullable;
910
import org.spongepowered.asm.mixin.Mixin;
1011
import org.spongepowered.asm.mixin.Shadow;
12+
import org.spongepowered.asm.mixin.Unique;
1113
import org.spongepowered.asm.mixin.injection.At;
1214
import org.spongepowered.asm.mixin.injection.Inject;
1315
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -20,8 +22,13 @@ public class MixinMinecraftClient {
2022

2123
@Inject(method = "setOverlay", at = @At("HEAD"), cancellable = true)
2224
private void lazyLanguageLoader$$setOverlay(Overlay overlay, CallbackInfo ci) {
23-
if (overlay instanceof SplashOverlay && currentScreen instanceof LanguageOptionsScreen) {
25+
if (overlay instanceof SplashOverlay && lazyLanguageLoader$$verifyScreen(currentScreen)) {
2426
ci.cancel();
2527
}
2628
}
29+
30+
@Unique
31+
private boolean lazyLanguageLoader$$verifyScreen(Screen screen) {
32+
return screen instanceof LanguageOptionsScreen || screen instanceof CraftingScreen;
33+
}
2734
}

0 commit comments

Comments
 (0)