From 24d5c5ce2d2cbc08226640b6e54d40738a4a2d57 Mon Sep 17 00:00:00 2001 From: JvstvsHD <79066214+JvstvsHD@users.noreply.github.com> Date: Sun, 19 May 2024 20:33:56 +0200 Subject: [PATCH] Rename to Necrify --- .../api/PunishmentException.java | 2 +- .../api/VelocityPunishment.java | 8 ++--- .../duration/AbsolutePunishmentDuration.java | 2 +- .../duration/PermanentPunishmentDuration.java | 2 +- .../api/duration/PunishmentDuration.java | 2 +- .../duration/RelativePunishmentDuration.java | 2 +- .../api/message/MessageProvider.java | 2 +- .../api/punishment/Ban.java | 2 +- .../api/punishment/Kick.java | 6 ++-- .../api/punishment/Mute.java | 2 +- .../api/punishment/Punishment.java | 8 ++--- .../api/punishment/PunishmentManager.java | 6 ++-- .../api/punishment/PunishmentType.java | 2 +- .../punishment/StandardPunishmentType.java | 2 +- .../api/punishment/TemporalPunishment.java | 4 +-- .../api/punishment/util/PlayerResolver.java | 2 +- .../api/punishment/util/ReasonHolder.java | 2 +- .../paper/VelocityPunishmentPaperPlugin.java | 10 +++---- .../paper/listeners/ChatListener.java | 4 +-- .../listeners/MessagingChannelListener.java | 6 ++-- .../paper/listeners/MuteInformation.java | 6 ++-- .../common/plugin/MuteData.java | 2 +- .../common/plugin/Util.java | 2 +- .../MessagingChannelCommunicator.java | 10 +++---- .../NecrifyPlugin.java} | 30 +++++++++---------- .../commands/BanCommand.java | 16 +++++----- .../commands/KickCommand.java | 12 ++++---- .../commands/MuteCommand.java | 20 ++++++------- .../commands/PunishmentCommand.java | 18 +++++------ .../commands/PunishmentRemovalCommand.java | 22 +++++++------- .../commands/TempbanCommand.java | 18 +++++------ .../commands/TempmuteCommand.java | 20 ++++++------- .../commands/WhitelistCommand.java | 10 +++---- .../config/ConfigData.java | 2 +- .../config/ConfigurationManager.java | 2 +- .../config/DataBaseData.java | 2 +- .../impl/AbstractPunishment.java | 8 ++--- .../impl/AbstractTemporalPunishment.java | 18 +++++------ .../impl/DefaultBan.java | 16 +++++----- .../impl/DefaultKick.java | 16 +++++----- .../impl/DefaultMute.java | 18 +++++------ .../impl/DefaultPlayerResolver.java | 6 ++-- .../impl/DefaultPunishmentManager.java | 18 +++++------ .../internal/PunishmentHelper.java | 14 ++++----- .../internal/Util.java | 14 ++++----- .../listener/ConnectListener.java | 22 +++++++------- .../ResourceBundleMessageProvider.java | 12 ++++---- settings.gradle.kts | 2 +- 48 files changed, 216 insertions(+), 216 deletions(-) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/PunishmentException.java (92%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/VelocityPunishment.java (87%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/duration/AbsolutePunishmentDuration.java (98%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/duration/PermanentPunishmentDuration.java (98%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/duration/PunishmentDuration.java (99%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/duration/RelativePunishmentDuration.java (98%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/message/MessageProvider.java (97%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/Ban.java (95%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/Kick.java (91%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/Mute.java (95%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/Punishment.java (94%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/PunishmentManager.java (97%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/PunishmentType.java (97%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/StandardPunishmentType.java (97%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/TemporalPunishment.java (92%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/util/PlayerResolver.java (98%) rename api/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/api/punishment/util/ReasonHolder.java (96%) rename paper-extension/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/paper/VelocityPunishmentPaperPlugin.java (86%) rename paper-extension/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/paper/listeners/ChatListener.java (94%) rename paper-extension/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/paper/listeners/MessagingChannelListener.java (93%) rename paper-extension/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/paper/listeners/MuteInformation.java (93%) rename plugin-common/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/common/plugin/MuteData.java (98%) rename plugin-common/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/common/plugin/Util.java (97%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/MessagingChannelCommunicator.java (94%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment/VelocityPunishmentPlugin.java => necrify/NecrifyPlugin.java} (92%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/BanCommand.java (89%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/KickCommand.java (89%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/MuteCommand.java (87%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/PunishmentCommand.java (93%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/PunishmentRemovalCommand.java (87%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/TempbanCommand.java (89%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/TempmuteCommand.java (88%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/commands/WhitelistCommand.java (96%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/config/ConfigData.java (98%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/config/ConfigurationManager.java (98%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/config/DataBaseData.java (98%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/AbstractPunishment.java (95%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/AbstractTemporalPunishment.java (90%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/DefaultBan.java (89%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/DefaultKick.java (84%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/DefaultMute.java (88%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/DefaultPlayerResolver.java (97%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/impl/DefaultPunishmentManager.java (94%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/internal/PunishmentHelper.java (94%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/internal/Util.java (95%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/listener/ConnectListener.java (90%) rename plugin/src/main/java/de/jvstvshd/{velocitypunishment => necrify}/message/ResourceBundleMessageProvider.java (93%) diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/PunishmentException.java b/api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java similarity index 92% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/PunishmentException.java rename to api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java index 3f7f7f8b..14be6502 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/PunishmentException.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/PunishmentException.java @@ -1,4 +1,4 @@ -package de.jvstvshd.velocitypunishment.api; +package de.jvstvshd.necrify.api; public class PunishmentException extends Exception { diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/VelocityPunishment.java b/api/src/main/java/de/jvstvshd/necrify/api/VelocityPunishment.java similarity index 87% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/VelocityPunishment.java rename to api/src/main/java/de/jvstvshd/necrify/api/VelocityPunishment.java index 9d9aa8ac..60692bc6 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/VelocityPunishment.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/VelocityPunishment.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api; +package de.jvstvshd.necrify.api; import com.velocitypowered.api.proxy.ProxyServer; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.PunishmentManager; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.PunishmentManager; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; import java.util.concurrent.ExecutorService; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/AbsolutePunishmentDuration.java b/api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java similarity index 98% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/AbsolutePunishmentDuration.java rename to api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java index 1050ad7c..32d21752 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/AbsolutePunishmentDuration.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/duration/AbsolutePunishmentDuration.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.duration; +package de.jvstvshd.necrify.api.duration; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/PermanentPunishmentDuration.java b/api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java similarity index 98% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/PermanentPunishmentDuration.java rename to api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java index 5ea0af1d..7051815e 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/PermanentPunishmentDuration.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/duration/PermanentPunishmentDuration.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.duration; +package de.jvstvshd.necrify.api.duration; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/PunishmentDuration.java b/api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java similarity index 99% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/PunishmentDuration.java rename to api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java index 7c58a8ee..f5ae5f96 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/PunishmentDuration.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/duration/PunishmentDuration.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.duration; +package de.jvstvshd.necrify.api.duration; import java.sql.Timestamp; import java.time.Duration; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/RelativePunishmentDuration.java b/api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java similarity index 98% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/RelativePunishmentDuration.java rename to api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java index 3e72931f..855ae6e3 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/duration/RelativePunishmentDuration.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/duration/RelativePunishmentDuration.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.duration; +package de.jvstvshd.necrify.api.duration; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/message/MessageProvider.java b/api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java similarity index 97% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/message/MessageProvider.java rename to api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java index 522bec20..6b0e77a9 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/message/MessageProvider.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/message/MessageProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.message; +package de.jvstvshd.necrify.api.message; import com.velocitypowered.api.command.CommandSource; import net.kyori.adventure.text.Component; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Ban.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java similarity index 95% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Ban.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java index 4cad2b0f..48edb5c9 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Ban.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Ban.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; public interface Ban extends TemporalPunishment { diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Kick.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java similarity index 91% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Kick.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java index 09a67349..9d401bad 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Kick.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Kick.java @@ -22,10 +22,10 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; import net.kyori.adventure.text.Component; import java.util.concurrent.CompletableFuture; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Mute.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java similarity index 95% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Mute.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java index fbe8efa5..f7cb5045 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Mute.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Mute.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; public interface Mute extends TemporalPunishment { diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Punishment.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java similarity index 94% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Punishment.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java index 7ea7db13..fa0d6c5b 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/Punishment.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/Punishment.java @@ -22,11 +22,11 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.punishment.util.ReasonHolder; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.punishment.util.ReasonHolder; import net.kyori.adventure.text.Component; import java.time.LocalDateTime; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/PunishmentManager.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java similarity index 97% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/PunishmentManager.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java index 970e9f16..c649e24a 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/PunishmentManager.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentManager.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; import net.kyori.adventure.text.Component; import java.util.List; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/PunishmentType.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java similarity index 97% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/PunishmentType.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java index 2bff850f..8b7fd41b 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/PunishmentType.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/PunishmentType.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; public interface PunishmentType { diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/StandardPunishmentType.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java similarity index 97% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/StandardPunishmentType.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java index 4b47448e..f216bb7a 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/StandardPunishmentType.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/StandardPunishmentType.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; public enum StandardPunishmentType implements PunishmentType { diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/TemporalPunishment.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java similarity index 92% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/TemporalPunishment.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java index 6c232df5..4f298d00 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/TemporalPunishment.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/TemporalPunishment.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment; +package de.jvstvshd.necrify.api.punishment; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; /** * An interface containing some methods to only punish a player for a defined duration. diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/util/PlayerResolver.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java similarity index 98% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/util/PlayerResolver.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java index 3aa3216e..8506ef50 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/util/PlayerResolver.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/util/PlayerResolver.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment.util; +package de.jvstvshd.necrify.api.punishment.util; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/util/ReasonHolder.java b/api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java similarity index 96% rename from api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/util/ReasonHolder.java rename to api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java index 74c4ee26..4b9b5e0e 100644 --- a/api/src/main/java/de/jvstvshd/velocitypunishment/api/punishment/util/ReasonHolder.java +++ b/api/src/main/java/de/jvstvshd/necrify/api/punishment/util/ReasonHolder.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.api.punishment.util; +package de.jvstvshd.necrify.api.punishment.util; import com.velocitypowered.api.command.CommandSource; import net.kyori.adventure.text.Component; diff --git a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/VelocityPunishmentPaperPlugin.java b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/VelocityPunishmentPaperPlugin.java similarity index 86% rename from paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/VelocityPunishmentPaperPlugin.java rename to paper-extension/src/main/java/de/jvstvshd/necrify/paper/VelocityPunishmentPaperPlugin.java index 070105ae..90f354e7 100644 --- a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/VelocityPunishmentPaperPlugin.java +++ b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/VelocityPunishmentPaperPlugin.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.paper; +package de.jvstvshd.necrify.paper; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; -import de.jvstvshd.velocitypunishment.paper.listeners.ChatListener; -import de.jvstvshd.velocitypunishment.paper.listeners.MessagingChannelListener; -import de.jvstvshd.velocitypunishment.paper.listeners.MuteInformation; +import de.jvstvshd.necrify.common.plugin.MuteData; +import de.jvstvshd.necrify.paper.listeners.ChatListener; +import de.jvstvshd.necrify.paper.listeners.MessagingChannelListener; +import de.jvstvshd.necrify.paper.listeners.MuteInformation; import org.bukkit.plugin.java.JavaPlugin; import java.util.ArrayList; diff --git a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/ChatListener.java b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java similarity index 94% rename from paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/ChatListener.java rename to paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java index 55dee60b..320f6938 100644 --- a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/ChatListener.java +++ b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/ChatListener.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.paper.listeners; +package de.jvstvshd.necrify.paper.listeners; -import de.jvstvshd.velocitypunishment.paper.VelocityPunishmentPaperPlugin; +import de.jvstvshd.necrify.paper.VelocityPunishmentPaperPlugin; import io.papermc.paper.event.player.AsyncChatEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/MessagingChannelListener.java b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java similarity index 93% rename from paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/MessagingChannelListener.java rename to paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java index 9d29a387..a76f2f6f 100644 --- a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/MessagingChannelListener.java +++ b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MessagingChannelListener.java @@ -22,12 +22,12 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.paper.listeners; +package de.jvstvshd.necrify.paper.listeners; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.io.ByteStreams; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; -import de.jvstvshd.velocitypunishment.paper.VelocityPunishmentPaperPlugin; +import de.jvstvshd.necrify.common.plugin.MuteData; +import de.jvstvshd.necrify.paper.VelocityPunishmentPaperPlugin; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; import org.jetbrains.annotations.NotNull; diff --git a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/MuteInformation.java b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java similarity index 93% rename from paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/MuteInformation.java rename to paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java index 7704ba2b..bae4949b 100644 --- a/paper-extension/src/main/java/de/jvstvshd/velocitypunishment/paper/listeners/MuteInformation.java +++ b/paper-extension/src/main/java/de/jvstvshd/necrify/paper/listeners/MuteInformation.java @@ -22,10 +22,10 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.paper.listeners; +package de.jvstvshd.necrify.paper.listeners; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.common.plugin.MuteData; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.Bukkit; diff --git a/plugin-common/src/main/java/de/jvstvshd/velocitypunishment/common/plugin/MuteData.java b/plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java similarity index 98% rename from plugin-common/src/main/java/de/jvstvshd/velocitypunishment/common/plugin/MuteData.java rename to plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java index 8f576585..3923e7a4 100644 --- a/plugin-common/src/main/java/de/jvstvshd/velocitypunishment/common/plugin/MuteData.java +++ b/plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/MuteData.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.common.plugin; +package de.jvstvshd.necrify.common.plugin; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/plugin-common/src/main/java/de/jvstvshd/velocitypunishment/common/plugin/Util.java b/plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java similarity index 97% rename from plugin-common/src/main/java/de/jvstvshd/velocitypunishment/common/plugin/Util.java rename to plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java index 364d6eba..dad8d4ae 100644 --- a/plugin-common/src/main/java/de/jvstvshd/velocitypunishment/common/plugin/Util.java +++ b/plugin-common/src/main/java/de/jvstvshd/necrify/common/plugin/Util.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.common.plugin; +package de.jvstvshd.necrify.common.plugin; import java.util.UUID; import java.util.concurrent.Callable; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/MessagingChannelCommunicator.java b/plugin/src/main/java/de/jvstvshd/necrify/MessagingChannelCommunicator.java similarity index 94% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/MessagingChannelCommunicator.java rename to plugin/src/main/java/de/jvstvshd/necrify/MessagingChannelCommunicator.java index 9d9ea086..c413372f 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/MessagingChannelCommunicator.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/MessagingChannelCommunicator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment; +package de.jvstvshd.necrify; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.io.ByteStreams; @@ -31,9 +31,9 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.jvstvshd.velocitypunishment.api.punishment.Mute; -import de.jvstvshd.velocitypunishment.api.punishment.util.ReasonHolder; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; +import de.jvstvshd.necrify.api.punishment.Mute; +import de.jvstvshd.necrify.api.punishment.util.ReasonHolder; +import de.jvstvshd.necrify.common.plugin.MuteData; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.slf4j.Logger; @@ -121,7 +121,7 @@ public void onChooseInitialServer(ServerPostConnectEvent event) { } private boolean sendMessage(RegisteredServer server, MuteData muteData) throws JsonProcessingException { - return server.sendPluginMessage(VelocityPunishmentPlugin.MUTE_DATA_CHANNEL_IDENTIFIER, serializeMuteData(muteData)); + return server.sendPluginMessage(NecrifyPlugin.MUTE_DATA_CHANNEL_IDENTIFIER, serializeMuteData(muteData)); } diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/VelocityPunishmentPlugin.java b/plugin/src/main/java/de/jvstvshd/necrify/NecrifyPlugin.java similarity index 92% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/VelocityPunishmentPlugin.java rename to plugin/src/main/java/de/jvstvshd/necrify/NecrifyPlugin.java index 47937a15..0a1b73a8 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/VelocityPunishmentPlugin.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/NecrifyPlugin.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment; +package de.jvstvshd.necrify; import com.google.inject.Inject; import com.velocitypowered.api.command.CommandManager; @@ -43,17 +43,17 @@ import de.chojo.sadu.jdbc.RemoteJdbcConfig; import de.chojo.sadu.updater.SqlUpdater; import de.chojo.sadu.wrapper.QueryBuilderConfig; -import de.jvstvshd.velocitypunishment.api.VelocityPunishment; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.PunishmentManager; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; -import de.jvstvshd.velocitypunishment.commands.*; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; -import de.jvstvshd.velocitypunishment.config.ConfigurationManager; -import de.jvstvshd.velocitypunishment.impl.DefaultPlayerResolver; -import de.jvstvshd.velocitypunishment.impl.DefaultPunishmentManager; -import de.jvstvshd.velocitypunishment.listener.ConnectListener; -import de.jvstvshd.velocitypunishment.message.ResourceBundleMessageProvider; +import de.jvstvshd.necrify.api.VelocityPunishment; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.PunishmentManager; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.commands.*; +import de.jvstvshd.necrify.common.plugin.MuteData; +import de.jvstvshd.necrify.config.ConfigurationManager; +import de.jvstvshd.necrify.impl.DefaultPlayerResolver; +import de.jvstvshd.necrify.impl.DefaultPunishmentManager; +import de.jvstvshd.necrify.listener.ConnectListener; +import de.jvstvshd.necrify.message.ResourceBundleMessageProvider; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; @@ -67,7 +67,7 @@ import java.util.concurrent.Executors; @Plugin(id = "velocity-punishment", name = "Velocity Punishment Plugin", version = "1.0.0-SNAPSHOT", description = "A simple punishment plugin for Velocity", authors = {"JvstvsHD"}) -public class VelocityPunishmentPlugin implements VelocityPunishment { +public class NecrifyPlugin implements VelocityPunishment { private final ProxyServer server; private final Logger logger; @@ -96,7 +96,7 @@ public class VelocityPunishmentPlugin implements VelocityPunishment { public static final Component MUTES_DISABLED = Component.text(MUTES_DISABLED_STRING); @Inject - public VelocityPunishmentPlugin(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { + public NecrifyPlugin(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { this.server = server; this.logger = logger; this.configurationManager = new ConfigurationManager(dataDirectory.resolve("config.yml")); @@ -127,7 +127,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) { logger.error("Could not create table velocity_punishment in database {}", dataSource.getDataSourceProperties().get("dataSource.databaseName"), e); } setup(server.getCommandManager(), server.getEventManager()); - logger.info("Velocity Punishment Plugin v1.0.0 has been loaded"); + logger.info("Velocity Punishment Plugin v1.2.0-SNAPSHOT has been loaded"); } private void setup(CommandManager commandManager, EventManager eventManager) { diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/BanCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/BanCommand.java similarity index 89% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/BanCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/BanCommand.java index 3c001679..5d0bf7da 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/BanCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/BanCommand.java @@ -22,31 +22,31 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; -import static de.jvstvshd.velocitypunishment.internal.Util.copyComponent; +import static de.jvstvshd.necrify.internal.Util.copyComponent; public class BanCommand { - public static BrigadierCommand banCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand banCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("ban", "velocitypunishment.command.ban") .then(Util.playerArgument(plugin.getServer()).executes(context -> execute(context, plugin)) .then(Util.reasonArgument.executes(context -> execute(context, plugin)))); return new BrigadierCommand(node); } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { var source = context.getSource(); var player = context.getArgument("player", String.class); var reason = PunishmentHelper.parseReason(context); diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/KickCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/KickCommand.java similarity index 89% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/KickCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/KickCommand.java index fad27e90..706a27be 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/KickCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/KickCommand.java @@ -22,16 +22,16 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -39,14 +39,14 @@ public class KickCommand { - public static BrigadierCommand kickCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand kickCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("kick", "velocitypunishment.command.kick") .then(Util.playerArgument(plugin.getServer()).executes(context -> execute(context, plugin)) .then(Util.reasonArgument.executes(context -> execute(context, plugin)))); return new BrigadierCommand(node); } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { var source = context.getSource(); var playerArgument = context.getArgument("player", String.class); Optional playerOptional = plugin.getServer().getPlayer(playerArgument); diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/MuteCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/MuteCommand.java similarity index 87% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/MuteCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/MuteCommand.java index 3b7e10bd..1ff09fd1 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/MuteCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/MuteCommand.java @@ -22,37 +22,37 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; -import static de.jvstvshd.velocitypunishment.internal.Util.copyComponent; +import static de.jvstvshd.necrify.internal.Util.copyComponent; /** - * @see VelocityPunishmentPlugin#MUTES_DISABLED + * @see NecrifyPlugin#MUTES_DISABLED */ public class MuteCommand { - public static BrigadierCommand muteCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand muteCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("mute", "velocitypunishment.command.mute") .then(Util.playerArgument(plugin.getServer()).executes(context -> execute(context, plugin)) .then(Util.reasonArgument.executes(context -> execute(context, plugin)))); return new BrigadierCommand(node); } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { CommandSource source = context.getSource(); - source.sendMessage(VelocityPunishmentPlugin.MUTES_DISABLED); + source.sendMessage(NecrifyPlugin.MUTES_DISABLED); var player = context.getArgument("player", String.class); var playerResolver = plugin.getPlayerResolver(); var punishmentManager = plugin.getPunishmentManager(); diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/PunishmentCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/PunishmentCommand.java similarity index 93% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/PunishmentCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/PunishmentCommand.java index 8a862748..706ee480 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/PunishmentCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/PunishmentCommand.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.google.common.collect.ImmutableList; import com.mojang.brigadier.Command; @@ -32,11 +32,11 @@ import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; @@ -51,7 +51,7 @@ public class PunishmentCommand { private final static List PUNISHMENT_OPTIONS = ImmutableList.of("cancel", "remove", "info", "change"); - public static BrigadierCommand punishmentCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand punishmentCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("punishment", "velocitypunishment.command.punishment") .then(LiteralArgumentBuilder.literal("playerinfo") .then(Util.punishmentRemoveArgument(plugin).executes(context -> executePlayerInfo(context, plugin)))) @@ -63,7 +63,7 @@ public static BrigadierCommand punishmentCommand(VelocityPunishmentPlugin plugin return new BrigadierCommand(node); } - private static int executePlayerInfo(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int executePlayerInfo(CommandContext context, NecrifyPlugin plugin) { CommandSource source = context.getSource(); var punishmentManager = plugin.getPunishmentManager(); PunishmentHelper.getPlayerUuid(context, plugin).whenCompleteAsync((uuid, throwable) -> { @@ -87,7 +87,7 @@ private static int executePlayerInfo(CommandContext context, Velo return Command.SINGLE_SUCCESS; } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { var source = context.getSource(); var uuidString = context.getArgument("punishment ID", String.class); UUID uuid; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/PunishmentRemovalCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/PunishmentRemovalCommand.java similarity index 87% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/PunishmentRemovalCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/PunishmentRemovalCommand.java index 3e60950d..487ef5dc 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/PunishmentRemovalCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/PunishmentRemovalCommand.java @@ -22,19 +22,19 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.PunishmentType; -import de.jvstvshd.velocitypunishment.api.punishment.StandardPunishmentType; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.PunishmentType; +import de.jvstvshd.necrify.api.punishment.StandardPunishmentType; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; @@ -45,19 +45,19 @@ public class PunishmentRemovalCommand { - public static BrigadierCommand unmuteCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand unmuteCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("unmute", "velocitypunishment.command.unmute") .then(Util.punishmentRemoveArgument(plugin).executes(context -> execute(context, plugin, "unmute", StandardPunishmentType.MUTE, StandardPunishmentType.PERMANENT_MUTE))); return new BrigadierCommand(node); } - public static BrigadierCommand unbanCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand unbanCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("unban", "velocitypunishment.command.unban") .then(Util.punishmentRemoveArgument(plugin).executes(context -> execute(context, plugin, "unban", StandardPunishmentType.BAN, StandardPunishmentType.PERMANENT_BAN))); return new BrigadierCommand(node); } - public static int execute(CommandContext context, VelocityPunishmentPlugin plugin, String commandName, PunishmentType... types) { + public static int execute(CommandContext context, NecrifyPlugin plugin, String commandName, PunishmentType... types) { var source = context.getSource(); PunishmentHelper.getPlayerUuid(context, plugin).whenCompleteAsync((uuid, throwable) -> { if (Util.sendErrorMessageIfErrorOccurred(context, uuid, throwable, plugin)) return; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/TempbanCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/TempbanCommand.java similarity index 89% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/TempbanCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/TempbanCommand.java index fb2e5246..5148b770 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/TempbanCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/TempbanCommand.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; @@ -41,12 +41,12 @@ import java.time.format.DateTimeFormatter; import java.util.Optional; -import static de.jvstvshd.velocitypunishment.internal.Util.copyComponent; +import static de.jvstvshd.necrify.internal.Util.copyComponent; public class TempbanCommand { - public static BrigadierCommand tempbanCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand tempbanCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("tempban", "velocitypunishment.command.tempban") .then(Util.playerArgument(plugin.getServer()) .then(Util.durationArgument.executes(context -> execute(context, plugin)) @@ -54,7 +54,7 @@ public static BrigadierCommand tempbanCommand(VelocityPunishmentPlugin plugin) { return new BrigadierCommand(node); } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { CommandSource source = context.getSource(); var player = context.getArgument("player", String.class); plugin.getPlayerResolver().getOrQueryPlayerUuid(player, plugin.getService()).whenCompleteAsync((uuid, throwable) -> { diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/TempmuteCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/TempmuteCommand.java similarity index 88% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/TempmuteCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/TempmuteCommand.java index 26dc5e6f..1ad60f64 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/TempmuteCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/TempmuteCommand.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.internal.PunishmentHelper; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.internal.PunishmentHelper; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; @@ -41,14 +41,14 @@ import java.time.format.DateTimeFormatter; import java.util.Optional; -import static de.jvstvshd.velocitypunishment.internal.Util.copyComponent; +import static de.jvstvshd.necrify.internal.Util.copyComponent; /** - * @see VelocityPunishmentPlugin#MUTES_DISABLED + * @see NecrifyPlugin#MUTES_DISABLED */ public class TempmuteCommand { - public static BrigadierCommand tempmuteCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand tempmuteCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("tempmute", "velocitypunishment.command.tempmute") .then(Util.playerArgument(plugin.getServer()) .then(Util.durationArgument.executes(context -> execute(context, plugin)) @@ -56,7 +56,7 @@ public static BrigadierCommand tempmuteCommand(VelocityPunishmentPlugin plugin) return new BrigadierCommand(node); } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { CommandSource source = context.getSource(); var player = context.getArgument("player", String.class); plugin.getPlayerResolver().getOrQueryPlayerUuid(player, plugin.getService()).whenCompleteAsync((uuid, throwable) -> { diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/WhitelistCommand.java b/plugin/src/main/java/de/jvstvshd/necrify/commands/WhitelistCommand.java similarity index 96% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/WhitelistCommand.java rename to plugin/src/main/java/de/jvstvshd/necrify/commands/WhitelistCommand.java index 1db4b697..cf5f2366 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/commands/WhitelistCommand.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/commands/WhitelistCommand.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.commands; +package de.jvstvshd.necrify.commands; import com.google.common.collect.ImmutableList; import com.mojang.brigadier.Command; @@ -33,8 +33,8 @@ import com.velocitypowered.api.command.CommandSource; import de.chojo.sadu.wrapper.QueryBuilder; import de.chojo.sadu.wrapper.QueryBuilderConfig; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -47,7 +47,7 @@ public class WhitelistCommand { public static final List options = ImmutableList.of("add", "remove", "on", "off"); - public static BrigadierCommand whitelistCommand(VelocityPunishmentPlugin plugin) { + public static BrigadierCommand whitelistCommand(NecrifyPlugin plugin) { var node = Util.permissibleCommand("whitelist", "velocitypunishment.command.whitelist") .then(RequiredArgumentBuilder.argument("option", StringArgumentType.word()) .executes(context -> execute(context, plugin)) @@ -64,7 +64,7 @@ public static BrigadierCommand whitelistCommand(VelocityPunishmentPlugin plugin) return new BrigadierCommand(node); } - private static int execute(CommandContext context, VelocityPunishmentPlugin plugin) { + private static int execute(CommandContext context, NecrifyPlugin plugin) { var source = context.getSource(); String player; if (context.getArguments().containsKey("player")) { diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/config/ConfigData.java b/plugin/src/main/java/de/jvstvshd/necrify/config/ConfigData.java similarity index 98% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/config/ConfigData.java rename to plugin/src/main/java/de/jvstvshd/necrify/config/ConfigData.java index 48b55699..83708a9e 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/config/ConfigData.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/config/ConfigData.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.config; +package de.jvstvshd.necrify.config; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/config/ConfigurationManager.java b/plugin/src/main/java/de/jvstvshd/necrify/config/ConfigurationManager.java similarity index 98% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/config/ConfigurationManager.java rename to plugin/src/main/java/de/jvstvshd/necrify/config/ConfigurationManager.java index 0853fdfd..63654a2c 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/config/ConfigurationManager.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/config/ConfigurationManager.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.config; +package de.jvstvshd.necrify.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/config/DataBaseData.java b/plugin/src/main/java/de/jvstvshd/necrify/config/DataBaseData.java similarity index 98% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/config/DataBaseData.java rename to plugin/src/main/java/de/jvstvshd/necrify/config/DataBaseData.java index 1018667e..bd10d01b 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/config/DataBaseData.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/config/DataBaseData.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.config; +package de.jvstvshd.necrify.config; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/AbstractPunishment.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/AbstractPunishment.java similarity index 95% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/AbstractPunishment.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/AbstractPunishment.java index 95403e73..7defde5e 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/AbstractPunishment.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/AbstractPunishment.java @@ -22,13 +22,13 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; import de.chojo.sadu.base.QueryFactory; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/AbstractTemporalPunishment.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/AbstractTemporalPunishment.java similarity index 90% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/AbstractTemporalPunishment.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/AbstractTemporalPunishment.java index cf560163..996bf492 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/AbstractTemporalPunishment.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/AbstractTemporalPunishment.java @@ -22,16 +22,16 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.StandardPunishmentType; -import de.jvstvshd.velocitypunishment.api.punishment.TemporalPunishment; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.StandardPunishmentType; +import de.jvstvshd.necrify.api.punishment.TemporalPunishment; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.common.plugin.MuteData; import net.kyori.adventure.text.Component; import javax.sql.DataSource; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultBan.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultBan.java similarity index 89% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultBan.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultBan.java index 53438bbb..2e17679f 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultBan.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultBan.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Ban; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.StandardPunishmentType; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Ban; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.StandardPunishmentType; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultKick.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultKick.java similarity index 84% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultKick.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultKick.java index e4be1885..5daf7e73 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultKick.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultKick.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Kick; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.PunishmentType; -import de.jvstvshd.velocitypunishment.api.punishment.StandardPunishmentType; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Kick; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.PunishmentType; +import de.jvstvshd.necrify.api.punishment.StandardPunishmentType; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; import net.kyori.adventure.text.Component; import javax.sql.DataSource; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultMute.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultMute.java similarity index 88% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultMute.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultMute.java index 5067e873..8edef36c 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultMute.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultMute.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; import com.velocitypowered.api.command.CommandSource; -import de.jvstvshd.velocitypunishment.api.PunishmentException; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Mute; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.StandardPunishmentType; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; +import de.jvstvshd.necrify.api.PunishmentException; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Mute; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.StandardPunishmentType; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.common.plugin.MuteData; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultPlayerResolver.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultPlayerResolver.java similarity index 97% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultPlayerResolver.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultPlayerResolver.java index a1031957..df7f351d 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultPlayerResolver.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultPlayerResolver.java @@ -22,14 +22,14 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import de.jvstvshd.velocitypunishment.api.punishment.util.PlayerResolver; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.api.punishment.util.PlayerResolver; +import de.jvstvshd.necrify.internal.Util; import org.jetbrains.annotations.NotNull; import java.net.URI; diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultPunishmentManager.java b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultPunishmentManager.java similarity index 94% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultPunishmentManager.java rename to plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultPunishmentManager.java index fc90d927..39d738a2 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/impl/DefaultPunishmentManager.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/impl/DefaultPunishmentManager.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.impl; +package de.jvstvshd.necrify.impl; import com.google.common.collect.ImmutableList; import com.velocitypowered.api.proxy.ProxyServer; import com.zaxxer.hikari.HikariDataSource; import de.chojo.sadu.base.QueryFactory; import de.chojo.sadu.wrapper.util.Row; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.punishment.*; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.punishment.*; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; @@ -44,7 +44,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static de.jvstvshd.velocitypunishment.internal.Util.executeAsync; +import static de.jvstvshd.necrify.internal.Util.executeAsync; public class DefaultPunishmentManager extends QueryFactory implements PunishmentManager { @@ -54,9 +54,9 @@ public class DefaultPunishmentManager extends QueryFactory implements Punishment private final ProxyServer proxyServer; private final HikariDataSource dataSource; private final ExecutorService service = Executors.newCachedThreadPool(); - private final VelocityPunishmentPlugin plugin; + private final NecrifyPlugin plugin; - public DefaultPunishmentManager(ProxyServer proxyServer, HikariDataSource dataSource, VelocityPunishmentPlugin plugin) { + public DefaultPunishmentManager(ProxyServer proxyServer, HikariDataSource dataSource, NecrifyPlugin plugin) { super(dataSource); this.proxyServer = proxyServer; this.dataSource = dataSource; @@ -161,7 +161,7 @@ public ProxyServer getServer() { return proxyServer; } - public VelocityPunishmentPlugin plugin() { + public NecrifyPlugin plugin() { return plugin; } diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/internal/PunishmentHelper.java b/plugin/src/main/java/de/jvstvshd/necrify/internal/PunishmentHelper.java similarity index 94% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/internal/PunishmentHelper.java rename to plugin/src/main/java/de/jvstvshd/necrify/internal/PunishmentHelper.java index b81620ba..860d3619 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/internal/PunishmentHelper.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/internal/PunishmentHelper.java @@ -22,17 +22,17 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.internal; +package de.jvstvshd.necrify.internal; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.SimpleCommand; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.duration.PunishmentDuration; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.TemporalPunishment; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.duration.PunishmentDuration; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.TemporalPunishment; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; @@ -123,7 +123,7 @@ public static TextComponent parseComponent(int startIndex, SimpleCommand.Invocat return LegacyComponentSerializer.legacyAmpersand().deserialize(builder.toString()); } - public static CompletableFuture getPlayerUuid(CommandContext context, VelocityPunishmentPlugin plugin) { + public static CompletableFuture getPlayerUuid(CommandContext context, NecrifyPlugin plugin) { var argument = context.getArgument("player", String.class); if (argument.length() <= 16) { return plugin.getPlayerResolver().getOrQueryPlayerUuid(argument, plugin.getService()); diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/internal/Util.java b/plugin/src/main/java/de/jvstvshd/necrify/internal/Util.java similarity index 95% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/internal/Util.java rename to plugin/src/main/java/de/jvstvshd/necrify/internal/Util.java index dfb5e20a..fbc310b9 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/internal/Util.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/internal/Util.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.internal; +package de.jvstvshd.necrify.internal; import com.google.common.collect.ImmutableList; import com.mojang.brigadier.arguments.StringArgumentType; @@ -36,10 +36,10 @@ import com.velocitypowered.api.proxy.ProxyServer; import de.chojo.sadu.wrapper.QueryBuilder; import de.chojo.sadu.wrapper.QueryBuilderConfig; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.TemporalPunishment; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.TemporalPunishment; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.event.ClickEvent; @@ -73,7 +73,7 @@ public static RequiredArgumentBuilder playerArgument(Prox }); } - public static RequiredArgumentBuilder punishmentRemoveArgument(VelocityPunishmentPlugin plugin) { + public static RequiredArgumentBuilder punishmentRemoveArgument(NecrifyPlugin plugin) { return RequiredArgumentBuilder.argument("player", StringArgumentType.word()).suggests((context, builder) -> Util.executeAsync(() -> { var input = builder.getRemainingLowerCase(); if (input.isBlank() || input.length() <= 2) return builder.build(); @@ -147,7 +147,7 @@ public static UUID trimmedUuid(UUID origin) { return UUID.fromString(trimUuid(origin)); } - public static boolean sendErrorMessageIfErrorOccurred(CommandContext context, UUID uuid, Throwable throwable, VelocityPunishmentPlugin plugin) { + public static boolean sendErrorMessageIfErrorOccurred(CommandContext context, UUID uuid, Throwable throwable, NecrifyPlugin plugin) { var source = context.getSource(); var player = context.getArgument("player", String.class); if (throwable != null) { diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/listener/ConnectListener.java b/plugin/src/main/java/de/jvstvshd/necrify/listener/ConnectListener.java similarity index 90% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/listener/ConnectListener.java rename to plugin/src/main/java/de/jvstvshd/necrify/listener/ConnectListener.java index bbdc26e7..7764ad45 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/listener/ConnectListener.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/listener/ConnectListener.java @@ -22,20 +22,20 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.listener; +package de.jvstvshd.necrify.listener; import com.velocitypowered.api.event.ResultedEvent; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.LoginEvent; import com.velocitypowered.api.proxy.ProxyServer; import de.chojo.sadu.base.QueryFactory; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.punishment.Ban; -import de.jvstvshd.velocitypunishment.api.punishment.Mute; -import de.jvstvshd.velocitypunishment.api.punishment.Punishment; -import de.jvstvshd.velocitypunishment.api.punishment.StandardPunishmentType; -import de.jvstvshd.velocitypunishment.common.plugin.MuteData; -import de.jvstvshd.velocitypunishment.internal.Util; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.punishment.Ban; +import de.jvstvshd.necrify.api.punishment.Mute; +import de.jvstvshd.necrify.api.punishment.Punishment; +import de.jvstvshd.necrify.api.punishment.StandardPunishmentType; +import de.jvstvshd.necrify.common.plugin.MuteData; +import de.jvstvshd.necrify.internal.Util; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -46,11 +46,11 @@ import java.util.concurrent.TimeUnit; public final class ConnectListener extends QueryFactory { - private final VelocityPunishmentPlugin plugin; + private final NecrifyPlugin plugin; private final ExecutorService service; private final ProxyServer proxyServer; - public ConnectListener(VelocityPunishmentPlugin plugin, + public ConnectListener(NecrifyPlugin plugin, ExecutorService service, ProxyServer proxyServer) { super(plugin.getDataSource()); this.plugin = plugin; @@ -119,7 +119,7 @@ public void onConnect(LoginEvent event) throws Exception { } } - public VelocityPunishmentPlugin plugin() { + public NecrifyPlugin plugin() { return plugin; } diff --git a/plugin/src/main/java/de/jvstvshd/velocitypunishment/message/ResourceBundleMessageProvider.java b/plugin/src/main/java/de/jvstvshd/necrify/message/ResourceBundleMessageProvider.java similarity index 93% rename from plugin/src/main/java/de/jvstvshd/velocitypunishment/message/ResourceBundleMessageProvider.java rename to plugin/src/main/java/de/jvstvshd/necrify/message/ResourceBundleMessageProvider.java index b925434c..0ef6067b 100644 --- a/plugin/src/main/java/de/jvstvshd/velocitypunishment/message/ResourceBundleMessageProvider.java +++ b/plugin/src/main/java/de/jvstvshd/necrify/message/ResourceBundleMessageProvider.java @@ -22,13 +22,13 @@ * SOFTWARE. */ -package de.jvstvshd.velocitypunishment.message; +package de.jvstvshd.necrify.message; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import de.jvstvshd.velocitypunishment.VelocityPunishmentPlugin; -import de.jvstvshd.velocitypunishment.api.message.MessageProvider; -import de.jvstvshd.velocitypunishment.config.ConfigData; +import de.jvstvshd.necrify.NecrifyPlugin; +import de.jvstvshd.necrify.api.message.MessageProvider; +import de.jvstvshd.necrify.config.ConfigData; import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -75,14 +75,14 @@ public class ResourceBundleMessageProvider implements MessageProvider { } }); ResourceBundleMessageProvider.bundles = Collections.unmodifiableList(bundles); - try (JarFile jar = new JarFile(new File(VelocityPunishmentPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) { + try (JarFile jar = new JarFile(new File(NecrifyPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) { for (JarEntry translationEntry : jar.stream().filter(jarEntry -> jarEntry.getName().toLowerCase().contains("translations") && !jarEntry.isDirectory()).toList()) { var path = Path.of(baseDir.toString(), translationEntry.getName().split("/")[1]); if (Files.exists(path)) { continue; } System.out.println("copying translation file " + translationEntry.getName()); - Files.copy(Objects.requireNonNull(VelocityPunishmentPlugin.class.getResourceAsStream("/" + translationEntry.getName())), path); + Files.copy(Objects.requireNonNull(NecrifyPlugin.class.getResourceAsStream("/" + translationEntry.getName())), path); } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index c6a568d5..55dab6cb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "velocity-punishment" +rootProject.name = "necrify" include("api") include("plugin") include("paper-extension")