Skip to content

Add minimessage support [TESTING NEEDED] #13

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

Open
TheAmberr wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add minimessage support [TESTING NEEDED] #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2f911e
Add minimessage support!
TheAmberr Jun 26, 2025
321bc1b
fix rando shit
TheAmberr Jul 5, 2025
abd97c2
Updated user caching to cache and encrypt via a database over config.yml
SnarkyDeveloper Jul 14, 2025
481261c
Formatted created date string, and made cleaner tab completion, may a…
SnarkyDeveloper Jul 14, 2025
7c1d807
Merge pull request #1 from SnarkyDeveloper/master
TheAmberr Jul 23, 2025
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
46 changes: 46 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
Expand All @@ -40,6 +44,11 @@
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
</repositories>

<build>
Expand All @@ -53,6 +62,22 @@
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -63,6 +88,27 @@
<version>1.20.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.15.0</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.3.2</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bungeecord</artifactId>
<version>4.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-minimessage</artifactId>
<version>4.15.0</version>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
Expand Down
261 changes: 109 additions & 152 deletions src/main/java/com/omnipico/pluralkitmc/ChatUtils.java
View file
Open in desktop

Large diffs are not rendered by default.

502 changes: 252 additions & 250 deletions src/main/java/com/omnipico/pluralkitmc/CommandPK.java
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 45 additions & 74 deletions src/main/java/com/omnipico/pluralkitmc/PluralKitData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,59 @@
package com.omnipico.pluralkitmc;

import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import com.omnipico.pluralkitmc.database.CacheManager;

import java.util.*;

