Attempting to use annotations

Hope this works.

Author: Wundero

README.md

@@ -1,4 +1,4 @@
-# PlaceholderAPI [![Build Status](https://travis-ci.org/rojo8399/PlaceholderAPI.svg?branch=master)](https://travis-ci.org/rojo8399/PlaceholderAPI) [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
+# PlaceholderAPI [![Build Status](https://travis-ci.org/rojo8399/PlaceholderAPI.svg?branch=annotations)](https://travis-ci.org/rojo8399/PlaceholderAPI) [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 [![forthebadge](http://forthebadge.com/images/badges/made-with-crayons.svg)](http://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com)
 
 If you were sent here from another plugin, simply download this plugin and install it in your mods folder. After the first start of this plugin, you will need to enable the default expansions in the config file to be able to use those placeholders. Example if you want Player placeholders, open the config and set <code>Player</code> to <code>True</code>. Now you can use %player_name% as a placeholder. This same method applies for every available expansion.

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'me.rojo8399.placeholderapi'
-version = '3.12'
+version = '4.0'
 description = 'An API for all of your placeholders.'
 
 compileJava.options.encoding = 'UTF-8'

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

@@ -27,12 +27,17 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.spongepowered.api.Game;
+import org.spongepowered.api.Sponge;
 import org.spongepowered.api.asset.Asset;
 import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandResult;
@@ -64,15 +69,10 @@ of this software and associated documentation files (the "Software"), to deal
 import me.rojo8399.placeholderapi.configs.Config;
 import me.rojo8399.placeholderapi.configs.JavascriptManager;
 import me.rojo8399.placeholderapi.configs.Messages;
-import me.rojo8399.placeholderapi.expansions.CurrencyExpansion;
-import me.rojo8399.placeholderapi.expansions.DateTimeExpansion;
-import me.rojo8399.placeholderapi.expansions.Expansion;
-import me.rojo8399.placeholderapi.expansions.JavascriptExpansion;
-import me.rojo8399.placeholderapi.expansions.PlayerExpansion;
-import me.rojo8399.placeholderapi.expansions.RankExpansion;
-import me.rojo8399.placeholderapi.expansions.ServerExpansion;
-import me.rojo8399.placeholderapi.expansions.SoundExpansion;
-import me.rojo8399.placeholderapi.expansions.StatisticExpansion;
+import me.rojo8399.placeholderapi.placeholder.Expansion;
+import me.rojo8399.placeholderapi.placeholder.ExpansionBuilder;
+import me.rojo8399.placeholderapi.placeholder.Store;
+import me.rojo8399.placeholderapi.placeholder.impl.Defaults;
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.commented.CommentedConfigurationNode;
 import ninja.leaping.configurate.hocon.HoconConfigurationLoader;
@@ -85,7 +85,7 @@ public class PlaceholderAPIPlugin {
 
 	public static final String PLUGIN_ID = "placeholderapi";
 	public static final String PLUGIN_NAME = "PlaceholderAPI";
-	public static final String PLUGIN_VERSION = "3.12";
+	public static final String PLUGIN_VERSION = "4.0";
 	private static PlaceholderAPIPlugin instance;
 
 	@Inject
@@ -116,9 +116,14 @@ public class PlaceholderAPIPlugin {
 	private ConfigurationNode msgRoot;
 	private Messages msgs;
 	private ConfigurationLoader<CommentedConfigurationNode> msgloader;
+	private DateTimeFormatter formatter;
 
 	private PlaceholderService s;
 
+	public DateTimeFormatter formatter() {
+		return formatter;
+	}
+
 	public ConfigurationNode getRootConfig() {
 		return root;
 	}
@@ -201,6 +206,7 @@ public void onGamePreInitializationEvent(GamePreInitializationEvent event)
 			}
 		}
 		Messages.init(msgs);
+		this.formatter = DateTimeFormatter.ofPattern(config.dateFormat);
 	}
 
 	@Listener
@@ -236,36 +242,119 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
 
 	}
 
