Fix off by 1 for hex colors when stopping at end of string

This commit is contained in:
Esophose 2020-08-25 18:44:53 -06:00
parent 3a441e3329
commit 4474c4354c

View file

@ -154,7 +154,7 @@ public final class HexUtils {
if (matcher.start() > searchAfter) if (matcher.start() > searchAfter)
return matcher.start(); return matcher.start();
} }
return content.length() - 1; return content.length();
} }
private static String cleanHex(String hex) { private static String cleanHex(String hex) {
@ -270,6 +270,9 @@ public final class HexUtils {
this.step = this.stepIndex = 0; this.step = this.stepIndex = 0;
} }
/**
* @return the next color in the gradient
*/
public Color next() { public Color next() {
// Gradients will use the first color of the entire spectrum won't be available to preserve prettiness // Gradients will use the first color of the entire spectrum won't be available to preserve prettiness
if (NMSUtil.getVersionNumber() < 16) if (NMSUtil.getVersionNumber() < 16)
@ -344,6 +347,9 @@ public final class HexUtils {
this(totalColors, 1.0F, 1.0F); this(totalColors, 1.0F, 1.0F);
} }
/**
* @return the next color in the gradient
*/
public Color next() { public Color next() {
Color color = Color.getHSBColor(this.hue, this.saturation, this.brightness); Color color = Color.getHSBColor(this.hue, this.saturation, this.brightness);
this.hue += this.hueStep; this.hue += this.hueStep;