docs(api): add @throws MergeException to ResourceContainer#merge

unnamed · Nov 28, 2023 · 309240e · 309240e
1 parent df22246
commit 309240e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/api/src/main/java/team/unnamed/creative/overlay/ResourceContainer.java b/api/src/main/java/team/unnamed/creative/overlay/ResourceContainer.java
@@ -36,6 +36,7 @@
 import team.unnamed.creative.metadata.Metadata;
 import team.unnamed.creative.model.Model;
 import team.unnamed.creative.part.ResourcePackPart;
+import team.unnamed.creative.resources.MergeException;
 import team.unnamed.creative.resources.MergeStrategy;
 import team.unnamed.creative.sound.Sound;
 import team.unnamed.creative.sound.SoundEvent;
@@ -628,6 +629,7 @@ default void part(final @NotNull ResourcePackPart part) {
      *
      * @param other    The other resource container
      * @param strategy The merge strategy
+     * @throws MergeException If the merge fails
      * @since 1.4.0
      */
     void merge(final @NotNull ResourceContainer other, final @NotNull MergeStrategy strategy);