+	private Set<Object> alreadyRegistered = new HashSet<>();
+
+	public void registerListeners(Object object) {
+		if (alreadyRegistered.contains(object)) {
+			return;
+		}
+		Sponge.getEventManager().registerListeners(this, object);
+		alreadyRegistered.add(object);
+	}
+
+	public void unregisterListeners(Object object) {
+		Sponge.getEventManager().unregisterListeners(object);
+		if (alreadyRegistered.contains(object)) {
+			alreadyRegistered.remove(object);
+		}
+	}
+
 	@Listener
 	public void onGameStartingServerEvent(GameStartingServerEvent event) {
 		registerPlaceholders();
 		metrics.addCustomChart(new Metrics.SimpleBarChart("placeholders") {
 			@Override
 			public HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap) {
-				Set<Expansion> exp = s.getExpansions();
-				if (exp.isEmpty()) {
+				List<String> rids = Store.get().ids(true);
+				List<String> ids = Store.get().ids(false);
+				if (rids.isEmpty() && ids.isEmpty()) {
 					HashMap<String, Integer> out = new HashMap<>();
 					out.put("none", 1);
 					return out;
 				}
-				return (HashMap<String, Integer>) exp.stream()
-						.collect(Collectors.toMap(Expansion::getIdentifier, e -> 1));
+				List<String> exp = new ArrayList<>();
+				rids.forEach(e -> exp.add("rel_" + e));
+				ids.forEach(exp::add);
+				return (HashMap<String, Integer>) exp.stream().collect(Collectors.toMap(e -> e, e -> 1));
 			}
 		});
 	}
 
 	public void registerPlaceholders() {
-		s.registerPlaceholder(new JavascriptExpansion(jsm));
-		s.registerPlaceholder(new PlayerExpansion());
-		s.registerPlaceholder(new ServerExpansion());
-		s.registerPlaceholder(new SoundExpansion());
-		s.registerPlaceholder(new RankExpansion());
-		if (game.getServiceManager().provide(EconomyService.class).isPresent()) {
-			s.registerPlaceholder(
-					new CurrencyExpansion(game.getServiceManager().provideUnchecked(EconomyService.class)));
+		EconomyService ex = game.getServiceManager().provide(EconomyService.class).orElse(null);
+		Defaults handle = new Defaults(ex, this.jsm);
+		ExpansionBuilder.loadAll(handle, this).stream().map(builder -> {
+			switch (builder.getId()) {
+			case "player": {
+				if (builder.isRelational()) {
+					return builder.description(Messages.get().placeholder.relplayerdesc.value)
+							.tokens("distance", "audible", "visible", "distance_x", "distance_y", "distance_z")
+							.version("2.0");
+				} else {
+					return builder.description(Messages.get().placeholder.playerdesc.value)
+							.tokens(null, "prefix", "suffix", "option_[option]", "permission_[permission]", "name",
+									"displayname", "uuid", "can_fly", "world", "ping", "language", "flying", "health",
+									"max_health", "food", "saturation", "gamemode", "x", "y", "z", "direction", "exp",
+									"exp_total", "exp_to_next", "level", "first_join", "fly_speed", "max_air",
+									"remaining_air", "item_in_main_hand", "item_in_off_hand", "walk_speed",
+									"time_played", "time_played_ticks", "time_played_seconds", "time_played_minutes",
+									"time_played_hours", "time_played_days")
+							.version("2.0");
+				}
+			}
+			case "rank": {
+				if (builder.isRelational()) {
+					return builder.description(Messages.get().placeholder.relrankdesc.value)
+							.tokens("greater_than", "less_than").version("1.0");
+				} else {
+					return builder.description(Messages.get().placeholder.rankdesc.value)
+							.tokens(null, "prefix", "suffix", "name", "permission_[permission]", "option_[option]")
+							.version("2.0");
+				}
+			}
+			case "javascript":
+				return builder.description(Messages.get().placeholder.jsdesc.value).tokens(jsm.getScriptNames())
+						.reloadFunction(e -> {
+							try {
+								jsm.reloadScripts();
+							} catch (Exception exc) {
+								getLogger().warn("Error reloading JavaScript placeholders!");
+								exc.printStackTrace();
+								return false;
+							}
+							e.setTokens(jsm.getScriptNames());
+							return true;
+						}).version("2.0");
+			case "economy":
+				return builder.description(Messages.get().placeholder.curdesc.value)
+						.tokens("", "[currency]", "balance", "balance_[currency]", "bal_format_[currency]",
+								"bal_format", "display", "display_[currency]", "plural_display_[currency]",
+								"symbol_[currency]", "plural_display", "symbol")
+						.version("2.0");
+			case "server":
+				return builder
+						.description(Messages.get().placeholder.serverdesc.value).tokens("unique_players", "online",
+								"max_players", "motd", "cores", "tps", "ram_used", "ram_free", "ram_total", "ram_max")
+						.version("2.0");
+			case "sound":
+				return builder.description(Messages.get().placeholder.sounddesc.value)
+						.tokens("[sound]-[volume]-[pitch]").version("2.0");
+			case "statistic":
+				return builder.description(Messages.get().placeholder.statdesc.value).version("2.0");
+			case "time":
+				return builder.description(Messages.get().placeholder.timedesc.value).tokens("").version("2.0");
+			}
+			return builder;
+		}).forEach(t -> {
+			try {
+				t.author("Wundero").plugin(this).buildAndRegister();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		});
+		if (ex == null) {
+			Store.get().get("economy", false).ifPresent(Expansion::disable);
 		}
-		s.registerPlaceholder(new DateTimeExpansion());
-		s.registerPlaceholder(new StatisticExpansion());
 	}
 
 	@Listener