Skip to content

Commit

Permalink
Make the settings screen scrollable
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sollace
Sollace committed Dec 18, 2023
1 parent 65fda0f commit aee399a
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 25 deletions.
74 changes: 52 additions & 22 deletions src/main/java/eu/ha3/presencefootsteps/PFOptionsScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.jetbrains.annotations.Nullable;

import com.minelittlepony.common.client.gui.GameGui;
import com.minelittlepony.common.client.gui.ScrollContainer;
import com.minelittlepony.common.client.gui.Tooltip;
import com.minelittlepony.common.client.gui.dimension.Bounds;
import com.minelittlepony.common.client.gui.element.AbstractSlider;
Expand All @@ -16,6 +17,7 @@

import eu.ha3.mc.quick.update.Versions;
import eu.ha3.presencefootsteps.util.BlockReport;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.Text;

Expand All @@ -24,98 +26,119 @@ class PFOptionsScreen extends GameGui {
public static final Text UP_TO_DATE = Text.translatable("pf.update.up_to_date");
public static final Text VOLUME_MIN = Text.translatable("menu.pf.volume.min");

private final ScrollContainer content = new ScrollContainer();

public PFOptionsScreen(@Nullable Screen parent) {
super(TITLE, parent);
super(Text.translatable("%s (%s)", TITLE, PresenceFootsteps.getInstance().getKeyBinding().getBoundKeyLocalizedText()), parent);
content.margin.top = 30;
content.margin.bottom = 30;
content.getContentPadding().top = 10;
content.getContentPadding().right = 10;
content.getContentPadding().bottom = 20;
content.getContentPadding().left = 10;

}

@Override
public void init() {
int left = width / 2 - 100;
protected void init() {
content.init(this::rebuildContent);
}

int wideLeft = width / 2 - 155;
private void rebuildContent() {
int left = content.width / 2 - 100;

int wideLeft = content.width / 2 - 155;
int wideRight = wideLeft + 160;

int row = height / 4;
int row = 0;

PFConfig config = PresenceFootsteps.getInstance().getConfig();

addButton(new Label(width / 2, 30)).setCentered().getStyle()
getChildElements().add(content);

addButton(new Label(width / 2, 10)).setCentered().getStyle()
.setText(getTitle());

redrawUpdateButton(addButton(new Button(width - 45, 20, 25, 20)).onClick(sender -> {
redrawUpdateButton(addButton(new Button(width - 30, 5, 25, 20)).onClick(sender -> {
sender.setEnabled(false);
sender.getStyle().setTooltip("pf.update.checking");
PresenceFootsteps.getInstance().getUpdateChecker().checkNow().thenAccept(newVersions -> {
redrawUpdateButton(sender);
});
}));

var slider = addButton(new Slider(wideLeft, row, 0, 100, config.getGlobalVolume()))
var slider = content.addButton(new Slider(wideLeft, row, 0, 100, config.getGlobalVolume()))
.onChange(config::setGlobalVolume)
.setTextFormat(this::formatVolume);
slider.setBounds(new Bounds(row, wideLeft, 310, 20));
slider.getStyle().setTooltip(Tooltip.of("menu.pf.volume.tooltip", 210)).setTooltipOffset(0, 25);

slider = addButton(new Slider(wideLeft, row += 24, 0, 100, config.getClientPlayerVolume()))
row += 10;

slider = content.addButton(new Slider(wideLeft, row += 24, 0, 100, config.getClientPlayerVolume()))
.onChange(config::setClientPlayerVolume)
.setTextFormat(formatVolume("menu.pf.volume.player"));
slider.setBounds(new Bounds(row, wideLeft, 150, 20));
slider.getStyle().setTooltip(Tooltip.of("menu.pf.volume.player.tooltip", 210)).setTooltipOffset(0, 25);

slider = addButton(new Slider(wideRight, row, 0, 100, config.getOtherPlayerVolume()))
slider = content.addButton(new Slider(wideRight, row, 0, 100, config.getOtherPlayerVolume()))
.onChange(config::setOtherPlayerVolume)
.setTextFormat(formatVolume("menu.pf.volume.other_players"));
slider.setBounds(new Bounds(row, wideRight, 150, 20));
slider.getStyle().setTooltip(Tooltip.of("menu.pf.volume.other_players.tooltip", 210)).setTooltipOffset(0, 25);

slider = addButton(new Slider(wideLeft, row += 24, 0, 100, config.getHostileEntitiesVolume()))
slider = content.addButton(new Slider(wideLeft, row += 24, 0, 100, config.getHostileEntitiesVolume()))
.onChange(config::setHostileEntitiesVolume)
.setTextFormat(formatVolume("menu.pf.volume.hostile_entities"));
slider.setBounds(new Bounds(row, wideLeft, 150, 20));
slider.getStyle().setTooltip(Tooltip.of("menu.pf.volume.hostile_entities.tooltip", 210)).setTooltipOffset(0, 25);

slider = addButton(new Slider(wideRight, row, 0, 100, config.getPassiveEntitiesVolume()))
slider = content.addButton(new Slider(wideRight, row, 0, 100, config.getPassiveEntitiesVolume()))
.onChange(config::setPassiveEntitiesVolume)
.setTextFormat(formatVolume("menu.pf.volume.passive_entities"));
slider.setBounds(new Bounds(row, wideRight, 150, 20));
slider.getStyle().setTooltip(Tooltip.of("menu.pf.volume.passive_entities.tooltip", 210)).setTooltipOffset(0, 25);

slider = addButton(new Slider(wideLeft, row += 24, -100, 100, config.getRunningVolumeIncrease()))
slider = content.addButton(new Slider(wideLeft, row += 24, -100, 100, config.getRunningVolumeIncrease()))
.onChange(config::setRunningVolumeIncrease)
.setTextFormat(formatVolume("menu.pf.volume.running"));
slider.setBounds(new Bounds(row, wideLeft, 310, 20));
slider.getStyle().setTooltip(Tooltip.of("menu.pf.volume.running.tooltip", 210)).setTooltipOffset(0, 25);

slider = addButton(new Slider(wideLeft, row += 24, 0, 100, config.getWetSoundsVolume()))
slider = content.addButton(new Slider(wideLeft, row += 24, 0, 100, config.getWetSoundsVolume()))
.onChange(config::setWetSoundsVolume)
.setTextFormat(formatVolume("menu.pf.volume.wet"));
slider.setBounds(new Bounds(row, wideLeft, 310, 20));
slider.styled(s -> s.setTooltip(Tooltip.of("menu.pf.volume.wet.tooltip", 210)).setTooltipOffset(0, 25));

addButton(new EnumSlider<>(left, row += 24, config.getLocomotion())
row += 10;

content.addButton(new EnumSlider<>(left, row += 24, config.getLocomotion())
.onChange(config::setLocomotion)
.setTextFormat(v -> v.getValue().getOptionName()))
.setTooltipFormat(v -> Tooltip.of(v.getValue().getOptionTooltip(), 250))
.setBounds(new Bounds(row, wideLeft, 310, 20));

addButton(new Button(wideLeft, row += 24, 150, 20).onClick(sender -> {
row += 10;

content.addButton(new Button(wideLeft, row += 24, 150, 20).onClick(sender -> {
sender.getStyle().setText("menu.pf.global." + config.cycleTargetSelector().name().toLowerCase());
})).getStyle()
.setText("menu.pf.global." + config.getEntitySelector().name().toLowerCase());

addButton(new Button(wideRight, row, 150, 20).onClick(sender -> {
content.addButton(new Button(wideRight, row, 150, 20).onClick(sender -> {
sender.getStyle().setText("menu.pf.multiplayer." + config.toggleMultiplayer());
})).getStyle()
.setText("menu.pf.multiplayer." + config.getEnabledMP());

addButton(new Button(wideLeft, row += 24, 150, 20).onClick(sender -> {
content.addButton(new Button(wideLeft, row += 24, 150, 20).onClick(sender -> {
sender.setEnabled(false);
BlockReport.execute(PresenceFootsteps.getInstance().getEngine().getIsolator(), "report_concise", false).thenRun(() -> sender.setEnabled(true));
})).setEnabled(client.world != null)
.getStyle()
.setText("menu.pf.report.concise");

addButton(new Button(wideRight, row, 150, 20)
content.addButton(new Button(wideRight, row, 150, 20)
.onClick(sender -> {
sender.setEnabled(false);
BlockReport.execute(PresenceFootsteps.getInstance().getEngine().getIsolator(), "report_full", true).thenRun(() -> sender.setEnabled(true));
Expand All @@ -124,7 +147,7 @@ public void init() {
.getStyle()
.setText("menu.pf.report.full");

addButton(new Button(left, row += 34)
addButton(new Button(left, height - 25)
.onClick(sender -> finish())).getStyle()
.setText("gui.done");
}
Expand All @@ -134,8 +157,8 @@ private void redrawUpdateButton(Button button) {
boolean hasUpdate = versions.isPresent();
button.setEnabled(true);
button.getStyle()
.setText(hasUpdate ? "!" : ":)")
.setColor(hasUpdate ? 0xAAFF00 : 0xFFFFFF)
.setText(hasUpdate ? "🙁" : "🙂")
.setColor(hasUpdate ? 0xFF0000 : 0xFFFFFF)
.setTooltip(versions
.map(Versions::latest)
.map(latest -> (Text)Text.translatable("pf.update.updates_available",
Expand All @@ -152,6 +175,13 @@ private Text formatVolume(AbstractSlider<Float> slider) {
return Text.translatable("menu.pf.volume", (int)Math.floor(slider.getValue()));
}

@Override
public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) {
super.render(context, mouseX, mouseY, tickDelta);
content.render(context, mouseX, mouseY, tickDelta);
}


static Function<AbstractSlider<Float>, Text> formatVolume(String key) {
return slider -> Text.translatable(key, (int)Math.floor(slider.getValue()));
}
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/eu/ha3/presencefootsteps/PresenceFootsteps.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ public PFConfig getConfig() {
return config;
}

public KeyBinding getKeyBinding() {
return keyBinding;
}

public UpdateChecker getUpdateChecker() {
return updater;
}
Expand All @@ -79,9 +83,7 @@ public void onInitializeClient() {
config = new PFConfig(pfFolder.resolve("userconfig.json"), this);
config.load();

keyBinding = new KeyBinding("key.presencefootsteps.settings", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_F10, "key.categories.misc");

KeyBindingHelper.registerKeyBinding(keyBinding);
keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("key.presencefootsteps.settings", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_F10, "key.categories.misc"));

engine = new SoundEngine(config);
debugHud = new PFDebugHud(engine);
Expand Down

0 comments on commit aee399a

Please sign in to comment.