From 8a528230a3cf6cbec621f932a35ca756318cb9fb Mon Sep 17 00:00:00 2001 From: Alastair Date: Thu, 28 Jul 2016 23:09:30 +0100 Subject: [PATCH] started adding tag registry and updated to support 1.10_R1 --- .../AdvancedPortalsCommand.java | 2 +- .../api/{ => portaldata}/PortalArg.java | 2 +- .../api/{ => portaldata}/PortalTags.java | 2 +- .../advancedportals/api/registry/TagInfo.java | 16 +++++++++++ .../api/registry/TagRegistry.java | 25 +++++++++++++++++ .../compat/bukkit/v1_10_R1.java | 27 +++++++++++++++++++ .../portals/AdvancedPortal.java | 1 + .../advancedportals/portals/ArgRegistry.java | 13 --------- .../advancedportals/portals/Portal.java | 1 + 9 files changed, 73 insertions(+), 16 deletions(-) rename src/com/sekwah/advancedportals/api/{ => portaldata}/PortalArg.java (87%) rename src/com/sekwah/advancedportals/api/{ => portaldata}/PortalTags.java (94%) create mode 100644 src/com/sekwah/advancedportals/api/registry/TagInfo.java create mode 100644 src/com/sekwah/advancedportals/api/registry/TagRegistry.java create mode 100644 src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java delete mode 100644 src/com/sekwah/advancedportals/portals/ArgRegistry.java diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java index 7e0937e5..46617d44 100644 --- a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java +++ b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java @@ -1,8 +1,8 @@ package com.sekwah.advancedportals; +import com.sekwah.advancedportals.api.portaldata.PortalArg; import com.sekwah.advancedportals.listeners.Listeners; import com.sekwah.advancedportals.portals.Portal; -import com.sekwah.advancedportals.portals.PortalArg; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; diff --git a/src/com/sekwah/advancedportals/api/PortalArg.java b/src/com/sekwah/advancedportals/api/portaldata/PortalArg.java similarity index 87% rename from src/com/sekwah/advancedportals/api/PortalArg.java rename to src/com/sekwah/advancedportals/api/portaldata/PortalArg.java index 238db28b..47676a49 100644 --- a/src/com/sekwah/advancedportals/api/PortalArg.java +++ b/src/com/sekwah/advancedportals/api/portaldata/PortalArg.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.api; +package com.sekwah.advancedportals.api.portaldata; public class PortalArg { diff --git a/src/com/sekwah/advancedportals/api/PortalTags.java b/src/com/sekwah/advancedportals/api/portaldata/PortalTags.java similarity index 94% rename from src/com/sekwah/advancedportals/api/PortalTags.java rename to src/com/sekwah/advancedportals/api/portaldata/PortalTags.java index c613c657..994f745f 100644 --- a/src/com/sekwah/advancedportals/api/PortalTags.java +++ b/src/com/sekwah/advancedportals/api/portaldata/PortalTags.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.api; +package com.sekwah.advancedportals.api.portaldata; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/sekwah/advancedportals/api/registry/TagInfo.java b/src/com/sekwah/advancedportals/api/registry/TagInfo.java new file mode 100644 index 00000000..4eaf9bf7 --- /dev/null +++ b/src/com/sekwah/advancedportals/api/registry/TagInfo.java @@ -0,0 +1,16 @@ +package com.sekwah.advancedportals.api.registry; + +/** + * Created by on 25/07/2016. + * + * @author sekwah41 + */ +public class TagInfo { + + private final String dataType; + + public TagInfo(String tag, String dataType){ + this.dataType = dataType; + } + +} diff --git a/src/com/sekwah/advancedportals/api/registry/TagRegistry.java b/src/com/sekwah/advancedportals/api/registry/TagRegistry.java new file mode 100644 index 00000000..3db0849a --- /dev/null +++ b/src/com/sekwah/advancedportals/api/registry/TagRegistry.java @@ -0,0 +1,25 @@ +package com.sekwah.advancedportals.api.registry; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by on 25/07/2016. + * + * @author sekwah41 + */ +public class TagRegistry { + + private ArrayList tags = new ArrayList(); + + private Map tagDesc = new HashMap(); + + public TagRegistry(){ + + } + + + + +} diff --git a/src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java b/src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java new file mode 100644 index 00000000..9df7f3ee --- /dev/null +++ b/src/com/sekwah/advancedportals/compat/bukkit/v1_10_R1.java @@ -0,0 +1,27 @@ +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/portals/AdvancedPortal.java b/src/com/sekwah/advancedportals/portals/AdvancedPortal.java index 8bb4b59e..eb712aa0 100644 --- a/src/com/sekwah/advancedportals/portals/AdvancedPortal.java +++ b/src/com/sekwah/advancedportals/portals/AdvancedPortal.java @@ -1,5 +1,6 @@ package com.sekwah.advancedportals.portals; +import com.sekwah.advancedportals.api.portaldata.PortalArg; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/com/sekwah/advancedportals/portals/ArgRegistry.java b/src/com/sekwah/advancedportals/portals/ArgRegistry.java deleted file mode 100644 index 315f49aa..00000000 --- a/src/com/sekwah/advancedportals/portals/ArgRegistry.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sekwah.advancedportals.portals; - -/** - * Created by on 29/02/2016. - *

- * TODO create argument registry for easier altering and control :) also allows other coders to add custom args - * - * @author sekwah41 - */ -public class ArgRegistry { - - -} diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java index 13a32842..ecb48f55 100644 --- a/src/com/sekwah/advancedportals/portals/Portal.java +++ b/src/com/sekwah/advancedportals/portals/Portal.java @@ -12,6 +12,7 @@ import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachment; +import com.sekwah.advancedportals.api.portaldata.PortalArg; import java.util.ArrayList; import java.util.Set;