Skip to content

feature(minimessage): Rainbow tag saturation argument #1210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Privatech38 wants to merge 5 commits into
base: main/4
Choose a base branch
from
Open

feature(minimessage): Rainbow tag saturation argument #1210

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45f1df9
Added [saturation] argument to RainbowTag <rainbow:[!][phase]:[satura…
Privatech38 Apr 10, 2025
4575de6
[saturation] argument is now allowed to replace [phase] argument in R…
Privatech38 Apr 10, 2025
874378d
Removed the ability to replace [phase] with [saturation] in rainbow t…
Privatech38 Apr 10, 2025
5118ed8
Added tests for saturation argument in rainbow tag
Privatech38 Apr 10, 2025
90ca99d
Fixed style check error for curly bracket position
Privatech38 Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[saturation] argument is now allowed to replace [phase] argument in R… 
…ainbowTag
  • Loading branch information
@Privatech38
Privatech38 committed Apr 10, 2025
commit 4575de6d64c76d0fbea74336063fcd03e6522e9c
33 changes: 21 additions & 12 deletions ...nimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/RainbowTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,27 @@ static Tag create(final ArgumentQueue args, final Context ctx) {
value = value.substring(REVERSE.length());
}
if (value.length() > 0) {
try {
phase = Integer.parseInt(value);
} catch (final NumberFormatException ex) {
throw ctx.newException("Expected phase, got " + value);
}
}
if (args.hasNext()) {
final String saturationValue = args.pop().value();
try {
saturation = Float.parseFloat(saturationValue);
} catch (final NumberFormatException ex) {
throw ctx.newException("Expected saturation, got " + saturationValue);
// Check if the value is a float or an int
if (value.endsWith("f") || value.endsWith("F") || value.contains(".")) {
try {
saturation = Float.parseFloat(value);
} catch (final NumberFormatException ex) {
throw ctx.newException("Expected saturation, got " + value);
}
} else {
try {
phase = Integer.parseInt(value);
} catch (final NumberFormatException ex) {
throw ctx.newException("Expected phase, got " + value);
}
if (args.hasNext()) {
final String saturationValue = args.pop().value();
try {
saturation = Float.parseFloat(saturationValue);
} catch (final NumberFormatException ex) {
throw ctx.newException("Expected saturation, got " + saturationValue);
}
}
}
}
if (saturation < 0f || saturation > 1f) {
Expand Down