From 42587c8b22278f126105a5e8dff6cac839e2aefe Mon Sep 17 00:00:00 2001 From: Brianna Date: Thu, 6 Jun 2019 12:36:59 -0400 Subject: [PATCH] You can now enable and disable holograms for entities and items globally --- .../com/songoda/ultimatestacker/entity/EntityStack.java | 2 ++ .../songoda/ultimatestacker/listeners/ItemListeners.java | 3 ++- .../com/songoda/ultimatestacker/utils/settings/Setting.java | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java b/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java index 9bca203..445e1f7 100644 --- a/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java +++ b/src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java @@ -24,6 +24,8 @@ public class EntityStack { } public void updateStack() { + if (!Setting.ENTITY_HOLOGRAMS.getBoolean()) return; + Entity entity = getEntityByUniqueId(this.entity); if (entity == null) return; diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/ItemListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/ItemListeners.java index ab6830c..723b443 100644 --- a/src/main/java/com/songoda/ultimatestacker/listeners/ItemListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/listeners/ItemListeners.java @@ -109,7 +109,8 @@ public class ItemListeners implements Listener { item.getItemStack().setAmount(newAmount); } - if (instance.getItemFile().getConfig().getBoolean("Items." + material + ".Has Hologram")) { + if (instance.getItemFile().getConfig().getBoolean("Items." + material + ".Has Hologram") + && Setting.ITEM_HOLOGRAMS.getBoolean()) { item.setCustomName(name); item.setCustomNameVisible(true); } diff --git a/src/main/java/com/songoda/ultimatestacker/utils/settings/Setting.java b/src/main/java/com/songoda/ultimatestacker/utils/settings/Setting.java index 7732346..41f2a45 100644 --- a/src/main/java/com/songoda/ultimatestacker/utils/settings/Setting.java +++ b/src/main/java/com/songoda/ultimatestacker/utils/settings/Setting.java @@ -32,6 +32,9 @@ public enum Setting { MIN_STACK_ENTITIES("Entity.Min Stack Amount", 5, "The minimum amount required before a stack can be formed."), + ENTITY_HOLOGRAMS("Entity.Holograms Enabled", true, + "Should holograms be displayed above stacked entities?"), + HOLOGRAMS_ON_LOOK_ENTITY("Entity.Only Show Holograms On Look", false, "Only show nametags above an entities head when looking directly at them."), @@ -84,6 +87,9 @@ public enum Setting { NAME_FORMAT_ITEM("Item.Name Format", "&f{TYPE} &6{AMT}x", "The text displayed above a dropped item."), + ITEM_HOLOGRAMS("Item.Holograms Enabled", true, + "Should holograms be displayed above stacked items?"), + SPAWNER_HOLOGRAMS("Spawners.Holograms Enabled", true, "Should holograms be displayed above stacked spawners?"),