New release soon (TODO fix some bugs)

Author: bensku

src/main/java/ch/njol/skript/SkriptCommand.java

@@ -78,6 +78,9 @@ public class SkriptCommand implements CommandExecutor {
 //					.add("set", "Creates a new variable or changes an existing one")
 //					.add("delete", "Deletes a variable")
 //					.add("find", "Find variables")
+			).add(new CommandHelp("timings", Color.DARK_RED)
+					.add("start")
+					.add("stop")
 			).add("help");
 
 	private final static ArgsMessage m_reloading = new ArgsMessage(NODE + ".reload.reloading");

src/main/java/ch/njol/skript/SkriptEventHandler.java

@@ -160,6 +160,7 @@ static void check(final Event e) {
 	@Nullable
 	private static Timing timing;
 
+	@SuppressWarnings("null")
 	public static void logEventStart(final Event e) {
 		if (Timings.enabled())
 			timing = Timings.of(e.getEventName());

src/main/java/ch/njol/skript/lang/function/FunctionReference.java

@@ -45,6 +45,7 @@ public class FunctionReference<T> {
 
 	final String functionName;
 
+	@Nullable
 	private Function<? extends T> function;
 
 	private boolean singleUberParam;
@@ -59,7 +60,6 @@ public class FunctionReference<T> {
 	@Nullable
 	public final File script;
 
-	@SuppressWarnings("null")
 	public FunctionReference(final String functionName, final @Nullable Node node, @Nullable final File script, @Nullable final Class<? extends T>[] returnTypes, final Expression<?>[] params) {
 		this.functionName = functionName;
 		this.node = node;
@@ -78,16 +78,6 @@ public boolean validateFunction(final boolean first) {
 			else
 				Skript.error("The function '" + functionName + "' was deleted or renamed, but is still used in other script(s)."
 						+ " These will continue to use the old version of the function until Skript restarts.");
-			
-			function = (Function<? extends T>) new Function<Object>("empty_placeholder", new Parameter<?>[0], null, true) {
-
-				@Override
-				@Nullable
-				public Object[] execute(FunctionEvent e, Object[][] params) {
-					return null;
-				}
-				
-			};
 			return false;
 		}
 		if (newFunc == function)
@@ -176,8 +166,12 @@ public Object[] execute(FunctionEvent e, Object[][] params) {
 		return true;
 	}
 
+	@SuppressWarnings("null")
 	@Nullable
 	protected T[] execute(final Event e) {
+		if (function == null)
+			return null;
+		
 		final Object[][] params = new Object[singleUberParam ? 1 : parameters.length][];
 		if (singleUberParam && parameters.length > 1) {
 			final ArrayList<Object> l = new ArrayList<Object>();

src/main/java/ch/njol/skript/timings/TimingReporter.java

@@ -21,12 +21,19 @@
 
 package ch.njol.skript.timings;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.localization.Language;
 
@@ -35,6 +42,7 @@
  */
 public class TimingReporter {
 
+	@SuppressWarnings("null")
 	public static String getReport() {
 		Map<Object,Timing> timings = Timings.timings;
 		Map<String,Long> triggers = new HashMap<String,Long>();
@@ -77,4 +85,23 @@ public static String getReport() {
 
 		return sb.toString();
 	}
+	
+	public static void saveToFile(String str) {
+		File folder = Skript.getInstance().getDataFolder();
+		File file = new File(folder + "/timings-" + DateFormat.getTimeInstance().format(System.currentTimeMillis()) + ".log");
+		if (!file.exists())
+			try {
+				file.createNewFile();
+			} catch (IOException e1) {
+				e1.printStackTrace();
+				return;
+			}
+		try {
+			PrintWriter out = new PrintWriter(file);
+			out.write(str);
+			out.close();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace(); // Can't happen...
+		}
+	}
 }

src/main/resources/lang/english.lang

@@ -1030,5 +1030,7 @@ io exceptions:
 # -- Timings Reports --
 timings:
 	start: "Skript timings for %s seconds:"
+	events: "Event times: used time (percent of timing length)
+	triggers: "Trigger times: used time (percent of timing length)