From 8fa4402eb53e65fa59913e9e3ab2ff9ee1220f4a Mon Sep 17 00:00:00 2001
From: ImMorpheus <ImMorpheus@users.noreply.github.com>
Date: Thu, 11 Mar 2021 01:12:07 +0100
Subject: [PATCH] Support ResourceKey in advancement background

---
 .../org/spongepowered/api/advancement/Advancement.java    | 4 ++--
 .../spongepowered/api/advancement/AdvancementTree.java    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/spongepowered/api/advancement/Advancement.java b/src/main/java/org/spongepowered/api/advancement/Advancement.java
index 7d357b2f248..39d7df99f65 100644
--- a/src/main/java/org/spongepowered/api/advancement/Advancement.java
+++ b/src/main/java/org/spongepowered/api/advancement/Advancement.java
@@ -27,6 +27,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
@@ -133,8 +134,7 @@ interface RootStep extends Builder {
              *
              * @return This builder, for chaining
              */
-            // TODO: Deprecate when ResourcePath is available
-            Builder background(String backgroundPath);
+            Builder background(ResourceKey backgroundPath);
         }
 
         /**
diff --git a/src/main/java/org/spongepowered/api/advancement/AdvancementTree.java b/src/main/java/org/spongepowered/api/advancement/AdvancementTree.java
index 1c3bc36d06c..e09b20eb7e3 100644
--- a/src/main/java/org/spongepowered/api/advancement/AdvancementTree.java
+++ b/src/main/java/org/spongepowered/api/advancement/AdvancementTree.java
@@ -24,8 +24,11 @@
  */
 package org.spongepowered.api.advancement;
 
+import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.entity.living.player.Player;
 
+import java.util.Optional;
+
 /**
  * Represents a {@link Advancement} tree or tab menu. The tree will become
  * visible to a {@link Player} once the root {@link Advancement} gets achieved.
@@ -44,9 +47,6 @@ public interface AdvancementTree  {
      *
      * @return The background texture
      */
-    // TODO: Deprecate when ResourcePath is available
-    String getBackgroundPath();
-
-    // ResourcePath getBackground();
+    Optional<ResourceKey> getBackgroundPath();
 
 }