diff --git a/pom.xml b/pom.xml
index 24e594b..bb80e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,32 +1,32 @@
- 4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
com.github.TBMCPlugins.ChromaCore
CorePOM
master-SNAPSHOT
- 0.0.1-SNAPSHOT
- Chroma-Chat Plugin
- Chroma-Chat Plugin
-
- src/main/java
-
-
- src
-
- **/*.java
-
-
-
- src/main/resources
-
- *.properties
- *.yml
- *.csv
- *.txt
-
- true
+ v${noprefix.version}-SNAPSHOT
+ Chroma-Chat Plugin
+ Chroma-Chat Plugin
+
+ src/main/java
+
+
+ src
+
+ **/*.java
+
+
+
+ src/main/resources
+
+ *.properties
+ *.yml
+ *.csv
+ *.txt
+
+ true
Chroma-Chat
@@ -72,49 +72,6 @@
-
-
maven-compiler-plugin
@@ -170,7 +127,7 @@
com.github.TBMCPlugins.ChromaCore
Chroma-Core
- ${branch}-SNAPSHOT
+ v1.0.0
net.ess3
@@ -204,7 +161,7 @@
org.spigotmc
spigot
- 1.16.3-R0.1-SNAPSHOT
+ 1.12.2-R0.1-SNAPSHOT
provided
githubo
UTF-8
-
- master
-
+ 1.0.0
-
-
-
- ci
-
-
- env.TRAVIS_BRANCH
-
-
-
-
- ${env.TRAVIS_BRANCH}
-
-
-
\ No newline at end of file
diff --git a/src/main/java/buttondevteam/chat/ChatPlayer.java b/src/main/java/buttondevteam/chat/ChatPlayer.java
index 2da7f1a..25fd122 100644
--- a/src/main/java/buttondevteam/chat/ChatPlayer.java
+++ b/src/main/java/buttondevteam/chat/ChatPlayer.java
@@ -9,7 +9,7 @@ import buttondevteam.lib.player.TBMCPlayerBase;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
-@PlayerClass(pluginname = "Button1Chat")
+@PlayerClass(pluginname = "Chroma-Chat")
public class ChatPlayer extends TBMCPlayerBase {
public final ConfigData UserName = getConfig().getData("UserName", "");
diff --git a/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java b/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
index 70c0bc8..c31f3b4 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
@@ -122,7 +122,7 @@ public class ChatProcessing {
mp = e.getUser().getAs(ChatPlayer.class); //May be null
if (mp != null) {
- if (System.nanoTime() - mp.LastMessageTime < 1000 * 1000 * component.minTimeBetweenMessages.get()) { //0.1s by default
+ if (System.nanoTime() - mp.LastMessageTime < 1000L * 1000L * component.minTimeBetweenMessages.get()) { //0.1s by default
sender.sendMessage("§cYou are sending messages too quickly!");
return true;
}
diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java
index 53fe988..b491ea0 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java
@@ -6,9 +6,9 @@ import java.io.Serializable;
public final class TellrawEvent implements Serializable {
private static final long serialVersionUID = -1681364161210561505L;
- private transient boolean hoverEvent;
- private T action;
- private Object value;
+ private final transient boolean hoverEvent;
+ private final T action;
+ private final Object value;
private TellrawEvent(T action, String value) {
this.hoverEvent = action instanceof HoverAction;
@@ -44,7 +44,7 @@ public final class TellrawEvent implements Serial
public enum ClickAction implements Action {
OPEN_URL("open_url"), RUN_COMMAND("run_command"), SUGGEST_COMMAND("suggest_command");
- private String action;
+ private final String action;
ClickAction(String action) {
this.action = action;
@@ -58,8 +58,8 @@ public final class TellrawEvent implements Serial
public enum HoverAction implements Action {
SHOW_TEXT("show_text"), SHOW_ITEM("show_item"), SHOW_ACHIEVEMENT("show_achievement"), SHOW_ENTITY(
- "show_entity");
- private String action;
+ "show_entity");
+ private final String action;
HoverAction(String action) {
this.action = action;
diff --git a/src/main/java/buttondevteam/chat/components/fun/FunComponent.java b/src/main/java/buttondevteam/chat/components/fun/FunComponent.java
index baf4476..e375114 100644
--- a/src/main/java/buttondevteam/chat/components/fun/FunComponent.java
+++ b/src/main/java/buttondevteam/chat/components/fun/FunComponent.java
@@ -40,6 +40,7 @@ public class FunComponent extends Component implements Listener {
private UnlolCommand command;
private TBMCSystemChatEvent.BroadcastTarget unlolTarget;
private TBMCSystemChatEvent.BroadcastTarget fTarget;
+ private final Random random = new Random();
/**
* The strings that count as laughs, see unlol.
@@ -66,7 +67,7 @@ public class FunComponent extends Component implements Listener {
val pc = new PressCommand();
registerCommand(pc);
registerListener(pc);
- registerCommand(command=new UnlolCommand(unlolTarget));
+ registerCommand(command = new UnlolCommand(unlolTarget));
registerListener(this);
registerCommand(new FTopCommand());
registerCommand(new OpmeCommand());
@@ -106,7 +107,7 @@ public class FunComponent extends Component implements Listener {
@EventHandler
public void onPlayerDeath(PlayerDeathEvent e) {
// MinigamePlayer mgp = Minigames.plugin.pdata.getMinigamePlayer(e.getEntity());
- if (e.getDeathMessage().length() > 0 && respect.get() && new Random().nextBoolean()) { // Don't store Fs for NPCs
+ if (e.getDeathMessage().length() > 0 && respect.get() && random.nextBoolean()) { // Don't store Fs for NPCs
Runnable tt = () -> {
if (ActiveF) {
ActiveF = false;
diff --git a/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java b/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java
index 091fcfe..c464b70 100644
--- a/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java
+++ b/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java
@@ -17,7 +17,7 @@ import org.bukkit.entity.Player;
"This command allows setting a color for a town.", //
"The town will be shown with this color on Dynmap and all players in the town will appear in chat with these colors.", //
"The colors will split the name evenly but residents can override that with /u ncolor.", //
-}) // TODO: /u u when annotation not present
+})
@RequiredArgsConstructor
public class TownColorCommand extends UCommandBase {
private final TownColorComponent component;
diff --git a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
index ae3b57f..94a0b18 100644
--- a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
+++ b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
@@ -44,22 +44,22 @@ public class TownColorComponent extends Component implements Listene
/**
* Names lowercased
*/
- public static Map TownColors = new HashMap<>();
+ public static final Map TownColors = new HashMap<>();
/**
* Names lowercased - nation color gets added to town colors when needed
*/
- public static Map NationColor = new HashMap<>();
+ public static final Map NationColor = new HashMap<>();
/**
* The amount of town colors allowed. If more than one is used, players can change how many letters to be in a specific color using /u ncolor.
*/
- public ConfigData colorCount = getConfig().getData("colorCount", (byte) 1, cc -> ((Integer) cc).byteValue(), Byte::intValue);
+ public final ConfigData colorCount = getConfig().getData("colorCount", (byte) 1, cc -> ((Integer) cc).byteValue(), Byte::intValue);
/**
* If enabled, players will have a nation-defined color in addition to town colors, white by default.
* They can change how much of each color they want with this as well.
*/
- public ConfigData useNationColors = getConfig().getData("useNationColors", true);
+ public final ConfigData useNationColors = getConfig().getData("useNationColors", true);
@Getter
private static TownColorComponent component;
diff --git a/src/main/java/buttondevteam/chat/components/towncolors/admin/TownColorCommand.java b/src/main/java/buttondevteam/chat/components/towncolors/admin/TownColorCommand.java
index 60083a4..3a3fc50 100644
--- a/src/main/java/buttondevteam/chat/components/towncolors/admin/TownColorCommand.java
+++ b/src/main/java/buttondevteam/chat/components/towncolors/admin/TownColorCommand.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
"The town will be shown with this color on Dynmap and all players in the town will appear in chat with these colors.", //
"The colors will split the name evenly.", //
})
-public class TownColorCommand extends AdminCommandBase { //TODO: Command path aliases
+public class TownColorCommand extends AdminCommandBase {
@Command2.Subcommand
public boolean def(CommandSender sender, String town, String... colornames) {
if (!TownyComponent.dataSource.hasTown(town)) {
diff --git a/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java b/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
index b80874c..4c079da 100644
--- a/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
+++ b/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
@@ -50,7 +50,7 @@ public class PlayerJoinLeaveListener implements Listener {
nwithoutformatting = nwithoutformatting.replace("§" + nwithoutformatting.charAt(index + 1), "");
} else
nwithoutformatting = p.getName();
- PlayerListener.nicknames.forcePut(nwithoutformatting.toLowerCase(), p.getUniqueId()); //TODO: FormatterComponent
+ PlayerListener.nicknames.forcePut(nwithoutformatting.toLowerCase(), p.getUniqueId());
if (PluginMain.Instance.storeChatHistory.get())
HistoryCommand.showHistory(e.getPlayer(), null);
diff --git a/src/main/java/buttondevteam/chat/listener/PlayerListener.java b/src/main/java/buttondevteam/chat/listener/PlayerListener.java
index ad45023..353f83f 100644
--- a/src/main/java/buttondevteam/chat/listener/PlayerListener.java
+++ b/src/main/java/buttondevteam/chat/listener/PlayerListener.java
@@ -31,7 +31,7 @@ public class PlayerListener implements Listener {
/**
* Does not contain format codes, lowercased
*/
- public static BiMap nicknames = HashBiMap.create();
+ public static final BiMap nicknames = HashBiMap.create();
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerChat(AsyncPlayerChatEvent event) {