Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

added actionbar tip

Browse Source
This commit is contained in:
XiaoMoMi
2025-03-31 23:46:11 +08:00
parent d791b38a8a
commit 72c29a9591
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/net/momirealms/customfishing/api/mechanic/context/ContextKeys.java
View File

@@ -86,7 +86,9 @@ public class ContextKeys<T> {
public static final ContextKeys<String> TIME_LEFT = of("time_left", String.class);
public static final ContextKeys<String> PROGRESS = of("progress", String.class);
public static final ContextKeys<Float> RECORD = of("record", Float.class);
public static final ContextKeys<Float> PREVIOUS_RECORD = of("previous_record", Float.class);
public static final ContextKeys<String> RECORD_FORMATTED = of("record_formatted", String.class);
public static final ContextKeys<String> PREVIOUS_RECORD_FORMATTED = of("previous_record_formatted", String.class);
public static final ContextKeys<Integer> CLICKS_LEFT = of("left_clicks", Integer.class);
public static final ContextKeys<Integer> REQUIRED_TIMES = of("clicks", Integer.class);
public static final ContextKeys<EquipmentSlot> SLOT = of("hand", EquipmentSlot.class);

5
api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/CustomFishingHook.java
View File

@@ -620,9 +620,12 @@ public class CustomFishingHook {
Pair<Integer, Integer> result = userData.statistics().addAmount(nextLoot.statisticKey().amountKey(), 1);
context.arg(ContextKeys.TOTAL_AMOUNT, userData.statistics().getAmount(nextLoot.statisticKey().amountKey()));
Optional.ofNullable(context.arg(ContextKeys.SIZE)).ifPresent(size -> {
float max = Math.max(size, userData.statistics().getMaxSize(nextLoot.statisticKey().sizeKey()));
float currentRecord = userData.statistics().getMaxSize(nextLoot.statisticKey().sizeKey());
float max = Math.max(size, currentRecord);
context.arg(ContextKeys.RECORD, max);
context.arg(ContextKeys.PREVIOUS_RECORD, currentRecord);
context.arg(ContextKeys.RECORD_FORMATTED, String.format("%.2f", max));
context.arg(ContextKeys.PREVIOUS_RECORD_FORMATTED, String.format("%.2f", currentRecord));
if (userData.statistics().updateSize(nextLoot.statisticKey().sizeKey(), size)) {
plugin.getEventManager().trigger(context, id, MechanicType.LOOT, ActionTrigger.NEW_SIZE_RECORD);
}

4
core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java
View File

@@ -563,6 +563,7 @@ public class BukkitGameManager implements GameManager {
private final String font = section.getString("subtitle.font");
private final String barImage = section.getString("subtitle.bar");
private final String tip = section.getString("tip");
private final String actionbarTip = section.getString("actionbar-tip");
@Override
public BiFunction<CustomFishingHook, GameSetting, AbstractGamingPlayer> gamingPlayerProvider() {
@@ -599,6 +600,9 @@ public class BukkitGameManager implements GameManager {
endGame();
return;
}
if (actionbarTip != null) {
SparrowHeart.getInstance().sendActionBar(getPlayer(), AdventureHelper.miniMessageToJson(actionbarTip));
}
showUI();
}

2
core/src/main/resources/config.yml
View File

@@ -56,7 +56,7 @@ mechanics:
actions:
actionbar_action:
type: actionbar
value: '<#FFD700>[New Record]</#FFD700> <#FFFFF0>You caught a(n) {nick} measuring <#FFA500>{size_formatted}cm</#FFA500> long!</#FFFFF0>'
value: '<#FFD700>[New Record]</#FFD700> <#FFFFF0>You caught a(n) {nick} measuring <#FFA500>{size_formatted}cm</#FFA500> long!</#FFFFF0> <#C0C0C0>(Previous record: {previous_record_formatted}cm)</#C0C0C0>'
sound_action:
type: sound
value:

3
core/src/main/resources/contents/minigame/default.yml
View File

@@ -1500,6 +1500,7 @@ tension_game_easy:
title: '{progress}'
# Tip would show on the title to guide the player how to play
tip: '<gray>Press <red><key:key.sneak> <gray>to start'
actionbar-tip: '<gray>Press <red><key:key.sneak> <gray>to pull the fish'
subtitle:
font: 'customfishing:default'
bar: '뀑'
@@ -1539,6 +1540,7 @@ tension_game_normal:
title: '{progress}'
# Tip would show on the title to guide the player how to play
tip: '<gray>Press <red><key:key.sneak> <gray>to start'
actionbar-tip: '<gray>Press <red><key:key.sneak> <gray>to pull the fish'
subtitle:
font: 'customfishing:default'
bar: '뀑'
@@ -1578,6 +1580,7 @@ tension_game_hard:
title: '{progress}'
# Tip would show on the title to guide the player how to play
tip: '<gray>Press <red><key:key.sneak> <gray>to start'
actionbar-tip: '<gray>Press <red><key:key.sneak> <gray>to pull the fish'
subtitle:
font: 'customfishing:default'
bar: '뀑'