Skip to content

Commit

Permalink
Fix HexUtils error, begin work on weighted prefixes for luckperms
Browse files Browse the repository at this point in the history
  • Loading branch information
Refrac committed Dec 29, 2023
1 parent 653a013 commit 3645c19
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 19 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.refracdevelopment</groupId>
<artifactId>SimpleStaffChat</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
<packaging>jar</packaging>

<name>SimpleStaffChat</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@
import lombok.Setter;
import lombok.experimental.UtilityClass;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.metastacking.MetaStackElement;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.Unmodifiable;

import java.util.List;
import java.util.SortedMap;

@UtilityClass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ProxiedPlayer;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

@UtilityClass
public class Placeholders {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
import java.nio.file.Path;

@Getter
@Plugin(id = "simplestaffchat2",
name = "SimpleStaffChat2",
version = "3.2",
@Plugin(id = "simplestaffchat",
name = "SimpleStaffChat",
version = "3.2.2",
dependencies = {@Dependency(id = "signedvelocity", optional = true), @Dependency(id = "luckperms", optional = true)},
url = "https://discord.gg/EFeSKPg739",
description = "SimpleStaffChat is a plugin that allows you to send messages to your staff members privately.",
Expand Down Expand Up @@ -77,7 +77,7 @@ public VelocityStaffChat(ProxyServer server, @DataDirectory Path path, Logger lo
public void onProxyInitialization(ProxyInitializeEvent event) {
long startTiming = System.currentTimeMillis();
PluginManager pluginManager = getServer().getPluginManager();
PluginContainer container = pluginManager.getPlugin("simplestaffchat2").get();
PluginContainer container = pluginManager.getPlugin("simplestaffchat").get();

metricsFactory.make(this, 12096);

Expand Down Expand Up @@ -214,7 +214,7 @@ public boolean getSignedVelocityAddon() {

public void updateCheck(CommandSource sender, boolean console) {
try {
PluginContainer container = getServer().getPluginManager().getPlugin("simplestaffchat2").get();
PluginContainer container = getServer().getPluginManager().getPlugin("simplestaffchat").get();

String urlString = "https://refracdev-updatecheck.refracdev.workers.dev/";
URL url = new URL(urlString);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public ConfigFile(String name) {
configFile.save();
} catch (IOException exception) {
VelocityStaffChat.getInstance().getLogger().error("Failed to load config file! This VelocityStaffChat.getInstance() will now shutdown.");
Optional<PluginContainer> container = VelocityStaffChat.getInstance().getServer().getPluginManager().getPlugin("simplestaffchat2");
Optional<PluginContainer> container = VelocityStaffChat.getInstance().getServer().getPluginManager().getPlugin("simplestaffchat");
container.ifPresent(pluginContainer -> pluginContainer.getExecutorService().shutdown());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void onQuit(DisconnectEvent event) {

private void sendDevMessage(Player player) {
PluginManager pluginManager = VelocityStaffChat.getInstance().getServer().getPluginManager();
PluginContainer container = pluginManager.getPlugin("simplestaffchat2").get();
PluginContainer container = pluginManager.getPlugin("simplestaffchat").get();

Color.sendMessage(player, " ");
Color.sendMessage(player, "<green>Welcome " + container.getDescription().getName().get() + " Developer!");
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/bungee-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ staffchat-output: "default"
# staffchat-output must be set to "custom" in order for this to work
staffchat-message:
- ""
- "&c&lSimpleStaffChat2 %arrow2% Help"
- "&c&lSimpleStaffChat %arrow2% Help"
- ""
- "&d/staffchat <message> &7- Send staffchat messages."
- "&d/adminchat <message> &7- Send adminchat messages."
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/bungee.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: SimpleStaffChat2
name: SimpleStaffChat
version: '${project.version}'
main: me.refracdevelopment.simplestaffchat.bungee.BungeeStaffChat
author: Refrac
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: SimpleStaffChat2
name: SimpleStaffChat
version: '${project.version}'
main: me.refracdevelopment.simplestaffchat.spigot.SimpleStaffChat
authors:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/velocity-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ messages:
staffchat-output: "default"
staffchat-message:
- ""
- "<red><bold>SimpleStaffChat2 %arrow2% Help"
- "<red><bold>SimpleStaffChat %arrow2% Help"
- ""
- "<red>/staffchat <message> <gray>- Send staffchat messages."
- "<red>/adminchat <message> <gray>- Send adminchat messages."
Expand Down

0 comments on commit 3645c19

Please sign in to comment.