re-add type in register() and Script#name()

Author: sovdeeth

src/main/java/org/skriptlang/skript/common/expressions/PropExprCustomName.java

@@ -38,7 +38,7 @@
 public class PropExprCustomName extends PropertyBaseExpression<ExpressionPropertyHandler<?,?>> {
 
 	static {
-		register(PropExprCustomName.class, "(display|nick|chat|custom)[ ]name[s]");
+		register(PropExprCustomName.class, "(display|nick|chat|custom)[ ]name[s]", "objects");
 	}
 
 	@Override

src/main/java/org/skriptlang/skript/common/expressions/PropExprName.java

@@ -45,7 +45,7 @@
 public class PropExprName extends PropertyBaseExpression<ExpressionPropertyHandler<?,?>> {
 
 	static {
-		register(PropExprName.class , "name[s]");
+		register(PropExprName.class , "name[s]", "objects");
 	}
 
 	@Override

src/main/java/org/skriptlang/skript/common/types/ScriptClassInfo.java

@@ -92,7 +92,7 @@ public boolean init(Expression<?> parentExpression, ParserInstance parser) {
 		@Override
 		public String convert(final Script script) {
 			if (useResolvedName)
-				return script.getConfig().name();
+				return script.name();
 			return script.nameAndPath();
 		}
 

src/main/java/org/skriptlang/skript/lang/properties/PropertyBaseExpression.java

@@ -37,8 +37,8 @@
  */
 public abstract class PropertyBaseExpression<Handler extends ExpressionPropertyHandler<?,?>> extends SimpleExpression<Object> {
 
-	protected static void register(Class<? extends PropertyBaseExpression<?>> expressionClass, String property) {
-		Skript.registerExpression(expressionClass, Object.class, ExpressionType.PROPERTY, PropertyExpression.getPatterns(property, "objects"));
+	protected static void register(Class<? extends PropertyBaseExpression<?>> expressionClass, String property, String types) {
+		Skript.registerExpression(expressionClass, Object.class, ExpressionType.PROPERTY, PropertyExpression.getPatterns(property, types));
 	}
 
 	protected Expression<?> expr;

src/main/java/org/skriptlang/skript/lang/script/Script.java

@@ -138,6 +138,13 @@ public <Value extends ScriptData> Value getData(Class<? extends Value> dataType,
 		return (Value) scriptData.computeIfAbsent(dataType, clazz -> mapper.get());
 	}
 
+	/**
+	 * @return The name of this script (excluding path and file extensions)
+	 */
+	public String name() {
+		return config.name();
+	}
+
 	/**
 	 * This is added to support the legacy script name syntax.
 	 * Script names used to be printed including their directory but excluding their file extension.