fancyholograms v3: Rename de.oliver.fancyholograms package to com.fancyinnovations.fancyholograms

This commit is contained in:
Oliver
2025-07-25 19:10:07 +02:00
parent 9eb8ec9bd0
commit c2d40a76aa
117 changed files with 549 additions and 543 deletions

View File

@@ -77,9 +77,9 @@ dependencies {
paper {
name = "FancyHolograms"
main = "de.oliver.fancyholograms.main.FancyHologramsPlugin"
bootstrapper = "de.oliver.fancyholograms.main.FancyHologramsBootstrapper"
loader = "de.oliver.fancyholograms.main.FancyHologramsLoader"
main = "com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin"
bootstrapper = "com.fancyinnovations.fancyholograms.main.FancyHologramsBootstrapper"
loader = "com.fancyinnovations.fancyholograms.main.FancyHologramsLoader"
foliaSupported = true
version = getFHVersion()
description = "Simple, lightweight and fast hologram plugin using display entities"

View File

@@ -18,7 +18,7 @@ dependencies {
tasks {
shadowJar {
relocate("org.lushplugins.chatcolorhandler", "de.oliver.fancyholograms.libs.chatcolorhandler")
relocate("org.lushplugins.chatcolorhandler", "com.fancyinnovations.fancyholograms.libs.chatcolorhandler")
archiveClassifier.set("")
}

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.api;
package com.fancyinnovations.fancyholograms.api;
import de.oliver.fancyanalytics.logger.ExtendedFancyLogger;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.api.trait.HologramTraitRegistry;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.trait.HologramTraitRegistry;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.api;
package com.fancyinnovations.fancyholograms.api;
public interface HologramConfiguration {

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api;
package com.fancyinnovations.fancyholograms.api;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api;
package com.fancyinnovations.fancyholograms.api;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import java.util.Collection;
import java.util.Optional;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.data;
package com.fancyinnovations.fancyholograms.api.data;
import de.oliver.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.data;
package com.fancyinnovations.fancyholograms.api.data;
import de.oliver.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Display;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.api.data;
package com.fancyinnovations.fancyholograms.api.data;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.data.property.Visibility;
import de.oliver.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.data.property.Visibility;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.data;
package com.fancyinnovations.fancyholograms.api.data;
import de.oliver.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.data;
package com.fancyinnovations.fancyholograms.api.data;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Color;
import org.bukkit.Location;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.api.data;
package com.fancyinnovations.fancyholograms.api.data;
import org.bukkit.configuration.ConfigurationSection;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.data.builder;
package com.fancyinnovations.fancyholograms.api.data.builder;
import de.oliver.fancyholograms.api.data.BlockHologramData;
import com.fancyinnovations.fancyholograms.api.data.BlockHologramData;
import org.bukkit.Location;
import org.bukkit.Material;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.api.data.builder;
package com.fancyinnovations.fancyholograms.api.data.builder;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.data.property.Visibility;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.data.property.Visibility;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.entity.Display;
import org.joml.Vector3f;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.data.builder;
package com.fancyinnovations.fancyholograms.api.data.builder;
import de.oliver.fancyholograms.api.data.ItemHologramData;
import com.fancyinnovations.fancyholograms.api.data.ItemHologramData;
import org.bukkit.Location;
import org.bukkit.inventory.ItemStack;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.data.builder;
package com.fancyinnovations.fancyholograms.api.data.builder;
import de.oliver.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.entity.TextDisplay;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.data.property;
package com.fancyinnovations.fancyholograms.api.data.property;
import com.google.common.collect.HashMultimap;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.entity.Player;
import java.util.Arrays;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.api.trait.HologramTrait;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.trait.HologramTrait;
import org.bukkit.Bukkit;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import com.google.common.collect.ImmutableList;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.events;
package com.fancyinnovations.fancyholograms.api.events;
import com.google.common.collect.ImmutableList;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.api.hologram;
package com.fancyinnovations.fancyholograms.api.hologram;
import com.google.common.collect.Sets;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.trait.HologramTrait;
import de.oliver.fancyholograms.api.trait.HologramTraitTrait;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.trait.HologramTrait;
import com.fancyinnovations.fancyholograms.api.trait.HologramTraitTrait;
import net.kyori.adventure.text.Component;
import org.bukkit.Color;
import org.bukkit.entity.Player;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.api.hologram;
package com.fancyinnovations.fancyholograms.api.hologram;
import java.util.Arrays;
import java.util.List;

View File

@@ -1,10 +1,10 @@
package de.oliver.fancyholograms.api.trait;
package com.fancyinnovations.fancyholograms.api.trait;
import de.oliver.fancyanalytics.logger.ExtendedFancyLogger;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.HologramController;
import de.oliver.fancyholograms.api.HologramRegistry;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.HologramController;
import com.fancyinnovations.fancyholograms.api.HologramRegistry;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import de.oliver.jdb.JDB;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.ApiStatus;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.api.trait;
package com.fancyinnovations.fancyholograms.api.trait;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.api.trait;
package com.fancyinnovations.fancyholograms.api.trait;
import org.jetbrains.annotations.ApiStatus;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.api.trait;
package com.fancyinnovations.fancyholograms.api.trait;
import de.oliver.fancyholograms.api.events.HologramTraitAttachedEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.events.HologramTraitAttachedEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.entity.Player;
import java.io.IOException;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands;
package com.fancyinnovations.fancyholograms.commands;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.converter.ConverterTarget;
import de.oliver.fancyholograms.converter.FHConversionRegistry;
import de.oliver.fancyholograms.converter.HologramConversionSession;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.converter.ConverterTarget;
import com.fancyinnovations.fancyholograms.converter.FHConversionRegistry;
import com.fancyinnovations.fancyholograms.converter.HologramConversionSession;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.commands;
package com.fancyinnovations.fancyholograms.commands;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.tests.FHTests;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.tests.FHTests;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;

View File

@@ -1,15 +1,15 @@
package de.oliver.fancyholograms.commands;
package com.fancyinnovations.fancyholograms.commands;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.commands.hologram.*;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.PluginUtils;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.api.hologram.HologramType;
import de.oliver.fancyholograms.commands.hologram.*;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.PluginUtils;
import de.oliver.fancylib.MessageHelper;
import de.oliver.fancynpcs.api.FancyNpcsPlugin;
import net.kyori.adventure.text.format.NamedTextColor;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.commands;
package com.fancyinnovations.fancyholograms.commands;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Color;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.base.Enums;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.apache.commons.lang3.StringUtils;
import org.bukkit.command.CommandSender;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.BlockHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.BlockHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;

View File

@@ -1,10 +1,10 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.NumberHelper;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.NumberHelper;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Display;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.Formats;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.Formats;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.events.HologramCreateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.events.HologramCreateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Bukkit;
import org.bukkit.Location;

View File

@@ -1,14 +1,14 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.BlockHologramData;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.data.ItemHologramData;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramCreateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.api.hologram.HologramType;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.BlockHologramData;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.data.ItemHologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramCreateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.*;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
@@ -34,7 +34,7 @@ public class InfoCMD implements Subcommand {
MessageHelper.info(player, "Location: <gray>" + data.getWorldName() + " " + data.getLocation().getX() + " / " + data.getLocation().getY() + " / " + data.getLocation().getZ());
MessageHelper.info(player, "Visibility distance: <gray>" + data.getVisibilityDistance() + " blocks");
if (data instanceof DisplayHologramData displayData) {
if (data instanceof com.fancyinnovations.fancyholograms.api.data.DisplayHologramData displayData) {
Vector3f scale = displayData.getScale();
if (scale.x() == scale.y() && scale.y() == scale.z()) {
MessageHelper.info(player, "Scale: <gray>x" + displayData.getScale().x());
@@ -51,7 +51,7 @@ public class InfoCMD implements Subcommand {
MessageHelper.info(player, "Linked npc: <gray>" + data.getLinkedNpcName());
}
if (data instanceof TextHologramData textData) {
if (data instanceof com.fancyinnovations.fancyholograms.api.data.TextHologramData textData) {
MessageHelper.info(player, "Text: ");
for (String line : textData.getText()) {
MessageHelper.info(player, " <reset> " + line);
@@ -71,9 +71,9 @@ public class InfoCMD implements Subcommand {
} else {
MessageHelper.info(player, "Update text interval: <gray>" + textData.getTextUpdateInterval() + " ticks");
}
} else if (data instanceof BlockHologramData blockData) {
} else if (data instanceof com.fancyinnovations.fancyholograms.api.data.BlockHologramData blockData) {
MessageHelper.info(player, "Block: <gray>" + blockData.getBlock().name());
} else if (data instanceof ItemHologramData itemData) {
} else if (data instanceof com.fancyinnovations.fancyholograms.api.data.ItemHologramData itemData) {
MessageHelper.info(player, "Item: <gray>" + itemData.getItemStack().getType().name());
}

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.ItemHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.ItemHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.PluginUtils;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.PluginUtils;
import de.oliver.fancylib.MessageHelper;
import de.oliver.fancynpcs.api.FancyNpcsPlugin;
import org.bukkit.command.CommandSender;

View File

@@ -1,10 +1,10 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.Formats;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.Formats;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Doubles;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.Formats;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.Formats;
import de.oliver.fancylib.MessageHelper;
import org.apache.commons.lang3.StringUtils;
import org.bukkit.Location;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;

View File

@@ -1,10 +1,10 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.Formats;
import de.oliver.fancyholograms.util.NumberHelper;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.Formats;
import com.fancyinnovations.fancyholograms.util.NumberHelper;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;

View File

@@ -1,10 +1,10 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.events.HologramDeleteEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.events.HologramDeleteEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Floats;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Floats;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Floats;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.base.Enums;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.TextDisplay;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Floats;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.PluginUtils;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.PluginUtils;
import de.oliver.fancylib.MessageHelper;
import de.oliver.fancynpcs.api.FancyNpcsPlugin;
import org.bukkit.command.CommandSender;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import de.oliver.fancyholograms.api.data.property.Visibility;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.property.Visibility;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,11 +1,11 @@
package de.oliver.fancyholograms.commands.hologram;
package com.fancyinnovations.fancyholograms.commands.hologram;
import com.google.common.primitives.Ints;
import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.Subcommand;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.events.HologramUpdateEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.Subcommand;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.commands.lampCommands.fancyholograms;
package com.fancyinnovations.fancyholograms.commands.lampCommands.fancyholograms;
import com.fancyinnovations.config.Config;
import com.fancyinnovations.config.ConfigField;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.translations.Translator;
import revxrsal.commands.annotation.Command;
import revxrsal.commands.annotation.Description;

View File

@@ -1,9 +1,9 @@
package de.oliver.fancyholograms.config;
package com.fancyinnovations.fancyholograms.config;
import com.fancyinnovations.config.Config;
import com.fancyinnovations.config.ConfigField;
import de.oliver.fancyholograms.api.HologramConfiguration;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.HologramConfiguration;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
public final class FHConfiguration implements HologramConfiguration {

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.controller;
package com.fancyinnovations.fancyholograms.controller;
import com.google.common.cache.CacheBuilder;
import de.oliver.fancyholograms.api.HologramController;
import de.oliver.fancyholograms.api.data.DisplayHologramData;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.HologramController;
import com.fancyinnovations.fancyholograms.api.data.DisplayHologramData;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancynpcs.api.FancyNpcsPlugin;
import org.bukkit.Bukkit;
import org.bukkit.Location;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.converter;
package com.fancyinnovations.fancyholograms.converter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.converter;
package com.fancyinnovations.fancyholograms.converter;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.data.ItemHologramData;
import de.oliver.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.ItemHologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Bukkit;
import org.bukkit.Location;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.converter;
package com.fancyinnovations.fancyholograms.converter;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.converter;
package com.fancyinnovations.fancyholograms.converter;
import de.oliver.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import de.oliver.fancylib.MessageHelper;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.converter;
package com.fancyinnovations.fancyholograms.converter;
import de.oliver.fancyanalytics.sdk.events.Event;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;

View File

@@ -1,13 +1,13 @@
package de.oliver.fancyholograms.hologram;
package com.fancyinnovations.fancyholograms.hologram;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.viaversion.viaversion.api.Via;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.data.*;
import de.oliver.fancyholograms.api.events.HologramDespawnEvent;
import de.oliver.fancyholograms.api.events.HologramSpawnEvent;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.PluginUtils;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.events.HologramDespawnEvent;
import com.fancyinnovations.fancyholograms.api.events.HologramSpawnEvent;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.PluginUtils;
import de.oliver.fancysitula.api.entities.*;
import de.oliver.fancysitula.factories.FancySitula;
import org.bukkit.entity.Player;
@@ -134,7 +134,7 @@ public final class HologramImpl extends Hologram {
final var location = data.getLocation();
fsDisplay.setLocation(location);
if (fsDisplay instanceof FS_TextDisplay textDisplay && data instanceof TextHologramData textData) {
if (fsDisplay instanceof FS_TextDisplay textDisplay && data instanceof com.fancyinnovations.fancyholograms.api.data.TextHologramData textData) {
// line width
textDisplay.setLineWidth(Hologram.LINE_WIDTH);
@@ -160,17 +160,17 @@ public final class HologramImpl extends Hologram {
textDisplay.setAlignRight(false);
}
}
} else if (fsDisplay instanceof FS_ItemDisplay itemDisplay && data instanceof ItemHologramData itemData) {
} else if (fsDisplay instanceof FS_ItemDisplay itemDisplay && data instanceof com.fancyinnovations.fancyholograms.api.data.ItemHologramData itemData) {
// item
itemDisplay.setItem(itemData.getItemStack());
} else if (fsDisplay instanceof FS_BlockDisplay blockDisplay && data instanceof BlockHologramData blockData) {
} else if (fsDisplay instanceof FS_BlockDisplay blockDisplay && data instanceof com.fancyinnovations.fancyholograms.api.data.BlockHologramData blockData) {
// block
// BlockType blockType = RegistryAccess.registryAccess().getRegistry(RegistryKey.BLOCK).get(blockData.getBlock().getKey());
blockDisplay.setBlock(blockData.getBlock().createBlockData().createBlockState());
}
if (data instanceof DisplayHologramData displayData) {
if (data instanceof com.fancyinnovations.fancyholograms.api.data.DisplayHologramData displayData) {
// interpolation
fsDisplay.setTransformationInterpolationDuration(displayData.getInterpolationDuration());
fsDisplay.setTransformationInterpolationStartDeltaTicks(0);

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.listeners;
package com.fancyinnovations.fancyholograms.listeners;
import de.oliver.fancyholograms.api.events.HologramSpawnEvent;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancyholograms.util.PluginUtils;
import com.fancyinnovations.fancyholograms.api.events.HologramSpawnEvent;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.util.PluginUtils;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.geysermc.floodgate.api.FloodgateApi;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.listeners;
package com.fancyinnovations.fancyholograms.listeners;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.FancyLib;
import de.oliver.fancylib.MessageHelper;
import de.oliver.fancynpcs.api.events.NpcModifyEvent;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.listeners;
package com.fancyinnovations.fancyholograms.listeners;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.listeners;
package com.fancyinnovations.fancyholograms.listeners;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import io.papermc.paper.event.player.PlayerClientLoadedWorldEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.listeners;
package com.fancyinnovations.fancyholograms.listeners;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldLoadEvent;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.main;
package com.fancyinnovations.fancyholograms.main;
import io.papermc.paper.plugin.bootstrap.BootstrapContext;
import io.papermc.paper.plugin.bootstrap.PluginBootstrap;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.main;
package com.fancyinnovations.fancyholograms.main;
import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
import io.papermc.paper.plugin.loader.PluginLoader;

View File

@@ -1,36 +1,36 @@
package de.oliver.fancyholograms.main;
package com.fancyinnovations.fancyholograms.main;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.HologramConfiguration;
import com.fancyinnovations.fancyholograms.api.HologramController;
import com.fancyinnovations.fancyholograms.api.HologramRegistry;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.commands.FancyHologramsCMD;
import com.fancyinnovations.fancyholograms.commands.FancyHologramsTestCMD;
import com.fancyinnovations.fancyholograms.commands.HologramCMD;
import com.fancyinnovations.fancyholograms.commands.lampCommands.fancyholograms.ConfigCMD;
import com.fancyinnovations.fancyholograms.config.FHConfiguration;
import com.fancyinnovations.fancyholograms.controller.HologramControllerImpl;
import com.fancyinnovations.fancyholograms.converter.FHConversionRegistry;
import com.fancyinnovations.fancyholograms.hologram.HologramImpl;
import com.fancyinnovations.fancyholograms.listeners.*;
import com.fancyinnovations.fancyholograms.metrics.FHMetrics;
import com.fancyinnovations.fancyholograms.registry.HologramRegistryImpl;
import com.fancyinnovations.fancyholograms.storage.HologramStorage;
import com.fancyinnovations.fancyholograms.storage.StorageMigrator;
import com.fancyinnovations.fancyholograms.storage.json.JsonStorage;
import com.fancyinnovations.fancyholograms.trait.HologramTraitRegistryImpl;
import com.fancyinnovations.fancyholograms.trait.builtin.FileContentTrait;
import com.fancyinnovations.fancyholograms.trait.builtin.InteractionTrait;
import com.fancyinnovations.fancyholograms.trait.builtin.MultiplePagesTrait;
import com.fancyinnovations.fancyholograms.util.PluginUtils;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import de.oliver.fancyanalytics.logger.ExtendedFancyLogger;
import de.oliver.fancyanalytics.logger.LogLevel;
import de.oliver.fancyanalytics.logger.appender.Appender;
import de.oliver.fancyanalytics.logger.appender.ConsoleAppender;
import de.oliver.fancyanalytics.logger.appender.JsonAppender;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.HologramConfiguration;
import de.oliver.fancyholograms.api.HologramController;
import de.oliver.fancyholograms.api.HologramRegistry;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.commands.FancyHologramsCMD;
import de.oliver.fancyholograms.commands.FancyHologramsTestCMD;
import de.oliver.fancyholograms.commands.HologramCMD;
import de.oliver.fancyholograms.commands.lampCommands.fancyholograms.ConfigCMD;
import de.oliver.fancyholograms.config.FHConfiguration;
import de.oliver.fancyholograms.controller.HologramControllerImpl;
import de.oliver.fancyholograms.converter.FHConversionRegistry;
import de.oliver.fancyholograms.hologram.version.HologramImpl;
import de.oliver.fancyholograms.listeners.*;
import de.oliver.fancyholograms.metrics.FHMetrics;
import de.oliver.fancyholograms.registry.HologramRegistryImpl;
import de.oliver.fancyholograms.storage.HologramStorage;
import de.oliver.fancyholograms.storage.StorageMigrator;
import de.oliver.fancyholograms.storage.json.JsonStorage;
import de.oliver.fancyholograms.trait.HologramTraitRegistryImpl;
import de.oliver.fancyholograms.trait.builtin.FileContentTrait;
import de.oliver.fancyholograms.trait.builtin.InteractionTrait;
import de.oliver.fancyholograms.trait.builtin.MultiplePagesTrait;
import de.oliver.fancyholograms.util.PluginUtils;
import de.oliver.fancylib.FancyLib;
import de.oliver.fancylib.VersionConfig;
import de.oliver.fancylib.serverSoftware.ServerSoftware;

View File

@@ -1,10 +1,10 @@
package de.oliver.fancyholograms.metrics;
package com.fancyinnovations.fancyholograms.metrics;
import de.oliver.fancyanalytics.api.FancyAnalyticsAPI;
import de.oliver.fancyanalytics.api.metrics.MetricSupplier;
import de.oliver.fancyanalytics.logger.ExtendedFancyLogger;
import de.oliver.fancyholograms.api.HologramRegistry;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.HologramRegistry;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import de.oliver.fancylib.Metrics;
import org.bukkit.Bukkit;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.registry;
package com.fancyinnovations.fancyholograms.registry;
import de.oliver.fancyholograms.api.HologramRegistry;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.HologramRegistry;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

View File

@@ -1,6 +1,6 @@
package de.oliver.fancyholograms.storage;
package com.fancyinnovations.fancyholograms.storage;
import de.oliver.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import java.util.Collection;

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.storage;
package com.fancyinnovations.fancyholograms.storage;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.hologram.Hologram;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.Hologram;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import java.util.Collection;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.storage;
package com.fancyinnovations.fancyholograms.storage;
public enum StorageType {

View File

@@ -1,8 +1,8 @@
package de.oliver.fancyholograms.storage;
package com.fancyinnovations.fancyholograms.storage;
import de.oliver.fancyholograms.api.data.*;
import de.oliver.fancyholograms.api.hologram.HologramType;
import de.oliver.fancyholograms.main.FancyHologramsPlugin;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin;
import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -23,7 +23,7 @@ public class YamlHologramStorage implements HologramStorage {
public static final File HOLOGRAMS_CONFIG_FILE = new File("plugins/FancyHolograms/holograms.yml");
private static final ReadWriteLock lock = new ReentrantReadWriteLock();
public void saveBatch(Collection<HologramData> holograms) {
public void saveBatch(Collection<com.fancyinnovations.fancyholograms.api.data.HologramData> holograms) {
lock.readLock().lock();
boolean success = false;
@@ -46,7 +46,7 @@ public class YamlHologramStorage implements HologramStorage {
FancyHologramsPlugin.get().getFancyLogger().debug("Saved " + holograms.size() + " holograms to file");
}
public void save(HologramData hologram) {
public void save(com.fancyinnovations.fancyholograms.api.data.HologramData hologram) {
lock.readLock().lock();
boolean success = false;
@@ -66,7 +66,7 @@ public class YamlHologramStorage implements HologramStorage {
FancyHologramsPlugin.get().getFancyLogger().debug("Saved hologram " + hologram.getName() + " to file");
}
public void delete(HologramData hologram) {
public void delete(com.fancyinnovations.fancyholograms.api.data.HologramData hologram) {
lock.readLock().lock();
boolean success = false;
@@ -86,14 +86,14 @@ public class YamlHologramStorage implements HologramStorage {
FancyHologramsPlugin.get().getFancyLogger().debug("Deleted hologram " + hologram.getName() + " from file");
}
public Collection<HologramData> loadAll() {
List<HologramData> holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, null);
public Collection<com.fancyinnovations.fancyholograms.api.data.HologramData> loadAll() {
List<com.fancyinnovations.fancyholograms.api.data.HologramData> holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, null);
FancyHologramsPlugin.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file");
return holograms;
}
public Collection<HologramData> loadAll(String world) {
List<HologramData> holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, world);
public Collection<com.fancyinnovations.fancyholograms.api.data.HologramData> loadAll(String world) {
List<com.fancyinnovations.fancyholograms.api.data.HologramData> holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, world);
FancyHologramsPlugin.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file (world=" + world + ")");
return holograms;
}
@@ -101,7 +101,7 @@ public class YamlHologramStorage implements HologramStorage {
/**
* @param world The world to load the holograms from. (null for all worlds)
*/
private List<HologramData> readHolograms(@NotNull File configFile, @Nullable String world) {
private List<com.fancyinnovations.fancyholograms.api.data.HologramData> readHolograms(@NotNull File configFile, @Nullable String world) {
lock.readLock().lock();
try {
YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
@@ -118,7 +118,7 @@ public class YamlHologramStorage implements HologramStorage {
return new ArrayList<>(0);
}
List<HologramData> holograms = new ArrayList<>();
List<com.fancyinnovations.fancyholograms.api.data.HologramData> holograms = new ArrayList<>();
ConfigurationSection hologramsSection = config.getConfigurationSection("holograms");
for (String name : hologramsSection.getKeys(false)) {
@@ -144,11 +144,14 @@ public class YamlHologramStorage implements HologramStorage {
continue;
}
DisplayHologramData displayData = null;
com.fancyinnovations.fancyholograms.api.data.DisplayHologramData displayData = null;
switch (type) {
case TEXT -> displayData = new TextHologramData(name, new Location(null, 0, 0, 0));
case ITEM -> displayData = new ItemHologramData(name, new Location(null, 0, 0, 0));
case BLOCK -> displayData = new BlockHologramData(name, new Location(null, 0, 0, 0));
case TEXT ->
displayData = new com.fancyinnovations.fancyholograms.api.data.TextHologramData(name, new Location(null, 0, 0, 0));
case ITEM ->
displayData = new com.fancyinnovations.fancyholograms.api.data.ItemHologramData(name, new Location(null, 0, 0, 0));
case BLOCK ->
displayData = new com.fancyinnovations.fancyholograms.api.data.BlockHologramData(name, new Location(null, 0, 0, 0));
}
displayData.setWorldName(holoSection.getString("location.world"));

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.storage.json;
package com.fancyinnovations.fancyholograms.storage.json;
import de.oliver.fancyholograms.api.data.*;
import de.oliver.fancyholograms.storage.json.model.*;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.storage.json.model.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@@ -11,7 +11,7 @@ import org.joml.Vector3f;
public class JsonAdapter {
public static JsonHologramData hologramDataToJson(HologramData data) {
public static JsonHologramData hologramDataToJson(com.fancyinnovations.fancyholograms.api.data.HologramData data) {
return new JsonHologramData(
data.getName(),
data.getType(),
@@ -30,7 +30,7 @@ public class JsonAdapter {
);
}
public static JsonDisplayHologramData displayHologramDataToJson(DisplayHologramData data) {
public static JsonDisplayHologramData displayHologramDataToJson(com.fancyinnovations.fancyholograms.api.data.DisplayHologramData data) {
return new JsonDisplayHologramData(
new JsonVec3f(
data.getScale().x(),
@@ -52,7 +52,7 @@ public class JsonAdapter {
);
}
public static JsonTextHologramData textHologramDataToJson(TextHologramData data) {
public static JsonTextHologramData textHologramDataToJson(com.fancyinnovations.fancyholograms.api.data.TextHologramData data) {
return new JsonTextHologramData(
data.getText(),
data.hasTextShadow(),
@@ -63,19 +63,19 @@ public class JsonAdapter {
);
}
public static JsonBlockHologramData blockHologramDataToJson(BlockHologramData data) {
public static JsonBlockHologramData blockHologramDataToJson(com.fancyinnovations.fancyholograms.api.data.BlockHologramData data) {
return new JsonBlockHologramData(
data.getBlock().name()
);
}
public static JsonItemHologramData itemHologramDataToJson(ItemHologramData data) {
public static JsonItemHologramData itemHologramDataToJson(com.fancyinnovations.fancyholograms.api.data.ItemHologramData data) {
return new JsonItemHologramData(
new String(data.getItemStack().serializeAsBytes())
);
}
public static JsonDataUnion toUnion(TextHologramData data) {
public static JsonDataUnion toUnion(com.fancyinnovations.fancyholograms.api.data.TextHologramData data) {
JsonHologramData hologramData = hologramDataToJson(data);
JsonDisplayHologramData displayHologramData = displayHologramDataToJson(data);
JsonTextHologramData textHologramData = textHologramDataToJson(data);
@@ -89,7 +89,7 @@ public class JsonAdapter {
);
}
public static JsonDataUnion toUnion(ItemHologramData data) {
public static JsonDataUnion toUnion(com.fancyinnovations.fancyholograms.api.data.ItemHologramData data) {
JsonHologramData hologramData = hologramDataToJson(data);
JsonDisplayHologramData displayHologramData = displayHologramDataToJson(data);
JsonItemHologramData itemHologramData = itemHologramDataToJson(data);
@@ -103,7 +103,7 @@ public class JsonAdapter {
);
}
public static JsonDataUnion toUnion(BlockHologramData data) {
public static JsonDataUnion toUnion(com.fancyinnovations.fancyholograms.api.data.BlockHologramData data) {
JsonHologramData hologramData = hologramDataToJson(data);
JsonDisplayHologramData displayHologramData = displayHologramDataToJson(data);
JsonBlockHologramData blockHologramData = blockHologramDataToJson(data);
@@ -117,7 +117,7 @@ public class JsonAdapter {
);
}
public static HologramData fromJson(JsonDataUnion data) {
public static com.fancyinnovations.fancyholograms.api.data.HologramData fromJson(JsonDataUnion data) {
if (!data.hologram_data().worldName().equals(data.hologram_data().location().world())) {
throw new IllegalArgumentException("World name in hologram data does not match location world");
}
@@ -150,48 +150,51 @@ public class JsonAdapter {
}
HologramData hologramData = switch (data.hologram_data().type()) {
case TEXT -> new TextHologramData(data.hologram_data().name(), loc)
.setText(data.text_data().text()) // text data
.setBackground(data.text_data().background_color())
.setTextAlignment(data.text_data().text_alignment())
.setTextShadow(data.text_data().text_shadow())
.setSeeThrough(data.text_data().see_through())
.setTextUpdateInterval(data.text_data().text_update_interval())
.setBillboard(data.display_data().billboard()) // display data
.setScale(scale)
.setTranslation(translation)
.setBrightness(brightness)
.setShadowRadius(data.display_data().shadow_radius())
.setShadowStrength(data.display_data().shadow_strength())
.setWorldName(data.hologram_data().worldName())// hologram data
.setVisibilityDistance(data.hologram_data().visibilityDistance())
.setVisibility(data.hologram_data().visibility())
.setLinkedNpcName(data.hologram_data().linkedNpcName());
case TEXT ->
new com.fancyinnovations.fancyholograms.api.data.TextHologramData(data.hologram_data().name(), loc)
.setText(data.text_data().text()) // text data
.setBackground(data.text_data().background_color())
.setTextAlignment(data.text_data().text_alignment())
.setTextShadow(data.text_data().text_shadow())
.setSeeThrough(data.text_data().see_through())
.setTextUpdateInterval(data.text_data().text_update_interval())
.setBillboard(data.display_data().billboard()) // display data
.setScale(scale)
.setTranslation(translation)
.setBrightness(brightness)
.setShadowRadius(data.display_data().shadow_radius())
.setShadowStrength(data.display_data().shadow_strength())
.setWorldName(data.hologram_data().worldName())// hologram data
.setVisibilityDistance(data.hologram_data().visibilityDistance())
.setVisibility(data.hologram_data().visibility())
.setLinkedNpcName(data.hologram_data().linkedNpcName());
case ITEM -> new ItemHologramData(data.hologram_data().name(), loc)
.setItemStack(ItemStack.deserializeBytes(data.item_data().item().getBytes())) // item data
.setBillboard(data.display_data().billboard()) // display data
.setScale(scale)
.setTranslation(translation)
.setBrightness(brightness)
.setShadowRadius(data.display_data().shadow_radius())
.setShadowStrength(data.display_data().shadow_strength())
.setWorldName(data.hologram_data().worldName())// hologram data
.setVisibilityDistance(data.hologram_data().visibilityDistance())
.setVisibility(data.hologram_data().visibility())
.setLinkedNpcName(data.hologram_data().linkedNpcName());
case BLOCK -> new BlockHologramData(data.hologram_data().name(), loc)
.setBlock(Material.getMaterial(data.block_data().block_material())) // block data
.setBillboard(data.display_data().billboard()) // display data
.setScale(scale)
.setTranslation(translation)
.setBrightness(brightness)
.setShadowRadius(data.display_data().shadow_radius())
.setShadowStrength(data.display_data().shadow_strength())
.setWorldName(data.hologram_data().worldName())// hologram data
.setVisibilityDistance(data.hologram_data().visibilityDistance())
.setVisibility(data.hologram_data().visibility())
.setLinkedNpcName(data.hologram_data().linkedNpcName());
case ITEM ->
new com.fancyinnovations.fancyholograms.api.data.ItemHologramData(data.hologram_data().name(), loc)
.setItemStack(ItemStack.deserializeBytes(data.item_data().item().getBytes())) // item data
.setBillboard(data.display_data().billboard()) // display data
.setScale(scale)
.setTranslation(translation)
.setBrightness(brightness)
.setShadowRadius(data.display_data().shadow_radius())
.setShadowStrength(data.display_data().shadow_strength())
.setWorldName(data.hologram_data().worldName())// hologram data
.setVisibilityDistance(data.hologram_data().visibilityDistance())
.setVisibility(data.hologram_data().visibility())
.setLinkedNpcName(data.hologram_data().linkedNpcName());
case BLOCK ->
new com.fancyinnovations.fancyholograms.api.data.BlockHologramData(data.hologram_data().name(), loc)
.setBlock(Material.getMaterial(data.block_data().block_material())) // block data
.setBillboard(data.display_data().billboard()) // display data
.setScale(scale)
.setTranslation(translation)
.setBrightness(brightness)
.setShadowRadius(data.display_data().shadow_radius())
.setShadowStrength(data.display_data().shadow_strength())
.setWorldName(data.hologram_data().worldName())// hologram data
.setVisibilityDistance(data.hologram_data().visibilityDistance())
.setVisibility(data.hologram_data().visibility())
.setLinkedNpcName(data.hologram_data().linkedNpcName());
};
return hologramData;

View File

@@ -1,12 +1,12 @@
package de.oliver.fancyholograms.storage.json;
package com.fancyinnovations.fancyholograms.storage.json;
import de.oliver.fancyholograms.api.FancyHolograms;
import de.oliver.fancyholograms.api.data.BlockHologramData;
import de.oliver.fancyholograms.api.data.HologramData;
import de.oliver.fancyholograms.api.data.ItemHologramData;
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.storage.HologramStorage;
import de.oliver.fancyholograms.storage.json.model.JsonDataUnion;
import com.fancyinnovations.fancyholograms.api.FancyHolograms;
import com.fancyinnovations.fancyholograms.api.data.BlockHologramData;
import com.fancyinnovations.fancyholograms.api.data.HologramData;
import com.fancyinnovations.fancyholograms.api.data.ItemHologramData;
import com.fancyinnovations.fancyholograms.api.data.TextHologramData;
import com.fancyinnovations.fancyholograms.storage.HologramStorage;
import com.fancyinnovations.fancyholograms.storage.json.model.JsonDataUnion;
import de.oliver.jdb.JDB;
import java.io.File;

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.storage.json.model;
package com.fancyinnovations.fancyholograms.storage.json.model;
public record JsonBlockHologramData(
String block_material

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.storage.json.model;
package com.fancyinnovations.fancyholograms.storage.json.model;
public record JsonBrightness(
Integer block_light,

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.storage.json.model;
package com.fancyinnovations.fancyholograms.storage.json.model;
public record JsonDataUnion(
JsonHologramData hologram_data,

View File

@@ -1,4 +1,4 @@
package de.oliver.fancyholograms.storage.json.model;
package com.fancyinnovations.fancyholograms.storage.json.model;
import org.bukkit.entity.Display;

View File

@@ -1,7 +1,7 @@
package de.oliver.fancyholograms.storage.json.model;
package com.fancyinnovations.fancyholograms.storage.json.model;
import de.oliver.fancyholograms.api.data.property.Visibility;
import de.oliver.fancyholograms.api.hologram.HologramType;
import com.fancyinnovations.fancyholograms.api.data.property.Visibility;
import com.fancyinnovations.fancyholograms.api.hologram.HologramType;
public record JsonHologramData(
String name,

Some files were not shown because too many files have changed in this diff Show More