From 0cd4ac8f3e461aadc9bc85b3682b9b808ac3097c Mon Sep 17 00:00:00 2001 From: filoghost Date: Fri, 22 Apr 2022 20:01:29 +0200 Subject: [PATCH] API renaming --- .../api/beta/hologram/Hologram.java | 4 ++-- ...aceholders.java => PlaceholderSetting.java} | 6 +++--- .../plugin/api/current/APIHologram.java | 18 +++++++++--------- .../api/current/APITextHologramLine.java | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) rename api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/{ResolvePlaceholders.java => PlaceholderSetting.java} (73%) diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java b/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java index 0d16b21d..6dc3b621 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java @@ -83,12 +83,12 @@ public interface Hologram { /** * @since 1 */ - @NotNull ResolvePlaceholders getResolvePlaceholders(); + @NotNull PlaceholderSetting getPlaceholderSetting(); /** * @since 1 */ - void setResolvePlaceholders(@NotNull ResolvePlaceholders resolvePlaceholders); + void setPlaceholderSetting(@NotNull PlaceholderSetting placeholderSetting); /** * Deletes this hologram. Editing or teleporting the hologram when deleted diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/ResolvePlaceholders.java b/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java similarity index 73% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/ResolvePlaceholders.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java index 24f50c61..31c92392 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/ResolvePlaceholders.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.api.beta.hologram; -public enum ResolvePlaceholders { +public enum PlaceholderSetting { DEFAULT, - ALL, - NONE + ENABLE_ALL, + DISABLE_ALL } diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIHologram.java index c334411a..7f54ccb2 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIHologram.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.api.current; import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.beta.Position; import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.ResolvePlaceholders; +import me.filoghost.holographicdisplays.api.beta.hologram.PlaceholderSetting; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologram; import me.filoghost.holographicdisplays.plugin.hologram.base.ImmutablePosition; import me.filoghost.holographicdisplays.plugin.hologram.tracking.LineTrackerManager; @@ -23,7 +23,7 @@ class APIHologram extends BaseHologram implements Hologram { private final APIHologramManager hologramManager; private final DefaultVisibilitySettings visibilitySettings; - private @NotNull ResolvePlaceholders resolvePlaceholders; + private @NotNull PlaceholderSetting placeholderSetting; APIHologram( ImmutablePosition position, @@ -36,7 +36,7 @@ class APIHologram extends BaseHologram implements Hologram { this.plugin = plugin; this.hologramManager = hologramManager; this.visibilitySettings = new DefaultVisibilitySettings(); - this.resolvePlaceholders = ResolvePlaceholders.DEFAULT; + this.placeholderSetting = PlaceholderSetting.DEFAULT; } @Override @@ -55,20 +55,20 @@ class APIHologram extends BaseHologram implements Hologram { } @Override - public @NotNull ResolvePlaceholders getResolvePlaceholders() { - return resolvePlaceholders; + public @NotNull PlaceholderSetting getPlaceholderSetting() { + return placeholderSetting; } @Override - public void setResolvePlaceholders(@NotNull ResolvePlaceholders resolvePlaceholders) { - Preconditions.notNull(resolvePlaceholders, "resolvePlaceholders"); + public void setPlaceholderSetting(@NotNull PlaceholderSetting placeholderSetting) { + Preconditions.notNull(placeholderSetting, "placeholderSetting"); checkNotDeleted(); - if (this.resolvePlaceholders == resolvePlaceholders) { + if (this.placeholderSetting == placeholderSetting) { return; } - this.resolvePlaceholders = resolvePlaceholders; + this.placeholderSetting = placeholderSetting; for (APIHologramLine line : lines) { line.setChanged(); } diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java index 45b9e2ec..7079531d 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.ResolvePlaceholders; +import me.filoghost.holographicdisplays.api.beta.hologram.PlaceholderSetting; import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLineClickListener; import me.filoghost.holographicdisplays.api.beta.hologram.line.TextHologramLine; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseTextHologramLine; @@ -24,7 +24,7 @@ class APITextHologramLine extends BaseTextHologramLine implements TextHologramLi @Override public boolean isAllowPlaceholders() { - return hologram.getResolvePlaceholders() == ResolvePlaceholders.ALL; + return hologram.getPlaceholderSetting() == PlaceholderSetting.ENABLE_ALL; } @Override