Timings update done!

Author: bensku

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

@@ -21,6 +21,8 @@
 import ch.njol.skript.localization.PluralizingArgsMessage;
 import ch.njol.skript.log.RedirectingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.timings.TimingReporter;
+import ch.njol.skript.timings.Timings;
 import ch.njol.skript.util.Color;
 import ch.njol.skript.util.ExceptionUtils;
 import ch.njol.skript.util.FileUtils;
@@ -402,6 +404,16 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 				}
 			} else if (args[0].equalsIgnoreCase("help")) {
 				skriptCommandHelp.showHelp(sender);
+			} else if (args[0].equalsIgnoreCase("timings")) {
+				if (args[1].equalsIgnoreCase("start")) {
+					Timings.enable();
+					Skript.adminBroadcast(Language.get("timings.start message"));
+				} else if (args[1].equalsIgnoreCase("stop")) {
+					Timings.disable();
+					TimingReporter.saveToFile(TimingReporter.getReport());
+					Timings.clear();
+					Skript.adminBroadcast(Language.get("timings.stop message"));
+				}
 			}
 		} catch (final Exception e) {
 			Skript.exception(e, "Exception occurred in Skript's main command", "Used command: /" + label + " " + StringUtils.join(args, " "));

src/main/java/ch/njol/skript/events/EvtBlock.java

@@ -133,15 +133,6 @@ public boolean check(final @Nullable ItemType t) {
 					return t != null && Relation.EQUAL.is(DefaultComparators.entityItemComparator.compare(d, t));
 				}
 			});
-		} else if (e instanceof HangingEvent) {
-			Entity entity = ((HangingEvent) e).getEntity();
-			if (entity instanceof Painting) {
-				id = Material.PAINTING.getId();
-				durability = 0;
-			} else if (entity instanceof ItemFrame) {
-				id = Material.ITEM_FRAME.getId();
-				durability = 0;
-			}
 		} else {
 			assert false;
 			return false;

src/main/java/ch/njol/skript/expressions/base/WrapperExpression.java

@@ -27,6 +27,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Converter;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;

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

@@ -65,22 +65,23 @@ public static String getReport() {
 			if (events.containsKey(key))
 				evtTime = events.get(key);
 			evtTime += val.getEventTime();
+			events.put(key, evtTime);
 		}
 
 		long length = Timings.disableTime - Timings.enableTime;
 		StringBuilder sb = new StringBuilder();
-		sb.append(String.format(Language.get("timings.start"), length / 1000000000));
+		sb.append(String.format(Language.get("timings.start"), length / (float) 1000000000) + "\n");
 
-		sb.append(Language.get("timings.triggers"));
+		sb.append(Language.get("timings.triggers") + "\n");
 		for (Entry<String,Long> trigger : triggers.entrySet()) {
-			float percent = trigger.getValue() / length * 100;
-			sb.append(trigger.getKey() + ": " + (trigger.getValue() / 1000000) + "ms (" + percent + "%)");
+			float percent = trigger.getValue() / (float) length * 100;
+			sb.append(trigger.getKey() + ": " + (trigger.getValue() / (float) 1000000) + "ms (" + percent + "%)\n");
 		}
 
-		sb.append(Language.get("timings.events"));
+		sb.append(Language.get("timings.events") + "\n");
 		for (Entry<Object,Long> event : events.entrySet()) {
-			float percent = event.getValue() / length * 100;
-			sb.append(event.getKey() + ": " + (event.getValue() / 1000000) + "ms (" + percent + "%)");
+			float percent = event.getValue() / (float) length * 100;
+			sb.append(event.getKey() + ": " + (event.getValue() / (float) 1000000) + "ms (" + percent + "%)\n");
 		}
 
 		return sb.toString();

src/main/resources/lang/english.lang

@@ -1029,8 +1029,9 @@ io exceptions:
 	accessdeniedexception: Access denied for %s
 # -- 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)
-
+	start: Skript timings for %s seconds:
+	events: Event times: used time (percents)
+	triggers: Trigger times: used time (percents)
+	start message: Skript timings started
+	stop message: Skript timings stopped and results parsed