Shiewk/SModeration
1
Fork 0
mirror of https://github.com/Shiewk/SModeration.git synced 2026-04-28 05:54:16 +02:00
Code Issues Activity

move SModeration for Paper to subproject

Browse Source
This commit is contained in:
Shy
2024-12-19 15:59:20 +01:00
parent 1f9758f3d0
commit 2f66c6f12c
38 changed files with 176 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+3 -13
View File
@@ -5,7 +5,8 @@ plugins {
group = 'de.shiewk'
version = pluginVersion
repositories {
subprojects {
repositories {
mavenCentral()
maven {
name = "papermc-repo"
@@ -15,11 +16,9 @@ repositories {
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 {
@@ -38,12 +37,3 @@ tasks.withType(JavaCompile).configureEach {
options.release.set(targetJavaVersion)
}
}
processResources {
def props = [version: version]
inputs.properties props
filteringCharset 'UTF-8'
filesMatching('plugin.yml') {
expand props
}
}
settings.gradle
+1
View File
@@ -1 +1,2 @@
rootProject.name = 'SModeration'
include 'smoderation-paper'
smoderation-paper/build.gradle
+19
View File
@@ -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
}
}
src/main/java/de/shiewk/smoderation/SModeration.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/SModerationPaper.java
+11 -11
View File
@@ -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)){
src/main/java/de/shiewk/smoderation/command/BanCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/BanCommand.java
+6 -6
View File
@@ -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;
}
}
src/main/java/de/shiewk/smoderation/command/EnderchestSeeCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/EnderchestSeeCommand.java
+3 -3
View File
@@ -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 {
src/main/java/de/shiewk/smoderation/command/InvseeCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/InvseeCommand.java
+4 -4
View File
@@ -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 {
src/main/java/de/shiewk/smoderation/command/KickCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/KickCommand.java
+5 -5
View File
@@ -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;
}
}
src/main/java/de/shiewk/smoderation/command/ModLogsCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/ModLogsCommand.java
+8 -8
View File
@@ -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<Punishment> punishments = SModeration.container.findAll(p -> p.to.equals(finalUuid) && p.isActive());
final List<Punishment> 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))
src/main/java/de/shiewk/smoderation/command/MuteCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/MuteCommand.java
+6 -6
View File
@@ -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;
}
}
src/main/java/de/shiewk/smoderation/command/SModCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SModCommand.java
+4 -4
View File
@@ -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;
}
src/main/java/de/shiewk/smoderation/command/SocialSpyCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/SocialSpyCommand.java
+3 -3
View File
@@ -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 {
src/main/java/de/shiewk/smoderation/command/UnbanCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnbanCommand.java
+7 -7
View File
@@ -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));
}
src/main/java/de/shiewk/smoderation/command/UnmuteCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/UnmuteCommand.java
+7 -7
View File
@@ -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));
}
src/main/java/de/shiewk/smoderation/command/VanishCommand.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/command/VanishCommand.java
+5 -5
View File
@@ -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)
src/main/java/de/shiewk/smoderation/config/SModerationConfig.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/config/SModerationConfig.java
+4 -4
View File
@@ -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;
}
src/main/java/de/shiewk/smoderation/event/PunishmentIssueEvent.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/event/PunishmentIssueEvent.java
+3 -3
View File
@@ -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;
src/main/java/de/shiewk/smoderation/input/ChatInput.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInput.java
+2 -2
View File
@@ -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;
src/main/java/de/shiewk/smoderation/input/ChatInputListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/input/ChatInputListener.java
+2 -2
View File
@@ -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 {
src/main/java/de/shiewk/smoderation/inventory/AutoUpdatingCustomInventory.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/AutoUpdatingCustomInventory.java
+1 -1
View File
@@ -1,3 +1,3 @@
package de.shiewk.smoderation.inventory;
package de.shiewk.smoderation.paper.inventory;
public interface AutoUpdatingCustomInventory extends CustomInventory { }
src/main/java/de/shiewk/smoderation/inventory/ConfirmationInventory.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/ConfirmationInventory.java
+1 -1
View File
@@ -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;
src/main/java/de/shiewk/smoderation/inventory/CustomInventory.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/CustomInventory.java
+1 -1
View File
@@ -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;
src/main/java/de/shiewk/smoderation/inventory/InvSeeEquipmentInventory.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/InvSeeEquipmentInventory.java
+3 -3
View File
@@ -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));
src/main/java/de/shiewk/smoderation/inventory/PageableCustomInventory.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/PageableCustomInventory.java
+1 -1
View File
@@ -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;
src/main/java/de/shiewk/smoderation/inventory/SModMenu.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/inventory/SModMenu.java
+9 -9
View File
@@ -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<Component> lore = new ArrayList<>();
src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/CustomInventoryListener.java
+3 -3
View File
@@ -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;
src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/EnderchestSeeListener.java
+1 -1
View File
@@ -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;
src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/InvSeeListener.java
+1 -1
View File
@@ -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;
src/main/java/de/shiewk/smoderation/listener/PunishmentListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/PunishmentListener.java
+10 -10
View File
@@ -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);
}
}
}
src/main/java/de/shiewk/smoderation/listener/SocialSpyListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/SocialSpyListener.java
+5 -5
View File
@@ -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<String> ssCommands = SModeration.CONFIG.getSocialSpyCommands(defaultCommands);
List<String> ssCommands = SModerationPaper.CONFIG.getSocialSpyCommands(defaultCommands);
final String message = event.getMessage();
if (ssCommands.stream().anyMatch(str ->
message.startsWith("/"+str+" ")
src/main/java/de/shiewk/smoderation/listener/VanishListener.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/listener/VanishListener.java
+7 -7
View File
@@ -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);
}
src/main/java/de/shiewk/smoderation/punishments/Punishment.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/Punishment.java
+7 -7
View File
@@ -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.";
src/main/java/de/shiewk/smoderation/punishments/PunishmentType.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/punishments/PunishmentType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.shiewk.smoderation.punishments;
package de.shiewk.smoderation.paper.punishments;
public enum PunishmentType {
MUTE("Mute"),
src/main/java/de/shiewk/smoderation/storage/PunishmentContainer.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/storage/PunishmentContainer.java
+5 -5
View File
@@ -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()){
src/main/java/de/shiewk/smoderation/util/ByteUtil.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/ByteUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.shiewk.smoderation.util;
package de.shiewk.smoderation.paper.util;
import java.nio.ByteBuffer;
import java.util.UUID;
src/main/java/de/shiewk/smoderation/util/PlayerUtil.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/PlayerUtil.java
+4 -4
View File
@@ -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;
}
src/main/java/de/shiewk/smoderation/util/TimeUtil.java → smoderation-paper/src/main/java/de/shiewk/smoderation/paper/util/TimeUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.shiewk.smoderation.util;
package de.shiewk.smoderation.paper.util;
import org.jetbrains.annotations.Range;
src/main/resources/plugin.yml → smoderation-paper/src/main/resources/plugin.yml
+2 -2
View File
@@ -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: