Skip to content

Commit

Permalink
Add an option to change the toast scale, close #17
Browse files Browse the repository at this point in the history
  • Loading branch information
@NotRyken
NotRyken committed Jun 15, 2024
1 parent 67ed4cd commit dcefd08
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 15 deletions.
3 changes: 3 additions & 0 deletions common/src/main/java/com/github/scotsguy/nowplaying/config/Config.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ public static class Options {
public static final boolean defaultSilenceWoosh = true;
public boolean silenceWoosh = defaultSilenceWoosh;

public static final float defaultToastScale = 1.0F;
public float toastScale = defaultToastScale;

public static final boolean defaultSimpleToast = false;
public boolean simpleToast = defaultSimpleToast;

Expand Down
9 changes: 9 additions & 0 deletions ...on/src/main/java/com/github/scotsguy/nowplaying/gui/screen/ClothConfigScreenProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ static Screen getConfigScreen(Screen parent) {
.setSaveConsumer(val -> options.silenceWoosh = val)
.build());

modSettings.addEntry(eb.startFloatField(
localized("option", "toast_scale"), options.toastScale)
.setTooltip(localized("option", "toast_scale.tooltip"))
.setDefaultValue(Config.Options.defaultToastScale)
.setMin(0.25F)
.setMax(2F)
.setSaveConsumer(val -> options.toastScale = val)
.build());

modSettings.addEntry(eb.startBooleanToggle(
localized("option", "simple_toast"), options.simpleToast)
.setTooltip(localized("option", "simple_toast.tooltip"))
Expand Down
32 changes: 19 additions & 13 deletions common/src/main/java/com/github/scotsguy/nowplaying/gui/toast/NowPlayingToast.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ public NowPlayingToast(Component description, ItemStack itemStack) {
}

@Override
public Visibility render(@NotNull GuiGraphics guiGraphics, @NotNull ToastComponent toastComponent, long startTime) {
public @NotNull Visibility render(@NotNull GuiGraphics graphics, @NotNull ToastComponent toastComponent, long startTime) {
float scale = Config.get().options.toastScale;
graphics.pose().pushPose();
graphics.pose().translate(160 * (1 - scale), 0.0F, 0.0F);
graphics.pose().scale(scale, scale, 0.0F);

Minecraft game = Minecraft.getInstance();

int width = this.width();
Expand All @@ -46,54 +51,55 @@ public Visibility render(@NotNull GuiGraphics guiGraphics, @NotNull ToastCompone

if (width == 160 && textLines.size() <= 1) {
// Draw the whole toast from the texture
guiGraphics.blitSprite(BACKGROUND_SPRITE, 0, 0, width, height);
graphics.blitSprite(BACKGROUND_SPRITE, 0, 0, width, height);
} else {
height = height + Math.max(0, textLines.size() - (Config.get().options.simpleToast ? 2 : 1)) * 12;
int bottomHeight = Math.min(4, height - 28);
// Draw the top border
this.renderBackgroundRow(guiGraphics, width, 0, 0, 28);
this.renderBackgroundRow(graphics, width, 0, 0, 28);

// Draw plain background
for (int n = 28; n < height - bottomHeight; n += 10) {
this.renderBackgroundRow(guiGraphics, width, 16 /* middle */, n, Math.min(16, height - n - bottomHeight));
this.renderBackgroundRow(graphics, width, 16 /* middle */, n, Math.min(16, height - n - bottomHeight));
}

// Draw the bottom border
this.renderBackgroundRow(guiGraphics, width, 32 - bottomHeight, height - bottomHeight, bottomHeight);
this.renderBackgroundRow(graphics, width, 32 - bottomHeight, height - bottomHeight, bottomHeight);
}
if (Config.get().options.simpleToast) {
// Draw song title
for (int i = 0; i < textLines.size(); ++i) {
guiGraphics.drawString(game.font, textLines.get(i), TEXT_LEFT_MARGIN, (textLines.size() == 1 ? 12 : 6 + i * 12), -16777216, false);
graphics.drawString(game.font, textLines.get(i), TEXT_LEFT_MARGIN, (textLines.size() == 1 ? 12 : 6 + i * 12), -16777216, false);
}
}
else {
// Draw "Now Playing"
guiGraphics.drawString(game.font, localized("message", "now_playing"), TEXT_LEFT_MARGIN, 7, -11534256, false);
graphics.drawString(game.font, localized("message", "now_playing"), TEXT_LEFT_MARGIN, 7, -11534256, false);

// Draw song title
for (int i = 0; i < textLines.size(); ++i) {
guiGraphics.drawString(game.font, textLines.get(i), TEXT_LEFT_MARGIN, (18 + i * 12), -16777216, false);
graphics.drawString(game.font, textLines.get(i), TEXT_LEFT_MARGIN, (18 + i * 12), -16777216, false);
}
}

// Draw icon
guiGraphics.renderFakeItem(itemStack, 9, (height / 2) - (16 / 2));
graphics.renderFakeItem(itemStack, 9, (height / 2) - (16 / 2));

graphics.pose().popPose();
return startTime - this.startTime >= this.displayTime ? Visibility.HIDE : Visibility.SHOW;
}

private void renderBackgroundRow(GuiGraphics guiGraphics, int i, int vOffset, int y, int vHeight) {
private void renderBackgroundRow(GuiGraphics graphics, int i, int vOffset, int y, int vHeight) {
int uWidth = vOffset == 0 ? 20 : 5;
int n = Math.min(60, i - uWidth);

guiGraphics.blitSprite(BACKGROUND_SPRITE, 160, 32, 0, vOffset, 0, y, uWidth, vHeight);
graphics.blitSprite(BACKGROUND_SPRITE, 160, 32, 0, vOffset, 0, y, uWidth, vHeight);

for (int o = uWidth; o < i - n; o += 64) {
guiGraphics.blitSprite(BACKGROUND_SPRITE, 160, 32, 32, vOffset, o, y, Math.min(64, i - o - n), vHeight);
graphics.blitSprite(BACKGROUND_SPRITE, 160, 32, 32, vOffset, o, y, Math.min(64, i - o - n), vHeight);
}

guiGraphics.blitSprite(BACKGROUND_SPRITE, 160, 32, 160 - n, vOffset, i - n, y, n, vHeight);
graphics.blitSprite(BACKGROUND_SPRITE, 160, 32, 160 - n, vOffset, i - n, y, n, vHeight);
}
}

Expand Down
6 changes: 4 additions & 2 deletions common/src/main/resources/assets/now-playing/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
"option.${mod_id}.jukebox_style": "Jukebox pop-up style",
"option.${mod_id}.fallback_toast": "Fallback to toast",
"option.${mod_id}.fallback_toast.tooltip": "When 'Hotbar' style is selected, use toast if hotbar display is not available",
"option.${mod_id}.silence_woosh": "Silence woosh",
"option.${mod_id}.silence_woosh.tooltip": "Silence the sound made by the music toast",
"option.${mod_id}.silence_woosh": "Silent toast",
"option.${mod_id}.silence_woosh.tooltip": "Silence the woosh sound made by the 'Now Playing' toast",
"option.${mod_id}.toast_scale": "Toast scale",
"option.${mod_id}.toast_scale.tooltip": "Scale the size of the 'Now Playing' toast",
"option.${mod_id}.simple_toast": "Simple toast",
"option.${mod_id}.simple_toast.tooltip": "Only show the song, not the 'Now Playing' text",
"option.${mod_id}.toast_time": "Toast display time",
Expand Down

0 comments on commit dcefd08

Please sign in to comment.