Skip to content

Verbose asserts for contains #8000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: dev/feature
Choose a base branch
from
Open

Verbose asserts for contains #8000

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fcdbfe
initcommit
Efnilite Jul 3, 2025
fabf4ff
fix
Efnilite Jul 3, 2025
9858402
Merge branch 'dev/feature' into feature/contains-verbose-assert
Efnilite Jul 5, 2025
6ff01ad
Merge branch 'dev/feature' into feature/contains-verbose-assert
Efnilite Jul 7, 2025
260cf49
Merge branch 'dev/feature' into feature/contains-verbose-assert
Burbulinis Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/main/java/ch/njol/skript/conditions/CondContains.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ch.njol.skript.Skript;
import ch.njol.skript.SkriptConfig;
import ch.njol.skript.aliases.ItemType;
import ch.njol.skript.lang.VerboseAssert;
import ch.njol.skript.lang.util.common.AnyContains;
import ch.njol.skript.util.LiteralUtils;
import org.skriptlang.skript.lang.comparator.Relation;
Expand All @@ -24,7 +25,9 @@
import org.jetbrains.annotations.Nullable;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.StringJoiner;

@Name("Contains")
@Description("Checks whether an inventory contains an item, a text contains another piece of text, "
Expand All @@ -34,7 +37,7 @@
"player has 4 flint and 2 iron ingots",
"{list::*} contains 5"})
@Since("1.0")
public class CondContains extends Condition {
public class CondContains extends Condition implements VerboseAssert {

static {
Skript.registerCondition(CondContains.class,
Expand Down Expand Up @@ -157,6 +160,29 @@ public boolean check(Event event) {
};
}

@Override
public String getExpectedMessage(Event event) {
StringJoiner joiner = new StringJoiner(" ");
joiner.add("to");
if (isNegated()) {
joiner.add("not");
}
joiner.add("find %s".formatted(VerboseAssert.getExpressionValue(items, event)));
return joiner.toString();
}

@Override
public String getReceivedMessage(Event event) {
StringJoiner joiner = new StringJoiner(" ");
if (!isNegated()) {
joiner.add("no");
} else {
joiner.add("a");
}
joiner.add("match in %s".formatted(VerboseAssert.getExpressionValue(containers, event)));
return joiner.toString();
}

@Override
public String toString(@Nullable Event e, boolean debug) {
return containers.toString(e, debug) + (isNegated() ? " doesn't contain " : " contains ") + items.toString(e, debug);
Expand Down