aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java20
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java18
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java18
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java16
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java16
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java30
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java10
11 files changed, 74 insertions, 74 deletions
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java
index 74f5f352..af23d306 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MCategoryElement.java
@@ -35,12 +35,12 @@ public class MCategoryElement extends MPanel {
private int leftPad = 0;
private int offsetX;
private RootConfigPanel rootConfigPanel;
- public MCategoryElement(String category, Runnable onClick, int leftPad, int offsetX, RootConfigPanel rooot) {
+ public MCategoryElement(String category, Runnable onClick, int leftPad, int offsetX, RootConfigPanel root) {
this.category = category;
this.onClick = onClick;
this.leftPad = leftPad;
this.offsetX = offsetX;
- this.rootConfigPanel = rooot;
+ this.rootConfigPanel = root;
}
@Override
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java
index d46e3c40..ecb0e838 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/AColor.java
@@ -33,8 +33,8 @@ public class AColor extends Color {
super(r, g, b, a);
}
- public AColor(int rgba, boolean hasalpha) {
- super(rgba, hasalpha);
+ public AColor(int rgba, boolean hasAlpha) {
+ super(rgba, hasAlpha);
}
public AColor(AColor clone) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java
index a92cd094..783b255e 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomNetworkPlayerInfo.java
@@ -62,11 +62,11 @@ public class CustomNetworkPlayerInfo extends NetworkPlayerInfo {
playerNameWithoutColor = "";
for (String s : unformattedDisplayText.split(" ")) {
- String strippped = TextUtils.stripColor(s);
- if (strippped.startsWith("[")) {
+ String stripped = TextUtils.stripColor(s);
+ if (stripped.startsWith("[")) {
continue;
}
- playerNameWithoutColor = strippped;
+ playerNameWithoutColor = stripped;
break;
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java
index 4e50b110..6f8bcb11 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerChatByMe.java
@@ -43,7 +43,7 @@ public class ChatReplacerChatByMe implements IChatReplacer {
@Override
public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
- List<Tuple<IChatComponent, IChatComponent>> replaceMents = new ArrayList<>();
+ List<Tuple<IChatComponent, IChatComponent>> replacements = new ArrayList<>();
List<IChatComponent> iChatComponents = new ArrayList<>( event.message.getSiblings() );
List<IChatComponent> hasMsg = new ArrayList<>();
for (IChatComponent sibling : iChatComponents) {
@@ -57,13 +57,13 @@ public class ChatReplacerChatByMe implements IChatReplacer {
ChatStyle origStyle = hasMsg.get(0).getChatStyle();
String name = chatComponents.getFormattedText();
- String[] splited = name.split(" ");
- String actualName = splited[splited.length-1];
+ String[] split = name.split(" ");
+ String actualName = split[split.length-1];
- List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase());
- if (cDatas == null) return;
+ List<ActiveCosmetic> cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase());
+ if (cData == null) return;
CosmeticData color=null, prefix=null;
- for (ActiveCosmetic activeCosmetic : cDatas) {
+ for (ActiveCosmetic activeCosmetic : cData) {
CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) {
color = cosmeticData;
@@ -74,12 +74,12 @@ public class ChatReplacerChatByMe implements IChatReplacer {
String building = "";
if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
- for (int i = 0; i < splited.length-1; i++) {
- building += splited[i] +" ";
+ for (int i = 0; i < split.length-1; i++) {
+ building += split[i] +" ";
}
if (color != null) {
- String nick = splited[splited.length-1];
+ String nick = split[split.length-1];
building += color.getData().replace("&","§");
boolean foundLegitChar = false;
boolean foundColor = false;
@@ -94,7 +94,7 @@ public class ChatReplacerChatByMe implements IChatReplacer {
}
}
} else {
- building += splited[splited.length-1] ;
+ building += split[split.length-1] ;
}
ChatComponentText chatComponents1 = new ChatComponentText(building);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java
index df003ec7..6522b4b2 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerCoop.java
@@ -42,14 +42,14 @@ public class ChatReplacerCoop implements IChatReplacer {
@Override
public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
- List<Tuple<IChatComponent, IChatComponent>> replaceMents = new ArrayList<>();
+ List<Tuple<IChatComponent, IChatComponent>> replacements = new ArrayList<>();
List<IChatComponent> iChatComponents = new ArrayList<>( event.message.getSiblings() );
IChatComponent sibling = iChatComponents.get(0); iChatComponents.remove(sibling);
String[] splitInto = sibling.getUnformattedTextForChat().split(" ");
int lastValidNickname = -1;
- int lastprefix = -1;
+ int lastPrefix = -1;
for (int i = 0; i < splitInto.length; i++) {
String s = TextUtils.stripColor(splitInto[i]);
char c = s.charAt(0);
@@ -59,16 +59,16 @@ public class ChatReplacerCoop implements IChatReplacer {
}
if (lastValidNickname == -1) return;
- if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1;
- else lastprefix = lastValidNickname;
+ if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1;
+ else lastPrefix = lastValidNickname;
- List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(splitInto[lastValidNickname].substring(0, splitInto[lastValidNickname].length()-1)).toLowerCase());
+ List<ActiveCosmetic> cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(splitInto[lastValidNickname].substring(0, splitInto[lastValidNickname].length()-1)).toLowerCase());
- if (cDatas == null) return;
+ if (cData == null) return;
CosmeticData color = null, prefix = null;
- for (ActiveCosmetic activeCosmetic : cDatas) {
+ for (ActiveCosmetic activeCosmetic : cData) {
CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
if (cosmeticData != null && cosmeticData.getCosmeticType().equals("color")) {
color = cosmeticData;
@@ -78,11 +78,11 @@ public class ChatReplacerCoop implements IChatReplacer {
}
String building = "";
- for (int i = 0; i < lastprefix; i++) {
+ for (int i = 0; i < lastPrefix; i++) {
building += splitInto[i] +" ";
}
if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
- for (int i = lastprefix; i < lastValidNickname; i++) {
+ for (int i = lastPrefix; i < lastValidNickname; i++) {
building += splitInto[i] +" ";
}
if (color != null) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java
index e819ca7f..db59f878 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerMessage.java
@@ -43,7 +43,7 @@ public class ChatReplacerMessage implements IChatReplacer {
@Override
public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
- List<Tuple<IChatComponent, IChatComponent>> replaceMents = new ArrayList<>();
+ List<Tuple<IChatComponent, IChatComponent>> replacements = new ArrayList<>();
List<IChatComponent> iChatComponents = new ArrayList<>( event.message.getSiblings() );
List<IChatComponent> hasMsg = new ArrayList<>();
for (IChatComponent sibling : iChatComponents) {
@@ -59,13 +59,13 @@ public class ChatReplacerMessage implements IChatReplacer {
String name = chatComponents.getFormattedText();
- String[] splited = name.split(" ");
- String actualName = splited[splited.length-1];
+ String[] split = name.split(" ");
+ String actualName = split[split.length-1];
- List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase());
- if (cDatas == null || splited.length > 2) return;
+ List<ActiveCosmetic> cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(TextUtils.stripColor(actualName).toLowerCase());
+ if (cData == null || split.length > 2) return;
CosmeticData color=null, prefix=null;
- for (ActiveCosmetic activeCosmetic : cDatas) {
+ for (ActiveCosmetic activeCosmetic : cData) {
CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) {
color = cosmeticData;
@@ -76,10 +76,10 @@ public class ChatReplacerMessage implements IChatReplacer {
String building = "";
if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
- if (splited.length == 2) building += splited[0] +" ";
+ if (split.length == 2) building += split[0] +" ";
if (color != null) {
- String nick = splited[1];
+ String nick = split[1];
building += color.getData().replace("&","§");
boolean foundLegitChar = false;
boolean foundColor = false;
@@ -94,7 +94,7 @@ public class ChatReplacerMessage implements IChatReplacer {
}
}
} else {
- building += splited[1] ;
+ building += split[1] ;
}
ChatComponentText chatComponents1 = new ChatComponentText(building);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java
index b4e1b777..2f1c8da9 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerPV.java
@@ -41,11 +41,11 @@ public class ChatReplacerPV implements IChatReplacer {
public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
if (event.message.getChatStyle() != null && event.message.getChatStyle().getChatClickEvent() != null && event.message.getChatStyle().getChatClickEvent().getValue().startsWith("/pv")) {
String username = event.message.getChatStyle().getChatClickEvent().getValue().split(" ")[1];
- List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase());
+ List<ActiveCosmetic> cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase());
- if (cDatas != null) {
+ if (cData != null) {
CosmeticData color=null, prefix=null;
- for (ActiveCosmetic activeCosmetic : cDatas) {
+ for (ActiveCosmetic activeCosmetic : cData) {
CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) {
color = cosmeticData;
@@ -56,7 +56,7 @@ public class ChatReplacerPV implements IChatReplacer {
String[] splitInto = event.message.getUnformattedTextForChat().split(" ");
int lastValidNickname = -1;
- int lastprefix = -1;
+ int lastPrefix = -1;
for (int i = 0; i < splitInto.length; i++) {
String s = splitInto[i];
if (s.startsWith("§7")) s = s.substring(2);
@@ -71,15 +71,15 @@ public class ChatReplacerPV implements IChatReplacer {
}
if (lastValidNickname == -1) return;
- if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1;
- else lastprefix = lastValidNickname;
+ if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1;
+ else lastPrefix = lastValidNickname;
String building = "";
- for (int i = 0; i < lastprefix; i++) {
+ for (int i = 0; i < lastPrefix; i++) {
building += splitInto[i] +" ";
}
if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
- for (int i = lastprefix; i < lastValidNickname; i++) {
+ for (int i = lastPrefix; i < lastValidNickname; i++) {
building += splitInto[i] +" ";
}
if (color != null) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java
index acbdf623..af855938 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerSocialOptions.java
@@ -39,11 +39,11 @@ public class ChatReplacerSocialOptions implements IChatReplacer {
public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
if (event.message.getChatStyle() != null && event.message.getChatStyle().getChatClickEvent() != null && event.message.getChatStyle().getChatClickEvent().getValue().startsWith("/socialoptions")) {
String username = event.message.getChatStyle().getChatClickEvent().getValue().split(" ")[1];
- List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase());
+ List<ActiveCosmetic> cData = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase());
- if (cDatas != null) {
+ if (cData != null) {
CosmeticData color=null, prefix=null;
- for (ActiveCosmetic activeCosmetic : cDatas) {
+ for (ActiveCosmetic activeCosmetic : cData) {
CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) {
color = cosmeticData;
@@ -54,7 +54,7 @@ public class ChatReplacerSocialOptions implements IChatReplacer {
String[] splitInto = event.message.getUnformattedTextForChat().split(" ");
int lastValidNickname = -1;
- int lastprefix = -1;
+ int lastPrefix = -1;
for (int i = 0; i < splitInto.length; i++) {
String s = splitInto[i];
if (s.startsWith("§7")) s = s.substring(2);
@@ -69,15 +69,15 @@ public class ChatReplacerSocialOptions implements IChatReplacer {
}
if (lastValidNickname == -1) return;
- if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1;
- else lastprefix = lastValidNickname;
+ if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1;
+ else lastPrefix = lastValidNickname;
String building = "";
- for (int i = 0; i < lastprefix; i++) {
+ for (int i = 0; i < lastPrefix; i++) {
building += splitInto[i] +" ";
}
if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
- for (int i = lastprefix; i < lastValidNickname; i++) {
+ for (int i = lastPrefix; i < lastValidNickname; i++) {
building += splitInto[i] +" ";
}
if (color != null) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java
index 28d1d3d0..c2993258 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/chatreplacers/ChatReplacerViewProfile.java
@@ -42,18 +42,18 @@ public class ChatReplacerViewProfile implements IChatReplacer {
@Override
public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
- List<Tuple<IChatComponent, IChatComponent>> replaceMents = new ArrayList<>();
+ List<Tuple<IChatComponent, IChatComponent>> replacements = new ArrayList<>();
for (IChatComponent sibling : event.message.getSiblings()) {
if (sibling.getChatStyle() != null && sibling.getChatStyle().getChatClickEvent() != null && sibling.getChatStyle().getChatClickEvent().getValue().startsWith("/viewprofile ")) {
String uid = sibling.getChatStyle().getChatClickEvent().getValue().split(" ")[1];
// TODO: make cosmeticsManager handle usernames instead of uuids
- // apperantly now hypixels /viewprofile command gives the nickname
-// List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayer().get(UUID.fromString(uid));
- List<ActiveCosmetic> cDatas = null;
+ // apparently now hypixel's /viewprofile command gives the nickname
+// List<ActiveCosmetic> cData = cosmeticsManager.getActiveCosmeticByPlayer().get(UUID.fromString(uid));
+ List<ActiveCosmetic> cData = null;
- if (cDatas != null) {
+ if (cData != null) {
CosmeticData color=null, prefix=null;
- for (ActiveCosmetic activeCosmetic : cDatas) {
+ for (ActiveCosmetic activeCosmetic : cData) {
CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) {
color = cosmeticData;
@@ -64,7 +64,7 @@ public class ChatReplacerViewProfile implements IChatReplacer {
String[] splitInto = sibling.getUnformattedTextForChat().split(" ");
int lastValidNickname = -1;
- int lastprefix = -1;
+ int lastPrefix = -1;
for (int i = 0; i < splitInto.length; i++) {
String s = TextUtils.stripColor(splitInto[i]);
char c = s.charAt(0);
@@ -78,15 +78,15 @@ public class ChatReplacerViewProfile implements IChatReplacer {
}
if (lastValidNickname == -1) continue;
- if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1;
- else lastprefix = lastValidNickname;
+ if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastPrefix = lastValidNickname -1;
+ else lastPrefix = lastValidNickname;
String building = "";
- for (int i = 0; i < lastprefix; i++) {
+ for (int i = 0; i < lastPrefix; i++) {
building += splitInto[i] +" ";
}
if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
- for (int i = lastprefix; i < lastValidNickname; i++) {
+ for (int i = lastPrefix; i < lastValidNickname; i++) {
building += splitInto[i] +" ";
}
if (color != null) {
@@ -116,15 +116,15 @@ public class ChatReplacerViewProfile implements IChatReplacer {
ChatComponentText newChatCompText = new ChatComponentText(building);
newChatCompText.setChatStyle(sibling.getChatStyle());
- replaceMents.add(new Tuple<>(sibling, newChatCompText));
+ replacements.add(new Tuple<>(sibling, newChatCompText));
break;
}
}
}
- for (Tuple<IChatComponent, IChatComponent> replaceMent : replaceMents) {
- int index = event.message.getSiblings().indexOf(replaceMent.getFirst());
- event.message.getSiblings().set(index, replaceMent.getSecond());
+ for (Tuple<IChatComponent, IChatComponent> replacement : replacements) {
+ int index = event.message.getSiblings().indexOf(replacement.getFirst());
+ event.message.getSiblings().set(index, replacement.getSecond());
}
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java
index 6d104b8f..27f97a0c 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/RichPresence.java
@@ -73,7 +73,7 @@ public class RichPresence
* Constructs a {@link JSONObject} representing a payload to send to discord
* to update a user's Rich Presence.
*
- * <p>This is purely internal, and should not ever need to be called outside of
+ * <p>This is purely internal and should not ever need to be called outside
* the library.
*
* @return A JSONObject payload for updating a user's Rich Presence.
@@ -259,7 +259,7 @@ public class RichPresence
}
/**
- * Sets party configurations for a team, lobby, or other form of group.
+ * Sets party configurations for a team, lobby, or another form of group.
*
* <p>The {@code partyId} is ID of the player's party.
* <br>The {@code partySize} is the current size of the player's party.
@@ -267,7 +267,7 @@ public class RichPresence
*
* @param partyId The ID of the player's party.
* @param partySize The current size of the player's party.
- * @param partyMax The maximum number of player's allowed in the party.
+ * @param partyMax The maximum number of players allowed in the party.
*
* @return This Builder.
*/
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java
index 45231079..986e9ed9 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/User.java
@@ -28,7 +28,7 @@ public class User
* Constructs a new {@link User}.<br>
* Only implemented internally.
* @param name user's name
- * @param discriminator user's discrim
+ * @param discriminator user's discriminator
* @param id user's id
* @param avatar user's avatar hash, or {@code null} if they have no avatar
*/
@@ -41,7 +41,7 @@ public class User
}
/**
- * Gets the Users account name.
+ * Gets the User's account name.
*
* @return The Users account name.
*/
@@ -51,7 +51,7 @@ public class User
}
/**
- * Gets the Users discriminator.
+ * Gets the User's discriminator.
*
* @return The Users discriminator.
*/
@@ -83,7 +83,7 @@ public class User
/**
* Gets the Users avatar ID.
*
- * @return The Users avatar ID.
+ * @return The User's avatar ID.
*/
public String getAvatarId()
{
@@ -133,7 +133,7 @@ public class User
}
/**
- * Gets whether or not this User is a bot.<p>
+ * Gets whether this User is a bot or not.<p>
*
* While, at the time of writing this documentation, bots cannot
* use Rich Presence features, there may be a time in the future