Option API improvements

Author: ItsNature

api/src/main/java/com/lunarclient/apollo/mods/ModStatus.java

@@ -126,94 +126,94 @@ public final class Mods {
      * @since 1.0.0
      */
     public static final List<Class<?>> ALL_MODS = Arrays.asList(
-        ModReplaymod.class,
-        ModOneSevenVisuals.class,
-        ModFps.class,
-        ModCps.class,
-        ModSba.class,
-        ModToggleSneak.class,
-        ModZoom.class,
-        ModHypixelMod.class,
-        ModHypixelBedwars.class,
-        ModQuickplay.class,
-        ModArmorstatus.class,
-        ModKeystrokes.class,
-        ModCoordinates.class,
-        ModDayCounter.class,
-        ModCrosshair.class,
-        ModPotionEffects.class,
-        ModDirectionHud.class,
-        ModWaypoints.class,
-        ModHitColor.class,
-        ModScoreboard.class,
-        ModTitles.class,
-        ModItemCounter.class,
-        ModPing.class,
-        ModMotionBlur.class,
-        ModPackOrganizer.class,
-        ModChat.class,
-        ModTab.class,
-        ModNametag.class,
-        ModShulkerPreview.class,
-        ModScrollableTooltips.class,
-        ModUhcOverlay.class,
-        ModParticleChanger.class,
-        ModNickHider.class,
-        ModCooldowns.class,
-        ModWorldeditCui.class,
-        ModClock.class,
-        ModStopwatch.class,
-        ModPlaytime.class,
-        ModMemory.class,
-        ModCombo.class,
-        ModReachDisplay.class,
-        ModTimeChanger.class,
-        ModServerAddress.class,
-        ModSaturation.class,
-        ModColorSaturation.class,
-        ModItemPhysics.class,
-        ModTntCountdown.class,
-        ModItemTracker.class,
-        ModShinyPots.class,
-        Mod3dSkins.class,
-        ModGlintColorizer.class,
-        ModMomentum.class,
-        ModBlockOutline.class,
-        ModScreenshot.class,
-        ModFov.class,
-        ModFog.class,
-        ModAutoTextHotkey.class,
-        ModAutoTextActions.class,
-        ModMumbleLink.class,
-        ModTotemCounter.class,
-        Mod2dItems.class,
-        ModBossbar.class,
-        ModFreelook.class,
-        ModPvpInfo.class,
-        ModSnaplook.class,
-        ModTeamView.class,
-        ModPackDisplay.class,
-        ModMenuBlur.class,
-        ModMinimap.class,
-        ModHitbox.class,
-        ModLighting.class,
-        ModWeatherChanger.class,
-        ModChunkBorders.class,
-        ModSoundChanger.class,
-        ModWaila.class,
-        ModNeu.class,
-        ModHurtCam.class,
-        ModTierTagger.class,
-        ModDamageTint.class,
-        ModMobSize.class,
-        ModSkyblock.class,
-        ModHorseStats.class,
-        ModRewind.class,
-        ModAudioSubtitles.class,
-        ModKillSounds.class,
-        ModInventoryMod.class,
-        ModRadio.class
-    );
+            ModReplaymod.class,
+            ModOneSevenVisuals.class,
+            ModFps.class,
+            ModCps.class,
+            ModSba.class,
+            ModToggleSneak.class,
+            ModZoom.class,
+            ModHypixelMod.class,
+            ModHypixelBedwars.class,
+            ModQuickplay.class,
+            ModArmorstatus.class,
+            ModKeystrokes.class,
+            ModCoordinates.class,
+            ModDayCounter.class,
+            ModCrosshair.class,
+            ModPotionEffects.class,
+            ModDirectionHud.class,
+            ModWaypoints.class,
+            ModHitColor.class,
+            ModScoreboard.class,
+            ModTitles.class,
+            ModItemCounter.class,
+            ModPing.class,
+            ModMotionBlur.class,
+            ModPackOrganizer.class,
+            ModChat.class,
+            ModTab.class,
+            ModNametag.class,
+            ModShulkerPreview.class,
+            ModScrollableTooltips.class,
+            ModUhcOverlay.class,
+            ModParticleChanger.class,
+            ModNickHider.class,
+            ModCooldowns.class,
+            ModWorldeditCui.class,
+            ModClock.class,
+            ModStopwatch.class,
+            ModPlaytime.class,
+            ModMemory.class,
+            ModCombo.class,
+            ModReachDisplay.class,
+            ModTimeChanger.class,
+            ModServerAddress.class,
+            ModSaturation.class,
+            ModColorSaturation.class,
+            ModItemPhysics.class,
+            ModTntCountdown.class,
+            ModItemTracker.class,
+            ModShinyPots.class,
+            Mod3dSkins.class,
+            ModGlintColorizer.class,
+            ModMomentum.class,
+            ModBlockOutline.class,
+            ModScreenshot.class,
+            ModFov.class,
+            ModFog.class,
+            ModAutoTextHotkey.class,
+            ModAutoTextActions.class,
+            ModMumbleLink.class,
+            ModTotemCounter.class,
+            Mod2dItems.class,
+            ModBossbar.class,
+            ModFreelook.class,
+            ModPvpInfo.class,
+            ModSnaplook.class,
+            ModTeamView.class,
+            ModPackDisplay.class,
+            ModMenuBlur.class,
+            ModMinimap.class,
+            ModHitbox.class,
+            ModLighting.class,
+            ModWeatherChanger.class,
+            ModChunkBorders.class,
+            ModSoundChanger.class,
+            ModWaila.class,
+            ModNeu.class,
+            ModHurtCam.class,
+            ModTierTagger.class,
+            ModDamageTint.class,
+            ModMobSize.class,
+            ModSkyblock.class,
+            ModHorseStats.class,
+            ModRewind.class,
+            ModAudioSubtitles.class,
+            ModKillSounds.class,
+            ModInventoryMod.class,
+            ModRadio.class
+        );
 
     private Mods() {
     }

