From 2c0b76877466287f12060d8fb1bae01054f5d5f8 Mon Sep 17 00:00:00 2001 From: extendedclip Date: Fri, 21 Jun 2019 12:30:12 -0400 Subject: [PATCH] ITS 2019 --- .../clip/placeholderapi/PlaceholderAPI.java | 19 +++++------- .../placeholderapi/PlaceholderAPIPlugin.java | 11 +++---- .../clip/placeholderapi/PlaceholderHook.java | 2 +- .../placeholderapi/PlaceholderListener.java | 9 +++--- .../ServerLoadEventListener.java | 24 +++++++++++++-- .../commands/ExpansionCloudCommands.java | 2 +- .../commands/PlaceholderAPICommands.java | 7 +++-- .../configuration/PlaceholderAPIConfig.java | 2 +- .../events/ExpansionRegisterEvent.java | 2 +- .../events/ExpansionUnregisterEvent.java | 2 +- .../events/PlaceholderHookUnloadEvent.java | 2 +- .../placeholderapi/expansion/Cacheable.java | 2 +- .../placeholderapi/expansion/Cleanable.java | 2 +- .../expansion/Configurable.java | 2 +- .../expansion/ExpansionManager.java | 2 +- .../placeholderapi/expansion/NMSVersion.java | 2 +- .../expansion/PlaceholderExpansion.java | 5 ++-- .../placeholderapi/expansion/Relational.java | 2 +- .../placeholderapi/expansion/Taskable.java | 2 +- .../placeholderapi/expansion/Version.java | 2 +- .../expansion/VersionSpecific.java | 2 +- .../expansion/cloud/CloudExpansion.java | 5 ++-- .../cloud/ExpansionCloudManager.java | 22 +++++--------- .../external/EZPlaceholderHook.java | 2 +- .../updatechecker/UpdateChecker.java | 29 ++++++++++++++++--- .../me/clip/placeholderapi/util/FileUtil.java | 5 ++-- .../java/me/clip/placeholderapi/util/Msg.java | 5 ++-- .../clip/placeholderapi/util/TimeFormat.java | 2 +- .../me/clip/placeholderapi/util/TimeUtil.java | 2 +- 29 files changed, 108 insertions(+), 69 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java index adac06d..e5e1974 100644 --- a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java +++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,18 +20,8 @@ */ package me.clip.placeholderapi; -import static me.clip.placeholderapi.util.Msg.color; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; import me.clip.placeholderapi.events.ExpansionRegisterEvent; import me.clip.placeholderapi.events.ExpansionUnregisterEvent; import me.clip.placeholderapi.expansion.PlaceholderExpansion; @@ -42,6 +32,13 @@ import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +import static me.clip.placeholderapi.util.Msg.color; + public class PlaceholderAPI { private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]"); diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java index 766fd8c..e76d9a9 100644 --- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java +++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,6 @@ */ package me.clip.placeholderapi; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; import me.clip.placeholderapi.commands.PlaceholderAPICommands; import me.clip.placeholderapi.configuration.PlaceholderAPIConfig; import me.clip.placeholderapi.expansion.ExpansionManager; @@ -39,6 +35,11 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.plugin.java.JavaPlugin; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** * Yes I have a shit load of work to do... diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderHook.java b/src/main/java/me/clip/placeholderapi/PlaceholderHook.java index 0be3256..7d92da0 100644 --- a/src/main/java/me/clip/placeholderapi/PlaceholderHook.java +++ b/src/main/java/me/clip/placeholderapi/PlaceholderHook.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderListener.java b/src/main/java/me/clip/placeholderapi/PlaceholderListener.java index 7c06084..539e859 100644 --- a/src/main/java/me/clip/placeholderapi/PlaceholderListener.java +++ b/src/main/java/me/clip/placeholderapi/PlaceholderListener.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,6 @@ */ package me.clip.placeholderapi; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import me.clip.placeholderapi.events.ExpansionUnregisterEvent; import me.clip.placeholderapi.expansion.Cacheable; import me.clip.placeholderapi.expansion.Cleanable; @@ -37,6 +34,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.server.PluginDisableEvent; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + public class PlaceholderListener implements Listener { diff --git a/src/main/java/me/clip/placeholderapi/ServerLoadEventListener.java b/src/main/java/me/clip/placeholderapi/ServerLoadEventListener.java index f34dfe3..6bd38eb 100644 --- a/src/main/java/me/clip/placeholderapi/ServerLoadEventListener.java +++ b/src/main/java/me/clip/placeholderapi/ServerLoadEventListener.java @@ -1,12 +1,32 @@ +/* + * + * PlaceholderAPI + * Copyright (C) 2019 Ryan McCarthy + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * + */ package me.clip.placeholderapi; -import java.util.Map; - import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.server.ServerLoadEvent; +import java.util.Map; + public class ServerLoadEventListener implements Listener { private PlaceholderAPIPlugin plugin; diff --git a/src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java b/src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java index e6d0952..b2ee528 100644 --- a/src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java +++ b/src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java b/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java index b94601d..479781a 100644 --- a/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java +++ b/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,6 @@ */ package me.clip.placeholderapi.commands; -import java.util.Set; -import java.util.stream.Collectors; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.expansion.PlaceholderExpansion; @@ -34,6 +32,9 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Set; +import java.util.stream.Collectors; + public class PlaceholderAPICommands implements CommandExecutor { private PlaceholderAPIPlugin plugin; diff --git a/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java b/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java index a8cdd8d..08da615 100644 --- a/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java +++ b/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java index fc78a66..664475a 100644 --- a/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java +++ b/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java index e5ba621..7682f78 100644 --- a/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java +++ b/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java b/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java index 69ad53d..68f7539 100644 --- a/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java +++ b/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java b/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java index 97521ea..caf4e5d 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java +++ b/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java b/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java index cfb1181..bd6e8f0 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java +++ b/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/Configurable.java b/src/main/java/me/clip/placeholderapi/expansion/Configurable.java index 52a147d..488c08d 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/Configurable.java +++ b/src/main/java/me/clip/placeholderapi/expansion/Configurable.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/ExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/ExpansionManager.java index 9049ebd..9b3ac70 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/ExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/ExpansionManager.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java index 95f4348..88b85cd 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java index a408b73..64b608d 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ */ package me.clip.placeholderapi.expansion; -import java.util.List; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderHook; @@ -28,6 +27,8 @@ import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; +import java.util.List; + public abstract class PlaceholderExpansion extends PlaceholderHook { /** diff --git a/src/main/java/me/clip/placeholderapi/expansion/Relational.java b/src/main/java/me/clip/placeholderapi/expansion/Relational.java index 02d93a0..e7708cb 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/Relational.java +++ b/src/main/java/me/clip/placeholderapi/expansion/Relational.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/Taskable.java b/src/main/java/me/clip/placeholderapi/expansion/Taskable.java index 98cc10e..19cd639 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/Taskable.java +++ b/src/main/java/me/clip/placeholderapi/expansion/Taskable.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/Version.java b/src/main/java/me/clip/placeholderapi/expansion/Version.java index 3b04676..1d9646f 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/Version.java +++ b/src/main/java/me/clip/placeholderapi/expansion/Version.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java b/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java index e05d4db..31d956f 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java +++ b/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java index 10da978..49a4e73 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,10 +20,11 @@ */ package me.clip.placeholderapi.expansion.cloud; +import me.clip.placeholderapi.util.TimeUtil; + import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import me.clip.placeholderapi.util.TimeUtil; public class CloudExpansion { diff --git a/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java b/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java index 419fec5..967177d 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,19 +21,6 @@ package me.clip.placeholderapi.expansion.cloud; import com.google.gson.Gson; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import com.google.gson.reflect.TypeToken; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPIPlugin; @@ -42,6 +29,13 @@ import me.clip.placeholderapi.util.Msg; import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import java.io.*; +import java.net.URL; +import java.net.URLConnection; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + public class ExpansionCloudManager { private static final String API_URL = "http://api.extendedclip.com/v2/"; diff --git a/src/main/java/me/clip/placeholderapi/external/EZPlaceholderHook.java b/src/main/java/me/clip/placeholderapi/external/EZPlaceholderHook.java index 097e13e..26e125e 100644 --- a/src/main/java/me/clip/placeholderapi/external/EZPlaceholderHook.java +++ b/src/main/java/me/clip/placeholderapi/external/EZPlaceholderHook.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java b/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java index 948da2b..c814c59 100644 --- a/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java +++ b/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java @@ -1,9 +1,25 @@ +/* + * + * PlaceholderAPI + * Copyright (C) 2019 Ryan McCarthy + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * + */ package me.clip.placeholderapi.updatechecker; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import javax.net.ssl.HttpsURLConnection; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.util.Msg; import org.bukkit.Bukkit; @@ -12,6 +28,11 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; +import javax.net.ssl.HttpsURLConnection; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + public class UpdateChecker implements Listener { private final int RESOURCE_ID = 6245; diff --git a/src/main/java/me/clip/placeholderapi/util/FileUtil.java b/src/main/java/me/clip/placeholderapi/util/FileUtil.java index 743a02d..ee5014d 100644 --- a/src/main/java/me/clip/placeholderapi/util/FileUtil.java +++ b/src/main/java/me/clip/placeholderapi/util/FileUtil.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,8 @@ */ package me.clip.placeholderapi.util; +import me.clip.placeholderapi.PlaceholderAPIPlugin; + import java.io.File; import java.io.FilenameFilter; import java.net.URL; @@ -28,7 +30,6 @@ import java.util.ArrayList; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; -import me.clip.placeholderapi.PlaceholderAPIPlugin; public class FileUtil { diff --git a/src/main/java/me/clip/placeholderapi/util/Msg.java b/src/main/java/me/clip/placeholderapi/util/Msg.java index 6a2e799..73b87dd 100644 --- a/src/main/java/me/clip/placeholderapi/util/Msg.java +++ b/src/main/java/me/clip/placeholderapi/util/Msg.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,11 +20,12 @@ */ package me.clip.placeholderapi.util; -import java.util.Arrays; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import java.util.Arrays; + public class Msg { public static void msg(CommandSender s, String... msg) { diff --git a/src/main/java/me/clip/placeholderapi/util/TimeFormat.java b/src/main/java/me/clip/placeholderapi/util/TimeFormat.java index aed1bef..facce5b 100644 --- a/src/main/java/me/clip/placeholderapi/util/TimeFormat.java +++ b/src/main/java/me/clip/placeholderapi/util/TimeFormat.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/me/clip/placeholderapi/util/TimeUtil.java b/src/main/java/me/clip/placeholderapi/util/TimeUtil.java index 0f32394..802055d 100644 --- a/src/main/java/me/clip/placeholderapi/util/TimeUtil.java +++ b/src/main/java/me/clip/placeholderapi/util/TimeUtil.java @@ -1,7 +1,7 @@ /* * * PlaceholderAPI - * Copyright (C) 2018 Ryan McCarthy + * Copyright (C) 2019 Ryan McCarthy * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by