Merge pull request #268 from NotEnoughUpdates/master

2.1 Continued

1 files changed, 38 insertions, 10 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 9c93b9c5..b1ab11c1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package io.github.moulberry.notenoughupdates.miscfeatures;
 
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
@@ -26,15 +45,18 @@ public class DamageCommas {
 	};
 
 	private static final char STAR = '\u2727';
+	private static final char OVERLOAD_STAR = '\u272F';
 	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+)(.*)");
+		"\u00a7f" + STAR + "((?:\u00a7.\\d(?:§.,)?)+)\u00a7." + STAR + "(.*)");
+	private static final Pattern PATTERN_NO_CRIT = Pattern.compile("(\u00a7.)([\\d+,]*)(.*)");
+	private static final Pattern OVERLOAD_PATTERN = Pattern.compile("(\u00a7.)" + OVERLOAD_STAR + "((?:\u00a7.[\\d,])+)(\u00a7.)" + OVERLOAD_STAR + "\u00a7r");
 
 	public static IChatComponent replaceName(EntityLivingBase entity) {
 		if (!entity.hasCustomName()) return entity.getDisplayName();
 
 		IChatComponent name = entity.getDisplayName();
-		if (NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 0) return name;
+		if (!NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle2) return name;
+		if (!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return name;
 
 		if (replacementMap.containsKey(entity)) {
 			ChatComponentText component = replacementMap.get(entity);
@@ -50,17 +72,23 @@ public class DamageCommas {
 		String suffix;
 
 		Matcher matcherCrit = PATTERN_CRIT.matcher(formatted);
+		Matcher matcherOverload = OVERLOAD_PATTERN.matcher(formatted);
 		if (matcherCrit.matches()) {
 			crit = true;
-			numbers = StringUtils.cleanColour(matcherCrit.group(1));
+			numbers = StringUtils.cleanColour(matcherCrit.group(1)).replace(",", "");
 			prefix = "\u00a7f" + STAR;
 			suffix = "\u00a7f" + STAR + matcherCrit.group(2);
-		} else {
+		} else if (matcherOverload.matches()) {
+				crit = true;
+        numbers = StringUtils.cleanColour(matcherOverload.group(2)).replace(",", "");
+        prefix = matcherOverload.group(1) + OVERLOAD_STAR;
+        suffix = matcherOverload.group(3) + OVERLOAD_STAR + "\u00a7r";
+			} else {
 			Matcher matcherNoCrit = PATTERN_NO_CRIT.matcher(formatted);
 			if (matcherNoCrit.matches()) {
-				numbers = matcherNoCrit.group(1);
-				prefix = "\u00A77";
-				suffix = "\u00A7r" + matcherNoCrit.group(2);
+				numbers = matcherNoCrit.group(2).replace(",", "");
+				prefix = matcherNoCrit.group(1);
+				suffix = "\u00A7r" + matcherNoCrit.group(3);
 			} else {
 				replacementMap.put(entity, null);
 				return name;
@@ -72,10 +100,10 @@ public class DamageCommas {
 		try {
 			int number = Integer.parseInt(numbers);
 
-			if (number > 999 && NotEnoughUpdates.INSTANCE.config.misc.damageIndicatorStyle == 2) {
+			if (number > 999) {
 				newFormatted.append(Utils.shortNumberFormat(number, 0));
 			} else {
-				newFormatted.append(NumberFormat.getIntegerInstance().format(number));
+				return name;
 			}
 		} catch (NumberFormatException e) {
 			replacementMap.put(entity, null);