Skip to content

feat: Add group-based formatting and revamp configuration #4

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
matcldr merged 1 commit into from
May 19, 2025
Merged

feat: Add group-based formatting and revamp configuration #4

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
13 changes: 12 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.noximity</groupId>
<artifactId>remmychat</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>
<packaging>jar</packaging>

<name>remmychat</name>
Expand Down Expand Up @@ -63,6 +63,11 @@
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<!-- LuckPerms Repository -->
<repository>
<id>luckperms</id>
<url>https://repo.lucko.me/</url>
</repository>
</repositories>

<dependencies>
Expand All @@ -78,6 +83,12 @@
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/com/noximity/remmyChat/RemmyChat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.noximity.remmyChat.listeners.ChatListener;
import com.noximity.remmyChat.services.ChatService;
import com.noximity.remmyChat.services.FormatService;
import com.noximity.remmyChat.services.PermissionService;
import com.noximity.remmyChat.utils.MessageUtils;
import org.bukkit.plugin.java.JavaPlugin;

Expand All @@ -22,6 +23,7 @@ public final class RemmyChat extends JavaPlugin {
private ChatService chatService;
private FormatService formatService;
private DatabaseManager databaseManager;
private PermissionService permissionService;

@Override
public void onEnable() {
Expand All @@ -31,6 +33,7 @@ public void onEnable() {
this.messages = new Messages(this);
this.databaseManager = new DatabaseManager(this);

this.permissionService = new PermissionService(this);
this.formatService = new FormatService(this);
this.chatService = new ChatService(this);

Expand All @@ -54,12 +57,10 @@ public void onEnable() {

@Override
public void onDisable() {
// Save all user data before shutdown
if (chatService != null) {
chatService.saveAllUsers();
}

// Close database connection
if (databaseManager != null) {
databaseManager.close();
}
Expand Down Expand Up @@ -90,4 +91,9 @@ public FormatService getFormatService() {
public DatabaseManager getDatabaseManager() {
return databaseManager;
}
}

public PermissionService getPermissionService() {
return permissionService;
}
}

14 changes: 12 additions & 2 deletions src/main/java/com/noximity/remmyChat/RemmyChatPlaceholders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,18 @@ public boolean persist() {
}

if (params.equalsIgnoreCase("channel")) {
ChatUser user = plugin.getChatService().getChatUser(player.getUniqueId());
return user.getCurrentChannel();
if (player.isOnline()) {
ChatUser user = plugin.getChatService().getChatUser(player.getUniqueId());
return user.getCurrentChannel();
}
return plugin.getConfigManager().getDefaultChannel().getName();
}

if (params.equalsIgnoreCase("group") && plugin.getPermissionService().isLuckPermsHooked()) {
if (player.isOnline()) {
return plugin.getPermissionService().getPrimaryGroup(player.getPlayer());
}
return "";
}

return null;
Expand Down
141 changes: 123 additions & 18 deletions src/main/java/com/noximity/remmyChat/config/ConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.noximity.remmyChat.RemmyChat;
import com.noximity.remmyChat.models.Channel;
import com.noximity.remmyChat.models.GroupFormat;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;

Expand All @@ -13,7 +14,14 @@ public class ConfigManager {
private final RemmyChat plugin;
private FileConfiguration config;
private final Map<String, Channel> channels = new HashMap<>();
private final Map<String, GroupFormat> groupFormats = new HashMap<>();
private final Map<String, String> hoverTemplates = new HashMap<>();
private final Map<String, String> channelPrefixTemplates = new HashMap<>();
private final Map<String, String> groupPrefixTemplates = new HashMap<>();
private final Map<String, String> nameStyleTemplates = new HashMap<>();
private boolean urlFormattingEnabled;
private boolean useGroupFormat;
private String chatFormat;

public ConfigManager(RemmyChat plugin) {
this.plugin = plugin;
Expand All @@ -23,8 +31,62 @@ public ConfigManager(RemmyChat plugin) {
private void loadConfig() {
plugin.saveDefaultConfig();
this.config = plugin.getConfig();
loadTemplates();
loadChannels();
loadGroupFormats();
loadUrlFormatting();
this.useGroupFormat = config.getBoolean("features.use-group-format", true);
this.chatFormat = config.getString("chat-format", "%channel_prefix% %group_prefix%%name%: %message%");
}

private void loadTemplates() {
// Load hover templates
ConfigurationSection hoversSection = config.getConfigurationSection("templates.hovers");
if (hoversSection != null) {
for (String key : hoversSection.getKeys(false)) {
String template = hoversSection.getString(key);
if (template != null) {
hoverTemplates.put(key, template);
plugin.getLogger().info("Loaded hover template: " + key);
}
}
}

// Load channel prefix templates
ConfigurationSection channelPrefixesSection = config.getConfigurationSection("templates.channel-prefixes");
if (channelPrefixesSection != null) {
for (String key : channelPrefixesSection.getKeys(false)) {
String template = channelPrefixesSection.getString(key);
if (template != null) {
channelPrefixTemplates.put(key, template);
plugin.getLogger().info("Loaded channel prefix template: " + key);
}
}
}

// Load group prefix templates
ConfigurationSection groupPrefixesSection = config.getConfigurationSection("templates.group-prefixes");
if (groupPrefixesSection != null) {
for (String key : groupPrefixesSection.getKeys(false)) {
String template = groupPrefixesSection.getString(key);
if (template != null) {
groupPrefixTemplates.put(key, template);
plugin.getLogger().info("Loaded group prefix template: " + key);
}
}
}

// Load name style templates
ConfigurationSection nameStylesSection = config.getConfigurationSection("templates.name-styles");
if (nameStylesSection != null) {
for (String key : nameStylesSection.getKeys(false)) {
String template = nameStylesSection.getString(key);
if (template != null) {
nameStyleTemplates.put(key, template);
plugin.getLogger().info("Loaded name style template: " + key);
}
}
}
}

private void loadChannels() {
Expand All @@ -35,45 +97,55 @@ private void loadChannels() {
}

for (String key : channelsSection.getKeys(false)) {
String format = channelsSection.getString(key + ".format");
String permission = channelsSection.getString(key + ".permission");
String permission = channelsSection.getString(key + ".permission", "");
double radius = channelsSection.getDouble(key + ".radius", -1);
String prefix = channelsSection.getString(key + ".prefix", "");
String hover = channelsSection.getString(key + ".hover", "player-info");

Channel channel = new Channel(key, format, permission, radius);
Channel channel = new Channel(key, permission, radius, prefix, hover);
channels.put(key, channel);

plugin.getLogger().info("Loaded channel: " + key);
}
}

private void loadUrlFormatting() {
this.urlFormattingEnabled = config.getBoolean("url-formatting.enabled", true);

if (!config.isSet("url-formatting.color")) {
config.set("url-formatting.color", "#3498DB");
private void loadGroupFormats() {
ConfigurationSection groupsSection = config.getConfigurationSection("groups");
if (groupsSection == null) {
plugin.getLogger().info("No group formats configured, using default name styles only.");
return;
}

if (!config.isSet("url-formatting.underline")) {
config.set("url-formatting.underline", true);
}
for (String key : groupsSection.getKeys(false)) {
String nameStyle = groupsSection.getString(key + ".name-style", "default");
String prefix = groupsSection.getString(key + ".prefix", "");

if (!config.isSet("url-formatting.hover")) {
config.set("url-formatting.hover", true);
}
GroupFormat groupFormat = new GroupFormat(key, nameStyle, prefix);
groupFormats.put(key, groupFormat);

if (!config.isSet("url-formatting.hover-text")) {
config.set("url-formatting.hover-text", "<#AAAAAA>Click to open</hover-text>");
plugin.getLogger().info("Loaded group format: " + key);
}
}

plugin.saveConfig();
private void loadUrlFormatting() {
this.urlFormattingEnabled = config.getBoolean("url-formatting.enabled", true);
}

public void reloadConfig() {
plugin.reloadConfig();
this.config = plugin.getConfig();
channels.clear();
groupFormats.clear();
hoverTemplates.clear();
channelPrefixTemplates.clear();
groupPrefixTemplates.clear();
nameStyleTemplates.clear();
loadTemplates();
loadChannels();
loadGroupFormats();
loadUrlFormatting();
this.useGroupFormat = config.getBoolean("features.use-group-format", true);
this.chatFormat = config.getString("chat-format", "%channel_prefix% %group_prefix%%name%: %message%");
}

public boolean isPlayerFormattingAllowed() {
Expand All @@ -88,6 +160,38 @@ public Channel getChannel(String name) {
return channels.get(name);
}

public GroupFormat getGroupFormat(String name) {
return groupFormats.get(name);
}

public Map<String, GroupFormat> getGroupFormats() {
return groupFormats;
}

public String getHoverTemplate(String name) {
return hoverTemplates.getOrDefault(name, "");
}

public String getChannelPrefixTemplate(String name) {
return channelPrefixTemplates.getOrDefault(name, "");
}

public String getGroupPrefixTemplate(String name) {
return groupPrefixTemplates.getOrDefault(name, "");
}

public String getNameStyleTemplate(String name) {
return nameStyleTemplates.getOrDefault(name, nameStyleTemplates.getOrDefault("default", "<#4A90E2>%player_name%"));
}

public String getChatFormat() {
return chatFormat;
}

public boolean isUseGroupFormat() {
return useGroupFormat;
}

public Channel getDefaultChannel() {
String defaultChannel = config.getString("default-channel");
return channels.getOrDefault(defaultChannel, null);
Expand All @@ -104,4 +208,5 @@ public boolean isLinkClickEnabled() {
public int getCooldown() {
return config.getInt("chat-cooldown", 0);
}
}
}

Loading
Loading