Bumped: Version to 3.0.2

Fixed: Paper remapping error
Bram1903 · Nov 4, 2024 · bd86cbf · bd86cbf
1 parent b710575
commit bd86cbf
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Ensure the [PacketEvents](https://modrinth.com/plugin/packetevents) library is i
 
 | Platform                           | Supported Versions |
 |------------------------------------|--------------------|
-| Bukkit (Spigot, Paper, Folia etc.) | 1.8.8 - 1.21.1     |
+| Bukkit (Spigot, Paper, Folia etc.) | 1.8.8 - 1.21.3     |
 | Velocity                           | Latest Major       |
 | BungeeCord (or any forks)          | Latest Major       |
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 group = "com.deathmotion.playercrasher"
 description = "A plugin that prevents hackers and modders from seeing the health of other players."
-version = "3.0.2-SNAPSHOT"
+version = "3.0.2"
 
 dependencies {
     implementation(project(":common"))
@@ -41,17 +41,17 @@ tasks {
     // 1.17           = Java 16
     // 1.18 - 1.20.4  = Java 17
     // 1-20.5+        = Java 21
-    val version = "1.21.1"
+    val version = "1.21.3"
     val javaVersion = JavaLanguageVersion.of(21)
 
     val jvmArgsExternal = listOf(
         "-Dcom.mojang.eula.agree=true"
     )
 
     val sharedBukkitPlugins = runPaper.downloadPluginsSpec {
-        url("https://ci.codemc.io/job/retrooper/job/packetevents/lastSuccessfulBuild/artifact/spigot/build/libs/packetevents-spigot-2.5.1-SNAPSHOT.jar")
-        url("https://github.com/ViaVersion/ViaVersion/releases/download/5.0.3/ViaVersion-5.0.3.jar")
-        url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.0.3/ViaBackwards-5.0.3.jar")
+        url("https://ci.codemc.io/job/retrooper/job/packetevents/lastSuccessfulBuild/artifact/spigot/build/libs/packetevents-spigot-2.6.1-SNAPSHOT.jar")
+        url("https://github.com/ViaVersion/ViaVersion/releases/download/5.1.1/ViaVersion-5.1.1.jar")
+        url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.1.1/ViaBackwards-5.1.1.jar")
     }
 
     runServer {
@@ -64,7 +64,8 @@ tasks {
 
         downloadPlugins {
             from(sharedBukkitPlugins)
-            url("https://download.luckperms.net/1556/bukkit/loader/LuckPerms-Bukkit-5.4.141.jar")
+            url("https://ci.lucko.me/job/spark/462/artifact/spark-bukkit/build/libs/spark-1.10.116-bukkit.jar")
+            url("https://download.luckperms.net/1560/bukkit/loader/LuckPerms-Bukkit-5.4.145.jar")
         }
 
         jvmArgs = jvmArgsExternal
@@ -94,7 +95,8 @@ tasks {
         }
 
         downloadPlugins {
-            url("https://ci.codemc.io/job/retrooper/job/packetevents/lastSuccessfulBuild/artifact/velocity/build/libs/packetevents-velocity-2.5.1-SNAPSHOT.jar")
+            url("https://ci.codemc.io/job/retrooper/job/packetevents/lastSuccessfulBuild/artifact/velocity/build/libs/packetevents-velocity-2.6.1-SNAPSHOT.jar")
+            url("https://ci.lucko.me/job/spark/418/artifact/spark-velocity/build/libs/spark-1.10.73-velocity.jar")
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 adventure = "4.16.0"
-packetevents = "2.6.0-SNAPSHOT"
+packetevents = "2.6.0"
 paper = "1.21-R0.1-SNAPSHOT"
 velocity = "3.3.0-SNAPSHOT"
 bungeecord = "1.21-R0.1-SNAPSHOT"

diff --git a/platforms/bukkit/src/main/java/com/deathmotion/playercrasher/BukkitPlayerCrasher.java b/platforms/bukkit/src/main/java/com/deathmotion/playercrasher/BukkitPlayerCrasher.java
@@ -22,7 +22,7 @@
 import com.deathmotion.playercrasher.commands.BukkitCrashInfoCommand;
 import com.deathmotion.playercrasher.commands.BukkitPCCommand;
 import com.deathmotion.playercrasher.interfaces.Scheduler;
-import com.deathmotion.playercrasher.util.MessageSender;
+import com.deathmotion.playercrasher.util.BukkitMessageSender;
 import io.github.retrooper.packetevents.adventure.serializer.legacy.LegacyComponentSerializer;
 import io.github.retrooper.packetevents.bstats.bukkit.Metrics;
 import io.github.retrooper.packetevents.bstats.charts.SimplePie;
@@ -35,14 +35,14 @@
 
 public class BukkitPlayerCrasher extends PCPlatform<JavaPlugin> {
 
-    public final MessageSender messageSender;
+    public final BukkitMessageSender bukkitMessageSender;
 
     private final PCBukkit plugin;
     private final boolean useAdventure;
 
     public BukkitPlayerCrasher(PCBukkit plugin) {
         this.plugin = plugin;
-        this.messageSender = new MessageSender(plugin);
+        this.bukkitMessageSender = new BukkitMessageSender(plugin);
 
         useAdventure = checkAdventureCompatibility();
     }
@@ -102,13 +102,9 @@ public String getPluginDirectory() {
     }
 
     protected void enableBStats() {
-        try {
-            Metrics metrics = new Metrics(this.plugin, 16190);
-            metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
-            metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "Bukkit"));
-        } catch (Exception e) {
-            this.plugin.getLogger().warning("Something went wrong while enabling bStats.\n" + e.getMessage());
-        }
+        Metrics metrics = new Metrics(this.plugin, 16190);
+        metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
+        metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "Bukkit"));
     }
 
     protected void registerCommands() {

diff --git a/...forms/bukkit/src/main/java/com/deathmotion/playercrasher/commands/BukkitCrashCommand.java b/...forms/bukkit/src/main/java/com/deathmotion/playercrasher/commands/BukkitCrashCommand.java
@@ -22,7 +22,7 @@
 import com.deathmotion.playercrasher.data.CommonSender;
 import com.deathmotion.playercrasher.enums.CrashMethod;
 import com.deathmotion.playercrasher.util.CommandUtil;
-import com.deathmotion.playercrasher.util.MessageSender;
+import com.deathmotion.playercrasher.util.BukkitMessageSender;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
@@ -39,46 +39,46 @@
 public class BukkitCrashCommand implements CommandExecutor, TabExecutor {
 
     private final PCBukkit plugin;
-    private final MessageSender messageSender;
+    private final BukkitMessageSender bukkitMessageSender;
 
     public BukkitCrashCommand(PCBukkit plugin) {
         this.plugin = plugin;
-        this.messageSender = plugin.getPc().messageSender;
+        this.bukkitMessageSender = plugin.getPc().bukkitMessageSender;
 
         plugin.getCommand("Crash").setExecutor(this);
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
         if (!sender.hasPermission("PlayerCrasher.Crash")) {
-            messageSender.sendMessages(sender, CommandUtil.NO_PERMISSION);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.NO_PERMISSION);
             return false;
         }
 
         if (args.length == 0) {
-            messageSender.sendMessages(sender, CommandUtil.INVALID_COMMAND);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.INVALID_COMMAND);
             return false;
         }
 
         Player targetPlayer = plugin.getServer().getPlayer(args[0]);
         if (targetPlayer == null) {
-            messageSender.sendMessages(sender, CommandUtil.PLAYER_NOT_FOUND);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.PLAYER_NOT_FOUND);
             return false;
         }
 
         User target = PacketEvents.getAPI().getPlayerManager().getUser(targetPlayer);
         if (target == null) {
-            messageSender.sendMessages(sender, CommandUtil.PLAYER_NOT_FOUND);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.PLAYER_NOT_FOUND);
             return false;
         }
 
         if (targetPlayer == sender) {
-            messageSender.sendMessages(sender, CommandUtil.SELF_CRASH);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.SELF_CRASH);
             return false;
         }
 
         if (targetPlayer.hasPermission("PlayerCrasher.Bypass")) {
-            messageSender.sendMessages(sender, CommandUtil.PLAYER_BYPASS);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.PLAYER_BYPASS);
             return false;
         }
 
