diff options
author | Nassim Jahnke <[email protected]> | 2023-09-24 17:16:58 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-24 18:25:25 +1000 |
commit | e284bb12156fad92767ceadf3d5e57cbc71e5b21 (patch) | |
tree | 8729234f3b355b10c44a7f6b87cbb85f435bd611 /patches/server/0664-Add-more-advancement-API.patch | |
parent | 7a00758b1b952c308041d87632b84a48dc18535f (diff) | |
download | Paper-e284bb12156fad92767ceadf3d5e57cbc71e5b21.tar.gz Paper-e284bb12156fad92767ceadf3d5e57cbc71e5b21.zip |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
fb23cbb3 Define surefire plugin version
d022084a Define ordering for MetadataStoreTest
99a7f6f0 PR-910: Match generic max absorption attribute name style with the rest
c7390d71 PR-909: Update tests to JUnit 5
CraftBukkit Changes:
f0661c351 PR-1230: Move unstructured PDC NBT serialisation to SNBT
452fcb599 PR-1256: Update tests to JUnit 5
Diffstat (limited to 'patches/server/0664-Add-more-advancement-API.patch')
-rw-r--r-- | patches/server/0664-Add-more-advancement-API.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0664-Add-more-advancement-API.patch b/patches/server/0664-Add-more-advancement-API.patch index 1d9f8d9a4a..ba79527126 100644 --- a/patches/server/0664-Add-more-advancement-API.patch +++ b/patches/server/0664-Add-more-advancement-API.patch @@ -189,7 +189,7 @@ index 313cd180cbad5727433daae4c15ffa4e1e948eaa..8f8b14cb845bf1ba28276b3e3c0d8f8c { diff --git a/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java new file mode 100644 -index 0000000000000000000000000000000000000000..4d043e0e43ef8bb75788e195f95b5a50a51a2a48 +index 0000000000000000000000000000000000000000..1a4b930ecf10dac8336dd2eceb4ee2bf9ec780d5 --- /dev/null +++ b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java @@ -0,0 +1,24 @@ @@ -199,9 +199,9 @@ index 0000000000000000000000000000000000000000..4d043e0e43ef8bb75788e195f95b5a50 +import net.kyori.adventure.text.format.TextColor; +import net.minecraft.advancements.FrameType; +import net.minecraft.network.chat.contents.TranslatableContents; -+import org.junit.Test; ++import org.junit.jupiter.api.Test; + -+import static org.junit.Assert.assertEquals; ++import static org.junit.jupiter.api.Assertions.assertEquals; + +public class AdvancementFrameTest { + @@ -211,8 +211,8 @@ index 0000000000000000000000000000000000000000..4d043e0e43ef8bb75788e195f95b5a50 + final TextColor expectedColor = PaperAdventure.asAdventure(nmsFrameType.getChatColor()); + final String expectedTranslationKey = ((TranslatableContents) nmsFrameType.getDisplayName().getContents()).getKey(); + final var frame = PaperAdvancementDisplay.asPaperFrame(nmsFrameType); -+ assertEquals("The translation keys should be the same", expectedTranslationKey, frame.translationKey()); -+ assertEquals("The frame colors should be the same", expectedColor, frame.color()); ++ assertEquals(expectedTranslationKey, frame.translationKey(), "The translation keys should be the same"); ++ assertEquals(expectedColor, frame.color(), "The frame colors should be the same"); + assertEquals(nmsFrameType.getName(), AdvancementDisplay.Frame.NAMES.key(frame)); + } + } |