From c2d40a76aac7731e531b82c806185c10c0494ba8 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 25 Jul 2025 19:10:07 +0200 Subject: [PATCH] fancyholograms v3: Rename de.oliver.fancyholograms package to com.fancyinnovations.fancyholograms --- plugins/fancyholograms/build.gradle.kts | 6 +- .../fancyholograms/fh-api/build.gradle.kts | 2 +- .../fancyholograms/api/FancyHolograms.java | 8 +- .../api/HologramConfiguration.java | 2 +- .../api/HologramController.java | 4 +- .../fancyholograms/api/HologramRegistry.java | 4 +- .../api/data/BlockHologramData.java | 4 +- .../api/data/DisplayHologramData.java | 4 +- .../fancyholograms/api/data/HologramData.java | 8 +- .../api/data/ItemHologramData.java | 4 +- .../api/data/TextHologramData.java | 6 +- .../fancyholograms/api/data/YamlData.java | 2 +- .../data/builder/BlockHologramBuilder.java | 4 +- .../api/data/builder/HologramBuilder.java | 10 +- .../api/data/builder/ItemHologramBuilder.java | 4 +- .../api/data/builder/TextHologramBuilder.java | 4 +- .../api/data/property/Visibility.java | 4 +- .../api/events/HologramCreateEvent.java | 4 +- .../api/events/HologramDeleteEvent.java | 4 +- .../api/events/HologramDespawnEvent.java | 4 +- .../api/events/HologramEvent.java | 4 +- .../api/events/HologramSpawnEvent.java | 4 +- .../events/HologramTraitAttachedEvent.java | 6 +- .../api/events/HologramUpdateEvent.java | 6 +- .../api/events/HologramsLoadEvent.java | 4 +- .../api/events/HologramsUnloadEvent.java | 4 +- .../fancyholograms/api/hologram/Hologram.java | 12 +- .../api/hologram/HologramType.java | 2 +- .../api/trait/HologramTrait.java | 10 +- .../api/trait/HologramTraitClass.java | 2 +- .../api/trait/HologramTraitRegistry.java | 2 +- .../api/trait/HologramTraitTrait.java | 6 +- .../commands/FancyHologramsCMD.java | 14 +-- .../commands/FancyHologramsTestCMD.java | 6 +- .../fancyholograms/commands/HologramCMD.java | 20 ++-- .../fancyholograms/commands/Subcommand.java | 4 +- .../commands/hologram/AddLineCMD.java | 8 +- .../commands/hologram/BackgroundCMD.java | 14 +-- .../commands/hologram/BillboardCMD.java | 14 +-- .../commands/hologram/BlockCMD.java | 14 +-- .../commands/hologram/BrightnessCMD.java | 12 +- .../commands/hologram/CenterCMD.java | 10 +- .../commands/hologram/CopyCMD.java | 10 +- .../commands/hologram/CreateCMD.java | 20 ++-- .../commands/hologram/InfoCMD.java | 16 +-- .../commands/hologram/InsertAfterCMD.java | 14 +-- .../commands/hologram/InsertBeforeCMD.java | 14 +-- .../commands/hologram/ItemCMD.java | 14 +-- .../commands/hologram/LinkWithNpcCMD.java | 10 +- .../commands/hologram/ListCMD.java | 10 +- .../commands/hologram/MoveHereCMD.java | 14 +-- .../commands/hologram/MoveToCMD.java | 6 +- .../commands/hologram/NearbyCMD.java | 12 +- .../commands/hologram/RemoveCMD.java | 12 +- .../commands/hologram/RemoveLineCMD.java | 8 +- .../commands/hologram/RotateCMD.java | 6 +- .../commands/hologram/RotatePitchCMD.java | 6 +- .../commands/hologram/ScaleCMD.java | 14 +-- .../commands/hologram/SeeThroughCMD.java | 14 +-- .../commands/hologram/SetLineCMD.java | 14 +-- .../commands/hologram/ShadowRadiusCMD.java | 14 +-- .../commands/hologram/ShadowStrengthCMD.java | 14 +-- .../commands/hologram/TeleportCMD.java | 6 +- .../commands/hologram/TextAlignmentCMD.java | 14 +-- .../commands/hologram/TextShadowCMD.java | 14 +-- .../commands/hologram/TranslateCommand.java | 14 +-- .../commands/hologram/UnlinkWithNpcCMD.java | 10 +- .../hologram/UpdateTextIntervalCMD.java | 14 +-- .../commands/hologram/VisibilityCMD.java | 10 +- .../hologram/VisibilityDistanceCMD.java | 12 +- .../fancyholograms/ConfigCMD.java | 4 +- .../config/FHConfiguration.java | 6 +- .../controller/HologramControllerImpl.java | 14 +-- .../converter/ConverterTarget.java | 2 +- .../converter/DecentHologramsConverter.java | 8 +- .../converter/FHConversionRegistry.java | 2 +- .../converter/HologramConversionSession.java | 4 +- .../converter/HologramConverter.java | 6 +- .../fancyholograms/hologram/HologramImpl.java | 24 ++-- .../listeners/BedrockPlayerListener.java | 8 +- .../fancyholograms/listeners/NpcListener.java | 8 +- .../listeners/PlayerListener.java | 6 +- .../listeners/PlayerLoadedListener.java | 6 +- .../listeners/WorldLoadedListener.java | 8 +- .../main/FancyHologramsBootstrapper.java | 2 +- .../main/FancyHologramsLoader.java | 2 +- .../main/FancyHologramsPlugin.java | 52 ++++----- .../fancyholograms/metrics/FHMetrics.java | 6 +- .../registry/HologramRegistryImpl.java | 8 +- .../storage/HologramStorage.java | 4 +- .../storage/StorageMigrator.java | 8 +- .../fancyholograms/storage/StorageType.java | 2 +- .../storage/YamlHologramStorage.java | 37 +++--- .../storage/json/JsonAdapter.java | 109 +++++++++--------- .../storage/json/JsonStorage.java | 16 +-- .../json/model/JsonBlockHologramData.java | 2 +- .../storage/json/model/JsonBrightness.java | 2 +- .../storage/json/model/JsonDataUnion.java | 2 +- .../json/model/JsonDisplayHologramData.java | 2 +- .../storage/json/model/JsonHologramData.java | 6 +- .../json/model/JsonItemHologramData.java | 6 + .../storage/json/model/JsonLocation.java | 2 +- .../json/model/JsonTextHologramData.java | 2 +- .../storage/json/model/JsonVec3f.java | 2 +- .../fancyholograms/tests/FHTests.java | 8 +- .../tests/api/HologramBuilderTest.java | 24 ++-- .../tests/api/HologramControllerTest.java | 12 +- .../tests/api/HologramRegistryTest.java | 12 +- .../tests/mocks/HologramMock.java | 6 +- .../trait/HologramTraitRegistryImpl.java | 8 +- .../trait/builtin/FileContentTrait.java | 8 +- .../trait/builtin/InteractionTrait.java | 10 +- .../trait/builtin/MultiplePagesTrait.java | 8 +- .../fancyholograms/util/Formats.java | 2 +- .../fancyholograms/util/NumberHelper.java | 2 +- .../fancyholograms/util/PluginUtils.java | 2 +- .../json/model/JsonItemHologramData.java | 6 - 117 files changed, 549 insertions(+), 543 deletions(-) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/FancyHolograms.java (88%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/HologramConfiguration.java (97%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/HologramController.java (93%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/HologramRegistry.java (95%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/BlockHologramData.java (94%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/DisplayHologramData.java (98%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/HologramData.java (96%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/ItemHologramData.java (94%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/TextHologramData.java (97%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/YamlData.java (90%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/builder/BlockHologramBuilder.java (86%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/builder/HologramBuilder.java (88%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/builder/ItemHologramBuilder.java (86%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/builder/TextHologramBuilder.java (94%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/data/property/Visibility.java (95%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramCreateEvent.java (87%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramDeleteEvent.java (87%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramDespawnEvent.java (87%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramEvent.java (89%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramSpawnEvent.java (87%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramTraitAttachedEvent.java (83%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramUpdateEvent.java (92%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramsLoadEvent.java (91%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/events/HologramsUnloadEvent.java (89%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/hologram/Hologram.java (94%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/hologram/HologramType.java (92%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/trait/HologramTrait.java (92%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/trait/HologramTraitClass.java (90%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/trait/HologramTraitRegistry.java (92%) rename plugins/fancyholograms/fh-api/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/api/trait/HologramTraitTrait.java (95%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/FancyHologramsCMD.java (92%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/FancyHologramsTestCMD.java (96%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/HologramCMD.java (96%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/Subcommand.java (77%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/AddLineCMD.java (82%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/BackgroundCMD.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/BillboardCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/BlockCMD.java (81%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/BrightnessCMD.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/CenterCMD.java (84%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/CopyCMD.java (88%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/CreateCMD.java (80%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/InfoCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/InsertAfterCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/InsertBeforeCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/ItemCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/LinkWithNpcCMD.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/ListCMD.java (90%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/MoveHereCMD.java (88%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/MoveToCMD.java (93%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/NearbyCMD.java (90%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/RemoveCMD.java (74%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/RemoveLineCMD.java (82%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/RotateCMD.java (87%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/RotatePitchCMD.java (87%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/ScaleCMD.java (85%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/SeeThroughCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/SetLineCMD.java (84%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/ShadowRadiusCMD.java (82%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/ShadowStrengthCMD.java (82%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/TeleportCMD.java (88%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/TextAlignmentCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/TextShadowCMD.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/TranslateCommand.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java (85%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/VisibilityCMD.java (84%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/hologram/VisibilityDistanceCMD.java (84%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java (94%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/config/FHConfiguration.java (96%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/controller/HologramControllerImpl.java (93%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/converter/ConverterTarget.java (96%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/converter/DecentHologramsConverter.java (97%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/converter/FHConversionRegistry.java (97%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/converter/HologramConversionSession.java (95%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/converter/HologramConverter.java (87%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/hologram/HologramImpl.java (87%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/listeners/BedrockPlayerListener.java (70%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/listeners/NpcListener.java (89%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/listeners/PlayerListener.java (96%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/listeners/PlayerLoadedListener.java (76%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/listeners/WorldLoadedListener.java (69%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/main/FancyHologramsBootstrapper.java (92%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/main/FancyHologramsLoader.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/main/FancyHologramsPlugin.java (87%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/metrics/FHMetrics.java (95%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/registry/HologramRegistryImpl.java (89%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/HologramStorage.java (88%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/StorageMigrator.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/StorageType.java (54%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/YamlHologramStorage.java (78%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/JsonAdapter.java (52%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/JsonStorage.java (90%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonBlockHologramData.java (53%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonBrightness.java (58%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonDataUnion.java (79%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonDisplayHologramData.java (80%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonHologramData.java (53%) create mode 100644 plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonItemHologramData.java rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonLocation.java (70%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonTextHologramData.java (82%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/storage/json/model/JsonVec3f.java (56%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/tests/FHTests.java (85%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/tests/api/HologramBuilderTest.java (89%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/tests/api/HologramControllerTest.java (81%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/tests/api/HologramRegistryTest.java (92%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/tests/mocks/HologramMock.java (83%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/trait/HologramTraitRegistryImpl.java (84%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/trait/builtin/FileContentTrait.java (89%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/trait/builtin/InteractionTrait.java (93%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/trait/builtin/MultiplePagesTrait.java (90%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/util/Formats.java (86%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/util/NumberHelper.java (85%) rename plugins/fancyholograms/src/main/java/{de/oliver => com/fancyinnovations}/fancyholograms/util/PluginUtils.java (89%) delete mode 100644 plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonItemHologramData.java diff --git a/plugins/fancyholograms/build.gradle.kts b/plugins/fancyholograms/build.gradle.kts index c93211db..029662ca 100644 --- a/plugins/fancyholograms/build.gradle.kts +++ b/plugins/fancyholograms/build.gradle.kts @@ -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" diff --git a/plugins/fancyholograms/fh-api/build.gradle.kts b/plugins/fancyholograms/fh-api/build.gradle.kts index 62d674a9..f93be5c7 100644 --- a/plugins/fancyholograms/fh-api/build.gradle.kts +++ b/plugins/fancyholograms/fh-api/build.gradle.kts @@ -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("") } diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/FancyHolograms.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/FancyHolograms.java similarity index 88% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/FancyHolograms.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/FancyHolograms.java index c33ca908..e115ec7c 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/FancyHolograms.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/FancyHolograms.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramConfiguration.java similarity index 97% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramConfiguration.java index d0a5e868..559547f7 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramConfiguration.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.api; +package com.fancyinnovations.fancyholograms.api; public interface HologramConfiguration { diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramController.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramController.java similarity index 93% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramController.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramController.java index ee92d063..2cadc6e1 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramController.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramController.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramRegistry.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramRegistry.java similarity index 95% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramRegistry.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramRegistry.java index bad11e59..c5688d46 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramRegistry.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/HologramRegistry.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/BlockHologramData.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/BlockHologramData.java similarity index 94% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/BlockHologramData.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/BlockHologramData.java index 9017a22e..5cce7520 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/BlockHologramData.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/BlockHologramData.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/DisplayHologramData.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/DisplayHologramData.java similarity index 98% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/DisplayHologramData.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/DisplayHologramData.java index 463a32e1..8302d7d3 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/DisplayHologramData.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/DisplayHologramData.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/HologramData.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/HologramData.java similarity index 96% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/HologramData.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/HologramData.java index aabf7a66..9969856c 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/HologramData.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/HologramData.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/ItemHologramData.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/ItemHologramData.java similarity index 94% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/ItemHologramData.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/ItemHologramData.java index 29b21646..d50ccbfd 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/ItemHologramData.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/ItemHologramData.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/TextHologramData.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/TextHologramData.java similarity index 97% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/TextHologramData.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/TextHologramData.java index 27a6a109..06150ff4 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/TextHologramData.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/TextHologramData.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/YamlData.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/YamlData.java similarity index 90% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/YamlData.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/YamlData.java index 1ca34e35..608bb454 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/YamlData.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/YamlData.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.api.data; +package com.fancyinnovations.fancyholograms.api.data; import org.bukkit.configuration.ConfigurationSection; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/BlockHologramBuilder.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/BlockHologramBuilder.java similarity index 86% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/BlockHologramBuilder.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/BlockHologramBuilder.java index 35221ef6..98203acf 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/BlockHologramBuilder.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/BlockHologramBuilder.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/HologramBuilder.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/HologramBuilder.java similarity index 88% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/HologramBuilder.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/HologramBuilder.java index 07b01e40..36cefcdb 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/HologramBuilder.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/HologramBuilder.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/ItemHologramBuilder.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/ItemHologramBuilder.java similarity index 86% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/ItemHologramBuilder.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/ItemHologramBuilder.java index f6ec8ec2..41287593 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/ItemHologramBuilder.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/ItemHologramBuilder.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/TextHologramBuilder.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/TextHologramBuilder.java similarity index 94% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/TextHologramBuilder.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/TextHologramBuilder.java index 778c2e41..fed782f8 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/builder/TextHologramBuilder.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/builder/TextHologramBuilder.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/property/Visibility.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/property/Visibility.java similarity index 95% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/property/Visibility.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/property/Visibility.java index 698f8239..b7b014f4 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/data/property/Visibility.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/data/property/Visibility.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramCreateEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramCreateEvent.java similarity index 87% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramCreateEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramCreateEvent.java index 27238540..53769a3b 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramCreateEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramCreateEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramDeleteEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramDeleteEvent.java similarity index 87% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramDeleteEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramDeleteEvent.java index 3772c525..ec307575 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramDeleteEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramDeleteEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramDespawnEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramDespawnEvent.java similarity index 87% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramDespawnEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramDespawnEvent.java index 549ddd0a..56178992 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramDespawnEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramDespawnEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramEvent.java similarity index 89% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramEvent.java index 15090052..e0e807bd 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramSpawnEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramSpawnEvent.java similarity index 87% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramSpawnEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramSpawnEvent.java index 2a432f15..9aa99615 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramSpawnEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramSpawnEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramTraitAttachedEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramTraitAttachedEvent.java similarity index 83% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramTraitAttachedEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramTraitAttachedEvent.java index bcab3808..a55227a2 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramTraitAttachedEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramTraitAttachedEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramUpdateEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramUpdateEvent.java similarity index 92% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramUpdateEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramUpdateEvent.java index d7123cfb..8799fc4a 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramUpdateEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramUpdateEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramsLoadEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramsLoadEvent.java similarity index 91% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramsLoadEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramsLoadEvent.java index 916255ba..5c4e6726 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramsLoadEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramsLoadEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramsUnloadEvent.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramsUnloadEvent.java similarity index 89% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramsUnloadEvent.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramsUnloadEvent.java index cacc9d4a..a5e722df 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/events/HologramsUnloadEvent.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/events/HologramsUnloadEvent.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/hologram/Hologram.java similarity index 94% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/hologram/Hologram.java index 23c788f8..327baae6 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/hologram/Hologram.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/hologram/HologramType.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/hologram/HologramType.java similarity index 92% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/hologram/HologramType.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/hologram/HologramType.java index 432fcdd8..a004de3c 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/hologram/HologramType.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/hologram/HologramType.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.api.hologram; +package com.fancyinnovations.fancyholograms.api.hologram; import java.util.Arrays; import java.util.List; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTrait.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTrait.java similarity index 92% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTrait.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTrait.java index 00ae0212..bcbc13d0 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTrait.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTrait.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitClass.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitClass.java similarity index 90% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitClass.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitClass.java index 75bb447a..50b2b0ac 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitClass.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitClass.java @@ -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; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitRegistry.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitRegistry.java similarity index 92% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitRegistry.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitRegistry.java index 8bf979dc..ef554047 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitRegistry.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitRegistry.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.api.trait; +package com.fancyinnovations.fancyholograms.api.trait; import org.jetbrains.annotations.ApiStatus; diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitTrait.java b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitTrait.java similarity index 95% rename from plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitTrait.java rename to plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitTrait.java index 166b6c80..ceeb550f 100644 --- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/trait/HologramTraitTrait.java +++ b/plugins/fancyholograms/fh-api/src/main/java/com/fancyinnovations/fancyholograms/api/trait/HologramTraitTrait.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/FancyHologramsCMD.java similarity index 92% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/FancyHologramsCMD.java index a496a38e..981738ba 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/FancyHologramsCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/FancyHologramsTestCMD.java similarity index 96% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/FancyHologramsTestCMD.java index a7651ac8..db38b4b3 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/FancyHologramsTestCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/HologramCMD.java similarity index 96% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/HologramCMD.java index 6ba832a5..43af24f9 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/HologramCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/Subcommand.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/Subcommand.java similarity index 77% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/Subcommand.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/Subcommand.java index edd4985d..e8f52499 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/Subcommand.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/Subcommand.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/AddLineCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/AddLineCMD.java similarity index 82% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/AddLineCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/AddLineCMD.java index 073928e6..9c12e102 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/AddLineCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/AddLineCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BackgroundCMD.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BackgroundCMD.java index ff12f004..353bc1a5 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BackgroundCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BillboardCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BillboardCMD.java index 6e2ae09b..c04f6552 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BillboardCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BlockCMD.java similarity index 81% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BlockCMD.java index 02cba224..8791f25b 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BlockCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BrightnessCMD.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BrightnessCMD.java index 93d16a23..0b2a7ffd 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/BrightnessCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CenterCMD.java similarity index 84% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CenterCMD.java index 928b3327..8445f1eb 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CenterCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CopyCMD.java similarity index 88% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CopyCMD.java index 1a66bc41..5e8d2fdf 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CopyCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CreateCMD.java similarity index 80% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CreateCMD.java index 0d73f136..afb4633d 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/CreateCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InfoCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InfoCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InfoCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InfoCMD.java index 0c73ea8b..3d324491 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InfoCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InfoCMD.java @@ -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: " + data.getWorldName() + " " + data.getLocation().getX() + " / " + data.getLocation().getY() + " / " + data.getLocation().getZ()); MessageHelper.info(player, "Visibility distance: " + 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: x" + displayData.getScale().x()); @@ -51,7 +51,7 @@ public class InfoCMD implements Subcommand { MessageHelper.info(player, "Linked npc: " + 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, " " + line); @@ -71,9 +71,9 @@ public class InfoCMD implements Subcommand { } else { MessageHelper.info(player, "Update text interval: " + textData.getTextUpdateInterval() + " ticks"); } - } else if (data instanceof BlockHologramData blockData) { + } else if (data instanceof com.fancyinnovations.fancyholograms.api.data.BlockHologramData blockData) { MessageHelper.info(player, "Block: " + blockData.getBlock().name()); - } else if (data instanceof ItemHologramData itemData) { + } else if (data instanceof com.fancyinnovations.fancyholograms.api.data.ItemHologramData itemData) { MessageHelper.info(player, "Item: " + itemData.getItemStack().getType().name()); } diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InsertAfterCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InsertAfterCMD.java index 65235495..46c99f0c 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InsertAfterCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InsertBeforeCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InsertBeforeCMD.java index 63e6b238..88b73a3a 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/InsertBeforeCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ItemCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ItemCMD.java index 2cf63798..5d99ee71 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ItemCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/LinkWithNpcCMD.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/LinkWithNpcCMD.java index 5cf24d4d..18766ff1 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/LinkWithNpcCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ListCMD.java similarity index 90% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ListCMD.java index dc1ff4e4..aca38e30 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ListCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/MoveHereCMD.java similarity index 88% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/MoveHereCMD.java index 3d6312f7..00c4835f 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/MoveHereCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveToCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/MoveToCMD.java similarity index 93% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveToCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/MoveToCMD.java index f921c580..99f833b8 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveToCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/MoveToCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/NearbyCMD.java similarity index 90% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/NearbyCMD.java index 0c6dbfda..98e15a03 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/NearbyCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RemoveCMD.java similarity index 74% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RemoveCMD.java index e94edd0b..c2760aff 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RemoveCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveLineCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RemoveLineCMD.java similarity index 82% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveLineCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RemoveLineCMD.java index bb78a82f..61d0779e 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveLineCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RemoveLineCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RotateCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RotateCMD.java similarity index 87% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RotateCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RotateCMD.java index ea2be61c..15522906 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RotateCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RotateCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RotatePitchCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RotatePitchCMD.java similarity index 87% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RotatePitchCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RotatePitchCMD.java index 8757be35..5d57a4e8 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/RotatePitchCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/RotatePitchCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ScaleCMD.java similarity index 85% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ScaleCMD.java index 3e665950..36d59136 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ScaleCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/SeeThroughCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/SeeThroughCMD.java index 1b75f611..47b2c49d 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/SeeThroughCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/SetLineCMD.java similarity index 84% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/SetLineCMD.java index 630a1cc8..df343df2 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/SetLineCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ShadowRadiusCMD.java similarity index 82% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ShadowRadiusCMD.java index 429ab600..d93cf120 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ShadowRadiusCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ShadowStrengthCMD.java similarity index 82% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ShadowStrengthCMD.java index 221e869f..2951a771 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/ShadowStrengthCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TeleportCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TeleportCMD.java similarity index 88% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TeleportCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TeleportCMD.java index 9335a716..7fba4f69 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TeleportCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TeleportCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TextAlignmentCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TextAlignmentCMD.java index 0d26a247..0710153c 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TextAlignmentCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TextShadowCMD.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TextShadowCMD.java index 6d8b2663..cb633bce 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TextShadowCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TranslateCommand.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TranslateCommand.java index 9f8ed1fb..27cbd7a7 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/TranslateCommand.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java similarity index 85% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java index c1e56469..c91252f1 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java index da44c899..72bf706f 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/VisibilityCMD.java similarity index 84% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/VisibilityCMD.java index 41657fd0..25eb5264 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/VisibilityCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/VisibilityDistanceCMD.java similarity index 84% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/VisibilityDistanceCMD.java index c78a5001..5e07d2da 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/hologram/VisibilityDistanceCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java similarity index 94% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java index 76075467..572f592a 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/commands/lampCommands/fancyholograms/ConfigCMD.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/config/FHConfiguration.java similarity index 96% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/config/FHConfiguration.java index d5de95b0..4132c3f9 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/config/FHConfiguration.java @@ -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 { diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/controller/HologramControllerImpl.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/controller/HologramControllerImpl.java similarity index 93% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/controller/HologramControllerImpl.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/controller/HologramControllerImpl.java index 7b248381..16e7a39c 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/controller/HologramControllerImpl.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/controller/HologramControllerImpl.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/ConverterTarget.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/ConverterTarget.java similarity index 96% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/ConverterTarget.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/ConverterTarget.java index 095bad97..b6ee135d 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/ConverterTarget.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/ConverterTarget.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.converter; +package com.fancyinnovations.fancyholograms.converter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/DecentHologramsConverter.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/DecentHologramsConverter.java similarity index 97% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/DecentHologramsConverter.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/DecentHologramsConverter.java index 5238b236..aa53c111 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/DecentHologramsConverter.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/DecentHologramsConverter.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/FHConversionRegistry.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/FHConversionRegistry.java similarity index 97% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/FHConversionRegistry.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/FHConversionRegistry.java index 3eb95b22..7c213e8b 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/FHConversionRegistry.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/FHConversionRegistry.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.converter; +package com.fancyinnovations.fancyholograms.converter; import org.jetbrains.annotations.NotNull; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConversionSession.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/HologramConversionSession.java similarity index 95% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConversionSession.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/HologramConversionSession.java index 11f571b0..53a255db 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConversionSession.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/HologramConversionSession.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/HologramConverter.java similarity index 87% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/HologramConverter.java index 4e68ae70..7bc56b16 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/converter/HologramConverter.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/hologram/HologramImpl.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/hologram/HologramImpl.java similarity index 87% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/hologram/HologramImpl.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/hologram/HologramImpl.java index 74adeb06..ebfa446f 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/hologram/HologramImpl.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/hologram/HologramImpl.java @@ -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); diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/BedrockPlayerListener.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/BedrockPlayerListener.java similarity index 70% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/BedrockPlayerListener.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/BedrockPlayerListener.java index 272e75e8..ff73c3f2 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/BedrockPlayerListener.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/BedrockPlayerListener.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/NpcListener.java similarity index 89% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/NpcListener.java index 2cbf1d3d..3ee4ca10 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/NpcListener.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/PlayerListener.java similarity index 96% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/PlayerListener.java index c4f52877..e55c110c 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/PlayerListener.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/PlayerLoadedListener.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/PlayerLoadedListener.java similarity index 76% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/PlayerLoadedListener.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/PlayerLoadedListener.java index c506ccaf..80c614da 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/PlayerLoadedListener.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/PlayerLoadedListener.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldLoadedListener.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/WorldLoadedListener.java similarity index 69% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldLoadedListener.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/WorldLoadedListener.java index b7f6a98c..687d32af 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldLoadedListener.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/listeners/WorldLoadedListener.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsBootstrapper.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsBootstrapper.java similarity index 92% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsBootstrapper.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsBootstrapper.java index 84063e7b..1fc02327 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsBootstrapper.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsBootstrapper.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsLoader.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsLoader.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsLoader.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsLoader.java index 171fca53..91eabe84 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsLoader.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsLoader.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java similarity index 87% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java index 3c6866c7..6db28d83 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/main/FancyHologramsPlugin.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/metrics/FHMetrics.java similarity index 95% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/metrics/FHMetrics.java index 65bfc997..5ebd2853 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/metrics/FHMetrics.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/registry/HologramRegistryImpl.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/registry/HologramRegistryImpl.java similarity index 89% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/registry/HologramRegistryImpl.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/registry/HologramRegistryImpl.java index 3e7a95aa..e5db5c71 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/registry/HologramRegistryImpl.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/registry/HologramRegistryImpl.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/HologramStorage.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/HologramStorage.java similarity index 88% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/HologramStorage.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/HologramStorage.java index 3fa4cc4f..ada71c74 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/HologramStorage.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/HologramStorage.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/StorageMigrator.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/StorageMigrator.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/StorageMigrator.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/StorageMigrator.java index c1b2c63f..c5c3168c 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/StorageMigrator.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/StorageMigrator.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/StorageType.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/StorageType.java similarity index 54% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/StorageType.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/StorageType.java index 27d4a378..892ab19e 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/StorageType.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/StorageType.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage; +package com.fancyinnovations.fancyholograms.storage; public enum StorageType { diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/YamlHologramStorage.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/YamlHologramStorage.java similarity index 78% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/YamlHologramStorage.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/YamlHologramStorage.java index c0311c0a..3a0b2b3d 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/YamlHologramStorage.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/YamlHologramStorage.java @@ -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 holograms) { + public void saveBatch(Collection 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 loadAll() { - List holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, null); + public Collection loadAll() { + List holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, null); FancyHologramsPlugin.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file"); return holograms; } - public Collection loadAll(String world) { - List holograms = readHolograms(YamlHologramStorage.HOLOGRAMS_CONFIG_FILE, world); + public Collection loadAll(String world) { + List 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 readHolograms(@NotNull File configFile, @Nullable String world) { + private List 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 holograms = new ArrayList<>(); + List 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")); diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonAdapter.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/JsonAdapter.java similarity index 52% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonAdapter.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/JsonAdapter.java index 70411821..6cb18999 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonAdapter.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/JsonAdapter.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/JsonStorage.java similarity index 90% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/JsonStorage.java index 74240ca5..047107d7 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/JsonStorage.java @@ -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; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonBlockHologramData.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonBlockHologramData.java similarity index 53% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonBlockHologramData.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonBlockHologramData.java index a4b5685e..f793ae21 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonBlockHologramData.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonBlockHologramData.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; public record JsonBlockHologramData( String block_material diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonBrightness.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonBrightness.java similarity index 58% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonBrightness.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonBrightness.java index e14554e0..6acdeb3f 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonBrightness.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonBrightness.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; public record JsonBrightness( Integer block_light, diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonDataUnion.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonDataUnion.java similarity index 79% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonDataUnion.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonDataUnion.java index c078c615..0d8c4dc7 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonDataUnion.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonDataUnion.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; public record JsonDataUnion( JsonHologramData hologram_data, diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonDisplayHologramData.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonDisplayHologramData.java similarity index 80% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonDisplayHologramData.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonDisplayHologramData.java index 8cc00323..cc6db4a7 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonDisplayHologramData.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonDisplayHologramData.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; import org.bukkit.entity.Display; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonHologramData.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonHologramData.java similarity index 53% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonHologramData.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonHologramData.java index c54e0dc4..6f2e3b31 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonHologramData.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonHologramData.java @@ -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, diff --git a/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonItemHologramData.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonItemHologramData.java new file mode 100644 index 00000000..ae30be11 --- /dev/null +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonItemHologramData.java @@ -0,0 +1,6 @@ +package com.fancyinnovations.fancyholograms.storage.json.model; + +public record JsonItemHologramData( + String item +) { +} diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonLocation.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonLocation.java similarity index 70% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonLocation.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonLocation.java index 2276bc88..4d8d68f5 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonLocation.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonLocation.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; public record JsonLocation( String world, diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonTextHologramData.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonTextHologramData.java similarity index 82% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonTextHologramData.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonTextHologramData.java index cb48382f..0fcb6a52 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonTextHologramData.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonTextHologramData.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; import org.bukkit.entity.TextDisplay; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonVec3f.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonVec3f.java similarity index 56% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonVec3f.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonVec3f.java index f5260bb3..400871aa 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonVec3f.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/storage/json/model/JsonVec3f.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.storage.json.model; +package com.fancyinnovations.fancyholograms.storage.json.model; public record JsonVec3f( Float x, diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/FHTests.java similarity index 85% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/FHTests.java index 781d0ef1..29432ddf 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/FHTests.java @@ -1,8 +1,8 @@ -package de.oliver.fancyholograms.tests; +package com.fancyinnovations.fancyholograms.tests; -import de.oliver.fancyholograms.tests.api.HologramBuilderTest; -import de.oliver.fancyholograms.tests.api.HologramControllerTest; -import de.oliver.fancyholograms.tests.api.HologramRegistryTest; +import com.fancyinnovations.fancyholograms.tests.api.HologramBuilderTest; +import com.fancyinnovations.fancyholograms.tests.api.HologramControllerTest; +import com.fancyinnovations.fancyholograms.tests.api.HologramRegistryTest; import de.oliver.plugintests.FPTestClass; import org.bukkit.entity.Player; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramBuilderTest.java similarity index 89% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramBuilderTest.java index a63f9000..02033cf3 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramBuilderTest.java @@ -1,16 +1,16 @@ -package de.oliver.fancyholograms.tests.api; +package com.fancyinnovations.fancyholograms.tests.api; -import de.oliver.fancyholograms.api.HologramRegistry; -import de.oliver.fancyholograms.api.data.BlockHologramData; -import de.oliver.fancyholograms.api.data.ItemHologramData; -import de.oliver.fancyholograms.api.data.TextHologramData; -import de.oliver.fancyholograms.api.data.builder.BlockHologramBuilder; -import de.oliver.fancyholograms.api.data.builder.ItemHologramBuilder; -import de.oliver.fancyholograms.api.data.builder.TextHologramBuilder; -import de.oliver.fancyholograms.api.data.property.Visibility; -import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.api.hologram.HologramType; -import de.oliver.fancyholograms.main.FancyHologramsPlugin; +import com.fancyinnovations.fancyholograms.api.HologramRegistry; +import com.fancyinnovations.fancyholograms.api.data.BlockHologramData; +import com.fancyinnovations.fancyholograms.api.data.ItemHologramData; +import com.fancyinnovations.fancyholograms.api.data.TextHologramData; +import com.fancyinnovations.fancyholograms.api.data.builder.BlockHologramBuilder; +import com.fancyinnovations.fancyholograms.api.data.builder.ItemHologramBuilder; +import com.fancyinnovations.fancyholograms.api.data.builder.TextHologramBuilder; +import com.fancyinnovations.fancyholograms.api.data.property.Visibility; +import com.fancyinnovations.fancyholograms.api.hologram.Hologram; +import com.fancyinnovations.fancyholograms.api.hologram.HologramType; +import com.fancyinnovations.fancyholograms.main.FancyHologramsPlugin; import de.oliver.plugintests.annotations.FPTest; import org.bukkit.Color; import org.bukkit.Material; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramControllerTest.java similarity index 81% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramControllerTest.java index 3c3b4345..e915a01a 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramControllerTest.java @@ -1,10 +1,10 @@ -package de.oliver.fancyholograms.tests.api; +package com.fancyinnovations.fancyholograms.tests.api; -import de.oliver.fancyholograms.api.HologramController; -import de.oliver.fancyholograms.api.data.TextHologramData; -import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.controller.HologramControllerImpl; -import de.oliver.fancyholograms.tests.mocks.HologramMock; +import com.fancyinnovations.fancyholograms.api.HologramController; +import com.fancyinnovations.fancyholograms.api.data.TextHologramData; +import com.fancyinnovations.fancyholograms.api.hologram.Hologram; +import com.fancyinnovations.fancyholograms.controller.HologramControllerImpl; +import com.fancyinnovations.fancyholograms.tests.mocks.HologramMock; import de.oliver.plugintests.annotations.FPBeforeEach; import de.oliver.plugintests.annotations.FPTest; import org.bukkit.Location; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramRegistryTest.java similarity index 92% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramRegistryTest.java index b3e71ad3..32c00bbe 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/api/HologramRegistryTest.java @@ -1,10 +1,10 @@ -package de.oliver.fancyholograms.tests.api; +package com.fancyinnovations.fancyholograms.tests.api; -import de.oliver.fancyholograms.api.HologramRegistry; -import de.oliver.fancyholograms.api.data.TextHologramData; -import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.registry.HologramRegistryImpl; -import de.oliver.fancyholograms.tests.mocks.HologramMock; +import com.fancyinnovations.fancyholograms.api.HologramRegistry; +import com.fancyinnovations.fancyholograms.api.data.TextHologramData; +import com.fancyinnovations.fancyholograms.api.hologram.Hologram; +import com.fancyinnovations.fancyholograms.registry.HologramRegistryImpl; +import com.fancyinnovations.fancyholograms.tests.mocks.HologramMock; import de.oliver.plugintests.annotations.FPBeforeEach; import de.oliver.plugintests.annotations.FPTest; import org.bukkit.entity.Player; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/mocks/HologramMock.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/mocks/HologramMock.java similarity index 83% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/mocks/HologramMock.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/mocks/HologramMock.java index a0151e51..ded8bdcc 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/mocks/HologramMock.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/tests/mocks/HologramMock.java @@ -1,7 +1,7 @@ -package de.oliver.fancyholograms.tests.mocks; +package com.fancyinnovations.fancyholograms.tests.mocks; -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.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/HologramTraitRegistryImpl.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/HologramTraitRegistryImpl.java similarity index 84% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/HologramTraitRegistryImpl.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/HologramTraitRegistryImpl.java index 53e54640..5d196ba3 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/HologramTraitRegistryImpl.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/HologramTraitRegistryImpl.java @@ -1,8 +1,8 @@ -package de.oliver.fancyholograms.trait; +package com.fancyinnovations.fancyholograms.trait; -import de.oliver.fancyholograms.api.trait.HologramTrait; -import de.oliver.fancyholograms.api.trait.HologramTraitClass; -import de.oliver.fancyholograms.api.trait.HologramTraitRegistry; +import com.fancyinnovations.fancyholograms.api.trait.HologramTrait; +import com.fancyinnovations.fancyholograms.api.trait.HologramTraitClass; +import com.fancyinnovations.fancyholograms.api.trait.HologramTraitRegistry; import java.util.HashMap; import java.util.List; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/FileContentTrait.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/FileContentTrait.java similarity index 89% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/FileContentTrait.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/FileContentTrait.java index 326c662c..357f1a79 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/FileContentTrait.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/FileContentTrait.java @@ -1,8 +1,8 @@ -package de.oliver.fancyholograms.trait.builtin; +package com.fancyinnovations.fancyholograms.trait.builtin; -import de.oliver.fancyholograms.api.data.TextHologramData; -import de.oliver.fancyholograms.api.trait.HologramTrait; -import de.oliver.fancyholograms.api.trait.HologramTraitClass; +import com.fancyinnovations.fancyholograms.api.data.TextHologramData; +import com.fancyinnovations.fancyholograms.api.trait.HologramTrait; +import com.fancyinnovations.fancyholograms.api.trait.HologramTraitClass; import org.jetbrains.annotations.ApiStatus; import java.io.IOException; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/InteractionTrait.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/InteractionTrait.java similarity index 93% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/InteractionTrait.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/InteractionTrait.java index dd586e38..5a6d5d15 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/InteractionTrait.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/InteractionTrait.java @@ -1,9 +1,9 @@ -package de.oliver.fancyholograms.trait.builtin; +package com.fancyinnovations.fancyholograms.trait.builtin; -import de.oliver.fancyholograms.api.data.TextHologramData; -import de.oliver.fancyholograms.api.trait.HologramTrait; -import de.oliver.fancyholograms.api.trait.HologramTraitClass; -import de.oliver.fancyholograms.util.PluginUtils; +import com.fancyinnovations.fancyholograms.api.data.TextHologramData; +import com.fancyinnovations.fancyholograms.api.trait.HologramTrait; +import com.fancyinnovations.fancyholograms.api.trait.HologramTraitClass; +import com.fancyinnovations.fancyholograms.util.PluginUtils; import de.oliver.fancynpcs.api.FancyNpcsPlugin; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/MultiplePagesTrait.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/MultiplePagesTrait.java similarity index 90% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/MultiplePagesTrait.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/MultiplePagesTrait.java index 9567b82e..2684a98e 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/trait/builtin/MultiplePagesTrait.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/trait/builtin/MultiplePagesTrait.java @@ -1,8 +1,8 @@ -package de.oliver.fancyholograms.trait.builtin; +package com.fancyinnovations.fancyholograms.trait.builtin; -import de.oliver.fancyholograms.api.data.TextHologramData; -import de.oliver.fancyholograms.api.trait.HologramTrait; -import de.oliver.fancyholograms.api.trait.HologramTraitClass; +import com.fancyinnovations.fancyholograms.api.data.TextHologramData; +import com.fancyinnovations.fancyholograms.api.trait.HologramTrait; +import com.fancyinnovations.fancyholograms.api.trait.HologramTraitClass; import org.jetbrains.annotations.ApiStatus; import java.io.IOException; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/Formats.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/Formats.java similarity index 86% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/Formats.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/Formats.java index 7fc343b5..5004a63d 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/Formats.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/Formats.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.util; +package com.fancyinnovations.fancyholograms.util; import java.text.DecimalFormat; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/NumberHelper.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/NumberHelper.java similarity index 85% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/NumberHelper.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/NumberHelper.java index 1e19728c..9a67f554 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/NumberHelper.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/NumberHelper.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.util; +package com.fancyinnovations.fancyholograms.util; import java.util.Optional; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/PluginUtils.java b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/PluginUtils.java similarity index 89% rename from plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/PluginUtils.java rename to plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/PluginUtils.java index 3ec815ed..c2493b7a 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/util/PluginUtils.java +++ b/plugins/fancyholograms/src/main/java/com/fancyinnovations/fancyholograms/util/PluginUtils.java @@ -1,4 +1,4 @@ -package de.oliver.fancyholograms.util; +package com.fancyinnovations.fancyholograms.util; import org.bukkit.Bukkit; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonItemHologramData.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonItemHologramData.java deleted file mode 100644 index 1277528a..00000000 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/model/JsonItemHologramData.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.oliver.fancyholograms.storage.json.model; - -public record JsonItemHologramData( - String item -) { -}