Skip to content

Prevent future ABI breakage with paper component flattener #4706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdcfe merged 2 commits into from
Dec 23, 2021
Merged

Prevent future ABI breakage with paper component flattener #4706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fec6883
Prevent future ABI breakage with paper component flattener
JRoy Dec 23, 2021
f2d3e6b
Merge branch '2.x' into fix/paper-abi-breakage
JRoy Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions providers/PaperProvider/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ java {

dependencies {
implementation project(':providers:BaseProviders')
compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
compileOnly 'io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT'
compileOnly 'io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT'
compileOnly 'io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT'
}

essentials {
Expand Down
21 changes: 19 additions & 2 deletions ...rProvider/src/main/java/net/ess3/provider/providers/PaperAdvancementListenerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,37 @@
package net.ess3.provider.providers;

import io.papermc.paper.advancement.AdvancementDisplay;
import io.papermc.paper.text.PaperComponents;
import net.ess3.provider.AbstractAchievementEvent;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.serializer.ComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerAdvancementDoneEvent;

public class PaperAdvancementListenerProvider implements Listener {
private final ComponentSerializer<Component, TextComponent, String> serializer;

public PaperAdvancementListenerProvider() {
ComponentSerializer<Component, TextComponent, String> yeOldSerializer;
try {
// This method is only available in Paper 1.18.1+ and replaces the old deprecated method below.
yeOldSerializer = PaperComponents.plainTextSerializer();
} catch (NoSuchMethodError e) {
//noinspection deprecation
yeOldSerializer = PaperComponents.plainSerializer();
}
this.serializer = yeOldSerializer;
}

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onAdvancement(final PlayerAdvancementDoneEvent event) {
final AdvancementDisplay display = event.getAdvancement().getDisplay();
if (display != null && display.doesAnnounceToChat()) {
//noinspection deprecation
Bukkit.getPluginManager().callEvent(new AbstractAchievementEvent(event.getPlayer(), Bukkit.getUnsafe().plainComponentSerializer().serialize(display.title())));
Bukkit.getPluginManager().callEvent(new AbstractAchievementEvent(event.getPlayer(), serializer.serialize(display.title())));
}
}
}