Minor bug fixes I found when testing with Gluon.

Author: Wundero

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

@@ -62,10 +62,7 @@ public interface PlaceholderService {
 	 * 
 	 * @return the expansion builder.
 	 */
-	public default ExpansionBuilder<?, ?, ?, ?> load(Object handle, String id, Object plugin) {
-		return builder().from(handle, id, plugin);
-	}
-
+	public ExpansionBuilder<?, ?, ?, ?> load(Object handle, String id, Object plugin);
 	/**
 	 * Create new ExpansionBuilders for all methods annotated with
 	 * '@Placeholder' in an object.

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

@@ -139,8 +139,6 @@ public void saveConfig() {
 	public void onGamePreInitializationEvent(GamePreInitializationEvent event)
 			throws IOException, ObjectMappingException {
 		instance = this;
-		// Provide default implementation
-		game.getServiceManager().setProvider(this, PlaceholderService.class, s = PlaceholderServiceImpl.get());
 		plugin = game.getPluginManager().getPlugin(PLUGIN_ID).get();
 		Asset conf = game.getAssetManager().getAsset(this, "config.conf").get();
 		jsm = new JavascriptManager(new File(path.toFile().getParentFile(), "javascript"));
@@ -207,6 +205,8 @@ public void onGamePreInitializationEvent(GamePreInitializationEvent event)
 		}
 		Messages.init(msgs);
 		this.formatter = DateTimeFormatter.ofPattern(config.dateFormat);
+		// Provide default implementation
+		game.getServiceManager().setProvider(this, PlaceholderService.class, s = PlaceholderServiceImpl.get());
 	}
 
 	@Listener

src/main/java/me/rojo8399/placeholderapi/impl/PlaceholderServiceImpl.java

@@ -274,4 +274,12 @@ public boolean registerExpansion(Expansion<?, ?, ?> expansion) {
 		return ExpansionBuilderImpl.loadAll(handle, plugin);
 	}
 
+	/* (non-Javadoc)
+	 * @see me.rojo8399.placeholderapi.PlaceholderService#load(java.lang.Object, java.lang.String, java.lang.Object)
+	 */
+	@Override
+	public ExpansionBuilder<?, ?, ?, ?> load(Object handle, String id, Object plugin) {
+		return ExpansionBuilderImpl.unverified().from(handle, id, plugin);
+	}
+
 }

src/main/java/me/rojo8399/placeholderapi/impl/commands/InfoCommand.java

@@ -120,7 +120,7 @@ private static Text format(Expansion<?, ?, ?> e, CommandSource src) {
 		Text url = e.url() == null ? Text.EMPTY
 				: Text.of(Text.NEW_LINE, TextColors.BLUE, TextActions.openUrl(e.url()), e.url().toString());
 		String d = e.description();
-		Text desc = d.isEmpty() || d == null ? Text.EMPTY : Text.of(Text.NEW_LINE, TextColors.AQUA, e.description());
+		Text desc = d == null || d.isEmpty() ? Text.EMPTY : Text.of(Text.NEW_LINE, TextColors.AQUA, e.description());
 		Text reload = Text.of(Text.NEW_LINE, Messages.get().placeholder.clickReload.t(), " ", reload(e.id()));
 		Text support = supportedTokens.isEmpty() ? Text.EMPTY
 				: Text.of(Text.NEW_LINE, Messages.get().placeholder.supportedPlaceholders.t(),

src/main/java/me/rojo8399/placeholderapi/impl/placeholder/Expansion.java

@@ -347,7 +347,8 @@ void setConfig(Object o) {
 	 * Popoulate configuration object. Override only if necessary.
 	 */
 	protected void populateConfigObject() {
-		if (configObject == null) {
+		if (configObject == null || PlaceholderAPIPlugin.getInstance() == null
+				|| PlaceholderAPIPlugin.getInstance().getRootConfig() == null) {
 			return;
 		}
 		ConfigurationNode node = PlaceholderAPIPlugin.getInstance().getRootConfig().getNode("expansions",

src/main/java/me/rojo8399/placeholderapi/impl/placeholder/ExpansionBuilderImpl.java

@@ -45,7 +45,6 @@ of this software and associated documentation files (the "Software"), to deal
 
 import me.rojo8399.placeholderapi.ExpansionBuilder;
 import me.rojo8399.placeholderapi.Placeholder;
-import me.rojo8399.placeholderapi.impl.utils.TypeUtils;
 
 /**
  * @author Wundero
@@ -142,7 +141,7 @@ public static <S, O, V> ExpansionBuilderImpl<S, O, V> builder() {
 		return new ExpansionBuilderImpl<S, O, V>(true);
 	}
 
-	private static <S, O, V> ExpansionBuilderImpl<S, O, V> unverified() {
+	public static <S, O, V> ExpansionBuilderImpl<S, O, V> unverified() {
 		return new ExpansionBuilderImpl<S, O, V>(false);
 	}
 
@@ -512,13 +511,13 @@ public void unregisterListeners() {
 	@SuppressWarnings({ "rawtypes" })
 	private ExpansionBuilderImpl frommethod(Object o, Method m, Object p) {
 		Expansion<?, ?, ?> exp = Store.get().createForMethod(m, o, p);
-		return from(this, exp);
+		return from(this.id(exp.id()).plugin(p), exp);
 	}
 
 	@SuppressWarnings("unchecked")
 	private static <S, O, V> ExpansionBuilderImpl<S, O, V> from(ExpansionBuilderImpl<?, ?, ?> builder,
 			final Expansion<S, O, V> exp) {
-		if (!(builder instanceof ExpansionBuilderImpl) || !exp.verify()) {
+		if (!exp.verify()) {
 			return (ExpansionBuilderImpl<S, O, V>) builder;
 		}
 		ExpansionBuilderImpl<?, ?, ?> b = (ExpansionBuilderImpl<?, ?, ?>) builder;
@@ -566,6 +565,7 @@ private static <S, O, V> ExpansionBuilderImpl<S, O, V> from(ExpansionBuilderImpl
 	 *            The plugin holding the expansion.
 	 * @return This builder.
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public ExpansionBuilderImpl<S, O, V> from(Object obj, String id, Object plugin) {
 		Class<?> clazz = obj.getClass();
@@ -578,10 +578,7 @@ public ExpansionBuilderImpl<S, O, V> from(Object obj, String id, Object plugin)
 			}
 			togglerel = true;
 		}
-		frommethod(obj, m, plugin);
-		this.id(id);
-		this.relational = TypeUtils.xor(togglerel, relational);
-		return plugin(plugin);
+		return frommethod(obj, m, plugin);
 	}
 
 	/**