Fix conflicts

Author: ItsNature

.github/workflows/deploy.yml

@@ -41,7 +41,7 @@ jobs:
                 fi
 
         -   name: Gradle Publish
-            if: "${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/feature/server-links' || startsWith(github.ref, 'refs/heads/version/') }}"
+            if: "${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/version/') }}"
             run: ./gradlew publish
 
         -   name: Gradle Release

docs/developers/modules/cooldown.mdx

@@ -197,7 +197,9 @@ public void displayCooldownWithStyleExample(Player viewer) {
     DisplayCooldownMessage message = DisplayCooldownMessage.newBuilder()
         .setName("book-cooldown")
         .setDuration(ProtobufUtil.createDurationProto(Duration.ofSeconds(30)))
-        .setIcon(ProtobufUtil.createItemStackIconProto("BOOK", 0, 0))
+        .setIcon(Icon.newBuilder()
+            .setItemStack(ProtobufUtil.createItemStackIconProto("BOOK", 0, 0))
+            .build())
         .setStyle(CooldownStyle.newBuilder()
             .setCircleStartColor(ProtobufUtil.createColorProto(new Color(255, 85, 85))) // ApolloColors.RED
             .setCircleEndColor(ProtobufUtil.createColorProto(new Color(85, 255, 85))) // ApolloColors.GREEN

example/bukkit/proto/src/main/java/com/lunarclient/apollo/example/proto/module/CooldownProtoExample.java

@@ -55,7 +55,9 @@ public void displayCooldownWithStyleExample(Player viewer) {
         DisplayCooldownMessage message = DisplayCooldownMessage.newBuilder()
             .setName("book-cooldown")
             .setDuration(ProtobufUtil.createDurationProto(Duration.ofSeconds(30)))
-            .setIcon(ProtobufUtil.createItemStackIconProto("BOOK", 0, 0))
+            .setIcon(Icon.newBuilder()
+                .setItemStack(ProtobufUtil.createItemStackIconProto("BOOK", 0, 0))
+                .build())
             .setStyle(CooldownStyle.newBuilder()
                 .setCircleStartColor(ProtobufUtil.createColorProto(new Color(255, 85, 85))) // ApolloColors.RED
                 .setCircleEndColor(ProtobufUtil.createColorProto(new Color(85, 255, 85))) // ApolloColors.GREEN