diff --git a/.idea/libraries/Maven__com_github_TBMCPlugins_ButtonCore_Towny_master_v1_0_g8d3b6b6_296.xml b/.idea/libraries/Maven__com_github_TBMCPlugins_ButtonCore_Towny_master_v1_0_g8d3b6b6_296.xml
deleted file mode 100644
index 8991a67..0000000
--- a/.idea/libraries/Maven__com_github_TBMCPlugins_ButtonCore_Towny_master_v1_0_g8d3b6b6_296.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_milkbowl_VaultAPI_master_c8cb88f27a_1.xml b/.idea/libraries/Maven__com_github_milkbowl_VaultAPI_master_c8cb88f27a_1.xml
deleted file mode 100644
index b5aaa43..0000000
--- a/.idea/libraries/Maven__com_github_milkbowl_VaultAPI_master_c8cb88f27a_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java
index 3c44345..2b2ecbf 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java
@@ -16,20 +16,13 @@ import javax.annotation.Nullable;
*/
@Getter
public class TBMCChatEvent extends TBMCChatEventBase {
- public TBMCChatEvent(CommandSender sender, ChromaGamerBase user, Channel channel, String message, int score, boolean fromcmd, String groupid) {
- super(channel, message, score, groupid);
- this.sender = sender;
- this.fromcmd = fromcmd;
- this.ignoreSenderPermissions = false;
- this.user = user;
- }
-
- public TBMCChatEvent(CommandSender sender, ChromaGamerBase user, Channel channel, String message, int score, boolean fromcmd, String groupid, boolean ignoreSenderPermissions) {
+ public TBMCChatEvent(CommandSender sender, ChromaGamerBase user, Channel channel, String message, int score, boolean fromcmd, String groupid, boolean ignoreSenderPermissions, String origin) {
super(channel, message, score, groupid);
this.sender = sender;
this.user = user;
this.fromcmd = fromcmd;
this.ignoreSenderPermissions = ignoreSenderPermissions;
+ this.origin = origin;
}
private static final HandlerList handlers = new HandlerList();
@@ -37,7 +30,8 @@ public class TBMCChatEvent extends TBMCChatEventBase {
private final CommandSender sender;
private final boolean fromcmd;
private final boolean ignoreSenderPermissions;
- private final ChromaGamerBase user;
+ private final ChromaGamerBase user;
+ private final String origin;
// TODO: Message object with data?
/**
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatMessage.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatMessage.java
index ff5528b..4ce179a 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatMessage.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatMessage.java
@@ -30,7 +30,8 @@ public class ChatMessage {
*/
private CommandSender permCheck;
/**
- * The origin of the message, "minecraft" or "discord" for example.
+ * The origin of the message, "Minecraft" or "Discord" for example. May be displayed to the user.
+ * This is the user class capitalized folder name.
*/
private final String origin;
@@ -39,7 +40,7 @@ public class ChatMessage {
}
@NonNull
- public static ChatMessageBuilder builder(Channel channel, CommandSender sender, ChromaGamerBase user, String message) {
- return builder().sender(sender).user(user).message(message);
+ public static ChatMessageBuilder builder(CommandSender sender, ChromaGamerBase user, String message) {
+ return builder().sender(sender).user(user).message(message).origin(user.getFolder().substring(0, 1).toUpperCase() + user.getFolder().substring(1));
}
}
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
index 995d48e..4cb7894 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
@@ -238,7 +238,7 @@ public class TBMCChatAPI {
if (eventPre.isCancelled())
return true;
TBMCChatEvent event;
- event = new TBMCChatEvent(cm.getSender(), cm.getUser(), channel, eventPre.getMessage(), score, cm.isFromCommand(), rtr.groupID, permcheck != cm.getSender());
+ event = new TBMCChatEvent(cm.getSender(), cm.getUser(), channel, eventPre.getMessage(), score, cm.isFromCommand(), rtr.groupID, permcheck != cm.getSender(), cm.getOrigin());
Bukkit.getPluginManager().callEvent(event);
return event.isCancelled();
}
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/player/UserClass.java b/ButtonCore/src/main/java/buttondevteam/lib/player/UserClass.java
index 9abfce6..0e375aa 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/player/UserClass.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/player/UserClass.java
@@ -13,7 +13,7 @@ import java.lang.annotation.*;
@Inherited
public @interface UserClass {
/**
- * Indicates which folder should the player files be saved in.
+ * Indicates which folder should the player files be saved in. Must be lowercase.
*/
String foldername();
}