diff --git a/craftbukkit/CraftBukkit Versions.txt b/craftbukkit/CraftBukkit Versions.txt
deleted file mode 100644
index 80ba684..0000000
--- a/craftbukkit/CraftBukkit Versions.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Currently needed craftbukkit versions to compile:
-
-1.8
-1.8.3
-1.8.8
-1.9
-1.9.4
-1.10.2
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ee974e1..5cb3fd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,29 +3,6 @@
com.sekwah.advancedportals
Advanced-Portals
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- copy-dependencies
- prepare-package
-
- copy-dependencies
-
-
- ${project.build.directory}/classes/lib
- false
- false
- true
-
-
-
-
-
-
-
${basedir}/src/
@@ -61,65 +38,5 @@
1.10.2-R0.1-SNAPSHOT
provided
-
\ No newline at end of file
diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
index 46617d4..8f230eb 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
@@ -238,7 +238,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
sender.sendMessage("");
sender.sendMessage("\u00A7c[\u00A77AdvancedPortals\u00A7c] Are you sure you would like to remove the portal \u00A7e" + args[2] + "\u00A7c?");
sender.sendMessage("");
- plugin.nmsAccess.sendRawMessage("{\"text\":\" \",\"extra\":[{\"text\":\"\u00A7e[Yes]\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Confirm removing this portal\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/portal remove " + args[2] + "\"}}, " +
+ plugin.compat.sendRawMessage("{\"text\":\" \",\"extra\":[{\"text\":\"\u00A7e[Yes]\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Confirm removing this portal\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/portal remove " + args[2] + "\"}}, " +
"{\"text\":\" \"},{\"text\":\"\u00A7e[No]\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Cancel removing this portal\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/portal edit " + args[2] + "\"}}]}", player);
sender.sendMessage("");
}
@@ -363,7 +363,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] Still designing in game help page :(");
sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] For now please use the wiki http://bit.ly/portals-help");
} else if (args[0].toLowerCase().equals("bukkitpage")) {
- sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] Bukkit page: http://bit.ly/adv-portals!");
+ sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] CraftBukkit page: http://bit.ly/adv-portals!");
} else if (args[0].toLowerCase().equals("helppage")) {
sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] Help page: http://bit.ly/portals-help!");
} else if (args[0].toLowerCase().equals("show")) {
@@ -475,7 +475,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
Player player = (Player) sender;
- plugin.nmsAccess.sendRawMessage("{\"text\":\"\u00A7aFunctions\u00A7e: \",\"extra\":[{\"text\":\"\u00A7eRemove\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Remove the selected portal\"},\"clickEvent\":{\"action\":\"clickEvent\",\"value\":\"/portal gui remove " + portalName + "\"}}"
+ plugin.compat.sendRawMessage("{\"text\":\"\u00A7aFunctions\u00A7e: \",\"extra\":[{\"text\":\"\u00A7eRemove\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Remove the selected portal\"},\"clickEvent\":{\"action\":\"clickEvent\",\"value\":\"/portal gui remove " + portalName + "\"}}"
+ ",{\"text\":\" \"},{\"text\":\"\u00A7eShow\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Show the selected portal\"},\"clickEvent\":{\"action\":\"clickEvent\",\"value\":\"/portal show " + portalName + "\"}}"
+ ",{\"text\":\" \"},{\"text\":\"\u00A7eRename\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Change the name of the portal\"},\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/portal rename \"}}"
+ ",{\"text\":\" \"},{\"text\":\"\u00A7eActivate\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Teleport to the set destination\n(same as entering the portal)\"},\"clickEvent\":{\"action\":\"clickEvent\",\"value\":\"/warp " + destination + "\"}}]}", player);
diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
index b80110b..9b74b2b 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
@@ -1,7 +1,7 @@
package com.sekwah.advancedportals;
import com.sekwah.advancedportals.DataCollector.DataCollector;
-import com.sekwah.advancedportals.compat.bukkit.NMS;
+import com.sekwah.advancedportals.compat.CraftBukkit;
import com.sekwah.advancedportals.destinations.Destination;
import com.sekwah.advancedportals.effects.WarpEffects;
import com.sekwah.advancedportals.listeners.*;
@@ -10,18 +10,17 @@ import com.sekwah.advancedportals.portals.Portal;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
public class AdvancedPortalsPlugin extends JavaPlugin {
- public NMS nmsAccess;
-
public boolean useCustomPrefix = false;
public String customPrefix = "\u00A7a[\u00A7eAdvancedPortals\u00A7a]";
public String customPrefixFail = "\u00A7c[\u00A77AdvancedPortals\u00A7c]";
+ public CraftBukkit compat = null;
+
public void onEnable() {
try {
@@ -36,63 +35,60 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
String version = packageSplit[packageSplit.length - 1];
try {
- Class> nmsClass = Class.forName("com.sekwah.advancedportals.compat.bukkit." + version);
- if (NMS.class.isAssignableFrom(nmsClass)) {
- this.nmsAccess = (NMS) nmsClass.getConstructor().newInstance();
+
+ this.compat = new CraftBukkit(version);
+
+ ConfigAccessor portalConfig = new ConfigAccessor(this, "portals.yml");
+ portalConfig.saveDefaultConfig();
+
+ ConfigAccessor destinationConfig = new ConfigAccessor(this, "destinations.yml");
+ destinationConfig.saveDefaultConfig();
+
+ new Assets(this);
+
+ // Opens a channel that messages bungeeCord
+ this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+
+ // Loads the portal and destination editors
+ new Portal(this);
+ new Destination(this);
+
+ new DataCollector(this);
+
+ // These register the commands
+ new AdvancedPortalsCommand(this);
+ new DestinationCommand(this);
+ new WarpCommand(this);
+
+ new WarpEffects(this);
- ConfigAccessor portalConfig = new ConfigAccessor(this, "portals.yml");
- portalConfig.saveDefaultConfig();
+ // These register the listeners
+ new Listeners(this);
- ConfigAccessor destinationConfig = new ConfigAccessor(this, "destinations.yml");
- destinationConfig.saveDefaultConfig();
+ new FlowStopper(this);
+ new PortalProtect(this);
+ new PortalPlacer(this);
- new Assets(this);
+ Selection.LoadData(this);
- // Opens a channel that messages bungeeCord
- this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+ DataCollector.setupMetrics();
- // Loads the portal and destination editors
- new Portal(this);
- new Destination(this);
+ this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+ this.getServer().getMessenger().registerIncomingPluginChannel(this, "BungeeCord", new BungeeListener(this));
- new DataCollector(this);
-
- // These register the commands
- new AdvancedPortalsCommand(this);
- new DestinationCommand(this);
- new WarpCommand(this);
-
- new WarpEffects(this);
+ this.getServer().getConsoleSender().sendMessage("\u00A7aAdvanced portals have been successfully enabled!");
- // These register the listeners
- new Listeners(this);
-
- new FlowStopper(this);
- new PortalProtect(this);
- new PortalPlacer(this);
-
- Selection.LoadData(this);
-
- DataCollector.setupMetrics();
-
- this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
- this.getServer().getMessenger().registerIncomingPluginChannel(this, "BungeeCord", new BungeeListener(this));
-
- this.getServer().getConsoleSender().sendMessage("\u00A7aAdvanced portals have been successfully enabled!");
-
-
- } else {
- this.getLogger().warning("Something went wrong, please notify the author and tell them this version v:" + version);
- this.setEnabled(false);
- }
} catch (ClassNotFoundException e) {
- this.getLogger().warning("This version of craftbukkit is not yet supported, please notify the author and give version v:" + version);
+ this.getLogger().warning("This version of craftbukkit is not yet supported, please notify sekwah and tell him about this version v:" + version);
this.setEnabled(false);
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException |
- NoSuchMethodException | SecurityException e) {
+ } catch (IllegalArgumentException |
+ NoSuchFieldException | SecurityException e) {
e.printStackTrace();
+ this.getLogger().warning("Something went wrong, please notify sekwah and tell him about this version v:" + version);
+ this.getLogger().warning("Along with the above stacktrace");
+ this.setEnabled(false);
}
saveDefaultConfig();
diff --git a/src/com/sekwah/advancedportals/DestinationCommand.java b/src/com/sekwah/advancedportals/DestinationCommand.java
index 22e7253..6ebb05a 100644
--- a/src/com/sekwah/advancedportals/DestinationCommand.java
+++ b/src/com/sekwah/advancedportals/DestinationCommand.java
@@ -77,7 +77,7 @@ public class DestinationCommand implements CommandExecutor, TabCompleter {
sender.sendMessage("");
} else if (PortalMessagesDisplay == 2) {
ConfigAccessor config = new ConfigAccessor(plugin, "destinations.yml");
- plugin.nmsAccess.sendActionBarMessage("{\"text\":\"\u00A7aYou have warped to \u00A7e" + args[1].replaceAll("_", " ") + "\u00A7a.\"}", (Player) sender);
+ plugin.compat.sendActionBarMessage("{\"text\":\"\u00A7aYou have warped to \u00A7e" + args[1].replaceAll("_", " ") + "\u00A7a.\"}", (Player) sender);
/**plugin.nmsAccess.sendActionBarMessage("[{text:\"You have warped to \",color:green},{text:\"" + config.getConfig().getString(Portal.Portals[portalId].portalName + ".destination").replaceAll("_", " ")
+ "\",color:yellow},{\"text\":\".\",color:green}]", player);*/
}
diff --git a/src/com/sekwah/advancedportals/WarpCommand.java b/src/com/sekwah/advancedportals/WarpCommand.java
index 6823a76..5ec9d62 100644
--- a/src/com/sekwah/advancedportals/WarpCommand.java
+++ b/src/com/sekwah/advancedportals/WarpCommand.java
@@ -36,7 +36,7 @@ public class WarpCommand implements CommandExecutor, TabCompleter {
sender.sendMessage("");
} else if (DestinationCommand.PortalMessagesDisplay == 2) {
ConfigAccessor config = new ConfigAccessor(plugin, "destinations.yml");
- plugin.nmsAccess.sendActionBarMessage("{\"text\":\"\u00A7aYou have warped to \u00A7e" + args[0].replaceAll("_", " ") + "\u00A7a.\"}", (Player) sender);
+ plugin.compat.sendActionBarMessage("{\"text\":\"\u00A7aYou have warped to \u00A7e" + args[0].replaceAll("_", " ") + "\u00A7a.\"}", (Player) sender);
/**plugin.nmsAccess.sendActionBarMessage("[{text:\"You have warped to \",color:green},{text:\"" + config.getConfig().getString(Portal.Portals[portalId].portalName + ".destination").replaceAll("_", " ")
+ "\",color:yellow},{\"text\":\".\",color:green}]", player);*/
}
diff --git a/src/com/sekwah/advancedportals/compat/CraftBukkit.java b/src/com/sekwah/advancedportals/compat/CraftBukkit.java
new file mode 100644
index 0000000..481b464
--- /dev/null
+++ b/src/com/sekwah/advancedportals/compat/CraftBukkit.java
@@ -0,0 +1,69 @@
+package com.sekwah.advancedportals.compat;
+
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.Field;
+
+/**
+ * Created by on 02/08/2016.
+ *
+ * I don't think there will be any others supported other than bukkit but if there are its not just the compat that will
+ * need to change.
+ *
+ * @author sekwah41
+ */
+public class CraftBukkit {
+
+ private final String craftBukkitVer;
+
+ private final String craftBukkitPackage;
+
+ private final String minecraftPackage;
+
+
+ // Classes so it doesnt keep fetching them.
+ private Class> chatBaseComponent;
+ private Class> chatSerializer;
+
+ public CraftBukkit(String craftBukkitVer) throws ClassNotFoundException, NoSuchFieldException {
+ this.craftBukkitVer = craftBukkitVer;
+ this.craftBukkitPackage = "org.bukkit.craftbukkit." + craftBukkitVer;
+ this.minecraftPackage = "net.minecraft.server." + craftBukkitVer;
+
+
+ this.setupCompat();
+ }
+
+ private void setupCompat() throws ClassNotFoundException, NoSuchFieldException {
+ this.chatBaseComponent = Class.forName(minecraftPackage + "IChatBaseComponent");
+ Field modfield = chatBaseComponent.getDeclaredField("modifiers");
+ chatBaseComponent.getDeclaredClasses();
+
+ }
+
+ // Convert to reflection
+ public void sendRawMessage(String rawMessage, Player player) {
+
+ try {
+
+ Class> nmsClass = Class.forName(minecraftPackage + "IChatBaseComponent");
+
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+
+ /*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);*/
+ }
+
+ 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);*/
+ }
+
+
+}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/NMS.java b/src/com/sekwah/advancedportals/compat/bukkit/NMS.java
deleted file mode 100644
index b0eedfe..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/NMS.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.sekwah.advancedportals.compat.bukkit;
-
-import org.bukkit.entity.Player;
-
-public interface NMS {
-
- void sendRawMessage(String rawMessage, Player player);
-
- void sendActionBarMessage(String rawMessage, Player player);
-}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java
deleted file mode 100644
index 9df7f3e..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sekwah.advancedportals.compat.bukkit;
-
-import net.minecraft.server.v1_10_R1.IChatBaseComponent;
-import net.minecraft.server.v1_10_R1.PacketPlayOutChat;
-import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-
-public class v1_10_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);
- }
-}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R1.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R1.java
deleted file mode 100644
index aa9809e..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.sekwah.advancedportals.compat.bukkit;
-
-import net.minecraft.server.v1_8_R1.ChatSerializer;
-import net.minecraft.server.v1_8_R1.IChatBaseComponent;
-import net.minecraft.server.v1_8_R1.PacketPlayOutChat;
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-
-public class v1_8_R1 implements NMS {
-
- @Override
- public void sendRawMessage(String rawMessage, Player player) {
- IChatBaseComponent comp = 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 = 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);
- }
-}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R2.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R2.java
deleted file mode 100644
index 46e477f..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sekwah.advancedportals.compat.bukkit;
-
-import net.minecraft.server.v1_8_R2.IChatBaseComponent;
-import net.minecraft.server.v1_8_R2.PacketPlayOutChat;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-
-public class v1_8_R2 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);
- }
-}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R3.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R3.java
deleted file mode 100644
index ca75728..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/v1_8_R3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sekwah.advancedportals.compat.bukkit;
-
-import net.minecraft.server.v1_8_R3.IChatBaseComponent;
-import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-
-public class v1_8_R3 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);
- }
-}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java
deleted file mode 100644
index f9614c0..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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);
- }
-}
diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R2.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R2.java
deleted file mode 100644
index 2e4b573..0000000
--- a/src/com/sekwah/advancedportals/compat/bukkit/v1_9_R2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sekwah.advancedportals.compat.bukkit;
-
-import net.minecraft.server.v1_9_R2.IChatBaseComponent;
-import net.minecraft.server.v1_9_R2.PacketPlayOutChat;
-import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-
-public class v1_9_R2 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);
- }
-}
diff --git a/src/com/sekwah/advancedportals/listeners/Listeners.java b/src/com/sekwah/advancedportals/listeners/Listeners.java
index 7a59408..d153d43 100644
--- a/src/com/sekwah/advancedportals/listeners/Listeners.java
+++ b/src/com/sekwah/advancedportals/listeners/Listeners.java
@@ -113,7 +113,7 @@ public class Listeners implements Listener {
player.sendMessage("");
} else if (PortalMessagesDisplay == 2 && warped) {
ConfigAccessor config = new ConfigAccessor(plugin, "inPortals.yml");
- plugin.nmsAccess.sendActionBarMessage("{\"text\":\"\u00A7aYou have been warped to \u00A7e" + inPortal.destiation.replaceAll("_", " ") + "\u00A7a.\"}", player);
+ plugin.compat.sendActionBarMessage("{\"text\":\"\u00A7aYou have been warped to \u00A7e" + inPortal.destiation.replaceAll("_", " ") + "\u00A7a.\"}", player);
}
if (!warped) {
player.teleport(fromloc, PlayerTeleportEvent.TeleportCause.PLUGIN);
diff --git a/src/com/sekwah/advancedportals/metrics/Metrics.java b/src/com/sekwah/advancedportals/metrics/Metrics.java
index 76c017d..55c11f0 100644
--- a/src/com/sekwah/advancedportals/metrics/Metrics.java
+++ b/src/com/sekwah/advancedportals/metrics/Metrics.java
@@ -436,9 +436,9 @@ public class Metrics {
boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
String pluginVersion = description.getVersion();
String serverVersion = Bukkit.getVersion();
- // make sure that the older versions of bukkit are added first in project imports, so it can be compiled
+ // make sure that the older versions of CraftBukkit are added first in project imports, so it can be compiled
// against an older version
- int playersOnline = Bukkit.getOnlinePlayers().size(); //Bukkit.getServer().getOnlinePlayers().length;
+ int playersOnline = Bukkit.getOnlinePlayers().size(); //CraftBukkit.getServer().getOnlinePlayers().length;
// END server software specific section -- all code below does not use any code outside of this class / Java
diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java
index dd856b0..6bda89e 100644
--- a/src/com/sekwah/advancedportals/portals/Portal.java
+++ b/src/com/sekwah/advancedportals/portals/Portal.java
@@ -363,7 +363,7 @@ public class Portal {
// add other variables or filter code here, or somehow have a way to register them
// TODO on load and unload recode the permissions to try to register themselves
- // https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/plugin/PluginManager.html#addPermission(org.bukkit.permissions.Permission)
+ // https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/plugin/PluginManager.html#addPermission(org.CraftBukkit.permissions.Permission)
// check they havent been registered before too and store a list of ones made by this plugin to remove when portals are unloaded.
// When a portal is added or removed it reloads all portals(i think) so add code for unloading too.