@@ -93,12 +93,12 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             try {
                 method = CrashMethod.valueOf(args[1].toUpperCase());
             } catch (IllegalArgumentException e) {
-                messageSender.sendMessages(sender, CommandUtil.INVALID_METHOD);
+                bukkitMessageSender.sendMessages(sender, CommandUtil.INVALID_METHOD);
                 return false;
             }
         }
 
-        messageSender.sendMessages(sender, CommandUtil.crashSent(target.getName()));
+        bukkitMessageSender.sendMessages(sender, CommandUtil.crashSent(target.getName()));
         plugin.getPc().crashPlayer(createCommonUser(sender), target, method);
 
         return true;

diff --git a/...s/bukkit/src/main/java/com/deathmotion/playercrasher/commands/BukkitCrashInfoCommand.java b/...s/bukkit/src/main/java/com/deathmotion/playercrasher/commands/BukkitCrashInfoCommand.java
@@ -20,7 +20,7 @@
 
 import com.deathmotion.playercrasher.PCBukkit;
 import com.deathmotion.playercrasher.util.CommandUtil;
-import com.deathmotion.playercrasher.util.MessageSender;
+import com.deathmotion.playercrasher.util.BukkitMessageSender;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
@@ -38,19 +38,19 @@
 
 public class BukkitCrashInfoCommand implements CommandExecutor, TabCompleter {
     private final PCBukkit plugin;
-    private final MessageSender messageSender;
+    private final BukkitMessageSender bukkitMessageSender;
 
     public BukkitCrashInfoCommand(PCBukkit plugin) {
         this.plugin = plugin;
-        this.messageSender = plugin.getPc().messageSender;
+        this.bukkitMessageSender = plugin.getPc().bukkitMessageSender;
 
         plugin.getCommand("CrashInfo").setExecutor(this);
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
         if (!sender.hasPermission("PlayerCrasher.CrashInfo")) {
-            messageSender.sendMessages(sender, CommandUtil.NO_PERMISSION);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.NO_PERMISSION);
             return false;
         }
 
@@ -70,15 +70,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         Player playerToCheck = Bukkit.getPlayer(args[0]);
 
         if (playerToCheck == null) {
-            messageSender.sendMessages(sender, CommandUtil.PLAYER_NOT_FOUND);
+            bukkitMessageSender.sendMessages(sender, CommandUtil.PLAYER_NOT_FOUND);
             return false;
         }
 
         User userToCheck = PacketEvents.getAPI().getPlayerManager().getUser(playerToCheck);
         String clientBrand = plugin.getPc().getClientBrand(userToCheck.getUUID());
         ClientVersion clientVersion = userToCheck.getClientVersion();
 
-        messageSender.sendMessages(sender, CommandUtil.playerBrand(playerToCheck.getName(), clientBrand, clientVersion.getReleaseName()));
+        bukkitMessageSender.sendMessages(sender, CommandUtil.playerBrand(playerToCheck.getName(), clientBrand, clientVersion.getReleaseName()));
         return true;
     }
 

diff --git a/platforms/bukkit/src/main/java/com/deathmotion/playercrasher/commands/BukkitPCCommand.java b/platforms/bukkit/src/main/java/com/deathmotion/playercrasher/commands/BukkitPCCommand.java
@@ -2,24 +2,24 @@
 
 import com.deathmotion.playercrasher.PCBukkit;
 import com.deathmotion.playercrasher.util.CommandUtil;
-import com.deathmotion.playercrasher.util.MessageSender;
+import com.deathmotion.playercrasher.util.BukkitMessageSender;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
 public class BukkitPCCommand implements CommandExecutor {
-    private final MessageSender messageSender;
+    private final BukkitMessageSender bukkitMessageSender;
 
     public BukkitPCCommand(PCBukkit plugin) {
-        this.messageSender = plugin.getPc().messageSender;
+        this.bukkitMessageSender = plugin.getPc().bukkitMessageSender;
 
         plugin.getCommand("PlayerCrasher").setExecutor(this);
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        messageSender.sendMessages(sender, CommandUtil.createPCCommandComponent());
+        bukkitMessageSender.sendMessages(sender, CommandUtil.createPCCommandComponent());
         return true;
     }
 }
diff --git a/...ion/playercrasher/util/MessageSender.java → ...ayercrasher/util/BukkitMessageSender.java b/...ion/playercrasher/util/MessageSender.java → ...ayercrasher/util/BukkitMessageSender.java
@@ -24,11 +24,11 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class MessageSender {
+public class BukkitMessageSender {
 
     private final PCBukkit plugin;
 
-    public MessageSender(PCBukkit plugin) {
+    public BukkitMessageSender(PCBukkit plugin) {
         this.plugin = plugin;
     }
 

diff --git a/platforms/bungeecord/src/main/java/com/deathmotion/playercrasher/BungeePlayerCrasher.java b/platforms/bungeecord/src/main/java/com/deathmotion/playercrasher/BungeePlayerCrasher.java
@@ -18,7 +18,7 @@
 
 package com.deathmotion.playercrasher;
 
-import com.deathmotion.playercrasher.util.MessageSender;
+import com.deathmotion.playercrasher.util.BungeeMessageSender;
 import com.deathmotion.playercrasher.commands.BungeeCrashCommand;
 import com.deathmotion.playercrasher.commands.BungeeCrashInfoCommand;
 import com.deathmotion.playercrasher.commands.BungeePCCommand;
@@ -35,12 +35,12 @@
 
 public class BungeePlayerCrasher extends PCPlatform<Plugin> {
 
-    public final MessageSender messageSender;
     private final PCBungee plugin;
+    public final BungeeMessageSender bungeeMessageSender;
 
     public BungeePlayerCrasher(PCBungee plugin) {
         this.plugin = plugin;
-        this.messageSender = new MessageSender(plugin);
+        this.bungeeMessageSender = new BungeeMessageSender(plugin);
     }
 
     @Override
@@ -76,13 +76,9 @@ public String getPluginDirectory() {
     }
 
     protected void enableBStats() {
-        try {
-            Metrics metrics = new Metrics(this.plugin, 16190);
-            metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
-            metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "BungeeCord"));
-        } catch (Exception e) {
-            this.plugin.getLogger().warning("Something went wrong while enabling bStats.\n" + e.getMessage());
-        }
+        Metrics metrics = new Metrics(this.plugin, 16190);
+        metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
+        metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "BungeeCord"));
     }
 
     protected void registerCommands() {