Merge pull request #56 from whimc/update-holograms

Update holograms dependency

Author: Geph

README.md

@@ -11,7 +11,7 @@ $ mvn clean package
 It should show up in the target directory. Make sure to update your version number.
 
 ## Dependencies
-* [HolographicDisplays](https://github.com/filoghost/HolographicDisplays)
+* [DecentHolograms](https://www.spigotmc.org/resources/decentholograms-1-8-1-21-5-papi-support-no-dependencies.96927/)
 * [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/)
 
 ## Commands

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>edu.whimc</groupId>
 	<artifactId>WHIMC-Observations</artifactId>
-	<version>2.6.3</version>
+	<version>2.7.0</version>
 	<name>WHIMC Observations</name>
 	<description>Create holographic observations in worlds</description>
 
@@ -18,7 +18,7 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-		<!-- Maven repo for Quests and HolographicDisplays -->
+		<!-- Maven repo for Quests -->
 		<repository>
 			<id>codemc-repo</id>
 			<url>https://repo.codemc.io/repository/maven-public/</url>
@@ -28,6 +28,11 @@
 			<id>dmulloy2-repo</id>
 			<url>https://repo.dmulloy2.net/repository/public/</url>
 		</repository>
+		<!-- Repo for DecentHolograms -->
+		<repository>
+			<id>jitpack</id>
+			<url>https://jitpack.io/</url>
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -45,9 +50,10 @@
 		</dependency>
 		<!-- Legacy version of Holographic Displays -->
 		<dependency>
-			<groupId>com.gmail.filoghost.holographicdisplays</groupId>
-			<artifactId>holographicdisplays-api</artifactId>
-			<version>2.4.0</version>
+			<groupId>com.github.decentsoftware-eu</groupId>
+			<artifactId>decentholograms</artifactId>
+			<version>2.8.17</version>
+			<scope>provided</scope>
 		</dependency>
 		<!-- Add Quests to the build -->
 		<dependency>

src/main/java/edu/whimc/observations/models/Observation.java

@@ -1,19 +1,11 @@
 package edu.whimc.observations.models;
 
-import com.gmail.filoghost.holographicdisplays.api.Hologram;
-import com.gmail.filoghost.holographicdisplays.api.HologramsAPI;
-import com.gmail.filoghost.holographicdisplays.api.handler.TouchHandler;
-import com.gmail.filoghost.holographicdisplays.api.line.TouchableLine;
 import edu.whimc.observations.Observations;
 import edu.whimc.observations.observetemplate.models.ObservationTemplate;
 import edu.whimc.observations.utils.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
+import eu.decentsoftware.holograms.api.DHAPI;
+import eu.decentsoftware.holograms.api.holograms.Hologram;
+import eu.decentsoftware.holograms.event.HologramClickEvent;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -22,8 +14,15 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 
-public class Observation {
+public class Observation implements Listener {
 
     private static final List<Observation> observations = new ArrayList<>();
 
@@ -59,6 +58,11 @@ protected Observation(Observations plugin, int id, Timestamp timestamp, String p
             this.hologramItem = this.template.getGuiItem();
         }
 
+        if (this.plugin.getConfig().getBoolean("enable-click-to-view")) {
+            // Register this class as a listener to handle hologram clicks
+            Bukkit.getPluginManager().registerEvents(this, plugin);
+        }
+
         if (!isNew) {
             this.id = id;
             createHologram();
@@ -156,28 +160,18 @@ public static List<String> getPlayersTabComplete(String hint) {
     }
 
     private void createHologram() {
-        Hologram holo = HologramsAPI.createHologram(this.plugin, this.holoLoc);
-
-        List<TouchableLine> lines = new ArrayList<>();
+        Hologram holo = DHAPI.createHologram(Integer.toString(this.id), this.holoLoc);
 
-        lines.add(holo.appendItemLine(new ItemStack(this.hologramItem)));
-        lines.add(holo.appendTextLine(Utils.color(this.observation)));
-        lines.add(holo.appendTextLine(ChatColor.GRAY + this.playerName + " - " + Utils.getDate(this.timestamp)));
+        DHAPI.addHologramLine(holo, this.hologramItem);
+        DHAPI.addHologramLine(holo, Utils.color(this.observation));
+        DHAPI.addHologramLine(holo, ChatColor.GRAY + this.playerName + " - " + Utils.getDate(this.timestamp));
 
         if (this.expiration != null) {
-            lines.add(holo.appendTextLine(ChatColor.GRAY + "Expires " + Utils.getDate(this.expiration)));
+            DHAPI.addHologramLine(holo, ChatColor.GRAY + "Expires " + Utils.getDate(this.expiration));
         }
 
         if (this.isTemporary) {
-            lines.add(holo.appendTextLine(ChatColor.DARK_GRAY + "*temporary*"));
-        }
-
-        if (this.plugin.getConfig().getBoolean("enable-click-to-view")) {
-            ObservationClick clickListener = new ObservationClick(this.viewLoc);
-            for (TouchableLine touchable : lines) {
-                touchable.setTouchHandler(clickListener);
-            }
-
+            DHAPI.addHologramLine(holo, ChatColor.DARK_GRAY + "*temporary*");
         }
 
         this.hologram = holo;
@@ -265,18 +259,13 @@ public void deleteHologramOnly() {
         }
     }
 
-    private class ObservationClick implements TouchHandler {
-
-        private final Location loc;
-
-        public ObservationClick(Location loc) {
-            this.loc = loc;
+    @EventHandler
+    public void onClick(HologramClickEvent event) {
+        if (event.getHologram() != this.hologram) {
+            return;
         }
 
-        @Override
-        public void onTouch(Player player) {
-            player.teleport(this.loc);
-        }
+        Bukkit.getScheduler().runTask(this.plugin, () -> event.getPlayer().teleport(this.viewLoc));
     }
 
-}
+}

src/main/resources/plugin.yml

@@ -5,7 +5,7 @@ author: Jack Henhapl
 api-version: 1.13
 main: edu.whimc.observations.Observations
 load: POSTWORLD
-depend: [HolographicDisplays, ProtocolLib]
+depend: [DecentHolograms, ProtocolLib]
 softdepend: [Multiverse-Core]
 loadbefore: [Quests]
 commands: