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
2 changes: 1 addition & 1 deletion .checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "http://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<!-- don't require javadocs on platform modules -->
<suppress files="bukkit-example-(api|json|proto|common)[\\/]src[\\/]main[\\/]java[\\/].*" checks="(FilteringWriteTag|MissingJavadoc.*)"/>
<suppress files="example[\\/]bukkit[\\/](api|json|proto|common)[\\/]src[\\/]main[\\/]java[\\/].*" checks="(FilteringWriteTag|MissingJavadoc.*)"/>

<!-- ignore illegal import in loader -->
<suppress files="extra[\\/]loader[\\/]src[\\/]main[\\/]java[\\/].*" checks="(IllegalImport)"/>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Configure Google Cloud credentials
uses: google-github-actions/auth@v1
with:
workload_identity_provider: 'projects/271010089174/locations/global/workloadIdentityPools/github/providers/github-oidc'
service_account: 'github-actions@moonsworth-299m4oir.iam.gserviceaccount.com'
workload_identity_provider: 'projects/266324743316/locations/global/workloadIdentityPools/github/providers/github-oidc'
service_account: 'github-actions@mw-lunarclient-maven-repo.iam.gserviceaccount.com'

- name: Setup Java
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setupPlatforms()

setupPlatformDependency("bukkit", "bukkitJar")
setupPlatformDependency("bungee", "bungeeJar")
setupPlatformDependency("velocity", "velocityJar")
setupPlatformDependency("velocity", "velocityJar", 17)
setupPlatformDependency("folia", "foliaJar", 21)

val main by sourceSets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import com.lunarclient.apollo.event.Event;
import com.lunarclient.apollo.module.packetenrichment.PlayerInfo;
import com.lunarclient.apollo.player.ApolloPlayer;
import lombok.Value;

/**
Expand All @@ -35,6 +36,14 @@
@Value
public class ApolloPlayerChatCloseEvent implements Event {

/**
* The player that sent the packet.
*
* @return the player
* @since 1.1.9
*/
ApolloPlayer player;

/**
* The {@code long} representing the unix timestamp
* when the packet was created.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import com.lunarclient.apollo.event.Event;
import com.lunarclient.apollo.module.packetenrichment.PlayerInfo;
import com.lunarclient.apollo.player.ApolloPlayer;
import lombok.Value;

/**
Expand All @@ -35,6 +36,14 @@
@Value
public class ApolloPlayerChatOpenEvent implements Event {

/**
* The player that sent the packet.
*
* @return the player
* @since 1.1.9
*/
ApolloPlayer player;

/**
* The {@code long} representing the unix timestamp
* when the packet was created.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import com.lunarclient.apollo.event.Event;
import com.lunarclient.apollo.module.packetenrichment.PlayerInfo;
import com.lunarclient.apollo.player.ApolloPlayer;
import lombok.Value;

/**
Expand All @@ -35,6 +36,14 @@
@Value
public class ApolloPlayerAttackEvent implements Event {

/**
* The player that sent the packet.
*
* @return the player
* @since 1.1.9
*/
ApolloPlayer player;

/**
* The {@code long} representing the unix timestamp
* when the packet was created.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import com.lunarclient.apollo.event.Event;
import com.lunarclient.apollo.module.packetenrichment.PlayerInfo;
import com.lunarclient.apollo.player.ApolloPlayer;
import lombok.Value;

/**
Expand All @@ -35,6 +36,14 @@
@Value
public class ApolloPlayerUseItemEvent implements Event {

/**
* The player that sent the packet.
*
* @return the player
* @since 1.1.9
*/
ApolloPlayer player;

