Add ALLOW_DIG_AND_USE to Combat Module (#290)

* Add CombatModule#ALLOW_ATTACK_AND_USE

* Update supported versions docs for the ALLOW_ATTACK_AND_USE option

* Rename to `allow-dig-and-use` & add anticheat callout

* Update combat.mdx

---------

Co-authored-by: Trentin <25537885+TrentinTheKid@users.noreply.github.com>

Author: ItsNature

api/src/main/java/com/lunarclient/apollo/module/combat/CombatModule.java

@@ -40,16 +40,32 @@ public final class CombatModule extends ApolloModule {
     /**
      * Whether the player gets a hit delay for a missed hit.
      *
+     * <p>Enabling this option may cause compatibility issues with anti-cheats.</p>
+     *
      * @since 1.0.4
      */
     public static final SimpleOption<Boolean> DISABLE_MISS_PENALTY = Option.<Boolean>builder()
-        .comment("Set to 'true' to remove the miss penalty on all versions 1.8 and above, otherwise 'false'.")
+        .comment("Set to 'true' to remove the miss penalty on all versions 1.8 and above, otherwise 'false'. Enabling this option may cause compatibility issues with anti-cheats.")
         .node("disable-miss-penalty").type(TypeToken.get(Boolean.class))
         .defaultValue(false).notifyClient().build();
 
+    /**
+     * Whether the player can dig and use an item at the same time,
+     * like in 1.7. Applies to all versions 1.8 and above.
+     *
+     * <p>Enabling this option may cause compatibility issues with anti-cheats.</p>
+     *
+     * @since 1.2.8
+     */
+    public static final SimpleOption<Boolean> ALLOW_DIG_AND_USE = Option.<Boolean>builder()
+        .comment("Set to 'true' to allow digging and using an item at the same time on all versions 1.8 and above, otherwise 'false'. Enabling this option may cause compatibility issues with anti-cheats.")
+        .node("allow-dig-and-use").type(TypeToken.get(Boolean.class))
+        .defaultValue(false).notifyClient().build();
+
     CombatModule() {
         this.registerOptions(
-            CombatModule.DISABLE_MISS_PENALTY
+            CombatModule.DISABLE_MISS_PENALTY,
+            CombatModule.ALLOW_DIG_AND_USE
         );
     }
 

docs/developers/lightweight/json/packet-util.mdx

@@ -35,6 +35,7 @@ static {
     // While using the Apollo plugin this would be equivalent to modifying the config.yml
     CONFIG_MODULE_PROPERTIES.put("colored_fire", "persist-colors-on-unload", false);
     CONFIG_MODULE_PROPERTIES.put("combat", "disable-miss-penalty", false);
+    CONFIG_MODULE_PROPERTIES.put("combat", "allow-dig-and-use", false);
     CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-attack.send-packet", false);
     CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-open.send-packet", false);
     CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-close.send-packet", false);

docs/developers/lightweight/protobuf/packet-util.mdx

@@ -35,6 +35,7 @@ static {
     // While using the Apollo plugin this would be equivalent to modifying the config.yml
     CONFIG_MODULE_PROPERTIES.put("colored_fire", "persist-colors-on-unload", Value.newBuilder().setBoolValue(false).build());
     CONFIG_MODULE_PROPERTIES.put("combat", "disable-miss-penalty", Value.newBuilder().setBoolValue(false).build());
+    CONFIG_MODULE_PROPERTIES.put("combat", "allow-dig-and-use", Value.newBuilder().setBoolValue(false).build());
     CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-attack.send-packet", Value.newBuilder().setBoolValue(false).build());
     CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-open.send-packet", Value.newBuilder().setBoolValue(false).build());
     CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-close.send-packet", Value.newBuilder().setBoolValue(false).build());

docs/developers/modules/combat.mdx

@@ -7,6 +7,7 @@ import { Callout, Tab, Tabs } from 'nextra-theme-docs'
 The combat module allows you to modify certain aspects of combat that are usually handled client-sided.
 
 - Adds the ability to disable the miss penalty, on all versions 1.8 and above.
+- Adds the ability to dig and use an item at the same time, like in 1.7, on all versions 1.8 and above.
 
 ### Sample Code
 Explore each integration by cycling through each tab, to find the best fit for your requirements and needs.
@@ -27,6 +28,14 @@ public void setDisableMissPenalty(boolean value) {
 }
 ```
 
+### Toggle Dig and Use
+
+```java
+public void setAllowDigAndUse(boolean value) {
+    this.combatModule.getOptions().set(CombatModule.ALLOW_DIG_AND_USE, value);
+}
+```
+
 </Tab>
 
 <Tab>
@@ -35,7 +44,7 @@ public void setDisableMissPenalty(boolean value) {
 **Lightweight Protobuf examples.** See [Lightweight Protobuf](/apollo/developers/lightweight/protobuf) for setup.
 </Callout>
 
-### Toggle Miss Penalty
+**Toggle Miss Penalty**
 
 ```java
 public void setDisableMissPenalty(boolean value) {
@@ -47,6 +56,18 @@ public void setDisableMissPenalty(boolean value) {
 }
 ```
 
+**Toggle Dig and Use**
+
+```java
+public void setAllowDigAndUse(boolean value) {
+    Map<String, Value> properties = new HashMap<>();
+    properties.put("allow-dig-and-use", Value.newBuilder().setBoolValue(value).build());
+
+    ConfigurableSettings settings = ProtobufPacketUtil.createModuleMessage("combat", properties);
+    ProtobufPacketUtil.broadcastPacket(settings);
+}
+```
+
 </Tab>
 
 <Tab>
@@ -55,7 +76,7 @@ public void setDisableMissPenalty(boolean value) {
 **Lightweight JSON examples.** See [Lightweight JSON](/apollo/developers/lightweight/json) for setup.
 </Callout>
 
-### Toggle Miss Penalty
+**Toggle Miss Penalty**
 
 ```java
 public void setDisableMissPenalty(boolean value) {
@@ -67,14 +88,31 @@ public void setDisableMissPenalty(boolean value) {
 }
 ```
 
+**Toggle Dig and Use**
+
+```java
+public void setAllowDigAndUse(boolean value) {
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("allow-dig-and-use", value);
+
+    JsonObject message = JsonUtil.createEnableModuleObjectWithType("combat", properties);
+    JsonPacketUtil.broadcastPacket(message);
+}
+```
+
 </Tab>
 
 </Tabs>
 
 ## Available options
 
 - __`DISABLE_MISS_PENALTY`__
-    - Whether the player gets a hit delay for a missed hit.
+    - Whether the player gets a hit delay for a missed hit. Enabling this option may cause compatibility issues with anti-cheats.
+    - Values
+        - Type: `Boolean`
+        - Default: `false`
+- __`ALLOW_DIG_AND_USE`__
+    - Whether the player can dig and use an item at the same time, like in 1.7. Applies to all versions 1.8 and above. Enabling this option may cause compatibility issues with anti-cheats.
     - Values
         - Type: `Boolean`
         - Default: `false`

example/bukkit/json/src/main/java/com/lunarclient/apollo/example/json/util/JsonPacketUtil.java

@@ -53,6 +53,7 @@ public final class JsonPacketUtil {
         // While using the Apollo plugin this would be equivalent to modifying the config.yml
         CONFIG_MODULE_PROPERTIES.put("colored_fire", "persist-colors-on-unload", false);
         CONFIG_MODULE_PROPERTIES.put("combat", "disable-miss-penalty", false);
+        CONFIG_MODULE_PROPERTIES.put("combat", "allow-dig-and-use", false);
         CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-attack.send-packet", false);
         CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-open.send-packet", false);
         CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-close.send-packet", false);

example/bukkit/proto/src/main/java/com/lunarclient/apollo/example/proto/util/ProtobufPacketUtil.java

@@ -54,6 +54,7 @@ public final class ProtobufPacketUtil {
         // While using the Apollo plugin this would be equivalent to modifying the config.yml
         CONFIG_MODULE_PROPERTIES.put("colored_fire", "persist-colors-on-unload", Value.newBuilder().setBoolValue(false).build());
         CONFIG_MODULE_PROPERTIES.put("combat", "disable-miss-penalty", Value.newBuilder().setBoolValue(false).build());
+        CONFIG_MODULE_PROPERTIES.put("combat", "allow-dig-and-use", Value.newBuilder().setBoolValue(false).build());
         CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-attack.send-packet", Value.newBuilder().setBoolValue(false).build());
         CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-open.send-packet", Value.newBuilder().setBoolValue(false).build());
         CONFIG_MODULE_PROPERTIES.put("packet_enrichment", "player-chat-close.send-packet", Value.newBuilder().setBoolValue(false).build());