Add Addon Packets (#1)

* add AddonDisablePacket & InstalledAddon Packets

* register missing addon packets

* properly implement the addon packets

* improve usability of InstalledAddonsResponse, add LabyModInstalledAddonsUpdateEvent

* oops

* add installed addon model

Author: jumpingpxl

api/src/main/java/net/labymod/serverapi/api/Protocol.java

@@ -325,13 +325,19 @@ private void handlePacket(ProtocolPacket protocolPacket, UUID sender, Packet pac
             this.awaitingResponses.remove(responsePacket);
           }
         } catch (Exception e) {
-          e.printStackTrace();
+          this.protocolService.logger().warn(
+              "Failed to handle packet response " + packet.getClass().getSimpleName(), e);
         }
       }
     }
 
     for (PacketHandler handler : protocolPacket.handlers) {
-      handler.handle(sender, packet);
+      try {
+        handler.handle(sender, packet);
+      } catch (Exception e) {
+        this.protocolService.logger().warn(
+            "Failed to handle packet " + packet.getClass().getSimpleName(), e);
+      }
     }
 
     this.protocolService.afterPacketHandled(this, packet, sender);

core/src/main/java/net/labymod/serverapi/core/AbstractLabyModPlayer.java

@@ -48,6 +48,7 @@
 import net.labymod.serverapi.core.packet.clientbound.game.feature.PlayingGameModePacket;
 import net.labymod.serverapi.core.packet.clientbound.game.feature.marker.AddMarkerPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.feature.marker.MarkerPacket;
+import net.labymod.serverapi.core.packet.clientbound.game.moderation.AddonDisablePacket;
 import net.labymod.serverapi.core.packet.clientbound.game.moderation.AddonRecommendationPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.moderation.PermissionPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.supplement.InputPromptPacket;
@@ -74,6 +75,7 @@ public abstract class AbstractLabyModPlayer<P extends AbstractLabyModPlayer<?>>
   private final AbstractLabyModProtocolService protocolService;
   private final List<LabyModIntegrationPlayer> integrationPlayers = new ArrayList<>();
   private final Map<String, EconomyDisplay> economies = new HashMap<>(2);
+  private final List<String> disabledAddons = new ArrayList<>();
 
   private Subtitle subtitle;
   private TabListFlag flag;
@@ -204,6 +206,51 @@ public void updateSubtitle(Consumer<Subtitle> consumer) {
     }
   }
 
