NotAlexNoyle/legacy-plugin-base
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Jason Penilla committed 2022-03-01 10:22:49 -07:00
1 parent 869010e428
commit dd652b93c1
4 files changed
+49 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle.kts
+9 -9
View File
@@ -33,26 +33,26 @@ repositories {
}
dependencies {
val adventureVersion = "4.9.3"
api("net.kyori", "adventure-api", adventureVersion)
api("net.kyori", "adventure-text-serializer-gson", adventureVersion) {
api(platform("net.kyori:adventure-bom:4.10.0"))
api("net.kyori", "adventure-api")
api("net.kyori", "adventure-text-serializer-gson") {
exclude("com.google.code.gson", "gson")
}
api("net.kyori", "adventure-text-serializer-legacy", adventureVersion) {
api("net.kyori", "adventure-text-serializer-legacy") {
exclude("com.google.code.gson", "gson")
}
api("net.kyori", "adventure-text-minimessage", "4.2.0-SNAPSHOT")
api("net.kyori", "adventure-text-minimessage")
api("net.kyori", "adventure-text-feature-pagination", "4.0.0-SNAPSHOT")
api("net.kyori", "adventure-platform-bukkit", "4.0.1") {
api("net.kyori", "adventure-platform-bukkit", "4.1.0") {
exclude("com.google.code.gson", "gson")
}
api("net.kyori", "adventure-text-serializer-bungeecord", "4.0.1") {
api("net.kyori", "adventure-text-serializer-bungeecord", "4.1.0") {
exclude("com.google.code.gson", "gson")
}
compileOnly("org.checkerframework", "checker-qual", "3.19.0")
compileOnly("io.papermc.paper", "paper-api", "1.18-R0.1-SNAPSHOT")
compileOnly("org.checkerframework", "checker-qual", "3.21.2")
compileOnly("io.papermc.paper", "paper-api", "1.18.1-R0.1-SNAPSHOT")
compileOnly("me.clip", "placeholderapi", "2.10.9")
}
src/main/java/xyz/jpenilla/jmplib/Chat.java
+13 -14
View File
@@ -1,5 +1,11 @@
package xyz.jpenilla.jmplib;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.sound.Sound;
@@ -14,13 +20,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import xyz.jpenilla.jmplib.compatability.JMPLibPAPIHook;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
/**
* Chat message sending utilities
*
@@ -98,7 +97,7 @@ public class Chat {
}
public void broadcast(@NonNull String message) {
basePlugin.audiences().players().sendMessage(Identity.nil(), basePlugin.miniMessage().parse(message));
basePlugin.audiences().players().sendMessage(Identity.nil(), basePlugin.miniMessage().deserialize(message));
}
public void broadcast(@NonNull List<String> messages) {
@@ -144,13 +143,13 @@ public class Chat {
}
public void send(@NonNull CommandSender sender, @NonNull String message) {
send(sender, basePlugin.miniMessage().parse(message));
send(sender, basePlugin.miniMessage().deserialize(message));
}
public Title getTitle(@NonNull String title, @NonNull String subTitle, @NonNull ChronoUnit fadeInTimeUnit, int fadeInTime, @NonNull ChronoUnit stayTimeUnit, int stayTime, @NonNull ChronoUnit fadeOutTimeUnit, int fadeOutTime) {
final Component titleComponent = basePlugin.miniMessage().parse(title);
final Component subTitleComponent = basePlugin.miniMessage().parse(subTitle);
return Title.title(titleComponent, subTitleComponent, Title.Times.of(Duration.of(fadeInTime, fadeInTimeUnit), Duration.of(stayTime, stayTimeUnit), Duration.of(fadeOutTime, fadeOutTimeUnit)));
final Component titleComponent = basePlugin.miniMessage().deserialize(title);
final Component subTitleComponent = basePlugin.miniMessage().deserialize(subTitle);
return Title.title(titleComponent, subTitleComponent, Title.Times.times(Duration.of(fadeInTime, fadeInTimeUnit), Duration.of(stayTime, stayTimeUnit), Duration.of(fadeOutTime, fadeOutTimeUnit)));
}
public Title getTitleSeconds(@NonNull String title, @NonNull String subTitle, int fadeInTime, int stayTime, int fadeOutTime) {
@@ -166,7 +165,7 @@ public class Chat {
}
public void sendActionBar(@NonNull Player player, @NonNull String text) {
basePlugin.audiences().player(player).sendActionBar(basePlugin.miniMessage().parse(text));
basePlugin.audiences().player(player).sendActionBar(basePlugin.miniMessage().deserialize(text));
}
public BukkitTask sendActionBar(@NonNull Player player, int durationSeconds, @NonNull String text) {
@@ -182,7 +181,7 @@ public class Chat {
* @return String of spaces
*/
public static String getCenteredSpacePrefix(@NonNull String message) {
return ChatCentering.spacePrefix(MiniMessage.miniMessage().parse(message));
return ChatCentering.spacePrefix(MiniMessage.miniMessage().deserialize(message));
}
/**
src/main/java/xyz/jpenilla/jmplib/ItemBuilder.java
+13 -5
View File
@@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
@@ -57,6 +58,13 @@ public class ItemBuilder {
return this;
}
static Component removeItalics(final Component component) {
if (component.decoration(TextDecoration.ITALIC) == TextDecoration.State.NOT_SET) {
return component.decoration(TextDecoration.ITALIC, false);
}
return component;
}
/**
* Set the Display Name of the ItemStack using a MiniMessage string
*
@@ -65,7 +73,7 @@ public class ItemBuilder {
*/
public @NonNull ItemBuilder setName(String displayName) {
if (hasComponentApi) {
meta.setDisplayNameComponent(serializer.serialize(miniMessage.parse(displayName).decoration(TextDecoration.ITALIC, false)));
meta.setDisplayNameComponent(serializer.serialize(removeItalics(miniMessage.deserialize(displayName))));
} else {
meta.setDisplayName(MiniMessageUtil.miniMessageToLegacy(displayName));
}
@@ -82,11 +90,11 @@ public class ItemBuilder {
if (hasComponentApi) {
final List<BaseComponent[]> newLore = new ArrayList<>();
for (String line : lore) {
newLore.add(serializer.serialize(miniMessage.parse(line).decoration(TextDecoration.ITALIC, false)));
newLore.add(serializer.serialize(removeItalics(miniMessage.deserialize(line))));
}
meta.setLoreComponents(newLore);
} else {
meta.setLore(MiniMessageUtil.miniMessageToLegacy(Arrays.asList(lore)));
meta.setLore(MiniMessageUtil.miniMessageToLegacy(Arrays.asList(lore), true));
}
return this;
}
@@ -102,7 +110,7 @@ public class ItemBuilder {
final List<BaseComponent[]> newLore = meta.getLoreComponents();
final List<BaseComponent[]> newLines = new ArrayList<>();
for (String line : lore) {
newLines.add(serializer.serialize(miniMessage.parse(line).decoration(TextDecoration.ITALIC, false)));
newLines.add(serializer.serialize(removeItalics(miniMessage.deserialize(line))));
}
if (newLore != null) {
newLore.addAll(newLines);
@@ -113,7 +121,7 @@ public class ItemBuilder {
return this;
} else {
final List<String> newLore = meta.getLore();
final List<String> newLines = MiniMessageUtil.miniMessageToLegacy(Arrays.asList(lore));
final List<String> newLines = MiniMessageUtil.miniMessageToLegacy(Arrays.asList(lore), true);
if (newLore != null) {
newLore.addAll(newLines);
return setLore(newLore);
src/main/java/xyz/jpenilla/jmplib/MiniMessageUtil.java
+14 -5
View File
@@ -1,11 +1,11 @@
package xyz.jpenilla.jmplib;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.ArrayList;
import java.util.List;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.checkerframework.checker.nullness.qual.NonNull;
public class MiniMessageUtil {
private static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
@@ -13,11 +13,20 @@ public class MiniMessageUtil {
private static final MiniMessage miniMessage = MiniMessage.miniMessage();
public static String miniMessageToLegacy(final @NonNull String message) {
return miniMessageToLegacy(message, false);
}
public static String miniMessageToLegacy(final @NonNull String message, final boolean disableItalics) {
final LegacyComponentSerializer serializer = Environment.majorMinecraftVersion() >= 16 ? SERIALIZER : DOWNSAMPLING_SERIALIZER;
return serializer.serialize(miniMessage.parse(BasePlugin.getBasePlugin().chat().parse(null, message, null)));
final Component comp = miniMessage.deserialize(BasePlugin.getBasePlugin().chat().parse(null, message, null));
return serializer.serialize(disableItalics ? ItemBuilder.removeItalics(comp) : comp);
}
public static List<String> miniMessageToLegacy(final @NonNull List<String> messages) {
return miniMessageToLegacy(messages, false);
}
public static List<String> miniMessageToLegacy(final @NonNull List<String> messages, final boolean disableItalics) {
final List<String> result = new ArrayList<>();
for (final String message : messages) {
result.add(miniMessageToLegacy(message));