Fix all imports once and for all

This commit is contained in:
Ben Woo 2023-09-11 23:09:34 +08:00
parent d3fa42a035
commit 39f3805ef3
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
81 changed files with 206 additions and 222 deletions

View File

@ -30,7 +30,6 @@ import io.vavr.control.Try;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.inject.Provider; import jakarta.inject.Provider;
import me.main__.util.SerializationConfig.SerializationConfig; import me.main__.util.SerializationConfig.SerializationConfig;
import org.bukkit.Bukkit;
import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.bukkit.configuration.serialization.ConfigurationSerialization;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -127,7 +126,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
registerCommands(); registerCommands();
registerDestinations(); registerDestinations();
setupMetrics(); setupMetrics();
loadPlaceholderAPIIntegration(); loadPlaceholderApiIntegration();
saveAllConfigs(); saveAllConfigs();
logEnableMessage(); logEnableMessage();
}).onFailure(e -> { }).onFailure(e -> {
@ -193,8 +192,8 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
private void registerEvents() { private void registerEvents() {
var pluginManager = getServer().getPluginManager(); var pluginManager = getServer().getPluginManager();
Try.run(() -> serviceLocator.getAllServices(InjectableListener.class) Try.run(() -> serviceLocator.getAllServices(InjectableListener.class).forEach(
.forEach(listener -> pluginManager.registerEvents(listener, this))) listener -> pluginManager.registerEvents(listener, this)))
.onFailure(e -> { .onFailure(e -> {
throw new RuntimeException("Failed to register listeners. Terminating...", e); throw new RuntimeException("Failed to register listeners. Terminating...", e);
}); });
@ -216,7 +215,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
} }
/** /**
* Register locales * Register locales.
*/ */
private void setUpLocales() { private void setUpLocales() {
Try.of(() -> commandManagerProvider.get()) Try.of(() -> commandManagerProvider.get())
@ -277,7 +276,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
} }
} }
private void loadPlaceholderAPIIntegration() { private void loadPlaceholderApiIntegration() {
if (configProvider.get().isRegisterPapiHook() if (configProvider.get().isRegisterPapiHook()
&& getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) { && getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
Try.run(() -> serviceLocator.createAndInitialize(MultiverseCorePlaceholders.class)) Try.run(() -> serviceLocator.createAndInitialize(MultiverseCorePlaceholders.class))
@ -310,7 +309,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
@Override @Override
public String getAuthors() { public String getAuthors() {
List<String> authorsList = this.getDescription().getAuthors(); List<String> authorsList = this.getDescription().getAuthors();
if (authorsList.size() == 0) { if (authorsList.isEmpty()) {
return ""; return "";
} }
@ -392,15 +391,15 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
* *
* @param contractOrImpl The contract or concrete implementation to get the best instance of * @param contractOrImpl The contract or concrete implementation to get the best instance of
* @param qualifiers The set of qualifiers that must match this service definition * @param qualifiers The set of qualifiers that must match this service definition
* @param <T> The type of the contract to get
* @return A list of services implementing this contract or concrete implementation. May not return null, but may * @return A list of services implementing this contract or concrete implementation. May not return null, but may
* return an empty list * return an empty list.
* @throws MultiException if there was an error during service lookup * @throws MultiException if there was an error during service lookup
*/ */
@NotNull @NotNull
public <T> List<T> getAllServices( public <T> List<T> getAllServices(
@NotNull Class<T> contractOrImpl, @NotNull Class<T> contractOrImpl,
Annotation... qualifiers Annotation... qualifiers) throws MultiException {
) throws MultiException {
var handles = serviceLocator.getAllServiceHandles(contractOrImpl, qualifiers); var handles = serviceLocator.getAllServiceHandles(contractOrImpl, qualifiers);
return handles.stream() return handles.stream()
.filter(ServiceHandle::isActive) .filter(ServiceHandle::isActive)

View File

@ -12,7 +12,8 @@ class MultiverseCorePluginBinder extends JavaPluginBinder<MultiverseCore> {
} }
@Override @Override
protected ScopedBindingBuilder<MultiverseCore> bindPluginClass(ScopedBindingBuilder<MultiverseCore> bindingBuilder) { protected ScopedBindingBuilder<MultiverseCore> bindPluginClass(
ScopedBindingBuilder<MultiverseCore> bindingBuilder) {
return super.bindPluginClass(bindingBuilder).to(MVCore.class).to(MultiverseCore.class); return super.bindPluginClass(bindingBuilder).to(MVCore.class).to(MultiverseCore.class);
} }
} }

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.api; package com.onarandombox.MultiverseCore.api;
import java.util.Collection;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Contract; import org.jvnet.hk2.annotations.Contract;
import java.util.Collection;
@Contract @Contract
public interface Destination<T extends DestinationInstance> { public interface Destination<T extends DestinationInstance> {
/** /**

View File

@ -7,8 +7,6 @@
package com.onarandombox.MultiverseCore.api; package com.onarandombox.MultiverseCore.api;
import java.util.List;
import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException; import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
import com.onarandombox.MultiverseCore.world.configuration.AddProperties; import com.onarandombox.MultiverseCore.world.configuration.AddProperties;
import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
@ -23,6 +21,8 @@ import org.bukkit.WorldType;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List;
/** /**
* The API for a Multiverse Handled World. * The API for a Multiverse Handled World.
*/ */

View File

@ -7,9 +7,6 @@
package com.onarandombox.MultiverseCore.api; package com.onarandombox.MultiverseCore.api;
import java.util.Collection;
import java.util.List;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.WorldType; import org.bukkit.WorldType;
@ -17,6 +14,9 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;
import org.jvnet.hk2.annotations.Contract; import org.jvnet.hk2.annotations.Contract;
import java.util.Collection;
import java.util.List;
/** /**
* Multiverse 2 World Manager API * Multiverse 2 World Manager API
* <p> * <p>

View File

@ -1,7 +1,5 @@
package com.onarandombox.MultiverseCore.api; package com.onarandombox.MultiverseCore.api;
import java.util.concurrent.CompletableFuture;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.destination.ParsedDestination; import com.onarandombox.MultiverseCore.destination.ParsedDestination;
import com.onarandombox.MultiverseCore.teleportation.TeleportResult; import com.onarandombox.MultiverseCore.teleportation.TeleportResult;
@ -10,6 +8,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.jvnet.hk2.annotations.Contract; import org.jvnet.hk2.annotations.Contract;
import java.util.concurrent.CompletableFuture;
/** /**
* Used to safely teleport people. * Used to safely teleport people.
*/ */

View File

@ -1,13 +1,13 @@
package com.onarandombox.MultiverseCore.api; package com.onarandombox.MultiverseCore.api;
import java.util.concurrent.CompletableFuture;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.destination.ParsedDestination; import com.onarandombox.MultiverseCore.destination.ParsedDestination;
import com.onarandombox.MultiverseCore.teleportation.TeleportResult; import com.onarandombox.MultiverseCore.teleportation.TeleportResult;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.jvnet.hk2.annotations.Contract; import org.jvnet.hk2.annotations.Contract;
import java.util.concurrent.CompletableFuture;
@Contract @Contract
public interface Teleporter { public interface Teleporter {
/** /**

View File

@ -1,11 +1,11 @@
package com.onarandombox.MultiverseCore.api; package com.onarandombox.MultiverseCore.api;
import java.util.List;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.jvnet.hk2.annotations.Contract; import org.jvnet.hk2.annotations.Contract;
import java.util.List;
/** /**
* Used to remove animals from worlds that don't belong there. * Used to remove animals from worlds that don't belong there.
*/ */

View File

@ -19,10 +19,10 @@ 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.worldnew.entrycheck.WorldEntryChecker;
import com.onarandombox.MultiverseCore.worldnew.entrycheck.WorldEntryCheckerProvider;
import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld; import com.onarandombox.MultiverseCore.worldnew.LoadedMultiverseWorld;
import com.onarandombox.MultiverseCore.worldnew.WorldManager; import com.onarandombox.MultiverseCore.worldnew.WorldManager;
import com.onarandombox.MultiverseCore.worldnew.entrycheck.WorldEntryChecker;
import com.onarandombox.MultiverseCore.worldnew.entrycheck.WorldEntryCheckerProvider;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.commands; package com.onarandombox.MultiverseCore.commands;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import co.aikar.commands.CommandIssuer; import co.aikar.commands.CommandIssuer;
import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandAlias;
@ -21,6 +18,9 @@ import jakarta.inject.Inject;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
@Service @Service
@CommandAlias("mv") @CommandAlias("mv")
public class TeleportCommand extends MultiverseCommand { public class TeleportCommand extends MultiverseCommand {

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.commandtools; package com.onarandombox.MultiverseCore.commandtools;
import java.util.HashSet;
import java.util.Set;
import co.aikar.commands.BukkitCommandExecutionContext; import co.aikar.commands.BukkitCommandExecutionContext;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.InvalidCommandArgument;
@ -28,6 +25,9 @@ import org.bukkit.GameRule;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.HashSet;
import java.util.Set;
@Service @Service
public class MVCommandContexts extends PaperCommandContexts { public class MVCommandContexts extends PaperCommandContexts {

View File

@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.commandtools;
import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.BukkitCommandCompletionContext;
import co.aikar.commands.BukkitCommandExecutionContext; import co.aikar.commands.BukkitCommandExecutionContext;
import co.aikar.commands.BukkitLocales;
import co.aikar.commands.CommandCompletions; import co.aikar.commands.CommandCompletions;
import co.aikar.commands.CommandContexts; import co.aikar.commands.CommandContexts;
import co.aikar.commands.CommandHelp; import co.aikar.commands.CommandHelp;

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.commandtools.context;

View File

@ -1,11 +1,11 @@
package com.onarandombox.MultiverseCore.commandtools.flags; package com.onarandombox.MultiverseCore.commandtools.flags;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.jetbrains.annotations.NotNull;
/** /**
* Represents a flag. * Represents a flag.
*/ */

View File

@ -1,5 +1,8 @@
package com.onarandombox.MultiverseCore.commandtools.flags; package com.onarandombox.MultiverseCore.commandtools.flags;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -7,9 +10,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** /**
* A group of flags. * A group of flags.
*/ */

View File

@ -1,16 +1,16 @@
package com.onarandombox.MultiverseCore.commandtools.flags; package com.onarandombox.MultiverseCore.commandtools.flags;
import co.aikar.commands.InvalidCommandArgument;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import co.aikar.commands.InvalidCommandArgument;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service;
/** /**
* Manages all the flag groups and parsing. * Manages all the flag groups and parsing.
*/ */

View File

@ -1,11 +1,11 @@
package com.onarandombox.MultiverseCore.commandtools.flags; package com.onarandombox.MultiverseCore.commandtools.flags;
import java.util.HashMap;
import java.util.Map;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
/** /**
* Object to contain the results of the flags present and its values. * Object to contain the results of the flags present and its values.
*/ */

View File

@ -7,9 +7,6 @@
package com.onarandombox.MultiverseCore.commandtools.queue; package com.onarandombox.MultiverseCore.commandtools.queue;
import java.util.Map;
import java.util.WeakHashMap;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import jakarta.inject.Inject; import jakarta.inject.Inject;
@ -23,6 +20,9 @@ import org.bukkit.scheduler.BukkitTask;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Map;
import java.util.WeakHashMap;
/** /**
* <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p> * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
* *

View File

@ -1,4 +1,4 @@
/** /**
* Manager queuing of dangerous commands in need of confirmation. * Manager queuing of dangerous commands in need of confirmation.
*/ */
package com.onarandombox.MultiverseCore.commandtools.queue; package com.onarandombox.MultiverseCore.commandtools.queue;

View File

@ -1,9 +1,5 @@
package com.onarandombox.MultiverseCore.config; package com.onarandombox.MultiverseCore.config;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVConfig; import com.onarandombox.MultiverseCore.api.MVConfig;
@ -21,6 +17,10 @@ import org.bukkit.plugin.PluginManager;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@Service @Service
public class MVCoreConfig implements MVConfig { public class MVCoreConfig implements MVConfig {
public static final String CONFIG_FILENAME = "config.yml"; public static final String CONFIG_FILENAME = "config.yml";

View File

@ -7,7 +7,6 @@ import com.onarandombox.MultiverseCore.configuration.node.Node;
import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; import com.onarandombox.MultiverseCore.configuration.node.NodeGroup;
import com.onarandombox.MultiverseCore.event.MVDebugModeEvent; import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
import com.onarandombox.MultiverseCore.exceptions.MultiverseException; import com.onarandombox.MultiverseCore.exceptions.MultiverseException;
import io.github.townyadvanced.commentedconfiguration.setting.CommentedNode;
import io.vavr.control.Try; import io.vavr.control.Try;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.config;

View File

@ -1,19 +1,19 @@
package com.onarandombox.MultiverseCore.configuration.handle; package com.onarandombox.MultiverseCore.configuration.handle;
import java.io.IOException;
import java.nio.file.Path;
import java.util.logging.Logger;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator;
import com.onarandombox.MultiverseCore.configuration.node.NodeGroup;
import com.onarandombox.MultiverseCore.configuration.node.CommentedNode; import com.onarandombox.MultiverseCore.configuration.node.CommentedNode;
import com.onarandombox.MultiverseCore.configuration.node.NodeGroup;
import com.onarandombox.MultiverseCore.configuration.node.ValueNode; import com.onarandombox.MultiverseCore.configuration.node.ValueNode;
import io.github.townyadvanced.commentedconfiguration.CommentedConfiguration; import io.github.townyadvanced.commentedconfiguration.CommentedConfiguration;
import io.vavr.control.Try; import io.vavr.control.Try;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.nio.file.Path;
import java.util.logging.Logger;
/** /**
* Configuration handle for commented YAML files. * Configuration handle for commented YAML files.
*/ */

View File

@ -1,10 +1,5 @@
package com.onarandombox.MultiverseCore.configuration.handle; package com.onarandombox.MultiverseCore.configuration.handle;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.logging.Logger;
import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator;
import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; import com.onarandombox.MultiverseCore.configuration.node.NodeGroup;
import io.vavr.control.Try; import io.vavr.control.Try;
@ -13,6 +8,11 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.logging.Logger;
/** /**
* Generic configuration handle for file based configurations. * Generic configuration handle for file based configurations.
* @param <C> The configuration type. * @param <C> The configuration type.

View File

@ -1,9 +1,5 @@
package com.onarandombox.MultiverseCore.configuration.handle; package com.onarandombox.MultiverseCore.configuration.handle;
import java.io.IOException;
import java.nio.file.Path;
import java.util.logging.Logger;
import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator; import com.onarandombox.MultiverseCore.configuration.migration.ConfigMigrator;
import com.onarandombox.MultiverseCore.configuration.node.NodeGroup; import com.onarandombox.MultiverseCore.configuration.node.NodeGroup;
import io.vavr.control.Try; import io.vavr.control.Try;
@ -12,6 +8,10 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.nio.file.Path;
import java.util.logging.Logger;
/** /**
* Configuration handle for YAML files. * Configuration handle for YAML files.
*/ */

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.configuration.handle;

View File

@ -3,7 +3,6 @@ package com.onarandombox.MultiverseCore.configuration.migration;
import co.aikar.commands.ACFUtil; import co.aikar.commands.ACFUtil;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
/** /**
* Single migrator action that converts a string value to a boolean. * Single migrator action that converts a string value to a boolean.

View File

@ -1,13 +1,11 @@
package com.onarandombox.MultiverseCore.configuration.migration; package com.onarandombox.MultiverseCore.configuration.migration;
import java.util.ArrayList;
import java.util.List;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.configuration.node.ValueNode; import com.onarandombox.MultiverseCore.configuration.node.ValueNode;
import io.github.townyadvanced.commentedconfiguration.setting.TypedValueNode;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import java.util.ArrayList;
import java.util.List;
/** /**
* Helper class for migrating configs to the latest config version. * Helper class for migrating configs to the latest config version.

View File

@ -3,7 +3,6 @@ package com.onarandombox.MultiverseCore.configuration.migration;
import co.aikar.commands.ACFUtil; import co.aikar.commands.ACFUtil;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
/** /**
* Single migrator action that converts a string value to an integer. * Single migrator action that converts a string value to an integer.

View File

@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.configuration.migration;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
/** /**
* Single migrator action that inverts a boolean value for a given path. * Single migrator action that inverts a boolean value for a given path.

View File

@ -1,7 +1,6 @@
package com.onarandombox.MultiverseCore.configuration.migration; package com.onarandombox.MultiverseCore.configuration.migration;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
/** /**
* A migrator action is a single action that is performed when migrating a config. * A migrator action is a single action that is performed when migrating a config.

View File

@ -1,10 +1,9 @@
package com.onarandombox.MultiverseCore.configuration.migration; package com.onarandombox.MultiverseCore.configuration.migration;
import java.util.Optional;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import java.util.Optional;
/** /**
* Single migrator action that moves a value from one path to another. * Single migrator action that moves a value from one path to another.

View File

@ -1,11 +1,10 @@
package com.onarandombox.MultiverseCore.configuration.migration; package com.onarandombox.MultiverseCore.configuration.migration;
import org.bukkit.configuration.ConfigurationSection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
/** /**
* A version migrator is a collection of migrator actions that are performed when migrating a config to a specific version. * A version migrator is a collection of migrator actions that are performed when migrating a config to a specific version.
*/ */

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.configuration.migration;

View File

@ -1,11 +1,11 @@
package com.onarandombox.MultiverseCore.configuration.node; package com.onarandombox.MultiverseCore.configuration.node;
import java.util.ArrayList;
import java.util.List;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
/** /**
* A node that represents a header without any value. * A node that represents a header without any value.
*/ */

View File

@ -1,13 +1,13 @@
package com.onarandombox.MultiverseCore.configuration.node; package com.onarandombox.MultiverseCore.configuration.node;
import java.util.function.BiConsumer;
import java.util.function.Function;
import io.vavr.control.Option; import io.vavr.control.Option;
import io.vavr.control.Try; import io.vavr.control.Try;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.function.BiConsumer;
import java.util.function.Function;
/** /**
* A node that contains a value. * A node that contains a value.
* @param <T> The type of the value. * @param <T> The type of the value.

View File

@ -1,7 +1,5 @@
package com.onarandombox.MultiverseCore.configuration.node; package com.onarandombox.MultiverseCore.configuration.node;
import com.dumptruckman.minecraft.util.Logging;
public class EnumNodeSerializer<T extends Enum<T>> implements NodeSerializer<T> { public class EnumNodeSerializer<T extends Enum<T>> implements NodeSerializer<T> {
@Override @Override

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.configuration.node;

View File

@ -1,11 +1,5 @@
package com.onarandombox.MultiverseCore.destination; package com.onarandombox.MultiverseCore.destination;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import co.aikar.commands.CommandIssuer; import co.aikar.commands.CommandIssuer;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
@ -22,6 +16,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/** /**
* Provides destinations for teleportation. * Provides destinations for teleportation.
*/ */

View File

@ -1,7 +1,5 @@
package com.onarandombox.MultiverseCore.destination.core; package com.onarandombox.MultiverseCore.destination.core;
import java.util.Collection;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.anchor.AnchorManager; import com.onarandombox.MultiverseCore.anchor.AnchorManager;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
@ -12,6 +10,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
@Service @Service
public class AnchorDestination implements Destination<AnchorDestinationInstance> { public class AnchorDestination implements Destination<AnchorDestinationInstance> {

View File

@ -1,9 +1,5 @@
package com.onarandombox.MultiverseCore.destination.core; package com.onarandombox.MultiverseCore.destination.core;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
import com.onarandombox.MultiverseCore.api.Teleporter; import com.onarandombox.MultiverseCore.api.Teleporter;
@ -14,6 +10,10 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@Service @Service
public class BedDestination implements Destination<BedDestinationInstance> { public class BedDestination implements Destination<BedDestinationInstance> {
public static final String OWN_BED_STRING = "playerbed"; public static final String OWN_BED_STRING = "playerbed";

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.destination.core; package com.onarandombox.MultiverseCore.destination.core;
import java.util.Collection;
import java.util.Collections;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
import com.onarandombox.MultiverseCore.api.Teleporter; import com.onarandombox.MultiverseCore.api.Teleporter;
@ -15,6 +12,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
import java.util.Collections;
@Service @Service
public class CannonDestination implements Destination<CannonDestinationInstance> { public class CannonDestination implements Destination<CannonDestinationInstance> {

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.destination.core; package com.onarandombox.MultiverseCore.destination.core;
import java.util.Collection;
import java.util.Collections;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
import com.onarandombox.MultiverseCore.api.Teleporter; import com.onarandombox.MultiverseCore.api.Teleporter;
@ -15,6 +12,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
import java.util.Collections;
@Service @Service
public class ExactDestination implements Destination<ExactDestinationInstance> { public class ExactDestination implements Destination<ExactDestinationInstance> {

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.destination.core; package com.onarandombox.MultiverseCore.destination.core;
import java.util.Collection;
import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
import com.onarandombox.MultiverseCore.api.Teleporter; import com.onarandombox.MultiverseCore.api.Teleporter;
@ -13,6 +10,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
import java.util.stream.Collectors;
@Service @Service
public class PlayerDestination implements Destination<PlayerDestinationInstance> { public class PlayerDestination implements Destination<PlayerDestinationInstance> {
/** /**

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.destination.core; package com.onarandombox.MultiverseCore.destination.core;
import java.util.Collection;
import java.util.Collections;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
import com.onarandombox.MultiverseCore.api.LocationManipulation; import com.onarandombox.MultiverseCore.api.LocationManipulation;
@ -14,6 +11,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.Collection;
import java.util.Collections;
@Service @Service
public class WorldDestination implements Destination<WorldDestinationInstance> { public class WorldDestination implements Destination<WorldDestinationInstance> {

View File

@ -1,15 +1,15 @@
package com.onarandombox.MultiverseCore.display; package com.onarandombox.MultiverseCore.display;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.onarandombox.MultiverseCore.display.handlers.DefaultSendHandler; import com.onarandombox.MultiverseCore.display.handlers.DefaultSendHandler;
import com.onarandombox.MultiverseCore.display.handlers.SendHandler; import com.onarandombox.MultiverseCore.display.handlers.SendHandler;
import com.onarandombox.MultiverseCore.display.parsers.ContentProvider; import com.onarandombox.MultiverseCore.display.parsers.ContentProvider;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/** /**
* Helps to display contents such as list and maps in a nicely formatted fashion. * Helps to display contents such as list and maps in a nicely formatted fashion.
*/ */

View File

@ -1,14 +1,14 @@
package com.onarandombox.MultiverseCore.display.filters; package com.onarandombox.MultiverseCore.display.filters;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
/** /**
* Filter content and text based on regex matching. * Filter content and text based on regex matching.
*/ */

View File

@ -1,8 +1,5 @@
package com.onarandombox.MultiverseCore.display.handlers; package com.onarandombox.MultiverseCore.display.handlers;
import java.util.List;
import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.onarandombox.MultiverseCore.display.filters.ContentFilter; import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
@ -11,6 +8,9 @@ import org.bukkit.ChatColor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* Base implementation of {@link SendHandler} with some common parameters. * Base implementation of {@link SendHandler} with some common parameters.
* *

View File

@ -1,10 +1,10 @@
package com.onarandombox.MultiverseCore.display.handlers; package com.onarandombox.MultiverseCore.display.handlers;
import java.util.List;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List;
public class DefaultSendHandler implements SendHandler { public class DefaultSendHandler implements SendHandler {
private static DefaultSendHandler instance; private static DefaultSendHandler instance;

View File

@ -1,11 +1,11 @@
package com.onarandombox.MultiverseCore.display.handlers; package com.onarandombox.MultiverseCore.display.handlers;
import java.util.List;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List;
/** /**
* Display the contents in a single line. * Display the contents in a single line.
*/ */

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.display.handlers; package com.onarandombox.MultiverseCore.display.handlers;
import java.util.List;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List;
/** /**
* Display content as a list with optional pagination. * Display content as a list with optional pagination.
*/ */

View File

@ -1,10 +1,10 @@
package com.onarandombox.MultiverseCore.display.handlers; package com.onarandombox.MultiverseCore.display.handlers;
import java.util.List;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List;
/** /**
* Handles the sending of all content to the command sender. * Handles the sending of all content to the command sender.
*/ */

View File

@ -1,10 +1,10 @@
package com.onarandombox.MultiverseCore.display.parsers; package com.onarandombox.MultiverseCore.display.parsers;
import java.util.Collection;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Collection;
/** /**
* Parse objects into string or list of strings. * Parse objects into string or list of strings.
*/ */

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.display.parsers; package com.onarandombox.MultiverseCore.display.parsers;
import co.aikar.commands.BukkitCommandIssuer;
import org.jetbrains.annotations.NotNull;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer;
import org.jetbrains.annotations.NotNull;
/** /**
* Simple parser for list object. * Simple parser for list object.
* *

View File

@ -1,13 +1,13 @@
package com.onarandombox.MultiverseCore.display.parsers; package com.onarandombox.MultiverseCore.display.parsers;
import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* Simple parser for map object. * Simple parser for map object.
* *

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.economy; package com.onarandombox.MultiverseCore.economy;
import java.util.HashMap;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.HashMap;
class ItemEconomy { class ItemEconomy {
private static final String ECONOMY_NAME = "Simple Item Economy"; private static final String ECONOMY_NAME = "Simple Item Economy";

View File

@ -1,9 +1,8 @@
package com.onarandombox.MultiverseCore.event; package com.onarandombox.MultiverseCore.event;
import com.onarandombox.MultiverseCore.api.MVWorld;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import com.onarandombox.MultiverseCore.api.MVWorld;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
/** /**

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.inject.binder;

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.inject;

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.permissions;

View File

@ -0,0 +1 @@
package com.onarandombox.MultiverseCore.placeholders;

View File

@ -7,14 +7,13 @@
package com.onarandombox.MultiverseCore.teleportation; package com.onarandombox.MultiverseCore.teleportation;
import com.onarandombox.MultiverseCore.api.LocationManipulation;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.onarandombox.MultiverseCore.api.LocationManipulation;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.text.DecimalFormat; import java.text.DecimalFormat;

View File

@ -7,8 +7,6 @@
package com.onarandombox.MultiverseCore.teleportation; package com.onarandombox.MultiverseCore.teleportation;
import java.util.concurrent.CompletableFuture;
import co.aikar.commands.BukkitCommandIssuer; import co.aikar.commands.BukkitCommandIssuer;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
@ -32,6 +30,8 @@ import org.bukkit.entity.Vehicle;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import java.util.concurrent.CompletableFuture;
/** /**
* The default-implementation of {@link SafeTTeleporter}. * The default-implementation of {@link SafeTTeleporter}.
*/ */

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.teleportation; package com.onarandombox.MultiverseCore.teleportation;
import com.dumptruckman.minecraft.util.Logging;
import org.jvnet.hk2.annotations.Service;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import com.dumptruckman.minecraft.util.Logging;
import org.jvnet.hk2.annotations.Service;
@Service @Service
public class TeleportQueue { public class TeleportQueue {

View File

@ -1,11 +1,5 @@
package com.onarandombox.MultiverseCore.utils; package com.onarandombox.MultiverseCore.utils;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -14,6 +8,12 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/** /**
* Helper class to get {@link Player} from name, UUID or Selectors. * Helper class to get {@link Player} from name, UUID or Selectors.
*/ */

View File

@ -1,5 +1,7 @@
package com.onarandombox.MultiverseCore.utils.file; package com.onarandombox.MultiverseCore.utils.file;
import org.bukkit.plugin.Plugin;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -7,8 +9,6 @@ import java.io.InputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import org.bukkit.plugin.Plugin;
/** /**
* A class loader that loads resources from the plugin's locales folder. * A class loader that loads resources from the plugin's locales folder.
*/ */

View File

@ -7,8 +7,8 @@
package com.onarandombox.MultiverseCore.utils.file; package com.onarandombox.MultiverseCore.utils.file;
import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES; import com.dumptruckman.minecraft.util.Logging;
import static org.bukkit.Bukkit.getServer; import org.jetbrains.annotations.Nullable;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -17,16 +17,12 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor; import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Stream; import java.util.stream.Stream;
import com.dumptruckman.minecraft.util.Logging; import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
import com.onarandombox.MultiverseCore.MultiverseCore; import static org.bukkit.Bukkit.getServer;
import org.jetbrains.annotations.Nullable;
/** /**
* File-utilities. * File-utilities.

View File

@ -1 +1 @@
package com.onarandombox.MultiverseCore.utils.message; package com.onarandombox.MultiverseCore.utils.message;

View File

@ -1,4 +1,4 @@
/** /**
* This package contains the Metrics class, which is used to collect anonymous data for bstats * This package contains the Metrics class, which is used to collect anonymous data for bstats.
*/ */
package com.onarandombox.MultiverseCore.utils.metrics; package com.onarandombox.MultiverseCore.utils.metrics;

View File

@ -4,7 +4,6 @@ import com.onarandombox.MultiverseCore.utils.message.Message;
import com.onarandombox.MultiverseCore.utils.message.MessageReplacement; import com.onarandombox.MultiverseCore.utils.message.MessageReplacement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.NoSuchElementException;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.utils.webpaste; package com.onarandombox.MultiverseCore.utils.webpaste;
import java.io.IOException;
import java.util.Map;
import net.minidev.json.JSONObject; import net.minidev.json.JSONObject;
import net.minidev.json.parser.JSONParser; import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException; import net.minidev.json.parser.ParseException;
import java.io.IOException;
import java.util.Map;
/** /**
* A {@link URLShortener} using {@code bit.ly}. Requires an access token. * A {@link URLShortener} using {@code bit.ly}. Requires an access token.
*/ */

View File

@ -1,13 +1,13 @@
package com.onarandombox.MultiverseCore.utils.webpaste; package com.onarandombox.MultiverseCore.utils.webpaste;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import net.minidev.json.JSONObject; import net.minidev.json.JSONObject;
import net.minidev.json.parser.JSONParser; import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException; import net.minidev.json.parser.ParseException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/** /**
* Pastes to {@code gist.github.com}. Requires an access token with the {@code gist} scope. * Pastes to {@code gist.github.com}. Requires an access token with the {@code gist} scope.
*/ */

View File

@ -1,14 +1,14 @@
package com.onarandombox.MultiverseCore.utils.webpaste; package com.onarandombox.MultiverseCore.utils.webpaste;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import net.minidev.json.JSONArray; import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject; import net.minidev.json.JSONObject;
import net.minidev.json.parser.JSONParser; import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException; import net.minidev.json.parser.ParseException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/** /**
* Pastes to {@code paste.gg}. * Pastes to {@code paste.gg}.
*/ */

View File

@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.utils.webpaste; package com.onarandombox.MultiverseCore.utils.webpaste;
import java.io.IOException;
import java.util.Map;
import net.minidev.json.JSONObject; import net.minidev.json.JSONObject;
import net.minidev.json.parser.JSONParser; import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException; import net.minidev.json.parser.ParseException;
import java.io.IOException;
import java.util.Map;
/** /**
* Pastes to {@code hastebin.com}. * Pastes to {@code hastebin.com}.
*/ */

View File

@ -7,11 +7,6 @@
package com.onarandombox.MultiverseCore.world; package com.onarandombox.MultiverseCore.world;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.api.BlockSafety; import com.onarandombox.MultiverseCore.api.BlockSafety;
import com.onarandombox.MultiverseCore.api.LocationManipulation; import com.onarandombox.MultiverseCore.api.LocationManipulation;
@ -24,9 +19,9 @@ import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
import com.onarandombox.MultiverseCore.listeners.MVPlayerListener; import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor; import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor;
import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation;
import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings; import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings;
import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator; import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator;
import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation;
import me.main__.util.SerializationConfig.ChangeDeniedException; import me.main__.util.SerializationConfig.ChangeDeniedException;
import me.main__.util.SerializationConfig.NoSuchPropertyException; import me.main__.util.SerializationConfig.NoSuchPropertyException;
import me.main__.util.SerializationConfig.VirtualProperty; import me.main__.util.SerializationConfig.VirtualProperty;
@ -47,6 +42,11 @@ import org.bukkit.permissions.PermissionDefault;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/** /**
* The implementation of a Multiverse handled world. * The implementation of a Multiverse handled world.
*/ */

View File

@ -8,7 +8,6 @@
package com.onarandombox.MultiverseCore.world; package com.onarandombox.MultiverseCore.world;
import com.dumptruckman.minecraft.util.Logging; import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorld; import com.onarandombox.MultiverseCore.api.MVWorld;
import com.onarandombox.MultiverseCore.api.WorldPurger; import com.onarandombox.MultiverseCore.api.WorldPurger;
import org.bukkit.World; import org.bukkit.World;

View File

@ -1,21 +1,13 @@
package com.onarandombox.MultiverseCore.world; package com.onarandombox.MultiverseCore.world;
import java.util.ArrayList; import com.onarandombox.MultiverseCore.world.SimpleMVWorld.NullLocation;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.onarandombox.MultiverseCore.world.configuration.EntryFee;
import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation;
import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings;
import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator;
import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor; import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor;
import com.onarandombox.MultiverseCore.world.configuration.EnglishChatStyle; import com.onarandombox.MultiverseCore.world.configuration.EnglishChatStyle;
import com.onarandombox.MultiverseCore.world.SimpleMVWorld.NullLocation; import com.onarandombox.MultiverseCore.world.configuration.EntryFee;
import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings;
import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator;
import com.onarandombox.MultiverseCore.worldnew.config.SpawnLocation;
import me.main__.util.SerializationConfig.IllegalPropertyValueException; import me.main__.util.SerializationConfig.IllegalPropertyValueException;
import me.main__.util.SerializationConfig.Property; import me.main__.util.SerializationConfig.Property;
import me.main__.util.SerializationConfig.SerializationConfig; import me.main__.util.SerializationConfig.SerializationConfig;
@ -31,6 +23,14 @@ import org.bukkit.World.Environment;
import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.configuration.serialization.SerializableAs;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/* /*
* This is a property class, I think we don't need that much javadoc. * This is a property class, I think we don't need that much javadoc.
* BEGIN CHECKSTYLE-SUPPRESSION: Javadoc * BEGIN CHECKSTYLE-SUPPRESSION: Javadoc

View File

@ -1,16 +1,15 @@
package com.onarandombox.MultiverseCore.world.configuration; package com.onarandombox.MultiverseCore.world.configuration;
import java.util.Map;
import com.onarandombox.MultiverseCore.utils.MaterialConverter; import com.onarandombox.MultiverseCore.utils.MaterialConverter;
import me.main__.util.SerializationConfig.Property; import me.main__.util.SerializationConfig.Property;
import me.main__.util.SerializationConfig.SerializationConfig; import me.main__.util.SerializationConfig.SerializationConfig;
import me.main__.util.SerializationConfig.Serializor; import me.main__.util.SerializationConfig.Serializor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.configuration.serialization.SerializableAs;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Map;
/** /**
* Entryfee-settings. * Entryfee-settings.
*/ */

View File

@ -1,12 +1,11 @@
package com.onarandombox.MultiverseCore.world.configuration; package com.onarandombox.MultiverseCore.world.configuration;
import java.util.Map;
import me.main__.util.SerializationConfig.Property; import me.main__.util.SerializationConfig.Property;
import me.main__.util.SerializationConfig.SerializationConfig; import me.main__.util.SerializationConfig.SerializationConfig;
import org.bukkit.configuration.serialization.SerializableAs; import org.bukkit.configuration.serialization.SerializableAs;
import java.util.Map;
/** /**
* Spawning-Settings. * Spawning-Settings.
*/ */

View File

@ -1,14 +1,13 @@
package com.onarandombox.MultiverseCore.world.configuration; package com.onarandombox.MultiverseCore.world.configuration;
import me.main__.util.SerializationConfig.Property;
import me.main__.util.SerializationConfig.SerializationConfig;
import org.bukkit.configuration.serialization.SerializableAs;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import me.main__.util.SerializationConfig.Property;
import me.main__.util.SerializationConfig.SerializationConfig;
import org.bukkit.configuration.serialization.SerializableAs;
/** /**
* SpawnSubSettings. * SpawnSubSettings.
*/ */

View File

@ -1,12 +1,10 @@
package com.onarandombox.MultiverseCore.world.configuration; package com.onarandombox.MultiverseCore.world.configuration;
import org.bukkit.Bukkit;
import com.onarandombox.MultiverseCore.world.SimpleMVWorld;
import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent; import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent;
import com.onarandombox.MultiverseCore.world.SimpleMVWorld;
import me.main__.util.SerializationConfig.ChangeDeniedException; import me.main__.util.SerializationConfig.ChangeDeniedException;
import me.main__.util.SerializationConfig.ObjectUsingValidator; import me.main__.util.SerializationConfig.ObjectUsingValidator;
import org.bukkit.Bukkit;
/** /**
* Validates world-property-changes. * Validates world-property-changes.