Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,27 @@ public static void register() {

private static OptionPage createPage() {
OptionGroup memory = OptionGroup.createBuilder()
.setId(id("memory"))
.add(OptionImpl.createBuilder(boolean.class, INSTANCE)
.setId(id("release_crash_reserve"))
.setControl(TickBoxControl::new)
.setBinding((config, value) -> config.releaseCrashReserve = value,
config -> config.releaseCrashReserve)
.setFlags(OptionFlag.REQUIRES_GAME_RESTART)
.build())
.add(OptionImpl.createBuilder(boolean.class, INSTANCE)
.setId(id("disable_realms"))
.setControl(TickBoxControl::new)
.setBinding((config, value) -> config.disableRealms = value,
config -> config.disableRealms)
.build())
.build();
.setId(id("memory"))
.add(OptionImpl.createBuilder(boolean.class, INSTANCE)
.setId(id("release_crash_reserve"))
.setControl(TickBoxControl::new)
.setBinding((config, value) -> config.releaseCrashReserve = value,
config -> config.releaseCrashReserve)
.setFlags(OptionFlag.REQUIRES_GAME_RESTART)
.build())
.add(OptionImpl.createBuilder(boolean.class, INSTANCE)
.setId(id("disable_realms"))
.setControl(TickBoxControl::new)
.setBinding((config, value) -> config.disableRealms = value,
config -> config.disableRealms)
.build())
.add(OptionImpl.createBuilder(boolean.class, INSTANCE)
.setId(id("persistent_keybindings"))
.setControl(TickBoxControl::new)
.setBinding((config, value) -> config.persistentKeybindings = value,
config -> config.persistentKeybindings)
.build())
.build();

return new OptionPage(id("options"), TextComponent.translatable("sarcio.options.pages.sarcio"), List.of(memory));
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/dev/rdh/sarcio/SarcioConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public final class SarcioConfig {

public boolean releaseCrashReserve;
public boolean disableRealms;
public boolean persistentKeybindings = true;

public static SarcioConfig load() {
if (Files.isRegularFile(PATH)) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/dev/rdh/sarcio/mixin/bugfix/MinecraftMixin.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.rdh.sarcio.mixin.bugfix;

import dev.rdh.sarcio.SarcioMod;
import net.minecraft.client.Minecraft;
import net.minecraft.client.Screenshot;
import net.minecraft.client.gui.screen.ProgressScreen;
Expand All @@ -26,6 +27,8 @@ public class MinecraftMixin {

@Inject(method = "openScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;lockMouse()V"))
private void sarcio$reapplyKeybinds(Screen guiScreenIn, CallbackInfo ci) {
if (!SarcioMod.CONFIG.persistentKeybindings) return;

for (KeyBinding keyBinding : KeyBinding.ALL) {
int keyCode = keyBinding.getKeyCode();
if (keyCode > 0 && keyCode < Keyboard.KEYBOARD_SIZE) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/sarcio/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ sarcio.options.release_crash_reserve.name=Release Crash Reserve
sarcio.options.release_crash_reserve.tooltip=Releases Minecraft's 10 MiB emergency reserve after startup.
sarcio.options.disable_realms.name=Hide Realms Button
sarcio.options.disable_realms.tooltip=Hides the Minecraft Realms button from the title screen.
sarcio.options.persistent_keybindings.name=Persistent Keybindings
sarcio.options.persistent_keybindings.tooltip=Keeps keys you are still holding pressed after a screen closes, instead of making you press them again.