OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 22:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add test plugin (to remove later)

Browse source 
- adds `/test_lidded_new <blockpos> query` to get the api's view of the block
- adds `/test_lidded_new <blockpos> set <lidmode>` to change it.
- adds `/test_lidded_old <blockpos> <is_open | close | toggle>` to use the implementation of the old api on top of the new api.
- adds `LiddedTestListener` to test `PlayerLiddedOpenEvent`, which makes any lidded blocks open quietly (ie cancel the event), if done while holding any wool in your main hand.

since it's not the easiest thing to test in-game without some api consumer/activator

a seconds player might be useful to inspect state while it is open/closed with multiple people.
This commit is contained in:
Isaac - The456 2024-12-25 01:47:51 +00:00
parent abf6eca3dc
commit 47270e640e
No known key found for this signature in database
GPG key ID: 57A848D2F87C14EF
4 changed files with 399 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test-plugin/src/main/java/io/papermc/testplugin/TestPlugin.java
View file

@ -1,5 +1,7 @@
package io.papermc.testplugin;
import io.papermc.testplugin.lidded.LiddedCommands;
import io.papermc.testplugin.lidded.LiddedTestListener;
import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin;
@ -9,6 +11,10 @@ public final class TestPlugin extends JavaPlugin implements Listener {
public void onEnable() {
this.getServer().getPluginManager().registerEvents(this, this);
LiddedCommands.registerAll(this);
getServer().getPluginManager()
.registerEvents(new LiddedTestListener(this.getLogger()), this);
// io.papermc.testplugin.brigtests.Registration.registerViaOnEnable(this);
}

90
test-plugin/src/main/java/io/papermc/testplugin/lidded/LidModeArgument.java Normal file
View file

@ -0,0 +1,90 @@
package io.papermc.testplugin.lidded;
import com.mojang.brigadier.LiteralMessage;
import com.mojang.brigadier.arguments.ArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import io.papermc.paper.block.LidMode;
import io.papermc.paper.command.brigadier.argument.CustomArgumentType;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.jetbrains.annotations.NotNull;
public class LidModeArgument implements CustomArgumentType.Converted<LidMode, String> {
private static final SimpleCommandExceptionType INVALID_MODE = new SimpleCommandExceptionType(
new LiteralMessage("Invalid lid mode"));
private static final LinkedHashMap<String, LidMode> BY_STRING = Arrays.stream(
LidMode.values())
.collect(
Collectors.toMap(LidMode::name, Function.identity(), (lidMode, lidMode2) -> lidMode,
LinkedHashMap::new));
static boolean matchesSubStr(String remaining, String candidate) {
for (int i = 0; !candidate.startsWith(remaining, i); i++) {
int j = candidate.indexOf(46, i);
int k = candidate.indexOf(95, i);
if (Math.max(j, k) < 0) {
return false;
}
if (j >= 0 && k >= 0) {
i = Math.min(k, j);
} else {
i = j >= 0 ? j : k;
}
}
return true;
}
public static LidModeArgument lidMode() {
return new LidModeArgument();
}
public static LidMode getLidMode(CommandContext<?> context, String name) {
return context.getArgument(name, LidMode.class);
}
@Override
public @NotNull LidMode convert(@NotNull final String nativeType)
throws CommandSyntaxException {
LidMode mode = BY_STRING.get(nativeType.toUpperCase(Locale.ROOT));
if (mode == null) {
throw INVALID_MODE.create();
}
return mode;
}
@Override
public @NotNull ArgumentType<String> getNativeType() {
return StringArgumentType.word();
}
@Override
public @NotNull Collection<String> getExamples() {
return BY_STRING.keySet();
}
@Override
public @NotNull <S> CompletableFuture<Suggestions> listSuggestions(
final @NotNull CommandContext<S> context, final @NotNull SuggestionsBuilder builder
) {
String string = builder.getRemaining().toLowerCase(Locale.ROOT);
BY_STRING.keySet().stream()
.filter(candidate -> matchesSubStr(string, candidate.toLowerCase(Locale.ROOT)))
.forEach(builder::suggest);
return builder.buildFuture();
}
}

251
test-plugin/src/main/java/io/papermc/testplugin/lidded/LiddedCommands.java Normal file
View file

@ -0,0 +1,251 @@
package io.papermc.testplugin.lidded;
import com.mojang.brigadier.LiteralMessage;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType;
import io.papermc.paper.block.LidMode;
import io.papermc.paper.block.LidState;
import io.papermc.paper.command.brigadier.CommandSourceStack;
import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
import io.papermc.paper.math.BlockPosition;
import io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager;
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
import io.papermc.testplugin.TestPlugin;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Location;
import org.bukkit.block.BlockState;
import org.bukkit.block.Lidded;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import static net.kyori.adventure.text.Component.text;
public class LiddedCommands {
private static final Dynamic3CommandExceptionType NOT_LIDDED = new Dynamic3CommandExceptionType(
(objPos, objExpected, objActual) -> {
if (!(objPos instanceof BlockPosition pos) || !(objExpected instanceof String expected)
|| !(objActual instanceof String actual)) {
TestPlugin.getPlugin(TestPlugin.class).getLogger().warning(
"Internal Exception while making error message" + objPos.getClass()
+ objExpected.getClass() + objActual.getClass());
return new LiteralMessage("Internal Exception while making error message");
}
return new LiteralMessage(
"Block at %d, %d, %d is not a lidded block. Expected: \"%s\", Actual: \"%s\"".formatted(
pos.blockX(), pos.blockY(), pos.blockZ(), expected, actual));
});
public static void registerAll(JavaPlugin plugin) {
LifecycleEventManager<Plugin> lifecycleManager = plugin.getLifecycleManager();
lifecycleManager.registerEventHandler(LifecycleEvents.COMMANDS, event -> {
final io.papermc.paper.command.brigadier.Commands registrar = event.registrar();
LiddedCommands.registerNew(registrar);
LiddedCommands.registerOld(registrar);
});
}
public static void registerNew(io.papermc.paper.command.brigadier.Commands commands) {
commands.register(io.papermc.paper.command.brigadier.Commands.literal("test_lidded_new")
.then(io.papermc.paper.command.brigadier.Commands.argument("pos",
ArgumentTypes.blockPosition())
.then(io.papermc.paper.command.brigadier.Commands.literal("query")
.executes(context -> {
BlockPosition pos = context.getArgument("pos",
BlockPositionResolver.class).resolve(context.getSource());
io.papermc.paper.block.Lidded lidded = getPaperLidded(context, pos);
if (!(lidded instanceof BlockState state)) {
throw new IllegalStateException("Impossible");
}
Component msg = text()
.append(text("---", NamedTextColor.DARK_GRAY)).appendNewline()
.append(text("Lidded Block: "))
.append(text(state.getType().key().asString())).appendNewline()
.append(text("Lid Mode: "))
.append(text(lidded.getLidMode().name())).appendNewline()
.append(text("Effective LidState: "))
.append(text(lidded.getEffectiveLidState().name(),
lidded.getEffectiveLidState() == LidState.OPEN
? NamedTextColor.GREEN : NamedTextColor.RED)).appendSpace()
.append(text("True LidState: "))
.append(text(lidded.getTrueLidState().name(),
lidded.getTrueLidState() == LidState.OPEN ? NamedTextColor.GREEN
: NamedTextColor.RED))
.build();
context.getSource().getSender().sendMessage(msg);
return 1;
})
)
.then(io.papermc.paper.command.brigadier.Commands.literal("set")
.then(io.papermc.paper.command.brigadier.Commands.argument("lidMode",
LidModeArgument.lidMode())
.executes(context -> {
BlockPosition pos = context.getArgument("pos",
BlockPositionResolver.class).resolve(context.getSource());
io.papermc.paper.block.Lidded lidded = getPaperLidded(context, pos);
if (!(lidded instanceof BlockState state)) {
throw new IllegalStateException("Impossible");
}
LidMode previousMode = lidded.getLidMode();
LidState oldEffectiveState = lidded.getEffectiveLidState();
LidState oldTrueState = lidded.getTrueLidState();
LidMode targetMode = LidModeArgument.getLidMode(context, "lidMode");
LidMode resultantMode = lidded.setLidMode(targetMode);
Component msg = text()
.append(text("---", NamedTextColor.DARK_GRAY)).appendNewline()
.append(text("Lidded Block: "))
.append(text(state.getType().key().asString())).appendNewline()
.append(text("Lid Mode: "))
.append(text("Old: "))
.append(text(previousMode.name())).appendSpace()
.append(text("Target: "))
.append(text(targetMode.name())).appendSpace()
.append(text("New: "))
.append(text(resultantMode.name())).appendNewline()
.append(text("Effective LidState: "))
.append(text("Old: "))
.append(text(oldEffectiveState.name(),
oldEffectiveState == LidState.OPEN ? NamedTextColor.GREEN
: NamedTextColor.RED)).appendSpace()
.append(text("New: "))
.append(text(lidded.getEffectiveLidState().name(),
lidded.getEffectiveLidState() == LidState.OPEN
? NamedTextColor.GREEN : NamedTextColor.RED))
.appendNewline()
.append(text("True LidState: "))
.append(text("Old: "))
.append(text(oldTrueState.name(),
oldTrueState == LidState.OPEN ? NamedTextColor.GREEN
: NamedTextColor.RED)).appendSpace()
.append(text("New: "))
.append(text(lidded.getTrueLidState().name(),
lidded.getTrueLidState() == LidState.OPEN ? NamedTextColor.GREEN
: NamedTextColor.RED))
.build();
context.getSource().getSender().sendMessage(msg);
return 1;
}
)
)
)
)
.build()
);
}
private static io.papermc.paper.block.Lidded getPaperLidded(
CommandContext<CommandSourceStack> context,
BlockPosition pos
)
throws CommandSyntaxException {
Location targetLoc = new Location(context.getSource().getLocation().getWorld(),
pos.blockX(), pos.blockY(), pos.blockZ());
BlockState state = targetLoc.getBlock().getState();
if (state instanceof io.papermc.paper.block.Lidded lidded) {
return lidded;
}
throw NOT_LIDDED.create(pos, "A block Implementing Paper Lidded",
state.getType().key().asString());
}
public static void registerOld(io.papermc.paper.command.brigadier.Commands commands) {
commands.register(
io.papermc.paper.command.brigadier.Commands.literal("test_lidded_old")
.then(io.papermc.paper.command.brigadier.Commands.argument("pos",
ArgumentTypes.blockPosition())
.then(io.papermc.paper.command.brigadier.Commands.literal("is_open")
.executes(context -> {
BlockPosition pos = context.getArgument("pos",
BlockPositionResolver.class).resolve(context.getSource());
Lidded lidded = getBukkitLidded(context, pos);
if (!(lidded instanceof BlockState state)) {
throw new IllegalStateException("Impossible");
}
Component msg = text()
.append(text("Lidded Block: "))
.append(text(state.getType().key().asString()))
.append(text(" is open: "))
.append(text(lidded.isOpen() ? "Yes" : "No",
lidded.isOpen() ? NamedTextColor.GREEN : NamedTextColor.RED))
.build();
context.getSource().getSender().sendMessage(msg);
return 1;
})
)
.then(io.papermc.paper.command.brigadier.Commands.literal("open")
.executes(context -> {
BlockPosition pos = context.getArgument("pos",
BlockPositionResolver.class).resolve(context.getSource());
Lidded lidded = getBukkitLidded(context, pos);
if (!(lidded instanceof BlockState state)) {
throw new IllegalStateException("Impossible");
}
lidded.open();
Component msg = text()
.append(text("Lidded Block: "))
.append(text(state.getType().key().asString()))
.append(text(" set "))
.append(text("open", NamedTextColor.GREEN))
.build();
context.getSource().getSender().sendMessage(msg);
return 1;
})
)
.then(io.papermc.paper.command.brigadier.Commands.literal("close")
.executes(context -> {
BlockPosition pos = context.getArgument("pos",
BlockPositionResolver.class).resolve(context.getSource());
Lidded lidded = getBukkitLidded(context, pos);
if (!(lidded instanceof BlockState state)) {
throw new IllegalStateException("Impossible");
}
lidded.close();
Component msg = text()
.append(text("Lidded Block: "))
.append(text(state.getType().key().asString()))
.append(text(" set "))
.append(text("closed", NamedTextColor.RED))
.build();
context.getSource().getSender().sendMessage(msg);
return 1;
})
)
)
.build()
);
}
private static Lidded getBukkitLidded(
CommandContext<CommandSourceStack> context,
BlockPosition pos
) throws CommandSyntaxException {
Location targetLoc = new Location(context.getSource().getLocation().getWorld(),
pos.blockX(), pos.blockY(), pos.blockZ());
BlockState state = targetLoc.getBlock().getState();
if (state instanceof Lidded lidded) {
return lidded;
}
throw NOT_LIDDED.create(pos, "A block Implementing Bukkit Lidded",
state.getType().key().asString());
}
}

52
test-plugin/src/main/java/io/papermc/testplugin/lidded/LiddedTestListener.java Normal file
View file

@ -0,0 +1,52 @@
package io.papermc.testplugin.lidded;
import io.papermc.paper.event.player.PlayerLiddedOpenEvent;
import io.papermc.paper.registry.RegistryAccess;
import io.papermc.paper.registry.RegistryKey;
import io.papermc.paper.registry.TypedKey;
import io.papermc.paper.registry.tag.Tag;
import io.papermc.paper.registry.tag.TagKey;
import java.util.Objects;
import java.util.logging.Logger;
import net.kyori.adventure.key.Key;
import org.bukkit.Registry;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ItemType;
public class LiddedTestListener implements Listener {
private static final TagKey<ItemType> WOOL_TAG_KEY = TagKey.create(RegistryKey.ITEM,
Key.key("minecraft:wool"));
private final Logger logger;
public LiddedTestListener(Logger logger) {
this.logger = logger;
}
@EventHandler
public void onLiddedEvent(PlayerLiddedOpenEvent event) {
Registry<ItemType> itemTypeRegistry = RegistryAccess.registryAccess()
.getRegistry(RegistryKey.ITEM);
if (!itemTypeRegistry.hasTag(WOOL_TAG_KEY)) {
logger.warning("Wool tag not found");
return;
}
Tag<ItemType> woolTag = itemTypeRegistry.getTag(WOOL_TAG_KEY);
ItemStack mainHandItem = event.getPlayer().getInventory().getItemInMainHand();
boolean isWool = woolTag.contains(
TypedKey.create(RegistryKey.ITEM, itemTypeRegistry.getKeyOrThrow(
Objects.requireNonNull(mainHandItem.getType().asItemType()))));
if (isWool) {
event.getPlayer().sendRichMessage(
"<gray>Opening <gold>" + event.getLidded().getType().getKey().asString()
+ "</gold> Quietly");
event.setCancelled(true);
}
}
}