+  /**
+   * Forcefully disables the provided addons.
+   *
+   * @param addonsToDisable the addons to disable
+   */
+  public void disableAddons(List<String> addonsToDisable) {
+    for (String addon : addonsToDisable) {
+      if (!this.disabledAddons.contains(addon)) {
+        this.disabledAddons.add(addon);
+      }
+    }
+
+    this.sendPacket(AddonDisablePacket.disable(addonsToDisable));
+  }
+
+  /**
+   * Reverts the forced disable state for the provided addons
+   *
+   * @param addonsToRevert the addons to revert
+   */
+  public void revertDisabledAddons(List<String> addonsToRevert) {
+    for (String addon : addonsToRevert) {
+      this.disabledAddons.remove(addon);
+    }
+
+    this.sendPacket(AddonDisablePacket.revert(addonsToRevert));
+  }
+
+  /**
+   * Reverts the forced disable state for all addons disabled via {@link #disableAddons(List)}
+   */
+  public void revertDisabledAddons() {
+    this.sendPacket(AddonDisablePacket.revert(this.disabledAddons));
+    this.disabledAddons.clear();
+  }
+
+  /**
+   * Gets all forcefully disabled addons disabled via {@link #disableAddons(List)}
+   *
+   * @return the disabled addons
+   */
+  public List<String> getDisabledAddons() {
+    return this.disabledAddons;
+  }
+
   /**
    * Gives LabyMod the instruction to send placed markers by the player as
    * {@link net.labymod.serverapi.core.packet.serverbound.game.feature.marker.ClientAddMarkerPacket}

core/src/main/java/net/labymod/serverapi/core/LabyModProtocol.java

@@ -37,12 +37,16 @@
 import net.labymod.serverapi.core.packet.clientbound.game.feature.PlayingGameModePacket;
 import net.labymod.serverapi.core.packet.clientbound.game.feature.marker.AddMarkerPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.feature.marker.MarkerPacket;
+import net.labymod.serverapi.core.packet.clientbound.game.moderation.AddonDisablePacket;
 import net.labymod.serverapi.core.packet.clientbound.game.moderation.AddonRecommendationPacket;
+import net.labymod.serverapi.core.packet.clientbound.game.moderation.InstalledAddonsRequestPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.moderation.PermissionPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.supplement.InputPromptPacket;
 import net.labymod.serverapi.core.packet.clientbound.game.supplement.ServerSwitchPromptPacket;
 import net.labymod.serverapi.core.packet.serverbound.game.feature.marker.ClientAddMarkerPacket;
 import net.labymod.serverapi.core.packet.serverbound.game.moderation.AddonRecommendationResponsePacket;
+import net.labymod.serverapi.core.packet.serverbound.game.moderation.AddonStateChangedPacket;
+import net.labymod.serverapi.core.packet.serverbound.game.moderation.InstalledAddonsResponsePacket;
 import net.labymod.serverapi.core.packet.serverbound.game.supplement.InputPromptResponsePacket;
 import net.labymod.serverapi.core.packet.serverbound.game.supplement.ServerSwitchPromptResponsePacket;
 import net.labymod.serverapi.core.packet.serverbound.login.VersionLoginPacket;
@@ -75,7 +79,7 @@ private void registerPackets() {
     this.registerPacket(21, ServerSwitchPromptResponsePacket.class, Direction.SERVERBOUND);
     this.registerPacket(22, InputPromptPacket.class, Direction.CLIENTBOUND);
     this.registerPacket(23, InputPromptResponsePacket.class, Direction.SERVERBOUND);
-    //this.registerPacket(24, AddonDisablePacket.class, Direction.CLIENTBOUND);
+    this.registerPacket(24, AddonDisablePacket.class, Direction.CLIENTBOUND);
     this.registerPacket(25, AddonRecommendationPacket.class, Direction.CLIENTBOUND);
     this.registerPacket(26, AddonRecommendationResponsePacket.class, Direction.SERVERBOUND);
     this.registerPacket(27, MarkerPacket.class, Direction.CLIENTBOUND);
@@ -84,5 +88,8 @@ private void registerPackets() {
     //this.registerPacket(30, ChatFilterPacket.class, Direction.CLIENTBOUND);
     //this.registerPacket(31, ChatFilterRemovePacket.class, Direction.CLIENTBOUND);
     //this.registerPacket(32, ServerEventPacket.class, Direction.CLIENTBOUND);
+    this.registerPacket(33, InstalledAddonsRequestPacket.class, Direction.CLIENTBOUND);
+    this.registerPacket(34, InstalledAddonsResponsePacket.class, Direction.SERVERBOUND);
+    this.registerPacket(35, AddonStateChangedPacket.class, Direction.SERVERBOUND);
   }
 }

core/src/main/java/net/labymod/serverapi/core/model/moderation/InstalledAddon.java

@@ -0,0 +1,136 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2024 LabyMedia GmbH
+ *
+ * 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 net.labymod.serverapi.core.model.moderation;
+
+import java.util.Objects;
+
+public class InstalledAddon {
+
+  private final String namespace;
+  private final AddonVersion version;
+  private final boolean local;
+  private boolean enabled;
+
+  public InstalledAddon(String namespace, AddonVersion version, boolean enabled, boolean local) {
+    this.namespace = namespace;
+    this.version = version;
+    this.enabled = enabled;
+    this.local = local;
+  }
+
+  /**
+   * @return the namespace of the addon
+   */
+  public String getNamespace() {
+    return this.namespace;
+  }
+
+  /**
+   * @return the version of the addon
+   */
+  public AddonVersion getVersion() {
+    return this.version;
+  }
+
+  /**
+   * @return whether the addon was downloaded from the addon store or not
+   */
+  public boolean isLocal() {
+    return this.local;
+  }
+
+  /**
+   * @return whether the addon is enabled or not
+   */
+  public boolean isEnabled() {
+    return this.enabled;
+  }
+
+  /**
+   * Sets the enabled state of the addon
+   */
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  @Override
+  public String toString() {
+    return "Addon{" +
+        "namespace='" + this.namespace + '\'' +
+        ", version=" + this.version +
+        ", enabled=" + this.enabled +
+        ", local=" + this.local +
+        '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+
+    if (!(o instanceof InstalledAddon)) {
+      return false;
+    }
+
+    InstalledAddon that = (InstalledAddon) o;
+    return Objects.equals(this.namespace, that.namespace);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.namespace);
+  }
+
+  public static class AddonVersion {
+
+    private final int major;
+    private final int minor;
+    private final int patch;
+
+    public AddonVersion(int major, int minor, int patch) {
+      this.major = major;
+      this.minor = minor;
+      this.patch = patch;
+    }
+
+    public int getMajor() {
+      return this.major;
+    }
+
+    public int getMinor() {
+      return this.minor;
+    }
+
+    public int getPatch() {
+      return this.patch;
+    }
+
+    @Override
+    public String toString() {
+      return this.major + "." + this.minor + "." + this.patch;
+    }
+  }
+}

