2021-10-20 21:59:13 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: syldium <syldium@mailo.com>
|
|
|
|
Date: Fri, 9 Jul 2021 18:50:40 +0200
|
2022-11-04 23:59:15 +01:00
|
|
|
Subject: [PATCH] Add more advancement API
|
2021-10-20 21:59:13 +02:00
|
|
|
|
2023-09-22 15:15:57 +02:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.advancements.Advancement decorateName(Lnet/minecraft/advancements/DisplayInfo;)Lnet/minecraft/network/chat/Component;
|
|
|
|
|
2022-11-25 08:05:48 +01:00
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
2021-10-20 21:59:13 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java b/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java
|
|
|
|
new file mode 100644
|
2023-09-22 15:19:33 +02:00
|
|
|
index 0000000000000000000000000000000000000000..1705f65d897114dd0813f6d366124cefafcb450e
|
2021-10-20 21:59:13 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java
|
2022-11-25 08:05:48 +01:00
|
|
|
@@ -0,0 +1,69 @@
|
2021-10-20 21:59:13 +02:00
|
|
|
+package io.papermc.paper.advancement;
|
|
|
|
+
|
|
|
|
+import io.papermc.paper.adventure.PaperAdventure;
|
|
|
|
+import net.kyori.adventure.text.Component;
|
2022-11-25 08:05:48 +01:00
|
|
|
+import net.minecraft.advancements.Advancement;
|
2021-10-20 21:59:13 +02:00
|
|
|
+import net.minecraft.advancements.DisplayInfo;
|
|
|
|
+import net.minecraft.advancements.FrameType;
|
|
|
|
+import org.bukkit.NamespacedKey;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
|
|
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
|
|
|
|
+import org.bukkit.inventory.ItemStack;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
|
|
|
+
|
|
|
|
+public record PaperAdvancementDisplay(DisplayInfo handle) implements AdvancementDisplay {
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @NotNull Frame frame() {
|
|
|
|
+ return asPaperFrame(this.handle.getFrame());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @NotNull Component title() {
|
|
|
|
+ return PaperAdventure.asAdventure(this.handle.getTitle());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @NotNull Component description() {
|
|
|
|
+ return PaperAdventure.asAdventure(this.handle.getDescription());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @NotNull ItemStack icon() {
|
|
|
|
+ return CraftItemStack.asBukkitCopy(this.handle.getIcon());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean doesShowToast() {
|
|
|
|
+ return this.handle.shouldShowToast();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean doesAnnounceToChat() {
|
|
|
|
+ return this.handle.shouldAnnounceChat();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isHidden() {
|
|
|
|
+ return this.handle.isHidden();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @Nullable NamespacedKey backgroundPath() {
|
|
|
|
+ return this.handle.getBackground() == null ? null : CraftNamespacedKey.fromMinecraft(this.handle.getBackground());
|
|
|
|
+ }
|
|
|
|
+
|
2022-11-25 08:05:48 +01:00
|
|
|
+ @Override
|
|
|
|
+ public @NotNull Component displayName() {
|
2023-09-22 15:19:33 +02:00
|
|
|
+ return PaperAdventure.asAdventure(Advancement.decorateName(java.util.Objects.requireNonNull(this.handle, "cannot build display name for null handle, invalid state")));
|
2022-11-25 08:05:48 +01:00
|
|
|
+ }
|
|
|
|
+
|
2021-10-20 21:59:13 +02:00
|
|
|
+ public static @NotNull Frame asPaperFrame(@NotNull FrameType frameType) {
|
|
|
|
+ return switch (frameType) {
|
|
|
|
+ case TASK -> Frame.TASK;
|
|
|
|
+ case CHALLENGE -> Frame.CHALLENGE;
|
|
|
|
+ case GOAL -> Frame.GOAL;
|
|
|
|
+ };
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/net/minecraft/advancements/DisplayInfo.java b/src/main/java/net/minecraft/advancements/DisplayInfo.java
|
2023-09-22 19:59:56 +02:00
|
|
|
index a6ea13198a2de14d57472681b5a2b30baf3c4280..11b26d14b863075d776884544629cdd23f219298 100644
|
2021-10-20 21:59:13 +02:00
|
|
|
--- a/src/main/java/net/minecraft/advancements/DisplayInfo.java
|
|
|
|
+++ b/src/main/java/net/minecraft/advancements/DisplayInfo.java
|
2023-09-22 15:15:57 +02:00
|
|
|
@@ -29,6 +29,7 @@ public class DisplayInfo {
|
2021-10-20 21:59:13 +02:00
|
|
|
private final boolean hidden;
|
|
|
|
private float x;
|
|
|
|
private float y;
|
|
|
|
+ public final io.papermc.paper.advancement.AdvancementDisplay paper = new io.papermc.paper.advancement.PaperAdvancementDisplay(this); // Paper
|
|
|
|
|
|
|
|
public DisplayInfo(ItemStack icon, Component title, Component description, @Nullable ResourceLocation background, FrameType frame, boolean showToast, boolean announceToChat, boolean hidden) {
|
|
|
|
this.title = title;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
|
2023-09-22 15:15:57 +02:00
|
|
|
index 52baf818579a6841b77ff80e42f4f1b9f635ea08..3321445645514769ff494f90090f22241fffbc44 100644
|
2021-10-20 21:59:13 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
|
2023-09-22 15:15:57 +02:00
|
|
|
@@ -29,12 +29,49 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
|
|
|
|
return Collections.unmodifiableCollection(this.handle.value().criteria().keySet());
|
2021-10-20 21:59:13 +02:00
|
|
|
}
|
2022-06-05 10:43:06 +02:00
|
|
|
|
2021-10-20 21:59:13 +02:00
|
|
|
+ // Paper start
|
2022-06-05 10:43:06 +02:00
|
|
|
@Override
|
|
|
|
- public AdvancementDisplay getDisplay() {
|
2023-09-22 15:15:57 +02:00
|
|
|
- if (this.handle.value().display().isEmpty()) {
|
2022-06-05 10:43:06 +02:00
|
|
|
- return null;
|
2021-10-20 21:59:13 +02:00
|
|
|
+ public io.papermc.paper.advancement.AdvancementDisplay getDisplay() {
|
2023-09-22 15:15:57 +02:00
|
|
|
+ return this.handle.value().display().map(d -> d.paper).orElse(null);
|
2023-03-23 22:57:03 +01:00
|
|
|
+ }
|
2021-10-20 21:59:13 +02:00
|
|
|
+
|
2023-09-22 15:15:57 +02:00
|
|
|
+ @Deprecated
|
|
|
|
+ @io.papermc.paper.annotation.DoNotUse
|
2022-11-04 23:59:15 +01:00
|
|
|
+ public AdvancementDisplay getDisplay0() { // May be called by plugins via Commodore
|
2023-09-22 15:15:57 +02:00
|
|
|
+ return this.handle.value().display().map(CraftAdvancementDisplay::new).orElse(null);
|
2022-11-04 23:59:15 +01:00
|
|
|
+ }
|
|
|
|
+
|
2021-10-20 21:59:13 +02:00
|
|
|
+ @Override
|
2022-11-25 08:05:48 +01:00
|
|
|
+ public net.kyori.adventure.text.Component displayName() {
|
2023-09-22 15:15:57 +02:00
|
|
|
+ return this.handle.value().display()
|
|
|
|
+ .map(d -> io.papermc.paper.adventure.PaperAdventure.asAdventure(net.minecraft.advancements.Advancement.decorateName(d)))
|
|
|
|
+ .orElseGet(() -> net.kyori.adventure.text.Component.text(this.handle.id().toString()));
|
2022-11-25 08:05:48 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-10-20 21:59:13 +02:00
|
|
|
+ public org.bukkit.advancement.Advancement getParent() {
|
2023-09-22 15:15:57 +02:00
|
|
|
+ return this.handle.value().parent()
|
|
|
|
+ .map(net.minecraft.server.MinecraftServer.getServer().getAdvancements()::get)
|
|
|
|
+ .map(AdvancementHolder::toBukkit)
|
|
|
|
+ .orElse(null);
|
2021-10-20 21:59:13 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Collection<org.bukkit.advancement.Advancement> getChildren() {
|
|
|
|
+ final var children = com.google.common.collect.ImmutableList.<org.bukkit.advancement.Advancement>builder();
|
2023-09-22 15:15:57 +02:00
|
|
|
+ final var advancementNode = net.minecraft.server.MinecraftServer.getServer().getAdvancements().tree().get(this.handle);
|
|
|
|
+ if (advancementNode != null) {
|
|
|
|
+ for (final var child : advancementNode.children()) {
|
|
|
|
+ children.add(child.holder().toBukkit());
|
|
|
|
+ }
|
2023-03-23 22:57:03 +01:00
|
|
|
}
|
2021-10-20 21:59:13 +02:00
|
|
|
+ return children.build();
|
|
|
|
+ }
|
2023-03-23 22:57:03 +01:00
|
|
|
|
2023-09-22 15:15:57 +02:00
|
|
|
- return new CraftAdvancementDisplay(this.handle.value().display().get());
|
2021-10-20 21:59:13 +02:00
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.advancement.Advancement getRoot() {
|
2023-09-22 15:15:57 +02:00
|
|
|
+ final var advancementNode = net.minecraft.server.MinecraftServer.getServer().getAdvancements().tree().get(this.handle);
|
|
|
|
+ return java.util.Objects.requireNonNull(advancementNode, "could not find internal advancement node for advancement " + this.handle.id()).root().holder().toBukkit();
|
2023-03-23 22:57:03 +01:00
|
|
|
}
|
2021-10-20 21:59:13 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
2022-11-04 23:59:15 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
|
|
|
|
index 4aa8cda2bf72627b153e636a408fb3971caf2309..e29d7c6e1cef10a76c8630855fada11cee583d30 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
|
|
|
|
@@ -6,6 +6,7 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
|
|
import org.bukkit.craftbukkit.util.CraftChatMessage;
|
|
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
|
|
|
|
+@Deprecated // Paper
|
|
|
|
public class CraftAdvancementDisplay implements org.bukkit.advancement.AdvancementDisplay {
|
|
|
|
|
|
|
|
private final DisplayInfo handle;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
2023-04-14 01:52:42 +02:00
|
|
|
index 43ffc4180b1ef2d2000991ad58b0706141470d08..cacd9b59741c31e70e898e7af91a1a6ed3f87f07 100644
|
2022-11-04 23:59:15 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
|
|
|
@@ -54,6 +54,7 @@ public class Commodore
|
|
|
|
) );
|
|
|
|
|
|
|
|
// Paper start - Plugin rewrites
|
|
|
|
+ private static final String CB_PACKAGE = org.bukkit.Bukkit.getServer().getClass().getPackageName().replace('.', '/');
|
|
|
|
private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();
|
|
|
|
private static Map<String, String> initReplacementsMap()
|
2022-11-05 06:16:57 +01:00
|
|
|
{
|
2023-04-14 01:52:42 +02:00
|
|
|
@@ -460,6 +461,11 @@ public class Commodore
|
2022-12-20 19:56:33 +01:00
|
|
|
super.visitMethodInsn(opcode, owner, name, "()Lcom/destroystokyo/paper/profile/PlayerProfile;", itf);
|
|
|
|
return;
|
2022-11-04 23:59:15 +01:00
|
|
|
}
|
|
|
|
+ if (owner.equals("org/bukkit/advancement/Advancement") && name.equals("getDisplay") && desc.endsWith(")Lorg/bukkit/advancement/AdvancementDisplay;")) {
|
|
|
|
+ super.visitTypeInsn(Opcodes.CHECKCAST, CB_PACKAGE + "/advancement/CraftAdvancement");
|
|
|
|
+ super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, CB_PACKAGE + "/advancement/CraftAdvancement", "getDisplay0", desc, false);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
if ( modern )
|
2022-12-20 19:56:33 +01:00
|
|
|
{
|
2021-10-20 21:59:13 +02:00
|
|
|
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
|
2022-10-12 05:05:28 +02:00
|
|
|
index 0000000000000000000000000000000000000000..4d043e0e43ef8bb75788e195f95b5a50a51a2a48
|
2021-10-20 21:59:13 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java
|
2022-10-12 05:05:28 +02:00
|
|
|
@@ -0,0 +1,24 @@
|
2021-10-20 21:59:13 +02:00
|
|
|
+package io.papermc.paper.advancement;
|
|
|
|
+
|
|
|
|
+import io.papermc.paper.adventure.PaperAdventure;
|
|
|
|
+import net.kyori.adventure.text.format.TextColor;
|
|
|
|
+import net.minecraft.advancements.FrameType;
|
2022-06-08 17:31:27 +02:00
|
|
|
+import net.minecraft.network.chat.contents.TranslatableContents;
|
2021-10-20 21:59:13 +02:00
|
|
|
+import org.junit.Test;
|
|
|
|
+
|
|
|
|
+import static org.junit.Assert.assertEquals;
|
|
|
|
+
|
|
|
|
+public class AdvancementFrameTest {
|
|
|
|
+
|
|
|
|
+ @Test
|
|
|
|
+ public void test() {
|
|
|
|
+ for (FrameType nmsFrameType : FrameType.values()) {
|
|
|
|
+ final TextColor expectedColor = PaperAdventure.asAdventure(nmsFrameType.getChatColor());
|
2022-06-08 17:31:27 +02:00
|
|
|
+ final String expectedTranslationKey = ((TranslatableContents) nmsFrameType.getDisplayName().getContents()).getKey();
|
2021-10-20 21:59:13 +02:00
|
|
|
+ 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(nmsFrameType.getName(), AdvancementDisplay.Frame.NAMES.key(frame));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|