diff --git a/pom.xml b/pom.xml index 4263b3a..c566d58 100644 --- a/pom.xml +++ b/pom.xml @@ -18,16 +18,11 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - + codemc-repo https://repo.codemc.io/repository/maven-public/ - - - jitpack - https://jitpack.io/ - dmulloy2-repo @@ -48,12 +43,11 @@ spigot-api 1.18.2-R0.1-SNAPSHOT - + - com.github.decentsoftware-eu - decentholograms - 2.8.6 - provided + com.gmail.filoghost.holographicdisplays + holographicdisplays-api + 2.4.0 diff --git a/src/main/java/edu/whimc/observations/models/Observation.java b/src/main/java/edu/whimc/observations/models/Observation.java index ce7bc7a..15da7d6 100644 --- 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 getPlayersTabComplete(String hint) { } private void createHologram() { - Hologram holo = DHAPI.createHologram(this.plugin, this.holoLoc); + Hologram holo = HologramsAPI.createHologram(this.plugin, this.holoLoc); List 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) { } } -} +} \ No newline at end of file diff --git a/src/main/java/edu/whimc/observations/models/QuestObservationObjective.java b/src/main/java/edu/whimc/observations/models/QuestObservationObjective.java index e757201..5e50ea1 100644 --- 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); } }