core/src/main/java/net/labymod/serverapi/core/packet/clientbound/game/moderation/AddonDisablePacket.java

@@ -0,0 +1,125 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2024 LabyMedia GmbH
+ *
+ * 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 net.labymod.serverapi.core.packet.clientbound.game.moderation;
+
+import net.labymod.serverapi.api.packet.Packet;
+import net.labymod.serverapi.api.payload.io.PayloadReader;
+import net.labymod.serverapi.api.payload.io.PayloadWriter;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class AddonDisablePacket implements Packet {
+
+  private List<String> addonsToDisable;
+  private Action action;
+
+  protected AddonDisablePacket(@NotNull Action action, @NotNull List<String> addonsToDisable) {
+    Objects.requireNonNull(addonsToDisable, "Addons to disable cannot be null");
+    Objects.requireNonNull(action, "Action cannot be null");
+    this.action = action;
+    this.addonsToDisable = addonsToDisable;
+  }
+
+  protected AddonDisablePacket(@NotNull Action action, @NotNull String... addonsToDisable) {
+    this(action, Collections.unmodifiableList(Arrays.asList(addonsToDisable)));
+  }
+
+  /**
+   * Creates a packet that force disables the provided addons
+   *
+   * @param addonsToDisable the addons to disable
+   * @return the created packet
+   */
+  public static AddonDisablePacket disable(@NotNull List<String> addonsToDisable) {
+    return new AddonDisablePacket(Action.DISABLE, addonsToDisable);
+  }
+
+  /**
+   * Creates a packet that reverts the forced disable state for the provided addons
+   *
+   * @param addonsToRevert the addons to revert
+   * @return the created packet
+   */
+  public static AddonDisablePacket revert(@NotNull List<String> addonsToRevert) {
+    return new AddonDisablePacket(Action.REVERT, addonsToRevert);
+  }
+
+  /**
+   * Creates a packet that force disables the provided addons
+   *
+   * @param addonsToDisable the addons to disable
+   * @return the created packet
+   */
+  public static AddonDisablePacket disable(@NotNull String... addonsToDisable) {
+    return new AddonDisablePacket(Action.DISABLE, addonsToDisable);
+  }
+
+  /**
+   * Creates a packet that reverts the forced disable state for the provided addons
+   *
+   * @param addonsToRevert the addons to revert
+   * @return the created packet
+   */
+  public static AddonDisablePacket revert(@NotNull String... addonsToRevert) {
+    return new AddonDisablePacket(Action.REVERT, addonsToRevert);
+  }
+
+  @Override
+  public void read(@NotNull PayloadReader reader) {
+    this.action = reader.readBoolean() ? Action.DISABLE : Action.REVERT;
+    this.addonsToDisable = reader.readList(reader::readString);
+  }
+
+  @Override
+  public void write(@NotNull PayloadWriter writer) {
+    writer.writeBoolean(this.action == Action.DISABLE);
+    writer.writeCollection(this.addonsToDisable, writer::writeString);
+  }
+
+  public @NotNull List<String> getAddonsToDisable() {
+    return this.addonsToDisable;
+  }
+
+  public @NotNull Action action() {
+    return this.action;
+  }
+
+  @Override
+  public String toString() {
+    return "AddonDisablePacket{" +
+        "addonsToDisable=" + this.addonsToDisable +
+        ", action=" + this.action +
+        '}';
+  }
+
+  public enum Action {
+    DISABLE,
+    REVERT
+  }
+}