From bbd9984ac1f4f3bdc70ef2b69f6e27449d048ef0 Mon Sep 17 00:00:00 2001
From: Alastair Hawkes <alastair.hawkes@gmail.com>
Date: Tue, 1 Mar 2016 13:59:48 +0000
Subject: [PATCH] Added 1.9 support

---
 .../AdvancedPortalsPlugin.java                |  8 +++---
 src/com/sekwah/advancedportals/Listeners.java |  4 +--
 .../compat/bukkit/v1_9_R1.java                | 27 +++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java

diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
index 3e5d5131..87fe1f15 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
@@ -65,11 +65,11 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
 			this.customPrefix = config.getConfig().getString("CustomPrefix");
 		}
 
-        ConfigAccessor portalconfig = new ConfigAccessor(this, "Portals.yml");
-        portalconfig.saveDefaultConfig();
+        ConfigAccessor portalConfig = new ConfigAccessor(this, "Portals.yml");
+        portalConfig.saveDefaultConfig();
         
-        ConfigAccessor destinationconfig = new ConfigAccessor(this, "Destinations.yml");
-        destinationconfig.saveDefaultConfig();
+        ConfigAccessor destinationConfig = new ConfigAccessor(this, "Destinations.yml");
+        destinationConfig.saveDefaultConfig();
 		
         
         // Loads the portal and destination editors
diff --git a/src/com/sekwah/advancedportals/Listeners.java b/src/com/sekwah/advancedportals/Listeners.java
index 2d094bf9..b14246e5 100644
--- a/src/com/sekwah/advancedportals/Listeners.java
+++ b/src/com/sekwah/advancedportals/Listeners.java
@@ -111,12 +111,12 @@ public class Listeners implements Listener {
 								boolean warped = Portal.activate(player, portal);
 								if(PortalMessagesDisplay == 1 && warped){
 									player.sendMessage("");
-									player.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] You have been warped to \u00A7e" + Portal.getDestination(portal.portalName).replaceAll("_", " ") + "\u00A7.");
+									player.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] You have been warped to \u00A7e" + portal.destiation.replaceAll("_", " ") + "\u00A7.");
 									player.sendMessage("");
 								}
 								else if(PortalMessagesDisplay == 2 && warped){
 									ConfigAccessor config = new ConfigAccessor(plugin, "Portals.yml");
-									plugin.nmsAccess.sendActionBarMessage("{text:\"\u00A7aYou have been warped to \u00A7e" + config.getConfig().getString(portal.portalName + ".destination").replaceAll("_", " ") + "\u00A7a.\"}", player);
+									plugin.nmsAccess.sendActionBarMessage("{text:\"\u00A7aYou have been warped to \u00A7e" + portal.destiation.replaceAll("_", " ") + "\u00A7a.\"}", player);
 									/**plugin.nmsAccess.sendActionBarMessage("[{text:\"You have warped to \",color:green},{text:\"" + config.getConfig().getString(portal.portalName + ".destination").replaceAll("_", " ")
 									 + "\",color:yellow},{\"text\":\".\",color:green}]", player);*/
 								}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java
new file mode 100644
index 00000000..e9c4bf11
--- /dev/null
+++ b/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java
@@ -0,0 +1,27 @@
+package com.sekwah.advancedportals.compat.bukkit;
+
+import net.minecraft.server.v1_9_R1.IChatBaseComponent;
+import net.minecraft.server.v1_9_R1.PacketPlayOutChat;
+import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+
+public class v1_9_R1 implements NMS {
+	
+	@Override
+	public void sendRawMessage(String rawMessage, Player player) {
+		IChatBaseComponent comp = IChatBaseComponent.ChatSerializer.a(rawMessage);
+		// "json message", position(0: chat (chat box), 1: system message (chat box), 2: above action bar)
+		PacketPlayOutChat packet = new PacketPlayOutChat(comp, (byte) 1);
+		((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
+	}
+
+
+	@Override
+	public void sendActionBarMessage(String rawMessage, Player player) {
+		IChatBaseComponent comp = IChatBaseComponent.ChatSerializer.a(rawMessage);
+		// "json message", position(0: chat (chat box), 1: system message (chat box), 2: above action bar)
+		PacketPlayOutChat packet = new PacketPlayOutChat(comp, (byte) 2);
+		((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
+	}
+}