zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Get rid of the command sender interface entirely

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-17 13:35:16 +02:00
parent 8b0a650b48
commit 4cbbee7db0
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
57 changed files with 192 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cloud-minecraft/cloud-paper/src/main/java/com/intellectualsites/commands/PaperBrigadierListener.java
View file

@ -25,10 +25,9 @@ package com.intellectualsites.commands;
import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource;
import com.destroystokyo.paper.event.brigadier.CommandRegisteredEvent;
import com.intellectualsites.commands.brigadier.CloudBrigadierManager;
import com.intellectualsites.commands.arguments.CommandArgument;
import com.intellectualsites.commands.brigadier.CloudBrigadierManager;
import com.intellectualsites.commands.context.CommandContext;
import com.intellectualsites.commands.sender.CommandSender;
import com.mojang.brigadier.arguments.ArgumentType;
import org.bukkit.Bukkit;
import org.bukkit.Material;
@ -42,7 +41,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.UUID;
class PaperBrigadierListener<C extends CommandSender> implements Listener {
class PaperBrigadierListener<C> implements Listener {
private final CloudBrigadierManager<C, BukkitBrigadierCommandSource> brigadierManager;
private final PaperCommandManager<C> paperCommandManager;

8
cloud-minecraft/cloud-paper/src/main/java/com/intellectualsites/commands/PaperCommandManager.java
View file

@ -37,7 +37,7 @@ import java.util.function.Function;
*
* @param <C> Command sender type
*/
public class PaperCommandManager<C extends com.intellectualsites.commands.sender.CommandSender>
public class PaperCommandManager<C>
extends BukkitCommandManager<C> {
/**
@ -46,14 +46,16 @@ public class PaperCommandManager<C extends com.intellectualsites.commands.sender
* @param owningPlugin Plugin that is constructing the manager
* @param commandExecutionCoordinator Coordinator provider
* @param commandSenderMapper Function that maps {@link CommandSender} to the command sender type
* @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSender}
* @throws Exception If the construction of the manager fails
*/
public PaperCommandManager(@Nonnull final Plugin owningPlugin,
@Nonnull final Function<CommandTree<C, BukkitCommandMeta>,
CommandExecutionCoordinator<C, BukkitCommandMeta>> commandExecutionCoordinator,
@Nonnull final Function<CommandSender, C> commandSenderMapper) throws
@Nonnull final Function<CommandSender, C> commandSenderMapper,
@Nonnull final Function<C, CommandSender> backwardsCommandSenderMapper) throws
Exception {
super(owningPlugin, commandExecutionCoordinator, commandSenderMapper);
super(owningPlugin, commandExecutionCoordinator, commandSenderMapper, backwardsCommandSenderMapper);
}
/**