Fix MiniMessage
This commit is contained in:
1 parent
a9b7fcdf77
commit
1e740e6be1
4 files changed
+41
-34
No files matched your search
+6
-3
@@ -31,6 +31,8 @@ version = "1.0" // Declare plugin version (will be in .jar).
|
||||
|
||||
val apiVersion = "1.19" // Declare minecraft server target version.
|
||||
|
||||
val shadowPrefix = "${project.group}".replace("-", "") + ".shadow" // Dashless shadow project name.
|
||||
|
||||
/* ----------------------------- Resources ----------------------------- */
|
||||
tasks.named<ProcessResources>("processResources") {
|
||||
val props = mapOf("version" to version, "apiVersion" to apiVersion)
|
||||
@@ -52,6 +54,8 @@ dependencies {
|
||||
compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT") // Declare Purpur API version to be packaged.
|
||||
compileOnly("com.github.decentsoftware-eu:decentholograms:2.8.9") // Import DecentHolograms API.
|
||||
compileOnly("com.github.MilkBowl:VaultAPI:1.7") // Import Vault API.
|
||||
implementation("net.kyori:adventure-platform-bukkit:4.3.2") // Import Adventure Platform API.
|
||||
implementation("net.kyori:adventure-text-minimessage:4.13.1") // Import MiniMessage API.
|
||||
implementation("net.kyori:adventure-platform-bukkit:4.3.2") // Import verbose Minimessage API.
|
||||
implementation(project(":libs:MCShared-OG")) // Import TrueOG Network MCShared-OG API (from source).
|
||||
compileOnlyApi(project(":libs:Utilities-OG")) // Import TrueOG Network Utilities-OG Java API (from source).
|
||||
@@ -67,10 +71,9 @@ tasks.withType<AbstractArchiveTask>().configureEach { // Ensure reproducible .ja
|
||||
|
||||
/* ----------------------------- Shadow -------------------------------- */
|
||||
tasks.shadowJar {
|
||||
exclude("io.github.miniplaceholders.*") // Exclude the MiniPlaceholders package from being shadowed.
|
||||
isEnableRelocation = true
|
||||
relocationPrefix = "${project.group}.shadow"
|
||||
archiveClassifier.set("") // Use empty string instead of null.
|
||||
relocationPrefix = shadowPrefix
|
||||
archiveClassifier.set("") // Use empty String instead of null.
|
||||
minimize()
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ configurations.creating {
|
||||
|
||||
configure<EclipseModel> {
|
||||
project {
|
||||
name = "PetMaster-OG-Plugin"
|
||||
name = "PetMaster-OG"
|
||||
}
|
||||
classpath {
|
||||
plusConfigurations.add(ideLibs)
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -108,7 +109,7 @@ public class PetMaster extends JavaPlugin {
|
||||
public void onEnable() {
|
||||
|
||||
// Start enabling plugin.
|
||||
long startTime = System.currentTimeMillis();
|
||||
final long startTime = System.currentTimeMillis();
|
||||
|
||||
// Initializing the Messaging System
|
||||
this.adventure = BukkitAudiences.create(this);
|
||||
@@ -128,7 +129,7 @@ public class PetMaster extends JavaPlugin {
|
||||
playerTameListener = new PlayerTameListener(this);
|
||||
playerBreedListener = new PlayerBreedListener(this);
|
||||
|
||||
PluginManager pm = getServer().getPluginManager();
|
||||
final PluginManager pm = getServer().getPluginManager();
|
||||
// Register listeners.
|
||||
pm.registerEvents(playerInteractListener, this);
|
||||
pm.registerEvents(playerLeashListener, this);
|
||||
@@ -148,7 +149,7 @@ public class PetMaster extends JavaPlugin {
|
||||
|
||||
chatHeader = Component.text("<gray>[<gold>\u25b2<gray>]");
|
||||
|
||||
File playerColorConfig = new File(getDataFolder() + File.separator + "playersettings.yml");
|
||||
final File playerColorConfig = new File(getDataFolder() + File.separator + "playersettings.yml");
|
||||
|
||||
helpCommand = new HelpCommand(this);
|
||||
infoCommand = new InfoCommand(this);
|
||||
@@ -230,7 +231,7 @@ public class PetMaster extends JavaPlugin {
|
||||
*/
|
||||
private CommentedYamlConfiguration loadAndBackupYamlConfiguration(String fileName) {
|
||||
|
||||
CommentedYamlConfiguration yamlConfiguration = new CommentedYamlConfiguration(fileName, this);
|
||||
final CommentedYamlConfiguration yamlConfiguration = new CommentedYamlConfiguration(fileName, this);
|
||||
try {
|
||||
|
||||
yamlConfiguration.loadConfiguration();
|
||||
@@ -248,9 +249,9 @@ public class PetMaster extends JavaPlugin {
|
||||
|
||||
yamlConfiguration.backupConfiguration();
|
||||
|
||||
} catch (IOException e) {
|
||||
} catch (IOException error) {
|
||||
|
||||
getLogger().log(Level.SEVERE, "Error while backing up configuration file: ", e);
|
||||
getLogger().log(Level.SEVERE, "Error while backing up configuration file: ", error);
|
||||
|
||||
}
|
||||
|
||||
@@ -282,53 +283,53 @@ public class PetMaster extends JavaPlugin {
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
|
||||
|
||||
if (!"petm".equalsIgnoreCase(cmd.getName())) {
|
||||
if (!StringUtils.equalsIgnoreCase("petm", cmd.getName())) {
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
if (args.length == 0 || args.length == 1 && "help".equalsIgnoreCase(args[0])) {
|
||||
if (args.length == 0 || args.length == 1 && StringUtils.equalsIgnoreCase("help", args[0])) {
|
||||
|
||||
helpCommand.getHelp(sender);
|
||||
|
||||
} else if ("info".equalsIgnoreCase(args[0])) {
|
||||
} else if (StringUtils.equalsIgnoreCase("info", args[0])) {
|
||||
|
||||
infoCommand.getInfo(sender);
|
||||
|
||||
} else if ("reload".equalsIgnoreCase(args[0])) {
|
||||
} else if (StringUtils.equalsIgnoreCase("reload", args[0])) {
|
||||
|
||||
reloadCommand.reload(sender);
|
||||
|
||||
} else if ("disable".equalsIgnoreCase(args[0])) {
|
||||
} else if (StringUtils.equalsIgnoreCase("disable", args[0])) {
|
||||
|
||||
enableDisableCommand.setState(sender, true);
|
||||
|
||||
} else if ("enable".equalsIgnoreCase(args[0])) {
|
||||
} else if (StringUtils.equalsIgnoreCase("enable", args[0])) {
|
||||
|
||||
enableDisableCommand.setState(sender, false);
|
||||
|
||||
} else if ("setowner".equalsIgnoreCase(args[0]) && sender instanceof Player) {
|
||||
} else if (StringUtils.equalsIgnoreCase("setowner", args[0]) && sender instanceof Player) {
|
||||
|
||||
setOwnerCommand.setOwner(((Player) sender), args);
|
||||
|
||||
} else if ("free".equalsIgnoreCase(args[0]) && sender instanceof Player) {
|
||||
} else if (StringUtils.equalsIgnoreCase("free", args[0]) && sender instanceof Player) {
|
||||
|
||||
freeCommand.freePet(((Player) sender), args);
|
||||
|
||||
} else if ("setcolor".equalsIgnoreCase(args[0]) && sender instanceof Player) {
|
||||
} else if (StringUtils.equalsIgnoreCase("setcolor", args[0]) && sender instanceof Player) {
|
||||
|
||||
setColorCommand.setColor(((Player) sender), args);
|
||||
|
||||
} else if ("sharepet".equalsIgnoreCase(args[0]) && sender instanceof Player) {
|
||||
} else if (StringUtils.equalsIgnoreCase("sharepet", args[0]) && sender instanceof Player) {
|
||||
|
||||
shareCommand.sharePetCommand((Player) sender);
|
||||
|
||||
} else if ("godpet".equalsIgnoreCase(args[0]) && sender instanceof Player) {
|
||||
} else if (StringUtils.equalsIgnoreCase("godpet", args[0]) && sender instanceof Player) {
|
||||
|
||||
petInvincibleCommand.godPetCommand((Player) sender);
|
||||
|
||||
} else if ("petskill".equalsIgnoreCase(args[0]) && sender instanceof Player) {
|
||||
} else if (StringUtils.equalsIgnoreCase("petskill", args[0]) && sender instanceof Player) {
|
||||
|
||||
petSkillCommand.petSkillCommand((Player) sender);
|
||||
|
||||
@@ -396,4 +397,4 @@ public class PetMaster extends JavaPlugin {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,20 @@
|
||||
package com.hm.petmaster.utils;
|
||||
|
||||
import com.hm.petmaster.PetMaster;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.hm.petmaster.PetMaster;
|
||||
|
||||
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.Placeholder;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class MessageSender {
|
||||
|
||||
@@ -34,7 +37,7 @@ public class MessageSender {
|
||||
|
||||
public Component parseMessage(String message, TagResolver... tagResolvers) {
|
||||
|
||||
List<TagResolver> allTagResolvers = new ArrayList<>(Arrays.stream(tagResolvers).toList());
|
||||
final List<TagResolver> allTagResolvers = new ArrayList<>(Arrays.stream(tagResolvers).toList());
|
||||
allTagResolvers.add(Placeholder.parsed("prefix",
|
||||
plugin.getPluginLang().getString("petmaster-prefix", "<gray>[<gold>♞<gray>] ")));
|
||||
return miniMessage.deserialize(message, allTagResolvers.toArray(new TagResolver[] {}));
|
||||
@@ -43,14 +46,14 @@ public class MessageSender {
|
||||
|
||||
public void sendComponent(Player player, Component component) {
|
||||
|
||||
Audience audience = plugin.adventure().player(player);
|
||||
final Audience audience = plugin.adventure().player(player);
|
||||
audience.sendMessage(component);
|
||||
|
||||
}
|
||||
|
||||
public void sendComponentToActionBar(Player player, Component component) {
|
||||
|
||||
Audience audience = plugin.adventure().player(player);
|
||||
final Audience audience = plugin.adventure().player(player);
|
||||
audience.sendActionBar(component);
|
||||
|
||||
}
|
||||
@@ -63,14 +66,14 @@ public class MessageSender {
|
||||
|
||||
public void sendMessage(Player player, String key, TagResolver... tagResolvers) {
|
||||
|
||||
Audience audience = plugin.adventure().player(player);
|
||||
final Audience audience = plugin.adventure().player(player);
|
||||
sendMessage(audience, key, tagResolvers);
|
||||
|
||||
}
|
||||
|
||||
public void sendMessage(CommandSender sender, String key, TagResolver... tagResolvers) {
|
||||
|
||||
Audience audience = plugin.adventure().sender(sender);
|
||||
final Audience audience = plugin.adventure().sender(sender);
|
||||
sendMessage(audience, key, tagResolvers);
|
||||
|
||||
}
|
||||
@@ -83,14 +86,14 @@ public class MessageSender {
|
||||
|
||||
public void sendActionBar(Player player, String key, TagResolver... tagResolvers) {
|
||||
|
||||
Audience audience = plugin.adventure().player(player);
|
||||
final Audience audience = plugin.adventure().player(player);
|
||||
sendActionBar(audience, key, tagResolvers);
|
||||
|
||||
}
|
||||
|
||||
public void sendNewLine(CommandSender sender, boolean sendPrefix) {
|
||||
|
||||
Audience audience = plugin.adventure().sender(sender);
|
||||
final Audience audience = plugin.adventure().sender(sender);
|
||||
|
||||
if (sendPrefix) {
|
||||
|
||||
@@ -104,4 +107,4 @@ public class MessageSender {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user