Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Command related patches

Browse Source
This commit is contained in:
AlphaKR93
2025-02-24 01:53:56 +09:00
parent 637b0ef8cb
commit 55fbffae38
24 changed files with 1029 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
patches/work/commands/0063-Add-heal-command.patch Normal file
View File

@@ -0,0 +1,122 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 25 Dec 2024 19:07:19 +0900
Subject: [PATCH] Add heal command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index c416b1eaf27699de59aaa6b352ff1aa991d3f660..90ecfc550324521a7aece274bab330f8dc2de3f3 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -180,6 +180,7 @@ public class Commands {
org.purpurmc.purpur.command.CompassCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.RamBarCommand.register(this.dispatcher); // Purpur - Implement ram and rambar commands
org.purpurmc.purpur.command.RamCommand.register(this.dispatcher); // Purpur - Implement ram and rambar commands
+ org.plazmamc.plazma.commands.HealCommand.register(this.dispatcher); // Plazma - Add heal command
}
if (environment.includeIntegrated) {
diff --git a/src/main/java/org/plazmamc/plazma/commands/HealCommand.java b/src/main/java/org/plazmamc/plazma/commands/HealCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..b10725af7ec4433e98557cfbafb563822cd4f908
--- /dev/null
+++ b/src/main/java/org/plazmamc/plazma/commands/HealCommand.java
@@ -0,0 +1,66 @@
+package org.plazmamc.plazma.commands;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import io.papermc.paper.adventure.PaperAdventure;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
+import org.jetbrains.annotations.Contract;
+import org.plazmamc.plazma.configurations.GlobalConfiguration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
+
+@DefaultQualifier(NonNull.class)
+public class HealCommand {
+
+ public static void register(final CommandDispatcher<CommandSourceStack> dispatcher) {
+ dispatcher.register(Commands.literal("heal")
+ .requires(source -> source.hasPermission(2, "bukkit.command.heal"))
+ .executes(ctx -> execute(ctx.getSource(), Collections.singleton(ctx.getSource().getEntityOrException())))
+ .then(Commands.argument("targets", EntityArgument.entities())
+ .requires(source -> source.hasPermission(3, "bukkit.command.heal.others"))
+ .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntities(ctx, "targets")))
+ )
+ );
+ }
+
+ @Contract(pure = true)
+ private static int execute(final CommandSourceStack sender, Collection<? extends Entity> targets) throws CommandSyntaxException {
+ final ArrayList<Component> success = new ArrayList<>();
+
+ for (Entity target : targets) {
+ if (!(target instanceof LivingEntity entity)) continue;
+ if (entity.isDeadOrDying()) continue;
+
+ entity.heal(entity.getMaxHealth());
+ success.add(PaperAdventure.asAdventure(entity.getDisplayName()));
+
+ if (!(entity instanceof Player player)) continue;
+ player.getFoodData().setFoodLevel(20);
+ player.getFoodData().setSaturation(5.0F);
+ }
+
+ if (success.isEmpty()) {
+ throw new SimpleCommandExceptionType(PaperAdventure.asVanilla(miniMessage().deserialize(GlobalConfiguration.get().messages.heal.noTargets))).create();
+ }
+
+ final Component successJoined = success.stream().reduce((a, b) -> a.append(Component.text(", ").append(b))).orElseThrow();
+
+ sender.sendSuccess(miniMessage().deserialize(GlobalConfiguration.get().messages.heal.healed, Placeholder.component("targets", successJoined)));
+ return success.size();
+ }
+
+}
diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
index 898f9e6ec6f306a15639ee0d03bcfe7bf55e2c6c..02a164ff2c855864e246dcaaf8186274421edea7 100644
--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
@@ -31,6 +31,13 @@ public class GlobalConfiguration extends ConfigurationPart {
public Messages messages;
public class Messages extends ConfigurationPart {
+ public Heal heal;
+ public class Heal extends ConfigurationPart {
+
+ public String healed = "Healed %s";
+ public String noTargets = "No targets matched selector";
+
+ }
}
diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
index 180c0a532bbac10a8280b63eb7aa783a1bfbb237..75ddd1a811d0a07c6fe5431a527b3a74e52ad53a 100644
--- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
+++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
@@ -78,7 +78,8 @@ public class MinecraftCommandPermissionsTest {
"minecraft.command.gamemode.survival",
"minecraft.command.gamemode.survival.other",
// Purpur end
- "minecraft.command.selector"
+ "minecraft.command.selector",
+ "minecraft.command.heal" // Plazma
);
private static Set<String> collectMinecraftCommandPerms() {