Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow changing AdvancementDisplay's shouldAnnounceToChat flag

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-26 22:24:37 -06:00
parent 3ba70d25fb
commit d65f96833c
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/api/0007-Advancement-API-Additions.patch
View File

@@ -1,18 +1,18 @@
From 2f34a563b865b3e42ba0050a783f727cab88bd06 Mon Sep 17 00:00:00 2001 From 75d012a30e129dfce7a9d17c99e2e69399f48e3f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:21 -0500 Date: Fri, 31 May 2019 21:24:21 -0500
Subject: [PATCH] Advancement API Additions Subject: [PATCH] Advancement API Additions
--- ---
.../org/bukkit/advancement/Advancement.java | 9 ++++ .../org/bukkit/advancement/Advancement.java | 9 ++++
.../advancement/AdvancementDisplay.java | 45 +++++++++++++++++++ .../advancement/AdvancementDisplay.java | 53 +++++++++++++++++++
.../org/bukkit/advancement/FrameType.java | 27 +++++++++++ .../org/bukkit/advancement/FrameType.java | 27 ++++++++++
3 files changed, 81 insertions(+) 3 files changed, 89 insertions(+)
create mode 100644 src/main/java/org/bukkit/advancement/AdvancementDisplay.java create mode 100644 src/main/java/org/bukkit/advancement/AdvancementDisplay.java
create mode 100644 src/main/java/org/bukkit/advancement/FrameType.java create mode 100644 src/main/java/org/bukkit/advancement/FrameType.java
diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java
index 7c5009974..432caadba 100644 index 7c500997..432caadb 100644
--- a/src/main/java/org/bukkit/advancement/Advancement.java --- a/src/main/java/org/bukkit/advancement/Advancement.java
+++ b/src/main/java/org/bukkit/advancement/Advancement.java +++ b/src/main/java/org/bukkit/advancement/Advancement.java
@@ -3,6 +3,7 @@ package org.bukkit.advancement; @@ -3,6 +3,7 @@ package org.bukkit.advancement;
@@ -38,10 +38,10 @@ index 7c5009974..432caadba 100644
} }
diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
new file mode 100644 new file mode 100644
index 000000000..09b9f77d6 index 00000000..bca3d112
--- /dev/null --- /dev/null
+++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java +++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
@@ -0,0 +1,45 @@ @@ -0,0 +1,53 @@
+package org.bukkit.advancement; +package org.bukkit.advancement;
+ +
+import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.NotNull;
@@ -79,6 +79,14 @@ index 000000000..09b9f77d6
+ boolean shouldAnnounceToChat(); + boolean shouldAnnounceToChat();
+ +
+ /** + /**
+ * Set if this advancement should be announced in chat when completed
+ *
+ * @param announce True or false
+ *
+ */
+ void setShouldAnnounceToChat(boolean announce);
+
+ /**
+ * Get if this advancement (and all it's children) is hidden from the advancement screen until it has been completed + * Get if this advancement (and all it's children) is hidden from the advancement screen until it has been completed
+ * <p> + * <p>
+ * This has no effect on root advancements themselves, but will alter their children + * This has no effect on root advancements themselves, but will alter their children
@@ -89,7 +97,7 @@ index 000000000..09b9f77d6
+} +}
diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java
new file mode 100644 new file mode 100644
index 000000000..d1757f3d4 index 00000000..d1757f3d
--- /dev/null --- /dev/null
+++ b/src/main/java/org/bukkit/advancement/FrameType.java +++ b/src/main/java/org/bukkit/advancement/FrameType.java
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@@ -121,5 +129,5 @@ index 000000000..d1757f3d4
+ } + }
+} +}
-- --
2.23.0.rc1 2.24.0

28
patches/server/0021-Advancement-API-Additions.patch
View File

@@ -1,15 +1,15 @@
From d48cc6502c97f0b5b9a003ab2da52b58e624c9a8 Mon Sep 17 00:00:00 2001 From 89db8d3ffb6701c7c4a9ff71cfe817cfc2c0285c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:33 -0500 Date: Fri, 31 May 2019 21:24:33 -0500
Subject: [PATCH] Advancement API Additions Subject: [PATCH] Advancement API Additions
--- ---
.../net/minecraft/server/Advancement.java | 2 +- .../net/minecraft/server/Advancement.java | 2 +-
.../minecraft/server/AdvancementDisplay.java | 6 +++ .../minecraft/server/AdvancementDisplay.java | 8 +++-
.../server/AdvancementFrameType.java | 14 ++++-- .../server/AdvancementFrameType.java | 14 ++++--
.../advancement/CraftAdvancement.java | 6 +++ .../advancement/CraftAdvancement.java | 6 +++
.../advancement/CraftAdvancementDisplay.java | 43 +++++++++++++++++++ .../advancement/CraftAdvancementDisplay.java | 48 +++++++++++++++++++
5 files changed, 67 insertions(+), 4 deletions(-) 5 files changed, 73 insertions(+), 5 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java 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 diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
@@ -26,10 +26,15 @@ index 3ef2f4d2a..ac4c29f2b 100644
private final MinecraftKey d; private final MinecraftKey d;
private final Map<String, Criterion> e; private final Map<String, Criterion> e;
diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
index e8172d56f..dc6a0448d 100644 index e8172d56f..edfd7f84a 100644
--- a/src/main/java/net/minecraft/server/AdvancementDisplay.java --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
+++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
@@ -20,6 +20,7 @@ public class AdvancementDisplay { @@ -16,10 +16,11 @@ public class AdvancementDisplay {
private final MinecraftKey d;
private final AdvancementFrameType e;
private final boolean f;
- private final boolean g;
+ private boolean g; public void setShouldAnnounceToChat(boolean announce) { this.g = announce; } // Purpur - OBFHELPER - un-finalize
private final boolean h; private final boolean h;
private float i; private float i;
private float j; private float j;
@@ -119,10 +124,10 @@ index a5aadf285..36da44414 100644
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java 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 new file mode 100644
index 000000000..aed74fb18 index 000000000..dae18cd80
--- /dev/null --- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
@@ -0,0 +1,43 @@ @@ -0,0 +1,48 @@
+package org.bukkit.craftbukkit.advancement; +package org.bukkit.craftbukkit.advancement;
+ +
+import net.minecraft.server.AdvancementDisplay; +import net.minecraft.server.AdvancementDisplay;
@@ -162,10 +167,15 @@ index 000000000..aed74fb18
+ } + }
+ +
+ @Override + @Override
+ public void setShouldAnnounceToChat(boolean announce) {
+ handle.setShouldAnnounceToChat(announce);
+ }
+
+ @Override
+ public boolean isHidden() { + public boolean isHidden() {
+ return handle.isHidden(); + return handle.isHidden();
+ } + }
+} +}
-- --
2.23.0.rc1 2.24.0