/**
* The {@code long} representing the unix timestamp
* when the packet was created.
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/com/lunarclient/apollo/mods/Mods.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@
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.ModInventoryMod;
import com.lunarclient.apollo.mods.impl.ModItemCounter;
import com.lunarclient.apollo.mods.impl.ModItemPhysics;
import com.lunarclient.apollo.mods.impl.ModItemTracker;
import com.lunarclient.apollo.mods.impl.ModKeystrokes;
import com.lunarclient.apollo.mods.impl.ModKillSounds;
import com.lunarclient.apollo.mods.impl.ModLighting;
import com.lunarclient.apollo.mods.impl.ModMemory;
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
Expand Down Expand Up @@ -93,10 +95,12 @@
import com.lunarclient.apollo.mods.impl.ModStopwatch;
import com.lunarclient.apollo.mods.impl.ModTab;
import com.lunarclient.apollo.mods.impl.ModTeamView;
import com.lunarclient.apollo.mods.impl.ModTierTagger;
import com.lunarclient.apollo.mods.impl.ModTimeChanger;
import com.lunarclient.apollo.mods.impl.ModTitles;
import com.lunarclient.apollo.mods.impl.ModTntCountdown;
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.ModWaila;
import com.lunarclient.apollo.mods.impl.ModWaypoints;
Expand Down Expand Up @@ -178,6 +182,7 @@ public final class Mods {
ModAutoTextHotkey.class,
ModAutoTextActions.class,
ModMumbleLink.class,
ModTotemCounter.class,
Mod2dItems.class,
ModBossbar.class,
ModFreelook.class,
Expand All @@ -195,9 +200,12 @@ public final class Mods {
ModWaila.class,
ModNeu.class,
ModHurtCam.class,
ModTierTagger.class,
ModDamageTint.class,
ModSkyblock.class,
ModHorseStats.class,
ModKillSounds.class,
ModInventoryMod.class,
ModRadio.class
);

Expand Down
21 changes: 21 additions & 0 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/Mod3dSkins.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ public final class Mod3dSkins {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> SHOW_OTHERS = SimpleOption.<Boolean>builder()
.node("3d-skins", "show-others").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

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

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final NumberOption<Float> FIRST_PERSON_VOXEL_SIZE = NumberOption.<Float>number()
.node("3d-skins", "first-person-voxel-size").type(TypeToken.get(Float.class))
.min(1.001F).max(1.3F)
.notifyClient()
.build();

/**
* No documentation available.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ public final class ModArmorstatus {
.notifyClient()
.build();

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

/**
* No documentation available.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ public final class ModAutoTextHotkey {
.notifyClient()
.build();

/**
* Displays a notification when an input is blocked by the server.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> NOTIFY_ON_BLOCKED_INPUT = SimpleOption.<Boolean>builder()
.comment("Displays a notification when an input is blocked by the server")
.node("auto-text-hotkey", "notify-on-blocked-input").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

private ModAutoTextHotkey() {
}

Expand Down
85 changes: 83 additions & 2 deletions api/src/main/java/com/lunarclient/apollo/mods/impl/ModChat.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,26 @@ public final class ModChat {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> MODERN_CHAT_LENGTH_HYPIXEL = SimpleOption.<Boolean>builder()
.node("chat", "modern-chat-length-hypixel").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> LONG_CHAT_SINGLEPLAYER = SimpleOption.<Boolean>builder()
.node("chat", "long-chat-singleplayer").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* Choose whether or not you want to stack multiple of the same messages in chat.
*
Expand Down Expand Up @@ -183,12 +203,12 @@ public final class ModChat {
.build();

/**
* Displays a preview of an image when hovering over it.
* Displays a preview of an image when hovering over it.If a single message has more than one image, press CTRL to cycle through them.
*
* @since 1.1.3
*/
public static final SimpleOption<Boolean> HOVER_IMAGE_PREVIEW = SimpleOption.<Boolean>builder()
.comment("Displays a preview of an image when hovering over it.")
.comment("Displays a preview of an image when hovering over it.If a single message has more than one image, press CTRL to cycle through them.")
.node("chat", "hover-image-preview").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();
Expand Down Expand Up @@ -217,6 +237,17 @@ public final class ModChat {
.notifyClient()
.build();

/**
* When your max image size is set to e.g. 50%, when you press shift, the image will expand to 100%.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> FULLSCREEN_IMAGE = SimpleOption.<Boolean>builder()
.comment("When your max image size is set to e.g. 50%, when you press shift, the image will expand to 100%")
.node("chat", "fullscreen-image").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -238,6 +269,56 @@ public final class ModChat {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> CHAT_NAME_BOLD = SimpleOption.<Boolean>builder()
.node("chat", "chat-name-bold").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> CHAT_NAME_ITALIC = SimpleOption.<Boolean>builder()
.node("chat", "chat-name-italic").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> CHAT_NAME_UNDERLINE = SimpleOption.<Boolean>builder()
.node("chat", "chat-name-underline").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> CHAT_NAME_STRIKETHROUGH = SimpleOption.<Boolean>builder()
.node("chat", "chat-name-strikethrough").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> CHAT_NAME_OBFUSCATED = SimpleOption.<Boolean>builder()
.node("chat", "chat-name-obfuscated").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* No documentation available.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ public final class ModDirectionHud {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
.node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> SHOW_MARKER = SimpleOption.<Boolean>builder()
.node("direction-hud", "show-marker").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand All @@ -134,8 +134,8 @@ public final class ModDirectionHud {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> SHOW_MARKER = SimpleOption.<Boolean>builder()
.node("direction-hud", "show-marker").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> SHOW_MARKER_VALUE = SimpleOption.<Boolean>builder()
.node("direction-hud", "show-marker-value").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand All @@ -144,8 +144,19 @@ public final class ModDirectionHud {
*
* @since 1.0.0
*/
public static final SimpleOption<Boolean> SHOW_MARKER_VALUE = SimpleOption.<Boolean>builder()
.node("direction-hud", "show-marker-value").type(TypeToken.get(Boolean.class))
public static final SimpleOption<Boolean> USE_LEGACY_STYLE = SimpleOption.<Boolean>builder()
.node("direction-hud", "use-legacy-style").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

/**
* Choose whether to show the Direction HUD when TAB is open.
*
* @since 1.1.9
*/
public static final SimpleOption<Boolean> SHOW_WITH_TAB = SimpleOption.<Boolean>builder()
.comment("Choose whether to show the Direction HUD when TAB is open.")
.node("direction-hud", "show-with-tab").type(TypeToken.get(Boolean.class))
.notifyClient()
.build();

Expand Down
Loading