This repository has been archived by the owner on Jan 21, 2023. It is now read-only.
forked from txnimc/MagnesiumExtras
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restore ZoomSettingsPage, Add Right-align FPS Display
- Loading branch information
Showing
8 changed files
with
157 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
src/main/java/vice/rubidium_extras/mixins/SodiumConfig/ZoomSettingsPage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package vice.rubidium_extras.mixins.SodiumConfig; | ||
|
|
||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; | ||
| import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; | ||
| import me.jellysquid.mods.sodium.client.gui.options.*; | ||
| import me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl; | ||
| import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl; | ||
| import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage; | ||
| import net.minecraft.client.gui.screens.Screen; | ||
| import net.minecraft.client.resources.language.I18n; | ||
| import net.minecraft.network.chat.Component; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
| import vice.rubidium_extras.config.MagnesiumExtrasConfig; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
|
|
||
| @Pseudo | ||
| @Mixin(SodiumOptionsGUI.class) | ||
| public abstract class ZoomSettingsPage | ||
| { | ||
| @Shadow | ||
| @Final | ||
| private List<OptionPage> pages; | ||
| private static final SodiumOptionsStorage sodiumOpts = new SodiumOptionsStorage(); | ||
| @Inject(method = "<init>", at = @At("RETURN")) | ||
| private void DynamicLights(Screen prevScreen, CallbackInfo ci) | ||
| { | ||
| List<OptionGroup> groups = new ArrayList(); | ||
| //OptionImpl<SodiumGameOptions, Boolean> lowerSensitivity = OptionImpl.createBuilder(Boolean.class, sodiumOpts) | ||
| // .setName("Lower Zoom Sensitivity") | ||
| // .setTooltip("Lowers your sensitivity when zooming to make it feel more consistent.") | ||
| // .setControl(TickBoxControl::new) | ||
| // .setBinding( | ||
| // (options, value) -> MagnesiumExtrasConfig.lowerZoomSensitivity.set(value), | ||
| // (options) -> MagnesiumExtrasConfig.lowerZoomSensitivity.get()) | ||
| // .setImpact(OptionImpact.LOW) | ||
| // .build(); | ||
| OptionImpl<SodiumGameOptions, Boolean> zoomScrolling = OptionImpl.createBuilder(Boolean.class, sodiumOpts) | ||
| .setName(Component.nullToEmpty(I18n.get("rb_extra.zoom_scrolling.name"))) | ||
| .setTooltip(Component.nullToEmpty(I18n.get("rb_extra.zoom_scrolling.tooltip"))) | ||
| .setControl(TickBoxControl::new) | ||
| .setBinding( | ||
| (options, value) -> MagnesiumExtrasConfig.zoomScrolling.set(value), | ||
| (options) -> MagnesiumExtrasConfig.zoomScrolling.get()) | ||
| .setImpact(OptionImpact.LOW) | ||
| .build(); | ||
| OptionImpl<SodiumGameOptions, Boolean> zoomOverlay = OptionImpl.createBuilder(Boolean.class, sodiumOpts) | ||
| .setName(Component.nullToEmpty(I18n.get("rb_extra.zoom_overlay.name"))) | ||
| .setTooltip(Component.nullToEmpty(I18n.get("rb_extra.zoom_overlay.tooltip"))) | ||
| .setControl(TickBoxControl::new) | ||
| .setBinding( | ||
| (options, value) -> MagnesiumExtrasConfig.zoomOverlay.set(value), | ||
| (options) -> MagnesiumExtrasConfig.zoomOverlay.get()) | ||
| .setImpact(OptionImpact.LOW) | ||
| .build(); | ||
| groups.add(OptionGroup | ||
| .createBuilder() | ||
| //.add(lowerSensitivity) | ||
| .add(zoomScrolling) | ||
| .add(zoomOverlay) | ||
| .build() | ||
| ); | ||
| Option<MagnesiumExtrasConfig.ZoomTransitionOptions> zoomTransition = OptionImpl.createBuilder(MagnesiumExtrasConfig.ZoomTransitionOptions.class, sodiumOpts) | ||
| .setName(Component.nullToEmpty(I18n.get("rb_extra.zoom_transition_mode.name"))) | ||
| .setTooltip(Component.nullToEmpty("rb_extra.zoom_transition_mode.tooltip")) | ||
| .setControl((option) -> new CyclingControl<>(option, MagnesiumExtrasConfig.ZoomTransitionOptions.class, new Component[] { | ||
| Component.nullToEmpty(I18n.get("rb_extra.options.off")), | ||
| Component.nullToEmpty(I18n.get("rb_extra.options.smooth")) | ||
| })) | ||
| .setBinding( | ||
| (opts, value) -> MagnesiumExtrasConfig.zoomTransition.set(value.toString()), | ||
| (opts) -> MagnesiumExtrasConfig.ZoomTransitionOptions.valueOf(MagnesiumExtrasConfig.zoomTransition.get())) | ||
| .setImpact(OptionImpact.LOW) | ||
| .build(); | ||
| Option<MagnesiumExtrasConfig.ZoomModes> zoomMode = OptionImpl.createBuilder(MagnesiumExtrasConfig.ZoomModes.class, sodiumOpts) | ||
| .setName(Component.nullToEmpty(I18n.get("rb_extra.zoom_keybind_mode.name"))) | ||
| .setTooltip(Component.nullToEmpty(I18n.get("rb_extra.zoom_keybind_mode.tooltip"))) | ||
| .setControl((option) -> new CyclingControl<>(option, MagnesiumExtrasConfig.ZoomModes.class, new Component[] { | ||
| Component.nullToEmpty(I18n.get("rb_extra.options.hold")), | ||
| Component.nullToEmpty(I18n.get("rb_extra.options.toggle")), | ||
| Component.nullToEmpty(I18n.get("rb_extra.options.persistent")) | ||
| })) | ||
| .setBinding( | ||
| (opts, value) -> MagnesiumExtrasConfig.zoomMode.set(value.toString()), | ||
| (opts) -> MagnesiumExtrasConfig.ZoomModes.valueOf(MagnesiumExtrasConfig.zoomMode.get())) | ||
| .setImpact(OptionImpact.LOW) | ||
| .build(); | ||
| //Option<MagnesiumExtrasConfig.CinematicCameraOptions> cinematicCameraMode = OptionImpl.createBuilder(MagnesiumExtrasConfig.CinematicCameraOptions.class, sodiumOpts) | ||
| // .setName("Cinematic Camera Options") | ||
| // .setTooltip("Cinematic Camera Mode") | ||
| // .setControl((option) -> new CyclingControl<>(option, MagnesiumExtrasConfig.CinematicCameraOptions.class, new String[] { "Off", "Vanilla", "Multiplied"})) | ||
| // .setBinding( | ||
| // (opts, value) -> MagnesiumExtrasConfig.cinematicCameraMode.set(value.toString()), | ||
| // (opts) -> MagnesiumExtrasConfig.CinematicCameraOptions.valueOf(MagnesiumExtrasConfig.cinematicCameraMode.get())) | ||
| // .setImpact(OptionImpact.LOW) | ||
| // .build(); | ||
| groups.add(OptionGroup | ||
| .createBuilder() | ||
| .add(zoomTransition) | ||
| .add(zoomMode) | ||
| //.add(cinematicCameraMode) | ||
| .build() | ||
| ); | ||
| pages.add(new OptionPage(Component.nullToEmpty(I18n.get("rb_extra.page.zoom")), ImmutableList.copyOf(groups))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters