From 2f66c6f12c6e0e9f158503fe27379316ac97c1bf Mon Sep 17 00:00:00 2001 From: Shiewk Date: Thu, 19 Dec 2024 15:59:20 +0100 Subject: [PATCH] move SModeration for Paper to subproject --- build.gradle | 34 +++++++------------ settings.gradle | 1 + smoderation-paper/build.gradle | 19 +++++++++++ .../smoderation/paper/SModerationPaper.java | 22 ++++++------ .../paper}/command/BanCommand.java | 12 +++---- .../paper}/command/EnderchestSeeCommand.java | 6 ++-- .../paper}/command/InvseeCommand.java | 8 ++--- .../paper}/command/KickCommand.java | 10 +++--- .../paper}/command/ModLogsCommand.java | 16 ++++----- .../paper}/command/MuteCommand.java | 12 +++---- .../paper}/command/SModCommand.java | 8 ++--- .../paper}/command/SocialSpyCommand.java | 6 ++-- .../paper}/command/UnbanCommand.java | 14 ++++---- .../paper}/command/UnmuteCommand.java | 14 ++++---- .../paper}/command/VanishCommand.java | 10 +++--- .../paper}/config/SModerationConfig.java | 8 ++--- .../paper}/event/PunishmentIssueEvent.java | 6 ++-- .../smoderation/paper}/input/ChatInput.java | 4 +-- .../paper}/input/ChatInputListener.java | 4 +-- .../AutoUpdatingCustomInventory.java | 2 +- .../inventory/ConfirmationInventory.java | 2 +- .../paper}/inventory/CustomInventory.java | 2 +- .../inventory/InvSeeEquipmentInventory.java | 6 ++-- .../inventory/PageableCustomInventory.java | 2 +- .../paper}/inventory/SModMenu.java | 18 +++++----- .../listener/CustomInventoryListener.java | 6 ++-- .../listener/EnderchestSeeListener.java | 2 +- .../paper}/listener/InvSeeListener.java | 2 +- .../paper}/listener/PunishmentListener.java | 20 +++++------ .../paper}/listener/SocialSpyListener.java | 10 +++--- .../paper}/listener/VanishListener.java | 14 ++++---- .../paper}/punishments/Punishment.java | 14 ++++---- .../paper}/punishments/PunishmentType.java | 2 +- .../paper}/storage/PunishmentContainer.java | 10 +++--- .../smoderation/paper}/util/ByteUtil.java | 2 +- .../smoderation/paper}/util/PlayerUtil.java | 8 ++--- .../smoderation/paper}/util/TimeUtil.java | 2 +- .../src}/main/resources/plugin.yml | 4 +-- 38 files changed, 176 insertions(+), 166 deletions(-) create mode 100644 smoderation-paper/build.gradle rename src/main/java/de/shiewk/smoderation/SModeration.java => smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java (83%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/BanCommand.java (93%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/EnderchestSeeCommand.java (93%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/InvseeCommand.java (93%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/KickCommand.java (92%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/ModLogsCommand.java (86%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/MuteCommand.java (93%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/SModCommand.java (77%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/SocialSpyCommand.java (86%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/UnbanCommand.java (81%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/UnmuteCommand.java (81%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/command/VanishCommand.java (94%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/config/SModerationConfig.java (80%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/event/PunishmentIssueEvent.java (86%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/input/ChatInput.java (94%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/input/ChatInputListener.java (88%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/inventory/AutoUpdatingCustomInventory.java (61%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/inventory/ConfirmationInventory.java (98%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/inventory/CustomInventory.java (94%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/inventory/InvSeeEquipmentInventory.java (94%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/inventory/PageableCustomInventory.java (97%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/inventory/SModMenu.java (97%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/listener/CustomInventoryListener.java (88%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/listener/EnderchestSeeListener.java (95%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/listener/InvSeeListener.java (95%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/listener/PunishmentListener.java (78%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/listener/SocialSpyListener.java (90%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/listener/VanishListener.java (83%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/punishments/Punishment.java (96%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/punishments/PunishmentType.java (78%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/storage/PunishmentContainer.java (93%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/util/ByteUtil.java (97%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/util/PlayerUtil.java (89%) rename {src/main/java/de/shiewk/smoderation => smoderation-paper/src/main/java/de/shiewk/smoderation/paper}/util/TimeUtil.java (99%) rename {src => smoderation-paper/src}/main/resources/plugin.yml (98%) diff --git a/build.gradle b/build.gradle index 747e943..a6d7ff5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,21 +5,20 @@ plugins { group = 'de.shiewk' version = pluginVersion -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/" +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/" + } } } -dependencies { - compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT" -} def targetJavaVersion = 17 java { @@ -37,13 +36,4 @@ tasks.withType(JavaCompile).configureEach { if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { options.release.set(targetJavaVersion) } -} - -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/settings.gradle b/settings.gradle index b825dba..bc7cade 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ rootProject.name = 'SModeration' +include 'smoderation-paper' \ No newline at end of file diff --git a/smoderation-paper/build.gradle b/smoderation-paper/build.gradle new file mode 100644 index 0000000..3084d01 --- /dev/null +++ b/smoderation-paper/build.gradle @@ -0,0 +1,19 @@ +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/src/main/java/de/shiewk/smoderation/SModeration.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java similarity index 83% rename from src/main/java/de/shiewk/smoderation/SModeration.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java index b2c7c07..b22a72c 100644 --- a/src/main/java/de/shiewk/smoderation/SModeration.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java @@ -1,10 +1,10 @@ -package de.shiewk.smoderation; +package de.shiewk.smoderation.paper; -import de.shiewk.smoderation.command.*; -import de.shiewk.smoderation.config.SModerationConfig; -import de.shiewk.smoderation.input.ChatInputListener; -import de.shiewk.smoderation.listener.*; -import de.shiewk.smoderation.storage.PunishmentContainer; +import de.shiewk.smoderation.paper.command.*; +import de.shiewk.smoderation.paper.config.SModerationConfig; +import de.shiewk.smoderation.paper.input.ChatInputListener; +import de.shiewk.smoderation.paper.listener.*; +import de.shiewk.smoderation.paper.storage.PunishmentContainer; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; @@ -17,16 +17,16 @@ import org.bukkit.plugin.java.JavaPlugin; import java.io.File; -import static de.shiewk.smoderation.command.VanishCommand.isVanished; -import static de.shiewk.smoderation.command.VanishCommand.toggleVanish; +import static de.shiewk.smoderation.paper.command.VanishCommand.isVanished; +import static de.shiewk.smoderation.paper.command.VanishCommand.toggleVanish; import static net.kyori.adventure.text.Component.text; import static org.bukkit.Bukkit.getPluginManager; -public final class SModeration extends JavaPlugin { +public final class SModerationPaper extends JavaPlugin { public static final PunishmentContainer container = new PunishmentContainer(); public static ComponentLogger LOGGER = null; - public static SModeration PLUGIN = null; + public static SModerationPaper PLUGIN = null; public static SModerationConfig CONFIG = null; public static File SAVE_FILE = null; @@ -81,7 +81,7 @@ public final class SModeration extends JavaPlugin { @Override public void onDisable() { - SModeration.container.save(SModeration.SAVE_FILE); + SModerationPaper.container.save(SModerationPaper.SAVE_FILE); for (Player player : Bukkit.getOnlinePlayers()) { // in case players are still vanished when the server shuts down if (isVanished(player)){ diff --git a/src/main/java/de/shiewk/smoderation/command/BanCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java similarity index 93% rename from src/main/java/de/shiewk/smoderation/command/BanCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java index 8f248a1..88fbb00 100644 --- a/src/main/java/de/shiewk/smoderation/command/BanCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java @@ -1,9 +1,9 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.util.PlayerUtil; -import de.shiewk.smoderation.util.TimeUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.util.PlayerUtil; +import de.shiewk.smoderation.paper.util.TimeUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -81,7 +81,7 @@ public class BanCommand implements TabExecutor { reason.append(args[i]); } final Punishment punishment = Punishment.ban(System.currentTimeMillis(), System.currentTimeMillis() + duration, senderUUID, uuid, reason.isEmpty() ? Punishment.DEFAULT_REASON : reason.toString()); - Punishment.issue(punishment, SModeration.container); + Punishment.issue(punishment, SModerationPaper.container); return true; } } diff --git a/src/main/java/de/shiewk/smoderation/command/EnderchestSeeCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java similarity index 93% rename from src/main/java/de/shiewk/smoderation/command/EnderchestSeeCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java index f8e4e14..2a0224e 100644 --- a/src/main/java/de/shiewk/smoderation/command/EnderchestSeeCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java @@ -1,6 +1,6 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.util.PlayerUtil; +import de.shiewk.smoderation.paper.util.PlayerUtil; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import static de.shiewk.smoderation.SModeration.*; +import static de.shiewk.smoderation.paper.SModerationPaper.*; public class EnderchestSeeCommand implements TabExecutor { diff --git a/src/main/java/de/shiewk/smoderation/command/InvseeCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java similarity index 93% rename from src/main/java/de/shiewk/smoderation/command/InvseeCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java index c929d8f..2070419 100644 --- a/src/main/java/de/shiewk/smoderation/command/InvseeCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.inventory.InvSeeEquipmentInventory; -import de.shiewk.smoderation.util.PlayerUtil; +import de.shiewk.smoderation.paper.inventory.InvSeeEquipmentInventory; +import de.shiewk.smoderation.paper.util.PlayerUtil; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import static de.shiewk.smoderation.SModeration.*; +import static de.shiewk.smoderation.paper.SModerationPaper.*; public class InvseeCommand implements TabExecutor { diff --git a/src/main/java/de/shiewk/smoderation/command/KickCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java similarity index 92% rename from src/main/java/de/shiewk/smoderation/command/KickCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java index 43a1b34..67d70f9 100644 --- a/src/main/java/de/shiewk/smoderation/command/KickCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java @@ -1,8 +1,8 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.util.PlayerUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.util.PlayerUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -59,7 +59,7 @@ public class KickCommand implements TabExecutor { reason.append(args[i]); } final Punishment punishment = Punishment.kick(System.currentTimeMillis(), senderUUID, uuid, reason.isEmpty() ? Punishment.DEFAULT_REASON : reason.toString()); - Punishment.issue(punishment, SModeration.container); + Punishment.issue(punishment, SModerationPaper.container); return true; } } diff --git a/src/main/java/de/shiewk/smoderation/command/ModLogsCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java similarity index 86% rename from src/main/java/de/shiewk/smoderation/command/ModLogsCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java index 63fb990..720644a 100644 --- a/src/main/java/de/shiewk/smoderation/command/ModLogsCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java @@ -1,10 +1,10 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.punishments.PunishmentType; -import de.shiewk.smoderation.util.PlayerUtil; -import de.shiewk.smoderation.util.TimeUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.punishments.PunishmentType; +import de.shiewk.smoderation.paper.util.PlayerUtil; +import de.shiewk.smoderation.paper.util.TimeUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import static de.shiewk.smoderation.SModeration.*; +import static de.shiewk.smoderation.paper.SModerationPaper.*; public class ModLogsCommand implements TabExecutor { @Override @@ -45,7 +45,7 @@ public class ModLogsCommand implements TabExecutor { .append(Component.text(name).color(SECONDARY_COLOR)) .append(Component.text(" (%s)".formatted(uuid)).color(INACTIVE_COLOR)))); UUID finalUuid = uuid; - final List punishments = SModeration.container.findAll(p -> p.to.equals(finalUuid) && p.isActive()); + final List punishments = SModerationPaper.container.findAll(p -> p.to.equals(finalUuid) && p.isActive()); for (Punishment punishment : punishments) { sender.sendMessage(Component.text("- is currently ").color(PRIMARY_COLOR) .append(Component.text(punishment.type == PunishmentType.BAN ? "banned" : "muted").color(SECONDARY_COLOR)) diff --git a/src/main/java/de/shiewk/smoderation/command/MuteCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java similarity index 93% rename from src/main/java/de/shiewk/smoderation/command/MuteCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java index 29ec028..31ac311 100644 --- a/src/main/java/de/shiewk/smoderation/command/MuteCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java @@ -1,9 +1,9 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.util.PlayerUtil; -import de.shiewk.smoderation.util.TimeUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.util.PlayerUtil; +import de.shiewk.smoderation.paper.util.TimeUtil; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; import org.bukkit.command.*; @@ -80,7 +80,7 @@ public class MuteCommand implements TabExecutor { reason.append(args[i]); } final Punishment punishment = Punishment.mute(System.currentTimeMillis(), System.currentTimeMillis() + duration, senderUUID, uuid, reason.isEmpty() ? Punishment.DEFAULT_REASON : reason.toString()); - Punishment.issue(punishment, SModeration.container); + Punishment.issue(punishment, SModerationPaper.container); return true; } } diff --git a/src/main/java/de/shiewk/smoderation/command/SModCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java similarity index 77% rename from src/main/java/de/shiewk/smoderation/command/SModCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java index f0bccb8..cc2aede 100644 --- a/src/main/java/de/shiewk/smoderation/command/SModCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.inventory.SModMenu; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.inventory.SModMenu; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; @@ -15,7 +15,7 @@ public class SModCommand implements TabExecutor { @Override public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) { if (commandSender instanceof Player player){ - new SModMenu(player, SModeration.container).open(); + new SModMenu(player, SModerationPaper.container).open(); } return true; } diff --git a/src/main/java/de/shiewk/smoderation/command/SocialSpyCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java similarity index 86% rename from src/main/java/de/shiewk/smoderation/command/SocialSpyCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java index bd1a677..ed241a6 100644 --- a/src/main/java/de/shiewk/smoderation/command/SocialSpyCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java @@ -1,6 +1,6 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.listener.SocialSpyListener; +import de.shiewk.smoderation.paper.listener.SocialSpyListener; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static de.shiewk.smoderation.SModeration.CHAT_PREFIX; +import static de.shiewk.smoderation.paper.SModerationPaper.CHAT_PREFIX; import static net.kyori.adventure.text.Component.text; public class SocialSpyCommand implements TabExecutor { diff --git a/src/main/java/de/shiewk/smoderation/command/UnbanCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java similarity index 81% rename from src/main/java/de/shiewk/smoderation/command/UnbanCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java index 070a69f..9ba1a8f 100644 --- a/src/main/java/de/shiewk/smoderation/command/UnbanCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java @@ -1,9 +1,9 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.punishments.PunishmentType; -import de.shiewk.smoderation.util.PlayerUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.punishments.PunishmentType; +import de.shiewk.smoderation.paper.util.PlayerUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.*; @@ -46,10 +46,10 @@ public class UnbanCommand implements TabExecutor { return true; } UUID finalUuid = uuid; - final Punishment punishment = SModeration.container.find(p -> p.to.equals(finalUuid) && p.isActive() && p.type == PunishmentType.BAN); + final Punishment punishment = SModerationPaper.container.find(p -> p.to.equals(finalUuid) && p.isActive() && p.type == PunishmentType.BAN); if (punishment != null) { punishment.undo(senderUUID); - punishment.broadcastUndo(SModeration.container); + punishment.broadcastUndo(SModerationPaper.container); } else { sender.sendMessage(Component.text("This player is not banned.").color(NamedTextColor.RED)); } diff --git a/src/main/java/de/shiewk/smoderation/command/UnmuteCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java similarity index 81% rename from src/main/java/de/shiewk/smoderation/command/UnmuteCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java index 13e4102..4541a99 100644 --- a/src/main/java/de/shiewk/smoderation/command/UnmuteCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java @@ -1,9 +1,9 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.punishments.PunishmentType; -import de.shiewk.smoderation.util.PlayerUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.punishments.PunishmentType; +import de.shiewk.smoderation.paper.util.PlayerUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.*; @@ -46,10 +46,10 @@ public class UnmuteCommand implements TabExecutor { return true; } UUID finalUuid = uuid; - final Punishment punishment = SModeration.container.find(p -> p.to.equals(finalUuid) && p.isActive() && p.type == PunishmentType.MUTE); + final Punishment punishment = SModerationPaper.container.find(p -> p.to.equals(finalUuid) && p.isActive() && p.type == PunishmentType.MUTE); if (punishment != null) { punishment.undo(senderUUID); - punishment.broadcastUndo(SModeration.container); + punishment.broadcastUndo(SModerationPaper.container); } else { sender.sendMessage(Component.text("This player is not muted.").color(NamedTextColor.RED)); } diff --git a/src/main/java/de/shiewk/smoderation/command/VanishCommand.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java similarity index 94% rename from src/main/java/de/shiewk/smoderation/command/VanishCommand.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java index ec53f08..94984db 100644 --- a/src/main/java/de/shiewk/smoderation/command/VanishCommand.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.command; +package de.shiewk.smoderation.paper.command; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.util.PlayerUtil; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.util.PlayerUtil; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectListIterator; import net.kyori.adventure.text.Component; @@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import static de.shiewk.smoderation.SModeration.*; +import static de.shiewk.smoderation.paper.SModerationPaper.*; import static net.kyori.adventure.text.Component.text; public class VanishCommand implements TabExecutor { @@ -65,7 +65,7 @@ public class VanishCommand implements TabExecutor { final boolean newStatus = !isVanished(player); if (newStatus){ vanishedPlayers.add(player); - for (CommandSender sender : SModeration.container.collectBroadcastTargets()) { + for (CommandSender sender : SModerationPaper.container.collectBroadcastTargets()) { sender.sendMessage(CHAT_PREFIX.append( player.displayName() .colorIfAbsent(SECONDARY_COLOR) diff --git a/src/main/java/de/shiewk/smoderation/config/SModerationConfig.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java similarity index 80% rename from src/main/java/de/shiewk/smoderation/config/SModerationConfig.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java index 3de402b..74278e4 100644 --- a/src/main/java/de/shiewk/smoderation/config/SModerationConfig.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java @@ -1,6 +1,6 @@ -package de.shiewk.smoderation.config; +package de.shiewk.smoderation.paper.config; -import de.shiewk.smoderation.SModeration; +import de.shiewk.smoderation.paper.SModerationPaper; import org.bukkit.configuration.file.FileConfiguration; import java.util.List; @@ -8,9 +8,9 @@ import java.util.List; public class SModerationConfig { private final FileConfiguration config; - private final SModeration plugin; + private final SModerationPaper plugin; - public SModerationConfig(FileConfiguration config, SModeration plugin) { + public SModerationConfig(FileConfiguration config, SModerationPaper plugin) { this.config = config; this.plugin = plugin; } diff --git a/src/main/java/de/shiewk/smoderation/event/PunishmentIssueEvent.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java similarity index 86% rename from src/main/java/de/shiewk/smoderation/event/PunishmentIssueEvent.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java index 53112ab..a00eeb4 100644 --- a/src/main/java/de/shiewk/smoderation/event/PunishmentIssueEvent.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.event; +package de.shiewk.smoderation.paper.event; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.storage.PunishmentContainer; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.storage.PunishmentContainer; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/de/shiewk/smoderation/input/ChatInput.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java similarity index 94% rename from src/main/java/de/shiewk/smoderation/input/ChatInput.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java index 198f079..7fd49f0 100644 --- a/src/main/java/de/shiewk/smoderation/input/ChatInput.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.input; +package de.shiewk.smoderation.paper.input; import net.kyori.adventure.text.Component; import net.kyori.adventure.title.Title; @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; -import static de.shiewk.smoderation.SModeration.CHAT_PREFIX; +import static de.shiewk.smoderation.paper.SModerationPaper.CHAT_PREFIX; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.format.NamedTextColor.GRAY; diff --git a/src/main/java/de/shiewk/smoderation/input/ChatInputListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java similarity index 88% rename from src/main/java/de/shiewk/smoderation/input/ChatInputListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java index 5d48a60..4489820 100644 --- a/src/main/java/de/shiewk/smoderation/input/ChatInputListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.input; +package de.shiewk.smoderation.paper.input; import com.destroystokyo.paper.event.server.ServerTickStartEvent; import io.papermc.paper.event.player.AsyncChatEvent; @@ -7,7 +7,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; -import static de.shiewk.smoderation.input.ChatInput.runningInputs; +import static de.shiewk.smoderation.paper.input.ChatInput.runningInputs; public class ChatInputListener implements Listener { diff --git a/src/main/java/de/shiewk/smoderation/inventory/AutoUpdatingCustomInventory.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java similarity index 61% rename from src/main/java/de/shiewk/smoderation/inventory/AutoUpdatingCustomInventory.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java index e055a3c..609bb5f 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/AutoUpdatingCustomInventory.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java @@ -1,3 +1,3 @@ -package de.shiewk.smoderation.inventory; +package de.shiewk.smoderation.paper.inventory; public interface AutoUpdatingCustomInventory extends CustomInventory { } diff --git a/src/main/java/de/shiewk/smoderation/inventory/ConfirmationInventory.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java similarity index 98% rename from src/main/java/de/shiewk/smoderation/inventory/ConfirmationInventory.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java index c75a919..59b100d 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/ConfirmationInventory.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.inventory; +package de.shiewk.smoderation.paper.inventory; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/de/shiewk/smoderation/inventory/CustomInventory.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java similarity index 94% rename from src/main/java/de/shiewk/smoderation/inventory/CustomInventory.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java index 2d5df48..337b64b 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/CustomInventory.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.inventory; +package de.shiewk.smoderation.paper.inventory; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextDecoration; diff --git a/src/main/java/de/shiewk/smoderation/inventory/InvSeeEquipmentInventory.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java similarity index 94% rename from src/main/java/de/shiewk/smoderation/inventory/InvSeeEquipmentInventory.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java index f208b39..de1f787 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/InvSeeEquipmentInventory.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java @@ -1,6 +1,6 @@ -package de.shiewk.smoderation.inventory; +package de.shiewk.smoderation.paper.inventory; -import de.shiewk.smoderation.SModeration; +import de.shiewk.smoderation.paper.SModerationPaper; import org.bukkit.Bukkit; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryClickEvent; @@ -47,7 +47,7 @@ public class InvSeeEquipmentInventory implements AutoUpdatingCustomInventory { if (viewer.hasPermission("smod.invsee.modify") && !subject.hasPermission("smod.invsee.preventmodify")){ event.setCancelled(false); changing = true; - Bukkit.getScheduler().scheduleSyncDelayedTask(SModeration.PLUGIN, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SModerationPaper.PLUGIN, () -> { changing = false; final EntityEquipment equipment = subject.getEquipment(); equipment.setHelmet(inventory.getItem(0)); diff --git a/src/main/java/de/shiewk/smoderation/inventory/PageableCustomInventory.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java similarity index 97% rename from src/main/java/de/shiewk/smoderation/inventory/PageableCustomInventory.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java index e82f199..2f7ef42 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/PageableCustomInventory.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.inventory; +package de.shiewk.smoderation.paper.inventory; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/de/shiewk/smoderation/inventory/SModMenu.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java similarity index 97% rename from src/main/java/de/shiewk/smoderation/inventory/SModMenu.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java index d5049aa..e6cea26 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/SModMenu.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java @@ -1,11 +1,11 @@ -package de.shiewk.smoderation.inventory; +package de.shiewk.smoderation.paper.inventory; -import de.shiewk.smoderation.input.ChatInput; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.punishments.PunishmentType; -import de.shiewk.smoderation.storage.PunishmentContainer; -import de.shiewk.smoderation.util.PlayerUtil; -import de.shiewk.smoderation.util.TimeUtil; +import de.shiewk.smoderation.paper.input.ChatInput; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.punishments.PunishmentType; +import de.shiewk.smoderation.paper.storage.PunishmentContainer; +import de.shiewk.smoderation.paper.util.PlayerUtil; +import de.shiewk.smoderation.paper.util.TimeUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; @@ -31,7 +31,7 @@ import java.util.List; import java.util.function.Consumer; import java.util.function.Predicate; -import static de.shiewk.smoderation.SModeration.*; +import static de.shiewk.smoderation.paper.SModerationPaper.*; import static net.kyori.adventure.text.Component.text; public class SModMenu extends PageableCustomInventory { @@ -277,7 +277,7 @@ public class SModMenu extends PageableCustomInventory { skullMeta.setOwningPlayer(Bukkit.getOfflinePlayer(punishment.to)); } catch (NullPointerException e) { LOGGER.warn("Player {} has a punishment but was never on this server!", punishment.to); - }; + } } meta.displayName(applyFormatting(text(punishment.type.name).color(NamedTextColor.RED).decorate(TextDecoration.BOLD))); ArrayList lore = new ArrayList<>(); diff --git a/src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java similarity index 88% rename from src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java index 148a857..49da1ab 100644 --- a/src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java @@ -1,8 +1,8 @@ -package de.shiewk.smoderation.listener; +package de.shiewk.smoderation.paper.listener; import com.destroystokyo.paper.event.server.ServerTickEndEvent; -import de.shiewk.smoderation.inventory.AutoUpdatingCustomInventory; -import de.shiewk.smoderation.inventory.CustomInventory; +import de.shiewk.smoderation.paper.inventory.AutoUpdatingCustomInventory; +import de.shiewk.smoderation.paper.inventory.CustomInventory; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java similarity index 95% rename from src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java index 787f96b..43bd6eb 100644 --- a/src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.listener; +package de.shiewk.smoderation.paper.listener; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; diff --git a/src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java similarity index 95% rename from src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java index 0a9d7b9..ee00fd2 100644 --- a/src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.listener; +package de.shiewk.smoderation.paper.listener; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; diff --git a/src/main/java/de/shiewk/smoderation/listener/PunishmentListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java similarity index 78% rename from src/main/java/de/shiewk/smoderation/listener/PunishmentListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java index e5cef23..f68eeae 100644 --- a/src/main/java/de/shiewk/smoderation/listener/PunishmentListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java @@ -1,10 +1,10 @@ -package de.shiewk.smoderation.listener; +package de.shiewk.smoderation.paper.listener; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.event.PunishmentIssueEvent; -import de.shiewk.smoderation.punishments.Punishment; -import de.shiewk.smoderation.punishments.PunishmentType; -import de.shiewk.smoderation.storage.PunishmentContainer; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.event.PunishmentIssueEvent; +import de.shiewk.smoderation.paper.punishments.Punishment; +import de.shiewk.smoderation.paper.punishments.PunishmentType; +import de.shiewk.smoderation.paper.storage.PunishmentContainer; import io.papermc.paper.event.player.AsyncChatEvent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -14,13 +14,13 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.world.WorldSaveEvent; -import static de.shiewk.smoderation.SModeration.CHAT_PREFIX; +import static de.shiewk.smoderation.paper.SModerationPaper.CHAT_PREFIX; public class PunishmentListener implements Listener { @EventHandler(priority = EventPriority.LOW) public void onPlayerLogin(PlayerLoginEvent event){ - Punishment punishment = SModeration.container.find(p -> + Punishment punishment = SModerationPaper.container.find(p -> p.type == PunishmentType.BAN && p.to.equals(event.getPlayer().getUniqueId()) && p.isActive()); @@ -32,7 +32,7 @@ public class PunishmentListener implements Listener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onPlayerChat(AsyncChatEvent event){ final Player player = event.getPlayer(); - final Punishment punishment = SModeration.container.find(p -> + final Punishment punishment = SModerationPaper.container.find(p -> p.type == PunishmentType.MUTE && p.to.equals(player.getUniqueId()) && p.isActive()); @@ -64,7 +64,7 @@ public class PunishmentListener implements Listener { @EventHandler public void onWorldSave(WorldSaveEvent event){ if (event.getWorld().equals(Bukkit.getServer().getWorlds().get(0))){ - SModeration.container.save(SModeration.SAVE_FILE); + SModerationPaper.container.save(SModerationPaper.SAVE_FILE); } } } diff --git a/src/main/java/de/shiewk/smoderation/listener/SocialSpyListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java similarity index 90% rename from src/main/java/de/shiewk/smoderation/listener/SocialSpyListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java index 15aac2b..0e5004a 100644 --- a/src/main/java/de/shiewk/smoderation/listener/SocialSpyListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java @@ -1,6 +1,6 @@ -package de.shiewk.smoderation.listener; +package de.shiewk.smoderation.paper.listener; -import de.shiewk.smoderation.SModeration; +import de.shiewk.smoderation.paper.SModerationPaper; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import org.bukkit.NamespacedKey; import org.bukkit.command.CommandSender; @@ -16,8 +16,8 @@ import org.bukkit.persistence.PersistentDataType; import java.util.List; -import static de.shiewk.smoderation.SModeration.PRIMARY_COLOR; -import static de.shiewk.smoderation.SModeration.SECONDARY_COLOR; +import static de.shiewk.smoderation.paper.SModerationPaper.PRIMARY_COLOR; +import static de.shiewk.smoderation.paper.SModerationPaper.SECONDARY_COLOR; import static net.kyori.adventure.text.Component.text; public class SocialSpyListener implements Listener { @@ -72,7 +72,7 @@ public class SocialSpyListener implements Listener { @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL) public void onPlayerSendCommand(PlayerCommandPreprocessEvent event){ - List ssCommands = SModeration.CONFIG.getSocialSpyCommands(defaultCommands); + List ssCommands = SModerationPaper.CONFIG.getSocialSpyCommands(defaultCommands); final String message = event.getMessage(); if (ssCommands.stream().anyMatch(str -> message.startsWith("/"+str+" ") diff --git a/src/main/java/de/shiewk/smoderation/listener/VanishListener.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java similarity index 83% rename from src/main/java/de/shiewk/smoderation/listener/VanishListener.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java index fa7a596..1ad2030 100644 --- a/src/main/java/de/shiewk/smoderation/listener/VanishListener.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.listener; +package de.shiewk.smoderation.paper.listener; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.command.VanishCommand; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.command.VanishCommand; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -12,7 +12,7 @@ import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import static de.shiewk.smoderation.SModeration.SECONDARY_COLOR; +import static de.shiewk.smoderation.paper.SModerationPaper.SECONDARY_COLOR; import static net.kyori.adventure.text.Component.text; public class VanishListener implements Listener { @@ -24,18 +24,18 @@ public class VanishListener implements Listener { } for (Player vanishedPlayer : VanishCommand.getVanishedPlayers()) { // to clean up visibility status - player.hideEntity(SModeration.PLUGIN, vanishedPlayer); + player.hideEntity(SModerationPaper.PLUGIN, vanishedPlayer); } } @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent event){ - Bukkit.getScheduler().scheduleSyncDelayedTask(SModeration.PLUGIN, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SModerationPaper.PLUGIN, () -> { final Player player = event.getPlayer().getPlayer(); assert player != null; if (player.hasPermission("smod.vanish.see")){ for (Player vanishedPlayer : VanishCommand.getVanishedPlayers()) { // to show visible vanished players - player.showEntity(SModeration.PLUGIN, vanishedPlayer); + player.showEntity(SModerationPaper.PLUGIN, vanishedPlayer); } VanishCommand.listVanishedPlayersTo(player); } diff --git a/src/main/java/de/shiewk/smoderation/punishments/Punishment.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java similarity index 96% rename from src/main/java/de/shiewk/smoderation/punishments/Punishment.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java index 8b086d7..6efe4b0 100644 --- a/src/main/java/de/shiewk/smoderation/punishments/Punishment.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java @@ -1,10 +1,10 @@ -package de.shiewk.smoderation.punishments; +package de.shiewk.smoderation.paper.punishments; -import de.shiewk.smoderation.event.PunishmentIssueEvent; -import de.shiewk.smoderation.storage.PunishmentContainer; -import de.shiewk.smoderation.util.ByteUtil; -import de.shiewk.smoderation.util.PlayerUtil; -import de.shiewk.smoderation.util.TimeUtil; +import de.shiewk.smoderation.paper.event.PunishmentIssueEvent; +import de.shiewk.smoderation.paper.storage.PunishmentContainer; +import de.shiewk.smoderation.paper.util.ByteUtil; +import de.shiewk.smoderation.paper.util.PlayerUtil; +import de.shiewk.smoderation.paper.util.TimeUtil; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -15,7 +15,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.UUID; -import static de.shiewk.smoderation.SModeration.*; +import static de.shiewk.smoderation.paper.SModerationPaper.*; public class Punishment { public static final String DEFAULT_REASON = "No reason provided."; diff --git a/src/main/java/de/shiewk/smoderation/punishments/PunishmentType.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java similarity index 78% rename from src/main/java/de/shiewk/smoderation/punishments/PunishmentType.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java index cc48074..f51a1a8 100644 --- a/src/main/java/de/shiewk/smoderation/punishments/PunishmentType.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.punishments; +package de.shiewk.smoderation.paper.punishments; public enum PunishmentType { MUTE("Mute"), diff --git a/src/main/java/de/shiewk/smoderation/storage/PunishmentContainer.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java similarity index 93% rename from src/main/java/de/shiewk/smoderation/storage/PunishmentContainer.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java index 7c30fb2..01c1608 100644 --- a/src/main/java/de/shiewk/smoderation/storage/PunishmentContainer.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.storage; +package de.shiewk.smoderation.paper.storage; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; import net.kyori.adventure.text.logger.slf4j.ComponentLogger; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -75,7 +75,7 @@ public class PunishmentContainer { } public void load(File file){ - final ComponentLogger logger = SModeration.LOGGER; + final ComponentLogger logger = SModerationPaper.LOGGER; try { logger.info("Loading from {}", file.getPath()); if (!file.isFile()){ @@ -100,7 +100,7 @@ public class PunishmentContainer { } public void save(File file) { - final ComponentLogger logger = SModeration.LOGGER; + final ComponentLogger logger = SModerationPaper.LOGGER; try { logger.info("Saving to {}", file.getPath()); if (!file.isFile()){ diff --git a/src/main/java/de/shiewk/smoderation/util/ByteUtil.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java similarity index 97% rename from src/main/java/de/shiewk/smoderation/util/ByteUtil.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java index 559c371..56a48e0 100644 --- a/src/main/java/de/shiewk/smoderation/util/ByteUtil.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.util; +package de.shiewk.smoderation.paper.util; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/src/main/java/de/shiewk/smoderation/util/PlayerUtil.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java similarity index 89% rename from src/main/java/de/shiewk/smoderation/util/PlayerUtil.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java index fe05416..7be7ff0 100644 --- a/src/main/java/de/shiewk/smoderation/util/PlayerUtil.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java @@ -1,7 +1,7 @@ -package de.shiewk.smoderation.util; +package de.shiewk.smoderation.paper.util; -import de.shiewk.smoderation.SModeration; -import de.shiewk.smoderation.punishments.Punishment; +import de.shiewk.smoderation.paper.SModerationPaper; +import de.shiewk.smoderation.paper.punishments.Punishment; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -34,7 +34,7 @@ public abstract class PlayerUtil { return offlinePlayer.getUniqueId(); } else { // try to find uuid by searching through punishments - final Punishment punishment = SModeration.container.find(p -> offlinePlayerName(p.to).equalsIgnoreCase(name)); + final Punishment punishment = SModerationPaper.container.find(p -> offlinePlayerName(p.to).equalsIgnoreCase(name)); if (punishment != null) { return punishment.to; } diff --git a/src/main/java/de/shiewk/smoderation/util/TimeUtil.java b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java similarity index 99% rename from src/main/java/de/shiewk/smoderation/util/TimeUtil.java rename to smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java index c40a29b..97f2adf 100644 --- a/src/main/java/de/shiewk/smoderation/util/TimeUtil.java +++ b/smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.util; +package de.shiewk.smoderation.paper.util; import org.jetbrains.annotations.Range; diff --git a/src/main/resources/plugin.yml b/smoderation-paper/src/main/resources/plugin.yml similarity index 98% rename from src/main/resources/plugin.yml rename to smoderation-paper/src/main/resources/plugin.yml index 65651c6..a0d7afc 100644 --- a/src/main/resources/plugin.yml +++ b/smoderation-paper/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: SModeration -version: '${version}' -main: de.shiewk.smoderation.SModeration +version: '1.4.1' +main: de.shiewk.smoderation.paper.SModerationPaper api-version: '1.20' load: STARTUP authors: