From 02570993a7a8c55e7873b57402322c49c42ca1f3 Mon Sep 17 00:00:00 2001 From: Shiewk Date: Thu, 1 May 2025 10:46:00 +0200 Subject: [PATCH] Move SModeration for Paper to root project --- build.gradle | 38 +++++++++++++------ settings.gradle | 3 +- smoderation-paper/build.gradle | 19 ---------- .../smoderation/paper/SModerationPaper.java | 0 .../smoderation/paper/command/BanCommand.java | 0 .../paper/command/EnderchestSeeCommand.java | 0 .../paper/command/InvseeCommand.java | 0 .../paper/command/KickCommand.java | 0 .../paper/command/ModLogsCommand.java | 0 .../paper/command/MuteCommand.java | 0 .../paper/command/SModCommand.java | 0 .../paper/command/SocialSpyCommand.java | 0 .../paper/command/UnbanCommand.java | 0 .../paper/command/UnmuteCommand.java | 0 .../paper/command/VanishCommand.java | 0 .../paper/config/SModerationConfig.java | 0 .../paper/event/PunishmentIssueEvent.java | 0 .../paper/event/VanishToggleEvent.java | 0 .../smoderation/paper/input/ChatInput.java | 0 .../paper/input/ChatInputListener.java | 0 .../AutoUpdatingCustomInventory.java | 0 .../inventory/ConfirmationInventory.java | 0 .../paper/inventory/CustomInventory.java | 0 .../inventory/InvSeeEquipmentInventory.java | 0 .../inventory/PageableCustomInventory.java | 0 .../smoderation/paper/inventory/SModMenu.java | 0 .../listener/CustomInventoryListener.java | 0 .../paper/listener/EnderchestSeeListener.java | 0 .../paper/listener/InvSeeListener.java | 0 .../paper/listener/PunishmentListener.java | 0 .../paper/listener/SocialSpyListener.java | 0 .../paper/listener/VanishListener.java | 0 .../paper/punishments/Punishment.java | 0 .../paper/punishments/PunishmentType.java | 0 .../paper/storage/PunishmentContainer.java | 0 .../smoderation/paper/util/ByteUtil.java | 0 .../smoderation/paper/util/PlayerUtil.java | 0 .../smoderation/paper/util/TimeUtil.java | 0 .../src => src}/main/resources/plugin.yml | 2 +- 39 files changed, 29 insertions(+), 33 deletions(-) delete mode 100644 smoderation-paper/build.gradle rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/SModerationPaper.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/BanCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/KickCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/SModCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/event/VanishToggleEvent.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/input/ChatInput.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java (100%) rename {smoderation-paper/src => src}/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java (100%) rename {smoderation-paper/src => src}/main/resources/plugin.yml (99%) diff --git a/build.gradle b/build.gradle index a6d7ff5..4c0a3d5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,18 +5,34 @@ plugins { group = 'de.shiewk' version = pluginVersion -subprojects { - repositories { - mavenCentral() - maven { - name = "papermc-repo" - url = "https://repo.papermc.io/repository/maven-public/" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/groups/public/" - } +repositories { + mavenCentral() + maven { + name = "papermc-repo" + url = "https://repo.papermc.io/repository/maven-public/" } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/groups/public/" + } +} + +processResources { + def props = [version: version] + inputs.properties props + filteringCharset 'UTF-8' + filesMatching('plugin.yml') { + expand props + } +} + +dependencies { + compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT" +} + +jar { + archiveBaseName.set('SModeration-Paper') + archiveVersion.set(pluginVersion) } diff --git a/settings.gradle b/settings.gradle index bc7cade..50dbe2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ -rootProject.name = 'SModeration' -include 'smoderation-paper' \ No newline at end of file +rootProject.name = 'SModeration' \ No newline at end of file diff --git a/smoderation-paper/build.gradle b/smoderation-paper/build.gradle deleted file mode 100644 index 3084d01..0000000 --- a/smoderation-paper/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'java' - -dependencies { - compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT" -} - -jar { - archiveBaseName.set('SModeration-Paper') - archiveVersion.set(pluginVersion) -} - -processResources { - def props = [version: version] - inputs.properties props - filteringCharset 'UTF-8' - filesMatching('plugin.yml') { - expand props - } -} \ No newline at end of file diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java b/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java rename to src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java b/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java rename to src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java b/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java rename to src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java b/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java rename to src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/VanishToggleEvent.java b/src/main/java/de/shiewk/smoderation/paper/event/VanishToggleEvent.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/VanishToggleEvent.java rename to src/main/java/de/shiewk/smoderation/paper/event/VanishToggleEvent.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java b/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java rename to src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java b/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java rename to src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java b/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java rename to src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java b/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java rename to src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java b/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java rename to src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java b/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java rename to src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java b/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java rename to src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java b/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java rename to src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java b/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java rename to src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java b/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java rename to src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java b/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java rename to src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java b/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java rename to src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java b/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java rename to src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java b/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java rename to src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java b/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java rename to src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java b/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java rename to src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java b/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java rename to src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java b/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java rename to src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java b/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java rename to src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java diff --git a/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java b/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java similarity index 100% rename from smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java rename to src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java diff --git a/smoderation-paper/src/main/resources/plugin.yml b/src/main/resources/plugin.yml similarity index 99% rename from smoderation-paper/src/main/resources/plugin.yml rename to src/main/resources/plugin.yml index d6528d1..2e46037 100644 --- a/smoderation-paper/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: SModeration -version: '1.4.2' +version: '${version}' main: de.shiewk.smoderation.paper.SModerationPaper api-version: '1.20' load: STARTUP