feat: decentholograms support (fix #2)

JosTheDude · Feb 18, 2025 · 16d2c7a · 16d2c7a
1 parent 0bc85eb
commit 16d2c7a
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'gg.jos'
-version = '1.2'
+version = '1.3'
 
 
 
@@ -28,6 +28,7 @@ dependencies {
     compileOnly "io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT"
     implementation "com.github.FaultyFunctions:SoulGraves:v1.3.0"
     compileOnly "de.oliver:FancyHolograms:2.4.2"
+    compileOnly 'com.github.decentsoftware-eu:decentholograms:2.8.14'
 }
 
 def targetJavaVersion = 21

diff --git a/src/main/java/gg/jos/soulgravesplus/SoulGravesPlus.java b/src/main/java/gg/jos/soulgravesplus/SoulGravesPlus.java
@@ -3,9 +3,12 @@
 import de.oliver.fancyholograms.api.FancyHologramsPlugin;
 import de.oliver.fancyholograms.api.HologramManager;
 import gg.jos.soulgravesplus.commands.ReloadCommand;
-import gg.jos.soulgravesplus.events.hologram.SoulExplodeHologramListener;
-import gg.jos.soulgravesplus.events.hologram.SoulPickupHologramListener;
-import gg.jos.soulgravesplus.events.hologram.SoulSpawnHologramListener;
+import gg.jos.soulgravesplus.events.hologram.decentholograms.SoulExplodeDecentHologramListener;
+import gg.jos.soulgravesplus.events.hologram.decentholograms.SoulPickupDecentHologramListener;
+import gg.jos.soulgravesplus.events.hologram.decentholograms.SoulSpawnDecentHologramListener;
+import gg.jos.soulgravesplus.events.hologram.fancyholograms.SoulExplodeFancyHologramListener;
+import gg.jos.soulgravesplus.events.hologram.fancyholograms.SoulPickupFancyHologramListener;
+import gg.jos.soulgravesplus.events.hologram.fancyholograms.SoulSpawnFancyHologramListener;
 import gg.jos.soulgravesplus.events.logger.SoulExplodeLoggerListener;
 import gg.jos.soulgravesplus.events.logger.SoulPickupLoggerListener;
 import gg.jos.soulgravesplus.events.logger.SoulSpawnLoggerListener;
@@ -33,6 +36,7 @@ public final class SoulGravesPlus extends JavaPlugin {
     public boolean hologramBackground;
     public String[] hologramBackgroundColor;
     public List<String> hologramLines;
+    public String hologramManager; // Unused but exists for future needs
 
     @Override
     public void onEnable() {
@@ -112,15 +116,27 @@ private void loggerFeatures(SoulGravesPlus plugin) {
 
     private void hologramFeatures(SoulGravesPlus plugin) {
         if (plugin.getServer().getPluginManager().getPlugin("FancyHolograms") != null) {
+
+            plugin.hologramManager = "FancyHolograms";
+
             HologramManager manager = FancyHologramsPlugin.get().getHologramManager();
 
-            plugin.getServer().getPluginManager().registerEvents(new SoulSpawnHologramListener(this, manager, this), this);
-            plugin.getServer().getPluginManager().registerEvents(new SoulPickupHologramListener(this, manager), this);
-            plugin.getServer().getPluginManager().registerEvents(new SoulExplodeHologramListener(this, manager), this);
+            plugin.getServer().getPluginManager().registerEvents(new SoulSpawnFancyHologramListener(this, manager, this), this);
+            plugin.getServer().getPluginManager().registerEvents(new SoulPickupFancyHologramListener(this, manager), this);
+            plugin.getServer().getPluginManager().registerEvents(new SoulExplodeFancyHologramListener(this, manager), this);
 
             plugin.getLogger().info("FancyHolograms found! Hologram features enabled.");
+        } else if (plugin.getServer().getPluginManager().getPlugin("DecentHolograms") != null) {
+
+            plugin.hologramManager = "DecentHolograms";
+
+            plugin.getServer().getPluginManager().registerEvents(new SoulSpawnDecentHologramListener(this, this), this);
+            plugin.getServer().getPluginManager().registerEvents(new SoulPickupDecentHologramListener(this), this);
+            plugin.getServer().getPluginManager().registerEvents(new SoulExplodeDecentHologramListener(this), this);
+
+            plugin.getLogger().info("DecentHolograms found! Hologram features enabled.");
         } else {
-            plugin.getLogger().warning("FancyHolograms not found! Hologram features disabled.");
+            plugin.getLogger().warning("FancyHolograms or DecentHolograms not found! Hologram features disabled.");
         }
     }
 

diff --git a/...jos/soulgravesplus/events/hologram/decentholograms/SoulExplodeDecentHologramListener.java b/...jos/soulgravesplus/events/hologram/decentholograms/SoulExplodeDecentHologramListener.java
@@ -0,0 +1,26 @@
+package gg.jos.soulgravesplus.events.hologram.decentholograms;
+
+import de.oliver.fancyholograms.api.HologramManager;
+import de.oliver.fancyholograms.api.hologram.Hologram;
+import dev.faultyfunctions.soulgraves.api.event.SoulExplodeEvent;
+import eu.decentsoftware.holograms.api.DHAPI;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
+
+public class SoulExplodeDecentHologramListener implements Listener {
+    private final Plugin plugin;
+
+    public SoulExplodeDecentHologramListener(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onSoulExplode(SoulExplodeEvent event) {
+
+        String hologramName = "grave_hologram_" + event.getSoul().getMarkerUUID();
+
+        DHAPI.removeHologram(hologramName);
+
+    }
+}
diff --git a/.../jos/soulgravesplus/events/hologram/decentholograms/SoulPickupDecentHologramListener.java b/.../jos/soulgravesplus/events/hologram/decentholograms/SoulPickupDecentHologramListener.java
@@ -0,0 +1,26 @@
+package gg.jos.soulgravesplus.events.hologram.decentholograms;
+
+import de.oliver.fancyholograms.api.HologramManager;
+import de.oliver.fancyholograms.api.hologram.Hologram;
+import dev.faultyfunctions.soulgraves.api.event.SoulPickupEvent;
+import eu.decentsoftware.holograms.api.DHAPI;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
+
+public class SoulPickupDecentHologramListener implements Listener {
+    private final Plugin plugin;
+
+    public SoulPickupDecentHologramListener(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onSoulPickup(SoulPickupEvent event) {
+
+        String hologramName = "grave_hologram_" + event.getSoul().getMarkerUUID();
+
+        DHAPI.removeHologram(hologramName);
+
+    }
+}
diff --git a/...g/jos/soulgravesplus/events/hologram/decentholograms/SoulSpawnDecentHologramListener.java b/...g/jos/soulgravesplus/events/hologram/decentholograms/SoulSpawnDecentHologramListener.java
@@ -0,0 +1,67 @@
+package gg.jos.soulgravesplus.events.hologram.decentholograms;
+
+import de.oliver.fancyholograms.api.HologramManager;
+import de.oliver.fancyholograms.api.data.TextHologramData;
+import de.oliver.fancyholograms.api.hologram.Hologram;
+import dev.faultyfunctions.soulgraves.api.event.SoulSpawnEvent;
+import eu.decentsoftware.holograms.api.DHAPI;
+import gg.jos.soulgravesplus.SoulGravesPlus;
+import org.bukkit.Color;
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+public class SoulSpawnDecentHologramListener implements Listener {
+    private final Plugin plugin;
+    private final SoulGravesPlus soulGravesPlus;
+
+    public SoulSpawnDecentHologramListener(Plugin plugin, SoulGravesPlus soulGravesPlus) {
+        this.plugin = plugin;
+        this.soulGravesPlus = soulGravesPlus;
+    }
+
+    @EventHandler
+    public void onSoulSpawn(SoulSpawnEvent event) {
+
+        if (!soulGravesPlus.hologramEnabled) {
+            return;
+        }
+
+        // Get the grave location and adjust it to be above the grave
+        Location soulLocation = event.getSoulLocation();
+        Location location = soulLocation.clone().add(soulGravesPlus.hologramXOffset, soulGravesPlus.hologramYOffset, soulGravesPlus.hologramZOffset);
+
+        // Fetch the hologram config
+        if (soulGravesPlus.hologramLines.isEmpty()) {
+            plugin.getLogger().warning("Hologram lines are missing in the config!");
+            return;
+        }
+
+        // Define placeholders
+        String soulOwner = event.getPlayer().getName();
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String formattedTime = now.format(formatter);
+        String soulTime = String.valueOf(event.getSoul().getTimeLeft());
+
+        // Replace placeholders in the config lines
+        List<String> parsedLines = soulGravesPlus.hologramLines.stream()
+                .map(line -> line
+                        .replace("{soulOwner}", soulOwner)
+                        .replace("{formattedTime}", formattedTime)
+                        .replace("{soulTime}", soulTime)
+                        .replace("&", "§"))
+                .toList();
+
+        // Create a unique hologram name
+        String hologramName = "grave_hologram_" + event.getSoul().getMarkerUUID();
+
+        DHAPI.createHologram(hologramName, location, parsedLines);
+
+    }
+}
diff --git a/...hologram/SoulExplodeHologramListener.java → ...ams/SoulExplodeFancyHologramListener.java b/...hologram/SoulExplodeHologramListener.java → ...ams/SoulExplodeFancyHologramListener.java
@@ -1,4 +1,4 @@
-package gg.jos.soulgravesplus.events.hologram;
+package gg.jos.soulgravesplus.events.hologram.fancyholograms;
 
 import de.oliver.fancyholograms.api.HologramManager;
 import de.oliver.fancyholograms.api.hologram.Hologram;
@@ -7,11 +7,11 @@
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 
-public class SoulExplodeHologramListener implements Listener {
+public class SoulExplodeFancyHologramListener implements Listener {
     private final Plugin plugin;
     private final HologramManager manager;
 
-    public SoulExplodeHologramListener(Plugin plugin, HologramManager manager) {
+    public SoulExplodeFancyHologramListener(Plugin plugin, HologramManager manager) {
         this.plugin = plugin;
         this.manager = manager;
     }

diff --git a/.../hologram/SoulPickupHologramListener.java → ...rams/SoulPickupFancyHologramListener.java b/.../hologram/SoulPickupHologramListener.java → ...rams/SoulPickupFancyHologramListener.java
@@ -1,4 +1,4 @@
-package gg.jos.soulgravesplus.events.hologram;
+package gg.jos.soulgravesplus.events.hologram.fancyholograms;
 
 import de.oliver.fancyholograms.api.HologramManager;
 import de.oliver.fancyholograms.api.hologram.Hologram;
@@ -7,11 +7,11 @@
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 
-public class SoulPickupHologramListener implements Listener {
+public class SoulPickupFancyHologramListener implements Listener {
     private final Plugin plugin;
     private final HologramManager manager;
 
-    public SoulPickupHologramListener(Plugin plugin, HologramManager manager) {
+    public SoulPickupFancyHologramListener(Plugin plugin, HologramManager manager) {
         this.plugin = plugin;
         this.manager = manager;
     }

diff --git a/...s/hologram/SoulSpawnHologramListener.java → ...grams/SoulSpawnFancyHologramListener.java b/...s/hologram/SoulSpawnHologramListener.java → ...grams/SoulSpawnFancyHologramListener.java
@@ -1,4 +1,4 @@
-package gg.jos.soulgravesplus.events.hologram;
+package gg.jos.soulgravesplus.events.hologram.fancyholograms;
 
 import de.oliver.fancyholograms.api.HologramManager;
 import de.oliver.fancyholograms.api.data.TextHologramData;
@@ -15,12 +15,12 @@
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
-public class SoulSpawnHologramListener implements Listener {
+public class SoulSpawnFancyHologramListener implements Listener {
     private final Plugin plugin;
     private final HologramManager manager;
     private final SoulGravesPlus soulGravesPlus;
 
-    public SoulSpawnHologramListener(Plugin plugin, HologramManager manager, SoulGravesPlus soulGravesPlus) {
+    public SoulSpawnFancyHologramListener(Plugin plugin, HologramManager manager, SoulGravesPlus soulGravesPlus) {
         this.plugin = plugin;
         this.manager = manager;
         this.soulGravesPlus = soulGravesPlus;

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -28,17 +28,18 @@ hologram:
 
     # Hologram settings
     # Holograms are displayed above the soul's grave
-    # This features requires FancyHolograms
+    # This features requires FancyHolograms or DecentHolograms
 
     # Enable/Disable this feature entirely
     enabled: true
 
     # Configure the location of the hologram relative to the soul's location
     x-offset: 0.0 # x-offset from the soul's location
-    y-offset: 2.5 # y-offset from the soul's location
+    y-offset: 3.5 # y-offset from the soul's location
     z-offset: 0.0 # z-offset from the soul's location
 
     # Configure the background of the hologram, defaults to the default hologram background
+    # This has no effect if you are using DecentHolograms
     custom-background: false # enable custom background
     background-color: "1,100,255,79" # ARGB format
 
@@ -50,8 +51,8 @@ hologram:
     # DEPRECATED: {soulTime} for configured time for soul expiry (non-updating)
     lines:
         - ""
-        - "<aqua>☠ <b>SOUL GRAVE</b> <dark_gray>» <white>{soulOwner}"
-        - "<gray>Passed away at {formattedTime}"
+        - "&b☠ &lSOUL GRAVE&r &8» &f{soulOwner}"
+        - "&7Passed away at &f{formattedTime}"
         - ""
-        - "<aqua> [ᴛᴏᴜᴄʜ ᴛʜᴇ ɢʀᴀᴠᴇ ᴛᴏ ʀᴇᴛʀɪᴇᴠᴇ ᴇꜱꜱᴇɴᴄᴇ] "
+        - "&b [ᴛᴏᴜᴄʜ ᴛʜᴇ ɢʀᴀᴠᴇ ᴛᴏ ʀᴇᴛʀɪᴇᴠᴇ ᴇꜱꜱᴇɴᴄᴇ] &r"
         - ""
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,8 +2,7 @@ name: SoulGravesPlus
 version: '${version}'
 main: gg.jos.soulgravesplus.SoulGravesPlus
 api-version: '1.21'
-loadAfter: [SoulGraves, FancyHolograms]
-softDepend: [SoulGraves, FancyHolograms]
+softdepend: [SoulGraves, FancyHolograms, DecentHolograms]
 authors: [JosTheDude]
 website: https://jos.gg/