Skip to content

Marathon color shifting #4

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
mudkipdev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Marathon color shifting #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion marathon/src/main/java/dev/emortal/minestom/marathon/MarathonGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.kyori.adventure.text.format.ShadowColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.util.HSVLike;
import net.minestom.server.MinecraftServer;
import net.minestom.server.component.DataComponents;
import net.minestom.server.coordinate.Point;
Expand Down Expand Up @@ -61,6 +62,8 @@ public final class MarathonGame {
private static final int NEXT_BLOCKS_COUNT = 7;
public static final Pos RESET_POINT = new Pos(0.5, 150, 0.5);
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("mm:ss");
private static final float BASE_SCORE_HUE = 0.8915F;
private static final int SCORE_HUE_CYCLE = 350;
public static final @NotNull Tag<Boolean> MARATHON_ENTITY_TAG = Tag.Boolean("marathonEntity");

private final @NotNull Instance instance;
Expand Down Expand Up @@ -261,7 +264,7 @@ private void refreshDisplays() {
String scorePerSecond = this.score < 5 ? "-.-" : String.valueOf(MathUtils.clamp(Math.floor(this.score / secondsTaken * 10.0) / 10.0, 0.0, 9.9));

Component message = Component.text()
.append(Component.text(this.score, TextColor.fromHexString("#ff00a6"), TextDecoration.BOLD))
.append(Component.text(this.score, this.getScoreColor(), TextDecoration.BOLD))
.append(Component.text(" | ", NamedTextColor.DARK_GRAY).shadowColor(ShadowColor.none()))
.append(Component.text(formattedTime, NamedTextColor.GRAY))
.append(Component.text(" | ", NamedTextColor.DARK_GRAY).shadowColor(ShadowColor.none()))
Expand All @@ -277,6 +280,11 @@ private void refreshDisplays() {
// ));
}

private @NotNull TextColor getScoreColor() {
float hue = (BASE_SCORE_HUE + (float) this.score / SCORE_HUE_CYCLE) % 1.0F;
return TextColor.color(HSVLike.hsvLike(hue, 1.0F, 1.0F));
}

private void generateNextBlock(boolean shouldAnimate) {
if (this.blocks.size() > NEXT_BLOCKS_COUNT) {
Point firstBlockPos = this.blocks.getFirst();
Expand Down