ok fixed some bugs

Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
2024-11-27 01:05:38 +00:00 · 2019-07-31 12:19:23 -04:00 · 2019-07-31 12:19:23 -04:00 · ae1701613b
commit ae1701613b
parent c3d35487e7
29 changed files with 57 additions and 36 deletions
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java
@ -3,8 +3,8 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java
@ -4,7 +4,7 @@ import java.util.Iterator;
 import java.util.Map;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_debug.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_debug.java
@ -2,8 +2,8 @@ package me.totalfreedom.totalfreedommod.command;

 import java.lang.reflect.Field;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dispfill.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dispfill.java
@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java
@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.ArrayList;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java
@ -1,7 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
@ -10,7 +10,7 @@ import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java
@ -6,7 +6,7 @@ import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java
@ -8,7 +8,7 @@ import net.minecraft.server.v1_14_R1.NBTTagCompound;
 import net.minecraft.server.v1_14_R1.NBTTagInt;
 import net.minecraft.server.v1_14_R1.NBTTagList;
 import net.minecraft.server.v1_14_R1.NBTTagString;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java
@ -6,7 +6,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java
@ -5,7 +5,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
@ -6,7 +6,7 @@ import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java
@ -1,7 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;

 import java.io.BufferedReader;
+import java.io.FileNotFoundException;
 import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import me.totalfreedom.totalfreedommod.rank.Rank;
@ -44,15 +46,30 @@ public class Command_premium extends FreedomCommand
            {
                try
                {
-                    final URL getUrl = new URL("http://axis.iaero.me/accstatus?username=" + name + "&format=plain");
-                    final URLConnection urlConnection = getUrl.openConnection();
+                    final URL getUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
+                    final HttpURLConnection urlConnection = (HttpURLConnection)getUrl.openConnection();
+                    urlConnection.setRequestProperty("User-Agent", "");
                    final String message;
-                    try ( // Read the response
-                          BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())))
+                    String message1;
+                    try //( // Read the response
+                          //BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())))
                    {
-                        message = (!"PREMIUM".equalsIgnoreCase(in.readLine()) ? ChatColor.RED + "No" : ChatColor.DARK_GREEN + "Yes");
+                        if (urlConnection.getResponseCode() == 200)
+                        {
+                            message1 = ChatColor.GREEN + "Yes";
+                        }
+                        else
+                        {
+                            message1 = ChatColor.RED + "No";
+                        }
+                        //message = (!"PREMIUM".equalsIgnoreCase(in.readLine()) ? ChatColor.RED + "No" : ChatColor.DARK_GREEN + "Yes");
+                    }
+                    catch (Exception e){
+                        message1 = ChatColor.RED + "There was an error on trying to connect to the API server";
                    }

+
+                    message = message1;
                    if (!plugin.isEnabled())
                    {
                        return;
@ -71,7 +88,7 @@ public class Command_premium extends FreedomCommand
                catch (Exception ex)
                {
                    FLog.severe(ex);
-                    msg("There was an error querying the Mojang server.", ChatColor.RED);
+                    msg("There was an error querying the API server.", ChatColor.RED);
                }
            }
        }.runTaskAsynchronously(plugin);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_protectarea.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_protectarea.java
@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.ProtectArea;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qdeop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qdeop.java
@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qop.java
@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java
@ -1,8 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stfu.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stfu.java
@ -11,7 +11,7 @@ import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.pravian.aero.util.Ips;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stop.java
@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
@ -9,7 +9,7 @@ import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java
@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java
@ -11,7 +11,7 @@ import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.pravian.aero.util.Ips;
-import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java
@ -27,7 +27,7 @@ import me.totalfreedom.totalfreedommod.httpd.module.Module_schematic;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;

 public class HTTPDaemon extends FreedomService
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_file.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_file.java
@ -17,7 +17,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
 import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
 import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;

 /*
 * This class was adapted from https://github.com/NanoHttpd/nanohttpd/blob/master/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_help.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_help.java
@ -13,7 +13,7 @@ import me.totalfreedom.totalfreedommod.command.FreedomCommand;
 import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
 import me.totalfreedom.totalfreedommod.rank.Displayable;
 import net.pravian.aero.command.CommandReflection;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.PluginIdentifiableCommand;
--- a/src/main/java/me/totalfreedom/totalfreedommod/util/History.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/util/History.java
@ -35,8 +35,12 @@ public class History
                    String compactUuid = uuid.toString().replace("-", "");
                    try
                    {
+                        //UUIDs or playernames actually work with this one
+                        //TODO: fix the stupid api on how it's not working name histories
+                        //URL url = new URL("https://api.ashcon.app/mojang/v2/user/" + compactUuid);
                        URL url = new URL("https://api.mojang.com/user/profiles/" + compactUuid + "/names");
                        HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+                        //conn.setRequestProperty("User-Agent", "");
                        BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
                        FName[] oldNames = gson.fromJson(reader, FName[].class);
                        if (oldNames == null)
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@ -5,4 +5,4 @@ description: Plugin for the Total Freedom server.
 depend: [Aero]
 softdepend: [BukkitTelnet, Essentials, LibsDisguises, WorldEdit]
 authors: [Madgeek1450, Prozza]
-api-version: 1.13
+api-version: 1.14