From 8e42d74b86dc0c4cbf3631717904bfde4ec45615 Mon Sep 17 00:00:00 2001 From: jeffginger Date: Mon, 5 Feb 2024 14:17:05 -0700 Subject: [PATCH 1/5] Reference and dependencies fixes, using updated version of Holographic Displays --- pom.xml | 16 +++++--------- .../observations/models/Observation.java | 21 ++++++------------- .../models/QuestObservationObjective.java | 2 +- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 4263b3a..2560f99 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); } } From bb613ec080874661c129322281faaeb10d7088e4 Mon Sep 17 00:00:00 2001 From: jeffginger Date: Mon, 5 Feb 2024 14:26:48 -0700 Subject: [PATCH 2/5] New repository for Holographic Displays, import calls wrong in observation.java, working on it --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2560f99..362e492 100644 --- a/pom.xml +++ b/pom.xml @@ -45,9 +45,10 @@ - com.gmail.filoghost.holographicdisplays + me.filoghost.holographicdisplays holographicdisplays-api - 2.4.0 + 3.0.0 + provided From a78cf2b5982a28f3a74208e56e9ea498bdd1744d Mon Sep 17 00:00:00 2001 From: jeffginger Date: Mon, 5 Feb 2024 16:27:40 -0700 Subject: [PATCH 3/5] New repository for Holographic Displays, import calls wrong in observation.java - got one of them but it looks like the whole process of creating a hologram changed between versions, can't do it while on the plane without internet now --- .../java/edu/whimc/observations/models/Observation.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/whimc/observations/models/Observation.java b/src/main/java/edu/whimc/observations/models/Observation.java index 15da7d6..021f1eb 100644 --- a/src/main/java/edu/whimc/observations/models/Observation.java +++ b/src/main/java/edu/whimc/observations/models/Observation.java @@ -1,9 +1,16 @@ package edu.whimc.observations.models; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.line.*; + +/* +original imports below: 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; @@ -267,7 +274,7 @@ public void deleteHologramOnly() { private class ObservationClick implements TouchHandler { - private final Location loc; + private final Location loc; public ObservationClick(Location loc) { this.loc = loc; From c7c8281103f928851c1f7be8eee3d32f1d3f63cd Mon Sep 17 00:00:00 2001 From: jeffginger Date: Mon, 5 Feb 2024 23:36:12 -0600 Subject: [PATCH 4/5] Updated quests dependencies and call, tried updating holographic displays but when that failed just fell back on old dependencies and that worked! --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 362e492..c566d58 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,11 @@ spigot-api 1.18.2-R0.1-SNAPSHOT - + - me.filoghost.holographicdisplays + com.gmail.filoghost.holographicdisplays holographicdisplays-api - 3.0.0 - provided + 2.4.0 From 11ebca6f4b3613c4026db63737b87363723f1d3d Mon Sep 17 00:00:00 2001 From: jeffginger Date: Mon, 5 Feb 2024 23:38:49 -0600 Subject: [PATCH 5/5] Updated quests dependencies and call, tried updating holographic displays but when that failed just fell back on old dependencies and that worked! --- .../java/edu/whimc/observations/models/Observation.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/edu/whimc/observations/models/Observation.java b/src/main/java/edu/whimc/observations/models/Observation.java index 021f1eb..15da7d6 100644 --- a/src/main/java/edu/whimc/observations/models/Observation.java +++ b/src/main/java/edu/whimc/observations/models/Observation.java @@ -1,16 +1,9 @@ package edu.whimc.observations.models; -import me.filoghost.holographicdisplays.api.hologram.Hologram; -import me.filoghost.holographicdisplays.api.hologram.line.*; - -/* -original imports below: 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; @@ -274,7 +267,7 @@ public void deleteHologramOnly() { private class ObservationClick implements TouchHandler { - private final Location loc; + private final Location loc; public ObservationClick(Location loc) { this.loc = loc;