reduce priority of EffTree and modernize a bit

Author: sovdeeth

src/main/java/org/skriptlang/skript/bukkit/misc/MiscModule.java

@@ -2,6 +2,7 @@
 
 import org.skriptlang.skript.addon.AddonModule;
 import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.bukkit.misc.effects.EffTree;
 import org.skriptlang.skript.bukkit.misc.expressions.ExprWithYawPitch;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 
@@ -11,6 +12,7 @@ public class MiscModule implements AddonModule {
 	public void load(SkriptAddon addon) {
 		SyntaxRegistry registry = addon.syntaxRegistry();
 		ExprWithYawPitch.register(registry);
+		EffTree.register(registry);
 	}
 
 	@Override

…java/ch/njol/skript/effects/EffTree.java …/skript/bukkit/misc/effects/EffTree.javasrc/main/java/ch/njol/skript/effects/EffTree.java renamed to src/main/java/org/skriptlang/skript/bukkit/misc/effects/EffTree.java src/main/java/ch/njol/skript/effects/EffTree.java renamed to src/main/java/org/skriptlang/skript/bukkit/misc/effects/EffTree.java

@@ -1,10 +1,5 @@
-package ch.njol.skript.effects;
+package org.skriptlang.skript.bukkit.misc.effects;
 
-import org.bukkit.Location;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Example;
 import ch.njol.skript.doc.Name;
@@ -15,50 +10,56 @@
 import ch.njol.skript.util.Direction;
 import ch.njol.skript.util.StructureType;
 import ch.njol.util.Kleenean;
+import org.bukkit.Location;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxRegistry;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Tree")
 @Description({"Creates a tree.",
 		"This may require that there is enough space above the given location and that the block below is dirt/grass, but it is possible that the tree will just grow anyways, possibly replacing every block in its path."})
 @Example("grow a tall redwood tree above the clicked block")
 @Since("1.0")
 public class EffTree extends Effect {
-	
-	static {
-		Skript.registerEffect(EffTree.class,
-				"(grow|create|generate) tree [of type %structuretype%] %directions% %locations%",
-				"(grow|create|generate) %structuretype% %directions% %locations%");
+
+	public static void register(SyntaxRegistry registry) {
+		registry.register(
+				SyntaxRegistry.EFFECT,
+				SyntaxInfo.builder(EffTree.class)
+					.addPattern("(grow|create|generate) tree [of type %structuretype%] %directions% %locations%")
+					.addPattern("(grow|create|generate) %structuretype% %directions% %locations%")
+					.supplier(EffTree::new)
+					.priority(SyntaxInfo.PATTERN_MATCHES_EVERYTHING)
+					.build()
+		);
 	}
-	
-	@SuppressWarnings("null")
+
 	private Expression<Location> blocks;
-	@SuppressWarnings("null")
 	private Expression<StructureType> type;
-	
-	@SuppressWarnings({"unchecked", "null"})
+
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
 		type = (Expression<StructureType>) exprs[0];
 		blocks = Direction.combine((Expression<? extends Direction>) exprs[1], (Expression<? extends Location>) exprs[2]);
 		return true;
 	}
 
 	@Override
-	public void execute(final Event e) {
-		final StructureType type = this.type.getSingle(e);
+	public void execute(Event event) {
+		StructureType type = this.type.getSingle(event);
 		if (type == null)
 			return;
-		for (final Location l : blocks.getArray(e)) {
-			assert l != null : blocks;
-			type.grow(l.getBlock());
+		for (Location location : blocks.getArray(event)) {
+			assert location != null : blocks;
+			type.grow(location.getBlock());
 		}
 	}
 
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "grow tree of type " + type.toString(e, debug) + " " + blocks.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		return "grow tree of type " + type.toString(event, debug) + " " + blocks.toString(event, debug);
 	}
 
 }