tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Honor admin chat and reports config (#7) 

* Honor admin chat and reports config

* Optimize imports
This commit is contained in:
Austin Mayes 2018-12-23 00:20:42 -06:00 committed by GitHub
parent f57faddc42
commit 6073ddcea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
164 changed files with 435 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/LatencyReporter.java
View File

@ -2,7 +2,6 @@ package tc.oc.bukkit.analytics;
import java.time.Duration;
import javax.inject.Inject;
import tc.oc.analytics.Gauge;
import tc.oc.analytics.MetricFactory;
import tc.oc.api.bukkit.users.OnlinePlayers;

1
Commons/bukkit/src/main/java/tc/oc/bukkit/analytics/TickReporter.java
View File

@ -3,7 +3,6 @@ package tc.oc.bukkit.analytics;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import tc.oc.analytics.Count;
import tc.oc.analytics.Gauge;
import tc.oc.analytics.MetricFactory;

11
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/CommonsBukkitManifest.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit;
import javax.inject.Inject;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.command.ConsoleCommandSender;
@ -25,7 +24,15 @@ import tc.oc.commons.bukkit.chat.TextComponentRenderer;
import tc.oc.commons.bukkit.chat.TranslatableComponentRenderer;
import tc.oc.commons.bukkit.chat.UserTextComponent;
import tc.oc.commons.bukkit.chat.UserTextComponentRenderer;
import tc.oc.commons.bukkit.commands.*;
import tc.oc.commons.bukkit.commands.GroupCommands;
import tc.oc.commons.bukkit.commands.MiscCommands;
import tc.oc.commons.bukkit.commands.PermissionCommands;
import tc.oc.commons.bukkit.commands.ServerCommands;
import tc.oc.commons.bukkit.commands.ServerVisibilityCommands;
import tc.oc.commons.bukkit.commands.SkinCommands;
import tc.oc.commons.bukkit.commands.TraceCommands;
import tc.oc.commons.bukkit.commands.UserCommands;
import tc.oc.commons.bukkit.commands.UserFinder;
import tc.oc.commons.bukkit.debug.LeakListener;
import tc.oc.commons.bukkit.event.targeted.TargetedEventManifest;
import tc.oc.commons.bukkit.flairs.FlairConfiguration;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastFormatter.java
View File

@ -1,8 +1,7 @@
package tc.oc.commons.bukkit.broadcast;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastManifest.java
View File

@ -1,8 +1,7 @@
package tc.oc.commons.bukkit.broadcast;
import java.util.List;
import com.google.inject.TypeLiteral;
import java.util.List;
import tc.oc.commons.bukkit.broadcast.model.BroadcastPrefix;
import tc.oc.commons.bukkit.broadcast.model.BroadcastSchedule;
import tc.oc.commons.bukkit.settings.SettingBinder;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastParser.java
View File

@ -1,10 +1,9 @@
package tc.oc.commons.bukkit.broadcast;
import java.nio.file.Path;
import java.time.Duration;
import java.util.List;
import javax.inject.Inject;
import java.time.Duration;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastScheduler.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.broadcast;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
@ -10,9 +12,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.command.ConsoleCommandSender;
import tc.oc.api.bukkit.users.OnlinePlayers;

23
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java
View File

@ -1,11 +1,22 @@
package tc.oc.commons.bukkit.broadcast;
import static tc.oc.api.util.Permissions.hasPermissionForEnum;
import static tc.oc.commons.bukkit.commands.CommandUtils.newCommandException;
import static tc.oc.commons.bukkit.commands.CommandUtils.tryEnum;
import com.google.common.collect.Lists;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import com.sk89q.minecraft.util.commands.SuggestionContext;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TranslatableComponent;
@ -32,18 +43,6 @@ import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.formatting.StringUtils;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static tc.oc.api.util.Permissions.hasPermissionForEnum;
import static tc.oc.commons.bukkit.commands.CommandUtils.newCommandException;
import static tc.oc.commons.bukkit.commands.CommandUtils.tryEnum;
/**
* Allows {@link User}s to broadcast {@link Chat} messages across multiple servers.
*/

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSettings.java
View File

@ -1,16 +1,13 @@
package tc.oc.commons.bukkit.broadcast;
import javax.inject.Inject;
import me.anxuiz.settings.Setting;
import me.anxuiz.settings.SettingBuilder;
import me.anxuiz.settings.types.BooleanType;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import tc.oc.commons.bukkit.broadcast.model.BroadcastPrefix;
import tc.oc.commons.bukkit.settings.SettingManagerProvider;
import tc.oc.commons.bukkit.util.ItemCreator;
public class BroadcastSettings {

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSchedule.java
View File

@ -1,10 +1,9 @@
package tc.oc.commons.bukkit.broadcast.model;
import java.util.List;
import java.util.stream.Stream;
import com.google.common.collect.ImmutableList;
import java.time.Duration;
import java.util.List;
import java.util.stream.Stream;
import tc.oc.commons.core.inspect.Inspectable;
import tc.oc.commons.core.stream.Collectors;
import tc.oc.minecraft.server.ServerFilter;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/model/BroadcastSet.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.broadcast.model;
import java.nio.file.Path;
import tc.oc.commons.core.inspect.Inspectable;
public class BroadcastSet extends Inspectable.Impl {

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/Channel.java
View File

@ -1,13 +1,12 @@
package tc.oc.commons.bukkit.channels;
import javax.annotation.Nullable;
import org.bukkit.command.CommandSender;
import tc.oc.api.docs.Chat;
import tc.oc.api.docs.PlayerId;
import tc.oc.api.docs.virtual.ChatDoc;
import tc.oc.commons.core.chat.Audience;
import javax.annotation.Nullable;
/**
* An {@link Audience} that sends {@link Chat} messages to the API.
*/

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelChatEvent.java
View File

@ -1,12 +1,11 @@
package tc.oc.commons.bukkit.channels;
import javax.annotation.Nullable;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import tc.oc.api.docs.PlayerId;
import javax.annotation.Nullable;
/**
* Called when a command sender chats in a local {@link Channel}.
* If cancelled, the message will not be seen by users or reported to the API.

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java
View File

@ -4,6 +4,8 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -18,9 +20,6 @@ import tc.oc.commons.bukkit.util.SyncPlayerExecutorFactory;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.commands.TranslatableCommandException;
import javax.inject.Inject;
import javax.inject.Singleton;
@Singleton
public class ChannelCommands implements Commands, Listener {

21
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelConfiguration.java Normal file
View File

@ -0,0 +1,21 @@
package tc.oc.commons.bukkit.channels;
import javax.inject.Inject;
import org.bukkit.configuration.Configuration;
public class ChannelConfiguration {
private final Configuration config;
@Inject ChannelConfiguration(Configuration config) {
this.config = config;
}
public boolean admin_enabled() {
return config.getBoolean("channels.admin.enabled", false);
}
public boolean admin_cross_server() {
return config.getBoolean("channels.admin.cross-server", false);
}
}

11
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelRouter.java
View File

@ -1,6 +1,11 @@
package tc.oc.commons.bukkit.channels;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.Optional;
import java.util.function.Function;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import tc.oc.api.bukkit.users.BukkitUserStore;
@ -12,12 +17,6 @@ import tc.oc.api.users.UserService;
import tc.oc.commons.bukkit.channels.admin.AdminChannel;
import tc.oc.commons.bukkit.channels.server.ServerChannel;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Optional;
import java.util.function.Function;
/**
* Get the {@link Channel} based on the {@link ChatDoc.Type}.
*/

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/SimpleChannel.java
View File

@ -1,5 +1,8 @@
package tc.oc.commons.bukkit.channels;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.inject.Inject;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -17,10 +20,6 @@ import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.chat.MultiAudience;
import tc.oc.commons.core.plugin.PluginFacet;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.util.stream.Stream;
public abstract class SimpleChannel implements MultiAudience, Channel, PluginFacet {
@Inject protected Audiences audiences;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/admin/AdminChannel.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.channels.admin;
import javax.inject.Inject;
import javax.inject.Singleton;
import me.anxuiz.settings.Setting;
import me.anxuiz.settings.SettingBuilder;
import me.anxuiz.settings.types.BooleanType;
@ -21,9 +23,6 @@ import tc.oc.commons.bukkit.permissions.PermissionRegistry;
import tc.oc.commons.bukkit.settings.SettingManagerProvider;
import tc.oc.commons.core.chat.Component;
import javax.inject.Inject;
import javax.inject.Singleton;
@Singleton
public class AdminChannel extends SimpleChannel implements PermissibleChannel {

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/server/ServerChannel.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.channels.server;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.command.CommandSender;
import tc.oc.api.docs.Chat;
@ -8,9 +10,6 @@ import tc.oc.commons.bukkit.channels.SimpleChannel;
import tc.oc.commons.bukkit.chat.PlayerComponent;
import tc.oc.commons.core.chat.Component;
import javax.inject.Inject;
import javax.inject.Singleton;
@Singleton
public class ServerChannel extends SimpleChannel {

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/CachingNameRenderer.java
View File

@ -1,11 +1,10 @@
package tc.oc.commons.bukkit.chat;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.BaseComponent;
import tc.oc.commons.bukkit.nick.Identity;

22
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatAnnouncer.java
View File

@ -1,5 +1,8 @@
package tc.oc.commons.bukkit.chat;
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
import tc.oc.api.docs.Chat;
import tc.oc.api.docs.Server;
import tc.oc.api.docs.virtual.ChatDoc;
@ -10,17 +13,15 @@ import tc.oc.api.message.types.ModelUpdate;
import tc.oc.api.servers.ServerStore;
import tc.oc.commons.bukkit.broadcast.BroadcastSender;
import tc.oc.commons.bukkit.channels.Channel;
import tc.oc.commons.bukkit.channels.ChannelConfiguration;
import tc.oc.commons.bukkit.channels.ChannelRouter;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Optional;
@Singleton
public class ChatAnnouncer implements PluginFacet, MessageListener {
private final ChannelConfiguration configuration;
private final Server server;
private final ServerStore serverStore;
private final MessageQueue queue;
@ -28,13 +29,17 @@ public class ChatAnnouncer implements PluginFacet, MessageListener {
private final ChannelRouter channelRouter;
private final BroadcastSender broadcaster;
@Inject ChatAnnouncer(Server server, ServerStore serverStore, MessageQueue queue, MainThreadExecutor executor, ChannelRouter channelRouter, BroadcastSender broadcaster) {
@Inject
public ChatAnnouncer(ChannelConfiguration configuration, Server server, ServerStore serverStore,
MessageQueue queue, MainThreadExecutor executor, ChannelRouter channelRouter,
BroadcastSender broadcaster) {
this.configuration = configuration;
this.server = server;
this.serverStore = serverStore;
this.queue = queue;
this.executor = executor;
this.channelRouter = channelRouter;
this.broadcaster = broadcaster;
this.serverStore = serverStore;
}
@Override
@ -69,7 +74,10 @@ public class ChatAnnouncer implements PluginFacet, MessageListener {
case TEAM:
return false;
case ADMIN:
return remote;
if (!configuration.admin_cross_server() && !chat.server_id().equalsIgnoreCase(server._id())) {
return false;
}
return configuration.admin_enabled() && remote;
case BROADCAST:
return shouldAnnounce(chat.broadcast());
}

17
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/ChatCreator.java
View File

@ -1,7 +1,15 @@
package tc.oc.commons.bukkit.chat;
import static java.util.Optional.ofNullable;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.time.Duration;
import java.time.Instant;
import java.util.function.Consumer;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import tc.oc.api.docs.Chat;
import tc.oc.api.docs.PlayerId;
import tc.oc.api.docs.Server;
@ -14,15 +22,6 @@ import tc.oc.api.model.ModelService;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.minecraft.api.event.Listener;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.time.Duration;
import java.time.Instant;
import java.util.function.Consumer;
import static java.util.Optional.ofNullable;
@Singleton
public class ChatCreator implements PluginFacet, Listener {

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/FullNameRenderer.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.chat;
import javax.inject.Inject;
import net.md_5.bungee.api.chat.BaseComponent;
import tc.oc.commons.bukkit.flairs.FlairRenderer;
import tc.oc.commons.bukkit.nick.Identity;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/LinkComponent.java
View File

@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.chat;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Optional;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Links.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.chat;
import java.net.URI;
import java.net.URISyntaxException;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameStyle.java
View File

@ -1,11 +1,10 @@
package tc.oc.commons.bukkit.chat;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Set;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.Sets;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Set;
/**
* The formatting properties for each different context in which names are displayed.

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/NameType.java
View File

@ -1,11 +1,10 @@
package tc.oc.commons.bukkit.chat;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.nick.Identity;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.nick.Identity;
/**
* These are the parameters that determine how a player's name is

11
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/Paginator.java
View File

@ -1,12 +1,14 @@
package tc.oc.commons.bukkit.chat;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
@ -16,9 +18,6 @@ import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.util.IndexedFunction;
import tc.oc.commons.core.util.Numbers;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
public class Paginator<T> {
public static final int DEFAULT_PER_PAGE = 14;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponent.java
View File

@ -1,15 +1,14 @@
package tc.oc.commons.bukkit.chat;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
import java.util.Objects;
import net.md_5.bungee.api.chat.BaseComponent;
import tc.oc.commons.bukkit.nick.Identity;
import tc.oc.commons.core.chat.ImmutableComponent;
import tc.oc.commons.core.util.Utils;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* A component that renders as a player's name.
*

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/PlayerComponentRenderer.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.chat;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.command.CommandSender;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TemplateComponent.java
View File

@ -1,8 +1,7 @@
package tc.oc.commons.bukkit.chat;
import java.util.List;
import com.google.common.collect.ImmutableList;
import java.util.List;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.localization.MessageTemplate;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TextComponentRenderer.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.chat;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.command.CommandSender;

13
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/TranslatableComponentRenderer.java
View File

@ -1,17 +1,16 @@
package tc.oc.commons.bukkit.chat;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.localization.Translator;
import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.chat.Components;
import java.text.MessageFormat;
import java.util.List;
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.localization.Translator;
import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.chat.Components;
@Singleton
public class TranslatableComponentRenderer extends BaseComponentRenderer<TranslatableComponent> {

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserTextComponent.java
View File

@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.chat;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/chat/UserURI.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.chat;
import java.net.URI;
import java.util.Optional;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.nick.Identity;

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/CommandUtils.java
View File

@ -1,5 +1,8 @@
package tc.oc.commons.bukkit.commands;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import java.time.Duration;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
@ -10,10 +13,6 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/GroupCommands.java
View File

@ -5,6 +5,9 @@ import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import com.sk89q.minecraft.util.commands.NestedCommand;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import tc.oc.api.bukkit.users.BukkitUserStore;
@ -18,10 +21,6 @@ import tc.oc.commons.core.concurrent.Flexecutor;
import tc.oc.commons.core.util.ThrowingBiConsumer;
import tc.oc.minecraft.scheduler.Sync;
import javax.inject.Inject;
import java.time.Duration;
import java.time.Instant;
public class GroupCommands implements NestedCommands {
public static class Parent implements Commands {

17
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java
View File

@ -5,6 +5,14 @@ import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.Bukkit;
@ -29,15 +37,6 @@ import tc.oc.commons.core.util.Streams;
import tc.oc.minecraft.protocol.MinecraftVersion;
import tc.oc.minecraft.scheduler.Sync;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
/**
* Commands for miscellaneous purposes.
*/

11
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PermissionCommands.java
View File

@ -5,6 +5,11 @@ import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.NestedCommand;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.permissions.Permission;
@ -14,12 +19,6 @@ import tc.oc.api.util.Permissions;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.commands.NestedCommands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
public class PermissionCommands implements NestedCommands {
public static class Parent implements Commands {
@Command(

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/PrettyPaginatedResult.java
View File

@ -4,11 +4,10 @@ import com.google.common.base.Preconditions;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.WrappedCommandSender;
import com.sk89q.minecraft.util.pagination.PaginatedResult;
import java.util.List;
import net.md_5.bungee.api.ChatColor;
import tc.oc.commons.core.chat.ChatUtils;
import java.util.List;
public abstract class PrettyPaginatedResult<T> extends PaginatedResult<T> {
protected final String header;

17
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java
View File

@ -1,19 +1,16 @@
package tc.oc.commons.bukkit.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import javax.inject.Inject;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerVisibilityCommands.java
View File

@ -1,14 +1,13 @@
package tc.oc.commons.bukkit.commands;
import java.util.EnumSet;
import java.util.logging.Logger;
import javax.inject.Inject;
import com.google.common.util.concurrent.ListenableFuture;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import java.util.EnumSet;
import java.util.logging.Logger;
import javax.inject.Inject;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -19,12 +18,12 @@ import org.bukkit.event.player.PlayerQuitEvent;
import tc.oc.api.docs.Server;
import tc.oc.api.docs.virtual.ServerDoc;
import tc.oc.api.minecraft.MinecraftService;
import tc.oc.minecraft.scheduler.SyncExecutor;
import tc.oc.commons.bukkit.event.WhitelistStateChangeEvent;
import tc.oc.commons.bukkit.whitelist.Whitelist;
import tc.oc.commons.core.commands.CommandFutureCallback;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.logging.Loggers;
import tc.oc.minecraft.scheduler.SyncExecutor;
public class ServerVisibilityCommands implements Listener, Commands {

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/TraceCommands.java
View File

@ -1,13 +1,14 @@
package tc.oc.commons.bukkit.commands;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
import static tc.oc.commons.bukkit.commands.CommandUtils.getCommandSenderOrSelf;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.NestedCommand;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.event.AsyncClientConnectEvent;
@ -20,8 +21,6 @@ import tc.oc.commons.bukkit.util.PacketTracer;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.commands.NestedCommands;
import static tc.oc.commons.bukkit.commands.CommandUtils.getCommandSenderOrSelf;
/**
* Packet tracing commands
*/

15
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserCommands.java
View File

@ -1,11 +1,10 @@
package tc.oc.commons.bukkit.commands;
import javax.inject.Inject;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
@ -17,16 +16,14 @@ import tc.oc.api.docs.User;
import tc.oc.api.friendships.FriendshipRequest;
import tc.oc.api.friendships.FriendshipService;
import tc.oc.api.minecraft.MinecraftService;
import tc.oc.commons.bukkit.chat.Audiences;
import tc.oc.commons.bukkit.chat.Links;
import tc.oc.commons.bukkit.chat.NameStyle;
import tc.oc.commons.bukkit.chat.PlayerComponent;
import tc.oc.commons.core.util.Lazy;
import tc.oc.minecraft.scheduler.SyncExecutor;
import tc.oc.api.sessions.SessionService;
import tc.oc.commons.bukkit.chat.Audiences;
import tc.oc.commons.bukkit.chat.ComponentPaginator;
import tc.oc.commons.bukkit.chat.ComponentRenderers;
import tc.oc.commons.bukkit.chat.HeaderComponent;
import tc.oc.commons.bukkit.chat.Links;
import tc.oc.commons.bukkit.chat.NameStyle;
import tc.oc.commons.bukkit.chat.PlayerComponent;
import tc.oc.commons.bukkit.format.UserFormatter;
import tc.oc.commons.bukkit.nick.IdentityProvider;
import tc.oc.commons.core.chat.Audience;
@ -34,6 +31,8 @@ import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.commands.CommandFutureCallback;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.commands.TranslatableCommandException;
import tc.oc.commons.core.util.Lazy;
import tc.oc.minecraft.scheduler.SyncExecutor;
/**
* Commands for querying and possibly manipulating user records

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java
View File

@ -1,15 +1,14 @@
package tc.oc.commons.bukkit.commands;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import tc.oc.api.bukkit.users.BukkitUserStore;
@ -21,10 +20,10 @@ import tc.oc.api.users.UserSearchRequest;
import tc.oc.api.users.UserSearchResponse;
import tc.oc.api.users.UserService;
import tc.oc.commons.bukkit.nick.IdentityProvider;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
import tc.oc.commons.bukkit.users.PlayerSearchResponse;
import tc.oc.commons.core.commands.TranslatableCommandException;
import tc.oc.commons.core.util.Orderable;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
@Singleton
public class UserFinder {

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/config/ExternalConfiguration.java
View File

@ -7,15 +7,14 @@ import java.util.logging.Level;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import tc.oc.commons.bukkit.logging.MapdevLogger;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
import tc.oc.file.PathWatcher;
import tc.oc.file.PathWatcherService;
import tc.oc.minecraft.api.configuration.InvalidConfigurationException;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
/**
* Base class for a configuration section that is loaded from the external

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/debug/LeakListener.java
View File

@ -1,14 +1,13 @@
package tc.oc.commons.bukkit.debug;
import java.time.Duration;
import javax.annotation.Nullable;
import javax.inject.Inject;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.world.WorldUnloadEvent;
import java.time.Duration;
import tc.oc.api.bukkit.users.BukkitUserStore;
import tc.oc.api.docs.virtual.Model;
import tc.oc.api.model.ModelDispatcher;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/PlayerServerChangeEvent.java
View File

@ -1,14 +1,13 @@
package tc.oc.commons.bukkit.event;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nullable;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.PlayerAction;
import static com.google.common.base.Preconditions.checkNotNull;
public class PlayerServerChangeEvent extends ExtendedCancellable implements PlayerAction {
private final Player player;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/event/UserLoginEvent.java
View File

@ -1,7 +1,8 @@
package tc.oc.commons.bukkit.event;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nullable;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
@ -11,8 +12,6 @@ import tc.oc.api.docs.Session;
import tc.oc.api.docs.User;
import tc.oc.api.users.LoginResponse;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Fired from within {@link PlayerLoginEvent}, and inludes our {@link User} document.
* It also fires after various login info has been loaded e.g. PlayerId, permissions,

6
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairConfiguration.java
View File

@ -1,10 +1,10 @@
package tc.oc.commons.bukkit.flairs;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Inject;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.ConfigurationSection;
import javax.inject.Inject;
import static com.google.common.base.Preconditions.checkNotNull;
public class FlairConfiguration {

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/flairs/FlairRenderer.java
View File

@ -1,13 +1,10 @@
package tc.oc.commons.bukkit.flairs;
import java.util.ArrayList;
import java.util.Collections;
import com.google.common.collect.ImmutableSet;
import java.util.Set;
import java.util.stream.Stream;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.collect.ImmutableSet;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import tc.oc.api.bukkit.users.BukkitUserStore;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/GameFormatter.java
View File

@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.format;
import java.util.Collection;
import java.util.Optional;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/ServerFormatter.java
View File

@ -1,17 +1,16 @@
package tc.oc.commons.bukkit.format;
import java.time.Duration;
import java.time.Instant;
import java.util.Comparator;
import java.util.Optional;
import javax.annotation.Nullable;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import java.time.Duration;
import java.time.Instant;
import tc.oc.api.docs.virtual.MatchDoc;
import tc.oc.api.docs.virtual.ServerDoc;
import tc.oc.api.minecraft.MinecraftService;

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/format/UserFormatter.java
View File

@ -1,19 +1,18 @@
package tc.oc.commons.bukkit.format;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;
import javax.inject.Inject;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import java.time.Duration;
import java.time.Instant;
import tc.oc.api.docs.Server;
import tc.oc.api.docs.Session;
import tc.oc.api.docs.virtual.ServerDoc;

17
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/freeze/PlayerFreezer.java
View File

@ -1,14 +1,15 @@
package tc.oc.commons.bukkit.freeze;
import java.time.Duration;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import javax.inject.Inject;
import javax.inject.Singleton;
import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8;
import static tc.oc.minecraft.protocol.MinecraftVersion.lessThan;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
import java.time.Duration;
import java.util.Map;
import java.util.WeakHashMap;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -18,14 +19,10 @@ import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.world.WorldUnloadEvent;
import tc.oc.commons.bukkit.event.CoarsePlayerMoveEvent;
import tc.oc.commons.bukkit.util.NMSHacks;
import tc.oc.commons.core.collection.WeakHashSet;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.commons.core.util.Pair;
import tc.oc.minecraft.api.scheduler.Tickable;
import static tc.oc.minecraft.protocol.MinecraftVersion.lessThan;
import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8;
/**
* Freezes players by mounting them on an invisible minecart.
*/

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/Interface.java
View File

@ -1,13 +1,12 @@
package tc.oc.commons.bukkit.gui;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import tc.oc.commons.bukkit.gui.buttons.Button;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import tc.oc.commons.bukkit.gui.buttons.Button;
public class Interface {

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/InterfaceManager.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.gui;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
@ -7,9 +9,6 @@ import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
import tc.oc.commons.bukkit.gui.buttons.Button;
import java.util.ArrayList;
import java.util.List;
public class InterfaceManager {
private static List<Interface> inventories = new ArrayList<>();

2
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/empty/EmptyButton.java
View File

@ -1,8 +1,8 @@
package tc.oc.commons.bukkit.gui.buttons.empty;
import org.bukkit.Material;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.util.ItemCreator;
import org.bukkit.Material;
public class EmptyButton extends Button {

4
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/buttons/nextPage/NextPageButton.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.gui.buttons.nextPage;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.InterfaceManager;
import tc.oc.commons.bukkit.gui.buttons.Button;
@ -7,8 +9,6 @@ import tc.oc.commons.bukkit.gui.interfaces.ChestOptionsPageInterface;
import tc.oc.commons.bukkit.gui.interfaces.SinglePageInterface;
import tc.oc.commons.bukkit.util.Constants;
import tc.oc.commons.bukkit.util.ItemCreator;
import org.bukkit.Material;
import org.bukkit.entity.Player;
public class NextPageButton extends Button {

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestInterface.java
View File

@ -1,14 +1,13 @@
package tc.oc.commons.bukkit.gui.interfaces;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder;
import tc.oc.commons.bukkit.gui.buttons.Button;
import java.util.List;
public class ChestInterface extends Interface {
private int size;

11
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestOptionsPageInterface.java
View File

@ -1,5 +1,10 @@
package tc.oc.commons.bukkit.gui.interfaces;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.gui.buttons.empty.EmptyButton;
@ -7,12 +12,6 @@ import tc.oc.commons.bukkit.gui.buttons.toggle.ToggleButton;
import tc.oc.commons.bukkit.util.Constants;
import tc.oc.commons.bukkit.util.ItemCreator;
import tc.oc.commons.bukkit.util.ObjectUtils;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
/**
* MultiPageInterfaces are a special group of interfaces. They aren't a single interface, but a collection of

11
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/ChestPageInterface.java
View File

@ -1,17 +1,16 @@
package tc.oc.commons.bukkit.gui.interfaces;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.gui.buttons.empty.EmptyButton;
import tc.oc.commons.bukkit.util.Constants;
import tc.oc.commons.bukkit.util.ItemCreator;
import tc.oc.commons.bukkit.util.ObjectUtils;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import java.util.ArrayList;
import java.util.List;
/**
* MultiPageInterfaces are a special group of interfaces. They aren't a single interface, but a collection of

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/HopperInterface.java
View File

@ -1,15 +1,14 @@
package tc.oc.commons.bukkit.gui.interfaces;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.SimpleInterfaceHolder;
import tc.oc.commons.bukkit.gui.buttons.Button;
import java.util.List;
public class HopperInterface extends Interface {
private int size;

10
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/SinglePageInterface.java
View File

@ -1,17 +1,15 @@
package tc.oc.commons.bukkit.gui.interfaces;
import tc.oc.commons.bukkit.gui.Interface;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.gui.buttons.empty.EmptyButton;
import tc.oc.commons.bukkit.gui.buttons.nextPage.NextPageButton;
import tc.oc.commons.bukkit.util.Constants;
import tc.oc.commons.bukkit.util.ItemCreator;
import tc.oc.commons.bukkit.util.ObjectUtils;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
/**
* MultiPageInterfaces are a special group of interfaces. They aren't a single interface, but a collection of

12
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/ChestRenderInterface.java
View File

@ -1,16 +1,14 @@
package tc.oc.commons.bukkit.gui.interfaces.render;
import tc.oc.commons.bukkit.gui.Interface;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.gui.interfaces.ChestInterface;
import tc.oc.commons.bukkit.util.ItemCreator;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.gui.interfaces.ChestInterface;
import tc.oc.commons.bukkit.util.ItemCreator;
public class ChestRenderInterface extends ChestInterface {

13
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/gui/interfaces/render/text/GridTextRenderInterface.java
View File

@ -1,15 +1,16 @@
package tc.oc.commons.bukkit.gui.interfaces.render.text;
import tc.oc.commons.bukkit.gui.Interface;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import tc.oc.commons.bukkit.gui.buttons.Button;
import tc.oc.commons.bukkit.gui.interfaces.render.ChestRenderInterface;
import tc.oc.commons.bukkit.gui.interfaces.render.Coordinate;
import tc.oc.commons.bukkit.util.ItemCreator;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import java.util.*;
public class GridTextRenderInterface extends ChestRenderInterface {

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/HologramUtil.java
View File

@ -2,13 +2,12 @@ package tc.oc.commons.bukkit.hologram;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableBiMap;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import javax.annotation.Nullable;
import java.awt.*;
import java.awt.Color;
import java.awt.image.BufferedImage;
import java.util.LinkedList;
import javax.annotation.Nullable;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
/**
* Various {@link tc.oc.commons.bukkit.hologram.content.HologramFrame}-related utility methods

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/hologram/content/HologramFrame.java
View File

@ -1,10 +1,9 @@
package tc.oc.commons.bukkit.hologram.content;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
/**
* Represents a single frame of a {@link tc.oc.commons.bukkit.hologram.Hologram}.

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/AppealAlertListener.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.listeners;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.event.EventHandler;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/InactivePlayerListener.java
View File

@ -1,11 +1,12 @@
package tc.oc.commons.bukkit.listeners;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.ChatColor;
import org.bukkit.Sound;
import org.bukkit.configuration.Configuration;
@ -15,8 +16,6 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import java.time.Duration;
import java.time.Instant;
import tc.oc.commons.bukkit.configuration.ConfigUtils;
import tc.oc.commons.bukkit.localization.CommonsTranslations;
import tc.oc.commons.bukkit.teleport.PlayerServerChanger;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LocaleListener.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.listeners;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

6
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/LoginListener.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.listeners;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReadWriteLock;
@ -8,12 +10,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.bukkit.entity.Player;
import org.bukkit.event.EventBus;
import org.bukkit.event.EventHandler;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/listeners/PermissionGroupListener.java
View File

@ -1,11 +1,10 @@
package tc.oc.commons.bukkit.listeners;
import com.google.common.eventbus.Subscribe;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Nullable;
import javax.inject.Inject;
import com.google.common.eventbus.Subscribe;
import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizationManifest.java
View File

@ -1,8 +1,7 @@
package tc.oc.commons.bukkit.localization;
import java.util.Map;
import com.google.inject.TypeLiteral;
import java.util.Map;
import net.md_5.bungee.api.chat.BaseComponent;
import tc.oc.commons.core.inject.Manifest;
import tc.oc.commons.core.reflect.TypeLiterals;

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedDocument.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.localization;
import com.google.common.cache.LoadingCache;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Locale;
@ -9,18 +11,15 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.xml.parsers.DocumentBuilder;
import com.google.common.cache.LoadingCache;
import com.google.inject.assistedinject.Assisted;
import org.xml.sax.SAXException;
import tc.oc.commons.bukkit.logging.MapdevLogger;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
import tc.oc.commons.core.localization.Locales;
import tc.oc.commons.core.localization.LocalizedFileManager;
import tc.oc.commons.core.util.CacheUtils;
import tc.oc.file.PathWatcher;
import tc.oc.file.PathWatcherHandle;
import tc.oc.file.PathWatcherService;
import tc.oc.minecraft.scheduler.MainThreadExecutor;
import tc.oc.parse.ParseException;
import tc.oc.parse.xml.DocumentParser;

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/LocalizedMessageMap.java
View File

@ -1,5 +1,9 @@
package tc.oc.commons.bukkit.localization;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.inject.assistedinject.Assisted;
import java.nio.file.Path;
import java.util.AbstractMap;
import java.util.Collection;
@ -7,11 +11,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.inject.assistedinject.Assisted;
import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.command.CommandSender;
import tc.oc.commons.bukkit.chat.ComponentRenderContext;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageMapParser.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.localization;
import java.util.Map;
import javax.inject.Inject;
import net.md_5.bungee.api.chat.BaseComponent;
import org.w3c.dom.Document;
import tc.oc.commons.bukkit.markup.MarkupParser;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/MessageTemplate.java
View File

@ -3,7 +3,6 @@ package tc.oc.commons.bukkit.localization;
import java.text.MessageFormat;
import java.util.Locale;
import javax.inject.Inject;
import org.bukkit.command.CommandSender;
import tc.oc.commons.core.localization.Locales;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginLocales.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.localization;
import java.util.Locale;
import javax.annotation.Nullable;
import org.bukkit.command.CommandSender;
import tc.oc.commons.core.localization.LocaleMatcher;
import tc.oc.commons.core.localization.Locales;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/PluginTranslations.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.localization;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.NavigableSet;
@ -7,9 +9,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
import javax.annotation.Nullable;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import org.bukkit.command.CommandSender;
import tc.oc.commons.core.localization.Locales;
import tc.oc.commons.core.localization.TranslationSet;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/localization/Translations.java
View File

@ -1,5 +1,7 @@
package tc.oc.commons.bukkit.localization;
import static com.google.common.base.Preconditions.checkState;
import java.util.Collection;
import java.util.Iterator;
import java.util.Locale;
@ -8,14 +10,11 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.command.CommandSender;
import tc.oc.api.docs.virtual.MapDoc;
import tc.oc.commons.core.localization.Locales;
import tc.oc.commons.core.localization.TranslationSet;
import static com.google.common.base.Preconditions.checkState;
/**
* Contains translations for all plugins. This should be used instead of the
* individual plugin classes.

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevLogger.java
View File

@ -4,7 +4,6 @@ import java.util.Optional;
import java.util.logging.Logger;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.kencochrane.raven.dsn.Dsn;
import tc.oc.api.util.Permissions;
import tc.oc.commons.core.logging.Loggers;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/logging/MapdevSentryConfiguration.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.logging;
import javax.inject.Inject;
import net.kencochrane.raven.dsn.Dsn;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.ConfigurationSection;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/markup/MarkupParser.java
View File

@ -7,24 +7,23 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Inject;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import tc.oc.commons.bukkit.chat.LinkComponent;
import tc.oc.commons.bukkit.chat.Links;
import tc.oc.commons.bukkit.chat.UserURI;
import tc.oc.commons.bukkit.chat.Renderable;
import tc.oc.commons.bukkit.chat.UserURI;
import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.chat.Components;
import tc.oc.parse.MissingException;
import tc.oc.parse.ParseException;
import tc.oc.parse.ValueException;
import tc.oc.parse.xml.XML;
import tc.oc.parse.xml.ElementParser;
import tc.oc.parse.xml.NodeParser;
import tc.oc.parse.xml.UnrecognizedNodeException;
import tc.oc.parse.xml.XML;
/**
* Parses an XML dialect similar to HTML into {@link BaseComponent}s

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/ConsoleIdentity.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.nick;
import javax.annotation.Nullable;
import javax.inject.Singleton;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/Identity.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.nick;
import javax.annotation.Nullable;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import tc.oc.api.docs.PlayerId;

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityImpl.java
View File

@ -1,8 +1,9 @@
package tc.oc.commons.bukkit.nick;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Objects;
import javax.annotation.Nullable;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import tc.oc.api.bukkit.friends.OnlineFriends;
@ -11,8 +12,6 @@ import tc.oc.api.docs.PlayerId;
import tc.oc.api.docs.UserId;
import tc.oc.commons.bukkit.util.PlayerStates;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Functionality common to real and nicked identities
*/

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProvider.java
View File

@ -1,7 +1,6 @@
package tc.oc.commons.bukkit.nick;
import javax.annotation.Nullable;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import tc.oc.api.docs.PlayerId;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/IdentityProviderImpl.java
View File

@ -6,7 +6,6 @@ import java.util.Objects;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventBus;
@ -21,11 +20,11 @@ import tc.oc.api.bukkit.users.OnlinePlayers;
import tc.oc.api.docs.PlayerId;
import tc.oc.api.docs.Session;
import tc.oc.api.docs.UserId;
import tc.oc.minecraft.scheduler.SyncExecutor;
import tc.oc.api.users.UserSearchResponse;
import tc.oc.commons.bukkit.event.UserLoginEvent;
import tc.oc.commons.bukkit.util.PlayerStates;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.minecraft.scheduler.SyncExecutor;
@Singleton
public class IdentityProviderImpl implements IdentityProvider, Listener, PluginFacet {

21
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameCommands.java
View File

@ -1,13 +1,5 @@
package tc.oc.commons.bukkit.nick;
import java.time.Duration;
import java.time.Instant;
import java.util.Objects;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@ -15,6 +7,13 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import java.time.Duration;
import java.time.Instant;
import java.util.Objects;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
@ -35,9 +34,6 @@ import tc.oc.api.docs.PlayerId;
import tc.oc.api.docs.User;
import tc.oc.api.docs.virtual.UserDoc;
import tc.oc.api.exceptions.UnprocessableEntity;
import tc.oc.commons.core.commands.TranslatableCommandException;
import tc.oc.commons.core.formatting.PeriodFormats;
import tc.oc.minecraft.scheduler.SyncExecutor;
import tc.oc.api.users.UserService;
import tc.oc.commons.bukkit.chat.Audiences;
import tc.oc.commons.bukkit.chat.NameStyle;
@ -52,6 +48,9 @@ import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.commands.CommandFutureCallback;
import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.commands.ComponentCommandException;
import tc.oc.commons.core.commands.TranslatableCommandException;
import tc.oc.commons.core.formatting.PeriodFormats;
import tc.oc.minecraft.scheduler.SyncExecutor;
@Singleton
public class NicknameCommands implements Listener, Commands {

5
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/NicknameConfiguration.java
View File

@ -1,12 +1,11 @@
package tc.oc.commons.bukkit.nick;
import javax.inject.Inject;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Inject;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.ConfigurationSection;
import static com.google.common.base.Preconditions.checkNotNull;
public class NicknameConfiguration {
private final ConfigurationSection config;

18
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceChanger.java
View File

@ -1,26 +1,24 @@
package tc.oc.commons.bukkit.nick;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.Skin;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.Team;
import tc.oc.commons.bukkit.flairs.FlairConfiguration;
import tc.oc.commons.bukkit.flairs.FlairRenderer;
import tc.oc.commons.bukkit.chat.FullNameRenderer;
import tc.oc.commons.bukkit.chat.NameStyle;
import tc.oc.commons.bukkit.chat.NameType;
import tc.oc.commons.bukkit.flairs.FlairConfiguration;
import tc.oc.commons.bukkit.flairs.FlairRenderer;
import tc.oc.commons.core.scheduler.Scheduler;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* Manages the Bukkit aspects of a player's name and appearance
*/

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerAppearanceListener.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.nick;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;

4
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerIdentityChangeEvent.java
View File

@ -1,11 +1,11 @@
package tc.oc.commons.bukkit.nick;
import static com.google.common.base.Preconditions.checkNotNull;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Fired when a player changes/clears their nickname immediately during a session,
* i.e. with "/nick -i". This is NEVER fired on login or logout.

1
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrder.java
View File

@ -2,7 +2,6 @@ package tc.oc.commons.bukkit.nick;
import java.util.Comparator;
import java.util.function.Function;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/PlayerOrderCache.java
View File

@ -1,20 +1,19 @@
package tc.oc.commons.bukkit.nick;
import java.lang.ref.WeakReference;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ComparisonChain;
import com.google.common.eventbus.Subscribe;
import java.lang.ref.WeakReference;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerQuitEvent;
import tc.oc.api.minecraft.servers.LocalServerReconfigureEvent;
import tc.oc.api.bukkit.users.BukkitUserStore;
import tc.oc.api.minecraft.MinecraftService;
import tc.oc.api.minecraft.servers.LocalServerReconfigureEvent;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.commons.core.util.CacheUtils;

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/nick/UsernameRenderer.java
View File

@ -3,15 +3,14 @@ package tc.oc.commons.bukkit.nick;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import tc.oc.commons.bukkit.chat.NameFlag;
import tc.oc.commons.bukkit.chat.PartialNameRenderer;
import tc.oc.commons.bukkit.chat.NameType;
import tc.oc.commons.bukkit.chat.PartialNameRenderer;
import tc.oc.commons.core.chat.Component;
@Singleton

27
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java
View File

@ -1,16 +1,25 @@
package tc.oc.commons.bukkit.punishment;
import java.time.Duration;
import java.util.List;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import static tc.oc.api.docs.virtual.PunishmentDoc.Type;
import static tc.oc.api.docs.virtual.PunishmentDoc.Type.BAN;
import static tc.oc.api.docs.virtual.PunishmentDoc.Type.KICK;
import static tc.oc.api.docs.virtual.PunishmentDoc.Type.WARN;
import static tc.oc.commons.bukkit.commands.UserFinder.Default.NULL;
import static tc.oc.commons.bukkit.commands.UserFinder.Default.SENDER;
import static tc.oc.commons.bukkit.commands.UserFinder.Scope;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromFlag;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromType;
import com.google.common.collect.Collections2;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import java.time.Duration;
import java.util.List;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.command.CommandSender;
@ -30,14 +39,6 @@ import tc.oc.commons.core.commands.Commands;
import tc.oc.commons.core.concurrent.Flexecutor;
import tc.oc.minecraft.scheduler.Sync;
import static tc.oc.api.docs.virtual.PunishmentDoc.Type;
import static tc.oc.api.docs.virtual.PunishmentDoc.Type.*;
import static tc.oc.commons.bukkit.commands.UserFinder.Default.NULL;
import static tc.oc.commons.bukkit.commands.UserFinder.Default.SENDER;
import static tc.oc.commons.bukkit.commands.UserFinder.Scope;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromFlag;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.fromType;
@Singleton
public class PunishmentCommands implements Commands {

3
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCreator.java
View File

@ -1,12 +1,11 @@
package tc.oc.commons.bukkit.punishment;
import com.google.common.util.concurrent.ListenableFuture;
import java.time.Duration;
import java.time.Instant;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.util.concurrent.ListenableFuture;
import tc.oc.api.docs.PlayerId;
import tc.oc.api.docs.Punishment;
import tc.oc.api.docs.Server;

9
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentEnforcer.java
View File

@ -1,8 +1,11 @@
package tc.oc.commons.bukkit.punishment;
import static tc.oc.commons.bukkit.punishment.PunishmentMessageSetting.Options;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP_STALE;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.bukkit.Sound;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -26,10 +29,6 @@ import tc.oc.commons.core.concurrent.Flexecutor;
import tc.oc.minecraft.api.event.Enableable;
import tc.oc.minecraft.scheduler.Sync;
import static tc.oc.commons.bukkit.punishment.PunishmentMessageSetting.Options;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP;
import static tc.oc.commons.bukkit.punishment.PunishmentPermissions.LOOK_UP_STALE;
@Singleton
public class PunishmentEnforcer implements Enableable, MessageListener {

Some files were not shown because too many files have changed in this diff Show More