Skip to content

Commit

Permalink
Small code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexProgrammerDE committed Feb 7, 2021
1 parent 1431f99 commit b59591c
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 23 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>net.pistonmaster</groupId>
<artifactId>PistonQueue</artifactId>
<version>1.3.3</version>
<version>2.0.0</version>

<name>PistonQueue</name>
<description>Best queue plugin out there!</description>
Expand Down
17 changes: 10 additions & 7 deletions src/main/java/net/pistonmaster/pistonqueue/bungee/PistonQueue.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package net.pistonmaster.pistonqueue.bungee;

import net.pistonmaster.pistonqueue.bungee.commands.MainCommand;
import net.pistonmaster.pistonqueue.bungee.hooks.PistonMOTDPlaceholder;
import net.pistonmaster.pistonqueue.bungee.listeners.QueueListener;
import net.pistonmaster.pistonqueue.bungee.listeners.PistonListener;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import lombok.Getter;
Expand All @@ -16,6 +12,10 @@
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
import net.pistonmaster.pistonqueue.bungee.commands.MainCommand;
import net.pistonmaster.pistonqueue.bungee.hooks.PistonMOTDPlaceholder;
import net.pistonmaster.pistonqueue.bungee.listeners.PistonListener;
import net.pistonmaster.pistonqueue.bungee.listeners.QueueListener;
import net.pistonmaster.pistonqueue.bungee.utils.*;
import org.bstats.bungeecord.Metrics;

Expand All @@ -31,9 +31,12 @@

@SuppressWarnings({"deprecation"})
public final class PistonQueue extends Plugin {
protected static final @Getter Map<UUID, String> regularQueue = new LinkedHashMap<>();
protected static final @Getter Map<UUID, String> priorityQueue = new LinkedHashMap<>();
protected static final @Getter Map<UUID, String> veteranQueue = new LinkedHashMap<>();
protected static final @Getter
Map<UUID, String> regularQueue = new LinkedHashMap<>();
protected static final @Getter
Map<UUID, String> priorityQueue = new LinkedHashMap<>();
protected static final @Getter
Map<UUID, String> veteranQueue = new LinkedHashMap<>();

@Getter
private BanType banType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package net.pistonmaster.pistonqueue.bungee.commands;

import net.pistonmaster.pistonqueue.bungee.QueueAPI;
import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.pistonmaster.pistonqueue.bungee.utils.Config;
import net.pistonmaster.pistonqueue.bungee.utils.StorageTool;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.TabExecutor;
import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.pistonmaster.pistonqueue.bungee.QueueAPI;
import net.pistonmaster.pistonqueue.bungee.utils.Config;
import net.pistonmaster.pistonqueue.bungee.utils.StorageTool;

import java.util.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.pistonmaster.pistonqueue.bungee.hooks;

import net.pistonmaster.pistonqueue.bungee.QueueAPI;
import me.alexprogrammerde.pistonmotd.api.PlaceholderParser;
import me.alexprogrammerde.pistonmotd.api.PlaceholderUtil;
import net.pistonmaster.pistonqueue.bungee.QueueAPI;

public class PistonMOTDPlaceholder implements PlaceholderParser {
public PistonMOTDPlaceholder() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package net.pistonmaster.pistonqueue.bungee.listeners;

import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.pistonmaster.pistonqueue.bungee.utils.ChatUtils;
import net.pistonmaster.pistonqueue.bungee.utils.Config;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.event.PreLoginEvent;
import net.md_5.bungee.api.event.ProxyPingEvent;
import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;
import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.pistonmaster.pistonqueue.bungee.utils.ChatUtils;
import net.pistonmaster.pistonqueue.bungee.utils.Config;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package net.pistonmaster.pistonqueue.bungee.listeners;

import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.pistonmaster.pistonqueue.bungee.utils.BanType;
import net.pistonmaster.pistonqueue.bungee.utils.ChatUtils;
import net.pistonmaster.pistonqueue.bungee.utils.Config;
import net.pistonmaster.pistonqueue.bungee.utils.StorageTool;
import lombok.Setter;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.ComponentBuilder;
Expand All @@ -15,6 +10,11 @@
import net.md_5.bungee.api.event.ServerSwitchEvent;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;
import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.pistonmaster.pistonqueue.bungee.utils.BanType;
import net.pistonmaster.pistonqueue.bungee.utils.ChatUtils;
import net.pistonmaster.pistonqueue.bungee.utils.Config;
import net.pistonmaster.pistonqueue.bungee.utils.StorageTool;

import java.util.*;
import java.util.Map.Entry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.pistonmaster.pistonqueue.bungee.utils;

import net.pistonmaster.pistonqueue.bungee.QueueAPI;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import net.pistonmaster.pistonqueue.bungee.QueueAPI;

public final class ChatUtils {
private ChatUtils() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.pistonmaster.pistonqueue.bungee.utils;

import net.pistonmaster.pistonqueue.bungee.PistonQueue;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
import net.pistonmaster.pistonqueue.bungee.PistonQueue;

import java.io.File;
import java.io.IOException;
Expand Down

0 comments on commit b59591c

Please sign in to comment.