Skip to content
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

Jump to bottom

Fix ExprSets conflicting #6123

Merged
merged 7 commits into from Dec 1, 2023
Merged

Fix ExprSets conflicting #6123

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6696ec0
Change branch to dev/patch
TheLimeGlass Oct 15, 2023
46452b5
Also change the expression type
TheLimeGlass Oct 15, 2023
5f67c75
Merge branch 'dev/patch' into fix/expr-sets
TheLimeGlass Oct 15, 2023
59b14b1
Set expression type to PATTERN_MATCHES_EVERYTHING
TheLimeGlass Oct 15, 2023
30e15fb
Merge branch 'dev/patch' into fix/expr-sets
Moderocky Oct 31, 2023
97856b3
Merge branch 'dev/patch' into fix/expr-sets
TheLimeGlass Nov 3, 2023
51e5bc1
Merge branch 'dev/patch' into fix/expr-sets
APickledWalrus Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 17 additions & 19 deletions src/main/java/ch/njol/skript/expressions/ExprSets.java
View file
Open in desktop
Expand Up @@ -18,6 +18,14 @@
*/
package ch.njol.skript.expressions;

import java.util.Iterator;
import java.util.function.Supplier;

import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;

import com.google.common.collect.Lists;

import ch.njol.skript.Skript;
import ch.njol.skript.classes.ClassInfo;
import ch.njol.skript.doc.Description;
Expand All @@ -31,33 +39,26 @@
import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.skript.util.Utils;
import ch.njol.util.Kleenean;
import com.google.common.collect.Lists;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;

import java.util.Iterator;
import java.util.List;
import java.util.function.Supplier;

@Name("Sets")
@Description("Returns a list of all the values of a type; useful for looping.")
@Description("Returns a list of all the values of a type. Useful for looping.")
@Examples({
"loop all attribute types:",
"\tset loop-value attribute of player to 10",
"\tmessage \"Set attribute %loop-value% to 10!\""
"\tset loop-value attribute of player to 10",
"\tmessage \"Set attribute %loop-value% to 10!\""
})
@Since("<i>unknown</i> (before 1.4.2), 2.7 (colors)")
// Class history rename order: LoopItems.class -> ExprItems.class (renamed in 2.3-alpha1) -> ExprSets.class (renamed in 2.7.0)
@Since("1.0 pre-5, 2.7 (classinfo)")
public class ExprSets extends SimpleExpression<Object> {

static {
Skript.registerExpression(ExprSets.class, Object.class, ExpressionType.COMBINED,
"[all [[of] the]|the|every] %*classinfo%"
);
Skript.registerExpression(ExprSets.class, Object.class, ExpressionType.PATTERN_MATCHES_EVERYTHING,
"[all [[of] the]|the|every] %*classinfo%");
}

private ClassInfo<?> classInfo;
@Nullable
private Supplier<? extends Iterator<?>> supplier;
private ClassInfo<?> classInfo;

@Override
@SuppressWarnings("unchecked")
Expand All @@ -78,16 +79,13 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye

@Override
protected Object[] get(Event event) {
assert supplier != null;
Iterator<?> iterator = supplier.get();
List<?> elements = Lists.newArrayList(iterator);
return elements.toArray(new Object[0]);
return Lists.newArrayList(iterator).toArray(new Object[0]);
}

@Override
@Nullable
public Iterator<?> iterator(Event event) {
assert supplier != null;
return supplier.get();
}

Expand Down