Skip to content

Fixed MiniPlaceholders v3 compatibility #16

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

Closed
4drian3d wants to merge 1 commit into from
Closed

Fixed MiniPlaceholders v3 compatibility #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ allprojects {
}

dependencies {
compileOnly("org.spigotmc:spigot-api:1.21.8-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
compileOnly("net.kyori:adventure-text-serializer-legacy:4.24.0")
compileOnly("net.kyori:adventure-text-minimessage:4.24.0")
compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.0.1")
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/lushplugins/chatcolorhandler/ModernChatColorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import org.lushplugins.chatcolorhandler.messengers.MiniMessageMessenger;
import org.lushplugins.chatcolorhandler.parsers.Parser;
import org.lushplugins.chatcolorhandler.parsers.Resolver;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -62,12 +61,12 @@ public static Component translate(@Nullable String string, Player player, @NotNu

String legacyParsed = ChatColorHandler.parsers().parseString(string, Parser.OutputType.MINI_MESSAGE, player, parsers);

TagResolver tagResolver = Resolver.combineResolvers((Audience) player, parsers.stream()
TagResolver tagResolver = Resolver.combineResolvers(player, parsers.stream()
.map(parser -> parser instanceof Resolver resolver ? resolver : null)
.filter(Objects::nonNull)
.toList());

return MiniMessageMessenger.MINI_MESSAGE.deserialize(legacyParsed, tagResolver);
return MiniMessageMessenger.MINI_MESSAGE.deserialize(legacyParsed, player, tagResolver);
}

/**
Expand Down
17 changes: 6 additions & 11 deletions src/main/java/org/lushplugins/chatcolorhandler/messengers/MiniMessageMessenger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
Expand Down Expand Up @@ -33,9 +32,8 @@ public void sendMessage(@NotNull CommandSender recipient, @Nullable String messa
return;
}

Audience audience = Audience.audience((Audience) recipient);
Component parsed = ModernChatColorHandler.translate(message, (recipient instanceof Player player ? player : null));
audience.sendMessage(parsed);
recipient.sendMessage(parsed);
}

@Override
Expand All @@ -44,8 +42,7 @@ public void broadcastMessage(@Nullable String message) {
return;
}

Audience audience = Audience.audience((Audience) Bukkit.getServer());
audience.sendMessage(ModernChatColorHandler.translate(message));
Bukkit.getServer().sendMessage(ModernChatColorHandler.translate(message));
}

@Override
Expand All @@ -54,8 +51,7 @@ public void sendActionBarMessage(@NotNull Player player, @Nullable String messag
return;
}

Audience audience = Audience.audience((Audience) player);
audience.sendActionBar(ModernChatColorHandler.translate(message, player));
player.sendActionBar(ModernChatColorHandler.translate(message, player));
}

@Override
Expand All @@ -64,10 +60,9 @@ public void sendTitle(@NotNull Player player, @Nullable String title, @Nullable
return;
}

Audience audience = Audience.audience((Audience) player);
Title.Times times = Title.Times.times(Duration.ofMillis(fadeIn * 50L), Duration.ofMillis(stay * 50L), Duration.ofMillis(fadeOut * 50L));
audience.sendTitlePart(TitlePart.TIMES, times);
audience.sendTitlePart(TitlePart.SUBTITLE, ModernChatColorHandler.translate(subtitle, player));
audience.sendTitlePart(TitlePart.TITLE, ModernChatColorHandler.translate(title, player));
player.sendTitlePart(TitlePart.TIMES, times);
player.sendTitlePart(TitlePart.SUBTITLE, ModernChatColorHandler.translate(subtitle, player));
player.sendTitlePart(TitlePart.TITLE, ModernChatColorHandler.translate(title, player));
}
}
5 changes: 2 additions & 3 deletions src/main/java/org/lushplugins/chatcolorhandler/parsers/custom/MiniMessageResolverParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.lushplugins.chatcolorhandler.parsers.custom;

import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -33,8 +32,8 @@ public String parseString(@NotNull String string, @NotNull OutputType outputType
case SPIGOT -> {
string = string.replace('§', '&');

TagResolver resolver = Resolver.combineResolvers(player instanceof Audience audience ? audience : null, getPlaceholderResolvers());
yield MiniMessageMessenger.LEGACY_COMPONENT_SERIALIZER.serialize(MiniMessageMessenger.MINI_MESSAGE.deserialize(string, resolver));
TagResolver resolver = Resolver.combineResolvers(player, getPlaceholderResolvers());
yield MiniMessageMessenger.LEGACY_COMPONENT_SERIALIZER.serialize(MiniMessageMessenger.MINI_MESSAGE.deserialize(string, player, resolver));
}
case MINI_MESSAGE -> string;
};
Expand Down