-
-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4d023bf
commit 460dc41
Showing
5 changed files
with
180 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
common/src/main/java/com/wynntils/features/overlays/BombBellOverlayFeature.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /* | ||
| * Copyright © Wynntils 2024. | ||
| * This file is released under LGPLv3. See LICENSE for full license details. | ||
| */ | ||
| package com.wynntils.features.overlays; | ||
|
|
||
| import com.wynntils.core.consumers.features.Feature; | ||
| import com.wynntils.core.consumers.overlays.annotations.OverlayInfo; | ||
| import com.wynntils.core.persisted.config.Category; | ||
| import com.wynntils.core.persisted.config.ConfigCategory; | ||
| import com.wynntils.mc.event.RenderEvent; | ||
| import com.wynntils.overlays.BombBellOverlay; | ||
|
|
||
| @ConfigCategory(Category.OVERLAYS) | ||
| public class BombBellOverlayFeature extends Feature { | ||
| @OverlayInfo(renderType = RenderEvent.ElementType.GUI) | ||
| public final BombBellOverlay bombBellOverlay = new BombBellOverlay(); | ||
| } |
14 changes: 12 additions & 2 deletions
14
common/src/main/java/com/wynntils/models/worlds/type/BombInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
common/src/main/java/com/wynntils/overlays/BombBellOverlay.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| * Copyright © Wynntils 2024. | ||
| * This file is released under LGPLv3. See LICENSE for full license details. | ||
| */ | ||
| package com.wynntils.overlays; | ||
|
|
||
| import com.mojang.blaze3d.platform.Window; | ||
| import com.mojang.blaze3d.vertex.PoseStack; | ||
| import com.wynntils.core.components.Models; | ||
| import com.wynntils.core.consumers.overlays.Overlay; | ||
| import com.wynntils.core.consumers.overlays.OverlayPosition; | ||
| import com.wynntils.core.consumers.overlays.OverlaySize; | ||
| import com.wynntils.core.persisted.Persisted; | ||
| import com.wynntils.core.persisted.config.Config; | ||
| import com.wynntils.core.text.StyledText; | ||
| import com.wynntils.models.worlds.type.BombInfo; | ||
| import com.wynntils.models.worlds.type.BombType; | ||
| import com.wynntils.utils.render.TextRenderSetting; | ||
| import com.wynntils.utils.render.TextRenderTask; | ||
| import com.wynntils.utils.render.buffered.BufferedFontRenderer; | ||
| import com.wynntils.utils.render.type.HorizontalAlignment; | ||
| import com.wynntils.utils.render.type.TextShadow; | ||
| import com.wynntils.utils.render.type.VerticalAlignment; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.function.Supplier; | ||
| import net.minecraft.client.renderer.MultiBufferSource; | ||
|
|
||
| public class BombBellOverlay extends Overlay { | ||
| @Persisted | ||
| public final Config<TextShadow> textShadow = new Config<>(TextShadow.OUTLINE); | ||
|
|
||
| @Persisted | ||
| public final Config<Float> fontScale = new Config<>(1.0f); | ||
|
|
||
| @Persisted | ||
| public final Config<Boolean> showCombatBombs = new Config<>(true); | ||
|
|
||
| @Persisted | ||
| public final Config<Boolean> showDungeonBombs = new Config<>(true); | ||
|
|
||
| @Persisted | ||
| public final Config<Boolean> showLootBombs = new Config<>(true); | ||
|
|
||
| @Persisted | ||
| public final Config<Boolean> showProfessionXpBombs = new Config<>(true); | ||
|
|
||
| @Persisted | ||
| public final Config<Boolean> showProfessionSpeedBombs = new Config<>(true); | ||
|
|
||
| private final Map<BombType, Supplier<Boolean>> bombTypeMap = Map.ofEntries( | ||
| Map.entry(BombType.COMBAT_XP, showCombatBombs::get), | ||
| Map.entry(BombType.DUNGEON, showDungeonBombs::get), | ||
| Map.entry(BombType.LOOT, showLootBombs::get), | ||
| Map.entry(BombType.PROFESSION_XP, showProfessionXpBombs::get), | ||
| Map.entry(BombType.PROFESSION_SPEED, showProfessionSpeedBombs::get)); | ||
|
|
||
| private TextRenderSetting textRenderSetting; | ||
|
|
||
| public BombBellOverlay() { | ||
| super( | ||
| new OverlayPosition( | ||
| 130, | ||
| -5, | ||
| VerticalAlignment.TOP, | ||
| HorizontalAlignment.RIGHT, | ||
| OverlayPosition.AnchorSection.TOP_RIGHT), | ||
| new OverlaySize(200, 110)); | ||
|
|
||
| updateTextRenderSetting(); | ||
| } | ||
|
|
||
| @Override | ||
| public void render(PoseStack poseStack, MultiBufferSource bufferSource, float partialTicks, Window window) { | ||
| BufferedFontRenderer.getInstance() | ||
| .renderTextsWithAlignment( | ||
| poseStack, | ||
| bufferSource, | ||
| this.getRenderX(), | ||
| this.getRenderY(), | ||
| Models.Bomb.getBombBells().stream() | ||
| .sorted(Comparator.comparing(BombInfo::getRemainingLong) | ||
| .reversed()) | ||
| .filter(bombInfo -> { | ||
| BombType bombType = bombInfo.bomb(); | ||
| Supplier<Boolean> bombTypeSupplier = bombTypeMap.get(bombType); | ||
| return bombTypeSupplier != null && bombTypeSupplier.get(); | ||
| }) | ||
| .map(bombInfo -> new TextRenderTask(bombInfo.asString(), textRenderSetting)) | ||
| .toList(), | ||
| this.getWidth(), | ||
| this.getHeight(), | ||
| this.getRenderHorizontalAlignment(), | ||
| this.getRenderVerticalAlignment()); | ||
| } | ||
|
|
||
| @Override | ||
| public void renderPreview(PoseStack poseStack, MultiBufferSource bufferSource, float partialTicks, Window window) { | ||
| BufferedFontRenderer.getInstance() | ||
| .renderTextsWithAlignment( | ||
| poseStack, | ||
| bufferSource, | ||
| this.getRenderX(), | ||
| this.getRenderY(), | ||
| List.of( | ||
| new TextRenderTask( | ||
| StyledText.fromString("§6Combat XP§7 on §fWC32 §6(16m 35s)"), | ||
| textRenderSetting), | ||
| new TextRenderTask( | ||
| StyledText.fromString("§6Profession Speed§7 on §fWC1 §6(3m 12s)"), | ||
| textRenderSetting)), | ||
| this.getWidth(), | ||
| this.getHeight(), | ||
| this.getRenderHorizontalAlignment(), | ||
| this.getRenderVerticalAlignment(), | ||
| fontScale.get()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onConfigUpdate(Config<?> config) { | ||
| updateTextRenderSetting(); | ||
| } | ||
|
|
||
| private void updateTextRenderSetting() { | ||
| textRenderSetting = TextRenderSetting.DEFAULT | ||
| .withMaxWidth(this.getWidth()) | ||
| .withHorizontalAlignment(this.getRenderHorizontalAlignment()) | ||
| .withTextShadow(textShadow.get()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters