Skip to content

Make config navigation consistent (back to selector) #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MelanX wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

Make config navigation consistent (back to selector) #91

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
11 changes: 5 additions & 6 deletions src/main/java/org/moddingx/libx/impl/config/gui/ModConfigGuiAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
import org.moddingx.libx.impl.config.gui.screen.ConfigSelectScreen;
import org.moddingx.libx.impl.config.gui.screen.RootConfigScreen;

import javax.annotation.Nullable;
import java.util.Comparator;
import java.util.List;
import java.util.function.Function;
import java.util.function.BiFunction;

public class ModConfigGuiAdapter {

Expand Down Expand Up @@ -41,14 +40,14 @@ public Screen createScreen(ModContainer modContainer, Screen modListScreen) {
if (configs.isEmpty()) {
return modListScreen;
} else if (configs.size() == 1) {
return this.factory(modListScreen.getMinecraft(), modListScreen).apply(configs.get(0));
return this.factory(modListScreen.getMinecraft()).apply(configs.getFirst(), modListScreen);
} else {
return new ConfigSelectScreen(this.factory(modListScreen.getMinecraft(), modListScreen), configs, modListScreen);
return new ConfigSelectScreen(this.factory(modListScreen.getMinecraft()), configs, modListScreen);
}
}

private Function<ConfigImpl, Screen> factory(Minecraft minecraft, @Nullable Screen root) {
return config -> {
private BiFunction<ConfigImpl, Screen, Screen> factory(Minecraft minecraft) {
return (config, root) -> {
ConfigDisplay display = config.createDisplay();
ConfigScreenManager manager = new ConfigScreenManager(minecraft, root, display);
// Must also push to the manager
Expand Down
17 changes: 13 additions & 4 deletions src/main/java/org/moddingx/libx/impl/config/gui/screen/ConfigSelectScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
import org.moddingx.libx.impl.config.ConfigImpl;

import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;

public class ConfigSelectScreen extends ConfigBaseScreen {

private final Function<ConfigImpl, Screen> factory;
private final BiFunction<ConfigImpl, Screen, Screen> factory;
private final List<ConfigImpl> configs;
private final Screen root;

public ConfigSelectScreen(Function<ConfigImpl, Screen> factory, List<ConfigImpl> configs, Screen root) {
public ConfigSelectScreen(BiFunction<ConfigImpl, Screen, Screen> factory, List<ConfigImpl> configs, Screen root) {
super(Component.translatable("libx.config.gui.selection.title"), null, false);
this.factory = factory;
this.configs = configs;
Expand All @@ -26,10 +26,19 @@ public ConfigSelectScreen(Function<ConfigImpl, Screen> factory, List<ConfigImpl>

@Override
protected void buildGui(Consumer<AbstractWidget> consumer) {
Button back = Button.builder(Component.literal("\u2190 ").append(Component.translatable("libx.config.gui.back")), button -> this.mc.setScreen(this.root))
.pos(5, 5)
.size(52, 20)
.build();
this.addRenderableWidget(back);

int y = 5;
int buttonWidth = Math.min(200, this.contentWidth() - 10);
for (ConfigImpl config : this.configs) {
Button button = Button.builder(Component.literal(config.id.getPath()), b -> this.mc.setScreen(this.factory.apply(config)))
Button button = Button.builder(Component.literal(config.id.getPath()), b -> {
Screen configSelectScreen = this.factory.apply(config, this);
this.mc.setScreen(configSelectScreen);
})
.pos((this.contentWidth() - buttonWidth) / 2, y)
.size(buttonWidth, 20)
.build();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/moddingx/libx/impl/config/gui/screen/RootConfigScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ private static Map<BuiltCategory, List<ConfigKey>> buildGrouped(ConfigImpl confi

private static BuiltEntry createEntry(ConfigKey key, ConfigScreen<ConfigKey> screen, @Nullable AbstractWidget old, int x, int y, int width, int height) {
return new BuiltEntry(
Component.literal(key.path.get(key.path.size() - 1)),
Component.literal(key.path.getLast()),
key.comment.stream().map(Component::literal).collect(ImmutableList.toImmutableList()),
screen.display.createWidget(key, screen, old, x, y, width, height)
);
Expand Down