public class PluralKitData {
FileConfiguration config;
PluralKitMC plugin;
Map<UUID, UserCache> userCache = new HashMap<>();
long cacheUpdateFrequency;

public PluralKitData(FileConfiguration config, PluralKitMC plugin) {
this.config = config;
public PluralKitData(PluralKitMC plugin) {
this.plugin = plugin;
cacheUpdateFrequency = config.getLong("cache_update_frequency");
this.cacheUpdateFrequency = plugin.getConfig().getLong("cache-update-frequency");
}

public void setConfig(FileConfiguration config) {
this.config = config;
}
public void setConfig(org.bukkit.configuration.file.FileConfiguration config) {}

String getSystemId(UUID uuid) {
if (userCache.containsKey(uuid)) {
return userCache.get(uuid).systemId;
} else {
if (this.config.contains("players." + uuid.toString() + ".system")) {
return this.config.getString("players." + uuid.toString() + ".system");
} else {
return null;
}
}
UserCache user = CacheManager.getFromMemCache(uuid);
return user != null ? user.systemId : null;
}

String getToken(UUID uuid) {
if (userCache.containsKey(uuid)) {
return userCache.get(uuid).token;
} else {
if (this.config.contains("players." + uuid.toString() + ".token")) {
return this.config.getString("players." + uuid.toString() + ".token");
} else {
return null;
}
}
UserCache user = CacheManager.getFromMemCache(uuid);
return user != null ? user.token : null;
}

void setSystemId(UUID uuid, String systemId) {
config.set("players." + uuid.toString() + ".system", systemId);
plugin.saveConfig();
String token = null;
if (userCache.containsKey(uuid)) {
token = userCache.get(uuid).getToken();
UserCache user = CacheManager.getFromMemCache(uuid);
if (user != null) {
token = user.getToken();
}
userCache.remove(uuid);
UserCache user = new UserCache(uuid, systemId, token, plugin, true);
userCache.put(uuid, user);
UserCache newUser = new UserCache(uuid, systemId, token, plugin, true);
CacheManager.addToMemCache(newUser);
CacheManager.saveToDatabase(newUser, plugin);
}

void setSystemId(UUID uuid, String systemId, String token) {
config.set("players." + uuid.toString() + ".system", systemId);
plugin.saveConfig();

userCache.remove(uuid);
UserCache user = new UserCache(uuid, systemId, token, plugin, true);
userCache.put(uuid, user);
UserCache newUser = new UserCache(uuid, systemId, token, plugin, true);
CacheManager.addToMemCache(newUser);
CacheManager.saveToDatabase(newUser, plugin);
}

UserCache getCacheOrCreate(UUID uuid, boolean blocking) {
if (userCache.containsKey(uuid)) {
UserCache user = userCache.get(uuid);
UserCache user = CacheManager.getFromMemCache(uuid);
if (user != null) {
user.updateIfNeeded(cacheUpdateFrequency, blocking);
return user;
} else {
String systemId = getSystemId(uuid);
String token = getToken(uuid);
if (systemId != null) {
UserCache user = new UserCache(uuid, systemId, token, plugin, blocking);
userCache.put(uuid, user);
return user;
UserCache newUser = new UserCache(uuid, systemId, token, plugin, blocking);
CacheManager.addToMemCache(newUser);
return newUser;
} else {
return null;
}
Expand All @@ -89,8 +65,6 @@ UserCache getCacheOrCreate(UUID uuid) {
}

boolean setToken(UUID uuid, String token) {
config.set("players." + uuid.toString() + ".token", token);
plugin.saveConfig();
UserCache user = getCacheOrCreate(uuid);
String systemId = UserCache.verifyToken(plugin, token);
if (systemId != null) {
Expand All @@ -99,8 +73,8 @@ boolean setToken(UUID uuid, String token) {
} else {
user.setToken(token);
user.update(true);
CacheManager.saveToDatabase(user, plugin);
}
plugin.saveConfig();
return true;
}
return false;
Expand All @@ -110,21 +84,18 @@ void updateAutoProxyMode(UUID uuid, String mode) {
UserCache userCache = getCacheOrCreate(uuid);
if (userCache != null) {
userCache.setAutoProxyMode(mode);
CacheManager.saveToDatabase(userCache, plugin);
}
config.set("players." + uuid.toString() + ".ap_mode", mode);
plugin.saveConfig();
}

boolean updateAutoProxyMember(UUID uuid, String memberName) {
UserCache userCache = getCacheOrCreate(uuid);
memberName = memberName.toLowerCase();
if (userCache != null) {
for (int i = 0; i < userCache.members.size(); i++) {
PluralKitMember member = userCache.members.get(i);
for (PluralKitMember member : userCache.members) {
if (member.id.equals(memberName) || member.name.toLowerCase().equals(memberName)) {
userCache.setAutoProxyMember(member.id);
config.set("players." + uuid.toString() + ".ap_member", member.id);
plugin.saveConfig();
CacheManager.saveToDatabase(userCache, plugin);
return true;
}
}
Expand All @@ -136,29 +107,32 @@ void updateFronters(UUID uuid, List<String> fronterNames) {
UserCache userCache = getCacheOrCreate(uuid);
if (userCache != null) {
List<PluralKitMember> members = new ArrayList<>();
for (int i = 0; i < fronterNames.size(); i++) {
String fronterName = fronterNames.get(i);
for (String fronterName : fronterNames) {
PluralKitMember member = userCache.getMemberByIdOrName(fronterName);
if (member != null) {
members.add(member);
}
}
userCache.setFronters(members);
CacheManager.saveToDatabase(userCache, plugin);
}
}

void updateCache(UUID uuid, boolean blocking) {
UserCache user = getCacheOrCreate(uuid, blocking);
user.update(blocking);
if (user != null) {
user.update(blocking);
CacheManager.saveToDatabase(user, plugin);
}
}

void clearCache(UUID uuid) {
userCache.remove(uuid);
CacheManager.getFromMemCache(uuid);
}

String getSystemTag(UUID uuid) {
UserCache user = getCacheOrCreate(uuid);
if (user != null) {
if (user != null && user.system != null) {
return user.system.tag;
} else {
return null;
Expand All @@ -170,7 +144,7 @@ List<PluralKitMember> getMembers(UUID uuid) {
if (user != null) {
return user.members;
} else {
return new ArrayList<PluralKitMember>();
return new ArrayList<>();
}
}

Expand Down Expand Up @@ -215,19 +189,17 @@ PluralKitMember getProxiedUser(UUID uuid, String message) {
List<PluralKitMember> members = getMembers(uuid);
int fitStrength = 0;
PluralKitMember bestFit = null;
for (int i = 0; i < members.size(); i++) {
PluralKitMember member = members.get(i);
for (int j = 0; j < member.proxy_tags.size(); j++) {
PluralKitProxy proxy = member.proxy_tags.get(j);
for (PluralKitMember member : members) {
for (PluralKitProxy proxy : member.proxy_tags) {
int proxyLength = 0;
if (proxy.getPrefix() != null) {
proxyLength += proxy.getPrefix().length();
}
if (proxy.getSuffix() != null) {
proxyLength += proxy.getSuffix().length();
}
if (message.length() > proxyLength && (proxy.getPrefix() == null || message.substring(0, proxy.getPrefix().length()).equals(proxy.getPrefix()))
&& (proxy.getSuffix() == null || message.substring(message.length()-proxy.getSuffix().length()).equals(proxy.getSuffix()))
if (message.length() > proxyLength && (proxy.getPrefix() == null || message.startsWith(proxy.getPrefix()))
&& (proxy.getSuffix() == null || message.endsWith(proxy.getSuffix()))
&& (proxy.getPrefix() != null || proxy.getSuffix() != null)) {
if (proxyLength > fitStrength) {
fitStrength = proxyLength;
Expand All @@ -246,8 +218,9 @@ PluralKitMember getProxiedUser(UUID uuid, String message) {
bestFit = user.getFirstFronter();
}
}
if (bestFit != null) {
if (bestFit != null && user != null) {
user.setLastProxied(bestFit.id);
CacheManager.saveToDatabase(user, plugin);
}
return bestFit;
}
Expand All @@ -257,19 +230,17 @@ PluralKitProxy getProxy(UUID uuid, String message) {
List<PluralKitMember> members = getMembers(uuid);
int fitStrength = 0;
PluralKitProxy bestFit = null;
for (int i = 0; i < members.size(); i++) {
PluralKitMember member = members.get(i);
for (int j = 0; j < member.proxy_tags.size(); j++) {
PluralKitProxy proxy = member.proxy_tags.get(j);
for (PluralKitMember member : members) {
for (PluralKitProxy proxy : member.proxy_tags) {
int proxyLength = 0;
if (proxy.getPrefix() != null) {
proxyLength += proxy.getPrefix().length();
}
if (proxy.getSuffix() != null) {
proxyLength += proxy.getSuffix().length();
}
if (message.length() > proxyLength && (proxy.getPrefix() == null || message.substring(0, proxy.getPrefix().length()).equals(proxy.getPrefix()))
&& (proxy.getSuffix() == null || message.substring(message.length()-proxy.getSuffix().length()).equals(proxy.getSuffix()))
if (message.length() > proxyLength && (proxy.getPrefix() == null || message.startsWith(proxy.getPrefix()))
&& (proxy.getSuffix() == null || message.endsWith(proxy.getSuffix()))
&& (proxy.getPrefix() != null || proxy.getSuffix() != null)) {
if (proxyLength > fitStrength) {
fitStrength = proxyLength;
Expand Down
Loading