Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-31 21:06:38 +00:00
Code Issues Releases Activity

Improvement to MessagesUtil

Browse Source
This commit is contained in:
LoJoSho
2022-12-27 17:12:44 -06:00
parent 41c0730c92
commit 687ea6f8b9
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java
View File

@@ -17,6 +17,7 @@ import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
import com.hibiscusmc.hmccosmetics.listener.PlayerGameListener;
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
import com.hibiscusmc.hmccosmetics.util.misc.Translation;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@@ -120,6 +121,23 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
throw new RuntimeException(e);
}
// Messages setup
final File messagesFile = Path.of(getInstance().getDataFolder().getPath(), "messages.yml").toFile();
final YamlConfigurationLoader messagesLoader = YamlConfigurationLoader.
builder().
path(messagesFile.toPath()).
defaultOptions(opts ->
opts.serializers(build -> {
build.register(Location.class, LocationSerializer.INSTANCE);
build.register(ItemStack.class, ItemSerializer.INSTANCE);
}))
.build();
try {
MessagesUtil.setup(messagesLoader.load());
} catch (ConfigurateException e) {
throw new RuntimeException(e);
}
// Translation setup
Translation.setup();

4
common/src/main/java/com/hibiscusmc/hmccosmetics/util/MessagesUtil.java
View File

@@ -31,7 +31,7 @@ public class MessagesUtil {
if (!messages.containsKey(key)) return;
if (messages.get(key).isEmpty()) return;
String message = messages.get(key);
message.replaceAll("%prefix%", prefix);
message = message.replaceAll("%prefix%", prefix);
Component finalMessage = Adventure.MINI_MESSAGE.deserialize(message);
Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
@@ -42,7 +42,7 @@ public class MessagesUtil {
if (!messages.containsKey(key)) return;
if (messages.get(key).isEmpty()) return;
String message = messages.get(key);
message.replaceAll("%prefix%", prefix);
message = message.replaceAll("%prefix%", prefix);
Component finalMessage = Adventure.MINI_MESSAGE.deserialize(message);
Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).sender(sender);