Requested Changes, except async sorting

SkriptLang · Jun 3, 2024 · d42b8a1 · d42b8a1
1 parent ba922bc
commit d42b8a1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/ch/njol/skript/effects/EffSort.java b/src/main/java/ch/njol/skript/effects/EffSort.java
@@ -39,6 +39,7 @@
 import ch.njol.util.Pair;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -77,7 +78,7 @@ public class EffSort extends Effect implements InputSource {
 
 	@Nullable
 	private Object currentValue;
-	@Nullable
+	@UnknownNullability
 	private String currentIndex;
 
 	@Override
@@ -153,8 +154,7 @@ public boolean hasIndices() {
 	}
 
 	@Override
-	public String getCurrentIndex() {
-		assert currentIndex != null;
+	public @UnknownNullability String getCurrentIndex() {
 		return currentIndex;
 	}
 

diff --git a/src/main/java/ch/njol/skript/expressions/ExprInput.java b/src/main/java/ch/njol/skript/expressions/ExprInput.java
@@ -31,7 +31,8 @@
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.registrations.DefaultClasses;
+import ch.njol.skript.util.ClassInfoReference;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
@@ -99,14 +100,19 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			return false;
 		switch (matchedPattern) {
 			case 1:
-				specifiedType = ((Literal<ClassInfo<?>>) exprs[0]).getSingle();
+				ClassInfoReference classInfoReference = ((Literal<ClassInfoReference>) ClassInfoReference.wrap((Expression<ClassInfo<?>>) exprs[0])).getSingle();
+				if (classInfoReference.isPlural().isTrue()) {
+					Skript.error("An input can only be a single value! Please use a singular type (for example: players input -> player input).");
+					return false;
+				}
+				specifiedType = classInfoReference.getClassInfo();
 				break;
 			case 2:
 				if (!inputSource.hasIndices()) {
 					Skript.error("You cannot use 'input index' on lists without indices!");
 					return false;
 				}
-				specifiedType = Classes.getExactClassInfo(String.class);
+				specifiedType = DefaultClasses.STRING;
 				isIndex = true;
 				break;
 			default:

diff --git a/src/main/java/ch/njol/skript/lang/InputSource.java b/src/main/java/ch/njol/skript/lang/InputSource.java
@@ -21,6 +21,7 @@
 import ch.njol.skript.expressions.ExprInput;
 import ch.njol.skript.lang.parser.ParserInstance;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 import java.util.Set;
 
@@ -58,7 +59,7 @@ default boolean hasIndices() {
 	 *
 	 * @return The current value's index.
 	 */
-	default String getCurrentIndex() {
+	default @UnknownNullability String getCurrentIndex() {
 		return null;
 	}