Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2025-01-01 13:47:41 +01:00
Code Issues Projects Releases Wiki Activity

Rename PlaceholderReplacer to PlaceholderReplacementSupplier

Browse Source
This commit is contained in:
filoghost 2021-09-19 21:08:26 +02:00
parent dc9f0fe2b4
commit 769d3dacb2
11 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java
View File

@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.api;
import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.api.hologram.Hologram;
import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacementSupplier;
import me.filoghost.holographicdisplays.api.placeholder.RegisteredPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.RegisteredPlaceholder;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -80,7 +80,7 @@ public interface HolographicDisplaysAPI {
/** /**
* @since 1 * @since 1
*/ */
void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull GlobalPlaceholderReplacer replacer); void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull GlobalPlaceholderReplacementSupplier replacementSupplier);
/** /**
* @since 1 * @since 1

2
api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java
View File

@ -8,6 +8,6 @@ package me.filoghost.holographicdisplays.api.placeholder;
/** /**
* @since 1 * @since 1
*/ */
public interface GlobalPlaceholder extends GlobalPlaceholderReplacer, Placeholder { public interface GlobalPlaceholder extends GlobalPlaceholderReplacementSupplier, Placeholder {
} }

2
api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplacer.java → api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplacementSupplier.java
View File

@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
* @since 1 * @since 1
*/ */
@FunctionalInterface @FunctionalInterface
public interface GlobalPlaceholderReplacer { public interface GlobalPlaceholderReplacementSupplier {
/** /**
* Callback for providing a placeholder replacement, given the argument of the placeholder (if present). * Callback for providing a placeholder replacement, given the argument of the placeholder (if present).

2
api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholder.java
View File

@ -8,6 +8,6 @@ package me.filoghost.holographicdisplays.api.placeholder;
/** /**
* @since 1 * @since 1
*/ */
public interface IndividualPlaceholder extends IndividualPlaceholderReplacer, Placeholder { public interface IndividualPlaceholder extends IndividualPlaceholderReplacementSupplier, Placeholder {
} }

2
api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderReplacer.java → api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderReplacementSupplier.java
View File

@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
* @since 1 * @since 1
*/ */
@FunctionalInterface @FunctionalInterface
public interface IndividualPlaceholderReplacer { public interface IndividualPlaceholderReplacementSupplier {
/** /**
* @since 1 * @since 1

8
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java
View File

@ -9,7 +9,7 @@ import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI;
import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.api.hologram.Hologram;
import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.api.Position;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacementSupplier;
import me.filoghost.holographicdisplays.api.placeholder.RegisteredPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.RegisteredPlaceholder;
import me.filoghost.holographicdisplays.plugin.hologram.base.ImmutablePosition; import me.filoghost.holographicdisplays.plugin.hologram.base.ImmutablePosition;
import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
@ -50,15 +50,15 @@ class DefaultHolographicDisplaysAPI implements HolographicDisplaysAPI {
} }
@Override @Override
public void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull GlobalPlaceholderReplacer replacer) { public void registerPlaceholder(@NotNull String identifier, int refreshIntervalTicks, @NotNull GlobalPlaceholderReplacementSupplier replacementSupplier) {
Preconditions.notEmpty(identifier, "identifier"); Preconditions.notEmpty(identifier, "identifier");
for (char c : identifier.toCharArray()) { for (char c : identifier.toCharArray()) {
Preconditions.checkArgument(isValidIdentifierCharacter(c), "identifier contains invalid character '" + c + "'"); Preconditions.checkArgument(isValidIdentifierCharacter(c), "identifier contains invalid character '" + c + "'");
} }
Preconditions.checkArgument(refreshIntervalTicks >= 0, "refreshIntervalTicks should be positive"); Preconditions.checkArgument(refreshIntervalTicks >= 0, "refreshIntervalTicks should be positive");
Preconditions.notNull(replacer, "replacer"); Preconditions.notNull(replacementSupplier, "replacementSupplier");
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, identifier, refreshIntervalTicks, replacer); placeholderRegistry.registerGlobalPlaceholder(plugin, identifier, refreshIntervalTicks, replacementSupplier);
} }
private boolean isValidIdentifierCharacter(char c) { private boolean isValidIdentifierCharacter(char c) {

2
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2HologramsAPIProvider.java
View File

@ -68,7 +68,7 @@ public class V2HologramsAPIProvider extends HologramsAPIProvider {
boolean alreadyRegistered = placeholderRegistry.isRegisteredIdentifier(plugin, textPlaceholder); boolean alreadyRegistered = placeholderRegistry.isRegisteredIdentifier(plugin, textPlaceholder);
if (!alreadyRegistered) { if (!alreadyRegistered) {
placeholderRegistry.registerGlobalPlaceholderReplacer( placeholderRegistry.registerGlobalPlaceholder(
plugin, plugin,
textPlaceholder, textPlaceholder,
refreshIntervalTicks, refreshIntervalTicks,

16
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/DefaultPlaceholders.java
View File

@ -30,7 +30,7 @@ public class DefaultPlaceholders {
BungeeServerTracker bungeeServerTracker) { BungeeServerTracker bungeeServerTracker) {
placeholderRegistry.unregisterAll(plugin); placeholderRegistry.unregisterAll(plugin);
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, "empty", Integer.MAX_VALUE, (argument) -> { placeholderRegistry.registerGlobalPlaceholder(plugin, "empty", Integer.MAX_VALUE, (argument) -> {
return ""; return "";
}); });
@ -43,7 +43,7 @@ public class DefaultPlaceholders {
ChatColor.LIGHT_PURPLE ChatColor.LIGHT_PURPLE
))); )));
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, "time", 10, (argument) -> { placeholderRegistry.registerGlobalPlaceholder(plugin, "time", 10, (argument) -> {
return Settings.timeFormat.format(Instant.now()); return Settings.timeFormat.format(Instant.now());
}); });
@ -53,7 +53,7 @@ public class DefaultPlaceholders {
placeholderRegistry.registerGlobalPlaceholderFactory(plugin, "online", new OnlinePlayersPlaceholderFactory(bungeeServerTracker)); placeholderRegistry.registerGlobalPlaceholderFactory(plugin, "online", new OnlinePlayersPlaceholderFactory(bungeeServerTracker));
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, "max_players", 20, (serverName) -> { placeholderRegistry.registerGlobalPlaceholder(plugin, "max_players", 20, (serverName) -> {
if (serverName == null) { if (serverName == null) {
// No argument specified, return max players of this server // No argument specified, return max players of this server
return String.valueOf(Bukkit.getMaxPlayers()); return String.valueOf(Bukkit.getMaxPlayers());
@ -66,7 +66,7 @@ public class DefaultPlaceholders {
return String.valueOf(bungeeServerTracker.getCurrentServerInfo(serverName).getMaxPlayers()); return String.valueOf(bungeeServerTracker.getCurrentServerInfo(serverName).getMaxPlayers());
}); });
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, "status", 20, (serverName) -> { placeholderRegistry.registerGlobalPlaceholder(plugin, "status", 20, (serverName) -> {
if (serverName == null) { if (serverName == null) {
return NO_SERVER_SPECIFIED_ERROR; return NO_SERVER_SPECIFIED_ERROR;
} }
@ -83,7 +83,7 @@ public class DefaultPlaceholders {
} }
}); });
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, "motd", 20, (serverName) -> { placeholderRegistry.registerGlobalPlaceholder(plugin, "motd", 20, (serverName) -> {
if (serverName == null) { if (serverName == null) {
return NO_SERVER_SPECIFIED_ERROR; return NO_SERVER_SPECIFIED_ERROR;
} }
@ -95,7 +95,7 @@ public class DefaultPlaceholders {
return bungeeServerTracker.getCurrentServerInfo(serverName).getMotdLine1(); return bungeeServerTracker.getCurrentServerInfo(serverName).getMotdLine1();
}); });
placeholderRegistry.registerGlobalPlaceholderReplacer(plugin, "motd2", 20, (serverName) -> { placeholderRegistry.registerGlobalPlaceholder(plugin, "motd2", 20, (serverName) -> {
if (serverName == null) { if (serverName == null) {
return NO_SERVER_SPECIFIED_ERROR; return NO_SERVER_SPECIFIED_ERROR;
} }
@ -107,11 +107,11 @@ public class DefaultPlaceholders {
return bungeeServerTracker.getCurrentServerInfo(serverName).getMotdLine2(); return bungeeServerTracker.getCurrentServerInfo(serverName).getMotdLine2();
}); });
placeholderRegistry.registerIndividualPlaceholderReplacer(plugin, "player", Integer.MAX_VALUE, (player, argument) -> { placeholderRegistry.registerIndividualPlaceholder(plugin, "player", Integer.MAX_VALUE, (player, argument) -> {
return player.getName(); return player.getName();
}); });
placeholderRegistry.registerIndividualPlaceholderReplacer(plugin, "displayName", 20, (player, argument) -> { placeholderRegistry.registerIndividualPlaceholder(plugin, "displayName", 20, (player, argument) -> {
return player.getDisplayName(); return player.getDisplayName();
}); });
} }

16
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java
View File

@ -10,10 +10,10 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Table; import com.google.common.collect.Table;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacementSupplier;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacementSupplier;
import me.filoghost.holographicdisplays.api.placeholder.RegisteredPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.RegisteredPlaceholder;
import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier;
import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
@ -39,9 +39,9 @@ public class PlaceholderRegistry {
return version.get(); return version.get();
} }
public void registerIndividualPlaceholderReplacer( public void registerIndividualPlaceholder(
Plugin plugin, String identifier, int refreshIntervalTicks, IndividualPlaceholderReplacer placeholderReplacer) { Plugin plugin, String identifier, int refreshIntervalTicks, IndividualPlaceholderReplacementSupplier replacementSupplier) {
registerIndividualPlaceholder(plugin, identifier, new SimpleIndividualPlaceholder(refreshIntervalTicks, placeholderReplacer)); registerIndividualPlaceholder(plugin, identifier, new SimpleIndividualPlaceholder(refreshIntervalTicks, replacementSupplier));
} }
public void registerIndividualPlaceholder(Plugin plugin, String identifier, IndividualPlaceholder placeholder) { public void registerIndividualPlaceholder(Plugin plugin, String identifier, IndividualPlaceholder placeholder) {
@ -53,9 +53,9 @@ public class PlaceholderRegistry {
registerExpansion(expansion); registerExpansion(expansion);
} }
public void registerGlobalPlaceholderReplacer( public void registerGlobalPlaceholder(
Plugin plugin, String identifier, int refreshIntervalTicks, GlobalPlaceholderReplacer placeholderReplacer) { Plugin plugin, String identifier, int refreshIntervalTicks, GlobalPlaceholderReplacementSupplier replacementSupplier) {
registerGlobalPlaceholder(plugin, identifier, new SimpleGlobalPlaceholder(refreshIntervalTicks, placeholderReplacer)); registerGlobalPlaceholder(plugin, identifier, new SimpleGlobalPlaceholder(refreshIntervalTicks, replacementSupplier));
} }
public void registerGlobalPlaceholder(Plugin plugin, String identifier, GlobalPlaceholder placeholder) { public void registerGlobalPlaceholder(Plugin plugin, String identifier, GlobalPlaceholder placeholder) {

10
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java
View File

@ -6,16 +6,16 @@
package me.filoghost.holographicdisplays.plugin.placeholder.registry; package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder;
import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplacementSupplier;
class SimpleGlobalPlaceholder implements GlobalPlaceholder { class SimpleGlobalPlaceholder implements GlobalPlaceholder {
private final int refreshIntervalTicks; private final int refreshIntervalTicks;
private final GlobalPlaceholderReplacer placeholderReplacer; private final GlobalPlaceholderReplacementSupplier replacementSupplier;
SimpleGlobalPlaceholder(int refreshIntervalTicks, GlobalPlaceholderReplacer placeholderReplacer) { SimpleGlobalPlaceholder(int refreshIntervalTicks, GlobalPlaceholderReplacementSupplier replacementSupplier) {
this.refreshIntervalTicks = refreshIntervalTicks; this.refreshIntervalTicks = refreshIntervalTicks;
this.placeholderReplacer = placeholderReplacer; this.replacementSupplier = replacementSupplier;
} }
@Override @Override
@ -25,7 +25,7 @@ class SimpleGlobalPlaceholder implements GlobalPlaceholder {
@Override @Override
public String getReplacement(String argument) { public String getReplacement(String argument) {
return placeholderReplacer.getReplacement(argument); return replacementSupplier.getReplacement(argument);
} }
} }

10
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleIndividualPlaceholder.java
View File

@ -6,7 +6,7 @@
package me.filoghost.holographicdisplays.plugin.placeholder.registry; package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacementSupplier;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -14,11 +14,11 @@ import org.jetbrains.annotations.Nullable;
class SimpleIndividualPlaceholder implements IndividualPlaceholder { class SimpleIndividualPlaceholder implements IndividualPlaceholder {
private final int refreshIntervalTicks; private final int refreshIntervalTicks;
private final IndividualPlaceholderReplacer placeholderReplacer; private final IndividualPlaceholderReplacementSupplier replacementSupplier;
SimpleIndividualPlaceholder(int refreshIntervalTicks, IndividualPlaceholderReplacer placeholderReplacer) { SimpleIndividualPlaceholder(int refreshIntervalTicks, IndividualPlaceholderReplacementSupplier replacementSupplier) {
this.refreshIntervalTicks = refreshIntervalTicks; this.refreshIntervalTicks = refreshIntervalTicks;
this.placeholderReplacer = placeholderReplacer; this.replacementSupplier = replacementSupplier;
} }
@Override @Override
@ -28,7 +28,7 @@ class SimpleIndividualPlaceholder implements IndividualPlaceholder {
@Override @Override
public String getReplacement(@NotNull Player player, @Nullable String argument) { public String getReplacement(@NotNull Player player, @Nullable String argument) {
return placeholderReplacer.getReplacement(player, argument); return replacementSupplier.getReplacement(player, argument);
} }
} }