From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 23 Sep 2021 10:40:09 -0700 Subject: [PATCH] More CommandBlock API diff --git a/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java b/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java new file mode 100644 index 0000000000000000000000000000000000000000..0b42306f17bf8850a13a51067c2d19e7583187e5 --- /dev/null +++ b/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java @@ -0,0 +1,33 @@ +package io.papermc.paper.commands; + +import io.papermc.paper.adventure.PaperAdventure; +import io.papermc.paper.command.CommandBlockHolder; +import net.kyori.adventure.text.Component; +import net.minecraft.world.level.BaseCommandBlock; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public interface PaperCommandBlockHolder extends CommandBlockHolder { + + BaseCommandBlock getCommandBlockHandle(); + + @Override + default @NotNull Component lastOutput() { + return PaperAdventure.asAdventure(getCommandBlockHandle().getLastOutput()); + } + + @Override + default void lastOutput(@Nullable Component lastOutput) { + getCommandBlockHandle().setLastOutput(PaperAdventure.asVanilla(lastOutput)); + } + + @Override + default int getSuccessCount() { + return getCommandBlockHandle().getSuccessCount(); + } + + @Override + default void setSuccessCount(int successCount) { + getCommandBlockHandle().setSuccessCount(successCount); + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java index c4ea6760f489e6171f9e6e170160b932597f842f..245a9b062a0033a39fd42f3ff94350192570aec4 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java @@ -5,7 +5,7 @@ import org.bukkit.World; import org.bukkit.block.CommandBlock; import org.bukkit.craftbukkit.util.CraftChatMessage; -public class CraftCommandBlock extends CraftBlockEntityState implements CommandBlock { +public class CraftCommandBlock extends CraftBlockEntityState implements CommandBlock, io.papermc.paper.commands.PaperCommandBlockHolder { public CraftCommandBlock(World world, CommandBlockEntity tileEntity) { super(world, tileEntity); @@ -41,5 +41,10 @@ public class CraftCommandBlock extends CraftBlockEntityState public void name(net.kyori.adventure.text.Component name) { getSnapshot().getCommandBlock().setName(name == null ? net.minecraft.network.chat.Component.literal("@") : io.papermc.paper.adventure.PaperAdventure.asVanilla(name)); } + + @Override + public net.minecraft.world.level.BaseCommandBlock getCommandBlockHandle() { + return getSnapshot().getCommandBlock(); + } // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java index 66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5..2534abcdce426189ac15e0659ab62840b3d54762 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java @@ -13,7 +13,7 @@ import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; -public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart { +public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart, io.papermc.paper.commands.PaperCommandBlockHolder { private final PermissibleBase perm = new PermissibleBase(this); public CraftMinecartCommand(CraftServer server, MinecartCommandBlock entity) { @@ -64,6 +64,17 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca public net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component name() { return io.papermc.paper.adventure.PaperAdventure.asAdventure(this.getHandle().getCommandBlock().getName()); } + + @Override + public net.minecraft.world.level.BaseCommandBlock getCommandBlockHandle() { + return getHandle().getCommandBlock(); + } + + @Override + public void lastOutput(net.kyori.adventure.text.Component lastOutput) { + io.papermc.paper.commands.PaperCommandBlockHolder.super.lastOutput(lastOutput); + getCommandBlockHandle().onUpdated(); + } // Paper end @Override