Dragonestia/msb3
3
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: updated DialogConditionHandler

Browse Source
This commit is contained in:
Andrey Terentev 2025-03-12 16:19:23 +07:00
parent 37a0ec22fe
commit c83768c366
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/ru/dragonestia/msb3/api/dialog/DialogCondition.java
View File

@ -33,7 +33,7 @@ public class DialogCondition {
} }
try { try {
return condition.get().check(player, dialog, renderer, params); return condition.get().check(player, dialog, button, renderer, params);
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex.getMessage(), ex); log.error(ex.getMessage(), ex);
DebugMessage.send(player, "Во время проверки условия для кнопки произошла ошибка conditionId=%s params=%s".formatted(conditionId, params)); DebugMessage.send(player, "Во время проверки условия для кнопки произошла ошибка conditionId=%s params=%s".formatted(conditionId, params));

3
api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/AlwaysDialogConditionHandler.java
View File

@ -2,6 +2,7 @@ package ru.dragonestia.msb3.api.dialog.condition;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import ru.dragonestia.msb3.api.dialog.Dialog; import ru.dragonestia.msb3.api.dialog.Dialog;
import ru.dragonestia.msb3.api.dialog.DialogButton;
import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer;
import java.util.Map; import java.util.Map;
@ -9,7 +10,7 @@ import java.util.Map;
public class AlwaysDialogConditionHandler implements DialogConditionHandler { public class AlwaysDialogConditionHandler implements DialogConditionHandler {
@Override @Override
public boolean check(Player player, Dialog dialog, DialogueRenderer renderer, Map<String, String> params) { public boolean check(Player player, Dialog dialog, DialogButton button, DialogueRenderer renderer, Map<String, String> params) {
return true; return true;
} }
} }

3
api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/DialogConditionHandler.java
View File

@ -2,11 +2,12 @@ package ru.dragonestia.msb3.api.dialog.condition;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import ru.dragonestia.msb3.api.dialog.Dialog; import ru.dragonestia.msb3.api.dialog.Dialog;
import ru.dragonestia.msb3.api.dialog.DialogButton;
import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer;
import java.util.Map; import java.util.Map;
public interface DialogConditionHandler { public interface DialogConditionHandler {
boolean check(Player player, Dialog dialog, DialogueRenderer renderer, Map<String, String> params); boolean check(Player player, Dialog dialog, DialogButton button, DialogueRenderer renderer, Map<String, String> params);
} }

3
api/src/main/java/ru/dragonestia/msb3/api/dialog/condition/NeverDialogConditionHandler.java
View File

@ -2,6 +2,7 @@ package ru.dragonestia.msb3.api.dialog.condition;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import ru.dragonestia.msb3.api.dialog.Dialog; import ru.dragonestia.msb3.api.dialog.Dialog;
import ru.dragonestia.msb3.api.dialog.DialogButton;
import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer;
import java.util.Map; import java.util.Map;
@ -9,7 +10,7 @@ import java.util.Map;
public class NeverDialogConditionHandler implements DialogConditionHandler { public class NeverDialogConditionHandler implements DialogConditionHandler {
@Override @Override
public boolean check(Player player, Dialog dialog, DialogueRenderer renderer, Map<String, String> params) { public boolean check(Player player, Dialog dialog, DialogButton button, DialogueRenderer renderer, Map<String, String> params) {
return false; return false;
} }
} }