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
@@ -0,0 +1,73 @@
/*
* This file is part of Apollo, licensed under the MIT License.
*
* Copyright (c) 2023 Moonsworth
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.lunarclient.apollo.event.packetenrichment.world;

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

/**
* Represents an event that is fired when a player uses a bucket (1.7 and 1.8).
*
* @since 1.2.2
*/
@Value
public class ApolloPlayerUseItemBucketEvent implements Event {

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

/**
* The {@code long} representing the unix timestamp
* when the packet was created.
*
* @return the unix timestamp
* @since 1.2.2
*/
long instantiationTimeMs;

/**
* The player's {@link PlayerInfo} information.
*
* @return the player info
* @since 1.2.2
*/
PlayerInfo playerInfo;

/**
* The result of the client's {@link RayTraceResult} for this bucket interaction.
*
* @return the ray trace result
* @since 1.2.2
*/
RayTraceResult rayTraceResult;

}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import lombok.Value;

/**
* Represents an event that is when a player uses an item (1.16.1+).
* Represents an event that is fired when a player uses an item (1.16.1+).
*
* @since 1.0.7
*/
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 @@ -43,6 +43,7 @@
import com.lunarclient.apollo.mods.impl.ModDamageTint;
import com.lunarclient.apollo.mods.impl.ModDayCounter;
import com.lunarclient.apollo.mods.impl.ModDirectionHud;
import com.lunarclient.apollo.mods.impl.ModF3Display;
import com.lunarclient.apollo.mods.impl.ModFog;
import com.lunarclient.apollo.mods.impl.ModFov;
import com.lunarclient.apollo.mods.impl.ModFps;
Expand All @@ -61,6 +62,7 @@
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.ModMarkers;
import com.lunarclient.apollo.mods.impl.ModMemory;
import com.lunarclient.apollo.mods.impl.ModMenuBlur;
import com.lunarclient.apollo.mods.impl.ModMinimap;
Expand All @@ -72,6 +74,7 @@
import com.lunarclient.apollo.mods.impl.ModNeu;
import com.lunarclient.apollo.mods.impl.ModNickHider;
import com.lunarclient.apollo.mods.impl.ModOneSevenVisuals;
import com.lunarclient.apollo.mods.impl.ModOverlayMod;
import com.lunarclient.apollo.mods.impl.ModPackDisplay;
import com.lunarclient.apollo.mods.impl.ModPackOrganizer;
import com.lunarclient.apollo.mods.impl.ModParticleChanger;
Expand All @@ -90,6 +93,7 @@
import com.lunarclient.apollo.mods.impl.ModScreenshot;
import com.lunarclient.apollo.mods.impl.ModScrollableTooltips;
import com.lunarclient.apollo.mods.impl.ModServerAddress;
import com.lunarclient.apollo.mods.impl.ModShields;
import com.lunarclient.apollo.mods.impl.ModShinyPots;
import com.lunarclient.apollo.mods.impl.ModShulkerPreview;
import com.lunarclient.apollo.mods.impl.ModSkyblock;
Expand Down Expand Up @@ -190,6 +194,7 @@ public final class Mods {
ModBossbar.class,
ModFreelook.class,
ModPvpInfo.class,
ModMarkers.class,
ModSnaplook.class,
ModTeamView.class,
ModPackDisplay.class,
Expand All @@ -208,10 +213,13 @@ public final class Mods {
ModMobSize.class,
ModSkyblock.class,
ModHorseStats.class,
ModOverlayMod.class,
ModRewind.class,
ModAudioSubtitles.class,
ModShields.class,
ModKillSounds.class,
ModInventoryMod.class,
ModF3Display.class,
ModRadio.class
);

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

/**
* Allows you to simply right click a chat message to copy it, no keybind.
*
* @since 1.2.2
*/
public static final SimpleOption<Boolean> COPY_CHAT_RIGHT_CLICK = SimpleOption.<Boolean>builder()
.comment("Allows you to simply right click a chat message to copy it, no keybind")
.node("chat", "copy-chat-right-click").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* 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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
package com.lunarclient.apollo.mods.impl;

import com.lunarclient.apollo.option.NumberOption;
import com.lunarclient.apollo.option.SimpleOption;
import io.leangen.geantyref.TypeToken;
import java.awt.Color;
Expand All @@ -45,6 +46,41 @@ public final class ModChunkBorders {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final SimpleOption<Boolean> GRID = SimpleOption.<Boolean>builder()
.node("chunk-borders", "grid").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final NumberOption<Float> GRID_SIZE = NumberOption.<Float>number()
.node("chunk-borders", "grid-size").type(TypeToken.get(Float.class))
.min(1.0F).max(5.0F)
.defaultValue(1.0F)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final NumberOption<Float> GRID_LINE_THICKNESS = NumberOption.<Float>number()
.node("chunk-borders", "grid-line-thickness").type(TypeToken.get(Float.class))
.min(1.0F).max(5.0F)
.defaultValue(1.0F)
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -56,6 +92,29 @@ public final class ModChunkBorders {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final SimpleOption<Boolean> INNER_CORNERS = SimpleOption.<Boolean>builder()
.node("chunk-borders", "inner-corners").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final NumberOption<Float> INNER_CORNER_THICKNESS = NumberOption.<Float>number()
.node("chunk-borders", "inner-corner-thickness").type(TypeToken.get(Float.class))
.min(1.0F).max(5.0F)
.defaultValue(1.0F)
.notifyClient()
.build();

/**
* No documentation available.
*
Expand All @@ -67,6 +126,29 @@ public final class ModChunkBorders {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final SimpleOption<Boolean> OUTER_CORNERS = SimpleOption.<Boolean>builder()
.node("chunk-borders", "outer-corners").type(TypeToken.get(Boolean.class))
.defaultValue(true)
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final NumberOption<Float> OUTER_CORNER_THICKNESS = NumberOption.<Float>number()
.node("chunk-borders", "outer-corner-thickness").type(TypeToken.get(Float.class))
.min(1.0F).max(5.0F)
.defaultValue(1.0F)
.notifyClient()
.build();

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

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final SimpleOption<Boolean> GRAYSCALE = SimpleOption.<Boolean>builder()
.node("color-saturation", "grayscale").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

private ModColorSaturation() {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ public final class ModCoordinates {
.notifyClient()
.build();

/**
* No documentation available.
*
* @since 1.2.2
*/
public static final SimpleOption<Boolean> DECIMAL_COORDINATES = SimpleOption.<Boolean>builder()
.node("coordinates", "decimal-coordinates").type(TypeToken.get(Boolean.class))
.defaultValue(false)
.notifyClient()
.build();

/**
* No documentation available.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final NumberOption<Integer> CROSSHAIR_THICKNESS = NumberOption.<Integer>number()
.node("crosshair", "crosshair-thickness").type(TypeToken.get(Integer.class))
.min(1).max(5)
Expand All @@ -63,6 +64,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final NumberOption<Integer> CROSSHAIR_SIZE = NumberOption.<Integer>number()
.node("crosshair", "crosshair-size").type(TypeToken.get(Integer.class))
.min(0).max(8)
Expand All @@ -75,6 +77,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final NumberOption<Integer> CROSSHAIR_GAP = NumberOption.<Integer>number()
.node("crosshair", "crosshair-gap").type(TypeToken.get(Integer.class))
.min(0).max(8)
Expand All @@ -87,6 +90,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Boolean> CROSSHAIR_DOT = SimpleOption.<Boolean>builder()
.node("crosshair", "crosshair-dot").type(TypeToken.get(Boolean.class))
.defaultValue(true)
Expand All @@ -98,6 +102,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Boolean> CROSSHAIR_OUTLINE = SimpleOption.<Boolean>builder()
.node("crosshair", "crosshair-outline").type(TypeToken.get(Boolean.class))
.defaultValue(false)
Expand All @@ -109,6 +114,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final NumberOption<Float> OUTLINE_THICKNESS = NumberOption.<Float>number()
.node("crosshair", "outline-thickness").type(TypeToken.get(Float.class))
.min(0.0F).max(1.0F)
Expand All @@ -121,6 +127,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Color> OUTLINE_COLOR = SimpleOption.<Color>builder()
.node("crosshair", "outline-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(0, 0, 0, 136))
Expand All @@ -132,6 +139,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Boolean> CUSTOM_SCALE = SimpleOption.<Boolean>builder()
.node("crosshair", "custom-scale").type(TypeToken.get(Boolean.class))
.defaultValue(false)
Expand All @@ -143,6 +151,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Color> COLOR = SimpleOption.<Color>builder()
.node("crosshair", "color").type(TypeToken.get(Color.class))
.defaultValue(new Color(255, 255, 255))
Expand All @@ -154,6 +163,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Color> FRIENDLY_COLOR = SimpleOption.<Color>builder()
.node("crosshair", "friendly-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(51, 255, 51))
Expand All @@ -165,6 +175,7 @@ public final class ModCrosshair {
*
* @since 1.0.0
*/
@Deprecated
public static final SimpleOption<Color> ENEMY_COLOR = SimpleOption.<Color>builder()
.node("crosshair", "enemy-color").type(TypeToken.get(Color.class))
.defaultValue(new Color(255, 51, 51))
Expand Down
Loading