aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java80
1 files changed, 40 insertions, 40 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
index aafcfb4d..5f3a5afa 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
@@ -9,7 +9,6 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import java.text.NumberFormat;
-import java.util.HashMap;
import java.util.WeakHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -21,18 +20,18 @@ public class DamageCommas {
private static final EnumChatFormatting[] coloursHypixel = {EnumChatFormatting.WHITE, EnumChatFormatting.YELLOW, EnumChatFormatting.GOLD, EnumChatFormatting.RED, EnumChatFormatting.RED, EnumChatFormatting.WHITE};
private static final char STAR = '\u2727';
- private static final Pattern PATTERN_CRIT = Pattern.compile("\u00a7f"+STAR+"((?:\u00a7.\\d)+)\u00a7."+STAR+"(.*)");
+ private static final Pattern PATTERN_CRIT = Pattern.compile("\u00a7f" + STAR + "((?:\u00a7.\\d)+)\u00a7." + STAR + "(.*)");
private static final Pattern PATTERN_NO_CRIT = Pattern.compile("\u00a77(\\d+)(.*)");
public static IChatComponent replaceName(EntityLivingBase entity) {
- if(!entity.hasCustomName()) return entity.getDisplayName();
+ if (!entity.hasCustomName()) return entity.getDisplayName();
IChatComponent name = entity.getDisplayName();
- if(NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 0) return name;
+ if (NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 0) return name;
- if(replacementMap.containsKey(entity)) {
+ if (replacementMap.containsKey(entity)) {
ChatComponentText component = replacementMap.get(entity);
- if(component == null) return name;
+ if (component == null) return name;
return component;
}
@@ -44,17 +43,17 @@ public class DamageCommas {
String suffix;
Matcher matcherCrit = PATTERN_CRIT.matcher(formatted);
- if(matcherCrit.matches()) {
+ if (matcherCrit.matches()) {
crit = true;
numbers = StringUtils.cleanColour(matcherCrit.group(1));
- prefix = "\u00a7f"+STAR;
- suffix = "\u00a7f"+STAR+matcherCrit.group(2);
+ prefix = "\u00a7f" + STAR;
+ suffix = "\u00a7f" + STAR + matcherCrit.group(2);
} else {
Matcher matcherNoCrit = PATTERN_NO_CRIT.matcher(formatted);
- if(matcherNoCrit.matches()) {
+ if (matcherNoCrit.matches()) {
numbers = matcherNoCrit.group(1);
prefix = "\u00A77";
- suffix = "\u00A7r"+matcherNoCrit.group(2);
+ suffix = "\u00A7r" + matcherNoCrit.group(2);
} else {
replacementMap.put(entity, null);
return name;
@@ -66,22 +65,22 @@ public class DamageCommas {
try {
int number = Integer.parseInt(numbers);
- if(number > 999 && NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2) {
+ if (number > 999 && NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2) {
newFormatted.append(Utils.shortNumberFormat(number, 0));
} else {
newFormatted.append(NumberFormat.getIntegerInstance().format(number));
}
- } catch(NumberFormatException e) {
+ } catch (NumberFormatException e) {
replacementMap.put(entity, null);
return name;
}
- if(crit) {
+ if (crit) {
StringBuilder newFormattedCrit = new StringBuilder();
int colourIndex = 0;
- for(char c : newFormatted.toString().toCharArray()) {
- if(c == ',') {
+ for (char c : newFormatted.toString().toCharArray()) {
+ if (c == ',') {
newFormattedCrit.append(EnumChatFormatting.GRAY);
} else {
newFormattedCrit.append(coloursHypixel[colourIndex++ % coloursHypixel.length]);
@@ -92,23 +91,23 @@ public class DamageCommas {
newFormatted = newFormattedCrit;
}
- ChatComponentText finalComponent = new ChatComponentText(prefix+newFormatted.toString()+suffix);
+ ChatComponentText finalComponent = new ChatComponentText(prefix + newFormatted + suffix);
replacementMap.put(entity, finalComponent);
return finalComponent;
- /*if(formatted.startsWith("\u00A7f\u2727")) System.out.println(formatted);
+ /*if (formatted.startsWith("\u00A7f\u2727")) System.out.println(formatted);
- if(formatted.length() >= 7 && (formatted.startsWith("\u00A7f\u2727") || formatted.startsWith("\u00A7f\u2694")) &&
+ if (formatted.length() >= 7 && (formatted.startsWith("\u00A7f\u2727") || formatted.startsWith("\u00A7f\u2694")) &&
(formatted.endsWith("\u2727\u00a7r") || formatted.endsWith("\u2694\u00a7r"))) {
- if(NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2) {
- String numbers = Utils.cleanColour(formatted.substring(3, formatted.length()-3)).trim().replaceAll("[^0-9]", "");
+ if (NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2) {
+ String numbers = Utils.cleanColour(formatted.substring(3, formatted.length() - 3)).trim().replaceAll("[^0-9]", "");
try {
int damage = Integer.parseInt(numbers);
String damageString;
- if(damage > 999) {
+ if (damage > 999) {
damageString = Utils.shortNumberFormat(damage, 0);
} else {
damageString = NumberFormat.getIntegerInstance().format(damage);
@@ -116,10 +115,10 @@ public class DamageCommas {
StringBuilder colouredString = new StringBuilder();
int colourIndex = 0;
- for(int i=0; i<damageString.length(); i++) {
+ for (int i = 0; i < damageString.length(); i++) {
int index = damageString.length() - 1 - i;
char c = damageString.charAt(index);
- if(c >= '0' && c <= '9') {
+ if (c >= '0' && c <= '9') {
colouredString.insert(0, c);
colouredString.insert(0, colours[colourIndex++ % colours.length]);
} else {
@@ -127,10 +126,11 @@ public class DamageCommas {
}
}
- ChatComponentText ret = new ChatComponentText("\u00A7f\u2727"+colouredString+"\u00a7r\u2727\u00a7r");
+ ChatComponentText ret = new ChatComponentText("\u00A7f\u2727" + colouredString + "\u00a7r\u2727\u00a7r");
replacementMap.put(hashCode, ret);
return ret;
- } catch(NumberFormatException ignored) {}
+ } catch (NumberFormatException ignored) {
+ }
}
StringBuilder builder = new StringBuilder();
@@ -138,42 +138,42 @@ public class DamageCommas {
boolean colLast = false;
boolean colLastLast;
int numCount = 0;
- for(int i=formatted.length()-4; i>=3; i--) {
+ for (int i = formatted.length() - 4; i >= 3; i--) {
char c = formatted.charAt(i);
colLastLast = colLast;
- if(c == '\u00a7') {
- if(numLast) numCount--;
+ if (c == '\u00a7') {
+ if (numLast) numCount--;
numLast = false;
colLast = true;
- } else if((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')) {
+ } else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')) {
numLast = true;
colLast = false;
numCount++;
} else {
- if(colLast) {
+ if (colLast) {
replacementMap.put(hashCode, null);
return name;
}
numLast = false;
}
- if(colLastLast && numLast && numCount > 1 && (numCount-1) % 3 == 0) builder.append(',');
+ if (colLastLast && numLast && numCount > 1 && (numCount - 1) % 3 == 0) builder.append(',');
builder.append(c);
}
- ChatComponentText ret = new ChatComponentText("\u00A7f\u2727"+builder.reverse().toString()+"\u2727\u00a7r");
+ ChatComponentText ret = new ChatComponentText("\u00A7f\u2727" + builder.reverse().toString() + "\u2727\u00a7r");
replacementMap.put(hashCode, ret);
return ret;
}
- if(formatted.length() >= 5 && formatted.startsWith(EnumChatFormatting.GRAY.toString()) &&
+ if (formatted.length() >= 5 && formatted.startsWith(EnumChatFormatting.GRAY.toString()) &&
formatted.endsWith(EnumChatFormatting.RESET.toString())) {
- String damageS = formatted.substring(2, formatted.length()-2);
+ String damageS = formatted.substring(2, formatted.length() - 2);
- for(int i=0; i<damageS.length(); i++) {
+ for (int i = 0; i < damageS.length(); i++) {
char c = damageS.charAt(i);
- if(c < '0' || c > '9') {
+ if (c < '0' || c > '9') {
replacementMap.put(hashCode, null);
return name;
}
@@ -183,16 +183,16 @@ public class DamageCommas {
int damage = Integer.parseInt(damageS);
String damageFormatted;
- if(NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2 && damage > 999) {
+ if (NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2 && damage > 999) {
damageFormatted = Utils.shortNumberFormat(damage, 0);
} else {
damageFormatted = NumberFormat.getIntegerInstance().format(damage);
}
- ChatComponentText ret = new ChatComponentText(EnumChatFormatting.GRAY+damageFormatted+EnumChatFormatting.RESET);
+ ChatComponentText ret = new ChatComponentText(EnumChatFormatting.GRAY + damageFormatted + EnumChatFormatting.RESET);
replacementMap.put(hashCode, ret);
return ret;
- } catch(Exception e) {
+ } catch (Exception e) {
replacementMap.put(hashCode, null);
return name;
}
generated by cgit (git 2.34.1) at 2026-05-31 10:56:29 +0000