Merge branch 'master' of https://github.com/bensku/Skript

Author: bensku

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

@@ -230,8 +230,8 @@ public boolean accept(final @Nullable File f) {
 	/**
 	 * Loads the specified scripts.
 	 * 
-	 * @param configs
-	 * @return Info on the loaded scripts
+	 * @param configs Configs for scripts, loaded by {@link #loadStructures(File[])}
+	 * @return Info on the loaded scripts.
 	 */
 	public final static ScriptInfo loadScripts(final List<Config> configs) {
 		Collections.sort(configs);
@@ -256,8 +256,25 @@ public final static ScriptInfo loadScripts(final List<Config> configs) {
 		return i;
 	}
 
+	/**
+	 * Loads the specified scripts.
+	 * 
+	 * @param configs Configs for scripts, loaded by {@link #loadStructure(File)}
+	 * @return Info on the loaded scripts
+	 */
+	@SuppressWarnings("null")
+	public final static ScriptInfo loadScripts(final Config... configs) {
+		return loadScripts(Arrays.asList(configs));
+	}
+	
+	/**
+	 * Loads one script. Only for internal use, as this doesn't register/update
+	 * event handlers.
+	 * @param config Config for script to be loaded.
+	 * @return Info about script that is loaded
+	 */
 	@SuppressWarnings("unchecked")
-	final static ScriptInfo loadScript(final @Nullable Config config) {
+	private final static ScriptInfo loadScript(final @Nullable Config config) {
 		if (config == null) { // Something bad happened, hopefully got logged to console
 			return new ScriptInfo();
 		}
@@ -457,31 +474,6 @@ public String run(final Matcher m) {
 				numErrors.stop();
 			}
 
-//			if (SkriptConfig.enableScriptCaching.value() && cache != null) {
-//				if (numErrors.getCount() > 0) {
-//					ObjectOutputStream out = null;
-//					try {
-//						cache.getParentFile().mkdirs();
-//						out = new ObjectOutputStream(new FileOutputStream(cache));
-//						out.writeLong(f.lastModified());
-//						out.writeObject(script);
-//					} catch (final NotSerializableException e) {
-//						Skript.exception(e, "Cannot cache " + f.getName());
-//						if (out != null)
-//							out.close();
-//						cache.delete();
-//					} catch (final IOException e) {
-//						Skript.warning("Cannot cache " + f.getName() + ": " + e.getLocalizedMessage());
-//						if (out != null)
-//							out.close();
-//						cache.delete();
-//					} finally {
-//						if (out != null)
-//							out.close();
-//					}
-//				}
-//			}
-			
 			return new ScriptInfo(1, numTriggers, numCommands, numFunctions);
 		} catch (final Exception e) {
 			Skript.exception(e, "Could not load " + config.getFileName());
@@ -492,7 +484,7 @@ public String run(final Matcher m) {
 	}
 
 	/**
-	 * Loads the specified scripts.
+	 * Loads structures of specified scripts.
 	 * 
 	 * @param files
 	 */
@@ -505,7 +497,6 @@ public final static List<Config> loadStructures(final File[] files) {
 			loadedFiles.add(loadStructure(f));
 		}
 
-		SkriptEventHandler.registerBukkitEvents();
 		return loadedFiles;
 	}
 
@@ -538,24 +529,13 @@ public final static List<Config> loadStructures(final File directory) {
 	public final static @Nullable Config loadStructure(final File f) {
 		try {
 			final Config config = new Config(f, true, false, ":");
-			if (SkriptConfig.keepConfigsLoaded.value())
-				SkriptConfig.configs.add(config);
-			int numTriggers = 0;
-			int numCommands = 0;
-			int numFunctions = 0;
-			
-			currentAliases.clear();
-			currentOptions.clear();
-			currentScript = config;
-			
-//			final SerializedScript script = new SerializedScript();
 
 			final CountingLogHandler numErrors = SkriptLogger.startLogHandler(new CountingLogHandler(SkriptLogger.SEVERE));
 
 			try {
 				for (final Node cnode : config.getMainNode()) {
 					if (!(cnode instanceof SectionNode)) {
-						Skript.error("invalid line - all code has to be put into triggers");
+						// Don't spit error yet, we are only pre-parsing...
 						continue;
 					}
 
@@ -573,9 +553,6 @@ public final static List<Config> loadStructures(final File directory) {
 						setCurrentEvent("function", FunctionEvent.class);
 
 						final Signature<?> func = Functions.loadSignature(config.getFileName(), node);
-						if (func != null) {
-							numFunctions++;
-						}
 
 						deleteCurrentEvent();
 

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

@@ -184,7 +184,7 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 						reloading(sender, "script", f.getName());
 						ScriptLoader.unloadScript(f);
 						Config config = ScriptLoader.loadStructure(f);
-						ScriptLoader.loadScript(config);
+						ScriptLoader.loadScripts(config);
 						reloaded(sender, r, "script", f.getName());
 					} else {
 						reloading(sender, "scripts in folder", f.getName());
@@ -232,7 +232,7 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 
 						info(sender, "enable.single.enabling", f.getName());
 						Config config = ScriptLoader.loadStructure(f);
-						ScriptLoader.loadScript(config);
+						ScriptLoader.loadScripts(config);
 						if (r.numErrors() == 0) {
 							info(sender, "enable.single.enabled", f.getName());
 						} else {

src/main/java/ch/njol/skript/conditions/CondIsEmpty.java

@@ -46,8 +46,13 @@ public class CondIsEmpty extends PropertyCondition<Object> {
 	public boolean check(final Object o) {
 		if (o instanceof String)
 			return ((String) o).isEmpty();
-		if (o instanceof Inventory)
-			return !((Inventory) o).iterator().hasNext();
+		if (o instanceof Inventory) {
+			for (ItemStack s : ((Inventory) o).getContents()) {
+				if (s != null && s.getType() != Material.AIR)
+					return false; // There is an item here!
+			}
+			return true;
+		}
 		if (o instanceof Slot) {
 			final Slot s = (Slot) o;
 			final ItemStack i = s.getItem();

src/main/java/ch/njol/skript/effects/EffMessage.java

@@ -21,6 +21,7 @@
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
+import java.util.List;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.Conversable;
@@ -37,7 +38,9 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.VariableString;
+import ch.njol.skript.util.chat.BungeeConverter;
 import ch.njol.skript.util.chat.ChatMessages;
+import ch.njol.skript.util.chat.MessageComponent;
 import ch.njol.util.Kleenean;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.chat.ComponentSerializer;
@@ -79,10 +82,10 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 	protected void execute(final Event e) {
 		assert messages != null;
 		if (canSendRaw) {
-			// Sadly this is essentially serializing, then deserializing, then serializing again...
-			// TODO measure performance, potentially improve it
 			assert messages != null;
-			BaseComponent[] components = ComponentSerializer.parse(((VariableString) messages).toChatString(e));
+			List<MessageComponent> componentList = ((VariableString) messages).getMessageComponents(e);
+			@SuppressWarnings("null") // Most certainly safe, but I guess not...
+			BaseComponent[] components = BungeeConverter.convert(componentList.toArray(new MessageComponent[componentList.size()]));
 			for (final CommandSender s : recipients.getArray(e)) {
 				if (s instanceof Player) { // Use JSON chat
 					((Player) s).spigot().sendMessage(components);

src/main/java/ch/njol/skript/effects/EffPlaySound.java

@@ -0,0 +1,99 @@
+/*
+ *   This file is part of Skript.
+ *
+ *  Skript is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Skript is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * Copyright 2011-2016 Peter Güttinger and contributors
+ * 
+ */
+
+package ch.njol.skript.effects;
+
+import org.bukkit.Location;
+import org.bukkit.SoundCategory;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.eclipse.jdt.annotation.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Play Sound")
+@Description("Plays a sound at given location for everyone or just for given players. Playing sounds from resource packs is supported.")
+@Examples("")
+@Since("2.2-dev28")
+public class EffPlaySound extends Effect {
+	
+	static {
+		Skript.registerEffect(EffPlaySound.class, "play sound %string% [with volume %number%] [(and|with) pitch %number%] at %location% [for %players%]");
+	}
+	
+	@SuppressWarnings("null")
+	private Expression<String> sound;
+	@Nullable
+	private Expression<Number> volume;
+	@Nullable
+	private Expression<Number> pitch;
+	
+	@SuppressWarnings("null")
+	private Expression<Location> location;
+	@Nullable
+	private Expression<Player> players;
+	
+	@SuppressWarnings({"unchecked", "null"})
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		sound = (Expression<String>) exprs[0];
+		volume = (Expression<Number>) exprs[1];
+		pitch = (Expression<Number>) exprs[2];
+		location = (Expression<Location>) exprs[3];
+		players = (Expression<Player>) exprs[4];
+		
+		return true;
+	}
+
+	@SuppressWarnings("null")
+	@Override
+	protected void execute(Event e) {
+		Location l = location.getSingle(e);
+		
+		String s = sound.getSingle(e);
+		float vol = volume != null ? volume.getSingle(e).floatValue() : 0;
+		float pi = pitch != null ? pitch.getSingle(e).floatValue() : 0;
+		
+		if (players != null) {
+			for (Player p : players.getAll(e)) {
+				p.playSound(l, s, SoundCategory.MASTER, vol, pi);
+			}
+		} else {
+			l.getWorld().playSound(l, s, vol, pi);
+		}
+	}
+	
+	@Override
+	public String toString(@Nullable Event e, boolean debug) {
+		if (e != null)
+			return "play sound " + sound.getSingle(e);
+		return "play sound";
+	}
+	
+}

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

@@ -38,6 +38,7 @@
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityPortalEnterEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityResurrectEvent;
 import org.bukkit.event.entity.EntityTameEvent;
 import org.bukkit.event.entity.EntityToggleGlideEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
@@ -397,9 +398,17 @@ public class SimpleEvents {
 				.examples("")
 				.since("2.2-dev21");
 		Skript.registerEvent("Slime Split", SimpleEvent.class, SlimeSplitEvent.class, "slime split")
-				.description("Called when slime splits.")
+				.description("Called when a slime splits. Usually this happens when a big slime dies.")
 				.examples("")
 				.since("2.2-dev26");
-		
+		if (Skript.classExists("org.bukkit.event.entity.EntityResurrectEvent")) {
+			Skript.registerEvent("Resurrect Attempt", SimpleEvent.class, EntityResurrectEvent.class, "[entity] resurrect attempt")
+					.description("Called when an entity dies, always. If they are not holding a totem, this is calcelled - you can, however, uncancel it.")
+					.examples("on resurrect attempt:",
+							"	entity is player",
+							"	entity has permission \"admin.undying\"",
+							"	uncancel the event")
+					.since("2.2-dev28");
+		}
 	}
 }