api/src/main/java/com/lunarclient/apollo/mods/Mods.java

@@ -26,8 +26,8 @@
 import com.lunarclient.apollo.player.ApolloPlayer;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.function.BiFunction;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -48,11 +48,6 @@ final class EmptyOptions implements Options {
         return option.getDefaultValue();
     }
 
-    @Override
-    public <T, C extends Option<T, ?, ?>> @Nullable T get(UUID playerUuid, C option) {
-        return option.getDefaultValue();
-    }
-
     @Override
     public <T, C extends Option<T, ?, ?>> Optional<T> getDirect(C option) {
         return Optional.empty();
@@ -63,11 +58,6 @@ final class EmptyOptions implements Options {
         return Optional.empty();
     }
 
-    @Override
-    public <T, C extends Option<T, ?, ?>> Optional<T> getDirect(UUID playerUuid, C option) {
-        return Optional.empty();
-    }
-
     @Override
     public <T> void set(Option<?, ?, ?> option, @Nullable T value) {
 
@@ -108,6 +98,16 @@ public <T> void replace(ApolloPlayer player, Option<?, ?, ?> option, BiFunction<
 
     }
 
+    @Override
+    public <T, C extends Option<T, ?, ?>> void register(C option) {
+
+    }
+
+    @Override
+    public Map<String, Option<?, ?, ?>> getRegistry() {
+        return Collections.emptyMap();
+    }
+
     @Override
     public @NonNull Iterator<Option<?, ?, ?>> iterator() {
         return Collections.emptyIterator();

api/src/main/java/com/lunarclient/apollo/option/EmptyOptions.java

@@ -24,8 +24,8 @@
 package com.lunarclient.apollo.option;
 
 import com.lunarclient.apollo.player.ApolloPlayer;
+import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.function.BiFunction;
 import org.jetbrains.annotations.Nullable;
 
@@ -71,19 +71,6 @@ static Options empty() {
      */
     <T, C extends Option<T, ?, ?>> @Nullable T get(ApolloPlayer player, C option);
 
-    /**
-     * Returns the {@code T} value stored for the provided {@link UUID}
-     * and {@link Option} if it exists, or the default value if it exists.
-     *
-     * @param playerUuid the player uuid
-     * @param option     the option
-     * @param <T>        the value type
-     * @param <C>        the option type
-     * @return the value or default if present
-     * @since 1.2.1
-     */
-    <T, C extends Option<T, ?, ?>> @Nullable T get(UUID playerUuid, C option);
-
     /**
      * Returns an {@link Optional} of the {@code T} value stored for the
      * provided {@link Option} if it exists, otherwise returns
@@ -111,20 +98,6 @@ static Options empty() {
      */
     <T, C extends Option<T, ?, ?>> Optional<T> getDirect(ApolloPlayer player, C option);
 
-    /**
-     * Returns an {@link Optional} of the {@code T} value stored for the
-     * provided {@link UUID} and {@link Option} if it exists,
-     * otherwise returns {@link Optional#empty()}.
-     *
-     * @param playerUuid the player uuid
-     * @param option     the option
-     * @param <T>        the value type
-     * @param <C>        the option type
-     * @return the optional stored value
-     * @since 1.2.1
-     */
-    <T, C extends Option<T, ?, ?>> Optional<T> getDirect(UUID playerUuid, C option);
-
     /**
      * Sets the provided {@code T} value for the provided {@link Option}.
      *
@@ -216,4 +189,22 @@ static Options empty() {
      */
     <T> void replace(ApolloPlayer player, Option<?, ?, ?> option, BiFunction<Option<?, ?, ?>, T, T> remappingFunction);
 
+    /**
+     * Registers the provided {@code C} option for the {@link Options} implementation.
+     *
+     * @param option the option
+     * @param <T>    the value type
+     * @param <C>    the option type
+     * @since 1.2.1
+     */
+    <T, C extends Option<T, ?, ?>> void register(C option);
+
+    /**
+     * Returns the internal registry containing all registered {@link Option} instances, mapped by their keys.
+     *
+     * @return the map of option keys to their corresponding {@link Option} instances
+     * @since 1.2.1
+     */
+    Map<String, Option<?, ?, ?>> getRegistry();
+
 }