From 6823d17ee3491d81b62274a2aa0557b9fe541caa Mon Sep 17 00:00:00 2001 From: "Reichenbach, Michael" Date: Fri, 18 Feb 2022 19:53:53 +0100 Subject: [PATCH] feat(build): move to indra build and maven central release --- .checkstyle/checkstyle.xml | 283 ++++++++++++++++++ .checkstyle/suppressions.xml | 14 + .github/workflows/gradle.yml | 62 +++- .releaserc.json | 18 +- api/build.gradle | 24 -- bom/build.gradle.kts | 28 ++ build-logic/build.gradle.kts | 18 ++ build-logic/settings.gradle.kts | 7 + .../src/main/kotlin/schat.api.gradle.kts | 117 ++++++++ .../main/kotlin/schat.publishing.gradle.kts | 35 +++ .../src/main/kotlin/schat.shadow.gradle.kts | 36 +++ build.gradle | 136 --------- build.gradle.kts | 11 + bukkit/build.gradle.kts | 32 ++ .../silthus/schat/bukkit/BukkitBootstrap.java | 1 - .../silthus/schat/bukkit/BukkitLoader.java | 3 - .../schat/bukkit/SChatBukkitServer.java | 1 - .../bukkit/adapter/BukkitChatterFactory.java | 3 +- .../adapter/BukkitConnectionListener.java | 1 - .../bukkit/adapter/BukkitIdentityAdapter.java | 1 - .../adapter/BukkitMessengerGateway.java | 1 - .../adapter/BukkitSchedulerAdapter.java | 1 - .../bukkit/adapter/BukkitSenderFactory.java | 1 - .../bukkit/adapter/PlayerChatListener.java | 1 - .../bukkit/protocollib/AbstractPacket.java | 1 - .../protocollib/ChatPacketListener.java | 1 - .../protocollib/WrapperPlayServerChat.java | 1 - .../src/main/resources/config.yml | 0 .../net/silthus/schat/bukkit/BukkitTests.java | 1 - .../schat/bukkit/CustomServerMock.java | 1 - .../adapter/BukkitChatterFactoryTests.java | 1 - .../adapter/BukkitMessengerGatewayTest.java | 1 - .../adapter/BukkitSenderFactoryTests.java | 1 - .../adapter/PlayerChatListenerTest.java | 1 - .../test/resources/junit-platform.properties | 0 bungeecord/build.gradle.kts | 27 ++ .../gradle.properties | 0 .../schat/bungeecord/BungeecordBootstrap.java | 1 - .../schat/bungeecord/BungeecordLoader.java | 1 - .../bungeecord/BungeecordProxyPlugin.java | 1 - .../adapter/BungeecordIdentityAdapter.java | 1 - .../adapter/BungeecordMessengerGateway.java | 1 - .../adapter/BungeecordSchedulerAdapter.java | 1 - .../adapter/BungeecordSenderFactory.java | 1 - .../src/main/resources/config.yml | 0 .../src/main/resources/plugin.yml | 2 +- config/checkstyle/checkstyle.xml | 258 ---------------- config/checkstyle/suppressions.xml | 31 -- core/build.gradle | 25 -- core/build.gradle.kts | 15 + .../net/silthus/schat/channel/Channel.java | 1 - .../silthus/schat/channel/ChannelImpl.java | 1 - .../schat/channel/ChannelPrototype.java | 1 - .../schat/channel/ChannelRepository.java | 1 - .../schat/channel/ChannelSettings.java | 1 - .../channel/InMemoryChannelRepository.java | 1 - .../net/silthus/schat/chatter/Chatter.java | 3 +- .../silthus/schat/chatter/ChatterFactory.java | 1 - .../silthus/schat/chatter/ChatterImpl.java | 3 +- .../schat/chatter/ChatterRepository.java | 1 - .../chatter/InMemoryChatterRepository.java | 1 - .../net/silthus/schat/command/Command.java | 1 - .../silthus/schat/command/CommandBuilder.java | 1 - .../net/silthus/schat/command/Result.java | 1 - .../net/silthus/schat/command/ResultImpl.java | 1 - .../silthus/schat/commands/ChatCommand.java | 1 - .../commands/CreatePrivateChannelCommand.java | 1 - .../schat/commands/JoinChannelCommand.java | 1 - .../schat/commands/LeaveChannelCommand.java | 1 - .../schat/commands/SendMessageCommand.java | 1 - .../schat/commands/SendMessageResult.java | 1 - .../commands/SendPrivateMessageCommand.java | 1 - .../commands/SetActiveChannelCommand.java | 1 - .../silthus/schat/eventbus/EmptyEventBus.java | 1 - .../net/silthus/schat/eventbus/EventBus.java | 1 - .../silthus/schat/eventbus/EventBusImpl.java | 1 - .../silthus/schat/eventbus/EventListener.java | 1 - .../schat/eventbus/EventSubscription.java | 1 - .../schat/eventbus/EventSubscriptionImpl.java | 1 - .../net/silthus/schat/events/Cancellable.java | 1 - .../net/silthus/schat/events/SChatEvent.java | 1 - .../events/channel/JoinChannelEvent.java | 1 - .../events/channel/JoinedChannelEvent.java | 1 - .../events/channel/LeaveChannelEvent.java | 1 - .../events/channel/LeftChannelEvent.java | 1 - .../chatter/ChatterJoinedServerEvent.java | 1 - .../events/config/ConfigReloadedEvent.java | 1 - .../message/SendChannelMessageEvent.java | 1 - .../events/message/SendMessageEvent.java | 1 - .../silthus/schat/identity/Identified.java | 1 - .../net/silthus/schat/identity/Identity.java | 1 - .../silthus/schat/identity/IdentityImpl.java | 1 - .../net/silthus/schat/message/Message.java | 1 - .../silthus/schat/message/MessageImpl.java | 1 - .../silthus/schat/message/MessageTarget.java | 1 - .../net/silthus/schat/message/Messages.java | 1 - .../net/silthus/schat/message/Targets.java | 1 - .../silthus/schat/message/TargetsFilter.java | 1 - .../schat/messenger/EmptyMessenger.java | 1 - .../GsonPluginMessageSerializer.java | 1 - .../messenger/IncomingMessageConsumer.java | 1 - .../silthus/schat/messenger/Messenger.java | 1 - .../schat/messenger/MessengerGateway.java | 1 - .../messenger/MessengerGatewayProvider.java | 1 - .../schat/messenger/PluginMessage.java | 1 - .../messenger/PluginMessageSerializer.java | 1 - .../net/silthus/schat/pointer/Configured.java | 1 - .../net/silthus/schat/pointer/Pointer.java | 1 - .../silthus/schat/pointer/PointerImpl.java | 1 - .../net/silthus/schat/pointer/Pointered.java | 1 - .../net/silthus/schat/pointer/Pointers.java | 1 - .../silthus/schat/pointer/PointersImpl.java | 1 - .../net/silthus/schat/pointer/Setting.java | 1 - .../silthus/schat/pointer/SettingImpl.java | 1 - .../net/silthus/schat/pointer/Settings.java | 1 - .../silthus/schat/pointer/SettingsImpl.java | 1 - .../silthus/schat/policies/ChannelPolicy.java | 1 - .../schat/policies/JoinChannelPolicy.java | 1 - .../schat/policies/LeaveChannelPolicy.java | 1 - .../net/silthus/schat/policies/Policy.java | 1 - .../policies/SendChannelMessagePolicy.java | 1 - .../net/silthus/schat/repository/Entity.java | 1 - .../schat/repository/InMemoryRepository.java | 1 - .../silthus/schat/repository/Repository.java | 1 - .../schat/{view => ui}/ViewConnector.java | 3 +- .../schat/util/FilterableCollection.java | 1 - .../net/silthus/schat/util/Iterators.java | 1 - .../net/silthus/schat/util/Permissable.java | 1 - .../java/net/silthus/schat/util/Throwing.java | 1 - .../java/net/silthus/schat/util/UUIDUtil.java | 1 - .../silthus/schat/util/gson/GsonProvider.java | 1 - .../net/silthus/schat/util/gson/JElement.java | 1 - .../net/silthus/schat/util/gson/JObject.java | 1 - .../util/gson/types/ChannelSerializer.java | 1 - .../util/gson/types/ComponentSerializer.java | 1 - .../util/gson/types/IdentitySerializer.java | 1 - .../util/gson/types/InstantSerializer.java | 1 - .../util/gson/types/MessageSerializer.java | 1 - .../util/gson/types/SettingsSerializer.java | 1 - .../util/gson/types/TargetsSerializer.java | 1 - .../schat/channel/ChannelRepositoryTests.java | 1 - .../silthus/schat/channel/ChannelTests.java | 1 - .../silthus/schat/chatter/ChatterTest.java | 3 +- .../silthus/schat/command/ChecksTests.java | 1 - .../net/silthus/schat/command/ResultTest.java | 1 - .../schat/commands/ChatCommandTest.java | 1 - .../CreatePrivateChannelCommandTest.java | 1 - .../commands/JoinChannelCommandTests.java | 1 - .../commands/LeaveChannelCommandTest.java | 1 - .../commands/SendMessageCommandTests.java | 1 - .../SendPrivateMessageCommandTests.java | 1 - .../SetActiveChannelCommandTests.java | 1 - .../silthus/schat/eventbus/EventBusTests.java | 1 - .../silthus/schat/identity/IdentityTests.java | 1 - .../silthus/schat/message/MessageTest.java | 1 - .../silthus/schat/message/MessagesTest.java | 1 - .../silthus/schat/message/TargetsTest.java | 1 - .../silthus/schat/pointer/PointersTest.java | 1 - .../silthus/schat/pointer/SettingsTest.java | 1 - .../JoinPrivateChannelPolicyTest.java | 3 +- .../JoinProtectedChannelPolicyTest.java | 5 +- .../SendChannelMessagePolicyTest.java | 1 - .../gson/types/ChannelSerializerTest.java | 1 - .../gson/types/TargetsSerializerTest.java | 1 - .../net/silthus/schat/AssertionHelper.java | 1 - .../schat/channel/ChannelAssertions.java | 1 - .../silthus/schat/channel/ChannelHelper.java | 7 +- .../schat/chatter/ChatterAssertions.java | 1 - .../silthus/schat/chatter/ChatterMock.java | 1 - .../silthus/schat/eventbus/EventBusMock.java | 1 - .../schat/identity/IdentityHelper.java | 6 +- .../silthus/schat/message/MessageHelper.java | 5 +- .../schat/message/MessageTargetSpy.java | 1 - .../net/silthus/schat/message/MockTarget.java | 1 - .../schat/{view => ui}/ViewConnectorMock.java | 3 +- .../net/silthus/schat/util/StringUtil.java | 19 +- example/build.gradle | 37 --- .../schat/example/SChatExamplePlugin.java | 54 ---- example/src/main/resources/plugin.yml | 5 - features/build.gradle | 9 - features/build.gradle.kts | 13 + .../features/AutoJoinChannelsFeature.java | 1 - .../schat/features/GlobalChatFeature.java | 1 - .../features/AutoJoinChannelsFeatureTest.java | 1 - .../features/GlobalChatFeatureTests.java | 1 - gradle.properties | 11 +- gradle/jacoco.gradle | 10 - gradle/libs.versions.toml | 105 +++++++ gradle/publish.gradle | 76 ----- LICENSE => license.txt | 0 HEADER.txt => license_header.txt | 0 platform/build.gradle | 89 ------ platform/build.gradle.kts | 25 ++ platform/bukkit/build.gradle | 101 ------- .../test/resources/junit-platform.properties | 20 -- platform/bungeecord/build.gradle | 20 -- .../chatter/AbstractChatterFactory.java | 3 +- .../platform/chatter/ConnectionListener.java | 1 - .../platform/commands/AdminCommands.java | 1 - .../platform/commands/ChannelCommands.java | 1 - .../schat/platform/commands/Command.java | 1 - .../schat/platform/commands/Commands.java | 1 - .../commands/PrivateMessageCommands.java | 1 - .../commands/parser/ChannelArgument.java | 1 - .../commands/parser/ChatterArgument.java | 1 - .../schat/platform/config/ChannelConfig.java | 1 - .../silthus/schat/platform/config/Config.java | 1 - .../schat/platform/config/ConfigKeys.java | 1 - .../schat/platform/config/SChatConfig.java | 1 - .../config/adapter/ConfigurateAdapter.java | 1 - .../adapter/ConfigurateConfigSection.java | 1 - .../config/adapter/ConfigurationAdapter.java | 1 - .../config/adapter/ConfigurationAdapters.java | 1 - .../config/adapter/ConfigurationSection.java | 1 - .../schat/platform/config/key/ConfigKey.java | 1 - .../platform/config/key/ConfigKeyFactory.java | 1 - .../config/key/KeyedConfiguration.java | 1 - .../config/key/ModifiableConfigKey.java | 1 - .../platform/config/key/SimpleConfigKey.java | 1 - .../config/key/SimpleModifiableConfigKey.java | 1 - .../config/serializers/ColorSerializer.java | 1 - .../MiniMessageComponentSerializer.java | 1 - .../MiniMessageFormatSerializer.java | 1 - .../serializers/SettingsSerializer.java | 1 - .../serializers/TextDecorationSerializer.java | 1 - .../schat/platform/locale/Messages.java | 1 - .../platform/locale/TranslationManager.java | 1 - .../messaging/GatewayProviderRegistry.java | 1 - .../platform/messaging/MessagingService.java | 1 - .../platform/plugin/AbstractSChatPlugin.java | 1 - .../plugin/AbstractSChatProxyPlugin.java | 1 - .../plugin/AbstractSChatServerPlugin.java | 1 - .../schat/platform/plugin/ChannelLoader.java | 1 - .../schat/platform/plugin/SChatPlugin.java | 1 - .../platform/plugin/bootstrap/Bootstrap.java | 1 - .../plugin/bootstrap/LoaderBootstrap.java | 1 - .../platform/plugin/bootstrap/Platform.java | 1 - .../plugin/logging/JavaPluginLogger.java | 1 - .../platform/plugin/logging/PluginLogger.java | 1 - .../scheduler/AbstractJavaScheduler.java | 1 - .../plugin/scheduler/SchedulerAdapter.java | 1 - .../plugin/scheduler/SchedulerTask.java | 1 - .../schat/platform/sender/FactorySender.java | 1 - .../platform/sender/PlayerOnlineChecker.java | 1 - .../silthus/schat/platform/sender/Sender.java | 1 - .../schat/platform/sender/SenderFactory.java | 1 - .../chatter/ConnectionListenerTests.java | 1 - .../platform/commands/AdminCommandsTest.java | 1 - .../commands/ChannelCommandsTests.java | 1 - .../schat/platform/commands/CommandTest.java | 1 - .../commands/PrivateMessageCommandsTests.java | 1 - .../commands/parser/ChannelArgumentTests.java | 1 - .../commands/parser/ChatterArgumentTests.java | 1 - .../schat/platform/config/ConfigTests.java | 1 - .../serializers/ColorSerializerTest.java | 1 - .../TextDecorationSerializerTest.java | 1 - .../GatewayProviderRegistryTest.java | 1 - .../messaging/MessagingServiceTest.java | 1 - .../schat/platform/plugin/ServerTests.java | 1 - .../silthus/schat/platform/SchedulerMock.java | 1 - .../platform/chatter/ChatterFactoryStub.java | 7 +- .../platform/commands/CommandTestUtils.java | 1 - .../schat/platform/commands/ParserTest.java | 1 - .../config/TestConfigurationAdapter.java | 1 - .../CrossServerMessengerGateway.java | 1 - .../IncomingMessageConsumerMock.java | 1 - .../messaging/MessagingServiceMock.java | 1 - .../MockMessagingGatewayProvider.java | 1 - .../platform/messaging/MockPluginMessage.java | 1 - .../StubMessengerGatewayProvider.java | 1 - .../schat/platform/plugin/BootstrapStub.java | 1 - .../schat/platform/plugin/MockPlugin.java | 1 - .../schat/platform/plugin/TestServer.java | 1 - .../schat/platform/sender/SenderMock.java | 1 - platform/velocity/build.gradle | 31 -- settings.gradle | 34 --- settings.gradle.kts | 23 ++ ui/build.gradle | 7 - ui/build.gradle.kts | 19 ++ .../main/java/net/silthus/schat/ui/Click.java | 1 - .../net/silthus/schat/ui/format/Format.java | 1 - .../schat/ui/format/MiniMessageFormat.java | 1 - .../schat/ui/model/ChatterViewModel.java | 1 - .../net/silthus/schat/ui/util/ViewHelper.java | 1 - .../schat/ui/view/CachingViewProvider.java | 1 - .../schat/ui/view/DynamicViewConnector.java | 3 +- .../java/net/silthus/schat/ui/view/View.java | 1 - .../silthus/schat/ui/view/ViewFactory.java | 1 - .../silthus/schat/ui/view/ViewProvider.java | 1 - .../net/silthus/schat/ui/views/Views.java | 1 - .../schat/ui/views/tabbed/AbstractTab.java | 1 - .../schat/ui/views/tabbed/ChannelTab.java | 1 - .../schat/ui/views/tabbed/NoChannelsTab.java | 1 - .../silthus/schat/ui/views/tabbed/Tab.java | 1 - .../ui/views/tabbed/TabbedChannelsView.java | 1 - .../ui/format/MiniMessageFormatTest.java | 1 - .../schat/ui/model/ChatterViewModelTests.java | 3 +- .../ui/view/CachingViewProviderTests.java | 1 - .../ui/view/DynamicViewConnectorTest.java | 3 +- .../ui/views/TabbedChannelsViewTests.java | 1 - .../silthus/schat/ui/ComponentAssertions.java | 1 - .../silthus/schat/ui/ViewProviderStub.java | 1 - velocity/build.gradle.kts | 24 ++ .../velocity => velocity}/gradle.properties | 0 .../schat/velocity/SChatVelocityProxy.java | 1 - .../schat/velocity/VelocityBootstrap.java | 10 - .../velocity/adapter/Slf4jPluginLogger.java | 1 - .../adapter/VelocityMessengerGateway.java | 1 - .../adapter/VelocitySchedulerAdapter.java | 1 - .../adapter/VelocitySenderFactory.java | 1 - .../src/main/resources/config.yml | 0 .../src/main/resources/velocity-plugin.json | 12 + 312 files changed, 968 insertions(+), 1275 deletions(-) create mode 100644 .checkstyle/checkstyle.xml create mode 100644 .checkstyle/suppressions.xml delete mode 100644 api/build.gradle create mode 100644 bom/build.gradle.kts create mode 100644 build-logic/build.gradle.kts create mode 100644 build-logic/settings.gradle.kts create mode 100644 build-logic/src/main/kotlin/schat.api.gradle.kts create mode 100644 build-logic/src/main/kotlin/schat.publishing.gradle.kts create mode 100644 build-logic/src/main/kotlin/schat.shadow.gradle.kts delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 bukkit/build.gradle.kts rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java (97%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java (98%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java (99%) rename {platform/bukkit => bukkit}/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java (99%) rename {platform/bukkit => bukkit}/src/main/resources/config.yml (100%) rename {platform/bukkit => bukkit}/src/test/java/net/silthus/schat/bukkit/BukkitTests.java (99%) rename {platform/bukkit => bukkit}/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java (99%) rename {platform/bukkit => bukkit}/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java (99%) rename {platform/bukkit => bukkit}/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java (99%) rename {platform/bukkit => bukkit}/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java (99%) rename {platform/bukkit => bukkit}/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java (99%) rename {api => bukkit}/src/test/resources/junit-platform.properties (100%) create mode 100644 bungeecord/build.gradle.kts rename {platform/bungeecord => bungeecord}/gradle.properties (100%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java (99%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java (99%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java (99%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java (99%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java (99%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java (99%) rename {platform/bungeecord => bungeecord}/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java (99%) rename {platform/bungeecord => bungeecord}/src/main/resources/config.yml (100%) rename {platform/bungeecord => bungeecord}/src/main/resources/plugin.yml (79%) delete mode 100644 config/checkstyle/checkstyle.xml delete mode 100644 config/checkstyle/suppressions.xml delete mode 100644 core/build.gradle create mode 100644 core/build.gradle.kts rename core/src/main/java/net/silthus/schat/{view => ui}/ViewConnector.java (98%) rename core/src/testFixtures/java/net/silthus/schat/{view => ui}/ViewConnectorMock.java (98%) rename example/src/main/java/net/silthus/schat/example/SChatIntegration.java => core/src/testFixtures/java/net/silthus/schat/util/StringUtil.java (67%) delete mode 100644 example/build.gradle delete mode 100644 example/src/main/java/net/silthus/schat/example/SChatExamplePlugin.java delete mode 100644 example/src/main/resources/plugin.yml delete mode 100644 features/build.gradle create mode 100644 features/build.gradle.kts delete mode 100644 gradle/jacoco.gradle create mode 100644 gradle/libs.versions.toml delete mode 100644 gradle/publish.gradle rename LICENSE => license.txt (100%) rename HEADER.txt => license_header.txt (100%) delete mode 100644 platform/build.gradle create mode 100644 platform/build.gradle.kts delete mode 100644 platform/bukkit/build.gradle delete mode 100644 platform/bukkit/src/test/resources/junit-platform.properties delete mode 100644 platform/bungeecord/build.gradle delete mode 100644 platform/velocity/build.gradle delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts delete mode 100644 ui/build.gradle create mode 100644 ui/build.gradle.kts create mode 100644 velocity/build.gradle.kts rename {platform/velocity => velocity}/gradle.properties (100%) rename {platform/velocity => velocity}/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java (99%) rename {platform/velocity => velocity}/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java (93%) rename {platform/velocity => velocity}/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java (99%) rename {platform/velocity => velocity}/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java (99%) rename {platform/velocity => velocity}/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java (99%) rename {platform/velocity => velocity}/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java (99%) rename {platform/velocity => velocity}/src/main/resources/config.yml (100%) create mode 100644 velocity/src/main/resources/velocity-plugin.json diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml new file mode 100644 index 000000000..14c55d53d --- /dev/null +++ b/.checkstyle/checkstyle.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.checkstyle/suppressions.xml b/.checkstyle/suppressions.xml new file mode 100644 index 000000000..51386743d --- /dev/null +++ b/.checkstyle/suppressions.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 027eb2ae0..b5c27b3cb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -88,6 +88,47 @@ jobs: with: files: "**/build/test-results/**/*.xml" + snapshots: + needs: [ build, test ] + if: github.ref == 'refs/heads/develop' || 'refs/heads/next' + runs-on: ubuntu-18.04 + steps: + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Cache Gradle + id: cache-gradle + uses: actions/cache@v1 + with: + path: ~/.gradle + key: ${{ runner.os }}-gradle + + - uses: actions/checkout@v1 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Determine whether to deploy to Central + id: snapshot-check + shell: bash + run: | + if ! cat ./gradle.properties | grep --regexp 'version\s*=\s*.*".*-SNAPSHOT"' 2>&1 >/dev/null ; then + echo "::set-output name=snapshot::false" + else + echo "::set-output name=snapshot::true" + fi + + - name: Deploy to OSSRH + if: ${{ github.ref_type != 'tag' && steps.snapshot-check.outputs.snapshot == 'true' }} + run: ./gradlew -PforceSign=true publish --no-daemon + env: + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + release: needs: [ build, test ] if: github.ref == 'refs/heads/master' || 'refs/heads/beta' || github.ref == 'refs/heads/alpha' @@ -121,4 +162,23 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_URL: "https://api.github.com/" - run: npx --legacy-peer-deps -p @semantic-release/changelog -p @semantic-release/git -p gradle-semantic-release-plugin -p semantic-release semantic-release + run: npx --legacy-peer-deps -p @semantic-release/changelog -p @semantic-release/git -p @google/semantic-release-replace-plugin -p gradle-semantic-release-plugin -p semantic-release semantic-release + + - name: Determine whether to deploy to Central + id: snapshot-check + shell: bash + run: | + if ! cat ./gradle.properties | grep --regexp 'version\s*=\s*.*".*-SNAPSHOT"' 2>&1 >/dev/null ; then + echo "::set-output name=snapshot::false" + else + echo "::set-output name=snapshot::true" + fi + + - name: Deploy to Central + if: ${{ steps.snapshot-check.outputs.snapshot == 'false' }} + run: ./gradlew -PforceSign=true publish closeAndReleaseSonatypeStagingRepository --no-daemon + env: + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} \ No newline at end of file diff --git a/.releaserc.json b/.releaserc.json index 093c4facd..d7df3e6e9 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -14,13 +14,28 @@ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", "@semantic-release/changelog", + [ + "@google/semantic-release-replace-plugin", + { + "replacements": [ + { + "files": [ + "**/src/main/java/**/*.java" + ], + "from": "@since next", + "to": "@since ${nextRelease.version}", + "countMatches": true + } + ] + } + ], "gradle-semantic-release-plugin", [ "@semantic-release/github", { "assets": [ { - "path": "platform/{bukkit,velocity,bungeecord}/build/libs/*!(sources|javadoc|text-fixtures).jar" + "path": "{bukkit,velocity,bungeecord}/build/libs/*!(sources|javadoc|text-fixtures).jar" } ] } @@ -29,6 +44,7 @@ "@semantic-release/git", { "assets": [ + "**/src/main/java/**/*.java", "gradle.properties", "CHANGELOG.md" ] diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 8eb9128f5..000000000 --- a/api/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -dependencies { - implementation project(':core') - - testImplementation(testFixtures(project(':core'))) -} \ No newline at end of file diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts new file mode 100644 index 000000000..630668495 --- /dev/null +++ b/bom/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("schat.publishing") + `java-platform` +} + +description = "Bill of materials for sChat" + +indra { + configurePublications { + from(components["javaPlatform"]) + } +} + +dependencies { + constraints { + sequenceOf( + "core", + "features", + "ui", + "platform", + "bukkit", + "velocity", + "bungeecord" + ).forEach { + api(project(":schat-$it")) + } + } +} diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 000000000..40441a50c --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + `kotlin-dsl` +} + +repositories { + gradlePluginPortal() +} + +dependencies { + implementation(libs.gradle.plugin.indra) + implementation(libs.gradle.plugin.indra.publishing) + implementation(libs.gradle.plugin.indra.crossdoc) + implementation(libs.gradle.plugin.testlog) + implementation(libs.gradle.plugin.lombok) + implementation(libs.gradle.plugin.shadow) + + implementation(files(libs.javaClass.protectionDomain.codeSource.location)) +} \ No newline at end of file diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 000000000..fa8bc7492 --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/schat.api.gradle.kts b/build-logic/src/main/kotlin/schat.api.gradle.kts new file mode 100644 index 000000000..b707fe0b1 --- /dev/null +++ b/build-logic/src/main/kotlin/schat.api.gradle.kts @@ -0,0 +1,117 @@ +import com.adarshr.gradle.testlogger.theme.ThemeType +import net.kyori.indra.repository.sonatypeSnapshots +import org.gradle.accessors.dm.LibrariesForLibs + +plugins { + id("schat.publishing") + id("net.kyori.indra") + id("net.kyori.indra.crossdoc") + id("net.kyori.indra.checkstyle") + id("net.kyori.indra.license-header") + id("com.adarshr.test-logger") + id("io.freefair.lombok") + java + `java-library` + `java-test-fixtures` + jacoco +} + +indra { + checkstyle("9.3") +} + +checkstyle { + isIgnoreFailures = true +} + +testlogger { + theme = ThemeType.MOCHA_PARALLEL + showPassed = true +} + +configurations { + testCompileClasspath { + exclude(group = "junit") + } +} + +repositories { + mavenCentral() + sonatypeSnapshots() + maven("https://repo.velocitypowered.com/snapshots/") { + content { + includeGroup("com.velocitypowered") + } + } + maven("https://papermc.io/repo/repository/maven-public/") { + content { + includeGroup("io.papermc.paper") + } + } + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") { + content { + includeGroup("org.bukkit") + includeGroup("org.spigotmc") + } + } + maven("https://repo.dmulloy2.net/repository/public/") { + content { + includeGroup("com.comphenix.protocol") + } + } +} + +dependencies { + val libs = (project as ExtensionAware).extensions.getByName("libs") as LibrariesForLibs + api(libs.checkerframework) + + checkstyle(libs.checkstyle.plugin.stylecheck) + + testImplementation(libs.bundles.testing.api) + testFixturesImplementation(libs.bundles.testing.api) + testRuntimeOnly(libs.bundles.testing.runtime) +} + +indraCrossdoc { + baseUrl().set(providers.gradleProperty("javadocPublishRoot")) + nameBasedDocumentationUrlProvider { + projectNamePrefix.set("schat-") + } +} + +tasks { + withType { + options.compilerArgs.add("-parameters") + } + + processResources { + project.setProperty("version", version) + filesMatching("*.properties") { + expand(project.properties) + } + filesMatching("plugin.yml") { + expand("version" to version) + } + filesMatching("velocity-plugin.json") { + expand("version" to version) + } + } + + javadoc { + val opt = options as StandardJavadocDocletOptions + opt.addStringOption("Xdoclint:none", "-quiet") + opt.tags("sinceMinecraft:a:Since Minecraft:") + + opt.encoding("UTF-8") + opt.charSet("UTF-8") + doFirst { + opt.links( + "https://docs.oracle.com/en/java/javase/17/docs/api/", + ) + } + } + + jacocoTestReport { + dependsOn(test) + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/schat.publishing.gradle.kts b/build-logic/src/main/kotlin/schat.publishing.gradle.kts new file mode 100644 index 000000000..06b8d4430 --- /dev/null +++ b/build-logic/src/main/kotlin/schat.publishing.gradle.kts @@ -0,0 +1,35 @@ +plugins { + id("net.kyori.indra.publishing") +} + +if (System.getenv("CI").toBoolean()) { + val signingKey = System.getenv("SIGNING_KEY") + val signingPassword = System.getenv("SIGNING_PASSWORD") + if (signingKey != null && signingPassword != null) { + signing.useInMemoryPgpKeys(signingKey, signingPassword) + } +} + +indra { + javaVersions { + target(17) + } + + github("sVoxelDev", "sChat") { + ci(true) + } + + mitLicense() + + configurePublications { + pom { + developers { + developer { + id.set("Silthus") + name.set("Michael Reichenbach") + timezone.set("Europe/Berlin") + } + } + } + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/schat.shadow.gradle.kts b/build-logic/src/main/kotlin/schat.shadow.gradle.kts new file mode 100644 index 000000000..2f9a70465 --- /dev/null +++ b/build-logic/src/main/kotlin/schat.shadow.gradle.kts @@ -0,0 +1,36 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import gradle.kotlin.dsl.accessors._9bc3b6a3f384e4e728217dbc108ce9f4.build +import gradle.kotlin.dsl.accessors._9bc3b6a3f384e4e728217dbc108ce9f4.publish + +plugins { + id("com.github.johnrengelman.shadow") +} + +tasks.withType { + archiveClassifier.set("") + dependencies { + include(project(":schat-core")) + include(project(":schat-platform")) + include(project(":schat-ui")) + include(project(":schat-features")) + include(dependency("cloud.commandframework::")) + include(dependency("io.leangen.geantyref::")) + include(dependency("org.spongepowered::")) + include(dependency("org.bstats::")) + } + + val lib = "net.silthus.schat.lib" + + relocate("cloud.commandframework", "$lib.commands") + relocate("org.spongepowered.configurate", "$lib.configurate") + relocate("io.leangen.geantyref", "$lib.typetoken") + relocate("org.bstats", "$lib.bstats") +} + +tasks.build { + dependsOn(tasks.withType()) +} + +tasks.publish { + dependsOn(tasks.withType()) +} \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index ee7a040a1..000000000 --- a/build.gradle +++ /dev/null @@ -1,136 +0,0 @@ -import org.apache.tools.ant.filters.ReplaceTokens - -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -//file:noinspection GroovyAssignabilityCheck - -buildscript { - repositories { - mavenCentral() - } -} - -plugins { - id 'com.github.johnrengelman.shadow' version '7.1.0' apply false - id 'kr.entree.spigradle' version '2.2.4' apply false - id 'io.freefair.lombok' version '6.3.0' apply false - id 'org.cadixdev.licenser' version '0.6.1' apply false -} - -subprojects { - apply plugin: 'com.github.johnrengelman.shadow' - apply plugin: 'io.freefair.lombok' - apply plugin: 'org.cadixdev.licenser' - apply plugin: 'jacoco' - apply plugin: 'java-library' - apply plugin: 'java-test-fixtures' - apply plugin: 'idea' - - apply from: "$rootDir/gradle/jacoco.gradle" - apply from: "$rootDir/gradle/publish.gradle" - - if (project.hasProperty("local_script")) { - apply from: file(local_script + "/build.local.gradle") - } - - sourceCompatibility = 17 - targetCompatibility = 17 - - archivesBaseName = project.property("pluginName") - group project.property("group") - - ext { - mcVersion = project.property("mcVersion") - } - - task processSource(type: Sync) { - from sourceSets.main.java - inputs.property 'version', version - filter(ReplaceTokens, tokens: [version: version]) - into "$buildDir/src" - } - - compileJava { - options.encoding = 'UTF-8' - options.compilerArgs += ["-parameters"] - options.fork = true - options.forkOptions.executable = 'javac' - source = processSource.outputs - } - - processResources { - project.properties.put("version", this.version) - filesMatching('*.properties') { - expand(project.properties) - } - filter(ReplaceTokens, tokens:[version:this.version]) - } - - repositories { - mavenLocal() - mavenCentral() - maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } - maven { url = 'https://repo.aikar.co/content/groups/aikar/' } - maven { url = 'https://repo.dmulloy2.net/repository/public/' } - maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' } - maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' } - maven { url = 'https://maven.enginehub.org/repo/' } - maven { url = 'https://storehouse.okaeri.eu/repository/maven-public/' } - maven { url = 'https://jitpack.io' } - } - - dependencies { - api 'net.kyori:adventure-api:4.10.0-SNAPSHOT' - - implementation 'net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT' - implementation 'net.kyori:adventure-text-serializer-plain:4.10.0-SNAPSHOT' - implementation 'net.kyori:adventure-text-serializer-gson:4.10.0-SNAPSHOT' - implementation 'net.kyori:event-api:3.0.0' - - implementation 'org.jetbrains:annotations:22.0.0' - - // Test dependencies - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' - testImplementation 'org.mockito:mockito-core:4.0.0' - testImplementation 'org.assertj:assertj-core:3.21.0' - - testFixturesImplementation 'net.kyori:event-api:3.0.0' - testFixturesImplementation 'org.mockito:mockito-core:4.0.0' - testFixturesImplementation 'org.assertj:assertj-core:3.21.0' - testFixturesImplementation 'net.kyori:adventure-text-serializer-plain:4.10.0-SNAPSHOT' - } - - test { - useJUnitPlatform() - testLogging { - events "skipped", "failed" - } - ignoreFailures = false - } - - license { - header = rootProject.file("HEADER.txt") - include '**/*.java' - newLine = true - } - - tasks.build.dependsOn(updateLicenses) - - defaultTasks 'licenseFormat', 'build' -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..852b5cf9d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("schat.publishing") + alias(libs.plugins.indra.publishing.sonatype) +} + +group = "net.silthus.schat" +description = "A unique chat plugin for Minecraft servers." + +indraSonatype { + useAlternateSonatypeOSSHost("s01") +} diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts new file mode 100644 index 000000000..973d1084e --- /dev/null +++ b/bukkit/build.gradle.kts @@ -0,0 +1,32 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + id("schat.api") + id("schat.shadow") +} + +description = "Bukkit implementation of the sChat platform." + +dependencies { + api(project(":schat-platform")) + + implementation(libs.spigot) + + implementation(libs.protocollib) + implementation(libs.cloud.commands.paper) + implementation(libs.adventure.platform.bukkit) + + testImplementation(libs.mockbukkit) + testImplementation(testFixtures(project(":schat-core"))) + testImplementation(testFixtures(project(":schat-platform"))) + testImplementation(testFixtures(project(":schat-ui"))) +} + +tasks.withType { + dependencies { + include(dependency("net.kyori::")) + } + + val lib = "net.silthus.schat.lib" + relocate("net.kyori", "$lib.kyori") +} \ No newline at end of file diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java b/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java index 9d5fc6bb2..f2aae3ff9 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitBootstrap.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit; import java.nio.file.Path; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java b/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java similarity index 97% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java index 2a9ce4b54..b9abbe441 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/BukkitLoader.java @@ -21,11 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit; import java.io.File; -import kr.entree.spigradle.annotations.PluginMain; import lombok.Getter; import lombok.experimental.Accessors; import org.bukkit.plugin.PluginDescriptionFile; @@ -33,7 +31,6 @@ import org.bukkit.plugin.java.JavaPluginLoader; import org.jetbrains.annotations.NotNull; -@PluginMain @Getter @Accessors(fluent = true) public final class BukkitLoader extends JavaPlugin { diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java b/bukkit/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java index efc9ae8ee..ab8712bfd 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/SChatBukkitServer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit; import cloud.commandframework.CommandManager; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java similarity index 98% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java index da0b0288b..101822b78 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import java.util.Optional; @@ -30,8 +29,8 @@ import net.silthus.schat.chatter.Chatter; import net.silthus.schat.identity.Identity; import net.silthus.schat.platform.chatter.AbstractChatterFactory; +import net.silthus.schat.ui.ViewConnector; import net.silthus.schat.ui.view.DynamicViewConnector; -import net.silthus.schat.view.ViewConnector; import net.silthus.schat.ui.view.ViewProvider; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java index 075a33760..26cfc83ab 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitConnectionListener.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import net.silthus.schat.bukkit.SChatBukkitServer; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java index 61cb8c043..26ef0b4ae 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitIdentityAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import java.util.function.Supplier; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java index 392559f6e..50df10ebb 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGateway.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import com.google.common.io.ByteArrayDataOutput; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java index e2119a1d3..a62a62c00 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSchedulerAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import java.util.concurrent.Executor; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java index 773a0c887..756eea57c 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import java.util.UUID; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java index 6c3ff4dd7..90aea4a42 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/adapter/PlayerChatListener.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import net.silthus.schat.chatter.Chatter; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java b/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java index 0aeeead27..8381229c9 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/AbstractPacket.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.protocollib; import com.comphenix.protocol.PacketType; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java b/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java index 9340dca4a..b2b0b5999 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/ChatPacketListener.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.protocollib; import com.comphenix.protocol.PacketType; diff --git a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java b/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java similarity index 99% rename from platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java rename to bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java index 5b4d790c2..aaae9231f 100644 --- a/platform/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java +++ b/bukkit/src/main/java/net/silthus/schat/bukkit/protocollib/WrapperPlayServerChat.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.protocollib; import com.comphenix.protocol.PacketType; diff --git a/platform/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml similarity index 100% rename from platform/bukkit/src/main/resources/config.yml rename to bukkit/src/main/resources/config.yml diff --git a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/BukkitTests.java b/bukkit/src/test/java/net/silthus/schat/bukkit/BukkitTests.java similarity index 99% rename from platform/bukkit/src/test/java/net/silthus/schat/bukkit/BukkitTests.java rename to bukkit/src/test/java/net/silthus/schat/bukkit/BukkitTests.java index 4a61ccd0e..d5f4ea124 100644 --- a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/BukkitTests.java +++ b/bukkit/src/test/java/net/silthus/schat/bukkit/BukkitTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit; import be.seeseemelk.mockbukkit.MockBukkit; diff --git a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java b/bukkit/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java similarity index 99% rename from platform/bukkit/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java rename to bukkit/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java index d07f8d0a9..13a2fe9a1 100644 --- a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java +++ b/bukkit/src/test/java/net/silthus/schat/bukkit/CustomServerMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit; import be.seeseemelk.mockbukkit.ServerMock; diff --git a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java similarity index 99% rename from platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java rename to bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java index 5d42f4e8c..4f11e6c5a 100644 --- a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java +++ b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitChatterFactoryTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import be.seeseemelk.mockbukkit.entity.PlayerMock; diff --git a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java similarity index 99% rename from platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java rename to bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java index 6d1869a94..db24f0a96 100644 --- a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java +++ b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitMessengerGatewayTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import com.google.common.io.ByteArrayDataOutput; diff --git a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java similarity index 99% rename from platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java rename to bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java index 0fc1ae974..825324a23 100644 --- a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java +++ b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/BukkitSenderFactoryTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import be.seeseemelk.mockbukkit.command.ConsoleCommandSenderMock; diff --git a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java similarity index 99% rename from platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java rename to bukkit/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java index 53374fe19..094c147eb 100644 --- a/platform/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java +++ b/bukkit/src/test/java/net/silthus/schat/bukkit/adapter/PlayerChatListenerTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bukkit.adapter; import be.seeseemelk.mockbukkit.entity.PlayerMock; diff --git a/api/src/test/resources/junit-platform.properties b/bukkit/src/test/resources/junit-platform.properties similarity index 100% rename from api/src/test/resources/junit-platform.properties rename to bukkit/src/test/resources/junit-platform.properties diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts new file mode 100644 index 000000000..7240e45e6 --- /dev/null +++ b/bungeecord/build.gradle.kts @@ -0,0 +1,27 @@ +plugins { + id("schat.api") + id("schat.shadow") +} + +description = "Bungeecord implementation of the sChat platform." + +dependencies { + api(project(":schat-platform")) + + implementation(libs.bungeecord) + implementation(libs.adventure.platform.bungeecord) + + testImplementation(libs.mockbukkit) + testImplementation(testFixtures(project(":schat-platform"))) + + testFixturesImplementation(testFixtures(project(":schat-platform"))) +} + +tasks.withType { + dependencies { + include(dependency("net.kyori::")) + } + + val lib = "net.silthus.schat.lib" + relocate("net.kyori", "$lib.kyori") +} diff --git a/platform/bungeecord/gradle.properties b/bungeecord/gradle.properties similarity index 100% rename from platform/bungeecord/gradle.properties rename to bungeecord/gradle.properties diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java index 834f1dddf..e6ed9f150 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordBootstrap.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord; import java.nio.file.Path; diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java index 36c805b57..6bfe18369 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordLoader.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord; import net.md_5.bungee.api.plugin.Plugin; diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java index 77f39e5db..25ac2e70a 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/BungeecordProxyPlugin.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord; import lombok.Getter; diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java index d5b8cfedd..52a359089 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordIdentityAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord.adapter; import java.util.function.Supplier; diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java index 6a3b6e774..b17422892 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordMessengerGateway.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord.adapter; import com.google.common.io.ByteArrayDataOutput; diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java index d6a922325..abef93644 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSchedulerAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord.adapter; import java.util.Collections; diff --git a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java similarity index 99% rename from platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java rename to bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java index c9b4a0edf..46c483bb2 100644 --- a/platform/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java +++ b/bungeecord/src/main/java/net/silthus/schat/bungeecord/adapter/BungeecordSenderFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.bungeecord.adapter; import java.util.UUID; diff --git a/platform/bungeecord/src/main/resources/config.yml b/bungeecord/src/main/resources/config.yml similarity index 100% rename from platform/bungeecord/src/main/resources/config.yml rename to bungeecord/src/main/resources/config.yml diff --git a/platform/bungeecord/src/main/resources/plugin.yml b/bungeecord/src/main/resources/plugin.yml similarity index 79% rename from platform/bungeecord/src/main/resources/plugin.yml rename to bungeecord/src/main/resources/plugin.yml index 813cb9507..69d96cb58 100644 --- a/platform/bungeecord/src/main/resources/plugin.yml +++ b/bungeecord/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ name: sChat main: net.silthus.schat.bungeecord.BungeecordLoader -version: @version@ +version: ${version} author: Silthus \ No newline at end of file diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml deleted file mode 100644 index 6be2e45ec..000000000 --- a/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml deleted file mode 100644 index 6a481e085..000000000 --- a/config/checkstyle/suppressions.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/core/build.gradle b/core/build.gradle deleted file mode 100644 index 4d6ada994..000000000 --- a/core/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -dependencies { - implementation 'net.kyori:adventure-platform-api:4.0.1' - - testFixturesImplementation 'net.kyori:adventure-platform-api:4.0.1' - testFixturesImplementation 'org.apache.commons:commons-lang3:3.12.0' -} \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 000000000..272c61926 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + id("schat.api") +} + +description = "Core API and business logic of sChat" + +dependencies { + api(libs.adventure.api) + api(libs.event) + api(libs.gson) + + implementation(libs.adventure.gson) + + testFixturesImplementation(libs.adventure.api) +} \ No newline at end of file diff --git a/core/src/main/java/net/silthus/schat/channel/Channel.java b/core/src/main/java/net/silthus/schat/channel/Channel.java index 44860dabc..d1fdf00a2 100644 --- a/core/src/main/java/net/silthus/schat/channel/Channel.java +++ b/core/src/main/java/net/silthus/schat/channel/Channel.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import java.util.Optional; diff --git a/core/src/main/java/net/silthus/schat/channel/ChannelImpl.java b/core/src/main/java/net/silthus/schat/channel/ChannelImpl.java index 679a06223..319063296 100644 --- a/core/src/main/java/net/silthus/schat/channel/ChannelImpl.java +++ b/core/src/main/java/net/silthus/schat/channel/ChannelImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import java.util.HashMap; diff --git a/core/src/main/java/net/silthus/schat/channel/ChannelPrototype.java b/core/src/main/java/net/silthus/schat/channel/ChannelPrototype.java index 9bd067629..9e5c098cf 100644 --- a/core/src/main/java/net/silthus/schat/channel/ChannelPrototype.java +++ b/core/src/main/java/net/silthus/schat/channel/ChannelPrototype.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import net.silthus.schat.eventbus.EventBus; diff --git a/core/src/main/java/net/silthus/schat/channel/ChannelRepository.java b/core/src/main/java/net/silthus/schat/channel/ChannelRepository.java index 854ae83bc..9fcffc01e 100644 --- a/core/src/main/java/net/silthus/schat/channel/ChannelRepository.java +++ b/core/src/main/java/net/silthus/schat/channel/ChannelRepository.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import net.silthus.schat.repository.Repository; diff --git a/core/src/main/java/net/silthus/schat/channel/ChannelSettings.java b/core/src/main/java/net/silthus/schat/channel/ChannelSettings.java index 88448d45f..753fccc27 100644 --- a/core/src/main/java/net/silthus/schat/channel/ChannelSettings.java +++ b/core/src/main/java/net/silthus/schat/channel/ChannelSettings.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import net.silthus.schat.pointer.Setting; diff --git a/core/src/main/java/net/silthus/schat/channel/InMemoryChannelRepository.java b/core/src/main/java/net/silthus/schat/channel/InMemoryChannelRepository.java index 5e2270d36..f2687e940 100644 --- a/core/src/main/java/net/silthus/schat/channel/InMemoryChannelRepository.java +++ b/core/src/main/java/net/silthus/schat/channel/InMemoryChannelRepository.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import lombok.extern.java.Log; diff --git a/core/src/main/java/net/silthus/schat/chatter/Chatter.java b/core/src/main/java/net/silthus/schat/chatter/Chatter.java index bb0dc283d..f4f519d14 100644 --- a/core/src/main/java/net/silthus/schat/chatter/Chatter.java +++ b/core/src/main/java/net/silthus/schat/chatter/Chatter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import java.util.List; @@ -37,8 +36,8 @@ import net.silthus.schat.message.MessageTarget; import net.silthus.schat.pointer.Pointer; import net.silthus.schat.repository.Entity; +import net.silthus.schat.ui.ViewConnector; import net.silthus.schat.util.Permissable; -import net.silthus.schat.view.ViewConnector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/core/src/main/java/net/silthus/schat/chatter/ChatterFactory.java b/core/src/main/java/net/silthus/schat/chatter/ChatterFactory.java index b60b62ca0..7abdf05cb 100644 --- a/core/src/main/java/net/silthus/schat/chatter/ChatterFactory.java +++ b/core/src/main/java/net/silthus/schat/chatter/ChatterFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import java.util.UUID; diff --git a/core/src/main/java/net/silthus/schat/chatter/ChatterImpl.java b/core/src/main/java/net/silthus/schat/chatter/ChatterImpl.java index 8a049b4cd..aaec09c06 100644 --- a/core/src/main/java/net/silthus/schat/chatter/ChatterImpl.java +++ b/core/src/main/java/net/silthus/schat/chatter/ChatterImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import java.util.HashSet; @@ -41,7 +40,7 @@ import net.silthus.schat.identity.Identity; import net.silthus.schat.message.Message; import net.silthus.schat.pointer.Pointers; -import net.silthus.schat.view.ViewConnector; +import net.silthus.schat.ui.ViewConnector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/core/src/main/java/net/silthus/schat/chatter/ChatterRepository.java b/core/src/main/java/net/silthus/schat/chatter/ChatterRepository.java index d91b510c7..804d05a1f 100644 --- a/core/src/main/java/net/silthus/schat/chatter/ChatterRepository.java +++ b/core/src/main/java/net/silthus/schat/chatter/ChatterRepository.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import java.util.UUID; diff --git a/core/src/main/java/net/silthus/schat/chatter/InMemoryChatterRepository.java b/core/src/main/java/net/silthus/schat/chatter/InMemoryChatterRepository.java index afdfdb89c..20c7a96ed 100644 --- a/core/src/main/java/net/silthus/schat/chatter/InMemoryChatterRepository.java +++ b/core/src/main/java/net/silthus/schat/chatter/InMemoryChatterRepository.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import java.util.UUID; diff --git a/core/src/main/java/net/silthus/schat/command/Command.java b/core/src/main/java/net/silthus/schat/command/Command.java index 8b882f262..84574c4b1 100644 --- a/core/src/main/java/net/silthus/schat/command/Command.java +++ b/core/src/main/java/net/silthus/schat/command/Command.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.command; import java.util.function.Function; diff --git a/core/src/main/java/net/silthus/schat/command/CommandBuilder.java b/core/src/main/java/net/silthus/schat/command/CommandBuilder.java index 326943c8d..7aea51568 100644 --- a/core/src/main/java/net/silthus/schat/command/CommandBuilder.java +++ b/core/src/main/java/net/silthus/schat/command/CommandBuilder.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.command; import java.util.function.Function; diff --git a/core/src/main/java/net/silthus/schat/command/Result.java b/core/src/main/java/net/silthus/schat/command/Result.java index db4f165a6..7999a1139 100644 --- a/core/src/main/java/net/silthus/schat/command/Result.java +++ b/core/src/main/java/net/silthus/schat/command/Result.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.command; import java.util.Optional; diff --git a/core/src/main/java/net/silthus/schat/command/ResultImpl.java b/core/src/main/java/net/silthus/schat/command/ResultImpl.java index 27961aaae..30892583f 100644 --- a/core/src/main/java/net/silthus/schat/command/ResultImpl.java +++ b/core/src/main/java/net/silthus/schat/command/ResultImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.command; import java.util.Optional; diff --git a/core/src/main/java/net/silthus/schat/commands/ChatCommand.java b/core/src/main/java/net/silthus/schat/commands/ChatCommand.java index 77ff338bf..df4f9a5f4 100644 --- a/core/src/main/java/net/silthus/schat/commands/ChatCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/ChatCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import lombok.Getter; diff --git a/core/src/main/java/net/silthus/schat/commands/CreatePrivateChannelCommand.java b/core/src/main/java/net/silthus/schat/commands/CreatePrivateChannelCommand.java index 1c68888ae..cd556f608 100644 --- a/core/src/main/java/net/silthus/schat/commands/CreatePrivateChannelCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/CreatePrivateChannelCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.Set; diff --git a/core/src/main/java/net/silthus/schat/commands/JoinChannelCommand.java b/core/src/main/java/net/silthus/schat/commands/JoinChannelCommand.java index ab4f0bdd7..5d8c237c9 100644 --- a/core/src/main/java/net/silthus/schat/commands/JoinChannelCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/JoinChannelCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.function.Function; diff --git a/core/src/main/java/net/silthus/schat/commands/LeaveChannelCommand.java b/core/src/main/java/net/silthus/schat/commands/LeaveChannelCommand.java index b80bd82dc..a5a20af33 100644 --- a/core/src/main/java/net/silthus/schat/commands/LeaveChannelCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/LeaveChannelCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.function.Function; diff --git a/core/src/main/java/net/silthus/schat/commands/SendMessageCommand.java b/core/src/main/java/net/silthus/schat/commands/SendMessageCommand.java index 71f23cb40..0eec9e139 100644 --- a/core/src/main/java/net/silthus/schat/commands/SendMessageCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/SendMessageCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.function.Function; diff --git a/core/src/main/java/net/silthus/schat/commands/SendMessageResult.java b/core/src/main/java/net/silthus/schat/commands/SendMessageResult.java index 981129f48..d47099ffe 100644 --- a/core/src/main/java/net/silthus/schat/commands/SendMessageResult.java +++ b/core/src/main/java/net/silthus/schat/commands/SendMessageResult.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.command.Result; diff --git a/core/src/main/java/net/silthus/schat/commands/SendPrivateMessageCommand.java b/core/src/main/java/net/silthus/schat/commands/SendPrivateMessageCommand.java index 21478da8d..81132cbf1 100644 --- a/core/src/main/java/net/silthus/schat/commands/SendPrivateMessageCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/SendPrivateMessageCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.function.Function; diff --git a/core/src/main/java/net/silthus/schat/commands/SetActiveChannelCommand.java b/core/src/main/java/net/silthus/schat/commands/SetActiveChannelCommand.java index 65aa011cb..2d2066232 100644 --- a/core/src/main/java/net/silthus/schat/commands/SetActiveChannelCommand.java +++ b/core/src/main/java/net/silthus/schat/commands/SetActiveChannelCommand.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.channel.Channel; diff --git a/core/src/main/java/net/silthus/schat/eventbus/EmptyEventBus.java b/core/src/main/java/net/silthus/schat/eventbus/EmptyEventBus.java index cf066c425..a1fe2bad6 100644 --- a/core/src/main/java/net/silthus/schat/eventbus/EmptyEventBus.java +++ b/core/src/main/java/net/silthus/schat/eventbus/EmptyEventBus.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import java.util.Set; diff --git a/core/src/main/java/net/silthus/schat/eventbus/EventBus.java b/core/src/main/java/net/silthus/schat/eventbus/EventBus.java index 1f93b70bb..b3a8882a2 100644 --- a/core/src/main/java/net/silthus/schat/eventbus/EventBus.java +++ b/core/src/main/java/net/silthus/schat/eventbus/EventBus.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import java.util.Set; diff --git a/core/src/main/java/net/silthus/schat/eventbus/EventBusImpl.java b/core/src/main/java/net/silthus/schat/eventbus/EventBusImpl.java index 7f58fa462..a09661fe0 100644 --- a/core/src/main/java/net/silthus/schat/eventbus/EventBusImpl.java +++ b/core/src/main/java/net/silthus/schat/eventbus/EventBusImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import java.util.Set; diff --git a/core/src/main/java/net/silthus/schat/eventbus/EventListener.java b/core/src/main/java/net/silthus/schat/eventbus/EventListener.java index dfe83540d..00ef71869 100644 --- a/core/src/main/java/net/silthus/schat/eventbus/EventListener.java +++ b/core/src/main/java/net/silthus/schat/eventbus/EventListener.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import net.silthus.schat.events.SChatEvent; diff --git a/core/src/main/java/net/silthus/schat/eventbus/EventSubscription.java b/core/src/main/java/net/silthus/schat/eventbus/EventSubscription.java index 2a44ca831..d91cfd44e 100644 --- a/core/src/main/java/net/silthus/schat/eventbus/EventSubscription.java +++ b/core/src/main/java/net/silthus/schat/eventbus/EventSubscription.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import java.util.function.Consumer; diff --git a/core/src/main/java/net/silthus/schat/eventbus/EventSubscriptionImpl.java b/core/src/main/java/net/silthus/schat/eventbus/EventSubscriptionImpl.java index 96cec54c1..831072868 100644 --- a/core/src/main/java/net/silthus/schat/eventbus/EventSubscriptionImpl.java +++ b/core/src/main/java/net/silthus/schat/eventbus/EventSubscriptionImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/main/java/net/silthus/schat/events/Cancellable.java b/core/src/main/java/net/silthus/schat/events/Cancellable.java index e246bfeba..cc32efd66 100644 --- a/core/src/main/java/net/silthus/schat/events/Cancellable.java +++ b/core/src/main/java/net/silthus/schat/events/Cancellable.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/main/java/net/silthus/schat/events/SChatEvent.java b/core/src/main/java/net/silthus/schat/events/SChatEvent.java index 85ad1da63..b92b37a39 100644 --- a/core/src/main/java/net/silthus/schat/events/SChatEvent.java +++ b/core/src/main/java/net/silthus/schat/events/SChatEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events; /** diff --git a/core/src/main/java/net/silthus/schat/events/channel/JoinChannelEvent.java b/core/src/main/java/net/silthus/schat/events/channel/JoinChannelEvent.java index e464d87a8..9e941b5f0 100644 --- a/core/src/main/java/net/silthus/schat/events/channel/JoinChannelEvent.java +++ b/core/src/main/java/net/silthus/schat/events/channel/JoinChannelEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.channel; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/main/java/net/silthus/schat/events/channel/JoinedChannelEvent.java b/core/src/main/java/net/silthus/schat/events/channel/JoinedChannelEvent.java index ea8322218..91c52dc76 100644 --- a/core/src/main/java/net/silthus/schat/events/channel/JoinedChannelEvent.java +++ b/core/src/main/java/net/silthus/schat/events/channel/JoinedChannelEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.channel; import net.silthus.schat.channel.Channel; diff --git a/core/src/main/java/net/silthus/schat/events/channel/LeaveChannelEvent.java b/core/src/main/java/net/silthus/schat/events/channel/LeaveChannelEvent.java index 59ee2ccce..2523b964c 100644 --- a/core/src/main/java/net/silthus/schat/events/channel/LeaveChannelEvent.java +++ b/core/src/main/java/net/silthus/schat/events/channel/LeaveChannelEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.channel; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/main/java/net/silthus/schat/events/channel/LeftChannelEvent.java b/core/src/main/java/net/silthus/schat/events/channel/LeftChannelEvent.java index 8c75b4aa0..0e97e32ca 100644 --- a/core/src/main/java/net/silthus/schat/events/channel/LeftChannelEvent.java +++ b/core/src/main/java/net/silthus/schat/events/channel/LeftChannelEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.channel; import net.silthus.schat.channel.Channel; diff --git a/core/src/main/java/net/silthus/schat/events/chatter/ChatterJoinedServerEvent.java b/core/src/main/java/net/silthus/schat/events/chatter/ChatterJoinedServerEvent.java index b147ff176..1a2bb5707 100644 --- a/core/src/main/java/net/silthus/schat/events/chatter/ChatterJoinedServerEvent.java +++ b/core/src/main/java/net/silthus/schat/events/chatter/ChatterJoinedServerEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.chatter; import net.silthus.schat.chatter.Chatter; diff --git a/core/src/main/java/net/silthus/schat/events/config/ConfigReloadedEvent.java b/core/src/main/java/net/silthus/schat/events/config/ConfigReloadedEvent.java index 31b69f695..c39a3f6c1 100644 --- a/core/src/main/java/net/silthus/schat/events/config/ConfigReloadedEvent.java +++ b/core/src/main/java/net/silthus/schat/events/config/ConfigReloadedEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.config; import net.silthus.schat.events.SChatEvent; diff --git a/core/src/main/java/net/silthus/schat/events/message/SendChannelMessageEvent.java b/core/src/main/java/net/silthus/schat/events/message/SendChannelMessageEvent.java index 763caf4a0..22fa398f7 100644 --- a/core/src/main/java/net/silthus/schat/events/message/SendChannelMessageEvent.java +++ b/core/src/main/java/net/silthus/schat/events/message/SendChannelMessageEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.message; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/main/java/net/silthus/schat/events/message/SendMessageEvent.java b/core/src/main/java/net/silthus/schat/events/message/SendMessageEvent.java index 677b1117c..c8147f635 100644 --- a/core/src/main/java/net/silthus/schat/events/message/SendMessageEvent.java +++ b/core/src/main/java/net/silthus/schat/events/message/SendMessageEvent.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.events.message; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/core/src/main/java/net/silthus/schat/identity/Identified.java b/core/src/main/java/net/silthus/schat/identity/Identified.java index 6c833dc3e..9f45ea05b 100644 --- a/core/src/main/java/net/silthus/schat/identity/Identified.java +++ b/core/src/main/java/net/silthus/schat/identity/Identified.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.identity; import java.util.UUID; diff --git a/core/src/main/java/net/silthus/schat/identity/Identity.java b/core/src/main/java/net/silthus/schat/identity/Identity.java index bb23af75e..3b54295a0 100644 --- a/core/src/main/java/net/silthus/schat/identity/Identity.java +++ b/core/src/main/java/net/silthus/schat/identity/Identity.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.identity; import java.util.UUID; diff --git a/core/src/main/java/net/silthus/schat/identity/IdentityImpl.java b/core/src/main/java/net/silthus/schat/identity/IdentityImpl.java index cb798749c..1c9e8d7df 100644 --- a/core/src/main/java/net/silthus/schat/identity/IdentityImpl.java +++ b/core/src/main/java/net/silthus/schat/identity/IdentityImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.identity; import java.util.Objects; diff --git a/core/src/main/java/net/silthus/schat/message/Message.java b/core/src/main/java/net/silthus/schat/message/Message.java index c9138011e..6338e8ea5 100644 --- a/core/src/main/java/net/silthus/schat/message/Message.java +++ b/core/src/main/java/net/silthus/schat/message/Message.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.time.Instant; diff --git a/core/src/main/java/net/silthus/schat/message/MessageImpl.java b/core/src/main/java/net/silthus/schat/message/MessageImpl.java index b815dc04f..6c05c754a 100644 --- a/core/src/main/java/net/silthus/schat/message/MessageImpl.java +++ b/core/src/main/java/net/silthus/schat/message/MessageImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.time.Instant; diff --git a/core/src/main/java/net/silthus/schat/message/MessageTarget.java b/core/src/main/java/net/silthus/schat/message/MessageTarget.java index 1b72c376d..bad832780 100644 --- a/core/src/main/java/net/silthus/schat/message/MessageTarget.java +++ b/core/src/main/java/net/silthus/schat/message/MessageTarget.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.function.Predicate; diff --git a/core/src/main/java/net/silthus/schat/message/Messages.java b/core/src/main/java/net/silthus/schat/message/Messages.java index 1ab826404..881b13624 100644 --- a/core/src/main/java/net/silthus/schat/message/Messages.java +++ b/core/src/main/java/net/silthus/schat/message/Messages.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.AbstractList; diff --git a/core/src/main/java/net/silthus/schat/message/Targets.java b/core/src/main/java/net/silthus/schat/message/Targets.java index 6735cf6a2..380bb3d7e 100644 --- a/core/src/main/java/net/silthus/schat/message/Targets.java +++ b/core/src/main/java/net/silthus/schat/message/Targets.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.AbstractSet; diff --git a/core/src/main/java/net/silthus/schat/message/TargetsFilter.java b/core/src/main/java/net/silthus/schat/message/TargetsFilter.java index f2751b962..938007e76 100644 --- a/core/src/main/java/net/silthus/schat/message/TargetsFilter.java +++ b/core/src/main/java/net/silthus/schat/message/TargetsFilter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.Optional; diff --git a/core/src/main/java/net/silthus/schat/messenger/EmptyMessenger.java b/core/src/main/java/net/silthus/schat/messenger/EmptyMessenger.java index ff011e999..6d8887cc2 100644 --- a/core/src/main/java/net/silthus/schat/messenger/EmptyMessenger.java +++ b/core/src/main/java/net/silthus/schat/messenger/EmptyMessenger.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import java.lang.reflect.Type; diff --git a/core/src/main/java/net/silthus/schat/messenger/GsonPluginMessageSerializer.java b/core/src/main/java/net/silthus/schat/messenger/GsonPluginMessageSerializer.java index d0a65b42e..58befb53d 100644 --- a/core/src/main/java/net/silthus/schat/messenger/GsonPluginMessageSerializer.java +++ b/core/src/main/java/net/silthus/schat/messenger/GsonPluginMessageSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import com.google.gson.Gson; diff --git a/core/src/main/java/net/silthus/schat/messenger/IncomingMessageConsumer.java b/core/src/main/java/net/silthus/schat/messenger/IncomingMessageConsumer.java index 43103716f..953aa2f90 100644 --- a/core/src/main/java/net/silthus/schat/messenger/IncomingMessageConsumer.java +++ b/core/src/main/java/net/silthus/schat/messenger/IncomingMessageConsumer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import lombok.NonNull; diff --git a/core/src/main/java/net/silthus/schat/messenger/Messenger.java b/core/src/main/java/net/silthus/schat/messenger/Messenger.java index de5c1586d..ee4632602 100644 --- a/core/src/main/java/net/silthus/schat/messenger/Messenger.java +++ b/core/src/main/java/net/silthus/schat/messenger/Messenger.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import java.lang.reflect.Type; diff --git a/core/src/main/java/net/silthus/schat/messenger/MessengerGateway.java b/core/src/main/java/net/silthus/schat/messenger/MessengerGateway.java index 974c9ed02..1aac8057f 100644 --- a/core/src/main/java/net/silthus/schat/messenger/MessengerGateway.java +++ b/core/src/main/java/net/silthus/schat/messenger/MessengerGateway.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; public interface MessengerGateway extends AutoCloseable { diff --git a/core/src/main/java/net/silthus/schat/messenger/MessengerGatewayProvider.java b/core/src/main/java/net/silthus/schat/messenger/MessengerGatewayProvider.java index 967aae11e..e7b660e2c 100644 --- a/core/src/main/java/net/silthus/schat/messenger/MessengerGatewayProvider.java +++ b/core/src/main/java/net/silthus/schat/messenger/MessengerGatewayProvider.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import lombok.NonNull; diff --git a/core/src/main/java/net/silthus/schat/messenger/PluginMessage.java b/core/src/main/java/net/silthus/schat/messenger/PluginMessage.java index 45de60c5d..972bdb210 100644 --- a/core/src/main/java/net/silthus/schat/messenger/PluginMessage.java +++ b/core/src/main/java/net/silthus/schat/messenger/PluginMessage.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import java.util.UUID; diff --git a/core/src/main/java/net/silthus/schat/messenger/PluginMessageSerializer.java b/core/src/main/java/net/silthus/schat/messenger/PluginMessageSerializer.java index 4da5405b3..7684e2cde 100644 --- a/core/src/main/java/net/silthus/schat/messenger/PluginMessageSerializer.java +++ b/core/src/main/java/net/silthus/schat/messenger/PluginMessageSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.messenger; import java.lang.reflect.Type; diff --git a/core/src/main/java/net/silthus/schat/pointer/Configured.java b/core/src/main/java/net/silthus/schat/pointer/Configured.java index 435927820..529bc29a2 100644 --- a/core/src/main/java/net/silthus/schat/pointer/Configured.java +++ b/core/src/main/java/net/silthus/schat/pointer/Configured.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.function.Supplier; diff --git a/core/src/main/java/net/silthus/schat/pointer/Pointer.java b/core/src/main/java/net/silthus/schat/pointer/Pointer.java index 10d4d2daf..5d10562e5 100644 --- a/core/src/main/java/net/silthus/schat/pointer/Pointer.java +++ b/core/src/main/java/net/silthus/schat/pointer/Pointer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.lang.ref.WeakReference; diff --git a/core/src/main/java/net/silthus/schat/pointer/PointerImpl.java b/core/src/main/java/net/silthus/schat/pointer/PointerImpl.java index a9018451b..0acc027b0 100644 --- a/core/src/main/java/net/silthus/schat/pointer/PointerImpl.java +++ b/core/src/main/java/net/silthus/schat/pointer/PointerImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; record PointerImpl(Class type, String key) implements Pointer { diff --git a/core/src/main/java/net/silthus/schat/pointer/Pointered.java b/core/src/main/java/net/silthus/schat/pointer/Pointered.java index d4f1bb714..25cbe62ab 100644 --- a/core/src/main/java/net/silthus/schat/pointer/Pointered.java +++ b/core/src/main/java/net/silthus/schat/pointer/Pointered.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.Optional; diff --git a/core/src/main/java/net/silthus/schat/pointer/Pointers.java b/core/src/main/java/net/silthus/schat/pointer/Pointers.java index 12667080d..f6f769492 100644 --- a/core/src/main/java/net/silthus/schat/pointer/Pointers.java +++ b/core/src/main/java/net/silthus/schat/pointer/Pointers.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.Collections; diff --git a/core/src/main/java/net/silthus/schat/pointer/PointersImpl.java b/core/src/main/java/net/silthus/schat/pointer/PointersImpl.java index 37186e544..0ad59d243 100644 --- a/core/src/main/java/net/silthus/schat/pointer/PointersImpl.java +++ b/core/src/main/java/net/silthus/schat/pointer/PointersImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.Collections; diff --git a/core/src/main/java/net/silthus/schat/pointer/Setting.java b/core/src/main/java/net/silthus/schat/pointer/Setting.java index 53067c864..f397350af 100644 --- a/core/src/main/java/net/silthus/schat/pointer/Setting.java +++ b/core/src/main/java/net/silthus/schat/pointer/Setting.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.function.Supplier; diff --git a/core/src/main/java/net/silthus/schat/pointer/SettingImpl.java b/core/src/main/java/net/silthus/schat/pointer/SettingImpl.java index b22851eaa..2145f8342 100644 --- a/core/src/main/java/net/silthus/schat/pointer/SettingImpl.java +++ b/core/src/main/java/net/silthus/schat/pointer/SettingImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.function.Supplier; diff --git a/core/src/main/java/net/silthus/schat/pointer/Settings.java b/core/src/main/java/net/silthus/schat/pointer/Settings.java index f14e3ab87..481dc9383 100644 --- a/core/src/main/java/net/silthus/schat/pointer/Settings.java +++ b/core/src/main/java/net/silthus/schat/pointer/Settings.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.Collections; diff --git a/core/src/main/java/net/silthus/schat/pointer/SettingsImpl.java b/core/src/main/java/net/silthus/schat/pointer/SettingsImpl.java index 2903b2f8f..a819b2888 100644 --- a/core/src/main/java/net/silthus/schat/pointer/SettingsImpl.java +++ b/core/src/main/java/net/silthus/schat/pointer/SettingsImpl.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.Collections; diff --git a/core/src/main/java/net/silthus/schat/policies/ChannelPolicy.java b/core/src/main/java/net/silthus/schat/policies/ChannelPolicy.java index d6ae63903..a1b6073b3 100644 --- a/core/src/main/java/net/silthus/schat/policies/ChannelPolicy.java +++ b/core/src/main/java/net/silthus/schat/policies/ChannelPolicy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import java.util.function.BiPredicate; diff --git a/core/src/main/java/net/silthus/schat/policies/JoinChannelPolicy.java b/core/src/main/java/net/silthus/schat/policies/JoinChannelPolicy.java index ae2eaf424..35b131127 100644 --- a/core/src/main/java/net/silthus/schat/policies/JoinChannelPolicy.java +++ b/core/src/main/java/net/silthus/schat/policies/JoinChannelPolicy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import net.silthus.schat.channel.ChannelSettings; diff --git a/core/src/main/java/net/silthus/schat/policies/LeaveChannelPolicy.java b/core/src/main/java/net/silthus/schat/policies/LeaveChannelPolicy.java index b345208fa..c56cc1f20 100644 --- a/core/src/main/java/net/silthus/schat/policies/LeaveChannelPolicy.java +++ b/core/src/main/java/net/silthus/schat/policies/LeaveChannelPolicy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import static net.silthus.schat.channel.ChannelSettings.FORCED; diff --git a/core/src/main/java/net/silthus/schat/policies/Policy.java b/core/src/main/java/net/silthus/schat/policies/Policy.java index e9a5ce824..147af733a 100644 --- a/core/src/main/java/net/silthus/schat/policies/Policy.java +++ b/core/src/main/java/net/silthus/schat/policies/Policy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; public interface Policy { diff --git a/core/src/main/java/net/silthus/schat/policies/SendChannelMessagePolicy.java b/core/src/main/java/net/silthus/schat/policies/SendChannelMessagePolicy.java index f2c2c1b2c..d903248db 100644 --- a/core/src/main/java/net/silthus/schat/policies/SendChannelMessagePolicy.java +++ b/core/src/main/java/net/silthus/schat/policies/SendChannelMessagePolicy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import java.util.function.BiPredicate; diff --git a/core/src/main/java/net/silthus/schat/repository/Entity.java b/core/src/main/java/net/silthus/schat/repository/Entity.java index af778a6db..336a78673 100644 --- a/core/src/main/java/net/silthus/schat/repository/Entity.java +++ b/core/src/main/java/net/silthus/schat/repository/Entity.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.repository; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/net/silthus/schat/repository/InMemoryRepository.java b/core/src/main/java/net/silthus/schat/repository/InMemoryRepository.java index 4711fe7e6..75d333260 100644 --- a/core/src/main/java/net/silthus/schat/repository/InMemoryRepository.java +++ b/core/src/main/java/net/silthus/schat/repository/InMemoryRepository.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.repository; import java.util.Collection; diff --git a/core/src/main/java/net/silthus/schat/repository/Repository.java b/core/src/main/java/net/silthus/schat/repository/Repository.java index f946b3deb..02e321f91 100644 --- a/core/src/main/java/net/silthus/schat/repository/Repository.java +++ b/core/src/main/java/net/silthus/schat/repository/Repository.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.repository; import java.util.ArrayList; diff --git a/core/src/main/java/net/silthus/schat/view/ViewConnector.java b/core/src/main/java/net/silthus/schat/ui/ViewConnector.java similarity index 98% rename from core/src/main/java/net/silthus/schat/view/ViewConnector.java rename to core/src/main/java/net/silthus/schat/ui/ViewConnector.java index 79bc34979..5433c5f7e 100644 --- a/core/src/main/java/net/silthus/schat/view/ViewConnector.java +++ b/core/src/main/java/net/silthus/schat/ui/ViewConnector.java @@ -21,8 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - -package net.silthus.schat.view; +package net.silthus.schat.ui; import net.kyori.adventure.text.Component; import net.silthus.schat.chatter.Chatter; diff --git a/core/src/main/java/net/silthus/schat/util/FilterableCollection.java b/core/src/main/java/net/silthus/schat/util/FilterableCollection.java index d0c986045..23bbf2e98 100644 --- a/core/src/main/java/net/silthus/schat/util/FilterableCollection.java +++ b/core/src/main/java/net/silthus/schat/util/FilterableCollection.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util; import java.util.ArrayList; diff --git a/core/src/main/java/net/silthus/schat/util/Iterators.java b/core/src/main/java/net/silthus/schat/util/Iterators.java index 754707cfa..f6e95acc9 100644 --- a/core/src/main/java/net/silthus/schat/util/Iterators.java +++ b/core/src/main/java/net/silthus/schat/util/Iterators.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util; import java.util.ArrayDeque; diff --git a/core/src/main/java/net/silthus/schat/util/Permissable.java b/core/src/main/java/net/silthus/schat/util/Permissable.java index c353ad975..26c6e89b1 100644 --- a/core/src/main/java/net/silthus/schat/util/Permissable.java +++ b/core/src/main/java/net/silthus/schat/util/Permissable.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util; public interface Permissable { diff --git a/core/src/main/java/net/silthus/schat/util/Throwing.java b/core/src/main/java/net/silthus/schat/util/Throwing.java index e0a66a741..8ccbc6031 100644 --- a/core/src/main/java/net/silthus/schat/util/Throwing.java +++ b/core/src/main/java/net/silthus/schat/util/Throwing.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util; public interface Throwing { diff --git a/core/src/main/java/net/silthus/schat/util/UUIDUtil.java b/core/src/main/java/net/silthus/schat/util/UUIDUtil.java index d3b456664..4568480d1 100644 --- a/core/src/main/java/net/silthus/schat/util/UUIDUtil.java +++ b/core/src/main/java/net/silthus/schat/util/UUIDUtil.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util; import java.util.function.Predicate; diff --git a/core/src/main/java/net/silthus/schat/util/gson/GsonProvider.java b/core/src/main/java/net/silthus/schat/util/gson/GsonProvider.java index 717ceb037..7fd407544 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/GsonProvider.java +++ b/core/src/main/java/net/silthus/schat/util/gson/GsonProvider.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson; import com.google.gson.Gson; diff --git a/core/src/main/java/net/silthus/schat/util/gson/JElement.java b/core/src/main/java/net/silthus/schat/util/gson/JElement.java index c9de96684..dd36140b8 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/JElement.java +++ b/core/src/main/java/net/silthus/schat/util/gson/JElement.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson; import com.google.gson.JsonElement; diff --git a/core/src/main/java/net/silthus/schat/util/gson/JObject.java b/core/src/main/java/net/silthus/schat/util/gson/JObject.java index 262522aac..6efa1db1f 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/JObject.java +++ b/core/src/main/java/net/silthus/schat/util/gson/JObject.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson; import com.google.gson.JsonElement; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/ChannelSerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/ChannelSerializer.java index 612502429..097cb37cc 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/ChannelSerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/ChannelSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/ComponentSerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/ComponentSerializer.java index 5450119b9..0f114e1b4 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/ComponentSerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/ComponentSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/IdentitySerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/IdentitySerializer.java index c2808286b..db8508f02 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/IdentitySerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/IdentitySerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/InstantSerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/InstantSerializer.java index b18ec228d..cf16d780e 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/InstantSerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/InstantSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/MessageSerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/MessageSerializer.java index e8e7cb73e..6edd94c6d 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/MessageSerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/MessageSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/SettingsSerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/SettingsSerializer.java index 977328c4d..0a20036d0 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/SettingsSerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/SettingsSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/main/java/net/silthus/schat/util/gson/types/TargetsSerializer.java b/core/src/main/java/net/silthus/schat/util/gson/types/TargetsSerializer.java index cd6756b89..9adba0e12 100644 --- a/core/src/main/java/net/silthus/schat/util/gson/types/TargetsSerializer.java +++ b/core/src/main/java/net/silthus/schat/util/gson/types/TargetsSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonArray; diff --git a/core/src/test/java/net/silthus/schat/channel/ChannelRepositoryTests.java b/core/src/test/java/net/silthus/schat/channel/ChannelRepositoryTests.java index e0832422f..e1877e786 100644 --- a/core/src/test/java/net/silthus/schat/channel/ChannelRepositoryTests.java +++ b/core/src/test/java/net/silthus/schat/channel/ChannelRepositoryTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import net.silthus.schat.repository.Repository; diff --git a/core/src/test/java/net/silthus/schat/channel/ChannelTests.java b/core/src/test/java/net/silthus/schat/channel/ChannelTests.java index ada977dc5..bee059782 100644 --- a/core/src/test/java/net/silthus/schat/channel/ChannelTests.java +++ b/core/src/test/java/net/silthus/schat/channel/ChannelTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import net.kyori.adventure.text.TextComponent; diff --git a/core/src/test/java/net/silthus/schat/chatter/ChatterTest.java b/core/src/test/java/net/silthus/schat/chatter/ChatterTest.java index b54fae365..62458b1f5 100644 --- a/core/src/test/java/net/silthus/schat/chatter/ChatterTest.java +++ b/core/src/test/java/net/silthus/schat/chatter/ChatterTest.java @@ -21,13 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import net.silthus.schat.channel.Channel; import net.silthus.schat.identity.Identity; import net.silthus.schat.message.Message; -import net.silthus.schat.view.ViewConnectorMock; +import net.silthus.schat.ui.ViewConnectorMock; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/net/silthus/schat/command/ChecksTests.java b/core/src/test/java/net/silthus/schat/command/ChecksTests.java index 7c0f9f561..a995bd939 100644 --- a/core/src/test/java/net/silthus/schat/command/ChecksTests.java +++ b/core/src/test/java/net/silthus/schat/command/ChecksTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.command; public class ChecksTests { diff --git a/core/src/test/java/net/silthus/schat/command/ResultTest.java b/core/src/test/java/net/silthus/schat/command/ResultTest.java index 56cbc8ad4..f5ffef9cc 100644 --- a/core/src/test/java/net/silthus/schat/command/ResultTest.java +++ b/core/src/test/java/net/silthus/schat/command/ResultTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.command; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/net/silthus/schat/commands/ChatCommandTest.java b/core/src/test/java/net/silthus/schat/commands/ChatCommandTest.java index 28da35a77..6e3816c43 100644 --- a/core/src/test/java/net/silthus/schat/commands/ChatCommandTest.java +++ b/core/src/test/java/net/silthus/schat/commands/ChatCommandTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.channel.Channel; diff --git a/core/src/test/java/net/silthus/schat/commands/CreatePrivateChannelCommandTest.java b/core/src/test/java/net/silthus/schat/commands/CreatePrivateChannelCommandTest.java index fb85b72eb..fb46f7f0f 100644 --- a/core/src/test/java/net/silthus/schat/commands/CreatePrivateChannelCommandTest.java +++ b/core/src/test/java/net/silthus/schat/commands/CreatePrivateChannelCommandTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.channel.Channel; diff --git a/core/src/test/java/net/silthus/schat/commands/JoinChannelCommandTests.java b/core/src/test/java/net/silthus/schat/commands/JoinChannelCommandTests.java index 0f470fb47..0289ae46d 100644 --- a/core/src/test/java/net/silthus/schat/commands/JoinChannelCommandTests.java +++ b/core/src/test/java/net/silthus/schat/commands/JoinChannelCommandTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.channel.Channel; diff --git a/core/src/test/java/net/silthus/schat/commands/LeaveChannelCommandTest.java b/core/src/test/java/net/silthus/schat/commands/LeaveChannelCommandTest.java index f39045471..862dce69e 100644 --- a/core/src/test/java/net/silthus/schat/commands/LeaveChannelCommandTest.java +++ b/core/src/test/java/net/silthus/schat/commands/LeaveChannelCommandTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.channel.Channel; diff --git a/core/src/test/java/net/silthus/schat/commands/SendMessageCommandTests.java b/core/src/test/java/net/silthus/schat/commands/SendMessageCommandTests.java index 59cde9a15..2528e860a 100644 --- a/core/src/test/java/net/silthus/schat/commands/SendMessageCommandTests.java +++ b/core/src/test/java/net/silthus/schat/commands/SendMessageCommandTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.ArrayList; diff --git a/core/src/test/java/net/silthus/schat/commands/SendPrivateMessageCommandTests.java b/core/src/test/java/net/silthus/schat/commands/SendPrivateMessageCommandTests.java index ec204e326..4b667a59d 100644 --- a/core/src/test/java/net/silthus/schat/commands/SendPrivateMessageCommandTests.java +++ b/core/src/test/java/net/silthus/schat/commands/SendPrivateMessageCommandTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import java.util.Set; diff --git a/core/src/test/java/net/silthus/schat/commands/SetActiveChannelCommandTests.java b/core/src/test/java/net/silthus/schat/commands/SetActiveChannelCommandTests.java index 8705855c6..73f16d54e 100644 --- a/core/src/test/java/net/silthus/schat/commands/SetActiveChannelCommandTests.java +++ b/core/src/test/java/net/silthus/schat/commands/SetActiveChannelCommandTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.commands; import net.silthus.schat.channel.Channel; diff --git a/core/src/test/java/net/silthus/schat/eventbus/EventBusTests.java b/core/src/test/java/net/silthus/schat/eventbus/EventBusTests.java index 3aec73207..5af531140 100644 --- a/core/src/test/java/net/silthus/schat/eventbus/EventBusTests.java +++ b/core/src/test/java/net/silthus/schat/eventbus/EventBusTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/net/silthus/schat/identity/IdentityTests.java b/core/src/test/java/net/silthus/schat/identity/IdentityTests.java index 0df9bf289..515961e65 100644 --- a/core/src/test/java/net/silthus/schat/identity/IdentityTests.java +++ b/core/src/test/java/net/silthus/schat/identity/IdentityTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.identity; import java.util.UUID; diff --git a/core/src/test/java/net/silthus/schat/message/MessageTest.java b/core/src/test/java/net/silthus/schat/message/MessageTest.java index c425faa4c..330cc9b90 100644 --- a/core/src/test/java/net/silthus/schat/message/MessageTest.java +++ b/core/src/test/java/net/silthus/schat/message/MessageTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.UUID; diff --git a/core/src/test/java/net/silthus/schat/message/MessagesTest.java b/core/src/test/java/net/silthus/schat/message/MessagesTest.java index a955ee798..939c3abae 100644 --- a/core/src/test/java/net/silthus/schat/message/MessagesTest.java +++ b/core/src/test/java/net/silthus/schat/message/MessagesTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/net/silthus/schat/message/TargetsTest.java b/core/src/test/java/net/silthus/schat/message/TargetsTest.java index f1d78caa9..abbb0a73e 100644 --- a/core/src/test/java/net/silthus/schat/message/TargetsTest.java +++ b/core/src/test/java/net/silthus/schat/message/TargetsTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import net.silthus.schat.chatter.Chatter; diff --git a/core/src/test/java/net/silthus/schat/pointer/PointersTest.java b/core/src/test/java/net/silthus/schat/pointer/PointersTest.java index 3a06af161..dfe665633 100644 --- a/core/src/test/java/net/silthus/schat/pointer/PointersTest.java +++ b/core/src/test/java/net/silthus/schat/pointer/PointersTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import java.util.function.Supplier; diff --git a/core/src/test/java/net/silthus/schat/pointer/SettingsTest.java b/core/src/test/java/net/silthus/schat/pointer/SettingsTest.java index 1868f4b00..05142be11 100644 --- a/core/src/test/java/net/silthus/schat/pointer/SettingsTest.java +++ b/core/src/test/java/net/silthus/schat/pointer/SettingsTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.pointer; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/net/silthus/schat/policies/JoinPrivateChannelPolicyTest.java b/core/src/test/java/net/silthus/schat/policies/JoinPrivateChannelPolicyTest.java index f38df59ea..530629c6c 100644 --- a/core/src/test/java/net/silthus/schat/policies/JoinPrivateChannelPolicyTest.java +++ b/core/src/test/java/net/silthus/schat/policies/JoinPrivateChannelPolicyTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import net.silthus.schat.channel.Channel; @@ -29,9 +28,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static net.silthus.schat.channel.ChannelSettings.PRIVATE; import static net.silthus.schat.channel.ChannelHelper.channelWith; import static net.silthus.schat.channel.ChannelHelper.randomChannel; +import static net.silthus.schat.channel.ChannelSettings.PRIVATE; import static net.silthus.schat.chatter.ChatterMock.randomChatter; import static net.silthus.schat.policies.JoinChannelPolicy.CAN_JOIN_PRIVATE_CHANNEL; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/net/silthus/schat/policies/JoinProtectedChannelPolicyTest.java b/core/src/test/java/net/silthus/schat/policies/JoinProtectedChannelPolicyTest.java index b7f5bce14..c594c9dfa 100644 --- a/core/src/test/java/net/silthus/schat/policies/JoinProtectedChannelPolicyTest.java +++ b/core/src/test/java/net/silthus/schat/policies/JoinProtectedChannelPolicyTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import net.silthus.schat.channel.Channel; @@ -30,11 +29,11 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import static net.silthus.schat.channel.ChannelSettings.JOIN_PERMISSION; -import static net.silthus.schat.channel.ChannelSettings.PROTECTED; import static net.silthus.schat.channel.ChannelHelper.ConfiguredSetting.set; import static net.silthus.schat.channel.ChannelHelper.channelWith; import static net.silthus.schat.channel.ChannelHelper.randomChannel; +import static net.silthus.schat.channel.ChannelSettings.JOIN_PERMISSION; +import static net.silthus.schat.channel.ChannelSettings.PROTECTED; import static net.silthus.schat.chatter.ChatterMock.randomChatter; import static net.silthus.schat.policies.JoinChannelPolicy.CAN_JOIN_PROTECTED_CHANNEL; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/net/silthus/schat/policies/SendChannelMessagePolicyTest.java b/core/src/test/java/net/silthus/schat/policies/SendChannelMessagePolicyTest.java index 0acce45e5..c7f53a12d 100644 --- a/core/src/test/java/net/silthus/schat/policies/SendChannelMessagePolicyTest.java +++ b/core/src/test/java/net/silthus/schat/policies/SendChannelMessagePolicyTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.policies; import net.silthus.schat.channel.Channel; diff --git a/core/src/test/java/net/silthus/schat/util/gson/types/ChannelSerializerTest.java b/core/src/test/java/net/silthus/schat/util/gson/types/ChannelSerializerTest.java index b35f95d21..b47b53dfd 100644 --- a/core/src/test/java/net/silthus/schat/util/gson/types/ChannelSerializerTest.java +++ b/core/src/test/java/net/silthus/schat/util/gson/types/ChannelSerializerTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonDeserializationContext; diff --git a/core/src/test/java/net/silthus/schat/util/gson/types/TargetsSerializerTest.java b/core/src/test/java/net/silthus/schat/util/gson/types/TargetsSerializerTest.java index 1fdf2f922..93d67a045 100644 --- a/core/src/test/java/net/silthus/schat/util/gson/types/TargetsSerializerTest.java +++ b/core/src/test/java/net/silthus/schat/util/gson/types/TargetsSerializerTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.util.gson.types; import com.google.gson.JsonArray; diff --git a/core/src/testFixtures/java/net/silthus/schat/AssertionHelper.java b/core/src/testFixtures/java/net/silthus/schat/AssertionHelper.java index 3c45db61c..7e4d96c56 100644 --- a/core/src/testFixtures/java/net/silthus/schat/AssertionHelper.java +++ b/core/src/testFixtures/java/net/silthus/schat/AssertionHelper.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat; import java.util.Collection; diff --git a/core/src/testFixtures/java/net/silthus/schat/channel/ChannelAssertions.java b/core/src/testFixtures/java/net/silthus/schat/channel/ChannelAssertions.java index b1b0c8b3b..42707dfc9 100644 --- a/core/src/testFixtures/java/net/silthus/schat/channel/ChannelAssertions.java +++ b/core/src/testFixtures/java/net/silthus/schat/channel/ChannelAssertions.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import net.silthus.schat.message.MessageTarget; diff --git a/core/src/testFixtures/java/net/silthus/schat/channel/ChannelHelper.java b/core/src/testFixtures/java/net/silthus/schat/channel/ChannelHelper.java index b19a2da18..b36afaf89 100644 --- a/core/src/testFixtures/java/net/silthus/schat/channel/ChannelHelper.java +++ b/core/src/testFixtures/java/net/silthus/schat/channel/ChannelHelper.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.channel; import java.util.function.Function; @@ -29,7 +28,7 @@ import net.silthus.schat.pointer.Setting; import static net.silthus.schat.channel.Channel.channel; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static net.silthus.schat.util.StringUtil.randomString; public final class ChannelHelper { @@ -58,7 +57,7 @@ public static Channel channelWith(String key, ConfiguredSetting... settings) } public static Channel channelWith(ConfiguredSetting... settings) { - return channelWith(randomAlphabetic(10), settings); + return channelWith(randomString(), settings); } public static Channel channelWith(String key, Function config) { @@ -66,7 +65,7 @@ public static Channel channelWith(String key, Function config) { - return channelWith(randomAlphabetic(10).toLowerCase(), config); + return channelWith(randomString().toLowerCase(), config); } public record ConfiguredSetting(Setting setting, V value) { diff --git a/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterAssertions.java b/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterAssertions.java index aeae4a15c..3e6fdd92d 100644 --- a/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterAssertions.java +++ b/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterAssertions.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import net.silthus.schat.channel.Channel; diff --git a/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterMock.java b/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterMock.java index de7a66db7..9c1205526 100644 --- a/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterMock.java +++ b/core/src/testFixtures/java/net/silthus/schat/chatter/ChatterMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.chatter; import java.util.UUID; diff --git a/core/src/testFixtures/java/net/silthus/schat/eventbus/EventBusMock.java b/core/src/testFixtures/java/net/silthus/schat/eventbus/EventBusMock.java index 3c60983d6..795bff67f 100644 --- a/core/src/testFixtures/java/net/silthus/schat/eventbus/EventBusMock.java +++ b/core/src/testFixtures/java/net/silthus/schat/eventbus/EventBusMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.eventbus; import java.util.LinkedList; diff --git a/core/src/testFixtures/java/net/silthus/schat/identity/IdentityHelper.java b/core/src/testFixtures/java/net/silthus/schat/identity/IdentityHelper.java index 74dff0c20..4bba713c5 100644 --- a/core/src/testFixtures/java/net/silthus/schat/identity/IdentityHelper.java +++ b/core/src/testFixtures/java/net/silthus/schat/identity/IdentityHelper.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.identity; import java.util.UUID; -import org.apache.commons.lang3.RandomStringUtils; + +import static net.silthus.schat.util.StringUtil.randomString; public final class IdentityHelper { @@ -33,6 +33,6 @@ private IdentityHelper() { } public static Identity randomIdentity() { - return Identity.identity(UUID.randomUUID(), RandomStringUtils.randomAlphanumeric(10)); + return Identity.identity(UUID.randomUUID(), randomString()); } } diff --git a/core/src/testFixtures/java/net/silthus/schat/message/MessageHelper.java b/core/src/testFixtures/java/net/silthus/schat/message/MessageHelper.java index 5dc59bd60..4add14d71 100644 --- a/core/src/testFixtures/java/net/silthus/schat/message/MessageHelper.java +++ b/core/src/testFixtures/java/net/silthus/schat/message/MessageHelper.java @@ -21,14 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import net.kyori.adventure.text.Component; -import org.apache.commons.lang3.RandomStringUtils; import static net.kyori.adventure.text.Component.text; import static net.silthus.schat.message.Message.message; +import static net.silthus.schat.util.StringUtil.randomString; public final class MessageHelper { @@ -36,7 +35,7 @@ private MessageHelper() { } public static Component randomText() { - return text(RandomStringUtils.randomAlphanumeric(30)); + return text(randomString()); } public static Message randomMessage() { diff --git a/core/src/testFixtures/java/net/silthus/schat/message/MessageTargetSpy.java b/core/src/testFixtures/java/net/silthus/schat/message/MessageTargetSpy.java index 92903d82c..5ad2aef8a 100644 --- a/core/src/testFixtures/java/net/silthus/schat/message/MessageTargetSpy.java +++ b/core/src/testFixtures/java/net/silthus/schat/message/MessageTargetSpy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.ArrayList; diff --git a/core/src/testFixtures/java/net/silthus/schat/message/MockTarget.java b/core/src/testFixtures/java/net/silthus/schat/message/MockTarget.java index 23641ebc3..ef9fc2ee2 100644 --- a/core/src/testFixtures/java/net/silthus/schat/message/MockTarget.java +++ b/core/src/testFixtures/java/net/silthus/schat/message/MockTarget.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.message; import java.util.LinkedList; diff --git a/core/src/testFixtures/java/net/silthus/schat/view/ViewConnectorMock.java b/core/src/testFixtures/java/net/silthus/schat/ui/ViewConnectorMock.java similarity index 98% rename from core/src/testFixtures/java/net/silthus/schat/view/ViewConnectorMock.java rename to core/src/testFixtures/java/net/silthus/schat/ui/ViewConnectorMock.java index dc21a0600..4577a68ae 100644 --- a/core/src/testFixtures/java/net/silthus/schat/view/ViewConnectorMock.java +++ b/core/src/testFixtures/java/net/silthus/schat/ui/ViewConnectorMock.java @@ -21,8 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - -package net.silthus.schat.view; +package net.silthus.schat.ui; import static org.assertj.core.api.Assertions.assertThat; diff --git a/example/src/main/java/net/silthus/schat/example/SChatIntegration.java b/core/src/testFixtures/java/net/silthus/schat/util/StringUtil.java similarity index 67% rename from example/src/main/java/net/silthus/schat/example/SChatIntegration.java rename to core/src/testFixtures/java/net/silthus/schat/util/StringUtil.java index b623c33be..100e9d38b 100644 --- a/example/src/main/java/net/silthus/schat/example/SChatIntegration.java +++ b/core/src/testFixtures/java/net/silthus/schat/util/StringUtil.java @@ -21,10 +21,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +package net.silthus.schat.util; -package net.silthus.schat.example; +import java.util.Random; -final class SChatIntegration { +public final class StringUtil { + public static String randomString() { + int leftLimit = 48; // numeral '0' + int rightLimit = 122; // letter 'z' + int targetStringLength = 10; + Random random = new Random(); + return random.ints(leftLimit, rightLimit + 1) + .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97)) + .limit(targetStringLength) + .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append) + .toString(); + } + + private StringUtil() { + } } diff --git a/example/build.gradle b/example/build.gradle deleted file mode 100644 index 12fcea10c..000000000 --- a/example/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -apply plugin: 'kr.entree.spigradle' - -archivesBaseName = "${project.property("pluginName")}-example" - -dependencies { - implementation project(':core') - - implementation spigot(mcVersion) - - testImplementation 'net.silthus:MockBukkit:v1.17-SNAPSHOT' -} - -shadowJar { - archiveClassifier.set("") -} - -tasks.build.dependsOn(shadowJar) -tasks.publish.dependsOn(shadowJar) \ No newline at end of file diff --git a/example/src/main/java/net/silthus/schat/example/SChatExamplePlugin.java b/example/src/main/java/net/silthus/schat/example/SChatExamplePlugin.java deleted file mode 100644 index 7feda99ac..000000000 --- a/example/src/main/java/net/silthus/schat/example/SChatExamplePlugin.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of sChat, licensed under the MIT License. - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package net.silthus.schat.example; - -import org.bukkit.plugin.java.JavaPlugin; - -public final class SChatExamplePlugin extends JavaPlugin { - - private SChatIntegration sChatIntegration; - - @Override - public void onEnable() { - setupSChatIntegration(); - -// if (sChatIntegration != null) sChatIntegration.enable(); - } - - @Override - public void onDisable() { -// if (sChatIntegration != null) sChatIntegration.disable(); - } - - private void setupSChatIntegration() { -// final RegisteredServiceProvider registration = getServer().getServicesManager().getRegistration(SChat.class); -// if (registration == null) { -// getLogger().warning("sChat API not found. Not using sChat integration..."); -// return; -// } -// final SChat sChat = registration.getProvider(); -// this.sChatIntegration = new SChatIntegration(sChat); - } -} diff --git a/example/src/main/resources/plugin.yml b/example/src/main/resources/plugin.yml deleted file mode 100644 index 9ed21b5e4..000000000 --- a/example/src/main/resources/plugin.yml +++ /dev/null @@ -1,5 +0,0 @@ - name: sChat-Example - main: net.silthus.schat.example.SChatExamplePlugin - version: 1.0.0 - softdepend: - - sChat \ No newline at end of file diff --git a/features/build.gradle b/features/build.gradle deleted file mode 100644 index 3fe2bcb67..000000000 --- a/features/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -allprojects { - dependencies { - implementation project(':core') - - testImplementation(testFixtures(project(":core"))) - - testFixturesImplementation(testFixtures(project(':core'))) - } -} diff --git a/features/build.gradle.kts b/features/build.gradle.kts new file mode 100644 index 000000000..bcc604ecd --- /dev/null +++ b/features/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + id("schat.api") +} + +description = "Implementation of standalone features for sChat" + +dependencies { + implementation(project(":schat-core")) + + testImplementation(testFixtures(project(":schat-core"))) + + testFixturesImplementation(testFixtures(project(":schat-core"))) +} \ No newline at end of file diff --git a/features/src/main/java/net/silthus/schat/features/AutoJoinChannelsFeature.java b/features/src/main/java/net/silthus/schat/features/AutoJoinChannelsFeature.java index 8c201f9b2..110db4ad4 100644 --- a/features/src/main/java/net/silthus/schat/features/AutoJoinChannelsFeature.java +++ b/features/src/main/java/net/silthus/schat/features/AutoJoinChannelsFeature.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.features; import net.silthus.schat.channel.ChannelRepository; diff --git a/features/src/main/java/net/silthus/schat/features/GlobalChatFeature.java b/features/src/main/java/net/silthus/schat/features/GlobalChatFeature.java index 50d5958aa..285c6405e 100644 --- a/features/src/main/java/net/silthus/schat/features/GlobalChatFeature.java +++ b/features/src/main/java/net/silthus/schat/features/GlobalChatFeature.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.features; import lombok.EqualsAndHashCode; diff --git a/features/src/test/java/net/silthus/schat/features/AutoJoinChannelsFeatureTest.java b/features/src/test/java/net/silthus/schat/features/AutoJoinChannelsFeatureTest.java index bc1ac5fd3..b0366c558 100644 --- a/features/src/test/java/net/silthus/schat/features/AutoJoinChannelsFeatureTest.java +++ b/features/src/test/java/net/silthus/schat/features/AutoJoinChannelsFeatureTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.features; import net.silthus.schat.channel.Channel; diff --git a/features/src/test/java/net/silthus/schat/features/GlobalChatFeatureTests.java b/features/src/test/java/net/silthus/schat/features/GlobalChatFeatureTests.java index 29a2a6c46..4fff43fe8 100644 --- a/features/src/test/java/net/silthus/schat/features/GlobalChatFeatureTests.java +++ b/features/src/test/java/net/silthus/schat/features/GlobalChatFeatureTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.features; import java.lang.reflect.Type; diff --git a/gradle.properties b/gradle.properties index ea119c916..75b62b445 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,4 @@ -group = net.silthus.schat -packageName = net.silthus.schat -pluginName = sChat -author = Silthus -mcVersion = 1.17.1 -apiVersion = 1.13 -version = 1.0.0-alpha.3 +org.gradle.configureondemand=true +org.gradle.parallel=true +javadocPublishRoot=https://jd.schat.silthus.net/ +version=1.0.0-alpha.3 \ No newline at end of file diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle deleted file mode 100644 index 0886821f7..000000000 --- a/gradle/jacoco.gradle +++ /dev/null @@ -1,10 +0,0 @@ -jacoco { toolVersion = "0.8.7" } - -jacocoTestReport { - reports { - xml.required = true - html.required = true - } -} - -tasks.check.dependsOn 'jacocoTestReport' \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..6b8189756 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,105 @@ +[versions] +gradle-plugin-indra = "2.1.1" +gradle-plugin-testlog = "3.1.0" +gradle-plugin-lombok = "6.4.1" +gradle-plugin-shadow = "7.1.2" + +checkstyle-plugin-stylecheck = "0.1" + +minecraft = "1.18.1-R0.1-SNAPSHOT" +bungeecord = "1.16-R0.5-SNAPSHOT" +velocity = "3.0.1" + +protocollib = "4.7.0" +bstats = "3.0.0" +mockbukkit = "1.15.5" + +checkerframework = "3.21.2" +junit-jupiter = "5.8.1" +assertj = "3.21.0" +mockito = "4.0.0" + +event-api = "3.0.0" +adventure-api = "4.10.0-SNAPSHOT" +adventure-platform = "4.0.1" +examination = "1.3.0" +configurate = "4.1.2" +cloud-commands = "1.6.1" +gson = "2.9.0" + +[libraries] +gradle-plugin-indra = { module = "net.kyori:indra-common", version.ref = "gradle-plugin-indra" } +gradle-plugin-indra-publishing = { module = "net.kyori:indra-publishing-sonatype", version.ref = "gradle-plugin-indra" } +gradle-plugin-indra-crossdoc = { module = "net.kyori:indra-crossdoc", version.ref = "gradle-plugin-indra" } +gradle-plugin-testlog = { module = "com.adarshr:gradle-test-logger-plugin", version.ref = "gradle-plugin-testlog" } +gradle-plugin-lombok = { module = "io.freefair.gradle:lombok-plugin", version.ref = "gradle-plugin-lombok" } +gradle-plugin-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "gradle-plugin-shadow" } + +checkstyle-plugin-stylecheck = { module = "ca.stellardrift:stylecheck", version.ref = "checkstyle-plugin-stylecheck" } + +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" } +junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" } +assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" } +mockito = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } + +papermc = { module = "io.papermc.paper:paper-api", version.ref = "minecraft" } +spigot = { module = "org.spigotmc:spigot-api", version.ref = "minecraft" } +bungeecord = { module = "net.md-5:bungeecord-api", version.ref = "bungeecord" } +velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" } + +checkerframework = { module = "org.checkerframework:checker-qual", version.ref = "checkerframework" } + +examination-api = { module = "net.kyori:examination-api", version.ref = "examination" } +examination-string = { module = "net.kyori:examination-string", version.ref = "examination" } + +event = { module = "net.kyori:event-api", version.ref = "event-api" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } + +adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure-api" } +adventure-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure-api" } +adventure-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "adventure-api" } +adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure-api" } + +adventure-platform = { module = "net.kyori:adventure-platform-api", version.ref = "adventure-platform" } +adventure-platform-bukkit = { module = "net.kyori:adventure-platform-bukkit", version.ref = "adventure-platform" } +adventure-platform-bungeecord = { module = "net.kyori:adventure-platform-bungeecord", version.ref = "adventure-platform" } + +configurate-core = { module = "org.spongepowered:configurate-core", version.ref = "configurate" } +configurate-yaml = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate" } +configurate-xml = { module = "org.spongepowered:configurate-xml", version.ref = "configurate" } +configurate-hocon = { module = "org.spongepowered:configurate-hocon", version.ref = "configurate" } +configurate-gson = { module = "org.spongepowered:configurate-gson", version.ref = "configurate" } + +cloud-commands = { module = "cloud.commandframework:cloud-core", version.ref = "cloud-commands" } +cloud-annotations = { module = "cloud.commandframework:cloud-annotations", version.ref = "cloud-commands" } +cloud-commands-paper = { module = "cloud.commandframework:cloud-paper", version.ref = "cloud-commands" } + +protocollib = { module = "com.comphenix.protocol:ProtocolLib", version.ref = "protocollib" } +bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" } +mockbukkit = { module = "com.github.seeseemelk:MockBukkit-v1.18", version.ref = "mockbukkit" } + +[bundles] +testing-api = [ + "junit-jupiter-api", + "junit-jupiter-params", + "assertj-core", + "mockito", +] +testing-runtime = [ + "junit-jupiter-engine", +] +configurate = [ + "configurate-core", + "configurate-yaml", + "configurate-xml", + "configurate-hocon", + "configurate-gson" +] +cloud-commands = [ + "cloud-commands", + "cloud-annotations" +] + +[plugins] +indra-publishing-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "gradle-plugin-indra" } \ No newline at end of file diff --git a/gradle/publish.gradle b/gradle/publish.gradle deleted file mode 100644 index d434e2c8e..000000000 --- a/gradle/publish.gradle +++ /dev/null @@ -1,76 +0,0 @@ -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -apply plugin: 'maven-publish' - -def getBranch() { - def process = 'git branch --show-current'.execute() - process.waitFor() - return process.text.trim() -} - -def getHash() { - def process = 'git rev-parse HEAD'.execute() - process.waitFor() - return process.text.trim() -} - -java { - withJavadocJar() - withSourcesJar() -} - -jar { - manifest { - attributes ( - 'Build-Jdk': "${System.properties['java.vendor']} ${System.properties['java.vm.version']}", - 'Created-By': "Gradle ${gradle.gradleVersion}", - 'Git-Branch': getBranch(), - 'Git-Hash': getHash() - ) - } -} - -publishing { - publications { - shadow(MavenPublication) { publication -> - project.shadow.component(publication) - artifactId = project.getName().toLowerCase() - groupId = ((String)project.getGroup()).toLowerCase() - } - } - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/${project.findProperty("GITHUB_REPOSITORY")?: System.getenv("GITHUB_REPOSITORY")}") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") - password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") - } - } - } -} - -javadoc { - if(JavaVersion.current().isJava9Compatible()) { - options.addBooleanOption('html5', true) - options.addStringOption('Xdoclint:none', '-quiet') - options.encoding("UTF-8") - } -} diff --git a/LICENSE b/license.txt similarity index 100% rename from LICENSE rename to license.txt diff --git a/HEADER.txt b/license_header.txt similarity index 100% rename from HEADER.txt rename to license_header.txt diff --git a/platform/build.gradle b/platform/build.gradle deleted file mode 100644 index 38a80614f..000000000 --- a/platform/build.gradle +++ /dev/null @@ -1,89 +0,0 @@ -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -allprojects { - dependencies { - implementation project(':api') - implementation project(':core') - implementation project(':ui') - - testImplementation(testFixtures(project(':api'))) - testImplementation(testFixtures(project(":core"))) - testImplementation(testFixtures(project(":ui"))) - - testFixturesImplementation(testFixtures(project(':api'))) - testFixturesImplementation(testFixtures(project(':core'))) - testFixturesImplementation(testFixtures(project(':ui'))) - - testFixturesImplementation 'org.spongepowered:configurate-core:4.1.2' - testFixturesImplementation 'com.google.code.gson:gson:2.8.9' - } -} - -subprojects { - dependencies { - implementation project(':platform') - - testImplementation(testFixtures(project(":platform"))) - - testFixturesImplementation(testFixtures(project(':platform'))) - } - - shadowJar { - archiveClassifier.set("") - dependencies { - include(project(':api')) - include(project(':core')) - include(project(':platform')) - include(project(':ui')) - include(project(':features')) - include(dependency('cloud.commandframework::')) - include(dependency('io.leangen.geantyref::')) - include(dependency('org.spongepowered::')) - include(dependency('org.bstats::')) - } - relocate 'cloud.commandframework', "${packageName}.lib.commands" - relocate 'org.spongepowered.configurate', "${packageName}.lib.configurate" - relocate 'io.leangen.geantyref', "${packageName}.lib.typetoken" - relocate 'org.bstats', "${packageName}.lib.bstats" - } - - tasks.build.dependsOn(shadowJar) - tasks.publish.dependsOn(shadowJar) -} - -dependencies { - api project(':features') - - implementation 'cloud.commandframework:cloud-core:1.6.1' - implementation 'cloud.commandframework:cloud-annotations:1.6.1' - - implementation 'net.kyori:adventure-platform-api:4.0.1' - - implementation 'org.spongepowered:configurate-core:4.1.2' - implementation 'org.spongepowered:configurate-yaml:4.1.2' - implementation 'org.spongepowered:configurate-xml:4.1.2' - implementation 'org.spongepowered:configurate-hocon:4.1.2' - implementation 'org.spongepowered:configurate-gson:4.1.2' - - testFixturesImplementation 'org.spongepowered:configurate-yaml:4.1.2' - testFixturesImplementation 'cloud.commandframework:cloud-core:1.6.1' - testFixturesImplementation 'org.apache.commons:commons-lang3:3.12.0' - testFixturesImplementation 'net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT' -} \ No newline at end of file diff --git a/platform/build.gradle.kts b/platform/build.gradle.kts new file mode 100644 index 000000000..c90ea1044 --- /dev/null +++ b/platform/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + id("schat.api") +} + +description = "Base implementation of sChat for supporting various platforms" + +dependencies { + api(project(":schat-core")) + api(project(":schat-ui")) + api(project(":schat-features")) + + implementation(libs.adventure.platform) + implementation(libs.adventure.minimessage) + implementation(libs.bundles.cloud.commands) + implementation(libs.bundles.configurate) + + testImplementation(testFixtures(project(":schat-core"))) + testImplementation(testFixtures(project(":schat-ui"))) + + testFixturesImplementation(testFixtures(project(":schat-core"))) + testFixturesImplementation(testFixtures(project(":schat-ui"))) + + testFixturesImplementation(libs.adventure.minimessage) + testFixturesImplementation(libs.bundles.cloud.commands) +} diff --git a/platform/bukkit/build.gradle b/platform/bukkit/build.gradle deleted file mode 100644 index c86e96727..000000000 --- a/platform/bukkit/build.gradle +++ /dev/null @@ -1,101 +0,0 @@ -//file:noinspection -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -//file:noinspection GroovyAssignabilityCheck -//file:noinspection GroovyUnusedAssignment - -apply plugin: 'kr.entree.spigradle' - -archivesBaseName = "${project.property("pluginName")}-bukkit" - -spigot { - name = project.property("pluginName") - authors = [project.property("author")] - apiVersion = project.property("apiVersion") - load = STARTUP - depends = ['ProtocolLib'] - softDepends = ['Vault', 'PlaceholderAPI', 'WorldGuard'] - permissions { - 'schat.player' { - description 'Contains all basic player permissions for using sChat.' - defaults 'true' - children = [ - 'schat.player.channel' : true, - 'schat.player.channel.join' : true, - 'schat.player.channel.leave' : true, - 'schat.player.channel.quickmessage': true, - 'schat.player.directmessage' : true - ] - } - 'schat.admin' { - description 'Contains all admin permissions for sChat.' - defaults 'op' - children = [ - 'schat.admin.reload' : true, - 'schat.admin.broadcast' : true, - 'schat.message.select' : true, - 'schat.message.delete' : true, - 'schat.nickname.set' : true, - 'schat.nickname.set.blocked': true, - 'schat.nickname.set.others' : true, - ] - } - } -} - -repositories { - mavenCentral() -} - -dependencies { - implementation spigot(mcVersion) - - implementation 'cloud.commandframework:cloud-paper:1.6.1' - implementation 'com.comphenix.protocol:ProtocolLib:4.7.0' - - // - // Shaded Dependencies - // - implementation "net.kyori:adventure-platform-bukkit:4.0.1" - // bStats: https://bstats.org/plugin/bukkit/sChat/13304 - implementation 'org.bstats:bstats-bukkit:3.0.0' - - implementation "org.spongepowered:configurate-yaml:4.1.2" - - // - // Optional Plugin Integrations - // - // PlaceholderAPI: https://github.com/PlaceholderAPI/PlaceholderAPI -// implementation 'me.clip:placeholderapi:2.10.10' - // Vault: https://github.com/MilkBowl/VaultAPI -// implementation "com.github.MilkBowl:VaultAPI:1.7.1" - // WorldGuard: https://github.com/EngineHub/WorldGuard -// implementation 'com.sk89q.worldguard:worldguard-bukkit:7.0.6' - - testImplementation 'com.github.seeseemelk:MockBukkit-v1.18:1.15.5' - testImplementation(testFixtures(project(":core"))) -} - -shadowJar { - archiveClassifier.set("") - dependencies { - include(dependency('net.kyori::')) - } - relocate 'net.kyori', "${packageName}.lib.kyori" -} diff --git a/platform/bukkit/src/test/resources/junit-platform.properties b/platform/bukkit/src/test/resources/junit-platform.properties deleted file mode 100644 index b7fe0ed35..000000000 --- a/platform/bukkit/src/test/resources/junit-platform.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# sChat, a Supercharged Minecraft Chat Plugin -# Copyright (C) Silthus -# Copyright (C) sChat team and contributors -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -junit.jupiter.displayname.generator.default = org.junit.jupiter.api.DisplayNameGenerator$ReplaceUnderscores \ No newline at end of file diff --git a/platform/bungeecord/build.gradle b/platform/bungeecord/build.gradle deleted file mode 100644 index 9343497c0..000000000 --- a/platform/bungeecord/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ - -archivesBaseName = "${project.property("pluginName")}-bungeecord" - -repositories { - maven { url = "https://oss.sonatype.org/content/repositories/snapshots" } -} - -dependencies { - implementation 'net.md-5:bungeecord-api:1.16-R0.5-SNAPSHOT' - - implementation "net.kyori:adventure-platform-bungeecord:4.0.1" -} - -shadowJar { - archiveClassifier.set("") - dependencies { - include(dependency('net.kyori::')) - } - relocate 'net.kyori', "${packageName}.lib.kyori" -} \ No newline at end of file diff --git a/platform/src/main/java/net/silthus/schat/platform/chatter/AbstractChatterFactory.java b/platform/src/main/java/net/silthus/schat/platform/chatter/AbstractChatterFactory.java index f64ecd81f..f3d6ca9ce 100644 --- a/platform/src/main/java/net/silthus/schat/platform/chatter/AbstractChatterFactory.java +++ b/platform/src/main/java/net/silthus/schat/platform/chatter/AbstractChatterFactory.java @@ -21,14 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.chatter; import java.util.UUID; import net.silthus.schat.chatter.Chatter; import net.silthus.schat.chatter.ChatterFactory; import net.silthus.schat.identity.Identity; -import net.silthus.schat.view.ViewConnector; +import net.silthus.schat.ui.ViewConnector; import net.silthus.schat.ui.view.ViewProvider; import org.jetbrains.annotations.NotNull; diff --git a/platform/src/main/java/net/silthus/schat/platform/chatter/ConnectionListener.java b/platform/src/main/java/net/silthus/schat/platform/chatter/ConnectionListener.java index ab6e90912..fbc2d046b 100644 --- a/platform/src/main/java/net/silthus/schat/platform/chatter/ConnectionListener.java +++ b/platform/src/main/java/net/silthus/schat/platform/chatter/ConnectionListener.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.chatter; import com.google.gson.InstanceCreator; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/AdminCommands.java b/platform/src/main/java/net/silthus/schat/platform/commands/AdminCommands.java index d884ba357..20f1e8698 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/AdminCommands.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/AdminCommands.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/ChannelCommands.java b/platform/src/main/java/net/silthus/schat/platform/commands/ChannelCommands.java index 4f3dc0e09..ad02dff18 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/ChannelCommands.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/ChannelCommands.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/Command.java b/platform/src/main/java/net/silthus/schat/platform/commands/Command.java index 09d56b66f..f0f41156b 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/Command.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/Command.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/Commands.java b/platform/src/main/java/net/silthus/schat/platform/commands/Commands.java index 60a258f8a..06c4a3bb0 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/Commands.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/Commands.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/PrivateMessageCommands.java b/platform/src/main/java/net/silthus/schat/platform/commands/PrivateMessageCommands.java index dc9cdc774..422f419df 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/PrivateMessageCommands.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/PrivateMessageCommands.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChannelArgument.java b/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChannelArgument.java index af20e76f5..53da4ef56 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChannelArgument.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChannelArgument.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands.parser; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChatterArgument.java b/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChatterArgument.java index f6af66a47..ddc90202d 100644 --- a/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChatterArgument.java +++ b/platform/src/main/java/net/silthus/schat/platform/commands/parser/ChatterArgument.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands.parser; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/ChannelConfig.java b/platform/src/main/java/net/silthus/schat/platform/config/ChannelConfig.java index 1fbe4ccdb..cdfe24538 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/ChannelConfig.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/ChannelConfig.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config; import java.util.Collection; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/Config.java b/platform/src/main/java/net/silthus/schat/platform/config/Config.java index 3e5bdb2de..b63bc655f 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/Config.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/Config.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config; import net.silthus.schat.platform.config.key.ConfigKey; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/ConfigKeys.java b/platform/src/main/java/net/silthus/schat/platform/config/ConfigKeys.java index a1455af0f..0e07d0a26 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/ConfigKeys.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/ConfigKeys.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config; import java.util.ArrayList; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/SChatConfig.java b/platform/src/main/java/net/silthus/schat/platform/config/SChatConfig.java index e6689e57e..7bfa15d37 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/SChatConfig.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/SChatConfig.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config; import net.silthus.schat.eventbus.EventBus; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateAdapter.java b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateAdapter.java index eba2168f0..751276cab 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateAdapter.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.adapter; import java.io.IOException; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateConfigSection.java b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateConfigSection.java index aa7f9768a..8dd10fabc 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateConfigSection.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateConfigSection.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.adapter; import com.google.common.base.Splitter; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapter.java b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapter.java index a426042b2..6cb284889 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapter.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.adapter; import java.io.File; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapters.java b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapters.java index 2ddfb8639..d04876892 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapters.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationAdapters.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.adapter; import java.nio.file.Path; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationSection.java b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationSection.java index 74d7be514..ab191636b 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationSection.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurationSection.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.adapter; import java.util.List; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKey.java b/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKey.java index 876745958..8fd3acc80 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKey.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKey.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.key; import net.silthus.schat.platform.config.adapter.ConfigurationAdapter; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKeyFactory.java b/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKeyFactory.java index 9dc4816cc..110f92d5c 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKeyFactory.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/key/ConfigKeyFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.key; import java.util.Locale; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/key/KeyedConfiguration.java b/platform/src/main/java/net/silthus/schat/platform/config/key/KeyedConfiguration.java index af2a5ecc1..64bb61031 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/key/KeyedConfiguration.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/key/KeyedConfiguration.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.key; import java.lang.reflect.Field; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/key/ModifiableConfigKey.java b/platform/src/main/java/net/silthus/schat/platform/config/key/ModifiableConfigKey.java index 1e9d3327c..479e9f3f0 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/key/ModifiableConfigKey.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/key/ModifiableConfigKey.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.key; import net.silthus.schat.platform.config.adapter.ConfigurationAdapter; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleConfigKey.java b/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleConfigKey.java index a20571be4..3ddc07c5e 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleConfigKey.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleConfigKey.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.key; import java.util.function.Function; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleModifiableConfigKey.java b/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleModifiableConfigKey.java index d03c87119..c8f1ec17f 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleModifiableConfigKey.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/key/SimpleModifiableConfigKey.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.key; import java.util.function.BiConsumer; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/serializers/ColorSerializer.java b/platform/src/main/java/net/silthus/schat/platform/config/serializers/ColorSerializer.java index 2fc1f397b..c11f50cf3 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/serializers/ColorSerializer.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/serializers/ColorSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import java.lang.reflect.Type; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageComponentSerializer.java b/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageComponentSerializer.java index 4ff484178..cf425bfea 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageComponentSerializer.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageComponentSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import java.lang.reflect.Type; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageFormatSerializer.java b/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageFormatSerializer.java index ac83fa49f..958548317 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageFormatSerializer.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageFormatSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import java.lang.reflect.Type; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/serializers/SettingsSerializer.java b/platform/src/main/java/net/silthus/schat/platform/config/serializers/SettingsSerializer.java index c977a7355..606484d43 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/serializers/SettingsSerializer.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/serializers/SettingsSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import java.lang.reflect.Type; diff --git a/platform/src/main/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializer.java b/platform/src/main/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializer.java index 4be07e6eb..e4b26dde4 100644 --- a/platform/src/main/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializer.java +++ b/platform/src/main/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import java.lang.reflect.Type; diff --git a/platform/src/main/java/net/silthus/schat/platform/locale/Messages.java b/platform/src/main/java/net/silthus/schat/platform/locale/Messages.java index 26bedaa6c..988db9328 100644 --- a/platform/src/main/java/net/silthus/schat/platform/locale/Messages.java +++ b/platform/src/main/java/net/silthus/schat/platform/locale/Messages.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.locale; import java.util.Collection; diff --git a/platform/src/main/java/net/silthus/schat/platform/locale/TranslationManager.java b/platform/src/main/java/net/silthus/schat/platform/locale/TranslationManager.java index 8c8c57d01..76101ba64 100644 --- a/platform/src/main/java/net/silthus/schat/platform/locale/TranslationManager.java +++ b/platform/src/main/java/net/silthus/schat/platform/locale/TranslationManager.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.locale; import com.google.common.collect.Maps; diff --git a/platform/src/main/java/net/silthus/schat/platform/messaging/GatewayProviderRegistry.java b/platform/src/main/java/net/silthus/schat/platform/messaging/GatewayProviderRegistry.java index c80d7be10..608b8f6fe 100644 --- a/platform/src/main/java/net/silthus/schat/platform/messaging/GatewayProviderRegistry.java +++ b/platform/src/main/java/net/silthus/schat/platform/messaging/GatewayProviderRegistry.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import java.util.HashMap; diff --git a/platform/src/main/java/net/silthus/schat/platform/messaging/MessagingService.java b/platform/src/main/java/net/silthus/schat/platform/messaging/MessagingService.java index a1cdc54f0..f70269407 100644 --- a/platform/src/main/java/net/silthus/schat/platform/messaging/MessagingService.java +++ b/platform/src/main/java/net/silthus/schat/platform/messaging/MessagingService.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import java.lang.reflect.Type; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatPlugin.java b/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatPlugin.java index 0aaab8ff2..a660724a7 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatPlugin.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatPlugin.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import java.io.IOException; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatProxyPlugin.java b/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatProxyPlugin.java index c581c32fb..e65f01982 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatProxyPlugin.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatProxyPlugin.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import lombok.Getter; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatServerPlugin.java b/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatServerPlugin.java index 99d718e0e..f7b5157ef 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatServerPlugin.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/AbstractSChatServerPlugin.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import cloud.commandframework.CommandManager; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/ChannelLoader.java b/platform/src/main/java/net/silthus/schat/platform/plugin/ChannelLoader.java index 555971d44..73ca53c0c 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/ChannelLoader.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/ChannelLoader.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import java.util.HashMap; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/SChatPlugin.java b/platform/src/main/java/net/silthus/schat/platform/plugin/SChatPlugin.java index a37c9d2a4..2d5a32c05 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/SChatPlugin.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/SChatPlugin.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import net.silthus.schat.platform.config.SChatConfig; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Bootstrap.java b/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Bootstrap.java index 57723f618..d5caeea8b 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Bootstrap.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Bootstrap.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.bootstrap; import java.io.InputStream; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/LoaderBootstrap.java b/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/LoaderBootstrap.java index 6d7c16dca..164bbb9f5 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/LoaderBootstrap.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/LoaderBootstrap.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.bootstrap; /** diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Platform.java b/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Platform.java index 44a2dad46..17f69c68c 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Platform.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/bootstrap/Platform.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.bootstrap; import java.time.Instant; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/logging/JavaPluginLogger.java b/platform/src/main/java/net/silthus/schat/platform/plugin/logging/JavaPluginLogger.java index 82c577c87..85ec41217 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/logging/JavaPluginLogger.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/logging/JavaPluginLogger.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.logging; import java.util.logging.Level; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/logging/PluginLogger.java b/platform/src/main/java/net/silthus/schat/platform/plugin/logging/PluginLogger.java index 1fbcbb0fd..e328b135a 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/logging/PluginLogger.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/logging/PluginLogger.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.logging; /** diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/AbstractJavaScheduler.java b/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/AbstractJavaScheduler.java index 16ab818ef..9bd9552f3 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/AbstractJavaScheduler.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/AbstractJavaScheduler.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.scheduler; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerAdapter.java b/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerAdapter.java index 0d0fd11f5..38f78df5d 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerAdapter.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.scheduler; import java.util.concurrent.Executor; diff --git a/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerTask.java b/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerTask.java index e98cbcf03..dd971e965 100644 --- a/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerTask.java +++ b/platform/src/main/java/net/silthus/schat/platform/plugin/scheduler/SchedulerTask.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin.scheduler; /** diff --git a/platform/src/main/java/net/silthus/schat/platform/sender/FactorySender.java b/platform/src/main/java/net/silthus/schat/platform/sender/FactorySender.java index a475b74b8..666025a8d 100644 --- a/platform/src/main/java/net/silthus/schat/platform/sender/FactorySender.java +++ b/platform/src/main/java/net/silthus/schat/platform/sender/FactorySender.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.sender; import java.util.ArrayList; diff --git a/platform/src/main/java/net/silthus/schat/platform/sender/PlayerOnlineChecker.java b/platform/src/main/java/net/silthus/schat/platform/sender/PlayerOnlineChecker.java index 0dc82b8fc..44f718c50 100644 --- a/platform/src/main/java/net/silthus/schat/platform/sender/PlayerOnlineChecker.java +++ b/platform/src/main/java/net/silthus/schat/platform/sender/PlayerOnlineChecker.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.sender; import java.util.UUID; diff --git a/platform/src/main/java/net/silthus/schat/platform/sender/Sender.java b/platform/src/main/java/net/silthus/schat/platform/sender/Sender.java index 34236a112..4125a0050 100644 --- a/platform/src/main/java/net/silthus/schat/platform/sender/Sender.java +++ b/platform/src/main/java/net/silthus/schat/platform/sender/Sender.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.sender; import net.kyori.adventure.text.Component; diff --git a/platform/src/main/java/net/silthus/schat/platform/sender/SenderFactory.java b/platform/src/main/java/net/silthus/schat/platform/sender/SenderFactory.java index 60f0378e3..727f57e3d 100644 --- a/platform/src/main/java/net/silthus/schat/platform/sender/SenderFactory.java +++ b/platform/src/main/java/net/silthus/schat/platform/sender/SenderFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.sender; import java.util.UUID; diff --git a/platform/src/test/java/net/silthus/schat/platform/chatter/ConnectionListenerTests.java b/platform/src/test/java/net/silthus/schat/platform/chatter/ConnectionListenerTests.java index 5505a4632..466caf5c4 100644 --- a/platform/src/test/java/net/silthus/schat/platform/chatter/ConnectionListenerTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/chatter/ConnectionListenerTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.chatter; import net.silthus.schat.chatter.ChatterMock; diff --git a/platform/src/test/java/net/silthus/schat/platform/commands/AdminCommandsTest.java b/platform/src/test/java/net/silthus/schat/platform/commands/AdminCommandsTest.java index 5de5321e2..7ebf74a9b 100644 --- a/platform/src/test/java/net/silthus/schat/platform/commands/AdminCommandsTest.java +++ b/platform/src/test/java/net/silthus/schat/platform/commands/AdminCommandsTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import net.silthus.schat.platform.locale.Messages; diff --git a/platform/src/test/java/net/silthus/schat/platform/commands/ChannelCommandsTests.java b/platform/src/test/java/net/silthus/schat/platform/commands/ChannelCommandsTests.java index d0ea91d74..0ed7bceee 100644 --- a/platform/src/test/java/net/silthus/schat/platform/commands/ChannelCommandsTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/commands/ChannelCommandsTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.Command; diff --git a/platform/src/test/java/net/silthus/schat/platform/commands/CommandTest.java b/platform/src/test/java/net/silthus/schat/platform/commands/CommandTest.java index 955cc2eb3..2d26bb029 100644 --- a/platform/src/test/java/net/silthus/schat/platform/commands/CommandTest.java +++ b/platform/src/test/java/net/silthus/schat/platform/commands/CommandTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/test/java/net/silthus/schat/platform/commands/PrivateMessageCommandsTests.java b/platform/src/test/java/net/silthus/schat/platform/commands/PrivateMessageCommandsTests.java index 2eb0cfba4..2bc936f47 100644 --- a/platform/src/test/java/net/silthus/schat/platform/commands/PrivateMessageCommandsTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/commands/PrivateMessageCommandsTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import net.kyori.adventure.text.Component; diff --git a/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChannelArgumentTests.java b/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChannelArgumentTests.java index a4b5f0f3c..68d54e38a 100644 --- a/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChannelArgumentTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChannelArgumentTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands.parser; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; diff --git a/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChatterArgumentTests.java b/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChatterArgumentTests.java index 90c75db32..28465f208 100644 --- a/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChatterArgumentTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/commands/parser/ChatterArgumentTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands.parser; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; diff --git a/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java b/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java index 8f65f6007..75033334b 100644 --- a/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config; import java.io.File; diff --git a/platform/src/test/java/net/silthus/schat/platform/config/serializers/ColorSerializerTest.java b/platform/src/test/java/net/silthus/schat/platform/config/serializers/ColorSerializerTest.java index 73579f614..968f414a1 100644 --- a/platform/src/test/java/net/silthus/schat/platform/config/serializers/ColorSerializerTest.java +++ b/platform/src/test/java/net/silthus/schat/platform/config/serializers/ColorSerializerTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import lombok.SneakyThrows; diff --git a/platform/src/test/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializerTest.java b/platform/src/test/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializerTest.java index 381cfc84a..fcf47faaa 100644 --- a/platform/src/test/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializerTest.java +++ b/platform/src/test/java/net/silthus/schat/platform/config/serializers/TextDecorationSerializerTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config.serializers; import lombok.SneakyThrows; diff --git a/platform/src/test/java/net/silthus/schat/platform/messaging/GatewayProviderRegistryTest.java b/platform/src/test/java/net/silthus/schat/platform/messaging/GatewayProviderRegistryTest.java index c76d9baa6..163552957 100644 --- a/platform/src/test/java/net/silthus/schat/platform/messaging/GatewayProviderRegistryTest.java +++ b/platform/src/test/java/net/silthus/schat/platform/messaging/GatewayProviderRegistryTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import org.junit.jupiter.api.BeforeEach; diff --git a/platform/src/test/java/net/silthus/schat/platform/messaging/MessagingServiceTest.java b/platform/src/test/java/net/silthus/schat/platform/messaging/MessagingServiceTest.java index 301d95585..60ccff50e 100644 --- a/platform/src/test/java/net/silthus/schat/platform/messaging/MessagingServiceTest.java +++ b/platform/src/test/java/net/silthus/schat/platform/messaging/MessagingServiceTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import lombok.NonNull; diff --git a/platform/src/test/java/net/silthus/schat/platform/plugin/ServerTests.java b/platform/src/test/java/net/silthus/schat/platform/plugin/ServerTests.java index ac765d6ba..e693aa477 100644 --- a/platform/src/test/java/net/silthus/schat/platform/plugin/ServerTests.java +++ b/platform/src/test/java/net/silthus/schat/platform/plugin/ServerTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import java.io.IOException; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/SchedulerMock.java b/platform/src/testFixtures/java/net/silthus/schat/platform/SchedulerMock.java index ed44d6f89..5d0f4a3a8 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/SchedulerMock.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/SchedulerMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform; import java.util.concurrent.Executor; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/chatter/ChatterFactoryStub.java b/platform/src/testFixtures/java/net/silthus/schat/platform/chatter/ChatterFactoryStub.java index b5e9d9583..4749345cc 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/chatter/ChatterFactoryStub.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/chatter/ChatterFactoryStub.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.chatter; import java.util.HashMap; @@ -30,13 +29,13 @@ import net.silthus.schat.chatter.Chatter; import net.silthus.schat.identity.Identity; import net.silthus.schat.platform.sender.SenderMock; +import net.silthus.schat.ui.ViewConnector; import net.silthus.schat.ui.view.ViewProvider; -import net.silthus.schat.view.ViewConnector; import org.jetbrains.annotations.NotNull; import static net.silthus.schat.ui.view.ViewFactory.empty; import static net.silthus.schat.ui.view.ViewProvider.cachingViewProvider; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static net.silthus.schat.util.StringUtil.randomString; public class ChatterFactoryStub extends AbstractChatterFactory { @@ -63,7 +62,7 @@ public void removeSenderStub(SenderMock sender) { protected @NotNull Identity createIdentity(UUID id) { if (chatterStubs.containsKey(id)) return chatterStubs.get(id).identity(); - return Identity.identity(id, randomAlphabetic(10)); + return Identity.identity(id, randomString()); } @Override diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/commands/CommandTestUtils.java b/platform/src/testFixtures/java/net/silthus/schat/platform/commands/CommandTestUtils.java index 005c8c59b..dbc789760 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/commands/CommandTestUtils.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/commands/CommandTestUtils.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/commands/ParserTest.java b/platform/src/testFixtures/java/net/silthus/schat/platform/commands/ParserTest.java index 24667ee56..92471cb63 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/commands/ParserTest.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/commands/ParserTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.commands; import cloud.commandframework.CommandManager; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/config/TestConfigurationAdapter.java b/platform/src/testFixtures/java/net/silthus/schat/platform/config/TestConfigurationAdapter.java index 293a227ef..08af584e2 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/config/TestConfigurationAdapter.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/config/TestConfigurationAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.config; import java.io.File; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/CrossServerMessengerGateway.java b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/CrossServerMessengerGateway.java index 79da614ba..dfad5f251 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/CrossServerMessengerGateway.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/CrossServerMessengerGateway.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import java.util.Collection; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/IncomingMessageConsumerMock.java b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/IncomingMessageConsumerMock.java index 8e74c8349..1eddd5231 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/IncomingMessageConsumerMock.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/IncomingMessageConsumerMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import lombok.NonNull; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MessagingServiceMock.java b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MessagingServiceMock.java index 90c79604c..45de3ee2f 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MessagingServiceMock.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MessagingServiceMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import java.util.LinkedList; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockMessagingGatewayProvider.java b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockMessagingGatewayProvider.java index 0c55de2d7..15abb8917 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockMessagingGatewayProvider.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockMessagingGatewayProvider.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import lombok.NonNull; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockPluginMessage.java b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockPluginMessage.java index ba64a80ea..7332fbb5b 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockPluginMessage.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/MockPluginMessage.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import net.silthus.schat.messenger.PluginMessage; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/StubMessengerGatewayProvider.java b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/StubMessengerGatewayProvider.java index 5561c1a7c..30d922ba4 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/StubMessengerGatewayProvider.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/messaging/StubMessengerGatewayProvider.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.messaging; import lombok.NonNull; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/BootstrapStub.java b/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/BootstrapStub.java index af544c34b..367c43d5b 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/BootstrapStub.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/BootstrapStub.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import java.nio.file.Files; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/MockPlugin.java b/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/MockPlugin.java index 808311216..922367150 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/MockPlugin.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/MockPlugin.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import net.silthus.schat.platform.config.TestConfigurationAdapter; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/TestServer.java b/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/TestServer.java index bfb5ea2c2..7e78742c8 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/TestServer.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/plugin/TestServer.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.plugin; import cloud.commandframework.CommandManager; diff --git a/platform/src/testFixtures/java/net/silthus/schat/platform/sender/SenderMock.java b/platform/src/testFixtures/java/net/silthus/schat/platform/sender/SenderMock.java index 6f0f42a1e..a0e0066f9 100644 --- a/platform/src/testFixtures/java/net/silthus/schat/platform/sender/SenderMock.java +++ b/platform/src/testFixtures/java/net/silthus/schat/platform/sender/SenderMock.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.platform.sender; import java.util.LinkedList; diff --git a/platform/velocity/build.gradle b/platform/velocity/build.gradle deleted file mode 100644 index 45262f41d..000000000 --- a/platform/velocity/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -archivesBaseName = "${project.property("pluginName")}-velocity" - -repositories { - maven { url = "https://nexus.velocitypowered.com/repository/maven-public/" } -} - -dependencies { - implementation 'com.velocitypowered:velocity-api:3.0.1' - - annotationProcessor 'com.velocitypowered:velocity-api:3.0.1' -} - -shadowJar { - archiveClassifier.set("") - dependencies { -// exclude(dependency('net.kyori:adventure-api:')) -// exclude(dependency('net.kyori:adventure-platform-api:')) -// exclude(dependency('net.kyori:adventure-text-minimessage:')) -// exclude(dependency('net.kyori:adventure-text-serializer-plain:')) -// exclude(dependency('net.kyori:adventure-text-serializer-gson:')) -// exclude(dependency('net.kyori:adventure-text-serializer-legacy:')) -// exclude(dependency('net.kyori:adventure-key:')) -// exclude(dependency('net.kyori:examination-api:')) -// exclude(dependency('net.kyori:examination-string:')) - include(dependency('net.kyori:event-api:')) - include(dependency('net.kyori:adventure-text-minimessage:')) - } - - relocate "net.kyori.event", "${packageName}.lib.event" - relocate "net.kyori.adventure", "${packageName}.lib.adventure" -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index b2fb5c90c..000000000 --- a/settings.gradle +++ /dev/null @@ -1,34 +0,0 @@ -/* - * sChat, a Supercharged Minecraft Chat Plugin - * Copyright (C) Silthus - * Copyright (C) sChat team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'sChat' - -include 'api' -include 'core' - -include 'ui' -include 'features' - -include 'platform' -include 'platform:bukkit' -include 'platform:velocity' -include 'platform:bungeecord' - -include 'acceptance' -include 'example' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..f87341ee1 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,23 @@ +enableFeaturePreview("VERSION_CATALOGS") + +pluginManagement { + includeBuild("build-logic") +} + +rootProject.name = "sChat" + +moonshineProject("bom") +moonshineProject("core") +moonshineProject("features") +moonshineProject("ui") +moonshineProject("platform") +moonshineProject("bukkit") +moonshineProject("velocity") +moonshineProject("bungeecord") + +fun moonshineProject(path: String, name: String = "schat-$path"): ProjectDescriptor { + include(path) + val project = project(":$path") + project.name = name + return project +} \ No newline at end of file diff --git a/ui/build.gradle b/ui/build.gradle deleted file mode 100644 index ff93d83f8..000000000 --- a/ui/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -dependencies { - api project(':core') - - testImplementation(testFixtures(project(':core'))) - - testFixturesImplementation 'net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT' -} \ No newline at end of file diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts new file mode 100644 index 000000000..3525d5028 --- /dev/null +++ b/ui/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("schat.api") +} + +description = "UI API and implementation for sChat." + +dependencies { + api(project(":schat-core")) + + implementation(libs.adventure.minimessage) + + testImplementation(libs.adventure.plain) + testImplementation(libs.adventure.minimessage) + testImplementation(testFixtures(project(":schat-core"))) + + testFixturesImplementation(libs.adventure.plain) + testFixturesImplementation(libs.adventure.minimessage) + testFixturesImplementation(testFixtures(project(":schat-core"))) +} diff --git a/ui/src/main/java/net/silthus/schat/ui/Click.java b/ui/src/main/java/net/silthus/schat/ui/Click.java index 5bd8561b3..960e332a9 100644 --- a/ui/src/main/java/net/silthus/schat/ui/Click.java +++ b/ui/src/main/java/net/silthus/schat/ui/Click.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui; import net.kyori.adventure.text.event.ClickEvent; diff --git a/ui/src/main/java/net/silthus/schat/ui/format/Format.java b/ui/src/main/java/net/silthus/schat/ui/format/Format.java index 85c6c4639..c9658e4ff 100644 --- a/ui/src/main/java/net/silthus/schat/ui/format/Format.java +++ b/ui/src/main/java/net/silthus/schat/ui/format/Format.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.format; import net.kyori.adventure.text.Component; diff --git a/ui/src/main/java/net/silthus/schat/ui/format/MiniMessageFormat.java b/ui/src/main/java/net/silthus/schat/ui/format/MiniMessageFormat.java index 32ca246cd..009359f1a 100644 --- a/ui/src/main/java/net/silthus/schat/ui/format/MiniMessageFormat.java +++ b/ui/src/main/java/net/silthus/schat/ui/format/MiniMessageFormat.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.format; import java.util.ArrayList; diff --git a/ui/src/main/java/net/silthus/schat/ui/model/ChatterViewModel.java b/ui/src/main/java/net/silthus/schat/ui/model/ChatterViewModel.java index ba647b1c2..a54d846df 100644 --- a/ui/src/main/java/net/silthus/schat/ui/model/ChatterViewModel.java +++ b/ui/src/main/java/net/silthus/schat/ui/model/ChatterViewModel.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.model; import java.util.Collection; diff --git a/ui/src/main/java/net/silthus/schat/ui/util/ViewHelper.java b/ui/src/main/java/net/silthus/schat/ui/util/ViewHelper.java index 883f3f397..a6afaed7c 100644 --- a/ui/src/main/java/net/silthus/schat/ui/util/ViewHelper.java +++ b/ui/src/main/java/net/silthus/schat/ui/util/ViewHelper.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.util; import net.kyori.adventure.text.Component; diff --git a/ui/src/main/java/net/silthus/schat/ui/view/CachingViewProvider.java b/ui/src/main/java/net/silthus/schat/ui/view/CachingViewProvider.java index 17d47e3ab..82f4cb237 100644 --- a/ui/src/main/java/net/silthus/schat/ui/view/CachingViewProvider.java +++ b/ui/src/main/java/net/silthus/schat/ui/view/CachingViewProvider.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import java.util.Map; diff --git a/ui/src/main/java/net/silthus/schat/ui/view/DynamicViewConnector.java b/ui/src/main/java/net/silthus/schat/ui/view/DynamicViewConnector.java index 5bf2538b5..2678b8d18 100644 --- a/ui/src/main/java/net/silthus/schat/ui/view/DynamicViewConnector.java +++ b/ui/src/main/java/net/silthus/schat/ui/view/DynamicViewConnector.java @@ -21,11 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import net.silthus.schat.chatter.Chatter; -import net.silthus.schat.view.ViewConnector; +import net.silthus.schat.ui.ViewConnector; public record DynamicViewConnector(Chatter chatter, ViewProvider viewProvider, diff --git a/ui/src/main/java/net/silthus/schat/ui/view/View.java b/ui/src/main/java/net/silthus/schat/ui/view/View.java index 5196da39a..2c1f79959 100644 --- a/ui/src/main/java/net/silthus/schat/ui/view/View.java +++ b/ui/src/main/java/net/silthus/schat/ui/view/View.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import net.kyori.adventure.key.Key; diff --git a/ui/src/main/java/net/silthus/schat/ui/view/ViewFactory.java b/ui/src/main/java/net/silthus/schat/ui/view/ViewFactory.java index 3308b6793..0a8ed29de 100644 --- a/ui/src/main/java/net/silthus/schat/ui/view/ViewFactory.java +++ b/ui/src/main/java/net/silthus/schat/ui/view/ViewFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import net.silthus.schat.chatter.Chatter; diff --git a/ui/src/main/java/net/silthus/schat/ui/view/ViewProvider.java b/ui/src/main/java/net/silthus/schat/ui/view/ViewProvider.java index 9f8e2e07d..fc0bb9b89 100644 --- a/ui/src/main/java/net/silthus/schat/ui/view/ViewProvider.java +++ b/ui/src/main/java/net/silthus/schat/ui/view/ViewProvider.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import lombok.NonNull; diff --git a/ui/src/main/java/net/silthus/schat/ui/views/Views.java b/ui/src/main/java/net/silthus/schat/ui/views/Views.java index 224bc419e..bc66471d7 100644 --- a/ui/src/main/java/net/silthus/schat/ui/views/Views.java +++ b/ui/src/main/java/net/silthus/schat/ui/views/Views.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views; import lombok.NonNull; diff --git a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/AbstractTab.java b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/AbstractTab.java index 24c815ee4..51ed3e8fc 100644 --- a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/AbstractTab.java +++ b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/AbstractTab.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views.tabbed; import java.util.Collection; diff --git a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/ChannelTab.java b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/ChannelTab.java index efbdcc75d..08eb25aa0 100644 --- a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/ChannelTab.java +++ b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/ChannelTab.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views.tabbed; import lombok.Getter; diff --git a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/NoChannelsTab.java b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/NoChannelsTab.java index d2ce2a1ab..a802a091f 100644 --- a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/NoChannelsTab.java +++ b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/NoChannelsTab.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views.tabbed; import net.kyori.adventure.text.Component; diff --git a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/Tab.java b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/Tab.java index 0b707d2af..df96ec462 100644 --- a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/Tab.java +++ b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/Tab.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views.tabbed; import net.kyori.adventure.text.Component; diff --git a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsView.java b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsView.java index b727c9ef2..55032b770 100644 --- a/ui/src/main/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsView.java +++ b/ui/src/main/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsView.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views.tabbed; import java.util.List; diff --git a/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java b/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java index f79179b4d..45fc76293 100644 --- a/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java +++ b/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.format; import net.kyori.adventure.text.Component; diff --git a/ui/src/test/java/net/silthus/schat/ui/model/ChatterViewModelTests.java b/ui/src/test/java/net/silthus/schat/ui/model/ChatterViewModelTests.java index cd59b4643..1fac3740d 100644 --- a/ui/src/test/java/net/silthus/schat/ui/model/ChatterViewModelTests.java +++ b/ui/src/test/java/net/silthus/schat/ui/model/ChatterViewModelTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.model; import lombok.SneakyThrows; @@ -33,10 +32,10 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import static net.silthus.schat.channel.ChannelSettings.PRIORITY; import static net.silthus.schat.channel.ChannelHelper.ConfiguredSetting.set; import static net.silthus.schat.channel.ChannelHelper.channelWith; import static net.silthus.schat.channel.ChannelHelper.randomChannel; +import static net.silthus.schat.channel.ChannelSettings.PRIORITY; import static net.silthus.schat.chatter.ChatterMock.randomChatter; import static net.silthus.schat.ui.model.ChatterViewModel.of; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ui/src/test/java/net/silthus/schat/ui/view/CachingViewProviderTests.java b/ui/src/test/java/net/silthus/schat/ui/view/CachingViewProviderTests.java index d870c016a..ba93e4fd2 100644 --- a/ui/src/test/java/net/silthus/schat/ui/view/CachingViewProviderTests.java +++ b/ui/src/test/java/net/silthus/schat/ui/view/CachingViewProviderTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import net.silthus.schat.chatter.ChatterMock; diff --git a/ui/src/test/java/net/silthus/schat/ui/view/DynamicViewConnectorTest.java b/ui/src/test/java/net/silthus/schat/ui/view/DynamicViewConnectorTest.java index 2dbc69c7e..7593d79d3 100644 --- a/ui/src/test/java/net/silthus/schat/ui/view/DynamicViewConnectorTest.java +++ b/ui/src/test/java/net/silthus/schat/ui/view/DynamicViewConnectorTest.java @@ -21,14 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.view; import lombok.NonNull; import net.kyori.adventure.text.Component; import net.silthus.schat.chatter.ChatterMock; import net.silthus.schat.message.Message; -import net.silthus.schat.view.ViewConnector; +import net.silthus.schat.ui.ViewConnector; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/ui/src/test/java/net/silthus/schat/ui/views/TabbedChannelsViewTests.java b/ui/src/test/java/net/silthus/schat/ui/views/TabbedChannelsViewTests.java index 8c76ac463..44ebc5b86 100644 --- a/ui/src/test/java/net/silthus/schat/ui/views/TabbedChannelsViewTests.java +++ b/ui/src/test/java/net/silthus/schat/ui/views/TabbedChannelsViewTests.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui.views; import lombok.SneakyThrows; diff --git a/ui/src/testFixtures/java/net/silthus/schat/ui/ComponentAssertions.java b/ui/src/testFixtures/java/net/silthus/schat/ui/ComponentAssertions.java index 1c8375afe..44aa97a95 100644 --- a/ui/src/testFixtures/java/net/silthus/schat/ui/ComponentAssertions.java +++ b/ui/src/testFixtures/java/net/silthus/schat/ui/ComponentAssertions.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui; import net.kyori.adventure.text.Component; diff --git a/ui/src/testFixtures/java/net/silthus/schat/ui/ViewProviderStub.java b/ui/src/testFixtures/java/net/silthus/schat/ui/ViewProviderStub.java index 5ea4ad1a1..a5c25d347 100644 --- a/ui/src/testFixtures/java/net/silthus/schat/ui/ViewProviderStub.java +++ b/ui/src/testFixtures/java/net/silthus/schat/ui/ViewProviderStub.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.ui; import lombok.NonNull; diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts new file mode 100644 index 000000000..6eb1c678c --- /dev/null +++ b/velocity/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("schat.api") + id("schat.shadow") +} + +description = "Bukkit implementation of the sChat platform." + +dependencies { + api(project(":schat-platform")) + + implementation(libs.velocity) + annotationProcessor(libs.velocity) +} + +tasks.withType { + dependencies { + include(dependency("net.kyori:event-api:")) + include(dependency("net.kyori:adventure-text-minimessage:")) + } + + val lib = "net.silthus.schat.lib" + relocate("net.kyori.event", "$lib.kyori.event") + relocate("net.kyori.adventure", "$lib.kyori.adventure") +} diff --git a/platform/velocity/gradle.properties b/velocity/gradle.properties similarity index 100% rename from platform/velocity/gradle.properties rename to velocity/gradle.properties diff --git a/platform/velocity/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java b/velocity/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java similarity index 99% rename from platform/velocity/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java rename to velocity/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java index 0b7ac399c..ec5d25526 100644 --- a/platform/velocity/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java +++ b/velocity/src/main/java/net/silthus/schat/velocity/SChatVelocityProxy.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.velocity; import lombok.Getter; diff --git a/platform/velocity/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java b/velocity/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java similarity index 93% rename from platform/velocity/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java rename to velocity/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java index 0e122e489..727b09252 100644 --- a/platform/velocity/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java +++ b/velocity/src/main/java/net/silthus/schat/velocity/VelocityBootstrap.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.velocity; import com.google.inject.Inject; @@ -29,7 +28,6 @@ import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; -import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; @@ -44,14 +42,6 @@ import net.silthus.schat.velocity.adapter.VelocitySchedulerAdapter; import org.slf4j.Logger; -@Plugin(id = "schat", - name = "sChat", - version = "@version@", - url = "https://github.com/sVoxelDev/sChat", - description = "Supercharge your Minecraft Chat Experience!", - authors = {"Silthus"} -) - @Getter @Accessors(fluent = true) public final class VelocityBootstrap implements Bootstrap { diff --git a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java b/velocity/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java similarity index 99% rename from platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java rename to velocity/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java index f6e0286fd..99ccf6e94 100644 --- a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java +++ b/velocity/src/main/java/net/silthus/schat/velocity/adapter/Slf4jPluginLogger.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.velocity.adapter; import net.silthus.schat.platform.plugin.logging.PluginLogger; diff --git a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java b/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java similarity index 99% rename from platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java rename to velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java index 1389881a1..465f7b9b9 100644 --- a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java +++ b/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocityMessengerGateway.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.velocity.adapter; import com.velocitypowered.api.event.Subscribe; diff --git a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java b/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java similarity index 99% rename from platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java rename to velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java index 8cabb4663..715063d1b 100644 --- a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java +++ b/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySchedulerAdapter.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.velocity.adapter; import com.velocitypowered.api.scheduler.ScheduledTask; diff --git a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java b/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java similarity index 99% rename from platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java rename to velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java index f26d48c38..938acafa5 100644 --- a/platform/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java +++ b/velocity/src/main/java/net/silthus/schat/velocity/adapter/VelocitySenderFactory.java @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package net.silthus.schat.velocity.adapter; import com.velocitypowered.api.command.CommandSource; diff --git a/platform/velocity/src/main/resources/config.yml b/velocity/src/main/resources/config.yml similarity index 100% rename from platform/velocity/src/main/resources/config.yml rename to velocity/src/main/resources/config.yml diff --git a/velocity/src/main/resources/velocity-plugin.json b/velocity/src/main/resources/velocity-plugin.json new file mode 100644 index 000000000..d886fc627 --- /dev/null +++ b/velocity/src/main/resources/velocity-plugin.json @@ -0,0 +1,12 @@ +{ + "id": "schat", + "name": "sChat", + "version": "${version}", + "description": "Supercharge your Minecraft Chat Experience!", + "url": "https://github.com/sVoxelDev/sChat", + "authors": [ + "Silthus" + ], + "dependencies": [], + "main": "net.silthus.schat.velocity.VelocityBootstrap" +} \ No newline at end of file