I'm back sort of, cleanup commit

Small cleanup pieces.
Added 'user' placeholder, as per #57
Added safeguard for server not being started, as per #60.

I will try to push a build out sometime soon, since it's been so long and 4.4 doesn't support sponge 7.

Author: Wundero

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'me.rojo8399.placeholderapi'
-version = '4.5'
+version = '4.5.1'
 description = 'An API for all of your placeholders.'
 
 compileJava.options.encoding = 'UTF-8'
@@ -12,5 +12,5 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.21'
     compile 'org.reflections:reflections:0.9.10'
     compile 'ninja.leaping.configurate:configurate-hocon:3.2'
-    compile 'org.spongepowered:spongeapi:7.0.0'
+    compile 'org.spongepowered:spongeapi:7.1.0-SNAPSHOT'
 }

src/main/java/me/rojo8399/placeholderapi/Attach.java

@@ -23,11 +23,11 @@
 	/**
 	 * Whether the placeholder is relational.
 	 */
-	public boolean relational() default false;
+	boolean relational() default false;
 
 	/**
 	 * The placeholder to attach to.
 	 */
-	public String value();
+	String value();
 
 }

src/main/java/me/rojo8399/placeholderapi/ExpansionBuilder.java

@@ -55,7 +55,7 @@ public interface ExpansionBuilder<S, O, V, B extends ExpansionBuilder<S, O, V, B
 	 *            The value return type.
 	 */
 	@FunctionalInterface
-	public static interface ExpansionFunction<S, O, V> {
+	interface ExpansionFunction<S, O, V> {
 		/**
 		 * Parse the placeholder for the provided arguments.
 		 * 
@@ -69,7 +69,7 @@ public static interface ExpansionFunction<S, O, V> {
 		 * @throws Exception
 		 *             Thrown if anyting goes wrong.
 		 */
-		public V parse(S source, O observer, Optional<String> token) throws Exception;
+		V parse(S source, O observer, Optional<String> token) throws Exception;
 	}
 
 	/**
@@ -213,7 +213,7 @@ default B consumeToken(Consumer<Optional<String>> exec) {
 	 *            The description of the expansion.
 	 * @return This builder.
 	 */
-	B description(String desc);
+	B description(String description);
 
 	/**
 	 * Copy settings from the expansion provided in order to modify it.
@@ -240,7 +240,7 @@ default B consumeToken(Consumer<Optional<String>> exec) {
 	 * The provided id must exist on at least one method. Any repeated ids will be
 	 * ignored unless they are of different relational status.
 	 * 
-	 * @param obj
+	 * @param handle
 	 *            The object containing the placeholder method.
 	 * @param id
 	 *            The id of the placeholder method.
@@ -269,7 +269,7 @@ default B consumeToken(Consumer<Optional<String>> exec) {
 	 * Execute a function for the parsing of this expansion. ExpansionFunction is a
 	 * functional interface, meaning the method code may use lambdas.
 	 * 
-	 * @param exec
+	 * @param function
 	 *            The function to execute.
 	 * @return This builder.
 	 */

src/main/java/me/rojo8399/placeholderapi/IExpansion.java

@@ -23,54 +23,54 @@ public interface IExpansion<S, O, V> {
 	 *             Throws this exception in order to protect itself from hard
 	 *             failure.
 	 */
-	public V parse(S source, O observer, Optional<String> token) throws Exception;
+	V parse(S source, O observer, Optional<String> token) throws Exception;
 
 	/**
 	 * @return Whether the expansion is relational.
 	 */
-	public boolean relational();
+	boolean relational();
 
 	/**
 	 * @return The author of the expansion.
 	 */
-	public String author();
+	String author();
 
 	/**
 	 * @return The description of the expansion.
 	 */
-	public String description();
+	String description();
 
 	/**
 	 * Enable this expansion.
 	 */
-	public default void enable() {
+	default void enable() {
 		setEnabled(true);
 	}
 
 	/**
 	 * Disable this expansion.
 	 */
-	public default void disable() {
+	default void disable() {
 		setEnabled(false);
 	}
 
 	/**
 	 * @return Whether the expansion is enabled.
 	 */
-	public boolean isEnabled();
+	boolean isEnabled();
 
 	/**
 	 * Set whether this expansion is enabled.
 	 * 
 	 * @param enabled
 	 *            The state to set the plugin to.
 	 */
-	public void setEnabled(boolean enabled);
+	void setEnabled(boolean enabled);
 
 	/**
 	 * @return The plugin which owns this expansion.
 	 */
-	public Object getPlugin();
+	Object getPlugin();
 
 	/**
 	 * Decide what the user may have meant when inputting a token.
@@ -79,21 +79,21 @@ public default void disable() {
 	 *            The token which was inputted by the user.
 	 * @return A list of possible tokens which are approximate to the input.
 	 */
-	public List<String> getSuggestions(String token);
+	List<String> getSuggestions(String token);
 
 	/**
 	 * @return The id of the expansion.
 	 */
-	public String id();
+	String id();
 
 	/**
 	 * @return The website of the expansion.
 	 */
-	public URL url();
+	URL url();
 
 	/**
 	 * @return The version of the expansion.
 	 */
-	public String version();
+	String version();
 
 }

src/main/java/me/rojo8399/placeholderapi/Listening.java

@@ -23,8 +23,18 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package me.rojo8399.placeholderapi;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * This annotation denotes whether the class should be registered for listeners.
  */
+@Documented
+@Retention(RUNTIME)
+@Target(TYPE)
 public @interface Listening {
 }

src/main/java/me/rojo8399/placeholderapi/Placeholder.java

@@ -42,6 +42,6 @@ of this software and associated documentation files (the "Software"), to deal
 	/**
 	 * @return The id of the placeholder.
 	 */
-	public String id();
+	String id();
 
 }