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

Rename API classes and methods

This commit is contained in:
filoghost 2021-12-01 00:01:39 +01:00
parent fdd76f179e
commit 2c4aaa3f51
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java
View File

@ -22,7 +22,7 @@ public interface VisibilitySettings {
* @return the visibility
* @since 1
*/
@NotNull Visibility getVisibility();
@NotNull Visibility getGlobalVisibility();
/**
* Sets the visibility of the hologram. This value only affects player which do not have an individual visibility
@ -31,10 +31,10 @@ public interface VisibilitySettings {
* @param visibility the new visibility
* @since 1
*/
void setVisibility(@NotNull Visibility visibility);
void setGlobalVisibility(@NotNull Visibility visibility);
/**
* Sets the visibility for a specific player, overriding the global value of ({@link #getVisibility()}).
* Sets the visibility for a specific player, overriding the global value of ({@link #getGlobalVisibility()}).
* The individual visibility value can be removed with {@link #removeIndividualVisibility(Player)}.
*
* @since 1
@ -43,14 +43,14 @@ public interface VisibilitySettings {
/**
* Removes the individual visibility for a player. The visibility for the player would then be determined by the
* global visibility ({@link #getVisibility()}).
* global visibility ({@link #getGlobalVisibility()}).
*
* @since 1
*/
void removeIndividualVisibility(@NotNull Player player);
/**
* Removes the individual visibility all players which have one.
* Removes the individual visibility of all players which have one.
*
* @since 1
*/

4
api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java
View File

@ -20,7 +20,7 @@ public interface ClickableHologramLine extends HologramLine {
* @return the current click listener, null if not present
* @since 1
*/
@Nullable ClickListener getClickListener();
@Nullable HologramLineClickListener getClickListener();
/**
* Sets the click listener.
@ -28,6 +28,6 @@ public interface ClickableHologramLine extends HologramLine {
* @param clickListener the new click listener, null to unset
* @since 1
*/
void setClickListener(@Nullable ClickListener clickListener);
void setClickListener(@Nullable HologramLineClickListener clickListener);
}

2
api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickListener.java → api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java
View File

@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
* @since 1
*/
@FunctionalInterface
public interface ClickListener {
public interface HologramLineClickListener {
/**
* @since 1

2
api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/PickupListener.java → api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java
View File

@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
* @since 1
*/
@FunctionalInterface
public interface PickupListener {
public interface HologramLinePickupListener {
/**
* @since 1

4
api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java
View File

@ -35,7 +35,7 @@ public interface ItemHologramLine extends ClickableHologramLine {
* @return the current pickup listener, null if not present
* @since 1
*/
@Nullable PickupListener getPickupListener();
@Nullable HologramLinePickupListener getPickupListener();
/**
* Sets the pickup listener.
@ -43,6 +43,6 @@ public interface ItemHologramLine extends ClickableHologramLine {
* @param pickupListener the new pickup listener, null to unset
* @since 1
*/
void setPickupListener(@Nullable PickupListener pickupListener);
void setPickupListener(@Nullable HologramLinePickupListener pickupListener);
}

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

@ -5,7 +5,7 @@
*/
package me.filoghost.holographicdisplays.plugin.api.current;
import me.filoghost.holographicdisplays.api.hologram.line.ClickListener;
import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener;
import me.filoghost.holographicdisplays.api.hologram.line.ClickableHologramLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.ClickCallbackProvider;
import org.bukkit.entity.Player;
@ -20,7 +20,7 @@ interface APIClickableHologramLine extends ClickableHologramLine, APIHologramLin
@Override
default void invokeClickCallback(Player player) {
try {
ClickListener clickListener = getClickListener();
HologramLineClickListener clickListener = getClickListener();
if (clickListener != null) {
clickListener.onClick(new SimpleHologramLineClickEvent(player));
}

16
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIItemHologramLine.java
View File

@ -5,9 +5,9 @@
*/
package me.filoghost.holographicdisplays.plugin.api.current;
import me.filoghost.holographicdisplays.api.hologram.line.ClickListener;
import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener;
import me.filoghost.holographicdisplays.api.hologram.line.ItemHologramLine;
import me.filoghost.holographicdisplays.api.hologram.line.PickupListener;
import me.filoghost.holographicdisplays.api.hologram.line.HologramLinePickupListener;
import me.filoghost.holographicdisplays.plugin.hologram.base.BaseItemHologramLine;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -15,32 +15,32 @@ import org.jetbrains.annotations.Nullable;
class APIItemHologramLine extends BaseItemHologramLine implements ItemHologramLine, APIClickableHologramLine {
private PickupListener pickupListener;
private ClickListener clickListener;
private HologramLinePickupListener pickupListener;
private HologramLineClickListener clickListener;
APIItemHologramLine(APIHologram hologram, ItemStack itemStack) {
super(hologram, itemStack);
}
@Override
public @Nullable PickupListener getPickupListener() {
public @Nullable HologramLinePickupListener getPickupListener() {
return pickupListener;
}
@Override
public void setPickupListener(@Nullable PickupListener pickupListener) {
public void setPickupListener(@Nullable HologramLinePickupListener pickupListener) {
checkNotDeleted();
this.pickupListener = pickupListener;
}
@Override
public @Nullable ClickListener getClickListener() {
public @Nullable HologramLineClickListener getClickListener() {
return clickListener;
}
@Override
public void setClickListener(@Nullable ClickListener clickListener) {
public void setClickListener(@Nullable HologramLineClickListener clickListener) {
checkNotDeleted();
this.clickListener = clickListener;

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

@ -6,7 +6,7 @@
package me.filoghost.holographicdisplays.plugin.api.current;
import me.filoghost.holographicdisplays.api.hologram.ResolvePlaceholders;
import me.filoghost.holographicdisplays.api.hologram.line.ClickListener;
import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener;
import me.filoghost.holographicdisplays.api.hologram.line.TextHologramLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.BaseTextHologramLine;
import org.jetbrains.annotations.Nullable;
@ -15,7 +15,7 @@ class APITextHologramLine extends BaseTextHologramLine implements TextHologramLi
private final APIHologram hologram;
private ClickListener clickListener;
private HologramLineClickListener clickListener;
APITextHologramLine(APIHologram hologram, String text) {
super(hologram, text);
@ -28,14 +28,14 @@ class APITextHologramLine extends BaseTextHologramLine implements TextHologramLi
}
@Override
public void setClickListener(@Nullable ClickListener clickListener) {
public void setClickListener(@Nullable HologramLineClickListener clickListener) {
checkNotDeleted();
this.clickListener = clickListener;
}
@Override
public @Nullable ClickListener getClickListener() {
public @Nullable HologramLineClickListener getClickListener() {
return clickListener;
}

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

@ -24,12 +24,12 @@ public class DefaultVisibilitySettings implements VisibilitySettings {
}
@Override
public @NotNull Visibility getVisibility() {
public @NotNull Visibility getGlobalVisibility() {
return globalVisibility;
}
@Override
public void setVisibility(@NotNull Visibility visibility) {
public void setGlobalVisibility(@NotNull Visibility visibility) {
if (this.globalVisibility == visibility) {
return;
}

4
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManager.java
View File

@ -21,12 +21,12 @@ class V2VisibilityManager implements VisibilityManager {
@Override
public boolean isVisibleByDefault() {
return v3VisibilitySettings.getVisibility() == Visibility.VISIBLE;
return v3VisibilitySettings.getGlobalVisibility() == Visibility.VISIBLE;
}
@Override
public void setVisibleByDefault(boolean visibleByDefault) {
v3VisibilitySettings.setVisibility(visibleByDefault ? Visibility.VISIBLE : Visibility.HIDDEN);
v3VisibilitySettings.setGlobalVisibility(visibleByDefault ? Visibility.VISIBLE : Visibility.HIDDEN);
}
@Override