Skip to content

Commit

Permalink
1. updated dependencies for Quests-5.0.0-r.3, which is required for 1…
Browse files Browse the repository at this point in the history
….20.4

2. tried to swap in HolographicDisplays with DecentHolograms but the functions and structures vary too much for me to figure it out
  • Loading branch information
Geph committed Jan 5, 2024
1 parent 715fea0 commit 5294e1c
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 19 deletions.
28 changes: 18 additions & 10 deletions pom.xml
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.whimc</groupId>
<artifactId>WHIMC-Observations</artifactId>
<version>2.5.3</version>
<version>2.6.3</version>
<name>WHIMC Observations</name>
<description>Create holographic observations in worlds</description>

Expand All @@ -18,11 +18,16 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<!-- Maven repo for Holographic Displays and Quests -->
<!-- Maven repo for Quests -->
<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>
Expand All @@ -43,22 +48,25 @@
<artifactId>spigot-api</artifactId>
<version>1.18.2-R0.1-SNAPSHOT</version>
</dependency>
<!-- Add HolographicDisplays to the build -->
<!-- Add Decent Holograms to the build -->
<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.6</version>
<scope>provided</scope>
</dependency>
<!-- Add Quests to the build -->
<dependency>
<groupId>me.blackvein.quests</groupId>
<groupId>me.pikamug.quests</groupId>
<artifactId>quests-api</artifactId>
<version>4.5.3</version>
<version>5.0.0-rc.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.blackvein.quests</groupId>
<groupId>me.pikamug.quests</groupId>
<artifactId>quests-core</artifactId>
<version>4.5.3</version>
<version>5.0.0-rc.3</version>
<scope>provided</scope>
</dependency>
<!-- Add ProtocolLib to the build-->
<dependency>
Expand Down
19 changes: 14 additions & 5 deletions src/main/java/edu/whimc/observations/models/Observation.java
@@ -1,9 +1,18 @@
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;
Expand Down Expand Up @@ -156,13 +165,13 @@ public static List<String> getPlayersTabComplete(String hint) {
}

private void createHologram() {
Hologram holo = HologramsAPI.createHologram(this.plugin, this.holoLoc);
Hologram holo = DHAPI.createHologram(this.plugin, this.holoLoc);

List<TouchableLine> lines = new ArrayList<>();

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(lines, new ItemStack(this.hologramItem));
DHAPI.addHologramLine(lines, Utils.color(this.observation));
DHAPI.addHologramLine(lines, ChatColor.GRAY + this.playerName + " - " + Utils.getDate(this.timestamp));

if (this.expiration != null) {
lines.add(holo.appendTextLine(ChatColor.GRAY + "Expires " + Utils.getDate(this.expiration)));
Expand Down Expand Up @@ -265,7 +274,7 @@ public void deleteHologramOnly() {
}
}

private class ObservationClick implements TouchHandler {
private class ObservationClick implements DecentHologramsEvent {

private final Location loc;

Expand Down
@@ -1,16 +1,16 @@
package edu.whimc.observations.models;

import me.blackvein.quests.CustomObjective;
import me.blackvein.quests.Quest;
import me.blackvein.quests.Quests;
import me.pikamug.quests.quests.Quest;
import me.pikamug.quests.module.BukkitCustomObjective;
import me.pikamug.quests.Quests;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.plugin.Plugin;

/**
* A custom observation objective using the Quest plugin.
*/
public class QuestObservationObjective extends CustomObjective {
public class QuestObservationObjective extends BukkitCustomObjective {

public QuestObservationObjective() {
this.setName("Observation Objective");
Expand Down

1 comment on commit 5294e1c

@Geph
Copy link
Member Author

@Geph Geph commented on 5294e1c Jan 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is currently broken ^

Please sign in to comment.