Merge pull request #55 from whimc/1.20.4-update

1.20.4 update
whimc · Feb 9, 2024 · c2600ed · c2600ed
2 parents 5294e1c + 11ebca6
commit c2600ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,16 +18,11 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-		<!-- Maven repo for Quests -->
+		<!-- Maven repo for Quests and HolographicDisplays -->
 		<repository>
 			<id>codemc-repo</id>
 			<url>https://repo.codemc.io/repository/maven-public/</url>
 		</repository>
-		<!-- Maven repo for DecentHolograms (to replace HolographicDisplays) -->
-		<repository>
-			<id>jitpack</id>
-			<url>https://jitpack.io/</url>
-		</repository>
 		<!-- Maven repo for ProtocolLib -->
 		<repository>
 			<id>dmulloy2-repo</id>
@@ -48,12 +43,11 @@
 			<artifactId>spigot-api</artifactId>
 			<version>1.18.2-R0.1-SNAPSHOT</version>
 		</dependency>
-		<!-- Add Decent Holograms to the build -->
+		<!-- Legacy version of Holographic Displays -->
 		<dependency>
-			<groupId>com.github.decentsoftware-eu</groupId>
-			<artifactId>decentholograms</artifactId>
-			<version>2.8.6</version>
-			<scope>provided</scope>
+			<groupId>com.gmail.filoghost.holographicdisplays</groupId>
+			<artifactId>holographicdisplays-api</artifactId>
+			<version>2.4.0</version>
 		</dependency>
 		<!-- Add Quests to the build -->
 		<dependency>

diff --git a/src/main/java/edu/whimc/observations/models/Observation.java b/src/main/java/edu/whimc/observations/models/Observation.java
@@ -1,18 +1,9 @@
 package edu.whimc.observations.models;
 
-/* original HD displays imports
 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 eu.decentsoftware.holograms.api.DHAPI;
-import eu.decentsoftware.holograms.api.holograms.Hologram;
-import eu.decentsoftware.holograms.api.holograms.HologramLine;
-import eu.decentsoftware.holograms.api.DecentHologramsAPI;
-import eu.decentsoftware.holograms.event.DecentHologramsEvent;
-import eu.decentsoftware.holograms.event.HologramClickEvent;
-import eu.decentsoftware.holograms.api.utils.Common;
 import edu.whimc.observations.Observations;
 import edu.whimc.observations.observetemplate.models.ObservationTemplate;
 import edu.whimc.observations.utils.Utils;
@@ -165,13 +156,13 @@ public static List<String> getPlayersTabComplete(String hint) {
     }
 
     private void createHologram() {
-        Hologram holo = DHAPI.createHologram(this.plugin, this.holoLoc);
+        Hologram holo = HologramsAPI.createHologram(this.plugin, this.holoLoc);
 
         List<TouchableLine> lines = new ArrayList<>();
 
-        DHAPI.addHologramLine(lines, new ItemStack(this.hologramItem));
-        DHAPI.addHologramLine(lines, Utils.color(this.observation));
-        DHAPI.addHologramLine(lines, ChatColor.GRAY + this.playerName + " - " + Utils.getDate(this.timestamp));
+        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)));
 
         if (this.expiration != null) {
             lines.add(holo.appendTextLine(ChatColor.GRAY + "Expires " + Utils.getDate(this.expiration)));
@@ -274,7 +265,7 @@ public void deleteHologramOnly() {
         }
     }
 
-    private class ObservationClick implements DecentHologramsEvent {
+    private class ObservationClick implements TouchHandler {
 
         private final Location loc;
 
@@ -288,4 +279,4 @@ public void onTouch(Player player) {
         }
     }
 
-}
+}
diff --git a/src/main/java/edu/whimc/observations/models/QuestObservationObjective.java b/src/main/java/edu/whimc/observations/models/QuestObservationObjective.java
@@ -30,7 +30,7 @@ public void onObserve(ObserveEvent event) {
         Quests quests = (Quests) plugin;
 
         for (Quest quest : quests.getQuester(event.getPlayer().getUniqueId()).getCurrentQuests().keySet()) {
-            incrementObjective(event.getPlayer(), this, 1, quest);
+            incrementObjective(event.getPlayer().getUniqueId(), this, quest, 1);
         }
     }