Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-15 20:12:02 +01:00
Code Issues Projects Releases Wiki Activity

Update list command to new api changes

Browse Source
This commit is contained in:
Ben Woo 2023-08-31 23:55:40 +08:00
parent 55805aa618
commit da1d059b84
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
View File

@ -13,6 +13,9 @@ import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax; import co.aikar.commands.annotation.Syntax;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorld; import com.onarandombox.MultiverseCore.api.MVWorld;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
@ -22,15 +25,31 @@ import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter; import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
import com.onarandombox.MultiverseCore.display.handlers.PagedSendHandler; import com.onarandombox.MultiverseCore.display.handlers.PagedSendHandler;
import com.onarandombox.MultiverseCore.display.parsers.ListContentProvider; import com.onarandombox.MultiverseCore.display.parsers.ListContentProvider;
import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
import com.onarandombox.MultiverseCore.world.entrycheck.WorldEntryCheckerProvider;
import jakarta.inject.Inject;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jvnet.hk2.annotations.Service;
@Service
@CommandAlias("mv") @CommandAlias("mv")
public class ListCommand extends MultiverseCoreCommand { public class ListCommand extends MultiverseCommand {
public ListCommand(@NotNull MultiverseCore plugin) {
super(plugin); private final MVWorldManager worldManager;
private final WorldEntryCheckerProvider worldEntryCheckerProvider;
@Inject
public ListCommand(
@NotNull MVCommandManager commandManager,
@NotNull MVWorldManager worldManager,
@NotNull WorldEntryCheckerProvider worldEntryCheckerProvider
) {
super(commandManager);
this.worldManager = worldManager;
this.worldEntryCheckerProvider = worldEntryCheckerProvider;
registerFlagGroup(CommandFlagGroup.builder("mvlist") registerFlagGroup(CommandFlagGroup.builder("mvlist")
.add(CommandValueFlag.builder("--filter", ContentFilter.class) .add(CommandValueFlag.builder("--filter", ContentFilter.class)
@ -82,15 +101,15 @@ public class ListCommand extends MultiverseCoreCommand {
Player player = issuer.isPlayer() ? issuer.getPlayer() : null; Player player = issuer.isPlayer() ? issuer.getPlayer() : null;
List<String> worldList = new ArrayList<>(); List<String> worldList = new ArrayList<>();
this.plugin.getMVWorldManager().getMVWorlds().stream() worldManager.getMVWorlds().stream()
.filter(world -> player == null || plugin.getMVPerms().canEnterWorld(player, world)) .filter(world -> player == null || worldEntryCheckerProvider.forSender(player).canAccessWorld(world).isSuccess())
.filter(world -> canSeeWorld(player, world)) .filter(world -> canSeeWorld(player, world))
.map(world -> hiddenText(world) + world.getColoredWorldString() + " - " + parseColouredEnvironment(world.getEnvironment())) .map(world -> hiddenText(world) + world.getColoredWorldString() + " - " + parseColouredEnvironment(world.getEnvironment()))
.sorted() .sorted()
.forEach(worldList::add); .forEach(worldList::add);
this.plugin.getMVWorldManager().getUnloadedWorlds().stream() worldManager.getUnloadedWorlds().stream()
.filter(world -> plugin.getMVPerms().hasPermission(issuer.getIssuer(), "multiverse.access." + world, true)) .filter(world -> issuer.hasPermission("multiverse.access." + world)) // TODO: Refactor stray permission check
.map(world -> ChatColor.GRAY + world + " - UNLOADED") .map(world -> ChatColor.GRAY + world + " - UNLOADED")
.sorted() .sorted()
.forEach(worldList::add); .forEach(worldList::add);
@ -101,7 +120,7 @@ public class ListCommand extends MultiverseCoreCommand {
private boolean canSeeWorld(Player player, MVWorld world) { private boolean canSeeWorld(Player player, MVWorld world) {
return !world.isHidden() return !world.isHidden()
|| player == null || player == null
|| this.plugin.getMVPerms().hasPermission(player, "multiverse.core.modify", true); || player.hasPermission("multiverse.core.modify"); // TODO: Refactor stray permission check
} }
private String hiddenText(MVWorld world) { private String hiddenText(MVWorld world) {

2
src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt
View File

@ -127,7 +127,7 @@ class InjectionTest : TestWithMockBukkit() {
fun `Commands are available as services`() { fun `Commands are available as services`() {
val commands = multiverseCore.getAllServices(MultiverseCommand::class.java) val commands = multiverseCore.getAllServices(MultiverseCommand::class.java)
// TODO come up with a better way to test this like via actually testing the effect of calling each command // TODO come up with a better way to test this like via actually testing the effect of calling each command
assertEquals(17, commands.size) assertEquals(18, commands.size)
} }
@Test @Test