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

2.3.1

Browse Source
This commit is contained in:
XiaoMoMi
2025-01-10 00:35:24 +08:00
parent 9393bde4b9
commit 9b18b7175e
6 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/net/momirealms/customfishing/bukkit/action/BukkitActionManager.java
View File

@@ -693,8 +693,8 @@ public class BukkitActionManager implements ActionManager<Player> {
private void registerSoundAction() {
registerAction((args, chance) -> {
if (args instanceof Section section) {
MathValue<Player> volume = MathValue.auto(section.get("volume"));
MathValue<Player> pitch = MathValue.auto(section.get("pitch"));
MathValue<Player> volume = MathValue.auto(section.get("volume", 1));
MathValue<Player> pitch = MathValue.auto(section.get("pitch", 1));
Key key = Key.key(section.getString("key"));
Sound.Source source = Sound.Source.valueOf(section.getString("source", "PLAYER").toUpperCase(Locale.ENGLISH));
return context -> {

18
core/src/main/java/net/momirealms/customfishing/bukkit/requirement/BukkitRequirementManager.java
View File

@@ -34,6 +34,7 @@ import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
import net.momirealms.customfishing.api.mechanic.requirement.RequirementExpansion;
import net.momirealms.customfishing.api.mechanic.requirement.RequirementFactory;
import net.momirealms.customfishing.api.mechanic.requirement.RequirementManager;
import net.momirealms.customfishing.api.mechanic.totem.ActiveTotemList;
import net.momirealms.customfishing.api.util.MoonPhase;
import net.momirealms.customfishing.bukkit.integration.VaultHook;
import net.momirealms.customfishing.common.util.ClassUtils;
@@ -202,6 +203,7 @@ public class BukkitRequirementManager implements RequirementManager<Player> {
this.registerGameModeRequirement();
this.registerEquipmentRequirement();
this.registerLiquidDepthRequirement();
this.registerTotemRequirement();
}
private void registerImpossibleRequirement() {
@@ -755,6 +757,22 @@ public class BukkitRequirementManager implements RequirementManager<Player> {
}, "liquid-depth");
}
private void registerTotemRequirement() {
registerRequirement((args, actions, advanced) -> {
List<String> totems = ListUtils.toList(args);
return context -> {
ActiveTotemList totemList = context.arg(ContextKeys.TOTEMS);
if (totemList != null) {
for (String totem : totems) {
if (totemList.hasTotem(totem)) return true;
}
}
if (advanced) ActionManager.trigger(context, actions);
return false;
};
}, "totem");
}
private void registerLevelRequirement() {
registerRequirement((args, actions, runActions) -> {
MathValue<Player> value = MathValue.auto(args);