From 6ba96b427dc2bfcbe6f408635ae224f5659c5d8f Mon Sep 17 00:00:00 2001 From: Jerome van der Sar Date: Sun, 1 Dec 2013 12:13:39 +0100 Subject: [PATCH] Update to CraftBukkit 1.7 --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Commands/Command_cbtool.java | 4 ++-- .../TotalFreedomMod/Commands/Command_cmdlist.java | 2 +- .../TotalFreedomMod/Commands/Command_colorme.java | 2 +- .../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 +- .../TotalFreedomMod/Commands/Command_glist.java | 2 +- .../TotalFreedomMod/Commands/Command_gtfo.java | 4 ++-- .../TotalFreedomMod/Commands/Command_invis.java | 2 +- .../TotalFreedomMod/Commands/Command_list.java | 2 +- .../TotalFreedomMod/Commands/Command_logs.java | 2 +- .../TotalFreedomMod/Commands/Command_nf.java | 2 +- .../TotalFreedomMod/Commands/Command_o.java | 2 +- .../TotalFreedomMod/Commands/Command_permban.java | 2 +- .../Commands/Command_plugincontrol.java | 2 +- .../TotalFreedomMod/Commands/Command_potion.java | 2 +- .../TotalFreedomMod/Commands/Command_protectarea.java | 2 +- .../TotalFreedomMod/Commands/Command_rawsay.java | 2 +- .../TotalFreedomMod/Commands/Command_saconfig.java | 2 +- .../TotalFreedomMod/Commands/Command_say.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/HTTPD/HTMLGenerationTools.java | 2 +- .../TotalFreedomMod/HTTPD/Module_dump.java | 4 ++-- .../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 +- .../TotalFreedomMod/Listener/TFM_ServerListener.java | 4 +++- .../StevenLawson/TotalFreedomMod/TFM_AdminWorld.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_Config.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_Flatlands.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java | 2 +- .../TotalFreedomMod/TFM_ServerInterface.java | 10 +++++----- .../StevenLawson/TotalFreedomMod/TFM_Superadmin.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_Util.java | 4 ++-- .../StevenLawson/TotalFreedomMod/TotalFreedomMod.java | 4 ++-- 43 files changed, 61 insertions(+), 59 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 8eace633..b970fbcb 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sun Dec 01 11:54:49 CET 2013 -build.number=638 +#Sun Dec 01 12:13:00 CET 2013 +build.number=639 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java index d40b6f67..0d053f6a 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cbtool.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.TFM_Log; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; +import net.minecraft.util.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 935b62f6..479fbaf5 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 3dea3e92..a8586a17 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.TFM_EssentialsBridge; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 77c0d0b8..51a3a07c 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 023dcde5..785eba2b 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 org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; +import net.minecraft.util.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 36cd0d1a..3dbfbc50 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 24d4a66d..282d4dfe 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 f25ab1ef..07be4394 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_findip.java @@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_UserList; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 01cfc6a4..6ed5acf5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java @@ -7,7 +7,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_UserList; import me.StevenLawson.TotalFreedomMod.TFM_UserList.TFM_UserListEntry; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 89ad0718..5cd4257e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java @@ -4,8 +4,8 @@ import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager; import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_WorldEditBridge; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; +import net.minecraft.util.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 d4ade6bb..812c38ad 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_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 69291cf4..83755ae7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java @@ -7,7 +7,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_Superadmin; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 fdf8ab47..75ad1862 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java @@ -14,7 +14,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_Superadmin; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 9fd84b76..98bb921c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nf.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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_o.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java index cbab2738..1bc4d003 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 cffa1bea..a6758cde 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.TotalFreedomMod; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 2a263958..6a6406c9 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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_potion.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java index 5182cdde..1ae2d151 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java @@ -5,7 +5,7 @@ import java.util.List; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 590d3293..a43236cc 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.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 d36a1ee7..0c9836fe 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index 43ec0a9e..1000cf2d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -6,7 +6,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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_say.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java index 3d2ee9fa..31b75e4d 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 org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 d621c873..877ad6fa 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java @@ -4,8 +4,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; +import net.minecraft.util.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_tossmob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java index a96ff4c5..7498b009 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.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; import me.StevenLawson.TotalFreedomMod.TFM_Util; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 8bfd2ced..273aa75a 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_SuperadminList; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 711b05f8..974593ea 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java @@ -1,6 +1,6 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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/HTTPD/HTMLGenerationTools.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/HTMLGenerationTools.java index 35c869f7..4d3916b4 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 org.apache.commons.lang3.StringEscapeUtils.*; +import static net.minecraft.util.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 7e86c79b..77a09288 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 org.apache.commons.lang3.StringUtils; -import org.apache.commons.io.FileUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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_help.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java index ba6f5483..3fe9305b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java @@ -13,10 +13,10 @@ import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader.TFM_DynamicCom import org.bukkit.command.Command; import org.bukkit.command.CommandMap; import org.bukkit.command.PluginIdentifiableCommand; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; import static me.StevenLawson.TotalFreedomMod.HTTPD.HTMLGenerationTools.*; -import static org.apache.commons.lang3.StringEscapeUtils.*; +import static net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils.*; public class Module_help extends TFM_HTTPD_Module { diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_schematic.java index d5cab3c9..4c66ec4b 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_Log; import me.StevenLawson.TotalFreedomMod.TFM_Superadmin; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; +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; 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 8966d573..0f93100d 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.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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 d345e525..8f8db2e2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.*; import me.StevenLawson.TotalFreedomMod.Commands.Command_landmine; import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager.RollbackEntry; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java index ce809e88..a0b18426 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java @@ -30,6 +30,8 @@ public class TFM_ServerListener implements Listener // Comment this method out if you want to compile this without a custom CraftBukkit. // Just make sure that enable-command-block=false in server.properties. // -Madgeek + + /* Temporary: Until we get a custom CB build out @EventHandler(priority = EventPriority.NORMAL) public void onCommandBlockSet(org.bukkit.event.server.CommandBlockSetEvent event) { @@ -59,7 +61,7 @@ public class TFM_ServerListener implements Listener } } } - } + }*/ @EventHandler(priority = EventPriority.NORMAL) public void onRemoteServerCommand(RemoteServerCommandEvent event) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java index 7068ec7e..a60bfaa4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.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/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java index 62e75276..293547c6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.EnumMap; import java.util.List; -import org.apache.commons.io.FileUtils; +import net.minecraft.util.org.apache.commons.io.FileUtils; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Flatlands.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Flatlands.java index 3fd32a7d..69d703d4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Flatlands.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Flatlands.java @@ -1,7 +1,7 @@ package me.StevenLawson.TotalFreedomMod; import java.io.File; -import org.apache.commons.io.FileUtils; +import net.minecraft.util.org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java index 1135f5a4..dad936fc 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java @@ -11,7 +11,7 @@ import java.util.Random; import me.StevenLawson.TotalFreedomMod.Commands.Command_trail; import me.StevenLawson.TotalFreedomMod.Commands.TFM_Command; import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader; -import org.apache.commons.lang3.ArrayUtils; +import net.minecraft.util.org.apache.commons.lang3.ArrayUtils; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index d2359f27..b97a9d5f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -6,11 +6,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import net.minecraft.server.v1_6_R3.BanEntry; -import net.minecraft.server.v1_6_R3.BanList; -import net.minecraft.server.v1_6_R3.MinecraftServer; -import net.minecraft.server.v1_6_R3.PlayerList; -import net.minecraft.server.v1_6_R3.PropertyManager; +import net.minecraft.server.v1_7_R1.BanEntry; +import net.minecraft.server.v1_7_R1.BanList; +import net.minecraft.server.v1_7_R1.MinecraftServer; +import net.minecraft.server.v1_7_R1.PlayerList; +import net.minecraft.server.v1_7_R1.PropertyManager; import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java index 577fcd92..8df18d35 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Superadmin.java @@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod; import java.util.Date; import java.util.List; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.configuration.ConfigurationSection; public class TFM_Superadmin diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java index 47052cca..e0b2fde7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index fbb7da7a..883774c4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -10,9 +10,9 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.minecraft.util.org.apache.commons.io.FileUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 6d4db9cc..cbf35a8c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -8,8 +8,8 @@ import me.StevenLawson.TotalFreedomMod.Commands.TFM_Command; import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader; import me.StevenLawson.TotalFreedomMod.HTTPD.TFM_HTTPD_Manager; import me.StevenLawson.TotalFreedomMod.Listener.*; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import net.minecraft.util.org.apache.commons.lang3.exception.ExceptionUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Server;