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 @@ -24,17 +24,27 @@
package com.lunarclient.apollo.event.modsetting;

import com.lunarclient.apollo.event.Event;
import com.lunarclient.apollo.module.RestrictedAccess;
import com.lunarclient.apollo.module.modsetting.ModSettingModule;
import com.lunarclient.apollo.option.Option;
import com.lunarclient.apollo.player.ApolloPlayer;
import lombok.Value;
import org.jetbrains.annotations.Nullable;

/**
* Represents an event that is fired when an option is updated.
* Represents an event that is fired when a player's Lunar Client mod option is updated.
*
* <p>This event is fired for live updates only, not for the options listed in a
* {@link ModSettingModule#requestModStatus(ApolloPlayer)} response.</p>
*
* <p>This event is part of the private Mod Status API of {@link ModSettingModule}. Lunar Client
* only reports mod status to servers that have been granted access, so this event is never
* fired on other servers.</p>
*
* @since 1.2.1
*/
@Value
@RestrictedAccess
public class ApolloUpdateModOptionEvent implements Event {

/**
Expand Down
12 changes: 10 additions & 2 deletions api/src/main/java/com/lunarclient/apollo/mods/Mods.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@
import com.lunarclient.apollo.mods.impl.ModFreelook;
import com.lunarclient.apollo.mods.impl.ModGlintColorizer;
import com.lunarclient.apollo.mods.impl.ModGuiScale;
import com.lunarclient.apollo.mods.impl.ModHeightLimit;
import com.lunarclient.apollo.mods.impl.ModHitColor;
import com.lunarclient.apollo.mods.impl.ModHitbox;
import com.lunarclient.apollo.mods.impl.ModHorseStats;
import com.lunarclient.apollo.mods.impl.ModHurtCam;
import com.lunarclient.apollo.mods.impl.ModHypixelBedwars;
import com.lunarclient.apollo.mods.impl.ModHypixelMod;
import com.lunarclient.apollo.mods.impl.ModHypixelStats;
import com.lunarclient.apollo.mods.impl.ModInventoryMod;
import com.lunarclient.apollo.mods.impl.ModItemCounter;
import com.lunarclient.apollo.mods.impl.ModItemCustomizer;
Expand All @@ -68,6 +70,7 @@
import com.lunarclient.apollo.mods.impl.ModKnockbackTrainer;
import com.lunarclient.apollo.mods.impl.ModLightOverlay;
import com.lunarclient.apollo.mods.impl.ModLighting;
import com.lunarclient.apollo.mods.impl.ModLocatorBar;
import com.lunarclient.apollo.mods.impl.ModMarkers;
import com.lunarclient.apollo.mods.impl.ModMemory;
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
Expand Down Expand Up @@ -116,6 +119,7 @@
import com.lunarclient.apollo.mods.impl.ModToggleSneak;
import com.lunarclient.apollo.mods.impl.ModTotemCounter;
import com.lunarclient.apollo.mods.impl.ModUhcOverlay;
import com.lunarclient.apollo.mods.impl.ModViewAngles;
import com.lunarclient.apollo.mods.impl.ModWaila;
import com.lunarclient.apollo.mods.impl.ModWaypoints;
import com.lunarclient.apollo.mods.impl.ModWeatherChanger;
Expand All @@ -141,10 +145,12 @@ public final class Mods {
ModOneSevenVisuals.class,
ModFps.class,
ModCps.class,
ModViewAngles.class,
ModToggleSneak.class,
ModZoom.class,
ModHypixelMod.class,
ModHypixelBedwars.class,
ModHeightLimit.class,
ModQuickplay.class,
ModArmorstatus.class,
ModKeystrokes.class,
Expand Down Expand Up @@ -229,12 +235,14 @@ public final class Mods {
ModKillSounds.class,
ModInventoryMod.class,
ModF3Display.class,
ModLocatorBar.class,
ModGuiScale.class,
ModKnockbackTrainer.class,
ModHypixelStats.class,
ModRadio.class,
ModUhcOverlay.class,
ModNeu.class,
ModSba.class
ModSba.class,
ModNeu.class
);

private Mods() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@ public final class ModActionBar {
.notifyClient()
.build();

/**
* Keeps the mod at the vanilla position and scale. It can't be moved or scaled in the HUD editor while this is on.
*
* @since 1.3.0
*/
public static final SimpleOption<Boolean> LOCK_TO_VANILLA_POSITION = SimpleOption.<Boolean>builder()
.comment("Keeps the mod at the vanilla position and scale. It can't be moved or scaled in the HUD editor while this is on.")
.node("action-bar", "lock-to-vanilla-position").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

private ModActionBar() {
}

Expand Down
132 changes: 100 additions & 32 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModArmorstatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,56 @@ public final class ModArmorstatus {
*
* @since 1.0.0
*/
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
.node("armorstatus", "scale").type(TypeToken.get(Float.class))
.min(0.25F).max(5.0F)
.defaultValue(1.0F)
public static final SimpleOption<Boolean> MOVE_ARMOR_INDIVIDUALLY = SimpleOption.<Boolean>builder()
.node("armorstatus", "move-armor-individually").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
* @since 1.3.0
*/
public static final SimpleOption<Boolean> MOVE_ARMOR_INDIVIDUALLY = SimpleOption.<Boolean>builder()
.node("armorstatus", "move-armor-individually").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> VANILLA_MODE = SimpleOption.<Boolean>builder()
.node("armorstatus", "vanilla-mode").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
* @since 1.3.0
*/
public static final SimpleOption<Boolean> HIDE_UNBREAKABLE_DURABILITY = SimpleOption.<Boolean>builder()
.node("armorstatus", "hide-unbreakable-durability").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> HOTBAR_ANCHOR = SimpleOption.<Boolean>builder()
.node("armorstatus", "hotbar-anchor").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.3.0
*/
public static final SimpleOption<Boolean> ROUNDED_CORNERS = SimpleOption.<Boolean>builder()
.node("armorstatus", "rounded-corners").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.3.0
*/
public static final SimpleOption<Boolean> HIDE_EMPTY_SLOTS = SimpleOption.<Boolean>builder()
.node("armorstatus", "hide-empty-slots").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

/**
* No documentation available.
*
Expand Down Expand Up @@ -136,6 +157,17 @@ public final class ModArmorstatus {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.8
*/
public static final SimpleOption<Color> BACKGROUND_COLOR = SimpleOption.<Color>builder()
.node("armorstatus", "background-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(0, 0, 0, 111))
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -159,14 +191,26 @@ public final class ModArmorstatus {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.8
*/
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("armorstatus", "border-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(0, 0, 0, 159))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> DAMAGE_OVERLAY = SimpleOption.<Boolean>builder()
.node("armorstatus", "damage-overlay").type(TypeToken.get(Boolean.class))
.defaultValue(true)
public static final NumberOption<Float> SCALE = NumberOption.<Float>number()
.node("armorstatus", "scale").type(TypeToken.get(Float.class))
.min(0.25F).max(5.0F)
.defaultValue(1.0F)
.notifyClient()
.build();

Expand All @@ -175,53 +219,54 @@ public final class ModArmorstatus {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> ITEM_DAMAGE = SimpleOption.<Boolean>builder()
.node("armorstatus", "item-damage").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> DAMAGE_OVERLAY = SimpleOption.<Boolean>builder()
.node("armorstatus", "damage-overlay").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
* @since 1.3.0
*/
public static final SimpleOption<Boolean> ARMOR_DAMAGE = SimpleOption.<Boolean>builder()
.node("armorstatus", "armor-damage").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> LOW_DURABILITY_INDICATOR = SimpleOption.<Boolean>builder()
.node("armorstatus", "low-durability-indicator").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
* @since 1.3.0
*/
public static final SimpleOption<Boolean> MAX_DAMAGE = SimpleOption.<Boolean>builder()
.node("armorstatus", "max-damage").type(TypeToken.get(Boolean.class))
.defaultValue(false)
public static final NumberOption<Integer> LOW_DURABILITY_THRESHOLD = NumberOption.<Integer>number()
.node("armorstatus", "low-durability-threshold").type(TypeToken.get(Integer.class))
.min(1).max(100)
.defaultValue(10)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.8
* @since 1.0.0
*/
public static final SimpleOption<Color> BACKGROUND_COLOR = SimpleOption.<Color>builder()
.node("armorstatus", "background-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(0, 0, 0, 111))
public static final SimpleOption<Boolean> ITEM_DAMAGE = SimpleOption.<Boolean>builder()
.node("armorstatus", "item-damage").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.8
* @since 1.0.0
*/
public static final SimpleOption<Color> BORDER_COLOR = SimpleOption.<Color>builder()
.node("armorstatus", "border-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(0, 0, 0, 159))
public static final SimpleOption<Boolean> ARMOR_DAMAGE = SimpleOption.<Boolean>builder()
.node("armorstatus", "armor-damage").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

Expand All @@ -230,12 +275,24 @@ public final class ModArmorstatus {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> STATIC_DAMAGE_COLORS = SimpleOption.<Boolean>builder()
.node("armorstatus", "static-damage-colors").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> MAX_DAMAGE = SimpleOption.<Boolean>builder()
.node("armorstatus", "max-damage").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

/**
* Don't show damage value on items that are unbreakable.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> HIDE_UNBREAKABLE_DURABILITY = SimpleOption.<Boolean>builder()
.comment("Don't show damage value on items that are unbreakable")
.node("armorstatus", "hide-unbreakable-durability").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
Expand Down Expand Up @@ -313,6 +370,17 @@ public final class ModArmorstatus {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> STATIC_DAMAGE_COLORS = SimpleOption.<Boolean>builder()
.node("armorstatus", "static-damage-colors").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

private ModArmorstatus() {
}

Expand Down
Loading
Loading