From 295e6a675be84f7dfd932f0ea8e03c5a2473f4d2 Mon Sep 17 00:00:00 2001 From: filoghost Date: Mon, 22 Dec 2014 14:30:09 +0100 Subject: [PATCH] Deprecate methods, add support for Touchscreen Holograms. --- .../event/HolographicDisplaysReloadEvent.java | 30 +++++++++++++++++++ .../event/NamedHologramEditedEvent.java | 18 +++++++++++ .../object/CraftHologram.java | 15 ++++++++-- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java create mode 100644 HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/NamedHologramEditedEvent.java diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java new file mode 100644 index 00000000..272de0b6 --- /dev/null +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java @@ -0,0 +1,30 @@ +package com.gmail.filoghost.holographicdisplays.event; + +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +import com.gmail.filoghost.holographicdisplays.object.NamedHologram; + +public class HolographicDisplaysReloadEvent extends Event { + + private static final HandlerList handlers = new HandlerList(); + + private NamedHologram namedHologram; + + public HolographicDisplaysReloadEvent(NamedHologram namedHologram) { + this.namedHologram = namedHologram; + } + + public NamedHologram getNamedHologram() { + return namedHologram; + } + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/NamedHologramEditedEvent.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/NamedHologramEditedEvent.java new file mode 100644 index 00000000..56a718be --- /dev/null +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/event/NamedHologramEditedEvent.java @@ -0,0 +1,18 @@ +package com.gmail.filoghost.holographicdisplays.event; + +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class NamedHologramEditedEvent extends Event { + + private static final HandlerList handlers = new HandlerList(); + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/object/CraftHologram.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/object/CraftHologram.java index 63d0f514..5b94b3a9 100644 --- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/object/CraftHologram.java +++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/object/CraftHologram.java @@ -168,7 +168,7 @@ public class CraftHologram implements Hologram, com.gmail.filoghost.holograms.ap } lines.clear(); - } + } @Override public int size() { @@ -297,7 +297,7 @@ public class CraftHologram implements Hologram, com.gmail.filoghost.holograms.ap @Override public void teleport(World world, double x, double y, double z) { Validator.isTrue(!deleted, "hologram already deleted"); - Validator.notNull(world, "world"); + Validator.notNull(world, "world"); if (this.world != world) { updateLocation(world, x, y, z); @@ -338,47 +338,56 @@ public class CraftHologram implements Hologram, com.gmail.filoghost.holograms.ap */ @Override + @Deprecated public boolean update() { return true; } @Override + @Deprecated public void hide() { } @Override + @Deprecated public void addLine(String text) { appendTextLine(text); } @Override + @Deprecated public void setLine(int index, String text) { lines.get(index).despawn(); lines.set(index, new CraftTextLine(this, text)); } @Override + @Deprecated public void insertLine(int index, String text) { insertLine(index, text); } @Override + @Deprecated public String[] getLines() { return null; } @Override + @Deprecated public int getLinesLength() { return size(); } @Override + @Deprecated public void setLocation(Location location) { teleport(location); } @Override + @Deprecated public void setTouchHandler(TouchHandler handler) { if (size() > 0) { TouchableLine line0 = ((TouchableLine) getLine(0)); @@ -392,11 +401,13 @@ public class CraftHologram implements Hologram, com.gmail.filoghost.holograms.ap } @Override + @Deprecated public TouchHandler getTouchHandler() { return null; } @Override + @Deprecated public boolean hasTouchHandler() { return false; }