From d14a595ac4a1ecaa4b453132e3fba1d9163aed94 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 29 Nov 2014 19:16:00 +0000 Subject: [PATCH] Update to Spigot's CraftBukkit 1.8 Corrected the version check number Moved Apache Commons reference to imports section --- buildnumber.properties | 6 +++--- nbproject/project.properties | 2 +- .../TotalFreedomMod/Commands/Command_cbtool.java | 4 ++-- .../TotalFreedomMod/Commands/Command_cmdlist.java | 2 +- .../TotalFreedomMod/Commands/Command_colorme.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_csay.java | 2 +- .../TotalFreedomMod/Commands/Command_debug.java | 4 ++-- .../TotalFreedomMod/Commands/Command_dispfill.java | 2 +- .../TotalFreedomMod/Commands/Command_expel.java | 2 +- .../TotalFreedomMod/Commands/Command_findip.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java | 2 +- .../TotalFreedomMod/Commands/Command_glist.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java | 4 ++-- .../TotalFreedomMod/Commands/Command_invis.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_list.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_logs.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_nf.java | 2 +- .../TotalFreedomMod/Commands/Command_nickclean.java | 2 +- src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java | 2 +- .../TotalFreedomMod/Commands/Command_permban.java | 2 +- .../TotalFreedomMod/Commands/Command_plugincontrol.java | 2 +- .../TotalFreedomMod/Commands/Command_potion.java | 2 +- .../TotalFreedomMod/Commands/Command_protectarea.java | 2 +- .../TotalFreedomMod/Commands/Command_qdeop.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_qop.java | 2 +- .../TotalFreedomMod/Commands/Command_rawsay.java | 2 +- .../TotalFreedomMod/Commands/Command_report.java | 4 ++-- .../StevenLawson/TotalFreedomMod/Commands/Command_ro.java | 2 +- .../TotalFreedomMod/Commands/Command_saconfig.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_say.java | 2 +- .../StevenLawson/TotalFreedomMod/Commands/Command_tag.java | 2 +- .../TotalFreedomMod/Commands/Command_tagnyan.java | 2 +- .../TotalFreedomMod/Commands/Command_tempban.java | 4 ++-- .../TotalFreedomMod/Commands/Command_tossmob.java | 2 +- .../TotalFreedomMod/Commands/Command_whohas.java | 2 +- .../TotalFreedomMod/Commands/Command_wildcard.java | 2 +- .../TotalFreedomMod/Commands/TFM_CommandHandler.java | 2 +- src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java | 2 +- .../StevenLawson/TotalFreedomMod/Config/TFM_MainConfig.java | 2 +- .../TotalFreedomMod/HTTPD/HTMLGenerationTools.java | 2 +- src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_dump.java | 4 ++-- src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_file.java | 6 +++--- src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java | 4 ++-- .../TotalFreedomMod/HTTPD/Module_schematic.java | 6 +++--- .../TotalFreedomMod/HTTPD/TFM_HTTPD_Manager.java | 4 ++-- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java | 2 +- .../StevenLawson/TotalFreedomMod/TFM_ServerInterface.java | 6 +++--- src/me/StevenLawson/TotalFreedomMod/TFM_Util.java | 4 ++-- src/me/StevenLawson/TotalFreedomMod/TFM_UuidResolver.java | 2 +- .../StevenLawson/TotalFreedomMod/World/TFM_AdminWorld.java | 2 +- .../StevenLawson/TotalFreedomMod/World/TFM_Flatlands.java | 2 +- 55 files changed, 72 insertions(+), 72 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 11e8a76..454b2c3 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ -#Build Number for ANT. Do not edit! -#Thu Nov 20 23:19:02 CET 2014 -build.number=959 +#Build Number for ANT. Do not edit! +#Sat Nov 29 19:05:03 GMT 2014 +build.number=960 diff --git a/nbproject/project.properties b/nbproject/project.properties index 66fa7ca..3536837 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -51,7 +51,7 @@ javac.classpath=\ ${libs.WorldEdit.classpath}:\ ${libs.Essentials.classpath}:\ ${libs.BukkitTelnet.classpath}:\ - ${libs.SpigotPatched.classpath} + ${libs.CraftBukkit.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation javac.deprecation=false diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java index cd291a2..a1d3e4e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java @@ -5,8 +5,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; import me.StevenLawson.TotalFreedomMod.TFM_Log; -import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java index 5f4ba3c..2823768 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java index bbdc5d2..623b06c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_colorme.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.Map; import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java index 51a3a07..77c0d0b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java index 785eba2..023dcde 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_debug.java @@ -1,8 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; import java.lang.reflect.Field; -import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java index f319bc6..00a4c25 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java index 282d4df..24d4a66 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java @@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java index 7330866..f30dd6a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_PlayerList; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java index 48aa102..055d783 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java index f6c2729..b8f5a42 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java @@ -9,7 +9,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_Player; import me.StevenLawson.TotalFreedomMod.TFM_PlayerList; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_UuidManager; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java index 1b363b7..e35f543 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java @@ -6,8 +6,8 @@ import me.StevenLawson.TotalFreedomMod.TFM_BanManager; import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_UuidManager; -import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java index b6023c5..29e6486 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java index 20b8ef0..c9ca71d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java @@ -5,7 +5,7 @@ import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java index 4214dfb..e259511 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java @@ -13,7 +13,7 @@ import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_Admin; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java index 854128c..b409f1c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java index 730615e..e75f0d0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nickclean.java @@ -4,7 +4,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.Bridge.TFM_EssentialsBridge; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java index 1bc4d00..cbab273 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java @@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java index 580de41..1c6c276 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_PermbanList; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java index cbf5484..74755ce 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_plugincontrol.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java index 63814e3..42bccfe 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java index cc4a77e..a1a02a6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java index a868b57..5d7271a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java index b24597d..efcb2cb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java index d857ea4..eec3fe2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_report.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_report.java index 7d7f6c0..9bddb47 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_report.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_report.java @@ -2,8 +2,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java index b615e46..2e6edf5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.World; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index ed75069..c82c48e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -7,7 +7,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_DepreciationAggregator; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java index 31b75e4..3d2ee9f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java index 7baee50..31dd8d5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java @@ -5,7 +5,7 @@ import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java index 87e8c72..e2d11a6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java @@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java index 6e02cc3..6022cbe 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java @@ -7,8 +7,8 @@ import me.StevenLawson.TotalFreedomMod.TFM_BanManager; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_UuidManager; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java index a3ca5d2..75dab97 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.Command; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java index 1ade52a..06a2ef6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whohas.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import java.util.ArrayList; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.Command; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java index eea205a..8a49f33 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandHandler.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandHandler.java index c65be27..afa4dfa 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandHandler.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandHandler.java @@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java index 6fde7fe..52bf568 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java +++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.Plugin; diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_MainConfig.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_MainConfig.java index 480beda..44081b1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_MainConfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_MainConfig.java @@ -9,7 +9,7 @@ import java.util.EnumMap; import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import net.minecraft.util.org.apache.commons.io.FileUtils; +import org.apache.commons.io.FileUtils; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/HTMLGenerationTools.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/HTMLGenerationTools.java index 4d3916b..35c869f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/HTMLGenerationTools.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/HTMLGenerationTools.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map; -import static net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils.*; +import static org.apache.commons.lang3.StringEscapeUtils.*; public class HTMLGenerationTools { diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_dump.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_dump.java index 77a0928..7e86c79 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_dump.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_dump.java @@ -4,8 +4,8 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; import java.util.Map; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; -import net.minecraft.util.org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.io.FileUtils; import me.StevenLawson.TotalFreedomMod.TFM_Log; import static me.StevenLawson.TotalFreedomMod.HTTPD.HTMLGenerationTools.*; diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_file.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_file.java index 6254082..9b11a71 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_file.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_file.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; - -import static me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.*; +import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response; +import org.apache.commons.lang3.StringUtils; /* * This class was adapted from https://github.com/NanoHttpd/nanohttpd/blob/master/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java @@ -187,7 +187,7 @@ public class Module_file extends TFM_HTTPD_Module final String range = params.get("range"); if (range != null) { - final String[] rangeParams = net.minecraft.util.org.apache.commons.lang3.StringUtils.split(range, "="); + final String[] rangeParams = StringUtils.split(range, "="); if (rangeParams.length >= 2) { if ("bytes".equalsIgnoreCase(rangeParams[0])) diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java index ca1210e..22c061a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java @@ -12,8 +12,8 @@ import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader; import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader.TFM_DynamicCommand; import static me.StevenLawson.TotalFreedomMod.HTTPD.HTMLGenerationTools.heading; import static me.StevenLawson.TotalFreedomMod.HTTPD.HTMLGenerationTools.paragraph; -import static net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils.escapeHtml4; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandMap; import org.bukkit.command.PluginIdentifiableCommand; diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java index 01a3394..1d80eab 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java @@ -14,9 +14,9 @@ import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response; import me.StevenLawson.TotalFreedomMod.TFM_Admin; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_Log; -import net.minecraft.util.org.apache.commons.io.FileUtils; -import net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; public class Module_schematic extends TFM_HTTPD_Module { diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Manager.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Manager.java index 9ba3070..02eaf07 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Manager.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Manager.java @@ -11,8 +11,8 @@ import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; -import net.minecraft.util.org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.bukkit.Bukkit; public class TFM_HTTPD_Manager diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 8f31bb1..f3441e2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -27,7 +27,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_UuidManager; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java index 5443c05..27e1c7a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.UUID; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.Config.TFM_MainConfig; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.configuration.ConfigurationSection; public class TFM_Admin diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java index c02a161..cb4e09d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java @@ -15,7 +15,7 @@ import me.StevenLawson.TotalFreedomMod.Config.TFM_Config; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.Config.TFM_MainConfig; import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld; -import net.minecraft.util.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java index 50b9755..8f6c3f9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java @@ -14,7 +14,7 @@ import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandHandler; import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.Config.TFM_MainConfig; -import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java index 1b2a964..498d6dd 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.UUID; -import net.minecraft.util.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index 8ea98ed..9050a49 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.UUID; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; -import net.minecraft.server.v1_7_R4.MinecraftServer; -import net.minecraft.server.v1_7_R4.PropertyManager; +import net.minecraft.server.v1_8_R1.MinecraftServer; +import net.minecraft.server.v1_8_R1.PropertyManager; import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerLoginEvent.Result; public class TFM_ServerInterface { - public static final String COMPILE_NMS_VERSION = "v1_7_R4"; + public static final String COMPILE_NMS_VERSION = "v1_8_R1"; public static final Pattern USERNAME_REGEX = Pattern.compile("^[\\w\\d_]{3,20}$"); public static void setOnlineMode(boolean mode) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index 9a7d368..b8a67a9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -34,8 +34,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.Config.TFM_Config; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; -import net.minecraft.util.org.apache.commons.io.FileUtils; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_UuidResolver.java b/src/me/StevenLawson/TotalFreedomMod/TFM_UuidResolver.java index c6d8a74..42a1238 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_UuidResolver.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_UuidResolver.java @@ -12,7 +12,7 @@ import java.net.URL; import java.util.*; import java.util.concurrent.Callable; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; // Credits to evilmidget38 public class TFM_UuidResolver implements Callable> diff --git a/src/me/StevenLawson/TotalFreedomMod/World/TFM_AdminWorld.java b/src/me/StevenLawson/TotalFreedomMod/World/TFM_AdminWorld.java index b110b4b..be98e41 100644 --- a/src/me/StevenLawson/TotalFreedomMod/World/TFM_AdminWorld.java +++ b/src/me/StevenLawson/TotalFreedomMod/World/TFM_AdminWorld.java @@ -13,7 +13,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/me/StevenLawson/TotalFreedomMod/World/TFM_Flatlands.java b/src/me/StevenLawson/TotalFreedomMod/World/TFM_Flatlands.java index 0b9fbd2..fb0d50e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/World/TFM_Flatlands.java +++ b/src/me/StevenLawson/TotalFreedomMod/World/TFM_Flatlands.java @@ -6,7 +6,7 @@ import java.io.File; import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import net.minecraft.util.org.apache.commons.io.FileUtils; +import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material;