From 7db51a6dae23b45219e7f72ebb671755af35de05 Mon Sep 17 00:00:00 2001 From: filoghost Date: Tue, 31 Aug 2021 21:05:38 +0200 Subject: [PATCH] Rename API classes --- .../api/HolographicDisplaysAPI.java | 4 ++-- .../{Placeholder.java => GlobalPlaceholder.java} | 2 +- ...rFactory.java => GlobalPlaceholderFactory.java} | 4 ++-- ...eplacer.java => GlobalPlaceholderReplacer.java} | 2 +- .../api/current/DefaultHolographicDisplaysAPI.java | 4 ++-- .../internal/placeholder/AnimationPlaceholder.java | 4 ++-- .../placeholder/AnimationPlaceholderFactory.java | 14 +++++++------- ...cPlaceholder.java => ImmutablePlaceholder.java} | 6 +++--- .../OnlinePlayersPlaceholderFactory.java | 12 ++++++------ .../WorldPlayersPlaceholderFactory.java | 12 ++++++------ .../registry/GlobalPlaceholderExpansion.java | 14 +++++++------- .../placeholder/registry/PlaceholderRegistry.java | 12 ++++++------ .../registry/SimpleGlobalPlaceholder.java | 10 +++++----- 13 files changed, 50 insertions(+), 50 deletions(-) rename api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/{Placeholder.java => GlobalPlaceholder.java} (77%) rename api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/{PlaceholderFactory.java => GlobalPlaceholderFactory.java} (68%) rename api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/{PlaceholderReplacer.java => GlobalPlaceholderReplacer.java} (94%) rename plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/{StaticPlaceholder.java => ImmutablePlaceholder.java} (69%) diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java b/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java index e1b79637..d4efbf12 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.api; import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import org.bukkit.Location; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; @@ -79,7 +79,7 @@ public interface HolographicDisplaysAPI { /** * @since 1 */ - void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull PlaceholderReplacer replacer); + void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull GlobalPlaceholderReplacer replacer); /** * @since 1 diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/Placeholder.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java similarity index 77% rename from api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/Placeholder.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java index 4b50f0a5..9d52c839 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/Placeholder.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.api.placeholder; /** * @since 1 */ -public interface Placeholder extends PlaceholderReplacer { +public interface GlobalPlaceholder extends GlobalPlaceholderReplacer { /** * @since 1 diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/PlaceholderFactory.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderFactory.java similarity index 68% rename from api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/PlaceholderFactory.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderFactory.java index 578248ac..f78c76ae 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/PlaceholderFactory.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderFactory.java @@ -10,11 +10,11 @@ import org.jetbrains.annotations.Nullable; /** * @since 1 */ -public interface PlaceholderFactory { +public interface GlobalPlaceholderFactory { /** * @since 1 */ - @Nullable Placeholder getPlaceholder(@Nullable String argument); + @Nullable GlobalPlaceholder getPlaceholder(@Nullable String argument); } diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplacer.java similarity index 94% rename from api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplacer.java index d68a9c92..2df4f702 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplacer.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; * @since 1 */ @FunctionalInterface -public interface PlaceholderReplacer { +public interface GlobalPlaceholderReplacer { /** * Callback for providing a placeholder replacement, given the argument of the placeholder (if present). diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java index 1c16646d..f85d7676 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java @@ -9,7 +9,7 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.api.Position; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import me.filoghost.holographicdisplays.plugin.hologram.base.ImmutablePosition; import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; import org.bukkit.Location; @@ -49,7 +49,7 @@ class DefaultHolographicDisplaysAPI implements HolographicDisplaysAPI { } @Override - public void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull PlaceholderReplacer replacer) { + public void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull GlobalPlaceholderReplacer replacer) { Preconditions.notEmpty(identifier, "identifier"); for (char c : identifier.toCharArray()) { Preconditions.checkArgument(isValidIdentifierCharacter(c), "identifier contains invalid character '" + c + "'"); diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java index a951d86b..c6925a96 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java @@ -7,11 +7,11 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import com.google.common.collect.ImmutableList; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; import java.util.List; -public class AnimationPlaceholder implements Placeholder { +public class AnimationPlaceholder implements GlobalPlaceholder { private final int refreshIntervalTicks; private final ImmutableList frames; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java index e5be1ddb..1a94a902 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java @@ -7,14 +7,14 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.collection.CaseInsensitiveHashMap; import me.filoghost.fcommons.collection.CaseInsensitiveMap; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import java.util.Map; -public class AnimationPlaceholderFactory implements PlaceholderFactory { +public class AnimationPlaceholderFactory implements GlobalPlaceholderFactory { - private final CaseInsensitiveMap animationsByFileName; + private final CaseInsensitiveMap animationsByFileName; public AnimationPlaceholderFactory(Map animationsByFileName) { this.animationsByFileName = new CaseInsensitiveHashMap<>(); @@ -22,12 +22,12 @@ public class AnimationPlaceholderFactory implements PlaceholderFactory { } @Override - public Placeholder getPlaceholder(String fileNameArgument) { - Placeholder placeholder = animationsByFileName.get(fileNameArgument); + public GlobalPlaceholder getPlaceholder(String fileNameArgument) { + GlobalPlaceholder placeholder = animationsByFileName.get(fileNameArgument); if (placeholder != null) { return placeholder; } else { - return new StaticPlaceholder("[Animation not found: " + fileNameArgument + "]"); + return new ImmutablePlaceholder("[Animation not found: " + fileNameArgument + "]"); } } diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/StaticPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java similarity index 69% rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/StaticPlaceholder.java rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java index 9e28ed5d..20538ad6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/StaticPlaceholder.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java @@ -5,13 +5,13 @@ */ package me.filoghost.holographicdisplays.plugin.internal.placeholder; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; -public class StaticPlaceholder implements Placeholder { +public class ImmutablePlaceholder implements GlobalPlaceholder { private final String text; - public StaticPlaceholder(String text) { + public ImmutablePlaceholder(String text) { this.text = text; } diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java index 7485e9d0..de4caeaf 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java @@ -6,13 +6,13 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.Strings; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker; import org.bukkit.Bukkit; import org.jetbrains.annotations.Nullable; -public class OnlinePlayersPlaceholderFactory implements PlaceholderFactory { +public class OnlinePlayersPlaceholderFactory implements GlobalPlaceholderFactory { private final BungeeServerTracker bungeeServerTracker; @@ -21,7 +21,7 @@ public class OnlinePlayersPlaceholderFactory implements PlaceholderFactory { } @Override - public Placeholder getPlaceholder(@Nullable String argument) { + public GlobalPlaceholder getPlaceholder(@Nullable String argument) { if (argument == null) { // No argument specified, return online players in this server return new LocalOnlinePlayersPlaceholder(); @@ -32,7 +32,7 @@ public class OnlinePlayersPlaceholderFactory implements PlaceholderFactory { } - private static class LocalOnlinePlayersPlaceholder implements Placeholder { + private static class LocalOnlinePlayersPlaceholder implements GlobalPlaceholder { @Override public int getRefreshIntervalTicks() { @@ -47,7 +47,7 @@ public class OnlinePlayersPlaceholderFactory implements PlaceholderFactory { } - private static class BungeeOnlinePlayersPlaceholder implements Placeholder { + private static class BungeeOnlinePlayersPlaceholder implements GlobalPlaceholder { private final String[] serverNames; private final BungeeServerTracker bungeeServerTracker; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java index 6a621c22..cf21a0d0 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java @@ -6,19 +6,19 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.Strings; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; -public class WorldPlayersPlaceholderFactory implements PlaceholderFactory { +public class WorldPlayersPlaceholderFactory implements GlobalPlaceholderFactory { @Override - public Placeholder getPlaceholder(@Nullable String argument) { + public GlobalPlaceholder getPlaceholder(@Nullable String argument) { if (argument == null) { - return new StaticPlaceholder("[No world specified]"); + return new ImmutablePlaceholder("[No world specified]"); } String[] worldNames = Strings.splitAndTrim(argument, ","); @@ -26,7 +26,7 @@ public class WorldPlayersPlaceholderFactory implements PlaceholderFactory { } - private static class WorldPlayersPlaceholder implements Placeholder { + private static class WorldPlayersPlaceholder implements GlobalPlaceholder { private final String[] worldNames; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java index f0c682db..f28ce35b 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.placeholder.registry; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException; import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder; import org.bukkit.entity.Player; @@ -16,9 +16,9 @@ import org.jetbrains.annotations.Nullable; class GlobalPlaceholderExpansion extends PlaceholderExpansion { - private final PlaceholderFactory placeholderFactory; + private final GlobalPlaceholderFactory placeholderFactory; - GlobalPlaceholderExpansion(Plugin plugin, String identifier, PlaceholderFactory placeholderFactory) { + GlobalPlaceholderExpansion(Plugin plugin, String identifier, GlobalPlaceholderFactory placeholderFactory) { super(plugin, identifier); this.placeholderFactory = placeholderFactory; } @@ -30,7 +30,7 @@ class GlobalPlaceholderExpansion extends PlaceholderExpansion { @Override public @Nullable StandardPlaceholder createPlaceholder(String argument) throws PlaceholderException { - Placeholder placeholder; + GlobalPlaceholder placeholder; try { placeholder = placeholderFactory.getPlaceholder(argument); } catch (Throwable t) { @@ -47,9 +47,9 @@ class GlobalPlaceholderExpansion extends PlaceholderExpansion { private static class GlobalStandardPlaceholder extends StandardPlaceholder { - private final @NotNull Placeholder placeholder; + private final @NotNull GlobalPlaceholder placeholder; - GlobalStandardPlaceholder(@NotNull Placeholder placeholder, @NotNull GlobalPlaceholderExpansion source) { + GlobalStandardPlaceholder(@NotNull GlobalPlaceholder placeholder, @NotNull GlobalPlaceholderExpansion source) { super(source); this.placeholder = placeholder; } diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java index 03cf2581..7f8fe84b 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java @@ -11,9 +11,9 @@ import com.google.common.collect.Table; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacer; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName; @@ -51,15 +51,15 @@ public class PlaceholderRegistry { } public void registerGlobalPlaceholderReplacer( - Plugin plugin, String identifier, int refreshIntervalTicks, PlaceholderReplacer placeholderReplacer) { + Plugin plugin, String identifier, int refreshIntervalTicks, GlobalPlaceholderReplacer placeholderReplacer) { registerGlobalPlaceholder(plugin, identifier, new SimpleGlobalPlaceholder(refreshIntervalTicks, placeholderReplacer)); } - public void registerGlobalPlaceholder(Plugin plugin, String identifier, Placeholder placeholder) { + public void registerGlobalPlaceholder(Plugin plugin, String identifier, GlobalPlaceholder placeholder) { registerGlobalPlaceholderFactory(plugin, identifier, (String argument) -> placeholder); } - public void registerGlobalPlaceholderFactory(Plugin plugin, String identifier, PlaceholderFactory factory) { + public void registerGlobalPlaceholderFactory(Plugin plugin, String identifier, GlobalPlaceholderFactory factory) { PlaceholderExpansion expansion = new GlobalPlaceholderExpansion(plugin, identifier, factory); registerExpansion(expansion); } diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java index a8122cf4..6e5a84cc 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java @@ -5,15 +5,15 @@ */ package me.filoghost.holographicdisplays.plugin.placeholder.registry; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; -class SimpleGlobalPlaceholder implements Placeholder { +class SimpleGlobalPlaceholder implements GlobalPlaceholder { private final int refreshIntervalTicks; - private final PlaceholderReplacer placeholderReplacer; + private final GlobalPlaceholderReplacer placeholderReplacer; - SimpleGlobalPlaceholder(int refreshIntervalTicks, PlaceholderReplacer placeholderReplacer) { + SimpleGlobalPlaceholder(int refreshIntervalTicks, GlobalPlaceholderReplacer placeholderReplacer) { this.refreshIntervalTicks = refreshIntervalTicks; this.placeholderReplacer = placeholderReplacer; }