Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

API renaming

This commit is contained in:
filoghost 2022-04-22 20:01:29 +02:00
parent bf39afb630
commit 0cd4ac8f3e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java
View File

@ -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

6
api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/ResolvePlaceholders.java → api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java
View File

@ -5,10 +5,10 @@
*/
package me.filoghost.holographicdisplays.api.beta.hologram;
public enum ResolvePlaceholders {
public enum PlaceholderSetting {
DEFAULT,
ALL,
NONE
ENABLE_ALL,
DISABLE_ALL
}

18
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIHologram.java
View File

@ -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();
}

4
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java
View File

@ -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