Version 1.1

Author: ConnorLinfoot

README.md

@@ -1,4 +1,6 @@
 TitleAPI
 =====================
 
-LInk To Spigot Page Soon
+Spigot Page/More Info: http://www.spigotmc.org/resources/titleapi.1325/
+
+Release Notes: http://www.spigotmc.org/resources/titleapi.1325/history

src/com/connorlinfoot/titleapi/TitleAPI.java

@@ -2,8 +2,11 @@
 
 import net.minecraft.server.v1_7_R4.ChatSerializer;
 import net.minecraft.server.v1_7_R4.IChatBaseComponent;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.entity.Player;
@@ -13,12 +16,15 @@
 
 public class TitleAPI extends JavaPlugin {
 
-    public static void sendFullTitle(Player player, Integer fadeIn, Integer stay, Integer fadeOut, String title, String subtitle) {
+    public static void sendTitle(Player player, Integer fadeIn, Integer stay, Integer fadeOut, String title, String subtitle) {
         CraftPlayer craftPlayer = (CraftPlayer) player;
         if (craftPlayer.getHandle().playerConnection.networkManager.getVersion() != 47)
             return; // If using 1.8, allow method to run
 
+        if (title == null) title = "";
         title = ChatColor.translateAlternateColorCodes('&', title);
+
+        if (subtitle == null) subtitle = "";
         subtitle = ChatColor.translateAlternateColorCodes('&', subtitle);
 
         IChatBaseComponent title2;
@@ -35,34 +41,65 @@ public static void sendFullTitle(Player player, Integer fadeIn, Integer stay, In
             craftPlayer.getHandle().playerConnection.sendPacket(new ProtocolInjector.PacketTitle(ProtocolInjector.PacketTitle.Action.SUBTITLE, subtitle2));
     }
 
-    public static void sendTitle(Player player, Integer fadeIn, Integer stay, Integer fadeOut, String title) {
-        CraftPlayer craftPlayer = (CraftPlayer) player;
-        if (craftPlayer.getHandle().playerConnection.networkManager.getVersion() != 47)
-            return; // If using 1.8, allow method to run
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String string, String[] args) {
+        if (args.length < 6) {
+            sender.sendMessage(ChatColor.RED + "Usage: /title <player> title|subtitle <fadeIn> <stay> <fadeOut> <text>");
+            sender.sendMessage(ChatColor.RED + "Note: fadeIn, stay &, fadeOut require to be a number, works in ticks; 20 = 1 second");
+            return false;
+        }
 
-        title = ChatColor.translateAlternateColorCodes('&', title);
+        if (Bukkit.getPlayer(args[0]) == null) {
+            sender.sendMessage(ChatColor.RED + "Player not found");
+            return false;
+        }
 
-        IChatBaseComponent title2;
-        title2 = ChatSerializer.a(TextConverter.convert(title));
+        Player player = Bukkit.getPlayer(args[0]);
 
-        craftPlayer.getHandle().playerConnection.sendPacket(new ProtocolInjector.PacketTitle(ProtocolInjector.PacketTitle.Action.TIMES, fadeIn, stay, fadeOut));
-        if (title != null)
-            craftPlayer.getHandle().playerConnection.sendPacket(new ProtocolInjector.PacketTitle(ProtocolInjector.PacketTitle.Action.TITLE, title2));
-    }
+        if (!args[1].equalsIgnoreCase("title") && !args[1].equalsIgnoreCase("subtitle")) {
+            sender.sendMessage(ChatColor.RED + "Invalid argument: " + args[1]);
+            return false;
+        }
 
-    public static void sendSubtitle(Player player, Integer fadeIn, Integer stay, Integer fadeOut, String subtitle) {
-        CraftPlayer craftPlayer = (CraftPlayer) player;
-        if (craftPlayer.getHandle().playerConnection.networkManager.getVersion() != 47)
-            return; // If using 1.8, allow method to run
+        if (!isInteger(args[2])) {
+            sender.sendMessage(ChatColor.RED + "Not a number: " + args[2]);
+            return false;
+        }
 
-        subtitle = ChatColor.translateAlternateColorCodes('&', subtitle);
+        if (!isInteger(args[3])) {
+            sender.sendMessage(ChatColor.RED + "Not a number: " + args[3]);
+            return false;
+        }
 
-        IChatBaseComponent subtitle2;
-        subtitle2 = ChatSerializer.a(TextConverter.convert(subtitle));
+        if (!isInteger(args[4])) {
+            sender.sendMessage(ChatColor.RED + "Not a number: " + args[4]);
+            return false;
+        }
 
-        craftPlayer.getHandle().playerConnection.sendPacket(new ProtocolInjector.PacketTitle(ProtocolInjector.PacketTitle.Action.TIMES, fadeIn, stay, fadeOut));
-        if (subtitle != null)
-            craftPlayer.getHandle().playerConnection.sendPacket(new ProtocolInjector.PacketTitle(ProtocolInjector.PacketTitle.Action.SUBTITLE, subtitle2));
+        StringBuilder builder = new StringBuilder();
+        for (String value : args) {
+            builder.append(value).append(" ");
+        }
+        String message = builder.toString();
+        message = message.replace(args[0] + " ", "");
+        message = message.replace(args[1] + " ", "");
+        message = message.replace(args[2] + " ", "");
+        message = message.replace(args[3] + " ", "");
+        message = message.replace(args[4] + " ", "");
+
+        if (args[1].equalsIgnoreCase("title")) {
+            sendTitle(player, Integer.parseInt(args[2]), Integer.parseInt(args[3]), Integer.parseInt(args[4]), message, null);
+            sender.sendMessage(ChatColor.GREEN + "Title sent");
+            return true;
+        }
+
+        if (args[1].equalsIgnoreCase("subtitle")) {
+            sendTitle(player, Integer.parseInt(args[2]), Integer.parseInt(args[3]), Integer.parseInt(args[4]), null, message);
+            sender.sendMessage(ChatColor.GREEN + "Title sent");
+            return true;
+        }
+
+        return false;
     }
 
     public void onEnable() {

src/plugin.yml

@@ -1,7 +1,7 @@
 name: TitleAPI
 description: TitleAPI
 main: com.connorlinfoot.titleapi.TitleAPI
-version: 1.0
+version: 1.1
 commands:
   title:
     description: Minecraft 1.8 Title Feature