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

Reduce unnecessary class visibility

This commit is contained in:
filoghost 2021-09-25 11:00:22 +02:00
parent 651ac2f019
commit 11d57d40b7
19 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java
View File

@ -11,10 +11,8 @@ import me.filoghost.fcommons.FeatureSupport;
import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider;
import me.filoghost.holographicdisplays.nms.common.NMSManager;
import me.filoghost.holographicdisplays.plugin.api.current.APIHologram;
import me.filoghost.holographicdisplays.plugin.api.current.APIHologramManager;
import me.filoghost.holographicdisplays.plugin.api.current.DefaultHolographicDisplaysAPIProvider;
import me.filoghost.holographicdisplays.plugin.api.v2.V2Hologram;
import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramManager;
import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramsAPIProvider;
import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker;
@ -26,6 +24,7 @@ import me.filoghost.holographicdisplays.plugin.config.Settings;
import me.filoghost.holographicdisplays.plugin.config.upgrade.AnimationsLegacyUpgrade;
import me.filoghost.holographicdisplays.plugin.config.upgrade.DatabaseLegacyUpgrade;
import me.filoghost.holographicdisplays.plugin.config.upgrade.SymbolsLegacyUpgrade;
import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologram;
import me.filoghost.holographicdisplays.plugin.hologram.tracking.LineTrackerManager;
import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologramManager;
import me.filoghost.holographicdisplays.plugin.internal.placeholder.AnimationPlaceholderFactory;
@ -35,9 +34,9 @@ import me.filoghost.holographicdisplays.plugin.listener.LineClickListener;
import me.filoghost.holographicdisplays.plugin.listener.PlayerListener;
import me.filoghost.holographicdisplays.plugin.listener.UpdateNotificationListener;
import me.filoghost.holographicdisplays.plugin.log.PrintableErrorCollector;
import me.filoghost.holographicdisplays.plugin.tick.TickClock;
import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
import me.filoghost.holographicdisplays.plugin.placeholder.tracking.ActivePlaceholderTracker;
import me.filoghost.holographicdisplays.plugin.tick.TickClock;
import me.filoghost.holographicdisplays.plugin.tick.TickingTask;
import me.filoghost.holographicdisplays.plugin.util.NMSVersion;
import me.filoghost.holographicdisplays.plugin.util.NMSVersion.OutdatedVersionException;
@ -176,10 +175,10 @@ public class HolographicDisplays extends FCommonsPlugin {
HologramDatabase hologramDatabase = configManager.loadHologramDatabase(errorCollector);
hologramDatabase.createHolograms(internalHologramManager, errorCollector);
for (APIHologram hologram : apiHologramManager.getHolograms()) {
for (BaseHologram hologram : apiHologramManager.getHolograms()) {
hologram.getLines().updatePositions();
}
for (V2Hologram hologram : v2HologramManager.getHolograms()) {
for (BaseHologram hologram : v2HologramManager.getHolograms()) {
hologram.getLines().updatePositions();
}
}

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

@ -10,7 +10,7 @@ import me.filoghost.holographicdisplays.api.hologram.line.ClickableHologramLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.ClickCallbackProvider;
import org.bukkit.entity.Player;
public interface APIClickableHologramLine extends ClickableHologramLine, APIHologramLine, ClickCallbackProvider {
interface APIClickableHologramLine extends ClickableHologramLine, APIHologramLine, ClickCallbackProvider {
@Override
default boolean hasClickCallback() {

2
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APICollectableHologramLine.java
View File

@ -10,7 +10,7 @@ import me.filoghost.holographicdisplays.api.hologram.line.PickupListener;
import me.filoghost.holographicdisplays.plugin.hologram.base.PickupCallbackProvider;
import org.bukkit.entity.Player;
public interface APICollectableHologramLine extends CollectableHologramLine, APIHologramLine, PickupCallbackProvider {
interface APICollectableHologramLine extends CollectableHologramLine, APIHologramLine, PickupCallbackProvider {
@Override
default boolean hasPickupCallback() {

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

@ -16,7 +16,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
public class APIHologram extends BaseHologram implements Hologram {
class APIHologram extends BaseHologram implements Hologram {
private final APIHologramLines lines;
private final Plugin plugin;
@ -25,7 +25,7 @@ public class APIHologram extends BaseHologram implements Hologram {
private @NotNull ResolvePlaceholders resolvePlaceholders;
protected APIHologram(
APIHologram(
ImmutablePosition position,
Plugin plugin,
APIHologramManager hologramManager,

2
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIHologramLine.java
View File

@ -9,7 +9,7 @@ import me.filoghost.holographicdisplays.api.hologram.line.HologramLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.EditableHologramLine;
import org.bukkit.plugin.Plugin;
public interface APIHologramLine extends HologramLine, EditableHologramLine {
interface APIHologramLine extends HologramLine, EditableHologramLine {
void setChanged();

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

@ -15,11 +15,11 @@ import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class APIHologramLines extends BaseHologramLines<APIHologramLine> implements HologramLines {
class APIHologramLines extends BaseHologramLines<APIHologramLine> implements HologramLines {
private final APIHologram hologram;
public APIHologramLines(APIHologram hologram) {
APIHologramLines(APIHologram hologram) {
super(hologram);
this.hologram = hologram;
}

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

@ -24,13 +24,13 @@ public class APIHologramManager extends BaseHologramManager<APIHologram> {
this.lineTrackerManager = lineTrackerManager;
}
public APIHologram createHologram(ImmutablePosition position, Plugin plugin) {
APIHologram createHologram(ImmutablePosition position, Plugin plugin) {
APIHologram hologram = new APIHologram(position, plugin, this, lineTrackerManager);
super.addHologram(hologram);
return hologram;
}
public Collection<Hologram> getHologramsByPlugin(Plugin plugin) {
Collection<Hologram> getHologramsByPlugin(Plugin plugin) {
List<Hologram> ownedHolograms = new ArrayList<>();
for (APIHologram hologram : getHolograms()) {

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

@ -12,12 +12,12 @@ import me.filoghost.holographicdisplays.plugin.hologram.base.BaseItemHologramLin
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
public class APIItemHologramLine extends BaseItemHologramLine implements ItemHologramLine, APIClickableHologramLine, APICollectableHologramLine {
class APIItemHologramLine extends BaseItemHologramLine implements ItemHologramLine, APIClickableHologramLine, APICollectableHologramLine {
private PickupListener pickupListener;
private ClickListener clickListener;
public APIItemHologramLine(APIHologram hologram, ItemStack itemStack) {
APIItemHologramLine(APIHologram hologram, ItemStack itemStack) {
super(hologram, itemStack);
}

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

@ -11,13 +11,13 @@ import me.filoghost.holographicdisplays.api.hologram.line.TextHologramLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.BaseTextHologramLine;
import org.jetbrains.annotations.Nullable;
public class APITextHologramLine extends BaseTextHologramLine implements TextHologramLine, APIClickableHologramLine {
class APITextHologramLine extends BaseTextHologramLine implements TextHologramLine, APIClickableHologramLine {
private final APIHologram hologram;
private ClickListener clickListener;
public APITextHologramLine(APIHologram hologram, String text) {
APITextHologramLine(APIHologram hologram, String text) {
super(hologram, text);
this.hologram = hologram;
}

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

@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.plugin.api.current;
import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickEvent;
import org.bukkit.entity.Player;
public class SimpleHologramLineClickEvent implements HologramLineClickEvent {
class SimpleHologramLineClickEvent implements HologramLineClickEvent {
private final Player player;
public SimpleHologramLineClickEvent(Player player) {
SimpleHologramLineClickEvent(Player player) {
this.player = player;
}

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

@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.plugin.api.current;
import me.filoghost.holographicdisplays.api.hologram.line.HologramLinePickupEvent;
import org.bukkit.entity.Player;
public class SimpleHologramLinePickupEvent implements HologramLinePickupEvent {
class SimpleHologramLinePickupEvent implements HologramLinePickupEvent {
private final Player player;
public SimpleHologramLinePickupEvent(Player player) {
SimpleHologramLinePickupEvent(Player player) {
this.player = player;
}

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

@ -10,7 +10,7 @@ import com.gmail.filoghost.holographicdisplays.api.line.CollectableLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.PickupCallbackProvider;
import org.bukkit.entity.Player;
public interface V2CollectableLine extends CollectableLine, V2HologramLine, PickupCallbackProvider {
interface V2CollectableLine extends CollectableLine, V2HologramLine, PickupCallbackProvider {
@Override
default boolean hasPickupCallback() {

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

@ -21,7 +21,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
@SuppressWarnings("deprecation")
public class V2Hologram extends BaseHologram implements Hologram {
class V2Hologram extends BaseHologram implements Hologram {
private final Plugin plugin;
private final V2HologramManager hologramManager;
@ -30,7 +30,7 @@ public class V2Hologram extends BaseHologram implements Hologram {
private final long creationTimestamp;
private boolean allowPlaceholders;
public V2Hologram(
V2Hologram(
ImmutablePosition position,
Plugin plugin,
LineTrackerManager lineTrackerManager,

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

@ -10,7 +10,7 @@ import me.filoghost.holographicdisplays.plugin.hologram.base.EditableHologramLin
import org.bukkit.plugin.Plugin;
@SuppressWarnings("deprecation")
public interface V2HologramLine extends HologramLine, EditableHologramLine {
interface V2HologramLine extends HologramLine, EditableHologramLine {
@Override
V2Hologram getParent();

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

@ -18,7 +18,7 @@ public class V2HologramManager extends BaseHologramManager<V2Hologram> {
this.lineTrackerManager = lineTrackerManager;
}
public V2Hologram createHologram(ImmutablePosition position, Plugin plugin) {
V2Hologram createHologram(ImmutablePosition position, Plugin plugin) {
V2Hologram hologram = new V2Hologram(position, plugin, lineTrackerManager, this);
super.addHologram(hologram);
return hologram;

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

@ -12,14 +12,14 @@ import me.filoghost.holographicdisplays.plugin.hologram.base.BaseItemHologramLin
import org.bukkit.inventory.ItemStack;
@SuppressWarnings("deprecation")
public class V2ItemLine extends BaseItemHologramLine implements ItemLine, V2CollectableLine, V2TouchableLine {
class V2ItemLine extends BaseItemHologramLine implements ItemLine, V2CollectableLine, V2TouchableLine {
private final V2Hologram hologram;
private TouchHandler touchHandler;
private PickupHandler pickupHandler;
public V2ItemLine(V2Hologram hologram, ItemStack itemStack) {
V2ItemLine(V2Hologram hologram, ItemStack itemStack) {
super(hologram, itemStack);
this.hologram = hologram;
}

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

@ -10,13 +10,13 @@ import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.BaseTextHologramLine;
@SuppressWarnings("deprecation")
public class V2TextLine extends BaseTextHologramLine implements TextLine, V2TouchableLine {
class V2TextLine extends BaseTextHologramLine implements TextLine, V2TouchableLine {
private final V2Hologram hologram;
private TouchHandler touchHandler;
public V2TextLine(V2Hologram hologram, String text) {
V2TextLine(V2Hologram hologram, String text) {
super(hologram, text);
this.hologram = hologram;
}

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

@ -10,7 +10,7 @@ import com.gmail.filoghost.holographicdisplays.api.line.TouchableLine;
import me.filoghost.holographicdisplays.plugin.hologram.base.ClickCallbackProvider;
import org.bukkit.entity.Player;
public interface V2TouchableLine extends TouchableLine, V2HologramLine, ClickCallbackProvider {
interface V2TouchableLine extends TouchableLine, V2HologramLine, ClickCallbackProvider {
@Override
default boolean hasClickCallback() {

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

@ -11,11 +11,11 @@ import me.filoghost.holographicdisplays.plugin.api.current.DefaultVisibilitySett
import org.bukkit.entity.Player;
@SuppressWarnings("deprecation")
public class V2VisibilityManager implements VisibilityManager {
class V2VisibilityManager implements VisibilityManager {
private final DefaultVisibilitySettings v3VisibilitySettings;
public V2VisibilityManager() {
V2VisibilityManager() {
this.v3VisibilitySettings = new DefaultVisibilitySettings();
}