From e9e4ccfbeb6343c4d469af70b2290ab694015c17 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 2 Dec 2021 17:47:42 +0100 Subject: [PATCH 1/5] Delete .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 19871eb5cd39cdec1f606c02e7f376598867e105..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}*0S6n_I1wngkpL5PXEhM*n@DFQ}gjHN(G;|C2zgb0@1b|@RRJI(I$Ev6Sw z`~gO<{sH<=c<|)WlO8>L)RVsXDA1xNT#V6u$;|J~oA=)C{B~#G4giq!T5%9S2LKHl z$4Csjp9r7l?T9ofOB9ia9QPpy6B&mUEa!-KXb2ey8Ti{6;Cr_f?m`B}U;+;9UuNM9 z|16AR8~82+HSS#j24xt4P3#@H+xNX+H+V;38uO0AINU=Vz=&df1Uc6b(F{I#P-yVl zYw&7;08I2N0fnH!_uKD$tqs3oIpTibSry0jgJkjpX=;v~Xld27m=))=|*1f9Aj=^+Aj4(uwA6+vhdJ$i)mVng5KL-BtN~WJ2mBsRCMT-3Klk<%(!NmMtf6PX^Ud9>w}vx30eMb!5%z^ zSMUbj!h84#pW!PZBt{aXi<~DH$VGCATqa2w+EjZ$XKU#t60EfK4`@B-xejwnXy-8r zcmNJw%f|g-B2uiQ{QWM#D(W8Y8$Q#p*P3|r;hl-YV~M(3t?gJ*p>xPU$iV-=0RKK1 z*f^#XRwas02X^8JfEYou5Y+ik1CKEjrW95s;tUFrp@=e+s3QiE;b=FMUrJ$Bq6`P3 z4j)8anWz&A5m(3jhHwXxk{I?O10e(T3^dE3&g=iguh0MWLE$K5AY|a5Vt_=(bK_}T zlB%so7RPI?fo%yJ7w%V;C_=DP Date: Thu, 2 Dec 2021 17:56:38 +0100 Subject: [PATCH 2/5] Update Maven repositories --- pom.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 769b277..ebecca5 100644 --- a/pom.xml +++ b/pom.xml @@ -101,16 +101,18 @@ - public - http://repo.songoda.com/repository/public/ + songoda-public + https://repo.songoda.com/repository/public/ + + + spigotmc-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + CodeMC - https://repo.codemc.org/repository/maven-public - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + https://repo.codemc.org/repository/maven-public/ From ff82b1d8f8f87278d727b1e431882147df354ee7 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 2 Dec 2021 17:57:35 +0100 Subject: [PATCH 3/5] Replace `spigot` v1.17 dependency with `spigot-api` v1.18 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ebecca5..aeb3ddf 100644 --- a/pom.xml +++ b/pom.xml @@ -118,8 +118,8 @@ org.spigotmc - spigot - 1.17 + spigot-api + 1.18-R0.1-SNAPSHOT provided From e9e052871e31322268bf1e03b395b17c4fad0a03 Mon Sep 17 00:00:00 2001 From: Fernando Pettinelli Date: Wed, 22 Dec 2021 19:11:16 -0300 Subject: [PATCH 4/5] Updated to latest SongodaCore. --- pom.xml | 2 +- .../com/songoda/ultimatestacker/UltimateStacker.java | 11 ++++++++--- .../ultimatestacker/stackable/Hologramable.java | 2 ++ .../ultimatestacker/stackable/block/BlockStack.java | 12 ++++++++++++ .../stackable/spawner/SpawnerStack.java | 11 +++++++++++ 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index aeb3ddf..22ad9c1 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.songoda SongodaCore - LATEST + 2.6.10 compile diff --git a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java index 29933c2..3400192 100644 --- a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java +++ b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java @@ -367,12 +367,17 @@ public class UltimateStacker extends SongodaPlugin { spawnerStackManager.removeSpawner(stack.getLocation()); // are holograms enabled? if (!stack.areHologramsEnabled() && !HologramManager.getManager().isEnabled()) return; - // create the hologram - HologramManager.updateHologram(stack.getLocation(), stack.getHologramName()); + // update the hologram + if (!HologramManager.isHologramLoaded(stack.getHologramId())) { + HologramManager.createHologram(stack.getHologramId(), stack.getLocation(), stack.getHologramName()); + return; + } + + HologramManager.updateHologram(stack.getHologramId(), stack.getHologramName()); } public void removeHologram(Hologramable stack) { - HologramManager.removeHologram(stack.getLocation()); + HologramManager.removeHologram(stack.getHologramId()); } //////// Convenient API ////////// diff --git a/src/main/java/com/songoda/ultimatestacker/stackable/Hologramable.java b/src/main/java/com/songoda/ultimatestacker/stackable/Hologramable.java index 26aee3a..cfa3abb 100644 --- a/src/main/java/com/songoda/ultimatestacker/stackable/Hologramable.java +++ b/src/main/java/com/songoda/ultimatestacker/stackable/Hologramable.java @@ -11,4 +11,6 @@ public interface Hologramable { boolean areHologramsEnabled(); boolean isValid(); + + String getHologramId(); } diff --git a/src/main/java/com/songoda/ultimatestacker/stackable/block/BlockStack.java b/src/main/java/com/songoda/ultimatestacker/stackable/block/BlockStack.java index 2ce73bf..94b4d44 100644 --- a/src/main/java/com/songoda/ultimatestacker/stackable/block/BlockStack.java +++ b/src/main/java/com/songoda/ultimatestacker/stackable/block/BlockStack.java @@ -10,8 +10,15 @@ import com.songoda.ultimatestacker.utils.Stackable; import org.bukkit.Location; import org.bukkit.World; +import java.util.UUID; + public class BlockStack implements Stackable, Hologramable { + // This is the unique identifier for this stack. + // It is reset on every plugin load. + // Used for holograms. + private final UUID uniqueId = UUID.randomUUID(); + // The id that identifies this stack in the database. private int id; @@ -105,6 +112,11 @@ public class BlockStack implements Stackable, Hologramable { this.id = id; } + @Override + public String getHologramId() { + return "UltimateStacker-" + uniqueId; + } + @Override public String toString() { return "BlockStack{" + diff --git a/src/main/java/com/songoda/ultimatestacker/stackable/spawner/SpawnerStack.java b/src/main/java/com/songoda/ultimatestacker/stackable/spawner/SpawnerStack.java index 76a01a4..8b657ae 100644 --- a/src/main/java/com/songoda/ultimatestacker/stackable/spawner/SpawnerStack.java +++ b/src/main/java/com/songoda/ultimatestacker/stackable/spawner/SpawnerStack.java @@ -12,9 +12,15 @@ import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import java.util.Random; +import java.util.UUID; public class SpawnerStack extends SSpawner implements Stackable, Hologramable { + // This is the unique identifier for this spawner. + // It is reset on every plugin load. + // Used for holograms. + private final UUID uniqueId = UUID.randomUUID(); + private int id; private int amount; @@ -93,6 +99,11 @@ public class SpawnerStack extends SSpawner implements Stackable, Hologramable { return location.getWorld(); } + @Override + public String getHologramId() { + return "UltimateStacker-" + uniqueId; + } + @Override public String toString() { return "SpawnerStack:{" From 338ed66889473339032d6ef154fc2149b6a48d53 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Mon, 17 Jan 2022 12:46:15 +0100 Subject: [PATCH 5/5] Version 2.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22ad9c1..8d15859 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda UltimateStacker 4.0.0 - 2.1.8 + 2.2.0 clean install UltimateStacker-${project.version}