diff --git a/api/build.gradle.kts b/necrify-api/build.gradle.kts similarity index 100% rename from api/build.gradle.kts rename to necrify-api/build.gradle.kts diff --git a/api/src/main/java/de/jvstvshd/necrify/api/Necrify.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/Necrify.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/Necrify.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/Necrify.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/EventDispatcher.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/EventDispatcher.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/EventDispatcher.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/EventDispatcher.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/NecrifyEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/NecrifyEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/NecrifyEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/NecrifyEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/Slf4jLogger.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/Slf4jLogger.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/Slf4jLogger.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/Slf4jLogger.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/origin/ClassEventOrigin.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/origin/ClassEventOrigin.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/origin/ClassEventOrigin.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/origin/ClassEventOrigin.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/origin/EventOrigin.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/origin/EventOrigin.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/origin/EventOrigin.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/origin/EventOrigin.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/origin/StringEventOrigin.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/origin/StringEventOrigin.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/origin/StringEventOrigin.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/origin/StringEventOrigin.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentCancelledEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentCancelledEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentCancelledEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentCancelledEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentChangedEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentChangedEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentChangedEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentChangedEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentPersecutedEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentPersecutedEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentPersecutedEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentPersecutedEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisabledEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisabledEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisabledEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisabledEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisablingEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisablingEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisablingEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyDisablingEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyInitializedEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyInitializedEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyInitializedEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyInitializedEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyPreInitializationEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyPreInitializationEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyPreInitializationEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyPreInitializationEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyStateEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyStateEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyStateEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/state/NecrifyStateEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/user/UserCreatedEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserCreatedEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/user/UserCreatedEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserCreatedEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/user/UserDeletedEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserDeletedEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/user/UserDeletedEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserDeletedEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/user/UserEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/user/UserEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/event/user/UserLoadedEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserLoadedEvent.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/event/user/UserLoadedEvent.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/event/user/UserLoadedEvent.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/user/CommandSender.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/user/CommandSender.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/user/CommandSender.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/user/CommandSender.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/user/NecrifyUser.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/user/NecrifyUser.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/user/NecrifyUser.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/user/NecrifyUser.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/user/UserDeletionReason.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/user/UserDeletionReason.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/user/UserDeletionReason.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/user/UserDeletionReason.java diff --git a/api/src/main/java/de/jvstvshd/necrify/api/user/UserManager.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/user/UserManager.java similarity index 100% rename from api/src/main/java/de/jvstvshd/necrify/api/user/UserManager.java rename to necrify-api/src/main/java/de/jvstvshd/necrify/api/user/UserManager.java diff --git a/api/src/test/java/de/jvstvshd/necrify/api/event/NecrifyEventTest.java b/necrify-api/src/test/java/de/jvstvshd/necrify/api/event/NecrifyEventTest.java similarity index 100% rename from api/src/test/java/de/jvstvshd/necrify/api/event/NecrifyEventTest.java rename to necrify-api/src/test/java/de/jvstvshd/necrify/api/event/NecrifyEventTest.java diff --git a/api/src/test/resources/logback.xml b/necrify-api/src/test/resources/logback.xml similarity index 100% rename from api/src/test/resources/logback.xml rename to necrify-api/src/test/resources/logback.xml diff --git a/plugin-common/build.gradle.kts b/necrify-common/build.gradle.kts similarity index 95% rename from plugin-common/build.gradle.kts rename to necrify-common/build.gradle.kts index 4c11537..a5c2b55 100644 --- a/plugin-common/build.gradle.kts +++ b/necrify-common/build.gradle.kts @@ -7,7 +7,7 @@ group = "de.jvstvshd.necrify" version = rootProject.version dependencies { - api(projects.api) + api(projects.necrifyApi) api(libs.bundles.jackson) api(libs.bundles.database) { exclude(group = "org.slf4j", module = "slf4j-api") diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/AbstractNecrifyPlugin.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/AbstractNecrifyPlugin.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/AbstractNecrifyPlugin.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/AbstractNecrifyPlugin.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/commands/NecrifyCommand.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/commands/NecrifyCommand.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/commands/NecrifyCommand.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/commands/NecrifyCommand.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/io/Adapters.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/io/Adapters.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/io/Adapters.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/io/Adapters.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractPunishment.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractPunishment.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractPunishment.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractPunishment.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractTemporalPunishment.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractTemporalPunishment.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractTemporalPunishment.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/AbstractTemporalPunishment.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyBan.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyBan.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyBan.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyBan.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyKick.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyKick.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyKick.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyKick.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyMute.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyMute.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyMute.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/NecrifyMute.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/PunishmentBuilder.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/PunishmentBuilder.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/punishment/PunishmentBuilder.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/punishment/PunishmentBuilder.java diff --git a/plugin-common/src/main/java/de/jvstvshd/necrify/common/user/MojangAPI.java b/necrify-common/src/main/java/de/jvstvshd/necrify/common/user/MojangAPI.java similarity index 100% rename from plugin-common/src/main/java/de/jvstvshd/necrify/common/user/MojangAPI.java rename to necrify-common/src/main/java/de/jvstvshd/necrify/common/user/MojangAPI.java diff --git a/plugin-common/src/main/resources/database/postgresql/1/patch_1.sql b/necrify-common/src/main/resources/database/postgresql/1/patch_1.sql similarity index 100% rename from plugin-common/src/main/resources/database/postgresql/1/patch_1.sql rename to necrify-common/src/main/resources/database/postgresql/1/patch_1.sql diff --git a/plugin-common/src/main/resources/database/postgresql/1/setup.sql b/necrify-common/src/main/resources/database/postgresql/1/setup.sql similarity index 100% rename from plugin-common/src/main/resources/database/postgresql/1/setup.sql rename to necrify-common/src/main/resources/database/postgresql/1/setup.sql diff --git a/plugin-common/src/main/resources/database/version b/necrify-common/src/main/resources/database/version similarity index 100% rename from plugin-common/src/main/resources/database/version rename to necrify-common/src/main/resources/database/version diff --git a/plugin-common/src/main/resources/translations/de.properties b/necrify-common/src/main/resources/translations/de.properties similarity index 100% rename from plugin-common/src/main/resources/translations/de.properties rename to necrify-common/src/main/resources/translations/de.properties diff --git a/plugin-common/src/main/resources/translations/en.properties b/necrify-common/src/main/resources/translations/en.properties similarity index 100% rename from plugin-common/src/main/resources/translations/en.properties rename to necrify-common/src/main/resources/translations/en.properties diff --git a/paper-extension/build.gradle.kts b/necrify-paper/build.gradle.kts similarity index 88% rename from paper-extension/build.gradle.kts rename to necrify-paper/build.gradle.kts index 6b5426f..94044d7 100644 --- a/paper-extension/build.gradle.kts +++ b/necrify-paper/build.gradle.kts @@ -10,15 +10,15 @@ version = rootProject.version dependencies { compileOnly(libs.paper.api) - api(projects.pluginCommon) + api(projects.necrifyCommon) } tasks { shadowJar { archiveFileName.set("${rootProject.name}-Paper-${project.version}.jar") dependencies { - include(project(":plugin-common")) - include(project(":api")) + include(project(":necrify-common")) + include(project(":necrify-api")) } } build { @@ -32,7 +32,7 @@ tasks { val field = librariesRootComponent.get()::class.java.getDeclaredField("dependencies") field.isAccessible = true val set = field.get(librariesRootComponent.get()) as LinkedHashSet - val configuration = project(":plugin-common").configurations.getByName("runtimeClasspath") + val configuration = project(":necrify-common").configurations.getByName("runtimeClasspath") val resolutionResult = configuration.incoming.resolutionResult set.clear() set.addAll( diff --git a/paper-extension/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPlugin.java b/necrify-paper/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPlugin.java similarity index 100% rename from paper-extension/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPlugin.java rename to necrify-paper/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPlugin.java diff --git a/paper-extension/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginBootstrap.java b/necrify-paper/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginBootstrap.java similarity index 100% rename from paper-extension/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginBootstrap.java rename to necrify-paper/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginBootstrap.java diff --git a/paper-extension/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginLoader.java b/necrify-paper/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginLoader.java similarity index 100% rename from paper-extension/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginLoader.java rename to necrify-paper/src/main/java/de/jvstvshd/necrify/paper/NecrifyPaperPluginLoader.java diff --git a/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java b/necrify-paper/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java similarity index 100% rename from paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java rename to necrify-paper/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java diff --git a/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java b/necrify-paper/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java similarity index 100% rename from paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java rename to necrify-paper/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java diff --git a/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java b/necrify-paper/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java similarity index 100% rename from paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java rename to necrify-paper/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java diff --git a/plugin/build.gradle.kts b/necrify-velocity/build.gradle.kts similarity index 98% rename from plugin/build.gradle.kts rename to necrify-velocity/build.gradle.kts index 6db4e67..ef9af42 100644 --- a/plugin/build.gradle.kts +++ b/necrify-velocity/build.gradle.kts @@ -13,7 +13,7 @@ repositories { } dependencies { - api(projects.pluginCommon) + api(projects.necrifyCommon) annotationProcessor(libs.velocity.api) compileOnly(libs.velocity.api) compileOnly(libs.luckperms.api) diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/MessagingChannelCommunicator.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/MessagingChannelCommunicator.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/MessagingChannelCommunicator.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/MessagingChannelCommunicator.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/NecrifyVelocityPlugin.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/NecrifyVelocityPlugin.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/NecrifyVelocityPlugin.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/NecrifyVelocityPlugin.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/BanCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/BanCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/BanCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/BanCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/KickCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/KickCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/KickCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/KickCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/MuteCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/MuteCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/MuteCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/MuteCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentRemovalCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentRemovalCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentRemovalCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/PunishmentRemovalCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/TempbanCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/TempbanCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/TempbanCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/TempbanCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/TempmuteCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/TempmuteCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/TempmuteCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/TempmuteCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/WhitelistCommand.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/WhitelistCommand.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/commands/WhitelistCommand.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/commands/WhitelistCommand.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigData.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigData.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigData.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigData.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigurationManager.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigurationManager.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigurationManager.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/config/ConfigurationManager.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/config/DataBaseData.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/config/DataBaseData.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/config/DataBaseData.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/config/DataBaseData.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPlayerResolver.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPlayerResolver.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPlayerResolver.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPlayerResolver.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPunishmentManager.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPunishmentManager.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPunishmentManager.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/impl/DefaultPunishmentManager.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/impl/VelocityKick.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/impl/VelocityKick.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/impl/VelocityKick.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/impl/VelocityKick.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/internal/PunishmentHelper.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/internal/PunishmentHelper.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/internal/PunishmentHelper.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/internal/PunishmentHelper.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/internal/Util.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/internal/Util.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/internal/Util.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/internal/Util.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/listener/ConnectListener.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/listener/ConnectListener.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/listener/ConnectListener.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/listener/ConnectListener.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/message/ResourceBundleMessageProvider.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/message/ResourceBundleMessageProvider.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/message/ResourceBundleMessageProvider.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/message/ResourceBundleMessageProvider.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUser.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUser.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUser.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUser.java diff --git a/plugin/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUserManager.java b/necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUserManager.java similarity index 100% rename from plugin/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUserManager.java rename to necrify-velocity/src/main/java/de/jvstvshd/necrify/velocity/user/VelocityUserManager.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 2c12097..96647a8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ rootProject.name = "necrify" -include("api") -include("plugin") -include("paper-extension") -include("plugin-common") +include("necrify-api") +include("necrify-common") +include("necrify-paper") +include("necrify-velocity") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file