From f38bc41c719f4ec2f111350a6fb57cdf1cb1444a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 31 May 2019 21:24:33 -0500 Subject: [PATCH] Advancement API --- .../net/minecraft/server/Advancement.java | 2 +- .../minecraft/server/AdvancementDisplay.java | 12 ++++- .../server/AdvancementFrameType.java | 15 +++++- .../minecraft/server/CriterionTrigger.java | 1 + .../advancement/CraftAdvancement.java | 7 +++ .../advancement/CraftAdvancementDisplay.java | 47 +++++++++++++++++++ 6 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java index 315a03cf5..07d4c4cfd 100644 --- a/src/main/java/net/minecraft/server/Advancement.java +++ b/src/main/java/net/minecraft/server/Advancement.java @@ -64,7 +64,7 @@ public class Advancement { } @Nullable - public AdvancementDisplay c() { + public AdvancementDisplay c() { return getDisplay(); } public AdvancementDisplay getDisplay() { // Purpur return this.display; } diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java index 12c63a53b..0d3900456 100644 --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java @@ -15,10 +15,11 @@ public class AdvancementDisplay { private final MinecraftKey d; private final AdvancementFrameType e; private final boolean f; - private final boolean g; - private final boolean h; + private boolean g; // Purpur - un-finalize + private boolean h; // Purpur - un-finalize private float i; private float j; + public final org.bukkit.advancement.AdvancementDisplay bukkit = new org.bukkit.craftbukkit.advancement.CraftAdvancementDisplay(this); // Purpur public AdvancementDisplay(ItemStack itemstack, IChatBaseComponent ichatbasecomponent, IChatBaseComponent ichatbasecomponent1, @Nullable MinecraftKey minecraftkey, AdvancementFrameType advancementframetype, boolean flag, boolean flag1, boolean flag2) { this.a = ichatbasecomponent; @@ -36,22 +37,29 @@ public class AdvancementDisplay { this.j = f1; } + public IChatBaseComponent getTitle() { return a(); } // Purpur - OBFHELPER public IChatBaseComponent a() { return this.a; } + public IChatBaseComponent getDescription() { return b(); } // Purpur - OBFHELPER public IChatBaseComponent b() { return this.b; } + public AdvancementFrameType getFrameType() { return e(); } // Purpur - OBFHELPER public AdvancementFrameType e() { return this.e; } + public void setShouldAnnounceToChat(boolean announce) { this.g = announce; } // Purpur - OBFHELPER + public boolean shouldAnnounceToChat() { return i(); } // Purpur - OBFHELPER public boolean i() { return this.g; } + public void setHidden(boolean hidden) { this.h = hidden; } // Purpur - OBFHELPER + public boolean isHidden() { return j(); } // Purpur - OBFHELPER public boolean j() { return this.h; } diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java index a9c49a434..551a84547 100644 --- a/src/main/java/net/minecraft/server/AdvancementFrameType.java +++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java @@ -1,14 +1,25 @@ package net.minecraft.server; +import org.bukkit.advancement.FrameType; // Purpur + public enum AdvancementFrameType { - TASK("task", 0, EnumChatFormat.GREEN), CHALLENGE("challenge", 26, EnumChatFormat.DARK_PURPLE), GOAL("goal", 52, EnumChatFormat.GREEN); + // Purpur start + TASK("task", 0, EnumChatFormat.GREEN, FrameType.TASK), + CHALLENGE("challenge", 26, EnumChatFormat.DARK_PURPLE, FrameType.CHALLENGE), + GOAL("goal", 52, EnumChatFormat.GREEN, FrameType.GOAL); + // Purpur end private final String d; private final int e; private final EnumChatFormat f; - private AdvancementFrameType(String s, int i, EnumChatFormat enumchatformat) { + // Purpur start + public final FrameType bukkit; + + AdvancementFrameType(String s, int i, EnumChatFormat enumchatformat, FrameType bukkit) { + this.bukkit = bukkit; + // Purpur end this.d = s; this.e = i; this.f = enumchatformat; diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java index cfb420a9c..6fd3671c3 100644 --- a/src/main/java/net/minecraft/server/CriterionTrigger.java +++ b/src/main/java/net/minecraft/server/CriterionTrigger.java @@ -26,6 +26,7 @@ public interface CriterionTrigger { this.c = s; } + public T getInstance() { return a(); } // Purpur - OBFHELPER public T a() { return this.a; } diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java index a5aadf285..b0a7092d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java @@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement { public Collection getCriteria() { return Collections.unmodifiableCollection(handle.getCriteria().keySet()); } + + // Purpur start + @Override + public org.bukkit.advancement.AdvancementDisplay getDisplay() { + return getHandle().getDisplay() == null ? null : getHandle().getDisplay().bukkit; + } + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java new file mode 100644 index 000000000..1cbb1e67b --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java @@ -0,0 +1,47 @@ +package org.bukkit.craftbukkit.advancement; + +import net.minecraft.server.AdvancementDisplay; +import org.bukkit.advancement.FrameType; +import org.bukkit.craftbukkit.util.CraftChatMessage; + +public class CraftAdvancementDisplay implements org.bukkit.advancement.AdvancementDisplay { + private final AdvancementDisplay handle; + + public CraftAdvancementDisplay(AdvancementDisplay handle) { + this.handle = handle; + } + + public AdvancementDisplay getHandle() { + return handle; + } + + @Override + public String getTitle() { + return CraftChatMessage.fromComponent(handle.getTitle()); + } + + @Override + public String getDescription() { + return CraftChatMessage.fromComponent(handle.getDescription()); + } + + @Override + public FrameType getFrameType() { + return handle.getFrameType().bukkit; + } + + @Override + public boolean shouldAnnounceToChat() { + return handle.shouldAnnounceToChat(); + } + + @Override + public void setShouldAnnounceToChat(boolean announce) { + handle.setShouldAnnounceToChat(announce); + } + + @Override + public boolean isHidden() { + return handle.isHidden(); + } +} -- 2.26.2