From a5423cceec1a3c08e9c543453db448eb9a64832a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Dufrene?=
<43671109+itsme-to@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:04:57 +0200
Subject: [PATCH 1/3] Add the option to not display a text when the progress is
complete
---
.../java/net/aboodyy/progressexpansion/ProgressExpansion.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
index 71c3e68..952f8d2 100644
--- a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
+++ b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
@@ -30,6 +30,7 @@
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
@SuppressWarnings("unused")
public class ProgressExpansion extends PlaceholderExpansion implements Configurable {
@@ -160,7 +161,7 @@ public String onRequest(OfflinePlayer player, String identifier) {
StringBuilder bar = new StringBuilder();
amtPerSymbol = max / length;
progress = (int) Math.floor(placeholder / amtPerSymbol);
- if (placeholder >= max)
+ if (placeholder >= max && !Objects.equals(full, "none"))
return full;
while (barLength < progress) {
bar.append(completed);
From 534f3c18e60af83d2a4c344d2c783162f725ed5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Dufrene?=
<43671109+itsme-to@users.noreply.github.com>
Date: Mon, 9 Jun 2025 22:02:41 +0200
Subject: [PATCH 2/3] Fixed compilation errors
---
pom.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 78bc76c..c577c70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
placeholderapi
- http://repo.extendedclip.com/content/repositories/placeholderapi/
+ https://repo.extendedclip.com/releases/
@@ -30,7 +30,7 @@
me.clip
placeholderapi
- 2.10.8
+ 2.11.6
provided
@@ -41,9 +41,11 @@
org.apache.maven.plugins
maven-compiler-plugin
+ 3.14.0
- 7
- 7
+ 8
+ 8
+ UTF-8
From 0d592289da434e237eff10b0d229dd8bed4ae3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Dufrene?=
<43671109+itsme-to@users.noreply.github.com>
Date: Mon, 9 Jun 2025 22:02:50 +0200
Subject: [PATCH 3/3] =?UTF-8?q?The=20progress=20bar=20no=20longer=20exceed?=
=?UTF-8?q?s=20the=20maximum=20length=20when=20set=20to=20=E2=80=98none?=
=?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../net/aboodyy/progressexpansion/ProgressExpansion.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
index 952f8d2..8c35166 100644
--- a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
+++ b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
@@ -161,8 +161,12 @@ public String onRequest(OfflinePlayer player, String identifier) {
StringBuilder bar = new StringBuilder();
amtPerSymbol = max / length;
progress = (int) Math.floor(placeholder / amtPerSymbol);
- if (placeholder >= max && !Objects.equals(full, "none"))
- return full;
+ progress = Math.min(progress, length);
+ if (placeholder >= max) {
+ if (!Objects.equals(full, "none")) {
+ return full;
+ }
+ }
while (barLength < progress) {
bar.append(completed);
barLength++;