diff options
| author | Boy0000 <[email protected]> | 2024-06-21 19:01:10 +0200 |
|---|---|---|
| committer | Owen1212055 <[email protected]> | 2024-11-18 14:50:38 -0500 |
| commit | c92fa203dc2a438a028ea423598b0a338f4626d3 (patch) | |
| tree | 3fa01b9a06b993223fa773321498500193d51e02 /patches/api | |
| parent | 501b7408780d5bb01100224d31427e9215d79d36 (diff) | |
| download | Paper-c92fa203dc2a438a028ea423598b0a338f4626d3.tar.gz Paper-c92fa203dc2a438a028ea423598b0a338f4626d3.zip | |
Various minor fixes for DataComponent-API (#10938)
* fix RECIPES not using kyori key
* add missing MapDecorations getter
* fix ComponentAdapter for MAP_POST_PROCESSING
Diffstat (limited to 'patches/api')
| -rw-r--r-- | patches/api/0480-WIP-DataComponent-API.patch | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/patches/api/0480-WIP-DataComponent-API.patch b/patches/api/0480-WIP-DataComponent-API.patch index 3501e19350..b651650697 100644 --- a/patches/api/0480-WIP-DataComponent-API.patch +++ b/patches/api/0480-WIP-DataComponent-API.patch @@ -138,7 +138,7 @@ index 0000000000000000000000000000000000000000..50d15b4e0ed5cd17fdc95476ee4650ef +} diff --git a/src/main/java/io/papermc/paper/component/DataComponentTypes.java b/src/main/java/io/papermc/paper/component/DataComponentTypes.java new file mode 100644 -index 0000000000000000000000000000000000000000..fad96b6f92afc963eea51b49d3663349c867687d +index 0000000000000000000000000000000000000000..0d64edd242cd4a77cc1b6b8989544aad6641b5f5 --- /dev/null +++ b/src/main/java/io/papermc/paper/component/DataComponentTypes.java @@ -0,0 +1,313 @@ @@ -175,6 +175,7 @@ index 0000000000000000000000000000000000000000..fad96b6f92afc963eea51b49d3663349 +import io.papermc.paper.component.item.Unbreakable; +import io.papermc.paper.component.item.WritableBookContent; +import io.papermc.paper.component.item.WrittenBookContent; ++import net.kyori.adventure.key.Key; +import net.kyori.adventure.text.Component; +import org.bukkit.DyeColor; +import org.bukkit.FireworkEffect; @@ -185,7 +186,6 @@ index 0000000000000000000000000000000000000000..fad96b6f92afc963eea51b49d3663349 +import org.checkerframework.checker.index.qual.NonNegative; +import org.checkerframework.checker.index.qual.Positive; +import org.checkerframework.common.value.qual.IntRange; -+import java.security.Key; +import java.util.List; + +import static java.util.Objects.requireNonNull; @@ -1509,10 +1509,10 @@ index 0000000000000000000000000000000000000000..316e3e0894c0d5cc0a7b304a815803f9 +} diff --git a/src/main/java/io/papermc/paper/component/item/MapDecorations.java b/src/main/java/io/papermc/paper/component/item/MapDecorations.java new file mode 100644 -index 0000000000000000000000000000000000000000..723f65d502a94617174203da02fda55f78621e2a +index 0000000000000000000000000000000000000000..589be7348bfef06fe628696d56748a9d44fca177 --- /dev/null +++ b/src/main/java/io/papermc/paper/component/item/MapDecorations.java -@@ -0,0 +1,95 @@ +@@ -0,0 +1,98 @@ +package io.papermc.paper.component.item; + +import io.papermc.paper.component.ComponentBuilder; @@ -1547,6 +1547,9 @@ index 0000000000000000000000000000000000000000..723f65d502a94617174203da02fda55f + @Contract(pure = true) + @Nullable DecorationEntry getDecoration(@NonNull String id); + ++ @Contract(pure = true) ++ Map<String, DecorationEntry> getDecorations(); ++ + /** + * Decoration present on the map. + */ |