Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Preserve the current screen on style change #179

Merged
moehreag merged 1 commit into from
Oct 11, 2025
Merged

Preserve the current screen on style change #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion 1.16_combat-6/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
import io.github.axolotlclient.AxolotlClientConfig.api.util.Color;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
import io.github.axolotlclient.AxolotlClientConfig.impl.ui.RecreatableScreen;
import io.github.axolotlclient.AxolotlClientConfigCommon;
import io.github.axolotlclient.config.screen.CreditsScreen;
import io.github.axolotlclient.config.screen.ProfilesScreen;
Expand All @@ -43,6 +44,7 @@
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.options.KeyBinding;
import net.minecraft.client.texture.NativeImage;
import net.minecraft.client.texture.NativeImageBackedTexture;
Expand Down Expand Up @@ -155,7 +157,9 @@ public AxolotlClientConfig() {
general.add(configStyle = new StringArrayOption("configStyle", themes,
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
MinecraftClient.getInstance().openScreen(null);

Screen newScreen = RecreatableScreen.tryRecreate(MinecraftClient.getInstance().currentScreen);
MinecraftClient.getInstance().openScreen(newScreen);
}));
AxolotlClient.getInstance().getConfigManager().load();
ConfigUI.getInstance().setStyle(configStyle.get().split("\\.")[1]);
Expand Down
6 changes: 5 additions & 1 deletion 1.20/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
import io.github.axolotlclient.AxolotlClientConfig.api.util.Color;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
import io.github.axolotlclient.AxolotlClientConfig.impl.ui.RecreatableScreen;
import io.github.axolotlclient.AxolotlClientConfigCommon;
import io.github.axolotlclient.config.screen.CreditsScreen;
import io.github.axolotlclient.config.screen.ProfilesScreen;
Expand All @@ -43,6 +44,7 @@
import io.github.axolotlclient.util.options.GenericOption;
import lombok.Getter;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.option.KeyBind;
import net.minecraft.client.texture.NativeImageBackedTexture;

Expand Down Expand Up @@ -152,7 +154,9 @@ public AxolotlClientConfig() {
general.add(configStyle = new StringArrayOption("configStyle", themes,
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
MinecraftClient.getInstance().setScreen(null);

Screen newScreen = RecreatableScreen.tryRecreate(MinecraftClient.getInstance().currentScreen);
MinecraftClient.getInstance().setScreen(newScreen);
}));
AxolotlClient.getInstance().getConfigManager().load();
ConfigUI.getInstance().setStyle(configStyle.get().split("\\.")[1]);
Expand Down
6 changes: 5 additions & 1 deletion 1.21/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
import io.github.axolotlclient.AxolotlClientConfig.api.util.Color;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
import io.github.axolotlclient.AxolotlClientConfig.impl.ui.RecreatableScreen;
import io.github.axolotlclient.AxolotlClientConfigCommon;
import io.github.axolotlclient.config.screen.CreditsScreen;
import io.github.axolotlclient.config.screen.ProfilesScreen;
Expand All @@ -43,6 +44,7 @@
import io.github.axolotlclient.util.options.GenericOption;
import lombok.Getter;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.option.KeyBind;
import net.minecraft.client.texture.NativeImageBackedTexture;

Expand Down Expand Up @@ -151,7 +153,9 @@ public AxolotlClientConfig() {
general.add(configStyle = new StringArrayOption("configStyle", themes,
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
MinecraftClient.getInstance().setScreen(null);

Screen newScreen = RecreatableScreen.tryRecreate(MinecraftClient.getInstance().currentScreen);
MinecraftClient.getInstance().setScreen(newScreen);
}));
AxolotlClient.getInstance().getConfigManager().load();
ConfigUI.getInstance().setStyle(configStyle.get().split("\\.")[1]);
Expand Down
8 changes: 7 additions & 1 deletion 1.8.9/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@
import io.github.axolotlclient.AxolotlClientConfig.api.options.Option;
import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.api.util.Color;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
import io.github.axolotlclient.AxolotlClientConfig.impl.ui.RecreatableScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import io.github.axolotlclient.AxolotlClientConfigCommon;
import io.github.axolotlclient.config.screen.CreditsScreen;
import io.github.axolotlclient.config.screen.ProfilesScreen;
Expand All @@ -41,6 +44,7 @@
import io.github.axolotlclient.util.options.GenericOption;
import lombok.Getter;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.options.KeyBinding;
import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
import net.ornithemc.osl.lifecycle.api.client.MinecraftClientEvents;
Expand Down Expand Up @@ -135,7 +139,9 @@ public AxolotlClientConfig() {
general.add(configStyle = new StringArrayOption("configStyle", themes,
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
Minecraft.getInstance().openScreen(null);

Screen newScreen = RecreatableScreen.tryRecreate(Minecraft.getInstance().screen);
Minecraft.getInstance().openScreen(newScreen);
}));
AxolotlClient.getInstance().getConfigManager().load();
ConfigUI.getInstance().setStyle(configStyle.get().split("\\.")[1]);
Expand Down
7 changes: 6 additions & 1 deletion 1.latest/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
import io.github.axolotlclient.AxolotlClientConfig.api.util.Color;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
import io.github.axolotlclient.AxolotlClientConfig.impl.ui.RecreatableScreen;
import io.github.axolotlclient.AxolotlClientConfigCommon;
import io.github.axolotlclient.config.screen.CreditsScreen;
import io.github.axolotlclient.config.screen.ProfilesScreen;
Expand All @@ -43,6 +44,7 @@
import lombok.Getter;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.renderer.texture.DynamicTexture;

public class AxolotlClientConfig extends AxolotlClientConfigCommon {
Expand Down Expand Up @@ -140,7 +142,10 @@ public AxolotlClientConfig() {
general.add(configStyle = new StringArrayOption("configStyle", themes,
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
Minecraft.getInstance().schedule(() -> Minecraft.getInstance().setScreen(null));
Minecraft.getInstance().schedule(() -> {
Screen newScreen = RecreatableScreen.tryRecreate(Minecraft.getInstance().screen);
Minecraft.getInstance().setScreen(newScreen);
});
}));
AxolotlClient.getInstance().getConfigManager().load();
ConfigUI.getInstance().setStyle(configStyle.get().split("\\.")[1]);
Expand Down
Loading