Removed breaking expansion changes

This will be for version 3.12, the last update before annotation +
builder rewrite.

Author: Wundero

build.gradle

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

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

@@ -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 = "4.0";
+	public static final String PLUGIN_VERSION = "3.12";
 	private static PlaceholderAPIPlugin instance;
 
 	@Inject

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

@@ -250,7 +250,7 @@ public String getVersion() {
 			}
 
 			@Override
-			public Object onValueRequest(Player player, Optional<String> token) {
+			public Text onPlaceholderRequest(Player player, Optional<String> token) {
 				return function.apply(player, token);
 			}
 

src/main/java/me/rojo8399/placeholderapi/expansions/Expansion.java

@@ -33,6 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.item.inventory.ItemStack;
+import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.serializer.TextSerializers;
 
@@ -115,6 +116,9 @@ public default <T> Optional<T> onValueRequest(Player player, Optional<String> to
 			if (val instanceof Text) {
 				return TypeUtils.tryOptional(() -> expected.cast(val));
 			} else {
+				if (val instanceof ItemStackSnapshot) {
+					return TypeUtils.tryOptional(() -> expected.cast(TextUtils.ofItem((ItemStackSnapshot) val)));
+				}
 				if (val instanceof ItemStack) {
 					return TypeUtils.tryOptional(() -> expected.cast(TextUtils.ofItem((ItemStack) val)));
 				}
@@ -149,16 +153,32 @@ public default <T> Optional<T> onValueRequest(Player player, Optional<String> to
 	 * 
 	 * @return the value, as an object
 	 */
-	public Object onValueRequest(Player player, Optional<String> token);
+	public default Object onValueRequest(Player player, Optional<String> token) {
+		Text v = onPlaceholderRequest(player, token);
+		boolean rets = v.getClickAction().isPresent() || v.getHoverAction().isPresent()
+				|| v.getShiftClickAction().isPresent();
+		String p = v.toPlain().toLowerCase().trim();
+		try {
+			return Integer.parseInt(p);
+		} catch (Exception e) {
+			try {
+				return Double.parseDouble(p);
+			} catch (Exception e2) {
+				try {
+					return Boolean.valueOf(p);
+				} catch (Exception e3) {
+				}
+			}
+		}
+		return rets ? v : p;
+	}
 
 	/**
 	 * Parse the token for the player
 	 * 
 	 * @return the result of the parse as a text.
 	 */
-	public default Text onPlaceholderRequest(Player player, Optional<String> token) {
-		return onValueRequest(player, token, Text.class).orElse(null);
-	}
+	public Text onPlaceholderRequest(Player player, Optional<String> token);
 
 	/**
 	 * Parse the token for the player

src/main/java/me/rojo8399/placeholderapi/expansions/PlayerExpansion.java

@@ -318,4 +318,12 @@ public List<String> getSupportedRelationalTokens() {
 		return Arrays.asList("distance", "distance_x", "distance_y", "distance_z", "visible", "audible");
 	}
 
+	/* (non-Javadoc)
+	 * @see me.rojo8399.placeholderapi.expansions.Expansion#onPlaceholderRequest(org.spongepowered.api.entity.living.player.Player, java.util.Optional)
+	 */
+	@Override
+	public Text onPlaceholderRequest(Player player, Optional<String> token) {
+		return onValueRequest(player, token, Text.class).orElse(null);
+	}
+
 }

src/main/java/me/rojo8399/placeholderapi/expansions/RankExpansion.java

@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.service.permission.Subject;
+import org.spongepowered.api.text.Text;
 
 import me.rojo8399.placeholderapi.PlaceholderAPIPlugin;
 import me.rojo8399.placeholderapi.configs.Messages;
@@ -132,6 +133,18 @@ public Object onValueRequest(Player player, Optional<String> token) {
 		return null;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * me.rojo8399.placeholderapi.expansions.Expansion#onPlaceholderRequest(org.
+	 * spongepowered.api.entity.living.player.Player, java.util.Optional)
+	 */
+	@Override
+	public Text onPlaceholderRequest(Player player, Optional<String> token) {
+		return onValueRequest(player, token, Text.class).orElse(null);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 

src/main/java/me/rojo8399/placeholderapi/expansions/SoundExpansion.java

@@ -88,6 +88,18 @@ public Object onValueRequest(Player p, Optional<String> identifier) {
 
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * me.rojo8399.placeholderapi.expansions.Expansion#onPlaceholderRequest(org.
+	 * spongepowered.api.entity.living.player.Player, java.util.Optional)
+	 */
+	@Override
+	public Text onPlaceholderRequest(Player player, Optional<String> token) {
+		return onValueRequest(player, token, Text.class).orElse(null);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 

src/main/java/me/rojo8399/placeholderapi/utils/TextUtils.java

@@ -36,6 +36,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import org.spongepowered.api.data.key.Keys;
 import org.spongepowered.api.item.inventory.ItemStack;
+import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.TextTemplate;
 import org.spongepowered.api.text.action.TextActions;
@@ -96,6 +97,13 @@ public static Text ofItem(@Nullable ItemStack item) {
 		}
 		return Text.of(TextActions.showItem(item.createSnapshot()), item.getOrElse(Keys.DISPLAY_NAME, Text.of(item)));
 	}
+	
+	public static Text ofItem(@Nullable ItemStackSnapshot item) {
+		if(item==null) {
+			return Text.EMPTY;
+		}
+		return Text.of(TextActions.showItem(item), item.getOrElse(Keys.DISPLAY_NAME, Text.of(item)));
+	}
 
 	private static Text fix(Text to, TextFormat l) {
 		return to.toBuilder().format(l.merge(to.getFormat())).build();