Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-26 04:25:37 +01:00
Code Issues Projects Releases Wiki Activity

Some cleanup.

Browse Source
This commit is contained in:
benwoo1110 2020-12-19 23:44:05 +08:00
parent 4b4474b1a9
commit fbe0138fa2
11 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/onarandombox/MultiverseCore/commands_acf/CoordCommand.java
View File

@ -3,13 +3,9 @@ package com.onarandombox.MultiverseCore.commands_acf;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Conditions;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import co.aikar.commands.bukkit.contexts.OnlinePlayer;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiverseCore.commands_helper.CommandPlayer;

3
src/main/java/com/onarandombox/MultiverseCore/commands_acf/GeneratorCommand.java
View File

@ -1,18 +1,15 @@
package com.onarandombox.MultiverseCore.commands_acf;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.Plugin;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

1
src/main/java/com/onarandombox/MultiverseCore/commands_acf/ListCommand.java
View File

@ -1,7 +1,6 @@
package com.onarandombox.MultiverseCore.commands_acf;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Default;
import co.aikar.commands.annotation.Description;

2
src/main/java/com/onarandombox/MultiverseCore/commands_acf/LoadCommand.java
View File

@ -5,11 +5,9 @@ import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Conditions;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Single;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import co.aikar.commands.annotation.Values;
import com.onarandombox.MultiverseCore.MultiverseCore;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;

1
src/main/java/com/onarandombox/MultiverseCore/commands_acf/PurgeCommand.java
View File

@ -13,7 +13,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;

1
src/main/java/com/onarandombox/MultiverseCore/commands_acf/RemoveCommand.java
View File

@ -5,7 +5,6 @@ import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Conditions;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Single;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;

2
src/main/java/com/onarandombox/MultiverseCore/commands_acf/SpawnCommand.java
View File

@ -4,10 +4,8 @@ import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import co.aikar.commands.bukkit.contexts.OnlinePlayer;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiverseCore.commands_helper.CommandPlayer;

2
src/main/java/com/onarandombox/MultiverseCore/commands_acf/TeleportCommand.java
View File

@ -41,7 +41,7 @@ public class TeleportCommand extends MultiverseCommand {
@Syntax("[player] <destination>")
@CommandCompletion("@players|@MVWorlds @MVWorlds")
@Description("Allows you to the teleport to a location on your server!")
public void doSameTeleportCommand(@NotNull CommandSender sender,
public void doTeleportCommand(@NotNull CommandSender sender,
@NotNull @Flags("other,defaultself,fallbackself") Player player,
@NotNull @Single String destinationName) {

1
src/main/java/com/onarandombox/MultiverseCore/commands_acf/UnloadCommand.java
View File

@ -5,7 +5,6 @@ import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Single;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import com.onarandombox.MultiverseCore.MultiverseCore;

3
src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandCompletions.java
View File

@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.commands_helper;
import co.aikar.commands.BukkitCommandCompletionContext;
import co.aikar.commands.PaperCommandCompletions;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
@ -20,8 +19,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.logging.Logger;
import java.util.stream.Collectors;
public class MVCommandCompletions extends PaperCommandCompletions {

5
src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandContexts.java
View File

@ -4,7 +4,6 @@ import co.aikar.commands.BukkitCommandExecutionContext;
import co.aikar.commands.InvalidCommandArgument;
import co.aikar.commands.PaperCommandContexts;
import co.aikar.commands.annotation.Values;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVDestination;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
@ -27,7 +26,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.logging.Logger;
import java.util.stream.Collectors;
public class MVCommandContexts extends PaperCommandContexts {
@ -418,7 +416,6 @@ public class MVCommandContexts extends PaperCommandContexts {
}
private Location deriveLocation(BukkitCommandExecutionContext context) {
Logging.info("testing location");
if (context.getArgs().isEmpty()) {
Player player = context.getPlayer();
if (player != null) {
@ -436,8 +433,6 @@ public class MVCommandContexts extends PaperCommandContexts {
throw new InvalidCommandArgument("There was an error getting Target location world!");
}
Logging.info(world.getName());
List<String> locationArgs = context.getArgs();
if (locationArgs.size() != 3 && locationArgs.size() != 5) {
context.getSender().sendMessage(ChatColor.RED + "Invalid location arguments.");